Merge pull request #76817 from Karol1223/crimes-against-birds

[TropiCata] Audit the remaining birds
CleverRaven · Dec 8, 2024 · 545788c · 545788c
2 parents 2f0f0a0 + bb6e15b
commit 545788c
Show file tree

Hide file tree

Showing 8 changed files with 141 additions and 273 deletions.
diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json
@@ -37,7 +37,6 @@
       "HEARS",
       "ANIMAL",
       "PATH_AVOID_DANGER",
-      "PATH_AVOID_FIRE",
       "WARM",
       "FLIES",
       "SWARMS",

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -1,100 +1,95 @@
 [
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_quail",
-    "name": "quail egg",
-    "copy-from": "egg_guinea_fowl",
-    "rot_spawn": { "group": "GROUP_EGG_QUAIL" }
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_rhea",
-    "name": "rhea egg",
-    "copy-from": "egg_guinea_fowl",
-    "volume": "600 ml",
-    "weight": "600 g",
-    "calories": 1000,
-    "rot_spawn": { "group": "GROUP_EGG_RHEA" }
+    "name": { "str": "greater rhea egg" },
+    "spoils_in": "25 days",
+    "copy-from": "egg_chicken",
+    "proportional": { "volume": 12, "weight": 12, "calories": 12 },
+    "rot_spawn": { "monster": "mon_rhea_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_toucan",
     "name": { "str": "toco toucan egg" },
     "spoils_in": "9 days",
     "copy-from": "egg_crow",
-    "rot_spawn": { "group": "GROUP_EGG_TOUCAN" }
+    "rot_spawn": { "monster": "mon_toucan_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_parrot",
     "name": { "str": "white-eyed parakeet egg" },
     "spoils_in": "13 days",
     "copy-from": "egg_bluejay",
-    "rot_spawn": { "group": "GROUP_EGG_PARROT" }
+    "rot_spawn": { "monster": "mon_parrot_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_macaw",
     "name": { "str": "blue-and-yellow macaw egg" },
     "spoils_in": "13 days",
     "copy-from": "egg_crow",
-    "rot_spawn": { "group": "GROUP_EGG_MACAW" }
+    "rot_spawn": { "monster": "mon_macaw_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_finch_saffron",
     "name": { "str": "saffron finch egg" },
     "copy-from": "egg_waxwing",
-    "rot_spawn": { "group": "GROUP_EGG_FINCH_SAFFRON" }
+    "rot_spawn": { "monster": "mon_finch_saffron_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_great_kiskadee",
     "name": { "str": "great kiskadee egg" },
     "copy-from": "egg_bluejay",
-    "rot_spawn": { "group": "GROUP_EGG_GREAT_KISKADEE" }
+    "rot_spawn": { "monster": "mon_great_kiskadee_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_rufous_hornero",
     "name": { "str": "rufous hornero egg" },
     "copy-from": "egg_waxwing",
-    "rot_spawn": { "group": "GROUP_EGG_RUFOUS_HORNERO" }
+    "rot_spawn": { "monster": "mon_rufous_hornero_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_tinamou",
-    "name": "tinamou egg",
-    "copy-from": "egg_chicken",
-    "rot_spawn": { "group": "GROUP_EGG_TINAMOU", "chance": 70 }
+    "name": { "str": "small-billed tinamou egg" },
+    "copy-from": "egg_bluejay",
+    "rot_spawn": { "monster": "mon_tinamou_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_seriema",
-    "name": "seriema egg",
-    "copy-from": "egg_chicken",
-    "rot_spawn": { "group": "GROUP_EGG_SERIEMA", "chance": 70 }
+    "name": { "str": "red-legged seriema egg" },
+    "spoils_in": "15 days",
+    "copy-from": "egg_guinea_fowl",
+    "rot_spawn": { "monster": "mon_seriema_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_chachalaca",
-    "name": "chachalaca egg",
-    "copy-from": "egg_chicken",
-    "rot_spawn": { "group": "GROUP_EGG_CHACHALACA", "chance": 70 }
+    "name": { "str": "Chaco chachalaca egg" },
+    "spoils_in": "12 days",
+    "copy-from": "egg_crow",
+    "rot_spawn": { "monster": "mon_chachalaca_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_guan",
-    "name": "guan egg",
+    "name": { "str": "dusky-legged guan egg" },
+    "spoils_in": "14 days",
     "copy-from": "egg_chicken",
-    "rot_spawn": { "group": "GROUP_EGG_GUAN", "chance": 70 }
+    "rot_spawn": { "monster": "mon_guan_chick" }
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_curassow",
-    "name": "curassow egg",
-    "copy-from": "egg_chicken",
-    "rot_spawn": { "group": "GROUP_EGG_CURASSOW", "chance": 70 }
+    "name": { "str": "bare-faced curassow egg" },
+    "copy-from": "egg_crow",
+    "rot_spawn": { "monster": "mon_curassow_chick" }
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json
@@ -1,69 +1,4 @@
 [
-  {
-    "name": "GROUP_EGG_QUAIL",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_quail_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_RHEA",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_rhea_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_TOUCAN",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_toucan_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_PARROT",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_parrot_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_MACAW",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_macaw_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_FINCH_SAFFRON",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_finch_saffron_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_GREAT_KISKADEE",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_great_kiskadee_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_RUFOUS_HORNERO",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_rufous_hornero_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_TINAMOU",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_tinamou_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_SERIEMA",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_seriema_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_CHACHALACA",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_chachalaca_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_GUAN",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_guan_chick" } ]
-  },
-  {
-    "name": "GROUP_EGG_CURASSOW",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_curassow_chick" } ]
-  },
   {
     "name": "GROUP_EGG_CONSTRICTOR",
     "type": "monstergroup",

diff --git a/data/mods/TropiCataclysm/monstergroups/misc.json b/data/mods/TropiCataclysm/monstergroups/misc.json
@@ -7,8 +7,7 @@
     "monsters": [
       { "monster": "mon_llama", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] },
       { "monster": "mon_camel", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 4 ] },
-      { "monster": "mon_guinea_pig", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] },
-      { "monster": "mon_quail", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 16 ] }
+      { "monster": "mon_guinea_pig", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] }
     ]
   },
   {
@@ -21,7 +20,6 @@
       { "monster": "mon_capybara", "weight": 10 },
       { "monster": "mon_guinea_pig", "weight": 10 },
       { "monster": "mon_bushdog", "weight": 10 },
-      { "monster": "mon_quail", "weight": 10 },
       { "monster": "mon_camel", "weight": 10 },
       { "monster": "mon_boa", "weight": 10 },
       { "monster": "mon_anaconda", "weight": 10 }

diff --git a/data/mods/TropiCataclysm/monstergroups/wilderness.json b/data/mods/TropiCataclysm/monstergroups/wilderness.json
@@ -37,7 +37,6 @@
       { "monster": "mon_guinea_pig", "weight": 12, "cost_multiplier": 2, "pack_size": [ 1, 6 ] },
       { "monster": "mon_rhea", "weight": 12, "cost_multiplier": 2, "pack_size": [ 1, 10 ] },
       { "monster": "mon_kangaroo_wallaby", "weight": 12, "cost_multiplier": 2, "pack_size": [ 1, 10 ] },
-      { "monster": "mon_quail", "weight": 15, "cost_multiplier": 0, "pack_size": [ 1, 7 ] },
       { "monster": "mon_iguana", "weight": 15, "cost_multiplier": 10 },
       { "monster": "mon_basiliscus", "weight": 15, "cost_multiplier": 10 },
       { "monster": "mon_corytophanes", "weight": 15, "cost_multiplier": 10 },