new lifegen patrols, shunned stuff, faith patrol block #115
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
jaysoleson
commented
May 11, 2024
jaysoleson
commented
- new "faith_effects" block for patrols to change a cats faith-- test patrol is still in there
- tweaks to accessory gaining from patrols for o_c1 can get em
- new ceremony text for shunned apprentices and forgiven warriors
- disabled working buttons (queen, mediator, medcat) for shunned cats
- new patrols: shunned defaults for several statuses + 2 and 3 cat dates. some statuses still need shunned default patrols
- also a few more two cat df patrols
- enabled the possibility of shunned-specific DF patrols but shunned cats can still get all the normal ones
- thats all i rememebr :3c
…nto LifeGen-dev
sedgestripe
requested changes
May 11, 2024
| @@ -1903,12 +1903,12 @@ | |||
| "you_shunned", | |||
| "they_blind", | |||
| "you_blind", | |||
| "from_mate", | |||
| "from_your_mate", | |||
| @@ -608,7 +603,7 @@ def decide_if_romantic(romantic_event, patrol_leader, random_cat, patrol_apprent | |||
| print("final romance chance:", chance_of_romance_patrol) | |||
| return not int(random.random() * chance_of_romance_patrol) | |||
|
|
|||
| def _filter_patrols(self, possible_patrols: List[PatrolEvent], biome:str, camp:str, current_season:str, patrol_type:str): | |||
| def _filter_patrols(self, possible_patrols: List[PatrolEvent], biome:str, current_season:str, patrol_type:str): | |||
There was a problem hiding this comment.
any reason why you're removing camp?
scripts/patrol/patrol.py
Outdated
| @@ -26,8 +26,6 @@ | |||
| from scripts.patrol.patrol_outcome import PatrolOutcome | |||
| from scripts.cat.cats import Cat | |||
| from scripts.special_dates import get_special_date, contains_special_date_tag | |||
| from scripts.utility import change_clan_relations, change_clan_reputation, get_cluster, get_alive_kits, get_alive_cats, get_alive_apps, get_alive_meds, get_alive_mediators, get_alive_queens, get_alive_elders, get_alive_warriors, get_med_cats, ceremony_text_adjust, \ | |||
| get_current_season, adjust_list_text, ongoing_event_text_adjust, event_text_adjust, create_new_cat, create_outside_cat | |||
There was a problem hiding this comment.
removing these imports breaks some abbreviations
scripts/patrol/patrol.py
Outdated
| text2 = self.adjust_txt(text) | ||
| if text2: | ||
| text = text2 | ||
|
|
| @@ -519,6 +525,64 @@ def gather_cat_objects(cat_list, patrol: 'Patrol') -> list: | |||
|
|
|||
| return " ".join(results) | |||
|
|
|||
| def _handle_faith_changes(self, patrol:'Patrol') -> str: | |||
| @@ -1457,7 +1451,7 @@ def handle_history(self, cat, condition=None, possible=False, scar=False, death= | |||
| f"WARNING: No history found for {self.patrol_event.patrol_id}, it may not need one but double check please!") | |||
| if scar and "scar" in self.patrol_event.history_text: | |||
| adjust_text = self.patrol_event.history_text['scar'] | |||
| adjust_text = adjust_text.replace("o_c_n", f"{str(self.other_clan.name)}Clan") | |||
There was a problem hiding this comment.
removing Clan may mess up some clangen patrols
…nto LifeGen-dev
…nto LifeGen-dev
…nto LifeGen-dev
…nto LifeGen-dev
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.