saffron finch + egg mongroup cleanup

CleverRaven · Aug 17, 2024 · 15d2105 · 15d2105
1 parent c912fa5
commit 15d2105
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 48 deletions.
diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -48,6 +48,13 @@
     "copy-from": "egg_crow",
     "rot_spawn": "GROUP_EGG_MACAW"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_finch_saffron",
+    "name": { "str": "saffron finch egg" },
+    "copy-from": "egg_waxwing",
+    "rot_spawn": "GROUP_EGG_FINCH_SAFFRON"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_tinamou",

diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json
@@ -4,140 +4,125 @@
     "type": "monstergroup",
     "default": "mon_guinea_fowl_chick",
     "monsters": [
-      { "monster": "mon_guinea_fowl_chick", "weight": 50, "cost_multiplier": 1 },
-      { "monster": "mon_quail_chick", "weight": 100, "cost_multiplier": 1 },
-      { "monster": "mon_rhea_chick", "weight": 250, "cost_multiplier": 1 }
+      { "monster": "mon_guinea_fowl_chick", "weight": 1 },
+      { "monster": "mon_quail_chick", "weight": 2 },
+      { "monster": "mon_rhea_chick", "weight": 5 }
     ]
   },
   {
     "name": "GROUP_EGG_GUINEA_FOWL",
     "type": "monstergroup",
-    "default": "mon_guinea_fowl_chick",
-    "monsters": [ { "monster": "mon_guinea_fowl_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_guinea_fowl_chick" } ]
   },
   {
     "name": "GROUP_EGG_QUAIL",
     "type": "monstergroup",
-    "default": "mon_quail_chick",
-    "monsters": [ { "monster": "mon_quail_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_quail_chick" } ]
   },
   {
     "name": "GROUP_EGG_RHEA",
     "type": "monstergroup",
-    "default": "mon_rhea_chick",
-    "monsters": [ { "monster": "mon_rhea_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_rhea_chick" } ]
   },
   {
     "name": "GROUP_EGG_TOUCAN",
     "type": "monstergroup",
-    "default": "mon_toucan_chick",
-    "monsters": [ { "monster": "mon_toucan_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_toucan_chick" } ]
   },
   {
     "name": "GROUP_EGG_PARROT",
     "type": "monstergroup",
-    "default": "mon_parrot_chick",
-    "monsters": [ { "monster": "mon_parrot_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_parrot_chick" } ]
   },
   {
     "name": "GROUP_EGG_MACAW",
     "type": "monstergroup",
-    "default": "mon_macaw_chick",
-    "monsters": [ { "monster": "mon_macaw_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_macaw_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_FINCH_SAFFRON",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_finch_saffron_chick" } ]
   },
   {
     "name": "GROUP_EGG_TINAMOU",
     "type": "monstergroup",
-    "default": "mon_tinamou_chick",
-    "monsters": [ { "monster": "mon_tinamou_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_tinamou_chick" } ]
   },
   {
     "name": "GROUP_EGG_SERIEMA",
     "type": "monstergroup",
-    "default": "mon_seriema_chick",
-    "monsters": [ { "monster": "mon_seriema_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_seriema_chick" } ]
   },
   {
     "name": "GROUP_EGG_CHACHALACA",
     "type": "monstergroup",
-    "default": "mon_chachalaca_chick",
-    "monsters": [ { "monster": "mon_chachalaca_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_chachalaca_chick" } ]
   },
   {
     "name": "GROUP_EGG_GUAN",
     "type": "monstergroup",
-    "default": "mon_guan_chick",
-    "monsters": [ { "monster": "mon_guan_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_guan_chick" } ]
   },
   {
     "name": "GROUP_EGG_CURASSOW",
     "type": "monstergroup",
-    "default": "mon_curassow_chick",
-    "monsters": [ { "monster": "mon_curassow_chick", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_curassow_chick" } ]
   },
   {
     "name": "GROUP_EGG_CONSTRICTOR",
     "type": "monstergroup",
     "default": "mon_anaconda",
     "monsters": [
-      { "monster": "mon_anaconda", "weight": 40, "cost_multiplier": 1 },
-      { "monster": "mon_python", "weight": 20, "cost_multiplier": 1 },
-      { "monster": "mon_boa", "weight": 40, "cost_multiplier": 1 }
+      { "monster": "mon_anaconda", "weight": 2 },
+      { "monster": "mon_python", "weight": 1 },
+      { "monster": "mon_boa", "weight": 2 }
     ]
   },
   {
     "name": "GROUP_EGG_LIZARD",
     "type": "monstergroup",
-    "default": "mon_beaded_lizard",
-    "monsters": [ { "monster": "mon_beaded_lizard", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_beaded_lizard" } ]
   },
   {
     "name": "GROUP_EGG_MONITOR",
     "type": "monstergroup",
-    "default": "mon_monitor_lizard",
-    "monsters": [ { "monster": "mon_monitor_lizard", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_monitor_lizard" } ]
   },
   {
     "name": "GROUP_EGG_IGUANA",
     "type": "monstergroup",
-    "default": "mon_iguana",
-    "monsters": [ { "monster": "mon_iguana", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_iguana" } ]
   },
   {
     "name": "GROUP_EGG_TURTLE",
     "type": "monstergroup",
-    "default": "mon_turtle",
-    "monsters": [ { "monster": "mon_turtle", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_turtle" } ]
   },
   {
     "name": "GROUP_EGG_SNAPPER",
     "type": "monstergroup",
-    "default": "mon_turtle_snapper",
-    "monsters": [ { "monster": "mon_turtle_snapper", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_turtle_snapper" } ]
   },
   {
     "name": "GROUP_EGG_TORTOISE",
     "type": "monstergroup",
-    "default": "mon_tortoise",
-    "monsters": [ { "monster": "mon_tortoise", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_tortoise" } ]
   },
   {
     "name": "GROUP_EGG_TERMITE",
     "type": "monstergroup",
-    "default": "mon_termite_nymph",
-    "monsters": [ { "monster": "mon_termite_nymph", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_termite_nymph" } ]
   },
   {
     "name": "GROUP_EGG_TRIFFID",
     "type": "monstergroup",
-    "default": "mon_triffid_podling",
-    "monsters": [ { "monster": "mon_triffid_podling", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_triffid_podling" } ]
   },
   {
     "name": "GROUP_EGG_FUNGUS",
     "type": "monstergroup",
-    "default": "mon_fungaloid_saproling",
-    "monsters": [ { "monster": "mon_fungaloid_saproling", "weight": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_fungaloid_saproling" } ]
   },
   {
     "name": "GROUP_EGG_SALAMANDER",

diff --git a/data/mods/TropiCataclysm/monstergroups/wilderness.json b/data/mods/TropiCataclysm/monstergroups/wilderness.json
@@ -58,6 +58,7 @@
       { "monster": "mon_tortoise_small", "weight": 3, "pack_size": [ 1, 3 ], "starts": "240 hours" },
       { "monster": "mon_tortoise_giant", "weight": 3, "pack_size": [ 1, 3 ], "starts": "480 hours" },
       { "monster": "mon_parrot", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 14 ] },
+      { "monster": "mon_finch_saffron", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
       { "monster": "mon_toucan", "weight": 2, "cost_multiplier": 0, "pack_size": [ 1, 10 ] },
       { "monster": "mon_macaw", "weight": 3, "cost_multiplier": 0, "pack_size": [ 1, 8 ] },
       { "monster": "mon_seriema", "weight": 15, "cost_multiplier": 10 },
@@ -142,6 +143,7 @@
     "is_animal": true,
     "monsters": [
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_finch_saffron", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_iguana", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_macaw", "weight": 15, "cost_multiplier": 0 }
     ]
@@ -152,6 +154,7 @@
     "is_animal": true,
     "monsters": [
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_finch_saffron", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_boa", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_gecko", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_guinea_fowl", "weight": 10, "cost_multiplier": 0 },
@@ -186,6 +189,9 @@
     "type": "monstergroup",
     "name": "GROUP_BIRDFEEDER",
     "is_animal": true,
-    "monsters": [ { "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 } ]
+    "monsters": [
+      { "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 },
+      { "monster": "mon_finch_saffron", "weight": 20, "cost_multiplier": 0 }
+    ]
   }
 ]
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -187,6 +187,24 @@
       "pet": "The %s runs around your leg."
     }
   },
+  {
+    "id": "mon_finch_saffron",
+    "type": "MONSTER",
+    "name": { "str": "saffron finch", "str_pl": "saffron finches" },
+    "description": "A small bird with bright yellow plumage, common in most of Brazil.",
+    "copy-from": "mon_bird_flying_base",
+    "color": "yellow",
+    "volume": "27 ml",
+    "weight": "20 g",
+    "reproduction": { "baby_egg": "egg_finch_saffron", "baby_count": 5, "baby_timer": 16 },
+    "//": "Values for reproduction and chick growth copied from the cedar waxwing, as no info could be found online."
+  },
+  {
+    "id": "mon_finch_saffron_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 8, "into": "mon_finch_saffron" }
+  },
   {
     "id": "mon_tinamou",
     "type": "MONSTER",

diff --git a/data/mods/TropiCataclysm/requirements.json b/data/mods/TropiCataclysm/requirements.json
@@ -2,6 +2,6 @@
   {
     "id": "eggs_bird",
     "type": "requirement",
-    "extend": { "components": [ [ [ "egg_toucan", 3 ], [ "egg_parrot", 6 ], [ "egg_macaw", 3 ] ] ] }
+    "extend": { "components": [ [ [ "egg_toucan", 3 ], [ "egg_parrot", 6 ], [ "egg_macaw", 3 ], [ "egg_finch_saffron", 20 ] ] ] }
   }
 ]