From 009bd5e2e92414a315d822fb9ad2415b6ec8e773 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 10:52:28 +0200
Subject: [PATCH 01/10] obsoletion

---
 .../TropiCataclysm/items/comestibles/egg.json |  24 ----
 .../TropiCataclysm/monstergroups/eggs.json    |  18 ---
 .../monstergroups/wilderness.json             |  23 +---
 .../monsters/tropical_bird.json               | 126 ------------------
 .../migration_items.json                      |  17 +++
 5 files changed, 18 insertions(+), 190 deletions(-)
 create mode 100644 data/mods/TropiCataclysm/obsoletion_and_migration_0.I/migration_items.json

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index 4425204b52800..4cfbfd93fcdc3 100644
--- a/data/mods/TropiCataclysm/items/comestibles/egg.json
+++ b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -40,22 +40,6 @@
     "rot_spawn": "GROUP_EGG_PARROT",
     "rot_spawn_chance": 70
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_budgerigar",
-    "name": "budgerigar egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_BUDGERIGAR",
-    "rot_spawn_chance": 70
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_cockatoo",
-    "name": "cockatoo egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_COCKATOO",
-    "rot_spawn_chance": 70
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_macaw",
@@ -104,14 +88,6 @@
     "rot_spawn": "GROUP_EGG_CURASSOW",
     "rot_spawn_chance": 70
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_flamingo",
-    "name": "flamingo egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_FLAMINGO",
-    "rot_spawn_chance": 70
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_constrictor",
diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json
index 215a19d3086ae..86deff3bc4b63 100644
--- a/data/mods/TropiCataclysm/monstergroups/eggs.json
+++ b/data/mods/TropiCataclysm/monstergroups/eggs.json
@@ -39,18 +39,6 @@
     "default": "mon_parrot_chick",
     "monsters": [ { "monster": "mon_parrot_chick", "weight": 100, "cost_multiplier": 1 } ]
   },
-  {
-    "name": "GROUP_EGG_BUDGERIGAR",
-    "type": "monstergroup",
-    "default": "mon_budgerigar_chick",
-    "monsters": [ { "monster": "mon_budgerigar_chick", "weight": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_COCKATOO",
-    "type": "monstergroup",
-    "default": "mon_cockatoo_chick",
-    "monsters": [ { "monster": "mon_cockatoo_chick", "weight": 100, "cost_multiplier": 1 } ]
-  },
   {
     "name": "GROUP_EGG_MACAW",
     "type": "monstergroup",
@@ -87,12 +75,6 @@
     "default": "mon_curassow_chick",
     "monsters": [ { "monster": "mon_curassow_chick", "weight": 100, "cost_multiplier": 1 } ]
   },
-  {
-    "name": "GROUP_EGG_FLAMINGO",
-    "type": "monstergroup",
-    "default": "mon_flamingo_chick",
-    "monsters": [ { "monster": "mon_flamingo_chick", "weight": 100, "cost_multiplier": 1 } ]
-  },
   {
     "name": "GROUP_EGG_CONSTRICTOR",
     "type": "monstergroup",
diff --git a/data/mods/TropiCataclysm/monstergroups/wilderness.json b/data/mods/TropiCataclysm/monstergroups/wilderness.json
index 4eafca1068aa8..d8a4dccfc0fb5 100644
--- a/data/mods/TropiCataclysm/monstergroups/wilderness.json
+++ b/data/mods/TropiCataclysm/monstergroups/wilderness.json
@@ -58,9 +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_budgerigar", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 14 ] },
       { "monster": "mon_toucan", "weight": 2, "cost_multiplier": 0, "pack_size": [ 1, 10 ] },
-      { "monster": "mon_cockatoo", "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 },
       { "monster": "mon_tinamou", "weight": 12, "cost_multiplier": 2, "pack_size": [ 1, 6 ] },
@@ -77,7 +75,6 @@
     "monsters": [
       { "monster": "mon_coypus", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
       { "monster": "mon_turtle", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_flamingo", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
       { "monster": "mon_capybara", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
       { "monster": "mon_caiman", "weight": 10, "cost_multiplier": 5 },
       { "monster": "mon_crocodile", "weight": 10, "cost_multiplier": 5 },
@@ -142,27 +139,21 @@
   {
     "type": "monstergroup",
     "name": "GROUP_PARK_ANIMAL",
-    "//": "Current SPRING first DAY count is 425.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_budgerigar", "weight": 35, "cost_multiplier": 0 },
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_iguana", "weight": 25, "cost_multiplier": 0 },
-      { "monster": "mon_cockatoo", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_macaw", "weight": 15, "cost_multiplier": 0 }
     ]
   },
   {
     "type": "monstergroup",
     "name": "GROUP_ROOF_ANIMAL",
-    "//": "Current SPRING first DAY count is 350.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_budgerigar", "weight": 45, "cost_multiplier": 0 },
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_boa", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_gecko", "weight": 25, "cost_multiplier": 0 },
-      { "monster": "mon_cockatoo", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_guinea_fowl", "weight": 10, "cost_multiplier": 0 },
       { "monster": "mon_macaw", "weight": 10, "cost_multiplier": 0 },
       {
@@ -191,22 +182,10 @@
       { "monster": "mon_anaconda", "weight": 40, "cost_multiplier": 0 }
     ]
   },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_POND_BIRD",
-    "default": "mon_null",
-    "is_animal": true,
-    "monsters": [ { "monster": "mon_flamingo", "weight": 50, "cost_multiplier": 0 } ]
-  },
   {
     "type": "monstergroup",
     "name": "GROUP_BIRDFEEDER",
-    "//": "Current count is 225.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "is_animal": true,
-    "monsters": [
-      { "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 },
-      { "monster": "mon_cockatoo", "weight": 35, "cost_multiplier": 0 },
-      { "monster": "mon_budgerigar", "weight": 50, "cost_multiplier": 0 }
-    ]
+    "monsters": [ { "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 } ]
   }
 ]
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index a8db6cf76d971..86a53d296067c 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -184,74 +184,6 @@
     },
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
   },
-  {
-    "id": "mon_cockatoo",
-    "type": "MONSTER",
-    "name": { "str": "cockatoo" },
-    "description": "A small to medium bird with bright colored plumage and a short hooked beak.  These relatives of parrots originate from Indonesia and Oceania, and are well known for their antics and head plumage.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "400 ml",
-    "weight": "400 g",
-    "hp": 10,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "harvest": "bird_small",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_cockatoo", "baby_count": 5, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "petfood": {
-      "food": [ "BIRDFOOD" ],
-      "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
-      "pet": "The %s runs around your leg."
-    },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
-  },
-  {
-    "id": "mon_budgerigar",
-    "type": "MONSTER",
-    "name": { "str": "budgerigar" },
-    "description": "A small bird with with bright colored plumage and a short hooked beak.  These small relatives of the parrot come from Australia but were domesticated worldwide as pets.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "180 ml",
-    "weight": "35 g",
-    "hp": 5,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "harvest": "bird_tiny",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_budgerigar", "baby_count": 5, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "petfood": {
-      "food": [ "BIRDFOOD" ],
-      "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
-      "pet": "The %s runs around your leg."
-    },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
-  },
   {
     "id": "mon_macaw",
     "type": "MONSTER",
@@ -304,24 +236,6 @@
     "weight": "15 g",
     "upgrades": { "age_grow": 11, "into": "mon_parrot" }
   },
-  {
-    "id": "mon_budgerigar_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_crow_chick",
-    "name": { "str": "brown chick" },
-    "volume": "160 ml",
-    "weight": "10 g",
-    "upgrades": { "age_grow": 11, "into": "mon_budgerigar" }
-  },
-  {
-    "id": "mon_cockatoo_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_crow_chick",
-    "name": { "str": "brown chick" },
-    "volume": "200 ml",
-    "weight": "15 g",
-    "upgrades": { "age_grow": 11, "into": "mon_cockatoo" }
-  },
   {
     "id": "mon_macaw_chick",
     "type": "MONSTER",
@@ -460,45 +374,5 @@
     "copy-from": "mon_chicken_chick",
     "name": { "str": "brown chick" },
     "upgrades": { "age_grow": 10, "into": "mon_seriema" }
-  },
-  {
-    "id": "mon_flamingo",
-    "type": "MONSTER",
-    "name": { "str": "flamingo" },
-    "description": "A medium to large bird with white and pink plumage.  They can be found on both hemispheres living around shallow waters rich on plankton and small crustaceans.",
-    "default_faction": "small_animal",
-    "bodytype": "bird",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "28 L",
-    "weight": "2800 g",
-    "hp": 30,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "f",
-    "color": "pink",
-    "aggression": -10,
-    "morale": 25,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "dodge": 3,
-    "harvest": "bird_large",
-    "vision_day": 50,
-    "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_flamingo", "baby_count": 1, "baby_timer": 10 },
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS" ]
-  },
-  {
-    "id": "mon_flamingo_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_duck_chick",
-    "name": { "str": "flamingo chick" },
-    "description": "A baby flamingo covered in fuzzy plumage.  Unlike their parents they are born gray or white and obtain their pink color as they grow feeding on crustaceans.",
-    "volume": "280 ml",
-    "weight": "280 g",
-    "color": "light_gray",
-    "upgrades": { "age_grow": 16, "into": "mon_flamingo" }
   }
 ]
diff --git a/data/mods/TropiCataclysm/obsoletion_and_migration_0.I/migration_items.json b/data/mods/TropiCataclysm/obsoletion_and_migration_0.I/migration_items.json
new file mode 100644
index 0000000000000..aea58015da2ae
--- /dev/null
+++ b/data/mods/TropiCataclysm/obsoletion_and_migration_0.I/migration_items.json
@@ -0,0 +1,17 @@
+[
+  {
+    "id": "egg_budgerigar",
+    "type": "MIGRATION",
+    "replace": "egg_parrot"
+  },
+  {
+    "id": "egg_cockatoo",
+    "type": "MIGRATION",
+    "replace": "egg_parrot"
+  },
+  {
+    "id": "egg_flamingo",
+    "type": "MIGRATION",
+    "replace": "egg_duck"
+  }
+]

From f012eb1eabae5de94ae55e12e166e5aed23c40be Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 11:16:51 +0200
Subject: [PATCH 02/10] toucan

---
 .../TropiCataclysm/items/comestibles/egg.json |  8 ++--
 .../monsters/tropical_bird.json               | 46 ++++++-------------
 data/mods/TropiCataclysm/requirements.json    |  7 +++
 3 files changed, 25 insertions(+), 36 deletions(-)
 create mode 100644 data/mods/TropiCataclysm/requirements.json

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index 4cfbfd93fcdc3..d2f8e3e97050c 100644
--- a/data/mods/TropiCataclysm/items/comestibles/egg.json
+++ b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -27,10 +27,10 @@
   {
     "type": "COMESTIBLE",
     "id": "egg_toucan",
-    "name": "toucan egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_TOUCAN",
-    "rot_spawn_chance": 70
+    "name": { "str": "toco toucan egg" },
+    "spoils_in": "18 days",
+    "copy-from": "egg_crow",
+    "rot_spawn": "GROUP_EGG_TOUCAN"
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index 86a53d296067c..3a1a2586a3d3f 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -124,31 +124,22 @@
   {
     "id": "mon_toucan",
     "type": "MONSTER",
-    "name": { "str": "toucan" },
-    "description": "A small bird with dark plumage and a bright colored face and beak.  These tropical birds can be found all around the Americas feeding on fruits and seeds.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
+    "name": { "str": "toco toucan" },
+    "description": "The largest species of toucan sporting dark plumage and a bright colored beak.  This bird can be found pretty much all over South America, feeding on fruits and seeds.",
+    "copy-from": "mon_bird_flying_base",
     "species": [ "BIRD" ],
-    "volume": "400 ml",
-    "weight": "400 g",
-    "hp": 10,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
+    "volume": "867 ml",
+    "weight": "650 g",
+    "hp": 6,
     "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "harvest": "bird_small",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_toucan", "baby_count": 5, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS" ]
+    "reproduction": { "baby_egg": "egg_toucan", "baby_count": 4, "baby_timer": 63 }
+  },
+  {
+    "id": "mon_toucan_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_generic_chick",
+    "upgrades": { "age_grow": 35, "into": "mon_toucan" },
+    "//": "Copied from the vanilla corvids. ~8 weeks to fledge, but couldn't find any info on how long it takes for them to reach adult size. Sexual maturity is a bad metric as they reach it very late, at 3-4 years of age."
   },
   {
     "id": "mon_parrot",
@@ -218,15 +209,6 @@
     },
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
   },
-  {
-    "id": "mon_toucan_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_crow_chick",
-    "name": { "str": "brown chick" },
-    "volume": "200 ml",
-    "weight": "15 g",
-    "upgrades": { "age_grow": 11, "into": "mon_toucan" }
-  },
   {
     "id": "mon_parrot_chick",
     "type": "MONSTER",
diff --git a/data/mods/TropiCataclysm/requirements.json b/data/mods/TropiCataclysm/requirements.json
new file mode 100644
index 0000000000000..b626e04b93762
--- /dev/null
+++ b/data/mods/TropiCataclysm/requirements.json
@@ -0,0 +1,7 @@
+[
+  {
+    "id": "eggs_bird",
+    "type": "requirement",
+    "extend": { "components": [ [ [ "egg_toucan", 3 ] ] ] }
+  }
+]

From 1d94481461851b77b4e46669181ca18b99a82f8b Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 11:35:12 +0200
Subject: [PATCH 03/10] parakeet

---
 .../TropiCataclysm/items/comestibles/egg.json | 10 ++--
 .../monsters/tropical_bird.json               | 50 ++++++-------------
 data/mods/TropiCataclysm/requirements.json    |  2 +-
 3 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index d2f8e3e97050c..9a2eab2a7d340 100644
--- a/data/mods/TropiCataclysm/items/comestibles/egg.json
+++ b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -28,17 +28,17 @@
     "type": "COMESTIBLE",
     "id": "egg_toucan",
     "name": { "str": "toco toucan egg" },
-    "spoils_in": "18 days",
+    "spoils_in": "9 days",
     "copy-from": "egg_crow",
     "rot_spawn": "GROUP_EGG_TOUCAN"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_parrot",
-    "name": "parrot egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_PARROT",
-    "rot_spawn_chance": 70
+    "name": { "str": "white-eyed parakeet egg" },
+    "spoils_in": "13 days",
+    "copy-from": "egg_bluejay",
+    "rot_spawn": "GROUP_EGG_PARROT"
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index 3a1a2586a3d3f..dc23d7439a38e 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -144,36 +144,25 @@
   {
     "id": "mon_parrot",
     "type": "MONSTER",
-    "name": { "str": "parrot" },
-    "description": "A small to medium bird with bright colored plumage and a short hooked beak.  These birds are considered to be quite intelligent and have been domesticated heavily as pets.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "400 ml",
-    "weight": "400 g",
-    "hp": 10,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "harvest": "bird_small",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_parrot", "baby_count": 5, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
+    "name": { "str": "white-eyed parakeet" },
+    "description": "A small bird with bright green-colored plumage and a short hooked beak.  This species is widespread throughout all of South America, on top of being quite intelligent and sometimes kept as pets.",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "220 ml",
+    "weight": "165 g",
+    "color": "light_green",
+    "reproduction": { "baby_egg": "egg_parrot", "baby_count": 3, "baby_timer": 38 }
+  },
+  {
+    "id": "mon_parrot_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 12, "into": "mon_parrot" },
+    "//": "12 days to reach independence. Use the default multiplier of 4 to our advantage to get a rough estimate of reaching adult size.",
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
       "pet": "The %s runs around your leg."
-    },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
+    }
   },
   {
     "id": "mon_macaw",
@@ -209,15 +198,6 @@
     },
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
   },
-  {
-    "id": "mon_parrot_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_crow_chick",
-    "name": { "str": "brown chick" },
-    "volume": "200 ml",
-    "weight": "15 g",
-    "upgrades": { "age_grow": 11, "into": "mon_parrot" }
-  },
   {
     "id": "mon_macaw_chick",
     "type": "MONSTER",
diff --git a/data/mods/TropiCataclysm/requirements.json b/data/mods/TropiCataclysm/requirements.json
index b626e04b93762..8f68dc4f9d147 100644
--- 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 ] ] ] }
+    "extend": { "components": [ [ [ "egg_toucan", 3 ], [ "egg_parrot", 6 ] ] ] }
   }
 ]

From 37d0cb3797718ed49e0f7110b729ea2f4812090c Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 11:46:40 +0200
Subject: [PATCH 04/10] macaw

---
 .../TropiCataclysm/items/comestibles/egg.json |  8 +--
 .../monsters/tropical_bird.json               | 51 ++++++-------------
 data/mods/TropiCataclysm/requirements.json    |  2 +-
 3 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index 9a2eab2a7d340..77665844b78bc 100644
--- a/data/mods/TropiCataclysm/items/comestibles/egg.json
+++ b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -43,10 +43,10 @@
   {
     "type": "COMESTIBLE",
     "id": "egg_macaw",
-    "name": "macaw egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_MACAW",
-    "rot_spawn_chance": 70
+    "name": { "str": "blue-and-yellow macaw egg" },
+    "spoils_in": "13 days",
+    "copy-from": "egg_crow",
+    "rot_spawn": "GROUP_EGG_MACAW"
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index dc23d7439a38e..5441a973e1a69 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -167,45 +167,26 @@
   {
     "id": "mon_macaw",
     "type": "MONSTER",
-    "name": { "str": "macaw" },
-    "description": "A medium to large bird with bright colored plumage and a short hooked beak.  These are the largest flying parrots in the world, living usually in the thickest rainforests.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "1000 ml",
-    "weight": "900 g",
-    "hp": 25,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "harvest": "bird_small",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_macaw", "baby_count": 5, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "petfood": {
-      "food": [ "BIRDFOOD" ],
-      "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
-      "pet": "The %s runs around your leg."
-    },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
+    "name": { "str": "blue-and-yellow macaw" },
+    "description": "A large parrot sporting beautiful blue plumage.  Intelligent and often kept as a pet.",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "1800 ml",
+    "weight": "1350 g",
+    "hp": 8,
+    "color": "light_blue",
+    "reproduction": { "baby_egg": "egg_macaw", "baby_count": 3, "baby_timer": 116 }
   },
   {
     "id": "mon_macaw_chick",
     "type": "MONSTER",
-    "copy-from": "mon_crow_chick",
-    "name": { "str": "brown chick" },
-    "volume": "240 ml",
-    "weight": "20 g",
-    "upgrades": { "age_grow": 11, "into": "mon_macaw" }
+    "copy-from": "mon_generic_chick",
+    "upgrades": { "age_grow": 23, "into": "mon_macaw" },
+    "//": "3 months to reach independence.",
+    "petfood": {
+      "food": [ "BIRDFOOD" ],
+      "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
+      "pet": "The %s runs around your leg."
+    }
   },
   {
     "id": "mon_tinamou",
diff --git a/data/mods/TropiCataclysm/requirements.json b/data/mods/TropiCataclysm/requirements.json
index 8f68dc4f9d147..06892cc85314a 100644
--- 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 ] ] ] }
+    "extend": { "components": [ [ [ "egg_toucan", 3 ], [ "egg_parrot", 6 ], [ "egg_macaw", 3 ] ] ] }
   }
 ]

From c912fa5042ab95fa8ab4b1dbfd3baa9c4be7f623 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 12:01:50 +0200
Subject: [PATCH 05/10] useless field

---
 data/mods/TropiCataclysm/monsters/tropical_bird.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index 5441a973e1a69..61f4137b3276a 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -127,7 +127,6 @@
     "name": { "str": "toco toucan" },
     "description": "The largest species of toucan sporting dark plumage and a bright colored beak.  This bird can be found pretty much all over South America, feeding on fruits and seeds.",
     "copy-from": "mon_bird_flying_base",
-    "species": [ "BIRD" ],
     "volume": "867 ml",
     "weight": "650 g",
     "hp": 6,

From 15d2105a0d7d58ba3165f5a2a2fa3669278ed3da Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 12:37:51 +0200
Subject: [PATCH 06/10] saffron finch + egg mongroup cleanup

---
 .../TropiCataclysm/items/comestibles/egg.json |  7 ++
 .../TropiCataclysm/monstergroups/eggs.json    | 77 ++++++++-----------
 .../monstergroups/wilderness.json             |  8 +-
 .../monsters/tropical_bird.json               | 18 +++++
 data/mods/TropiCataclysm/requirements.json    |  2 +-
 5 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index 77665844b78bc..b813a0f62b4fe 100644
--- 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
index 86deff3bc4b63..73c3c65a7e224 100644
--- 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
index d8a4dccfc0fb5..e31c644f05c19 100644
--- 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
index 61f4137b3276a..27fd9a845492e 100644
--- 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
index 06892cc85314a..8d79bc3f4bdbf 100644
--- 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 ] ] ] }
   }
 ]

From a8d03ffa24ca831ead0165d76064983d1f568f5e Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 13:03:34 +0200
Subject: [PATCH 07/10] kiskadee

---
 .../TropiCataclysm/items/comestibles/egg.json  |  7 +++++++
 .../TropiCataclysm/monstergroups/eggs.json     |  5 +++++
 .../monstergroups/wilderness.json              |  6 +++++-
 .../TropiCataclysm/monsters/tropical_bird.json | 18 ++++++++++++++++++
 data/mods/TropiCataclysm/requirements.json     | 12 +++++++++++-
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index b813a0f62b4fe..0aa0c057c3710 100644
--- a/data/mods/TropiCataclysm/items/comestibles/egg.json
+++ b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -55,6 +55,13 @@
     "copy-from": "egg_waxwing",
     "rot_spawn": "GROUP_EGG_FINCH_SAFFRON"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_great_kiskadee",
+    "name": { "str": "great kiskadee egg" },
+    "copy-from": "egg_bluejay",
+    "rot_spawn": "GROUP_EGG_GREAT_KISKADEE"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_tinamou",
diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json
index 73c3c65a7e224..9f349ccdf2735 100644
--- a/data/mods/TropiCataclysm/monstergroups/eggs.json
+++ b/data/mods/TropiCataclysm/monstergroups/eggs.json
@@ -44,6 +44,11 @@
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_finch_saffron_chick" } ]
   },
+  {
+    "name": "GROUP_EGG_GREAT_KISKADEE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_great_kiskadee_chick" } ]
+  },
   {
     "name": "GROUP_EGG_TINAMOU",
     "type": "monstergroup",
diff --git a/data/mods/TropiCataclysm/monstergroups/wilderness.json b/data/mods/TropiCataclysm/monstergroups/wilderness.json
index e31c644f05c19..2023ed32da486 100644
--- a/data/mods/TropiCataclysm/monstergroups/wilderness.json
+++ b/data/mods/TropiCataclysm/monstergroups/wilderness.json
@@ -59,6 +59,7 @@
       { "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_great_kiskadee", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "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 },
@@ -144,6 +145,7 @@
     "monsters": [
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_finch_saffron", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_great_kiskadee", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_iguana", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_macaw", "weight": 15, "cost_multiplier": 0 }
     ]
@@ -155,6 +157,7 @@
     "monsters": [
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_finch_saffron", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_great_kiskadee", "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 },
@@ -191,7 +194,8 @@
     "is_animal": true,
     "monsters": [
       { "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 },
-      { "monster": "mon_finch_saffron", "weight": 20, "cost_multiplier": 0 }
+      { "monster": "mon_finch_saffron", "weight": 20, "cost_multiplier": 0 },
+      { "monster": "mon_great_kiskadee", "weight": 15, "cost_multiplier": 0 }
     ]
   }
 ]
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index 27fd9a845492e..bf750938d5ef6 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -205,6 +205,24 @@
     "copy-from": "mon_generic_chick_tiny",
     "upgrades": { "age_grow": 8, "into": "mon_finch_saffron" }
   },
+  {
+    "id": "mon_great_kiskadee",
+    "type": "MONSTER",
+    "name": { "str": "great kiskadee" },
+    "description": "A fairly large species of flycatcher with a yellow and brown plumage.",
+    "copy-from": "mon_bird_flying_base",
+    "color": "yellow",
+    "volume": "80 ml",
+    "weight": "60 g",
+    "reproduction": { "baby_egg": "egg_great_kiskadee", "baby_count": 5, "baby_timer": 18 },
+    "//": "Values for reproduction and chick growth copied from the bluejay, as no info could be found online."
+  },
+  {
+    "id": "mon_great_kiskadee_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 10, "into": "mon_great_kiskadee" }
+  },
   {
     "id": "mon_tinamou",
     "type": "MONSTER",
diff --git a/data/mods/TropiCataclysm/requirements.json b/data/mods/TropiCataclysm/requirements.json
index 8d79bc3f4bdbf..1c2335194b0a1 100644
--- a/data/mods/TropiCataclysm/requirements.json
+++ b/data/mods/TropiCataclysm/requirements.json
@@ -2,6 +2,16 @@
   {
     "id": "eggs_bird",
     "type": "requirement",
-    "extend": { "components": [ [ [ "egg_toucan", 3 ], [ "egg_parrot", 6 ], [ "egg_macaw", 3 ], [ "egg_finch_saffron", 20 ] ] ] }
+    "extend": {
+      "components": [
+        [
+          [ "egg_toucan", 3 ],
+          [ "egg_parrot", 6 ],
+          [ "egg_macaw", 3 ],
+          [ "egg_finch_saffron", 20 ],
+          [ "egg_great_kiskadee", 6 ]
+        ]
+      ]
+    }
   }
 ]

From 4ddaab5d422ea81029332941a522fe6613ff3e97 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 13:12:07 +0200
Subject: [PATCH 08/10] hornero

---
 .../TropiCataclysm/items/comestibles/egg.json   |  7 +++++++
 .../mods/TropiCataclysm/monstergroups/eggs.json |  5 +++++
 .../monstergroups/wilderness.json               |  8 ++++++--
 .../TropiCataclysm/monsters/tropical_bird.json  | 17 +++++++++++++++++
 data/mods/TropiCataclysm/requirements.json      |  1 +
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index 0aa0c057c3710..ace06780d19ae 100644
--- a/data/mods/TropiCataclysm/items/comestibles/egg.json
+++ b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -62,6 +62,13 @@
     "copy-from": "egg_bluejay",
     "rot_spawn": "GROUP_EGG_GREAT_KISKADEE"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_rufous_hornero",
+    "name": { "str": "rufous hornero egg" },
+    "copy-from": "egg_waxwing",
+    "rot_spawn": "GROUP_EGG_RUFOUS_HORNERO"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_tinamou",
diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json
index 9f349ccdf2735..06fa3fcb56d84 100644
--- a/data/mods/TropiCataclysm/monstergroups/eggs.json
+++ b/data/mods/TropiCataclysm/monstergroups/eggs.json
@@ -49,6 +49,11 @@
     "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",
diff --git a/data/mods/TropiCataclysm/monstergroups/wilderness.json b/data/mods/TropiCataclysm/monstergroups/wilderness.json
index 2023ed32da486..f5f2bb73a17b2 100644
--- a/data/mods/TropiCataclysm/monstergroups/wilderness.json
+++ b/data/mods/TropiCataclysm/monstergroups/wilderness.json
@@ -60,6 +60,7 @@
       { "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_great_kiskadee", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_rufous_hornero", "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 },
@@ -146,6 +147,7 @@
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_finch_saffron", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_great_kiskadee", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_rufous_hornero", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_iguana", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_macaw", "weight": 15, "cost_multiplier": 0 }
     ]
@@ -157,7 +159,8 @@
     "monsters": [
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_finch_saffron", "weight": 25, "cost_multiplier": 0 },
-      { "monster": "mon_great_kiskadee", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_great_kiskadee", "weight": 20, "cost_multiplier": 0 },
+      { "monster": "mon_rufous_hornero", "weight": 20, "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 },
@@ -195,7 +198,8 @@
     "monsters": [
       { "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 },
       { "monster": "mon_finch_saffron", "weight": 20, "cost_multiplier": 0 },
-      { "monster": "mon_great_kiskadee", "weight": 15, "cost_multiplier": 0 }
+      { "monster": "mon_great_kiskadee", "weight": 15, "cost_multiplier": 0 },
+      { "monster": "mon_rufous_hornero", "weight": 15, "cost_multiplier": 0 }
     ]
   }
 ]
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index bf750938d5ef6..62865d9ea00f6 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -223,6 +223,23 @@
     "copy-from": "mon_generic_chick_tiny",
     "upgrades": { "age_grow": 10, "into": "mon_great_kiskadee" }
   },
+  {
+    "id": "mon_rufous_hornero",
+    "type": "MONSTER",
+    "name": { "str": "rufous hornero" },
+    "description": "Placeholder.  Next commit.",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "60 ml",
+    "weight": "45 g",
+    "reproduction": { "baby_egg": "egg_rufous_hornero", "baby_count": 4, "baby_timer": 44 }
+  },
+  {
+    "id": "mon_rufous_hornero_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 25, "into": "mon_rufous_hornero" },
+    "//": "24-26 days to reach independence. Use the default multiplier of 4 to our advantage to get a rough estimate of reaching adult size."
+  },
   {
     "id": "mon_tinamou",
     "type": "MONSTER",
diff --git a/data/mods/TropiCataclysm/requirements.json b/data/mods/TropiCataclysm/requirements.json
index 1c2335194b0a1..c36166ca233d0 100644
--- a/data/mods/TropiCataclysm/requirements.json
+++ b/data/mods/TropiCataclysm/requirements.json
@@ -8,6 +8,7 @@
           [ "egg_toucan", 3 ],
           [ "egg_parrot", 6 ],
           [ "egg_macaw", 3 ],
+          [ "egg_rufous_hornero", 20 ],
           [ "egg_finch_saffron", 20 ],
           [ "egg_great_kiskadee", 6 ]
         ]

From 5d9d43ba76b8d02965018610179713f1958964b4 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 13:13:56 +0200
Subject: [PATCH 09/10] description updates

---
 data/mods/TropiCataclysm/monsters/tropical_bird.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index 62865d9ea00f6..81d9b21c5f097 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -191,7 +191,7 @@
     "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.",
+    "description": "A tiny, golden bird bopping around in the canopy of trees.  Its cone-shaped bill tells you it s a seed eater.",
     "copy-from": "mon_bird_flying_base",
     "color": "yellow",
     "volume": "27 ml",
@@ -209,7 +209,7 @@
     "id": "mon_great_kiskadee",
     "type": "MONSTER",
     "name": { "str": "great kiskadee" },
-    "description": "A fairly large species of flycatcher with a yellow and brown plumage.",
+    "description": "This large flycatcher has a black crown, prominent white eye stripe and a dominantly yellow body.  At almost a foot long, it swoops up a variety of flying insects.",
     "copy-from": "mon_bird_flying_base",
     "color": "yellow",
     "volume": "80 ml",
@@ -227,7 +227,7 @@
     "id": "mon_rufous_hornero",
     "type": "MONSTER",
     "name": { "str": "rufous hornero" },
-    "description": "Placeholder.  Next commit.",
+    "description": "A drab, robin-sized ground bird with startling red eyes.  More often spotted are their odd oven shaped nests.",
     "copy-from": "mon_bird_flying_base",
     "volume": "60 ml",
     "weight": "45 g",

From b85fe8fd3ed0a853b9acf879dcb6830719b83cf8 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 13:22:12 +0200
Subject: [PATCH 10/10] Update dictionary.txt

---
 tools/spell_checker/dictionary.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
index 3c3dc04aad7d5..aae38df7bde31 100644
--- a/tools/spell_checker/dictionary.txt
+++ b/tools/spell_checker/dictionary.txt
@@ -2678,6 +2678,8 @@ Horayot
 horchata
 horks
 Hornblower
+hornero
+horneros
 Horrorpelta
 Horrorpeltas
 hosomaki
@@ -3160,6 +3162,8 @@ kippahs
 Kippur
 kirpan
 kirpans
+kiskadee
+kiskadees
 Kitáb
 KITT
 kittel
@@ -6241,6 +6245,7 @@ tlatoani
 TNT
 Toby
 tock
+toco
 TODO
 Toffer
 toggleable