bug

sedgestripe · Oct 3, 2024 · 1964b44 · 1964b44
1 parent d19a345
commit 1964b44
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/resources/dicts/lifegen_talk/general_no_kit.json b/resources/dicts/lifegen_talk/general_no_kit.json
@@ -17961,7 +17961,7 @@
             "What is that for? Are you busy with a patient? I'm in the way, aren't I-",
             "[You cut off t_c and explain that you are worried about {PRONOUN/t_c/object}. You believe rest will make {PRONOUN/t_c/object} feel better.]",
             "Oh! I think so too but-",
-            "[You nudge the bundle of herbs to the poor cat, explaining that t_c can add {PRONOUN/t_c/object} to {PRONOUN/t_c/poss} nest and see if it helps {PRONOUN/t_c/object} relax.]",
+            "[You nudge the bundle of herbs to the poor cat, explaining that t_c can add them to {PRONOUN/t_c/poss} nest and see if it helps {PRONOUN/t_c/object} relax.]",
             "[t_c comes back later asking for more!]"
         ]
     ],

diff --git a/resources/dicts/lifegen_talk/newborn.json b/resources/dicts/lifegen_talk/newborn.json
@@ -1278,7 +1278,7 @@
             "you_deaf"
         ],
         [
-            "[r_c quickly grabs t_c and carries {PRONOUN/t_c/subject} away as {PRONOUN/t_c/poss} {VERB/t_c/stumble/stumbles} curiously towards you.]"
+            "[r_c quickly grabs t_c and carries {PRONOUN/t_c/poss} away as {PRONOUN/t_c/subject} {VERB/t_c/stumble/stumbles} curiously towards you.]"
         ]
     ],
     "newborn_shunned4": [

diff --git a/resources/dicts/patrols/lifegen/df.json b/resources/dicts/patrols/lifegen/df.json
@@ -1488,7 +1488,7 @@
                 "weight": 30
             },
             {
-                "text": "When you reach forward to try to pull {PRONOUN/r_c/object} out, r_c swats your paws away, mistaking you for a threat. As {PRONOUN/r_c/subject} {VERB/r_c/try/tries} to climb up onto the bank {PRONOUN/r_c/self}, eyes blinded by the filthy lakewater, the ground crumbles away, sending {PRONOUN/r_c/object} back into the lake. It take you longer than you'd like to will yourself awake, and when it finally works, you can already hear r_c hacking and coughing from {PRONOUN/r_c/poss} nest.",
+                "text": "When you reach forward to try to pull {PRONOUN/r_c/object} out, r_c swats your paws away, mistaking you for a threat. As {PRONOUN/r_c/subject} {VERB/r_c/try/tries} to climb up onto the bank {PRONOUN/r_c/self}, eyes blinded by the filthy lakewater, the ground crumbles away, sending {PRONOUN/r_c/object} back into the lake. It takes you longer than you'd like to will yourself awake, and when it finally works, you can already hear r_c hacking and coughing from {PRONOUN/r_c/poss} nest.",
                 "exp": 0,
                 "weight": 40,
                 "injury": [ 

diff --git a/scripts/events.py b/scripts/events.py
@@ -242,6 +242,7 @@ def one_moon(self):
             ghost_names = []
             shaken_cats = []
             extra_event = None
+            event = None
             for ghost in Cat.dead_cats:
                 if not ghost.dead_for > 1:
                     ghost_names.append(str(ghost.name))
@@ -251,7 +252,7 @@ def one_moon(self):
             if ghost_names:
                 insert = adjust_list_text(ghost_names)
 
-            if len(Cat.dead_cats) > 1:
+            if len(Cat.dead_cats) > 1 and insert:
                 event = f"The past moon, {insert} have taken their place in StarClan. {game.clan.name}Clan mourns their " \
                         f"loss, and their Clanmates will miss where they had been in their lives. Moments of their " \
                         f"lives are shared in stories around the circle of mourners as those that were closest to them " \
@@ -299,17 +300,18 @@ def one_moon(self):
                     else:
                         extra_event = f"So much grief and death has taken its toll on the cats of {game.clan.name}Clan. {insert} are particularly shaken by it. "
 
-            else:
+            elif insert:
                 event = (
                     f"The past moon, {insert} has taken their place in StarClan. {game.clan.name}Clan mourns their "
                     f"loss, and their Clanmates will miss the spot they took up in their lives. Moments of their "
                     f"life are shared in stories around the circle of mourners as those that were closest to them "
                     f"take them to their final resting place."
                 )
 
-            game.cur_events_list.append(
-                Single_Event(event, ["birth_death"], [i.ID for i in Cat.dead_cats])
-            )
+            if event:
+                game.cur_events_list.append(
+                    Single_Event(event, ["birth_death"], [i.ID for i in Cat.dead_cats])
+                )
             if extra_event:
                 game.cur_events_list.append(
                     Single_Event(