From 7a4079a4018e5cc41af3a38047b410d36f8b4735 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sun, 20 Oct 2024 21:58:17 +0200
Subject: [PATCH] tinamou

---
 .../TropiCataclysm/items/comestibles/egg.json |  4 +-
 .../TropiCataclysm/monstergroups/eggs.json    |  5 --
 .../monsters/tropical_bird.json               | 46 ++++++-------------
 3 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index cc77bffc40646..4898b65ce5c43 100644
--- a/data/mods/TropiCataclysm/items/comestibles/egg.json
+++ b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -56,9 +56,9 @@
   {
     "type": "COMESTIBLE",
     "id": "egg_tinamou",
-    "name": "tinamou egg",
+    "name": { "str": "small-billed tinamou egg" },
     "copy-from": "egg_chicken",
-    "rot_spawn": { "group": "GROUP_EGG_TINAMOU", "chance": 70 }
+    "rot_spawn": { "monster": "mon_tinamou_chick" }
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json
index e5c37840aa154..fda1d4b41aa12 100644
--- a/data/mods/TropiCataclysm/monstergroups/eggs.json
+++ b/data/mods/TropiCataclysm/monstergroups/eggs.json
@@ -1,9 +1,4 @@
 [
-  {
-    "name": "GROUP_EGG_TINAMOU",
-    "type": "monstergroup",
-    "monsters": [ { "monster": "mon_tinamou_chick" } ]
-  },
   {
     "name": "GROUP_EGG_SERIEMA",
     "type": "monstergroup",
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index 9d4df84faa039..63956dab80407 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -161,31 +161,20 @@
   {
     "id": "mon_tinamou",
     "type": "MONSTER",
-    "name": { "str": "tinamou" },
-    "description": "One of several species of the Tinamidae family.  These birds converged into shapes similar to fowl but are actually more closely related to the extinct moas.",
-    "default_faction": "small_animal",
-    "bodytype": "bird",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "2 L",
-    "weight": "1100 g",
-    "hp": 5,
-    "speed": 110,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -15,
-    "morale": 25,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "dodge": 3,
-    "harvest": "bird_small",
-    "vision_day": 50,
-    "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_type": { "baby_egg": "egg_tinamou" }, "baby_count": 6, "baby_timer": 10 },
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM" ]
+    "name": { "str": "small-billed tinamou" },
+    "description": "One of several species of tinamous present in Brazil.  Although these birds converged into shapes similar to domestic fowl, they are more closely related to the extinct moas, though unlike them, tinamous are capable of flight.",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "135 ml",
+    "weight": "100 g",
+    "reproduction": { "baby_type": { "baby_egg": "egg_tinamou" }, "baby_count": 4, "baby_timer": 45 },
+    "//": "4 broods a year, and we're assuming they're breeding only for half a year. Clutch sizes per nest can reach 16 eggs, but these can be eggs from up to 4 females, so we're taking an average."
+  },
+  {
+    "id": "mon_tinamou_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_chicken_chick",
+    "upgrades": { "age_grow": 21, "into": "mon_tinamou" },
+    "//": "3 weeks to reach independence."
   },
   {
     "id": "mon_seriema",
@@ -253,13 +242,6 @@
     "baby_flags": [ "SPRING", "SUMMER" ],
     "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }
   },
-  {
-    "id": "mon_tinamou_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_chicken_chick",
-    "name": { "str": "brown chick" },
-    "upgrades": { "age_grow": 10, "into": "mon_tinamou" }
-  },
   {
     "id": "mon_chachalaca_chick",
     "type": "MONSTER",