From 590de5dd021f02cb5b8f0462db519af257b1cc7b Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sat, 17 Aug 2024 22:33:36 +0200
Subject: [PATCH] woodpecker

---
 data/json/items/comestibles/egg.json          | 19 ++++-----
 data/json/monsters/bird.json                  | 39 ++++---------------
 .../json/requirements/cooking_components.json |  2 +-
 3 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
index 7b1c17d60de53..a92bf6e4d4922 100644
--- a/data/json/items/comestibles/egg.json
+++ b/data/json/items/comestibles/egg.json
@@ -43,8 +43,8 @@
     "type": "COMESTIBLE",
     "id": "egg_grouse",
     "name": { "str": "ruffed grouse egg" },
-    "copy-from": "egg_chicken",
     "spoils_in": "13 days",
+    "copy-from": "egg_chicken",
     "proportional": { "volume": 0.67, "weight": 0.67, "calories": 0.67 },
     "rot_spawn": "GROUP_EGG_GROUSE"
   },
@@ -134,8 +134,8 @@
     "type": "COMESTIBLE",
     "id": "egg_duck",
     "name": { "str": "mallard egg" },
-    "copy-from": "egg_chicken",
     "spoils_in": "14 days",
+    "copy-from": "egg_chicken",
     "proportional": { "volume": 1.4, "weight": 1.4 },
     "calories": 130,
     "vitamins": [ [ "iron", "3 mg" ], [ "calcium", "45 mg" ], [ "egg_allergen", 1 ] ],
@@ -145,8 +145,8 @@
     "type": "COMESTIBLE",
     "id": "egg_goose_canadian",
     "name": { "str": "Canada goose egg" },
-    "copy-from": "egg_chicken",
     "spoils_in": "15 days",
+    "copy-from": "egg_chicken",
     "proportional": { "volume": 3.26, "weight": 3.26 },
     "calories": 302,
     "vitamins": [ [ "iron", "6 mg" ], [ "calcium", "98 mg" ], [ "egg_allergen", 1 ] ],
@@ -156,8 +156,8 @@
     "type": "COMESTIBLE",
     "id": "egg_turkey",
     "name": { "str": "wild turkey egg" },
-    "copy-from": "egg_chicken",
     "spoils_in": "15 days",
+    "copy-from": "egg_chicken",
     "proportional": { "volume": 1.58, "weight": 1.58 },
     "calories": 135,
     "vitamins": [ [ "iron", "3 mg" ], [ "calcium", "78 mg" ], [ "egg_allergen", 1 ] ],
@@ -167,8 +167,8 @@
     "type": "COMESTIBLE",
     "id": "egg_pheasant",
     "name": { "str": "ring-necked pheasant egg" },
-    "copy-from": "egg_chicken",
     "spoils_in": "14 days",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_PHEASANT"
   },
   {
@@ -1193,7 +1193,7 @@
   {
     "type": "COMESTIBLE",
     "id": "egg_goose",
-    "name": { "str": "Domestic goose egg" },
+    "name": { "str": "domestic goose egg" },
     "copy-from": "egg_chicken",
     "proportional": { "volume": 2.88, "weight": 2.88 },
     "calories": 266,
@@ -1213,9 +1213,10 @@
   {
     "type": "COMESTIBLE",
     "id": "egg_woodpecker",
-    "name": "woodpecker egg",
-    "spoils_in": "7 days",
-    "copy-from": "egg_crow",
+    "name": { "str": "downy woodpecker egg" },
+    "spoils_in": "6 days",
+    "copy-from": "egg_chicken",
+    "proportional": { "volume": 0.06, "weight": 0.06, "calories": 0.06 },
     "rot_spawn": "GROUP_EGG_WOODPECKER"
   },
   {
diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json
index 69f950be052c2..814168b3fe198 100644
--- a/data/json/monsters/bird.json
+++ b/data/json/monsters/bird.json
@@ -586,33 +586,12 @@
   {
     "id": "mon_woodpecker",
     "type": "MONSTER",
-    "name": { "str": "woodpecker" },
-    "description": "A small bird with woody colors and a colored crest on its head.  These birds are well known for their ability to poke holes on trees while looking for grubs.",
-    "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,
-    "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_flying", "prof_wp_basic_bird" ],
-    "weakpoint_sets": [ "wps_bird_body" ],
-    "harvest": "bird_small",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_woodpecker", "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", "SMALL_HIDER" ]
+    "name": { "str": "downy woodpecker" },
+    "description": "A small bird with woody colors and a colored crest on its head.  Well known for its ability to poke holes on trees while looking for grubs.",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "35 ml",
+    "weight": "26 g",
+    "reproduction": { "baby_egg": "egg_woodpecker", "baby_count": 5, "baby_timer": 30 }
   },
   {
     "id": "mon_hummingbird_chick",
@@ -624,10 +603,8 @@
   {
     "id": "mon_woodpecker_chick",
     "type": "MONSTER",
-    "copy-from": "mon_generic_chick",
-    "volume": "200 ml",
-    "weight": "15 g",
-    "upgrades": { "age_grow": 11, "into": "mon_woodpecker" }
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 6, "into": "mon_woodpecker" }
   },
   {
     "id": "mon_coot",
diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
index 778c543eb1ff5..62d7dd7f586c1 100644
--- a/data/json/requirements/cooking_components.json
+++ b/data/json/requirements/cooking_components.json
@@ -89,7 +89,7 @@
         [ "egg_pheasant", 1 ],
         [ "egg_goose", 1 ],
         [ "egg_hummingbird", 5 ],
-        [ "egg_woodpecker", 5 ],
+        [ "egg_woodpecker", 20 ],
         [ "egg_coot", 1 ],
         [ "egg_cormorant", 1 ],
         [ "egg_moorhen", 1 ],