Merge pull request #217 from jaysoleson/LifeGen-dev

patrol tag fixes + dead shunned fix
sedgestripe · Sep 9, 2024 · f0e2dc3 · f0e2dc3
2 parents e066e24 + 6add88f
commit f0e2dc3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/scripts/patrol/patrol.py b/scripts/patrol/patrol.py
@@ -617,12 +617,6 @@ def _filter_patrols(
                 if "you_med" in patrol.tags:
                     if game.clan.your_cat.status != 'medicine cat':
                         continue
-                if "df" in patrol.tags:
-                    if len(self.patrol_cats) > 1:
-                        other_cat = self.patrol_cats[1]
-                        if not game.clan.your_cat.joined_df and not other_cat.joined_df:
-                            # need both cats to be trainees for goop romance
-                            continue
 
             #  correct button check
             if game.switches["patrol_category"] == 'clangen':
@@ -640,24 +634,25 @@ def _filter_patrols(
                     elif 'herb_gathering' not in patrol.types and patrol_type == 'med':
                         continue
 
-            if "df" in patrol.types:
-                if len(self.patrol_cats) > 1:
-
-                    other_cat = self.patrol_cats[1]
-
-                    if not other_cat.joined_df:
-                        if "fellowtrainee" in patrol.tags: 
-                            continue
-
-                    else:
-                        if "fellowtrainee" not in patrol.tags:
-                            continue
-
-                if "shunned" in patrol.tags:
-                    if game.clan.your_cat.shunned == 0:
-                        continue
-
             if game.switches["patrol_category"] in ['lifegen', 'df', 'date']:
+                if game.switches["patrol_category"] == "df":
+                    if len(self.patrol_cats) > 1:
+                        other_cat = self.patrol_cats[1]
+
+                        if not other_cat.joined_df:
+                            if "fellowtrainee" in patrol.tags: 
+                                continue
+
+                        else:
+                            if "fellowtrainee" not in patrol.tags:
+                                continue
+                elif game.switches["patrol_category"] == "date":
+                    if "df" in patrol.tags:
+                        if len(self.patrol_cats) > 1:
+                            other_cat = self.patrol_cats[1]
+                            if not game.clan.your_cat.joined_df or not other_cat.joined_df:
+                                # need both cats to be trainees for goop romance
+                                continue
 
                 if "bloodthirsty_only" in patrol.tags:
                     if Cat.all_cats.get(game.clan.your_cat.mentor).personality.trait != "bloodthirsty":

diff --git a/scripts/screens/MurderScreen.py b/scripts/screens/MurderScreen.py
@@ -1699,7 +1699,8 @@ def choose_discover_punishment(self, you, cat_to_murder, accomplice, accompliced
                 a_s = randint(1,2)
                 if a_s == 1 and accomplice.status != "leader":
                     game.cur_events_list.insert(2, Single_Event(f"Shocked at your request to be an accomplice to murder, {accomplice.name} reports your actions to the Clan leader."))
-                you.shunned = 1
+                if not you.dead:
+                    you.shunned = 1
             txt = ""
             if game.clan.your_cat.dead:
                 # if game.clan.your_cat.status in ['kitten', 'leader', 'deputy', 'medicine cat']:
@@ -1714,7 +1715,8 @@ def choose_discover_punishment(self, you, cat_to_murder, accomplice, accompliced
                     txt = choice(self.mu_txt["murder_discovered general"])
             txt = txt.replace('v_c', str(cat_to_murder.name))
             game.cur_events_list.insert(2, Single_Event(txt))
-            you.shunned = 1
+            if not you.dead:
+                you.shunned = 1
             you.faith -= 0.5
         elif punishment_chance == 2:
             if game.clan.your_cat.dead:
@@ -1723,14 +1725,17 @@ def choose_discover_punishment(self, you, cat_to_murder, accomplice, accompliced
                 txt = f"{accomplice.name} is blamed for the murder of v_c. However, you were not caught."
             txt = txt.replace('v_c', str(cat_to_murder.name))
             game.cur_events_list.insert(2, Single_Event(txt))
-            accomplice.shunned = 1
+            if not accomplice.dead:
+                accomplice.shunned = 1
             accomplice.faith -= 0.5
         else:
             txt = f"The unsettling truth of v_c's death is discovered, with you and {accomplice.name} responsible. The Clan decides both of your punishments."
             txt = txt.replace('v_c', str(cat_to_murder.name))
             game.cur_events_list.insert(2, Single_Event(txt))
-            you.shunned = 1
-            accomplice.shunned = 1
+            if not you.dead:
+                you.shunned = 1
+            if not accomplice.dead:
+                accomplice.shunned = 1
             accomplice.faith -= 0.5
 
         if punishment_chance == 1 or punishment_chance == 3: