Merge pull request #231 from Honeycase/LifeGen-dev

Small fixing yet again

resources/dicts/acc_display.json

@@ -555,7 +555,7 @@
     "plural": "indigo nylon collars",
     "singular": "indigo nylon collar"
   },
-  "DAISY": {
+  "DAISIES": {
     "default": "daisy",
     "plural": "daisies",
     "singular": "daisy"
@@ -625,7 +625,7 @@
     "plural": "wisteria strands",
     "singular": "wisteria strand"
   },
-  "CLOVER": {
+  "SINGULARCLOVER": {
     "default": "clover",
     "plural": "clovers",
     "singular": "clover"
@@ -860,7 +860,7 @@
     "plural": "rosy maple moth wings",
     "singular": "rosy maple moth wing"
   },
-  "MONARCH BUTTERFLY": {
+  "MONARCH": {
     "default": "monarch butterfly wings",
     "plural": "monarch butterfly wings",
     "singular": "monarch butterfly wing"
@@ -940,7 +940,7 @@
     "plural": "yellow ladybugs",
     "singular": "yellow ladybug"
   },
-  "RASPBERRY": {
+  "RASPBERRY2": {
     "default": "raspberry",
     "plural": "raspberries",
     "singular": "raspberry"
@@ -1180,6 +1180,11 @@
     "plural": "fern wraps",
     "singular": "fern wrap"
   },
+  "BLEEDINGVINES": {
+    "default": "bleeding vine",
+    "plural": "bleeding vines",
+    "singular": "bleeding vine"
+  },
   "BLEEDINGHEART": {
     "default": "bleeding heart",
     "plural": "bleeding hearts",
@@ -1435,10 +1440,10 @@
     "plural": "yews",
     "singular": "yew"
   },
-  "HEATHER": {
-    "default": "heather",
-    "plural": "heathers",
-    "singular": "heather"
+  "CALLUNA": {
+    "default": "calluna",
+    "plural": "callunas",
+    "singular": "calluna"
   },
   "TEETHCOLLAR": {
     "default": "teeth collar",

resources/dicts/events/misc/general.json

@@ -456,7 +456,7 @@
     "season": ["any"],
     "sub_type": ["murder_reveal","LIFEGEN_no_shun"],
     "weight": 5,
-    "event_text": "r_c follows after a blue butterfly, batting at it playfully as {PRONOUN/r_c/subject} {VERB/r_c/run/runs} into the thick forest. Accidentally, t_c stumbles across m_c talking to what seems to be nothing, stating {PRONOUN/m_c/subject} murdered mur_c. r_c sneaks away before m_c could realize {PRONOUN/r_c/subject} {VERB/r_c/were/was} there, wondering if the blue butterfly really is an omen...",
+    "event_text": "r_c follows after a blue butterfly, batting at it playfully as {PRONOUN/r_c/subject} {VERB/r_c/run/runs} into the thick forest. Accidentally, r_c stumbles across m_c talking to what seems to be nothing, stating {PRONOUN/m_c/subject} murdered mur_c. r_c sneaks away before m_c could realize {PRONOUN/r_c/subject} {VERB/r_c/were/was} there, wondering if the blue butterfly really is an omen...",
     "m_c": {
         "age": ["any"],
         "status": ["any"],

resources/dicts/lifegen_talk/general_no_newborn.json

@@ -3853,7 +3853,7 @@
             "any",
             "min_plike_20",
             "they_deaf",
-            "you_deaf"
+            "only_you_deaf"
         ],
         [
             "[You rush over to t_c, overjoyed to see {PRONOUN/t_c/object} alive and well.]",
@@ -3868,10 +3868,10 @@
             "any",
             "min_plike_20",
             "they_deaf",
-            "you_deaf"
+            "only_you_deaf"
         ],
         [
-            "[You rush over to t_c, overjoyed to see {PRONOUN/t_c/object} alive and well.]",
+            "[You rush over to t_c, overjoyed to see {PRONOUN/t_c/object} once again.]",
             "[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.]"
         ]
     ]

resources/dicts/lifegen_talk/newborn.json

@@ -769,7 +769,7 @@
             "you_deaf"
         ],
         [
-            "[You can barely make out t_c, they're so deeply buried in {PRONOUN/t_c/poss} parent's nest.]"
+            "[You can barely make out t_c, {PRONOUN/t_c/subject}{VERB/t_c/'re/'s} so deeply buried in {PRONOUN/t_c/poss} parent's nest.]"
         ]
     ],
     "newborn_yourkit": [

scripts/cat/pelts.py

@@ -81,9 +81,9 @@ class Pelt:
     # make sure to add plural and singular forms of new accs to acc_display.json so that they will display nicely
     plant_accessories = ['FERNS', 'BLEEDING HEARTS2', 'BLACK WHEAT', 'LARGE DEATHBERRY', 'BERRIES', 'GOLD FERNS', 'ORANGE POPPY', 'BULB YELLOW', 'NETTLE', 'HERBS', 'CATTAIL', 'LILY OF THE VALLEY', 'SNAPDRAGON', 'ACORN2', 'BULB PINK', 'BULB BLUE', 'DRY LAURELS', 'DAISY', 'HOLLY', 'BULB WHITE', 'GORSE', 'LILYPAD', 'BLUEBELLS', 'BLUE BERRIES', 'MAPLE LEAF', 'VINE', 'LAUREL', 'RASPBERRY', 'BULB ORANGE', 'OAK LEAVES', 'FLOWER MOSS', 'CYAN POPPY', 'WHEAT', 'CHERRY2', 'LAVENDER', 'SHELL PACK', 'PINK POPPY', 'POPPY', 'CLOVER2', 'DRY NETTLES', 'RYE STALK', 'MOSS2', 'MAPLE SEED', 'FORGET ME NOTS', 'PETALS', 'MUSHROOMS', 'CLOVER', 'CATMINT', 'JUNIPER', 'WHITE POPPY', 'HEATHER', 'DRY HERBS', 'PINECONE', 'SMALL DEATHBERRY', 'DRY CATMINT', 'CLOVERS'
                         ]
-    wild_accessories = ['ORANGEBUTTERFLY', 'WHITEPOINSETTIA', 'MUD', 'JAYFEATHER', 'EGGSHELLS', 'FLOWERCROWN', 'STICKS', 'ASHY PAWS', 'CORALBELLS', 'SMALL LUNA', 'LILY', 'BLUEEGGSHELLS', 'CHERRYPLUMLEAVES', 'BROWNPELT', 'MORPHO BUTTERFLY', 'SPRINGFEATHERS', 'WOODENBIRCHANTLERS', 'DOGWOOD', 'REDCROWN', 'LADYBUG', 'GULL FEATHERS', 'EASTEREGG', 'HONEYCOMB', 'DRIEDORANGE', 'FIRBRANCHES', 'BLACK CICADA', 'GRAYPELT', 'LILIESOFTHEVALLEY', 'MONARCH BUTTERFLY', 'FORSYTHIA', 'WHITEWOOL', 'WOODDRAGON', 'YEWS', 'MUD PAWS', 'SPARROW FEATHERS', 'LARGE COMET', 'SANVITALIAFLOWERS', 'HEATHER', 'YELLOWCROWN', 'ROSY MOTH WINGS', 'TEETHCOLLAR', 'CREAMWOOL', 'SNAILSHELL', 'JAY FEATHERS', 'MINTLEAF', 'STRAWMANE', 'CHERRYBLOSSOM', 'MISTLETOE', 'ROESKULL', 'BELLFLOWERS', 'WOODENOAKANTLERS', 'EAGLEFEATHER', 'CATKIN', 'CICADA WINGS', 'BROWNMOSSPELT', 'LARGE LUNA', 'LILYPADCROWN', 'BLEEDINGHEART', 'TULIPPETALS', 'COTONEASTERWREATH', 'RED FEATHERS', 'EGG', 'BLUE FEATHERS', 'SMALL COMET', 'BLUEBUTTERFLY', 'MOREFERN', 'MOTH WINGS', 'REDPOINSETTIA', 'CLOVERFLOWER', 'SLIVERDUSTPLANT', 'PANSIES', 'GRAYMOSSPELT', 'BLACKWOOL', 'GRAYWOOL', 'FERN', "STARFLOWERS", "HEARTLEAVES", "LAVENDERHEADPIECE", "LAVENDERANKLET", "HOLLY2", "HOLLYVINES", "WINTERSTOAT", "BROWNSTOAT"]
+    wild_accessories = ['ORANGEBUTTERFLY', 'WHITEPOINSETTIA', 'MUD', 'JAYFEATHER', 'EGGSHELLS', 'FLOWERCROWN', 'STICKS', 'ASHY PAWS', 'CORALBELLS', 'SMALL LUNA', 'LILY', 'BLUEEGGSHELLS', 'CHERRYPLUMLEAVES', 'BROWNPELT', 'MORPHO BUTTERFLY', 'SPRINGFEATHERS', 'WOODENBIRCHANTLERS', 'DOGWOOD', 'REDCROWN', 'LADYBUG', 'GULL FEATHERS', 'EASTEREGG', 'HONEYCOMB', 'DRIEDORANGE', 'FIRBRANCHES', 'BLACK CICADA', 'GRAYPELT', 'LILIESOFTHEVALLEY', 'MONARCH BUTTERFLY', 'FORSYTHIA', 'WHITEWOOL', 'WOODDRAGON', 'YEWS', 'MUD PAWS', 'SPARROW FEATHERS', 'LARGE COMET', 'SANVITALIAFLOWERS', 'CALLUNA', 'YELLOWCROWN', 'ROSY MOTH WINGS', 'TEETHCOLLAR', 'CREAMWOOL', 'SNAILSHELL', 'JAY FEATHERS', 'MINTLEAF', 'STRAWMANE', 'CHERRYBLOSSOM', 'MISTLETOE', 'ROESKULL', 'BELLFLOWERS', 'WOODENOAKANTLERS', 'EAGLEFEATHER', 'CATKIN', 'CICADA WINGS', 'BROWNMOSSPELT', 'LARGE LUNA', 'LILYPADCROWN', 'BLEEDINGVINES','BLEEDINGHEART', 'TULIPPETALS', 'COTONEASTERWREATH', 'RED FEATHERS', 'EGG', 'BLUE FEATHERS', 'SMALL COMET', 'BLUEBUTTERFLY', 'MOREFERN', 'MOTH WINGS', 'REDPOINSETTIA', 'CLOVERFLOWER', 'SLIVERDUSTPLANT', 'PANSIES', 'GRAYMOSSPELT', 'BLACKWOOL', 'GRAYWOOL', 'FERN', "STARFLOWERS", "HEARTLEAVES", "LAVENDERHEADPIECE", "LAVENDERANKLET", "HOLLY2", "HOLLYVINES", "WINTERSTOAT", "BROWNSTOAT","LAVENDERTAILWRAP", "YELLOWWISTERIA"]
 
-    tail_accessories = ["RED FEATHERS", "BLUE FEATHERS", "JAY FEATHERS", "GULL FEATHERS", "SPARROW FEATHERS", "CLOVER", "DAISY","LAVENDERTAILWRAP", "YELLOWWISTERIA"]
+    tail_accessories = ["RED FEATHERS", "BLUE FEATHERS", "JAY FEATHERS", "GULL FEATHERS", "SPARROW FEATHERS", "CLOVER", "DAISY"]
     collars = [
         "CRIMSON", "BLUE", "YELLOW", "CYAN", "RED", "LIME", "GREEN", "RAINBOW",
         "BLACK", "SPIKES", "WHITE", "PINK", "PURPLE", "MULTI", "INDIGO", "CRIMSONBELL", "BLUEBELL",
@@ -98,11 +98,11 @@ class Pelt:
     ]
 
     # ohdan's accessories
-    flower_accessories = ["DAISY", "DIANTHUS", "BLEEDING HEARTS", "FRANGIPANI", "BLUE GLORY",
+    flower_accessories = ["DAISIES", "DIANTHUS", "BLEEDING HEARTS", "FRANGIPANI", "BLUE GLORY",
                           "CATNIP FLOWER", "BLANKET FLOWER", "ALLIUM", "LACELEAF", "PURPLE GLORY",
-                          "YELLOW PRIMROSE", "HESPERIS", "MARIGOLD", "WISTERIA", "PINKFLOWERCROWN", "YELLOWFLOWERCROWN", "BLUEFLOWERCROWN", "PURPLEFLOWERCROWN", "SPRINGFLOWERCORSAGE", "ORCHID", "SPRINGFLOWERS", "RADIO", "SWANFEATHER", "DRACULAPARROTFEATHER"]
+                          "YELLOW PRIMROSE", "HESPERIS", "MARIGOLD", "WISTERIA", "PINKFLOWERCROWN", "YELLOWFLOWERCROWN", "BLUEFLOWERCROWN", "PURPLEFLOWERCROWN", "ORCHID", "SPRINGFLOWERS", "RADIO", "SWANFEATHER", "DRACULAPARROTFEATHER"]
 
-    plant2_accessories = ["CLOVER", "STICK", "PUMPKIN", "MOSS", "IVY", "ACORN", "MOSS PELT", "REEDS", "BAMBOO"]
+    plant2_accessories = ["SINGULARCLOVER", "STICK", "PUMPKIN", "MOSS", "IVY", "ACORN", "MOSS PELT", "REEDS", "BAMBOO"]
 
     snake_accessories = ["GRASS SNAKE", "BLUE RACER", "WESTERN COACHWHIP", "KINGSNAKE"]
 
@@ -115,17 +115,17 @@ class Pelt:
                            "RAT", "WHITE MOUSE", "BLACK MOUSE", "GRAY MOUSE", "BROWN MOUSE",
                            "GRAY RABBIT", "GRAY AND WHITE RABBIT", "GRAY VITILIGO RABBIT"]
 
-    deadInsect_accessories = ["LUNAR MOTH", "ROSY MAPLE MOTH", "MONARCH BUTTERFLY", "DAPPLED MONARCH",
+    deadInsect_accessories = ["LUNAR MOTH", "ROSY MAPLE MOTH", "MONARCH", "DAPPLED MONARCH",
                               "POLYPHEMUS MOTH", "MINT MOTH"]
 
     aliveInsect_accessories = ["BROWN SNAIL", "RED SNAIL", "WORM", "BLUE SNAIL", "ZEBRA ISOPOD", "DUCKY ISOPOD", "DAIRY COW ISOPOD",
                                "BEETLEJUICE ISOPOD", "BEE", "RED LADYBUG", "ORANGE LADYBUG", "YELLOW LADYBUG"]
 
-    fruit_accessories = ["RASPBERRY", "BLACKBERRY", "GOLDEN RASPBERRY", "CHERRY", "YEW"]
+    fruit_accessories = ["RASPBERRY2", "BLACKBERRY", "GOLDEN RASPBERRY", "CHERRY", "YEW"]
 
     crafted_accessories = ["WILLOWBARK BAG", "CLAY DAISY POT", "CLAY AMANITA POT", "CLAY BROWNCAP POT", "BIRD SKULL", "LEAF BOW", "RAINCOAT", "POPTABS", "FAZBEAR", "WHITEBEAR", "PANDA", "BEAR", "BROWNBEAR", "TIDE", "CELESTIALCHIMES", "LUNARCHIMES", "STARCHIMES", "SILVERLUNARCHIMES", "FIDDLEHEADS", "LANTERNS", "HEARTCHARMS", "BATHARNESS", "TOAST","TOASTBERRY", "TOASTGRAPE", "TOASTNUTELLA", "TOASTPB"]
 
-    tail2_accessories = ["SEAWEED", "DAISY CORSAGE"]
+    tail2_accessories = ["SEAWEED", "DAISY CORSAGE", "SPRINGFLOWERCORSAGE"]
 
 
     tabbies = ["Tabby", "Ticked", "Mackerel", "Classic", "Sokoke", "Agouti"]

scripts/cat/sprites.py

@@ -292,14 +292,14 @@ def load_scars(self):
 
             # ohdan's accessories
         for a, i in enumerate([
-            "DAISY", "DIANTHUS", "BLEEDING HEARTS", "FRANGIPANI", "BLUE GLORY", "CATNIP FLOWER", "BLANKET FLOWER", "ALLIUM", "LACELEAF", "PURPLE GLORY"]):
+            "DAISIES", "DIANTHUS", "BLEEDING HEARTS", "FRANGIPANI", "BLUE GLORY", "CATNIP FLOWER", "BLANKET FLOWER", "ALLIUM", "LACELEAF", "PURPLE GLORY"]):
             self.make_group('flower_accessories', (a, 0), f'acc_flower{i}')
         for a, i in enumerate([
             "YELLOW PRIMROSE", "HESPERIS", "MARIGOLD", "WISTERIA"]):
             self.make_group('flower_accessories', (a, 1), f'acc_flower{i}')
 
         for a, i in enumerate([
-            "CLOVER", "STICK", "PUMPKIN", "MOSS", "IVY", "ACORN", "MOSS PELT", "REEDS", "BAMBOO"]):
+            "SINGULARCLOVER", "STICK", "PUMPKIN", "MOSS", "IVY", "ACORN", "MOSS PELT", "REEDS", "BAMBOO"]):
             self.make_group('plant2_accessories', (a, 0), f'acc_plant2{i}')
 
         for a, i in enumerate([
@@ -320,7 +320,7 @@ def load_scars(self):
             self.make_group('smallAnimal_accessories', (a, 3), f'acc_smallAnimal{i}')
 
         for a, i in enumerate([
-            "LUNAR MOTH", "ROSY MAPLE MOTH", "MONARCH BUTTERFLY", "DAPPLED MONARCH", "POLYPHEMUS MOTH", "MINT MOTH"]):
+            "LUNAR MOTH", "ROSY MAPLE MOTH", "MONARCH", "DAPPLED MONARCH", "POLYPHEMUS MOTH", "MINT MOTH"]):
             self.make_group('deadInsect_accessories', (a, 0), f'acc_deadInsect{i}')
 
         for a, i in enumerate([
@@ -331,7 +331,7 @@ def load_scars(self):
             self.make_group('aliveInsect_accessories', (a, 1), f'acc_aliveInsect{i}')
 
         for a, i in enumerate([
-            "RASPBERRY", "BLACKBERRY", "GOLDEN RASPBERRY", "CHERRY", "YEW"]):
+            "RASPBERRY2", "BLACKBERRY", "GOLDEN RASPBERRY", "CHERRY", "YEW"]):
             self.make_group('fruit_accessories', (a, 0), f'acc_fruit{i}')
 
         for a, i in enumerate([
@@ -376,7 +376,7 @@ def load_scars(self):
             "ORANGEBUTTERFLY", "BLUEBUTTERFLY", "BROWNPELT", "GRAYPELT", "BROWNMOSSPELT", "GRAYMOSSPELT"]):
             self.make_group('superartsi', (a, 0), f'acc_wild{i}')
         for a, i in enumerate([
-            "FERN", "MOREFERN", "BLEEDINGHEART", "LILY"]):
+            "FERN", "MOREFERN", "BLEEDINGVINES", "BLEEDINGHEART", "LILY"]):
             self.make_group('superartsi', (a, 1), f'acc_wild{i}')
 
         # coffee's accessories
@@ -411,7 +411,7 @@ def load_scars(self):
             "MINTLEAF","STICKS","SPRINGFEATHERS","SNAILSHELL","MUD","CHERRYPLUMLEAVES","CATKIN","HONEYCOMB","FLOWERCROWN","LILIESOFTHEVALLEY"]):
             self.make_group('springwinter', (a, 1), f'acc_wild{i}')
         for a, i in enumerate([
-            "STRAWMANE","MISTLETOE","REDPOINSETTIA","WHITEPOINSETTIA","COTONEASTERWREATH","YEWS","HEATHER","TEETHCOLLAR","DRIEDORANGE","ROESKULL"]):
+            "STRAWMANE","MISTLETOE","REDPOINSETTIA","WHITEPOINSETTIA","COTONEASTERWREATH","YEWS","CALLUNA","TEETHCOLLAR","DRIEDORANGE","ROESKULL"]):
             self.make_group('springwinter', (a, 2), f'acc_wild{i}')
         for a, i in enumerate([
             "WOODENOAKANTLERS","WOODENBIRCHANTLERS","DOGWOOD","GRAYWOOL","BLACKWOOL","CREAMWOOL","WHITEWOOL","FIRBRANCHES","CORALBELLS","SLIVERDUSTPLANT"]):