Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen …

…into LifeGen-dev
sedgestripe · Sep 8, 2024 · 5130fd8 · 5130fd8
2 parents 8b945ab + 4dcdcb3
commit 5130fd8
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 6 deletions.
diff --git a/resources/dicts/lifegen_talk/choice_dialogue.json b/resources/dicts/lifegen_talk/choice_dialogue.json
@@ -3434,7 +3434,7 @@
         ],
         "intro": [
             "[Ever since d_c died, t_c has been refusing to sleep in {PRONOUN/t_c/poss} den.]",
-            "[Instead, whether in rain, snow, or storm, t_c faithfully curls up next to t_c's grave each night, without so much as a scrap of moss to warm {PRONOUN/t_c/object}.]",
+            "[Instead, whether in rain, snow, or storm, t_c faithfully curls up next to d_c's grave each night, without so much as a scrap of moss to warm {PRONOUN/t_c/object}.]",
             "[You're one of the closest cats to t_c in the entire Clan. It hurts for you to see {PRONOUN/t_c/object} like this.]",
             "[What should you do?]"
         ],

diff --git a/resources/dicts/lifegen_talk/flirt.json b/resources/dicts/lifegen_talk/flirt.json
@@ -3995,6 +3995,59 @@
             "Oh, you know what? Since you're so brave, how about I place you on more border patrols?"
         ]
     ],
+    "frommate_grieving_H1": [
+        [
+            "from_mate",
+            "they_grieving",
+            "any",
+            "reject",
+            "you_blind",
+            "they_blind"
+        ],
+        [
+            "I'm sorry, y_c, I'm... not in the mood right now."
+        ]
+    ],
+    "frommate_grieving_H2": [
+        [
+            "from_mate",
+            "they_grieving",
+            "any",
+            "flirt",
+            "they_blind"
+        ],
+        [
+            "Haha...",
+            "You always know what to say to cheer me up.",
+            "[t_c smiles, but you can still see the deep sadness in {PRONOUN/t_c/poss} eyes.]"
+        ]
+    ],
+    "frommate_grieving_H3": [
+        [
+            "from_mate",
+            "they_grieving",
+            "they_deaf",
+            "you_deaf",
+            "any",
+            "reject"
+        ],
+        [
+            "[t_c smiles at you, but it's clear {PRONOUN/t_c/subject}{VERB/t_c/'re/'s} not in the mood for flirting.]"
+        ]
+    ],
+    "grieving_H1": [
+        [
+            "they_grieving",
+            "any",
+            "reject",
+            "they_deaf",
+            "you_deaf",
+            "they_blind"
+        ],
+        [
+            "[t_c curls in a ball, ignoring your attempts to flirt.]"
+        ]
+    ],
     "frommate_reject_H1": [
         [
             "reject",

diff --git a/resources/dicts/lifegen_talk/general_no_kit.json b/resources/dicts/lifegen_talk/general_no_kit.json
@@ -1811,7 +1811,7 @@
             "It seems Leafbare has finally left us, I can feel the chill in the air starting to dissipate. It's nice.",
             "I'm looking forward to seeing the birds again, and the nice flowers that appear that smell wonderful.",
             "Just... seeing live plants again will be utterly wonderful, a great change of pace.",
-            "I love the snow of Leafbare, but Newleaf's flowers make the territory a lovely place to be."
+            "I love the snow of leafbare, but newleaf's flowers make the territory a lovely place to be."
         ]
     ],
     "introspective_newleaf_1": [

diff --git a/resources/dicts/lifegen_talk/general_no_newborn.json b/resources/dicts/lifegen_talk/general_no_newborn.json
@@ -3818,5 +3818,61 @@
             "[You smell t_c nearby while trying to get to sleep.]",
             "[You don't lift your head. You must be hallucinating in your grief.]"
         ]
+    ],
+    "gen_grievingyou_H1": [
+        [
+            "they_grieving",
+            "grievingyou",
+            "min_plike_20",
+            "any",
+            "they_deaf",
+            "you_deaf"
+        ],
+        [
+            "[t_c looks up from {PRONOUN/t_c/poss} curled position. {PRONOUN/t_c/poss/CAP} eyes flash in surprise, and {PRONOUN/t_c/subject} quickly bump heads with you, happy to see you again.]"
+        ]
+    ],
+    "gen_grievingyou_H2": [
+        [
+            "they_grieving",
+            "they_dead",
+            "grievingyou",
+            "min_plike_20",
+            "any",
+            "they_deaf",
+            "you_deaf"
+        ],
+        [
+            "[t_c looks up from {PRONOUN/t_c/poss} curled position. {PRONOUN/t_c/poss/CAP} eyes flash in surprise, and {PRONOUN/t_c/subject} quickly bunt heads with you, happy to see you again.]"
+        ]
+    ],
+    "gen_grievingthem_H1": [
+        [
+            "you_grieving",
+            "grievingthem",
+            "any",
+            "min_plike_20",
+            "they_deaf",
+            "you_deaf"
+        ],
+        [
+            "[You rush over to t_c, overjoyed to see {PRONOUN/t_c/object} alive and well.]",
+            "[You bunt heads with t_c and stay like that for a while, signing for {PRONOUN/t_c/object} to never leave you like that again.]"
+        ]
+    ],
+    "gen_grievingthem_H2": [
+        [
+            "you_grieving",
+            "they_dead",
+            "grievingthem",
+            "any",
+            "min_plike_20",
+            "they_deaf",
+            "you_deaf"
+        ],
+        [
+            "[You rush over to t_c, overjoyed to see {PRONOUN/t_c/object} alive and well.]",
+            "[You bunt heads with t_c and stay like that for a while, signing for {PRONOUN/t_c/object} to never leave you like that again.]"
+        ]
     ]
 }
diff --git a/resources/dicts/lifegen_talk/general_you_kit.json b/resources/dicts/lifegen_talk/general_you_kit.json
@@ -4613,7 +4613,7 @@
             "they_deaf",
             "they_blind",
             "you_blind",
-            "you_newborn"
+            "newborn"
         ],
         [
             "[You can feel the presence of so many big cats around you!]",
@@ -5024,6 +5024,8 @@
     "cool_kit_AJ6": [
         [
             "you_kitten",
+            "they_kitten",
+            "they_older",
             "cool",
             "unlawful",
             "you_blind",
@@ -5039,6 +5041,7 @@
     "cool_kit_AJ7": [
         [
             "you_kitten",
+            "they_kitten",
             "cool",
             "unlawful",
             "platonic_like",
@@ -5058,6 +5061,7 @@
     "cool_kit_AJ8": [
         [
             "you_kitten",
+            "they_kitten",
             "cool",
             "platonic_like",
             "you_blind",
@@ -5073,6 +5077,7 @@
     "cool_kit_AJ9": [
         [
             "you_kitten",
+            "they_kitten",
             "cool",
             "you_blind"
         ],
@@ -5088,6 +5093,7 @@
     "cool_kit_AJ10~1": [
         [
             "you_kitten",
+            "they_kitten",
             "cool",
             "upstanding",
             "they_orphaned",
@@ -5107,6 +5113,7 @@
     "cool_kit_AJ10~2": [
         [
             "you_kitten",
+            "they_kitten",
             "cool",
             "upstanding",
             "they_orphaned",

diff --git a/resources/dicts/lifegen_talk/insults.json b/resources/dicts/lifegen_talk/insults.json
@@ -2955,7 +2955,8 @@
         [
             "they_newborn",
             "newborn",
-            "insult"
+            "insult",
+            "they_deaf"
         ],
         [
             "[You meow at t_c aggressively, flopping your paws around as if that'll do much.]",
@@ -3075,14 +3076,43 @@
     ],
     "newborn_insult_J1": [
         [
-            "you_newborn",
+            "newborn",
             "they_newborn",
             "insult"
         ],
         [
             "Grrr..."
         ]
     ],
+    "newborn_to_newborn_H3": [
+        [
+            "they_newborn",
+            "newborn",
+            "they_deaf",
+            "you_deaf",
+            "they_blind",
+            "you_blind",
+            "insult"
+        ],
+        [
+            "[t_c does not respond to your insult.]"
+        ]
+    ],
+    "shunned_grieving_H1": [
+        [
+            "they_shunned",
+            "they_grieving",
+            "any",
+            "insult",
+            "they_deaf",
+            "you_deaf",
+            "they_blind"
+        ],
+        [
+            "[t_c turns {PRONOUN/t_c/poss} head away from you.]",
+            "[Looks like {PRONOUN/t_c/subject}{VERB/t_c/'re/'s} not in the mood for banter.]"
+        ]
+    ],
     "TinyTeddy_stable_neg_youkitten_theywarrior_01": [
     [
 "insult",

diff --git a/resources/dicts/lifegen_talk/kitten.json b/resources/dicts/lifegen_talk/kitten.json
@@ -7034,5 +7034,19 @@
             "I'll go tell r_q that I asked you about it, and that {PRONOUN/r_q/subject}{VERB/r_q/'re/'s} a liar.",
             "[You wonder if {PRONOUN/t_c/subject}'d still react so warmly if you told {PRONOUN/t_c/object} the truth.]"
         ]
-    }
+    },
+    "newborn_to_newborn_H3": [
+        [
+            "they_newborn",
+            "newborn",
+            "they_deaf",
+            "you_deaf",
+            "they_blind",
+            "you_blind",
+            "insult"
+        ],
+        [
+            "[t_c does not respond to your insult.]"
+        ]
+    ]
 }