Some new reptiles (CleverRaven#75829)

* rattlesnake + abstracts * wormsnake * correct biosig for wormsnakes * Update reptile_amphibian.json * garter snake * Update reptile_amphibian.json * skink * turtles * make snappers angry if close to the player * typos are evil * destroy * handle mods * Update reptile_amphibian.json * Update default_blacklist.json * spawning * Update reptile_amphibian.json
Knut-Aage-Hofseth · Aug 29, 2024 · cb9f8d9 · cb9f8d9
1 parent 2291d9c
commit cb9f8d9
Show file tree

Hide file tree

Showing 21 changed files with 495 additions and 130 deletions.
diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json b/data/json/itemgroups/Agriculture_Forage_Excavation/forage.json
@@ -8,7 +8,6 @@
       { "item": "plant_stalk", "prob": 20, "count": [ 1, 3 ] },
       { "group": "any_wild_egg", "prob": 15, "count": [ 2, 5 ] },
       { "item": "groundnut", "prob": 5, "count": [ 1, 8 ] },
-      { "item": "egg_reptile", "prob": 5, "count": [ 2, 5 ] },
       { "item": "snail_garden", "prob": 10, "count": [ 1, 3 ] },
       { "item": "wild_garlic", "prob": 5, "count": [ 2, 7 ] },
       { "item": "rhubarb", "prob": 5, "count": [ 2, 5 ] },
@@ -34,7 +33,7 @@
       { "item": "groundnut", "prob": 3, "count": [ 1, 6 ] },
       { "group": "forage_mushroom", "prob": 25 },
       { "group": "any_wild_egg", "prob": 5, "count": [ 2, 5 ] },
-      { "item": "egg_reptile", "prob": 5, "count": [ 1, 3 ] },
+      { "group": "egg_reptile_forest", "prob": 5, "count": [ 2, 5 ] },
       { "item": "snail_garden", "prob": 10, "count": [ 1, 3 ] },
       { "item": "wild_herbs", "prob": 20, "count": 20 },
       { "item": "buckwheat", "prob": 5, "count": [ 2, 8 ] },

diff --git a/data/json/itemgroups/Labs/labs_mutagen.json b/data/json/itemgroups/Labs/labs_mutagen.json
@@ -64,7 +64,6 @@
       { "item": "slime_sample", "prob": 40, "count": [ 1, 3 ] },
       { "item": "bird_sample", "prob": 40, "count": [ 1, 3 ] },
       { "item": "crustacean_sample", "prob": 40, "count": [ 1, 3 ] },
-      { "item": "egg_reptile", "prob": 20, "count": [ 1, 12 ] },
       { "item": "water_clean", "container-item": "bottle_plastic", "prob": 65, "count": [ 1, 3 ], "sealed": false },
       { "item": "water_mineral", "container-item": "bottle_plastic", "prob": 35, "count": [ 1, 2 ], "sealed": false }
     ]

diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
@@ -357,5 +357,15 @@
     "type": "item_group",
     "id": "butterfly_net_any",
     "items": [ { "item": "butterfly_net_collapsible", "prob": 4 }, { "item": "butterfly_net_makeshift", "prob": 6 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "egg_reptile_forest",
+    "//": "Any reptile eggs that make sense to find in random underbrush, assuming that it's a fair distance away from water.",
+    "items": [
+      { "item": "egg_turtle_painted", "prob": 5 },
+      { "item": "egg_wormsnake", "prob": 2 },
+      { "item": "egg_skink_fivelined", "prob": 2 }
+    ]
   }
 ]
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -187,23 +187,39 @@
   },
   {
     "type": "COMESTIBLE",
-    "id": "egg_reptile",
-    "name": { "str": "reptile egg" },
-    "weight": "60 g",
-    "color": "white",
+    "id": "egg_wormsnake",
+    "name": { "str": "worm snake egg" },
+    "spoils_in": "23 days",
+    "copy-from": "egg_chicken",
+    "proportional": { "volume": 0.06, "weight": 0.06, "calories": 0.06 },
+    "rot_spawn": "GROUP_EGG_WORMSNAKE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_turtle_painted",
+    "name": { "str": "painted turtle egg" },
+    "spoils_in": "40 days",
+    "copy-from": "egg_chicken",
+    "proportional": { "volume": 0.25, "weight": 0.25, "calories": 0.25 },
+    "rot_spawn": "GROUP_EGG_TURTLE_PAINTED"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_turtle_snapping_common",
+    "name": { "str": "common snapping turtle egg" },
+    "spoils_in": "51 days",
+    "copy-from": "egg_chicken",
+    "proportional": { "volume": 0.25, "weight": 0.25, "calories": 0.25 },
+    "rot_spawn": "GROUP_EGG_TURTLE_SNAPPING_COMMON"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_skink_fivelined",
+    "name": { "str": "five-lined skink egg" },
     "spoils_in": "28 days",
-    "comestible_type": "FOOD",
-    "symbol": "o",
-    "quench": 3,
-    "calories": 87,
-    "description": "An egg laid by one of reptile species found in New England.",
-    "price": "62 cent",
-    "price_postapoc": "12 cent",
-    "material": [ "egg" ],
-    "volume": "62 ml",
-    "fun": -12,
-    "flags": [ "RAW" ],
-    "vitamins": [ [ "egg_allergen", 1 ] ]
+    "copy-from": "egg_chicken",
+    "proportional": { "volume": 0.06, "weight": 0.06, "calories": 0.06 },
+    "rot_spawn": "GROUP_EGG_SKINK_FIVELINED"
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
@@ -103,6 +103,26 @@
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_pheasant_chick" } ]
   },
+  {
+    "name": "GROUP_EGG_WORMSNAKE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_wormsnake_baby" } ]
+  },
+  {
+    "name": "GROUP_EGG_TURTLE_PAINTED",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_turtle_painted_baby" } ]
+  },
+  {
+    "name": "GROUP_EGG_TURTLE_SNAPPING_COMMON",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_turtle_snapping_common_baby" } ]
+  },
+  {
+    "name": "GROUP_EGG_SKINK_FIVELINED",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_skink_fivelined_baby" } ]
+  },
   {
     "name": "GROUP_EGG_ROACH",
     "type": "monstergroup",

diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
@@ -292,7 +292,6 @@
       { "monster": "mon_opossum", "weight": 10 },
       { "monster": "mon_sewer_rat", "weight": 10 },
       { "monster": "mon_black_rat", "weight": 10 },
-      { "monster": "mon_rattlesnake", "weight": 10 },
       { "group": "GROUP_COWS", "weight": 10 },
       { "group": "GROUP_HORSES", "weight": 10 },
       { "group": "GROUP_PIGS", "weight": 10 },
@@ -335,8 +334,6 @@
       { "monster": "mon_black_rat", "weight": 100 },
       { "monster": "mon_opossum", "weight": 15 },
       { "monster": "mon_raccoon", "weight": 15 },
-      { "monster": "mon_rattlesnake", "weight": 10 },
-      { "monster": "mon_rattlesnake_giant", "weight": 5, "cost_multiplier": 2 },
       { "group": "GROUP_WORM", "weight": 20 },
       { "monster": "mon_wasp_small", "weight": 10 }
     ]

diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
@@ -115,8 +115,8 @@
         "starts": "90 days"
       },
       {
-        "monster": "mon_rattlesnake",
-        "weight": 3,
+        "group": "GROUP_WILDERNESS_FOREST_REPTILE",
+        "weight": 10,
         "cost_multiplier": 5,
         "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
       },
@@ -215,6 +215,18 @@
       { "monster": "mon_woodpecker", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 3 ] }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_WILDERNESS_FOREST_REPTILE",
+    "default": "mon_null",
+    "is_animal": true,
+    "monsters": [
+      { "monster": "mon_rattlesnake", "weight": 3 },
+      { "monster": "mon_gartersnake", "weight": 10 },
+      { "monster": "mon_wormsnake", "weight": 5 },
+      { "monster": "mon_skink_fivelined", "weight": 2, "pack_size": [ 1, 2 ] }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_WILDERNESS_FOREST_INSECT_HARMLESS",
@@ -457,9 +469,20 @@
       { "group": "GROUP_SNAIL", "weight": 15, "cost_multiplier": 2, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
       { "group": "GROUP_TADPOLES_SWAMP", "weight": 100, "pack_size": [ 3, 6 ] },
       { "group": "GROUP_FROGS_SWAMP", "weight": 100, "pack_size": [ 1, 3 ] },
+      { "group": "GROUP_WILDERNESS_FRESHWATER_REPTILE", "weight": 85, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
       { "group": "GROUP_MUTAFROGS_SWAMP", "weight": 75, "starts": "7 days" }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_WILDERNESS_FRESHWATER_REPTILE",
+    "default": "mon_null",
+    "is_animal": true,
+    "monsters": [
+      { "monster": "mon_turtle_painted", "weight": 15, "pack_size": [ 1, 5 ] },
+      { "monster": "mon_turtle_snapping_common", "weight": 5 }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_WILDERNESS_SWAMP_INSECT",
@@ -554,7 +577,13 @@
       { "group": "GROUP_RABBIT_WILD", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_squirrel_red", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_squirrel", "weight": 50, "cost_multiplier": 0 },
-      { "group": "GROUP_FROGS_ALL", "weight": 100, "cost_multiplier": 0 }
+      { "group": "GROUP_FROGS_ALL", "weight": 100, "cost_multiplier": 0 },
+      {
+        "group": "GROUP_WILDERNESS_FRESHWATER_REPTILE",
+        "weight": 10,
+        "cost_multiplier": 0,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      }
     ]
   },
   {
@@ -617,7 +646,8 @@
       { "group": "GROUP_STREAM_SMALL", "weight": 30 },
       { "group": "GROUP_STREAM_BIRDS", "weight": 30 },
       { "group": "GROUP_STREAM_DOMESTIC", "weight": 2 },
-      { "group": "GROUP_FROGS_ALL", "weight": 20 }
+      { "group": "GROUP_FROGS_ALL", "weight": 20 },
+      { "group": "GROUP_WILDERNESS_FRESHWATER_REPTILE", "weight": 10, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }
     ]
   },
   {