From 177a7a0b60e13777a9ae04c3a9dca5f22850c885 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:29:38 +0200 Subject: [PATCH 01/36] HP calculation + comment cleanup --- data/json/monsters/bird.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index e193252c8ad5f..b23c2fa55a5f0 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -8,10 +8,10 @@ "default_faction": "small_animal", "categories": [ "WILDLIFE" ], "species": [ "BIRD" ], - "volume": "600 ml", - "weight": "450 g", - "//": "~0.75g/ml density for most wild flying birds", - "hp": 4, + "volume": "467 ml", + "weight": "350 g", + "//": "~0.75g/ml density for most wild birds", + "hp": 1, "speed": 200, "material": [ "flesh" ], "symbol": "v", @@ -114,6 +114,9 @@ "name": { "str": "American crow" }, "description": "A fairly large, elegant black bird, famous for its distinctive call. An intelligent bird, there is a glitter of mischief behind its eyes.", "copy-from": "mon_bird_flying_base", + "volume": "600 ml", + "weight": "450 g", + "hp": 2, "color": "dark_gray", "stomach_size": 30, "special_attacks": [ [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ], @@ -128,6 +131,7 @@ "copy-from": "mon_bird_flying_base", "volume": "1960 ml", "weight": "1470 g", + "hp": 7, "color": "dark_gray", "stomach_size": 50, "special_attacks": [ [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ], @@ -547,8 +551,6 @@ "name": { "str": "feral pigeon" }, "description": "A gentle, plump, small-billed bird with a skin saddle, or cere, between its bill and forehead. On the ground, it struts about with a characteristic bobbing of the head. It is a strong, swift flier thanks to its long wings and powerful flight muscles.", "copy-from": "mon_bird_flying_base", - "volume": "467 ml", - "weight": "350 g", "reproduction": { "baby_egg": "egg_pigeon", "baby_count": 3, "baby_timer": 32 }, "petfood": { "food": [ "BIRDFOOD" ], From 593965d3eb914d457deaadfd81f526e54c0a8619 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:39:52 +0200 Subject: [PATCH 02/36] abstracts --- data/json/monsters/bird.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index b23c2fa55a5f0..75f3a9e09332a 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -3,7 +3,7 @@ "abstract": "mon_bird_flying_base", "type": "MONSTER", "name": { "str": "flying bird abstract" }, - "description": "This is an abstract monsters for other wild flying birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.", + "description": "This is an abstract monsters for other flying birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can fly, but cannot swim.", "bodytype": "bird", "default_faction": "small_animal", "categories": [ "WILDLIFE" ], @@ -44,6 +44,22 @@ "SMALL_HIDER" ] }, + { + "abstract": "mon_bird_flightless_base", + "type": "MONSTER", + "name": { "str": "flightless bird abstract" }, + "description": "This is an abstract monsters for other flightless birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can neither fly nor swim.", + "copy-from": "mon_bird_flying_base", + "delete": { "flags": [ "FLIES" ] } + }, + { + "abstract": "mon_bird_water_base", + "type": "MONSTER", + "name": { "str": "water bird abstract" }, + "description": "This is an abstract monsters for other water birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can both fly and swim.", + "copy-from": "mon_bird_flying_base", + "extend": { "flags": [ "SWIMS" ] } + }, { "id": "mon_chicken", "type": "MONSTER", From 9256f73171b3f8461e50de494fe7e8e12834c628 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:41:25 +0200 Subject: [PATCH 03/36] revise HP calculations --- data/json/monsters/bird.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 75f3a9e09332a..4172180eaf727 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -132,7 +132,6 @@ "copy-from": "mon_bird_flying_base", "volume": "600 ml", "weight": "450 g", - "hp": 2, "color": "dark_gray", "stomach_size": 30, "special_attacks": [ [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ], @@ -147,7 +146,7 @@ "copy-from": "mon_bird_flying_base", "volume": "1960 ml", "weight": "1470 g", - "hp": 7, + "hp": 4, "color": "dark_gray", "stomach_size": 50, "special_attacks": [ [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ], From 8112361d8cdff425d3924b47b1857624a272a856 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:42:31 +0200 Subject: [PATCH 04/36] I hate moving file contents but this is nonactionable Potentially for reversion --- data/json/monsters/bird.json | 106 +++++++++++++++++------------------ 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 4172180eaf727..e1ee2b535be6d 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -60,6 +60,59 @@ "copy-from": "mon_bird_flying_base", "extend": { "flags": [ "SWIMS" ] } }, + { + "abstract": "mon_generic_chick", + "type": "MONSTER", + "name": { "str": "brown chick" }, + "description": "A tiny darkly-colored chick, it could be from a number of different species.", + "default_faction": "small_animal", + "bodytype": "bird", + "categories": [ "WILDLIFE" ], + "species": [ "BIRD" ], + "volume": "80 ml", + "weight": "60 g", + "hp": 1, + "speed": 40, + "material": [ "flesh" ], + "symbol": "v", + "color": "yellow", + "looks_like": "mon_chicken", + "aggression": -99, + "morale": -8, + "melee_skill": 1, + "melee_dice": 1, + "melee_dice_sides": 1, + "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "dodge": 1, + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_basic_bird" ], + "harvest": "bird_tiny", + "upgrades": { "age_grow": 14, "into": "mon_chicken" }, + "//": "Grows up into a standard chicken as a fallback", + "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], + "flags": [ + "SEES", + "HEARS", + "ANIMAL", + "PATH_AVOID_DANGER", + "PATH_AVOID_FIRE", + "WARM", + "SWARMS", + "CAN_BE_CULLED", + "CANPLAY", + "SMALL_HIDER" + ] + }, + { + "abstract": "mon_generic_chick_tiny", + "type": "MONSTER", + "name": { "str": "grey chick" }, + "description": "A tiny dull-colored chick, it could be from a number of different species.", + "copy-from": "mon_generic_chick", + "volume": "7 ml", + "weight": "5 g", + "upgrades": { "age_grow": 14, "into": "mon_sparrow" }, + "//": "Grows up into a sparrow as a fallback" + }, { "id": "mon_chicken", "type": "MONSTER", @@ -330,59 +383,6 @@ "reproduction": { "baby_egg": "egg_pheasant", "baby_count": 5, "baby_timer": 8 }, "baby_flags": [ "SPRING" ] }, - { - "abstract": "mon_generic_chick", - "type": "MONSTER", - "name": { "str": "brown chick" }, - "description": "A tiny darkly-colored chick, it could be from a number of different species.", - "default_faction": "small_animal", - "bodytype": "bird", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "80 ml", - "weight": "60 g", - "hp": 1, - "speed": 40, - "material": [ "flesh" ], - "symbol": "v", - "color": "yellow", - "looks_like": "mon_chicken", - "aggression": -99, - "morale": -8, - "melee_skill": 1, - "melee_dice": 1, - "melee_dice_sides": 1, - "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], - "dodge": 1, - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_basic_bird" ], - "harvest": "bird_tiny", - "upgrades": { "age_grow": 14, "into": "mon_chicken" }, - "//": "Grows up into a standard chicken as a fallback", - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], - "flags": [ - "SEES", - "HEARS", - "ANIMAL", - "PATH_AVOID_DANGER", - "PATH_AVOID_FIRE", - "WARM", - "SWARMS", - "CAN_BE_CULLED", - "CANPLAY", - "SMALL_HIDER" - ] - }, - { - "abstract": "mon_generic_chick_tiny", - "type": "MONSTER", - "name": { "str": "grey chick" }, - "description": "A tiny dull-colored chick, it could be from a number of different species.", - "copy-from": "mon_generic_chick", - "volume": "7 ml", - "weight": "5 g", - "upgrades": { "age_grow": 14, "into": "mon_sparrow" }, - "//": "Grows up into a sparrow as a fallback" - }, { "id": "mon_chicken_chick", "type": "MONSTER", From 9a5a2bc0b945196650f4fb24dbdd14572f3c62ee Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:44:57 +0200 Subject: [PATCH 05/36] waterfowl chick abstract --- data/json/monsters/bird.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index e1ee2b535be6d..f3b6feafa71f8 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -113,6 +113,14 @@ "upgrades": { "age_grow": 14, "into": "mon_sparrow" }, "//": "Grows up into a sparrow as a fallback" }, + { + "abstract": "mon_generic_chick_water", + "type": "MONSTER", + "copy-from": "mon_generic_chick", + "upgrades": { "age_grow": 14, "into": "mon_duck" }, + "//": "Grows up into a duck as a fallback", + "extend": { "flags": [ "SWIMS" ] } + }, { "id": "mon_chicken", "type": "MONSTER", From 4027e56618416d413cb4988a2810aaeaa4bdbcfe Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:47:10 +0200 Subject: [PATCH 06/36] speeds for abstracts --- data/json/monsters/bird.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index f3b6feafa71f8..12bed3b4b3c2f 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -50,6 +50,7 @@ "name": { "str": "flightless bird abstract" }, "description": "This is an abstract monsters for other flightless birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can neither fly nor swim.", "copy-from": "mon_bird_flying_base", + "speed": 95, "delete": { "flags": [ "FLIES" ] } }, { @@ -58,6 +59,7 @@ "name": { "str": "water bird abstract" }, "description": "This is an abstract monsters for other water birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can both fly and swim.", "copy-from": "mon_bird_flying_base", + "speed": 85, "extend": { "flags": [ "SWIMS" ] } }, { From 620e5e45c307f4cd71037f4d48109001a18b0963 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 21:00:28 +0200 Subject: [PATCH 07/36] chicken + grouse --- data/json/monsters/bird.json | 62 ++++++++---------------------------- 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 12bed3b4b3c2f..d0ac56cab71dd 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -50,7 +50,7 @@ "name": { "str": "flightless bird abstract" }, "description": "This is an abstract monsters for other flightless birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can neither fly nor swim.", "copy-from": "mon_bird_flying_base", - "speed": 95, + "speed": 105, "delete": { "flags": [ "FLIES" ] } }, { @@ -128,64 +128,31 @@ "type": "MONSTER", "name": { "str": "chicken" }, "description": "A domesticated descendant of junglefowl, it may still be the most numerous bird in the world. Before the Cataclysm, it was raised by humans as a source of meat, eggs, and early morning wakeup calls.", - "default_faction": "small_animal", - "bodytype": "bird", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "4 L", - "weight": "3500 g", - "hp": 8, - "speed": 80, - "material": [ "flesh" ], - "symbol": "v", + "copy-from": "mon_bird_flightless_base", + "volume": "2667 ml", + "weight": "2 kg", + "hp": 7, + "speed": 95, "color": "white", - "aggression": -99, - "morale": 90, - "melee_skill": 1, - "melee_dice": 1, - "melee_dice_sides": 1, - "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], - "dodge": 4, - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_basic_bird" ], - "weakpoint_sets": [ "wps_bird_body" ], - "harvest": "bird_tiny", - "dissect": "dissect_bird_sample_single", - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FIRE", "HURT" ], "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 2 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 3 }, "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", - "CANPLAY", - "SWARMS", - "CAN_BE_CULLED", - "SMALL_HIDER" - ] + } }, { "id": "mon_grouse", "type": "MONSTER", - "copy-from": "mon_chicken", - "name": { "str": "grouse" }, + "name": { "str": "ruffed grouse" }, "description": "A very common game bird, these creatures remind you of what a wild chicken must have been like.", - "volume": "2 L", - "weight": "1100 g", - "hp": 5, - "speed": 110, + "copy-from": "mon_bird_flightless_base", + "volume": "860 ml", + "weight": "645 g", + "hp": 2, "color": "brown", - "reproduction": { "baby_egg": "egg_grouse", "baby_count": 2, "baby_timer": 6 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } + "reproduction": { "baby_egg": "egg_grouse", "baby_count": 11, "baby_timer": 35 } }, { "id": "mon_crow", @@ -410,8 +377,7 @@ "id": "mon_grouse_chick", "type": "MONSTER", "copy-from": "mon_generic_chick", - "description": "A tiny yellow and brown chick, it could be from a number of different species.", - "upgrades": { "age_grow": 10, "into": "mon_grouse" } + "upgrades": { "age_grow": 30, "into": "mon_grouse" } }, { "id": "mon_crow_chick", From bfc5f012e62c76e467b3eb58ca25fabbfe5aeb3a Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 21:17:38 +0200 Subject: [PATCH 08/36] mallard + grouse egg --- data/json/items/comestibles/egg.json | 11 +++---- data/json/monsters/bird.json | 44 ++++++++-------------------- 2 files changed, 19 insertions(+), 36 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 1ad01ce662258..c888293a7a00d 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -42,8 +42,10 @@ { "type": "COMESTIBLE", "id": "egg_grouse", - "name": { "str": "grouse egg" }, + "name": { "str": "ruffed grouse egg" }, "copy-from": "egg_chicken", + "spoils_in": "13 days", + "proportional": { "volume": 0.67, "weight": 0.67, "calories": 0.67 }, "rot_spawn": "GROUP_EGG_GROUSE" }, { @@ -131,13 +133,12 @@ { "type": "COMESTIBLE", "id": "egg_duck", - "name": { "str": "duck egg" }, + "name": { "str": "mallard egg" }, "copy-from": "egg_chicken", "spoils_in": "14 days", + "proportional": { "volume": 1.4, "weight": 1.4 }, "calories": 130, - "volume": "83 ml", - "weight": "70 g", - "vitamins": [ [ "calcium", 5 ], [ "iron", 15 ] ], + "vitamins": [ [ "iron", "3 mg" ], [ "calcium", "45 mg" ], [ "egg_allergen", 1 ] ], "rot_spawn": "GROUP_EGG_DUCK" }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index d0ac56cab71dd..8cfe878d6c723 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -118,6 +118,8 @@ { "abstract": "mon_generic_chick_water", "type": "MONSTER", + "name": { "str": "waterfowl chick" }, + "description": "A tiny yellow and brown waterfowl chick, it could be from a number of different species.", "copy-from": "mon_generic_chick", "upgrades": { "age_grow": 14, "into": "mon_duck" }, "//": "Grows up into a duck as a fallback", @@ -261,34 +263,15 @@ { "id": "mon_duck", "type": "MONSTER", - "name": { "str": "duck" }, - "description": "A mallard duck, often seen around rivers and other bodies of water. It feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps.", - "default_faction": "small_animal", - "bodytype": "bird", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "1500 ml", - "weight": "1500 g", - "hp": 4, - "speed": 140, - "material": [ "flesh" ], - "symbol": "v", + "name": { "str": "mallard" }, + "description": "A common species of duck often seen around rivers and other bodies of water. It feeds primarily on insects, seeds, roots, and, pre-Cataclysm, bread scraps.", + "copy-from": "mon_bird_water_base", + "volume": "1387 ml", + "weight": "1040 g", + "hp": 3, "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", - "dissect": "dissect_bird_sample_single", - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], - "reproduction": { "baby_egg": "egg_duck", "baby_count": 3, "baby_timer": 5 }, - "baby_flags": [ "SPRING" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 5 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ] + "reproduction": { "baby_egg": "egg_duck", "baby_count": 13, "baby_timer": 88 }, + "baby_flags": [ "SPRING" ] }, { "id": "mon_goose_canadian", @@ -447,15 +430,14 @@ { "id": "mon_duck_chick", "type": "MONSTER", - "copy-from": "mon_generic_chick", - "name": { "str": "waterfowl chick" }, - "description": "A tiny yellow and brown waterfowl chick, it could be from a number of different species.", + "copy-from": "mon_generic_chick_water", "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." }, - "upgrades": { "age_grow": 12, "into": "mon_duck" } + "upgrades": { "age_grow": 60, "into": "mon_duck" }, + "//": "A year to reach sexual maturity, so lets assume 2/3 of that time to reach roughly adult size." }, { "id": "mon_goose_canadian_chick", From eed50b5491ea27116e42a3e3ac0a1bd7028e5a2b Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 21:29:05 +0200 Subject: [PATCH 09/36] fix tileset issues with chicks --- data/json/monsters/bird.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 8cfe878d6c723..5bf425d09d4e9 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -78,7 +78,6 @@ "material": [ "flesh" ], "symbol": "v", "color": "yellow", - "looks_like": "mon_chicken", "aggression": -99, "morale": -8, "melee_skill": 1, @@ -110,6 +109,7 @@ "name": { "str": "grey chick" }, "description": "A tiny dull-colored chick, it could be from a number of different species.", "copy-from": "mon_generic_chick", + "looks_like": "mon_generic_chick_tiny", "volume": "7 ml", "weight": "5 g", "upgrades": { "age_grow": 14, "into": "mon_sparrow" }, From bf036977bc692cf376591ba5316cca13c5d35b55 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 21:37:10 +0200 Subject: [PATCH 10/36] obsolete the golden honker --- data/json/items/comestibles/egg.json | 8 ------- data/json/monstergroups/eggs.json | 8 +------ data/json/monstergroups/misc.json | 1 - data/json/monstergroups/wilderness.json | 3 +-- data/json/monsters/bird.json | 22 ------------------- .../migration_items.json | 5 +++++ .../json/requirements/cooking_components.json | 1 - 7 files changed, 7 insertions(+), 41 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index c888293a7a00d..da1f3b6e2aceb 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1199,14 +1199,6 @@ "copy-from": "egg_goose_canadian", "rot_spawn": "GROUP_EGG_GOOSE" }, - { - "type": "COMESTIBLE", - "id": "egg_goose_golden", - "name": "golden goose egg", - "copy-from": "egg_goose_canadian", - "proportional": { "weight": 2, "calories": 2, "volume": 2 }, - "rot_spawn": "GROUP_EGG_GOOSE" - }, { "type": "COMESTIBLE", "id": "egg_hummingbird", diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index 046616d584d4c..f6aa4d2603f90 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -15,8 +15,7 @@ { "monster": "mon_cardinal_chick", "weight": 15 }, { "monster": "mon_sparrow_chick", "weight": 15 }, { "monster": "mon_goose_canadian_chick", "weight": 100 }, - { "monster": "mon_goose_chick", "weight": 100, "cost_multiplier": 1 }, - { "monster": "mon_goose_golden_chick", "weight": 100, "cost_multiplier": 1 } + { "monster": "mon_goose_chick", "weight": 100 } ] }, { @@ -241,11 +240,6 @@ "type": "monstergroup", "monsters": [ { "monster": "mon_goose_chick" } ] }, - { - "name": "GROUP_EGG_GOOSE_GOLD", - "type": "monstergroup", - "monsters": [ { "monster": "mon_goose_golden_chick" } ] - }, { "name": "GROUP_EGG_HUMMINGBIRD", "type": "monstergroup", diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index e8221ed44cb49..ff63f4067074e 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -279,7 +279,6 @@ { "monster": "mon_goat", "weight": 10 }, { "monster": "mon_lemming", "weight": 10 }, { "monster": "mon_goose", "weight": 10 }, - { "monster": "mon_goose_golden", "weight": 1 }, { "monster": "mon_llama", "weight": 10 }, { "monster": "mon_woodlouse", "weight": 10 }, { "monster": "mon_cicada_nymph", "weight": 10 }, diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index 027ee5386b199..22ac6f2efa300 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -569,8 +569,7 @@ { "monster": "mon_coot", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_moorhen", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_cormorant", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_grebe", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_goose_golden", "weight": 10, "cost_multiplier": 0 } + { "monster": "mon_grebe", "weight": 50, "cost_multiplier": 0 } ] }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 5bf425d09d4e9..30c1f5e2f9749 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -569,34 +569,12 @@ }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CAN_BE_CULLED", "SMALL_HIDER" ] }, - { - "id": "mon_goose_golden", - "type": "MONSTER", - "copy-from": "mon_goose", - "name": { "str": "royal honker" }, - "description": "This strange colored goose seems larger than the rest. Even more strange is its docile, almost regal demeanor.", - "volume": "8 L", - "weight": "4000 g", - "hp": 25, - "symbol": "g", - "color": "yellow", - "aggression": 0, - "morale": 30, - "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "reproduction": { "baby_egg": "egg_goose_golden", "baby_count": 1, "baby_timer": 10 } - }, { "id": "mon_goose_chick", "type": "MONSTER", "copy-from": "mon_duck_chick", "upgrades": { "age_grow": 16, "into": "mon_goose" } }, - { - "id": "mon_goose_golden_chick", - "type": "MONSTER", - "copy-from": "mon_goose_chick", - "upgrades": { "age_grow": 16, "into": "mon_goose_golden" } - }, { "id": "mon_hummingbird", "type": "MONSTER", diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json index 1cf8670de999d..d1619384339a0 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -1825,5 +1825,10 @@ "type": "MIGRATION", "replace": "small_squeeze_tube", "contents": [ { "id": "super_glue", "count": 40 } ] + }, + { + "id": "egg_goose_golden", + "type": "MIGRATION", + "replace": "egg_goose" } ] diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 21f719ff5002b..778c543eb1ff5 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -88,7 +88,6 @@ [ "egg_turkey", 1 ], [ "egg_pheasant", 1 ], [ "egg_goose", 1 ], - [ "egg_goose_golden", 1 ], [ "egg_hummingbird", 5 ], [ "egg_woodpecker", 5 ], [ "egg_coot", 1 ], From 30f1255a0524e4990faeaeac6dd4660779369f67 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 21:52:10 +0200 Subject: [PATCH 11/36] turkey --- data/json/items/comestibles/egg.json | 9 ++++--- data/json/monsters/bird.json | 36 +++++++--------------------- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index da1f3b6e2aceb..e1643ed68ca3b 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -156,13 +156,12 @@ { "type": "COMESTIBLE", "id": "egg_turkey", - "name": { "str": "turkey egg" }, - "spoils_in": "14 days", + "name": { "str": "wild turkey egg" }, "copy-from": "egg_chicken", - "volume": "83 ml", - "weight": "79 g", + "spoils_in": "15 days", + "proportional": { "volume": 1.58, "weight": 1.58 }, "calories": 135, - "vitamins": [ [ "calcium", 8 ], [ "iron", 18 ] ], + "vitamins": [ [ "iron", "3 mg" ], [ "calcium", "78 mg" ], [ "egg_allergen", 1 ] ], "rot_spawn": "GROUP_EGG_TURKEY" }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 30c1f5e2f9749..c957bd20c5ee7 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -149,10 +149,11 @@ "type": "MONSTER", "name": { "str": "ruffed grouse" }, "description": "A very common game bird, these creatures remind you of what a wild chicken must have been like.", - "copy-from": "mon_bird_flightless_base", + "copy-from": "mon_bird_flying_base", "volume": "860 ml", "weight": "645 g", "hp": 2, + "speed": 140, "color": "brown", "reproduction": { "baby_egg": "egg_grouse", "baby_count": 11, "baby_timer": 35 } }, @@ -296,35 +297,16 @@ { "id": "mon_turkey", "type": "MONSTER", - "name": { "str": "turkey" }, + "name": { "str": "wild turkey" }, "description": "A large and colorful game bird native to the forests of North America. Its head and beak are covered in fleshy protuberances.", - "default_faction": "small_animal", - "bodytype": "bird", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "30 L", - "weight": "8000 g", + "copy-from": "mon_bird_flying_base", + "volume": "8 L", + "weight": "6 kg", + "//": "3.6-5.4kg for females, 6.8-11kg for males. We don't differentiate genders, so lets take a rough middle ground.", "hp": 21, "speed": 140, - "material": [ "flesh" ], - "symbol": "v", "color": "brown", - "aggression": -10, - "morale": 25, - "melee_dice": 1, - "melee_dice_sides": 1, - "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], - "dodge": 3, - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_flying", "prof_wp_basic_bird" ], - "weakpoint_sets": [ "wps_bird_body" ], - "harvest": "bird_small", - "dissect": "dissect_bird_sample_single", - "vision_day": 50, - "fear_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FIRE", "HURT" ], - "reproduction": { "baby_egg": "egg_turkey", "baby_count": 3, "baby_timer": 12 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SMALL_HIDER" ] + "reproduction": { "baby_egg": "egg_turkey", "baby_count": 17, "baby_timer": 151 } }, { "id": "mon_pheasant", @@ -414,7 +396,7 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "upgrades": { "age_grow": 18, "into": "mon_turkey" } + "upgrades": { "age_grow": 75, "into": "mon_turkey" } }, { "id": "mon_pheasant_chick", From 243d372b92f00b0dc5b68b3a4a97d0319be096b9 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 22:06:59 +0200 Subject: [PATCH 12/36] pheasant --- data/json/items/comestibles/egg.json | 4 ++-- data/json/monsters/bird.json | 24 +++++++++++------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index e1643ed68ca3b..1a7dd5d7dff03 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -167,9 +167,9 @@ { "type": "COMESTIBLE", "id": "egg_pheasant", - "name": { "str": "pheasant egg" }, - "spoils_in": "14 days", + "name": { "str": "ring-necked pheasant egg" }, "copy-from": "egg_chicken", + "spoils_in": "14 days", "rot_spawn": "GROUP_EGG_PHEASANT" }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index c957bd20c5ee7..9d1965fd9cd85 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -311,18 +311,15 @@ { "id": "mon_pheasant", "type": "MONSTER", - "copy-from": "mon_turkey", - "name": { "str": "pheasant" }, - "description": "A medium-sized game bird that can have bright feathers depending on the sex and species.", - "volume": "750 ml", - "weight": "1 kg", - "hp": 6, - "speed": 130, - "dodge": 4, - "aggression": -99, - "morale": -8, - "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], - "reproduction": { "baby_egg": "egg_pheasant", "baby_count": 5, "baby_timer": 8 }, + "name": { "str": "ring-necked pheasant" }, + "description": "A medium-sized game bird that can have bright feathers depending on the sex. Introduced from Asia to New England.", + "copy-from": "mon_bird_flying_base", + "volume": "1467 ml", + "weight": "1100 g", + "//": "0.9kg for females, 1.2kg for males. We don't differentiate genders, so lets take a rough middle ground.", + "hp": 3, + "speed": 140, + "reproduction": { "baby_egg": "egg_pheasant", "baby_count": 15, "baby_timer": 108 }, "baby_flags": [ "SPRING" ] }, { @@ -407,7 +404,8 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." }, - "upgrades": { "age_grow": 14, "into": "mon_pheasant" } + "upgrades": { "age_grow": 55, "into": "mon_pheasant" }, + "//": "A year to reach sexual maturity, but only 80 days to reach independence, so lets get an average from that." }, { "id": "mon_duck_chick", From 1ff408456a6938ae8cf3bcc3b0e7e73b7dd39f49 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 22:19:14 +0200 Subject: [PATCH 13/36] canada goose --- data/json/items/comestibles/egg.json | 18 ++++++++++-------- data/json/monsters/bird.json | 27 ++++++++++++--------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 1a7dd5d7dff03..7b1c17d60de53 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -144,13 +144,12 @@ { "type": "COMESTIBLE", "id": "egg_goose_canadian", - "name": { "str": "goose egg" }, - "spoils_in": "14 days", + "name": { "str": "Canada goose egg" }, "copy-from": "egg_chicken", - "calories": 266, - "volume": "130 ml", - "weight": "143 g", - "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ], + "spoils_in": "15 days", + "proportional": { "volume": 3.26, "weight": 3.26 }, + "calories": 302, + "vitamins": [ [ "iron", "6 mg" ], [ "calcium", "98 mg" ], [ "egg_allergen", 1 ] ], "rot_spawn": "GROUP_EGG_GOOSE_CANADIAN" }, { @@ -1194,8 +1193,11 @@ { "type": "COMESTIBLE", "id": "egg_goose", - "name": "goose egg", - "copy-from": "egg_goose_canadian", + "name": { "str": "Domestic goose egg" }, + "copy-from": "egg_chicken", + "proportional": { "volume": 2.88, "weight": 2.88 }, + "calories": 266, + "vitamins": [ [ "iron", "5 mg" ], [ "calcium", "86 mg" ], [ "egg_allergen", 1 ] ], "rot_spawn": "GROUP_EGG_GOOSE" }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 9d1965fd9cd85..69f950be052c2 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -277,22 +277,18 @@ { "id": "mon_goose_canadian", "type": "MONSTER", - "copy-from": "mon_duck", - "name": { "str": "goose", "str_pl": "geese" }, - "description": "A Canada goose; a common waterfowl that regrets leaving Canada.", - "volume": "5 L", - "weight": "3750 g", - "hp": 15, + "name": { "str": "Canada goose", "str_pl": "Canada geese" }, + "description": "A common type of waterfowl that regrets leaving Canada.", + "copy-from": "mon_bird_water_base", + "volume": "5333 ml", + "weight": "4 kg", + "hp": 14, "aggression": 0, "morale": 15, - "aggro_character": false, - "dodge": 3, - "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], "anger_triggers": [ "PLAYER_CLOSE", "FRIEND_ATTACKED" ], - "fear_triggers": [ "FRIEND_DIED", "FIRE" ], - "reproduction": { "baby_egg": "egg_goose_canadian", "baby_count": 3, "baby_timer": 10 }, - "baby_flags": [ "SPRING" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 4 } + "fear_triggers": [ "FRIEND_DIED", "FIRE", "HURT" ], + "reproduction": { "baby_egg": "egg_goose_canadian", "baby_count": 10, "baby_timer": 350 }, + "baby_flags": [ "SPRING" ] }, { "id": "mon_turkey", @@ -422,8 +418,9 @@ { "id": "mon_goose_canadian_chick", "type": "MONSTER", - "copy-from": "mon_duck_chick", - "upgrades": { "age_grow": 16, "into": "mon_goose_canadian" } + "copy-from": "mon_generic_chick_water", + "upgrades": { "age_grow": 135, "into": "mon_goose_canadian" }, + "//": "A year to reach independence, 2-3 years to reach sexual maturity, so lets assume 1.5 years to reach full size." }, { "id": "mon_crow_mutant_small", 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 14/36] 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 ], From 63a04dd6a19001415be48ba8fa9321bb954ec964 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 22:42:54 +0200 Subject: [PATCH 15/36] grebe --- data/json/items/comestibles/egg.json | 2 +- data/json/monsters/bird.json | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index a92bf6e4d4922..ff8d9046998f9 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1246,7 +1246,7 @@ { "type": "COMESTIBLE", "id": "egg_grebe", - "name": "grebe egg", + "name": { "str": "horned grebe egg" }, "spoils_in": "12 days", "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_GREBE" diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 814168b3fe198..f7ab8b5e4cc10 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -666,15 +666,13 @@ { "id": "mon_grebe", "type": "MONSTER", - "copy-from": "mon_coot", - "name": { "str": "grebe" }, - "description": "A medium sized aquatic bird with a long neck. These birds can be distinguished by their strange leg placement which makes them great at diving.", - "volume": "500 ml", - "weight": "500 g", + "name": { "str": "horned grebe" }, + "description": "A medium sized aquatic bird with a long neck. They can be distinguished by their strange leg placement which makes them great at diving.", + "copy-from": "mon_bird_water_base", + "volume": "580 ml", + "weight": "435 g", "color": "brown", - "reproduction": { "baby_egg": "egg_grebe", "baby_count": 2, "baby_timer": 6 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } + "reproduction": { "baby_egg": "egg_grebe", "baby_count": 8, "baby_timer": 49 } }, { "id": "mon_coot_chick", @@ -697,7 +695,8 @@ { "id": "mon_grebe_chick", "type": "MONSTER", - "copy-from": "mon_generic_chick", - "upgrades": { "age_grow": 14, "into": "mon_grebe" } + "copy-from": "mon_generic_chick_water", + "upgrades": { "age_grow": 60, "into": "mon_grebe" }, + "//": "A year to reach sexual maturity, so lets assume 2/3 of that time to reach roughly adult size." } ] From d029c9b4ea3b334632d9b38393dd97aa21bf5508 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 17 Aug 2024 22:52:50 +0200 Subject: [PATCH 16/36] hummingbird + cooking requirement collection --- data/json/items/comestibles/egg.json | 9 ++--- data/json/monsters/bird.json | 40 +++++-------------- .../json/requirements/cooking_components.json | 10 ++--- 3 files changed, 19 insertions(+), 40 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index ff8d9046998f9..7ae68dbe0ae51 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1203,11 +1203,10 @@ { "type": "COMESTIBLE", "id": "egg_hummingbird", - "name": "hummingbird egg", - "spoils_in": "8 days", - "copy-from": "egg_crow", - "volume": "1 ml", - "weight": "1 g", + "name": { "str": "ruby-throated hummingbird egg" }, + "spoils_in": "7 days", + "copy-from": "egg_chicken", + "proportional": { "volume": 0.01, "weight": 0.01, "calories": 0.01 }, "rot_spawn": "GROUP_EGG_HUMMINGBIRD" }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index f7ab8b5e4cc10..590b1d534f0b2 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -555,33 +555,14 @@ { "id": "mon_hummingbird", "type": "MONSTER", - "name": { "str": "hummingbird" }, - "description": "A very small ruby-throated hummingbird of varied colored feathers. It flies at incredible speeds while seeking nectar among flowers.", - "bodytype": "bird", - "default_faction": "small_animal", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "150 ml", - "weight": "18 g", - "hp": 3, - "speed": 160, - "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_tiny", - "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], - "reproduction": { "baby_egg": "egg_hummingbird", "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": "ruby-throated hummingbird" }, + "description": "A very small hummingbird of varied colorful feathers. It flies at incredible speeds while seeking nectar among flowers.", + "copy-from": "mon_bird_flying_base", + "volume": "5 ml", + "weight": "3600 mg", + "color": "light_green", + "reproduction": { "baby_egg": "egg_hummingbird", "baby_count": 3, "baby_timer": 36 }, + "baby_flags": [ "SPRING" ] }, { "id": "mon_woodpecker", @@ -596,9 +577,8 @@ { "id": "mon_hummingbird_chick", "type": "MONSTER", - "copy-from": "mon_generic_chick", - "weight": "7 g", - "upgrades": { "age_grow": 11, "into": "mon_hummingbird" } + "copy-from": "mon_generic_chick_tiny", + "upgrades": { "age_grow": 6, "into": "mon_hummingbird" } }, { "id": "mon_woodpecker_chick", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 62d7dd7f586c1..99cf1a3dacfdc 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -80,16 +80,16 @@ [ "egg_cardinal", 12 ], [ "egg_robin", 7 ], [ "egg_pigeon", 3 ], - [ "egg_sparrow", 20 ], - [ "egg_waxwing", 20 ], - [ "egg_chickadee", 50 ], + [ "egg_sparrow", 17 ], + [ "egg_waxwing", 17 ], + [ "egg_chickadee", 34 ], [ "egg_duck", 1 ], [ "egg_goose_canadian", 1 ], [ "egg_turkey", 1 ], [ "egg_pheasant", 1 ], [ "egg_goose", 1 ], - [ "egg_hummingbird", 5 ], - [ "egg_woodpecker", 20 ], + [ "egg_hummingbird", 100 ], + [ "egg_woodpecker", 17 ], [ "egg_coot", 1 ], [ "egg_cormorant", 1 ], [ "egg_moorhen", 1 ], From 752aeb5423b57648a123d191c34caac517b3e506 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 09:59:44 +0200 Subject: [PATCH 17/36] coot --- data/json/items/comestibles/egg.json | 7 ++--- data/json/monsters/bird.json | 38 +++++++--------------------- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 7ae68dbe0ae51..c15bf6ce1180d 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -45,7 +45,7 @@ "name": { "str": "ruffed grouse egg" }, "spoils_in": "13 days", "copy-from": "egg_chicken", - "proportional": { "volume": 0.67, "weight": 0.67, "calories": 0.67 }, + "proportional": { "volume": 0.73, "weight": 0.73, "calories": 0.73 }, "rot_spawn": "GROUP_EGG_GROUSE" }, { @@ -1221,9 +1221,10 @@ { "type": "COMESTIBLE", "id": "egg_coot", - "name": "coot egg", - "spoils_in": "12 days", + "name": { "str": "American coot egg" }, + "spoils_in": "13 days", "copy-from": "egg_chicken", + "proportional": { "volume": 0.73, "weight": 0.73, "calories": 0.73 }, "rot_spawn": "GROUP_EGG_COOT" }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 590b1d534f0b2..a394bafcd6381 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -589,33 +589,12 @@ { "id": "mon_coot", "type": "MONSTER", - "name": { "str": "coot" }, - "description": "A bird belonging to the Rallidae family. They can be found worldwide on freshwater habitats, including many islands in the not so distant past.", - "default_faction": "small_animal", - "bodytype": "bird", - "categories": [ "WILDLIFE" ], - "species": [ "BIRD" ], - "volume": "800 ml", - "weight": "800 g", - "hp": 5, - "speed": 110, - "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_coot", "baby_count": 3, "baby_timer": 5 }, - "baby_flags": [ "SPRING" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 5 }, - "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ] + "name": { "str": "American coot" }, + "description": "A bird belonging to the same family as rails. Its relatives can be found worldwide in freshwater habitats.", + "copy-from": "mon_bird_water_base", + "volume": "733 ml", + "weight": "550 g", + "reproduction": { "baby_egg": "egg_coot", "baby_count": 10, "baby_timer": 83 } }, { "id": "mon_cormorant", @@ -638,6 +617,7 @@ "description": "A bird belonging to the Rallidae family. They are relatives of the coots but have a distinctive red coloration on their heads and brownish plumage.", "volume": "400 ml", "weight": "400 g", + "speed": 110, "color": "brown", "reproduction": { "baby_egg": "egg_moorhen", "baby_count": 2, "baby_timer": 6 }, "baby_flags": [ "SPRING", "SUMMER" ], @@ -657,8 +637,8 @@ { "id": "mon_coot_chick", "type": "MONSTER", - "copy-from": "mon_generic_chick", - "upgrades": { "age_grow": 14, "into": "mon_coot" } + "copy-from": "mon_generic_chick_water", + "upgrades": { "age_grow": 23, "into": "mon_coot" } }, { "id": "mon_cormorant_chick", From a707e2b67edf3492e03cbd9d80c6f214b1f415d6 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:14:32 +0200 Subject: [PATCH 18/36] moorhen --- data/json/items/comestibles/egg.json | 5 +++-- data/json/monsters/bird.json | 19 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index c15bf6ce1180d..c814f82ba7f6d 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1238,9 +1238,10 @@ { "type": "COMESTIBLE", "id": "egg_moorhen", - "name": "moorhen egg", - "spoils_in": "10 days", + "name": { "str": "common moorhen egg" }, + "spoils_in": "11 days", "copy-from": "egg_chicken", + "proportional": { "volume": 0.73, "weight": 0.73, "calories": 0.73 }, "rot_spawn": "GROUP_EGG_MOORHEN" }, { diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index a394bafcd6381..02d9f6c55003a 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -612,16 +612,13 @@ { "id": "mon_moorhen", "type": "MONSTER", - "copy-from": "mon_coot", - "name": { "str": "moorhen" }, - "description": "A bird belonging to the Rallidae family. They are relatives of the coots but have a distinctive red coloration on their heads and brownish plumage.", - "volume": "400 ml", - "weight": "400 g", + "name": { "str": "common moorhen" }, + "description": "A bird belonging to the same family as rails. A relative of the coot with a distinctive red coloration on its heads and brownish plumage.", + "copy-from": "mon_bird_water_base", + "volume": "511 ml", + "weight": "383 g", "speed": 110, - "color": "brown", - "reproduction": { "baby_egg": "egg_moorhen", "baby_count": 2, "baby_timer": 6 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } + "reproduction": { "baby_egg": "egg_moorhen", "baby_count": 8, "baby_timer": 78 } }, { "id": "mon_grebe", @@ -649,8 +646,8 @@ { "id": "mon_moorhen_chick", "type": "MONSTER", - "copy-from": "mon_generic_chick", - "upgrades": { "age_grow": 14, "into": "mon_moorhen" } + "copy-from": "mon_generic_chick_water", + "upgrades": { "age_grow": 22, "into": "mon_moorhen" } }, { "id": "mon_grebe_chick", From 61dcf36dcd1f8f3dfed2acda5a6c16cf5aa05f8f Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:22:54 +0200 Subject: [PATCH 19/36] cormorant --- data/json/items/comestibles/egg.json | 4 ++-- data/json/monsters/bird.json | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index c814f82ba7f6d..16ed223746507 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1230,8 +1230,8 @@ { "type": "COMESTIBLE", "id": "egg_cormorant", - "name": "cormorant egg", - "spoils_in": "13 days", + "name": { "str": "double-crested cormorant egg" }, + "spoils_in": "14 days", "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_CORMORANT" }, diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 02d9f6c55003a..ba85525baa8e8 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -600,14 +600,12 @@ "id": "mon_cormorant", "type": "MONSTER", "copy-from": "mon_coot", - "name": { "str": "cormorant" }, - "description": "An aquatic bird with a long snake-like neck. They are considered coastal birds but many species can also be found on freshwater habitats.", - "volume": "340 ml", - "weight": "340 g", - "color": "brown", - "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 2, "baby_timer": 6 }, - "baby_flags": [ "SPRING", "SUMMER" ], - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 } + "name": { "str": "double-crested cormorant" }, + "description": "An aquatic bird with a long snake-like neck. While often considered coastal birds, they feel just as at home in freshwater habitats.", + "volume": "2467 ml", + "weight": "1850 g", + "speed": 110, + "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 7, "baby_timer": 98 } }, { "id": "mon_moorhen", @@ -641,7 +639,8 @@ "id": "mon_cormorant_chick", "type": "MONSTER", "copy-from": "mon_generic_chick", - "upgrades": { "age_grow": 14, "into": "mon_cormorant" } + "upgrades": { "age_grow": 97, "into": "mon_cormorant" }, + "//": "2 years to reach sexual maturity, but only 10 weeks to reach independence, so lets get an average from that." }, { "id": "mon_moorhen_chick", From 128dad5e31a326a49605cc49758ad6d7b4d8533d Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:24:41 +0200 Subject: [PATCH 20/36] oops wrong name --- data/json/items/comestibles/egg.json | 2 +- data/json/monsters/bird.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 16ed223746507..04ef79a6bec0b 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1238,7 +1238,7 @@ { "type": "COMESTIBLE", "id": "egg_moorhen", - "name": { "str": "common moorhen egg" }, + "name": { "str": "common gallinule egg" }, "spoils_in": "11 days", "copy-from": "egg_chicken", "proportional": { "volume": 0.73, "weight": 0.73, "calories": 0.73 }, diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index ba85525baa8e8..06665d7a040b8 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -610,7 +610,7 @@ { "id": "mon_moorhen", "type": "MONSTER", - "name": { "str": "common moorhen" }, + "name": { "str": "common gallinule" }, "description": "A bird belonging to the same family as rails. A relative of the coot with a distinctive red coloration on its heads and brownish plumage.", "copy-from": "mon_bird_water_base", "volume": "511 ml", From 5b66c0aacc253fc18ca88765f08dbe6f8fc71c3f Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:31:13 +0200 Subject: [PATCH 21/36] evil in my sight --- data/json/monsters/bird.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 06665d7a040b8..c6ad06021150c 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -622,7 +622,7 @@ "id": "mon_grebe", "type": "MONSTER", "name": { "str": "horned grebe" }, - "description": "A medium sized aquatic bird with a long neck. They can be distinguished by their strange leg placement which makes them great at diving.", + "description": "A medium-sized aquatic bird with a long neck. They can be distinguished by their strange leg placement which makes them great at diving.", "copy-from": "mon_bird_water_base", "volume": "580 ml", "weight": "435 g", From 2ae0919f39b32b03af199590da17cddb059a5ebf Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:35:34 +0200 Subject: [PATCH 22/36] cormorant HP --- data/json/monsters/bird.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index c6ad06021150c..750d947db94ec 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -604,6 +604,7 @@ "description": "An aquatic bird with a long snake-like neck. While often considered coastal birds, they feel just as at home in freshwater habitats.", "volume": "2467 ml", "weight": "1850 g", + "hp": 6, "speed": 110, "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 7, "baby_timer": 98 } }, From ec3efbe8964a8e5de7763e9a124a7ce1e9a3326f Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:40:41 +0200 Subject: [PATCH 23/36] goots --- data/json/monsters/bird.json | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 750d947db94ec..b673443324e5e 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -522,35 +522,34 @@ { "id": "mon_goose", "type": "MONSTER", - "copy-from": "mon_duck", - "name": { "str": "goose", "str_pl": "geese" }, - "description": "The domestic goose. A waterfowl well known for its loud honking and aggressive behavior.", + "name": { "str": "domestic goose", "str_pl": "domestic geese" }, + "description": "A type of waterfowl well known for its loud honking and relatively aggressive behavior.", + "copy-from": "mon_bird_water_base", "volume": "5 L", "weight": "3750 g", - "hp": 15, + "hp": 13, "looks_like": "mon_goose_canadian", "aggression": 1, "morale": 15, - "dodge": 3, - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_basic_bird" ], - "weakpoint_sets": [ "wps_bird_body" ], - "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ], - "anger_triggers": [ "PLAYER_CLOSE" ], - "reproduction": { "baby_egg": "egg_goose", "baby_count": 5, "baby_timer": 10 }, - "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 4 }, + "reproduction": { "baby_egg": "egg_goose", "baby_count": 15, "baby_timer": 35 }, + "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], "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", "CAN_BE_CULLED", "SMALL_HIDER" ] + } }, { "id": "mon_goose_chick", "type": "MONSTER", - "copy-from": "mon_duck_chick", - "upgrades": { "age_grow": 16, "into": "mon_goose" } + "copy-from": "mon_generic_chick_water", + "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." + }, + "upgrades": { "age_grow": 53, "into": "mon_goose" } }, { "id": "mon_hummingbird", From 0c33e6c0ee48608cb9c453c6403430f05255fa94 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:55:35 +0200 Subject: [PATCH 24/36] forgive me but I can't manage this reorganizes some file contents --- data/json/monsters/bird.json | 46 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index b673443324e5e..5a1a15432e4e3 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -274,6 +274,18 @@ "reproduction": { "baby_egg": "egg_duck", "baby_count": 13, "baby_timer": 88 }, "baby_flags": [ "SPRING" ] }, + { + "id": "mon_duck_chick", + "type": "MONSTER", + "copy-from": "mon_generic_chick_water", + "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." + }, + "upgrades": { "age_grow": 60, "into": "mon_duck" }, + "//": "A year to reach sexual maturity, so lets assume 2/3 of that time to reach roughly adult size." + }, { "id": "mon_goose_canadian", "type": "MONSTER", @@ -304,6 +316,17 @@ "color": "brown", "reproduction": { "baby_egg": "egg_turkey", "baby_count": 17, "baby_timer": 151 } }, + { + "id": "mon_turkey_chick", + "type": "MONSTER", + "copy-from": "mon_generic_chick", + "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." + }, + "upgrades": { "age_grow": 75, "into": "mon_turkey" } + }, { "id": "mon_pheasant", "type": "MONSTER", @@ -380,17 +403,6 @@ "copy-from": "mon_generic_chick_tiny", "upgrades": { "age_grow": 7, "into": "mon_sparrow" } }, - { - "id": "mon_turkey_chick", - "type": "MONSTER", - "copy-from": "mon_generic_chick", - "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." - }, - "upgrades": { "age_grow": 75, "into": "mon_turkey" } - }, { "id": "mon_pheasant_chick", "type": "MONSTER", @@ -403,18 +415,6 @@ "upgrades": { "age_grow": 55, "into": "mon_pheasant" }, "//": "A year to reach sexual maturity, but only 80 days to reach independence, so lets get an average from that." }, - { - "id": "mon_duck_chick", - "type": "MONSTER", - "copy-from": "mon_generic_chick_water", - "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." - }, - "upgrades": { "age_grow": 60, "into": "mon_duck" }, - "//": "A year to reach sexual maturity, so lets assume 2/3 of that time to reach roughly adult size." - }, { "id": "mon_goose_canadian_chick", "type": "MONSTER", From f12572f142fe18fbed0aadda7101ba811df1885a Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:57:12 +0200 Subject: [PATCH 25/36] cormorant chick needs watering --- data/json/monsters/bird.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 5a1a15432e4e3..fc9a6c5cfdbe3 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -638,7 +638,7 @@ { "id": "mon_cormorant_chick", "type": "MONSTER", - "copy-from": "mon_generic_chick", + "copy-from": "mon_generic_chick_water", "upgrades": { "age_grow": 97, "into": "mon_cormorant" }, "//": "2 years to reach sexual maturity, but only 10 weeks to reach independence, so lets get an average from that." }, From 3fef53ddbae1d2a9ea90acf94f54be35204e6e60 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 11:09:13 +0200 Subject: [PATCH 26/36] domestic turk --- data/json/items/comestibles/egg.json | 7 +++++ data/json/monstergroups/eggs.json | 5 ++++ data/json/monsters/bird.json | 29 +++++++++++++++++++ .../json/requirements/cooking_components.json | 1 + 4 files changed, 42 insertions(+) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 04ef79a6bec0b..525776160b621 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -163,6 +163,13 @@ "vitamins": [ [ "iron", "3 mg" ], [ "calcium", "78 mg" ], [ "egg_allergen", 1 ] ], "rot_spawn": "GROUP_EGG_TURKEY" }, + { + "type": "COMESTIBLE", + "id": "egg_turkey_domestic", + "name": { "str": "domestic turkey egg" }, + "copy-from": "egg_turkey", + "rot_spawn": "GROUP_EGG_TURKEY_DOMESTIC" + }, { "type": "COMESTIBLE", "id": "egg_pheasant", diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index f6aa4d2603f90..4aa8e204d4311 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -88,6 +88,11 @@ "type": "monstergroup", "monsters": [ { "monster": "mon_turkey_chick" } ] }, + { + "name": "GROUP_EGG_TURKEY_DOMESTIC", + "type": "monstergroup", + "monsters": [ { "monster": "mon_turkey_domestic_chick" } ] + }, { "name": "GROUP_EGG_PHEASANT", "type": "monstergroup", diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index fc9a6c5cfdbe3..16c3c84aeaa6d 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -327,6 +327,35 @@ }, "upgrades": { "age_grow": 75, "into": "mon_turkey" } }, + { + "id": "mon_turkey_domestic", + "type": "MONSTER", + "name": { "str": "domestic turkey" }, + "description": "A domesticated relative of the common wild turkey. Lost most of its colors and the ability to fly, but at least it got bigger!", + "copy-from": "mon_bird_flightless_base", + "volume": "10667 ml", + "weight": "8 kg", + "hp": 26, + "color": "white", + "reproduction": { "baby_egg": "egg_turkey_domestic", "baby_count": 10, "baby_timer": 21 }, + "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], + "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_turkey_domestic_chick", + "type": "MONSTER", + "copy-from": "mon_generic_chick", + "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." + }, + "upgrades": { "age_grow": 75, "into": "mon_turkey_domestic" } + }, { "id": "mon_pheasant", "type": "MONSTER", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 99cf1a3dacfdc..ce99d48f38f20 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -86,6 +86,7 @@ [ "egg_duck", 1 ], [ "egg_goose_canadian", 1 ], [ "egg_turkey", 1 ], + [ "egg_turkey_domestic", 1 ], [ "egg_pheasant", 1 ], [ "egg_goose", 1 ], [ "egg_hummingbird", 100 ], From febf8edda7ead51ca518849e7e5204dfa2b6d993 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 11:23:19 +0200 Subject: [PATCH 27/36] domestic duck --- data/json/items/comestibles/egg.json | 7 +++++ data/json/monstergroups/eggs.json | 5 ++++ data/json/monsters/bird.json | 30 +++++++++++++++++++ .../json/requirements/cooking_components.json | 1 + 4 files changed, 43 insertions(+) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 525776160b621..5042799ad64ff 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -141,6 +141,13 @@ "vitamins": [ [ "iron", "3 mg" ], [ "calcium", "45 mg" ], [ "egg_allergen", 1 ] ], "rot_spawn": "GROUP_EGG_DUCK" }, + { + "type": "COMESTIBLE", + "id": "egg_duck_domestic", + "name": { "str": "domestic duck egg" }, + "copy-from": "egg_duck", + "rot_spawn": "GROUP_EGG_DUCK_DOMESTIC" + }, { "type": "COMESTIBLE", "id": "egg_goose_canadian", diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json index 4aa8e204d4311..4917b69723785 100644 --- a/data/json/monstergroups/eggs.json +++ b/data/json/monstergroups/eggs.json @@ -78,6 +78,11 @@ "type": "monstergroup", "monsters": [ { "monster": "mon_duck_chick" } ] }, + { + "name": "GROUP_EGG_DUCK_DOMESTIC", + "type": "monstergroup", + "monsters": [ { "monster": "mon_duck_domestic_chick" } ] + }, { "name": "GROUP_EGG_GOOSE_CANADIAN", "type": "monstergroup", diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 16c3c84aeaa6d..c9a3778251bd7 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -286,6 +286,36 @@ "upgrades": { "age_grow": 60, "into": "mon_duck" }, "//": "A year to reach sexual maturity, so lets assume 2/3 of that time to reach roughly adult size." }, + { + "id": "mon_duck_domestic", + "type": "MONSTER", + "name": { "str": "domestic duck" }, + "description": "A domestic variety of the common mallard sporting while plumage.", + "copy-from": "mon_bird_water_base", + "volume": "2400 ml", + "weight": "1800 g", + "hp": 6, + "color": "white", + "reproduction": { "baby_egg": "egg_duck_domestic", "baby_count": 8, "baby_timer": 14 }, + "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], + "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_duck_domestic_chick", + "type": "MONSTER", + "copy-from": "mon_generic_chick_water", + "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." + }, + "upgrades": { "age_grow": 49, "into": "mon_duck_domestic" }, + "//": "28 weeks to start laying eggs for pekins." + }, { "id": "mon_goose_canadian", "type": "MONSTER", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index ce99d48f38f20..65a87602cf2b4 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -84,6 +84,7 @@ [ "egg_waxwing", 17 ], [ "egg_chickadee", 34 ], [ "egg_duck", 1 ], + [ "egg_duck_domestic", 1 ], [ "egg_goose_canadian", 1 ], [ "egg_turkey", 1 ], [ "egg_turkey_domestic", 1 ], From dc4c87f22fbe71c1838b99f4ccde4e1335d18afb Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 11:40:38 +0200 Subject: [PATCH 28/36] domestic bird spawn shakeup --- data/json/monstergroups/misc.json | 30 ++++++++++++++++++++----- data/json/monstergroups/wilderness.json | 8 +++---- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index ff63f4067074e..489b9f39f2b97 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -211,7 +211,7 @@ { "monster": "mon_dog_dachshund", "weight": 2, "cost_multiplier": 25, "pack_size": [ 1, 3 ] }, { "monster": "mon_dog_gshepherd", "weight": 3, "cost_multiplier": 25, "pack_size": [ 1, 3 ] }, { "monster": "mon_dog_samoyed", "weight": 1, "cost_multiplier": 25, "pack_size": [ 1, 3 ] }, - { "monster": "mon_chicken", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 16 ] }, + { "group": "GROUP_BIRD_DOMESTIC", "weight": 50, "cost_multiplier": 5, "pack_size": [ 1, 5 ] }, { "group": "GROUP_COWS", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] }, { "group": "GROUP_HORSES", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 4 ] }, { "group": "GROUP_PIGS", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] }, @@ -221,7 +221,6 @@ { "group": "GROUP_PIGS", "weight": 10, "cost_multiplier": 25, "ends": "90 days", "pack_size": [ 1, 6 ] }, { "group": "GROUP_SHEEPS", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 12 ] }, { "monster": "mon_goat", "weight": 25, "cost_multiplier": 25, "pack_size": [ 1, 12 ] }, - { "monster": "mon_goose", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] }, { "monster": "mon_llama", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] }, { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "3 days", "pack_size": [ 1, 5 ] }, { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "7 days", "pack_size": [ 1, 5 ] }, @@ -235,6 +234,28 @@ { "monster": "mon_ferret", "weight": 10 } ] }, + { + "type": "monstergroup", + "name": "GROUP_BIRD_DOMESTIC", + "default": "mon_chicken", + "is_animal": true, + "monsters": [ + { "monster": "mon_chicken", "weight": 10, "pack_size": [ 1, 4 ] }, + { "monster": "mon_duck_domestic", "weight": 6, "pack_size": [ 1, 3 ] }, + { "monster": "mon_goose", "weight": 3, "pack_size": [ 1, 2 ] }, + { "monster": "mon_turkey_domestic", "weight": 1 } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_BIRD_DOMESTIC_WATERFOWL", + "default": "mon_duck_domestic", + "is_animal": true, + "monsters": [ + { "monster": "mon_duck_domestic", "weight": 2, "pack_size": [ 1, 3 ] }, + { "monster": "mon_goose", "weight": 1, "pack_size": [ 1, 2 ] } + ] + }, { "type": "monstergroup", "name": "GROUP_SAFE", @@ -244,7 +265,7 @@ { "monster": "mon_null", "weight": 679 }, { "monster": "mon_bat", "weight": 10 }, { "monster": "mon_bobcat", "weight": 10 }, - { "monster": "mon_chicken", "weight": 10 }, + { "group": "GROUP_BIRD_DOMESTIC", "weight": 20 }, { "monster": "mon_chipmunk", "weight": 10 }, { "monster": "mon_crow", "weight": 10 }, { "monster": "mon_raven", "weight": 10 }, @@ -278,7 +299,6 @@ { "group": "GROUP_SHEEPS", "weight": 10 }, { "monster": "mon_goat", "weight": 10 }, { "monster": "mon_lemming", "weight": 10 }, - { "monster": "mon_goose", "weight": 10 }, { "monster": "mon_llama", "weight": 10 }, { "monster": "mon_woodlouse", "weight": 10 }, { "monster": "mon_cicada_nymph", "weight": 10 }, @@ -520,7 +540,6 @@ { "monster": "mon_opossum", "weight": 10 }, { "monster": "mon_squirrel", "weight": 20 }, { "monster": "mon_weasel", "weight": 20 }, - { "monster": "mon_chicken", "weight": 10 }, { "monster": "mon_grouse", "weight": 10 }, { "monster": "mon_pheasant", "weight": 10 }, { "monster": "mon_turkey", "weight": 20 } @@ -532,7 +551,6 @@ "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.", "//2": "This group can only be picked from when the hunt large animals mission is used, in addition to GROUP_CAMP_HUNTING.", "monsters": [ - { "monster": "mon_chicken", "weight": 20 }, { "monster": "mon_grouse", "weight": 2 }, { "monster": "mon_pheasant", "weight": 2 }, { "monster": "mon_turkey", "weight": 10 }, diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index 22ac6f2efa300..24b716d9269e8 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -356,7 +356,7 @@ "pack_size": [ 1, 3 ] }, { "group": "GROUP_WATER_STRIDER", "weight": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, - { "monster": "mon_goose", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, + { "group": "GROUP_BIRD_DOMESTIC_WATERFOWL", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 2 ] }, { "monster": "mon_coot", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, { "monster": "mon_moorhen", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, { "monster": "mon_cormorant", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, @@ -521,7 +521,6 @@ { "monster": "mon_chipmunk", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_squirrel", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_squirrel_red", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_chicken", "weight": 10 }, { "monster": "mon_turkey", "weight": 10 }, { "monster": "mon_raccoon", @@ -565,7 +564,7 @@ "monsters": [ { "monster": "mon_duck", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_goose_canadian", "weight": 50, "cost_multiplier": 0 }, - { "monster": "mon_goose", "weight": 50, "cost_multiplier": 0 }, + { "group": "GROUP_BIRD_DOMESTIC_WATERFOWL", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_coot", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_moorhen", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_cormorant", "weight": 50, "cost_multiplier": 0 }, @@ -627,7 +626,7 @@ "is_animal": true, "monsters": [ { "monster": "mon_goat", "weight": 1, "pack_size": [ 1, 4 ] }, - { "monster": "mon_chicken", "weight": 10, "pack_size": [ 4, 6 ] } + { "group": "GROUP_BIRD_DOMESTIC", "weight": 10, "pack_size": [ 1, 2 ] } ] }, { @@ -636,7 +635,6 @@ "is_animal": true, "monsters": [ { "monster": "mon_duck", "weight": 20, "pack_size": [ 1, 4 ], "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }, - { "monster": "mon_goose", "weight": 15, "pack_size": [ 2, 4 ] }, { "monster": "mon_coot", "weight": 15, "pack_size": [ 2, 4 ] }, { "monster": "mon_moorhen", "weight": 15, "pack_size": [ 2, 4 ] }, { "monster": "mon_cormorant", "weight": 15, "pack_size": [ 2, 4 ] }, From 1b5e9fa4edad624fae42061426bf6937cbe3e792 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 11:56:17 +0200 Subject: [PATCH 29/36] right the wrongs --- data/json/items/comestibles/egg.json | 5 +++-- data/json/monstergroups/misc.json | 8 ++++---- data/json/monstergroups/wilderness.json | 4 ++-- data/json/monsters/bird.json | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 5042799ad64ff..05eaf3b5aee51 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1220,7 +1220,9 @@ "name": { "str": "ruby-throated hummingbird egg" }, "spoils_in": "7 days", "copy-from": "egg_chicken", - "proportional": { "volume": 0.01, "weight": 0.01, "calories": 0.01 }, + "proportional": { "weight": 0.01, "calories": 0.01 }, + "volume": "1 ml", + "//": "Volume defined manually because proportional rounded it down to 0", "rot_spawn": "GROUP_EGG_HUMMINGBIRD" }, { @@ -1253,7 +1255,6 @@ "type": "COMESTIBLE", "id": "egg_moorhen", "name": { "str": "common gallinule egg" }, - "spoils_in": "11 days", "copy-from": "egg_chicken", "proportional": { "volume": 0.73, "weight": 0.73, "calories": 0.73 }, "rot_spawn": "GROUP_EGG_MOORHEN" diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json index 489b9f39f2b97..f963b75d9b48c 100644 --- a/data/json/monstergroups/misc.json +++ b/data/json/monstergroups/misc.json @@ -211,7 +211,7 @@ { "monster": "mon_dog_dachshund", "weight": 2, "cost_multiplier": 25, "pack_size": [ 1, 3 ] }, { "monster": "mon_dog_gshepherd", "weight": 3, "cost_multiplier": 25, "pack_size": [ 1, 3 ] }, { "monster": "mon_dog_samoyed", "weight": 1, "cost_multiplier": 25, "pack_size": [ 1, 3 ] }, - { "group": "GROUP_BIRD_DOMESTIC", "weight": 50, "cost_multiplier": 5, "pack_size": [ 1, 5 ] }, + { "group": "GROUP_BIRD_DOMESTIC", "weight": 50, "cost_multiplier": 5, "pack_size": [ 1, 12 ] }, { "group": "GROUP_COWS", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] }, { "group": "GROUP_HORSES", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 4 ] }, { "group": "GROUP_PIGS", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] }, @@ -243,7 +243,7 @@ { "monster": "mon_chicken", "weight": 10, "pack_size": [ 1, 4 ] }, { "monster": "mon_duck_domestic", "weight": 6, "pack_size": [ 1, 3 ] }, { "monster": "mon_goose", "weight": 3, "pack_size": [ 1, 2 ] }, - { "monster": "mon_turkey_domestic", "weight": 1 } + { "monster": "mon_turkey_domestic", "weight": 1, "pack_size": [ 1, 2 ] } ] }, { @@ -252,8 +252,8 @@ "default": "mon_duck_domestic", "is_animal": true, "monsters": [ - { "monster": "mon_duck_domestic", "weight": 2, "pack_size": [ 1, 3 ] }, - { "monster": "mon_goose", "weight": 1, "pack_size": [ 1, 2 ] } + { "monster": "mon_duck_domestic", "weight": 2, "pack_size": [ 1, 6 ] }, + { "monster": "mon_goose", "weight": 1, "pack_size": [ 1, 3 ] } ] }, { diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index 24b716d9269e8..79cf5afb648a0 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -356,7 +356,7 @@ "pack_size": [ 1, 3 ] }, { "group": "GROUP_WATER_STRIDER", "weight": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }, - { "group": "GROUP_BIRD_DOMESTIC_WATERFOWL", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 2 ] }, + { "group": "GROUP_BIRD_DOMESTIC_WATERFOWL", "weight": 15, "cost_multiplier": 5 }, { "monster": "mon_coot", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, { "monster": "mon_moorhen", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] }, { "monster": "mon_cormorant", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] }, @@ -564,7 +564,7 @@ "monsters": [ { "monster": "mon_duck", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_goose_canadian", "weight": 50, "cost_multiplier": 0 }, - { "group": "GROUP_BIRD_DOMESTIC_WATERFOWL", "weight": 50, "cost_multiplier": 0 }, + { "group": "GROUP_BIRD_DOMESTIC_WATERFOWL", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 1 ] }, { "monster": "mon_coot", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_moorhen", "weight": 50, "cost_multiplier": 0 }, { "monster": "mon_cormorant", "weight": 50, "cost_multiplier": 0 }, diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index c9a3778251bd7..9fd20cb9b221d 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -292,6 +292,7 @@ "name": { "str": "domestic duck" }, "description": "A domestic variety of the common mallard sporting while plumage.", "copy-from": "mon_bird_water_base", + "looks_like": "mon_duck", "volume": "2400 ml", "weight": "1800 g", "hp": 6, @@ -363,6 +364,7 @@ "name": { "str": "domestic turkey" }, "description": "A domesticated relative of the common wild turkey. Lost most of its colors and the ability to fly, but at least it got bigger!", "copy-from": "mon_bird_flightless_base", + "looks_like": "mon_turkey", "volume": "10667 ml", "weight": "8 kg", "hp": 26, From 3f141fb452eb435f4fca51cf897e5cb479bc55c5 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 12:03:37 +0200 Subject: [PATCH 30/36] Update bird.json --- data/mods/Tamable_Wildlife/bird.json | 72 +++------------------------- 1 file changed, 6 insertions(+), 66 deletions(-) diff --git a/data/mods/Tamable_Wildlife/bird.json b/data/mods/Tamable_Wildlife/bird.json index 7541d44e31a3a..3311cf9eeb39f 100644 --- a/data/mods/Tamable_Wildlife/bird.json +++ b/data/mods/Tamable_Wildlife/bird.json @@ -147,19 +147,17 @@ "food": [ "BIRDFOOD" ], "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." - }, - "extend": { "flags": [ "CANPLAY" ] } + } }, { - "id": "mon_goose_canadian", + "id": "mon_goose_canadian_chick", "type": "MONSTER", "copy-from": "mon_goose_canadian", "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." - }, - "extend": { "flags": [ "CANPLAY" ] } + } }, { "id": "mon_turkey", @@ -169,8 +167,7 @@ "food": [ "BIRDFOOD" ], "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." - }, - "extend": { "flags": [ "CANPLAY" ] } + } }, { "id": "mon_pheasant", @@ -180,8 +177,7 @@ "food": [ "BIRDFOOD" ], "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." - }, - "extend": { "flags": [ "CANPLAY" ] } + } }, { "id": "mon_hummingbird_chick", @@ -201,8 +197,7 @@ "food": [ "BIRDFOOD" ], "feed": "The %s seems to like you! It quickly flies around you and seems friendly.", "pet": "The %s flies around you." - }, - "extend": { "flags": [ "CANPLAY" ] } + } }, { "id": "mon_woodpecker_chick", @@ -214,17 +209,6 @@ "pet": "The %s runs around your leg." } }, - { - "id": "mon_woodpecker", - "type": "MONSTER", - "copy-from": "mon_woodpecker", - "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." - }, - "extend": { "flags": [ "CANPLAY" ] } - }, { "id": "mon_coot_chick", "type": "MONSTER", @@ -235,17 +219,6 @@ "pet": "The %s runs around your leg." } }, - { - "id": "mon_coot", - "type": "MONSTER", - "copy-from": "mon_coot", - "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." - }, - "extend": { "flags": [ "CANPLAY" ] } - }, { "id": "mon_cormorant_chick", "type": "MONSTER", @@ -256,17 +229,6 @@ "pet": "The %s runs around your leg." } }, - { - "id": "mon_cormorant", - "type": "MONSTER", - "copy-from": "mon_coot", - "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." - }, - "extend": { "flags": [ "CANPLAY" ] } - }, { "id": "mon_moorhen_chick", "type": "MONSTER", @@ -277,17 +239,6 @@ "pet": "The %s runs around your leg." } }, - { - "id": "mon_moorhen", - "type": "MONSTER", - "copy-from": "mon_coot", - "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." - }, - "extend": { "flags": [ "CANPLAY" ] } - }, { "id": "mon_grebe_chick", "type": "MONSTER", @@ -297,16 +248,5 @@ "feed": "The %s seems to like you! It runs around your legs and seems friendly.", "pet": "The %s runs around your leg." } - }, - { - "id": "mon_grebe", - "type": "MONSTER", - "copy-from": "mon_coot", - "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." - }, - "extend": { "flags": [ "CANPLAY" ] } } ] From ce68f389840fe8018a37b05d16980ffaba278492 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 12:07:27 +0200 Subject: [PATCH 31/36] grouse taming in mods --- data/mods/Tamable_Wildlife/bird.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/mods/Tamable_Wildlife/bird.json b/data/mods/Tamable_Wildlife/bird.json index 3311cf9eeb39f..b62c8c3ee0b70 100644 --- a/data/mods/Tamable_Wildlife/bird.json +++ b/data/mods/Tamable_Wildlife/bird.json @@ -179,6 +179,16 @@ "pet": "The %s runs around your leg." } }, + { + "id": "mon_grouse_chick", + "type": "MONSTER", + "copy-from": "mon_grouse_chick", + "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_hummingbird_chick", "type": "MONSTER", From d13a1b828634f4c0a22a49c1d7e0adf4bdf79938 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 12:10:16 +0200 Subject: [PATCH 32/36] Update bird.json --- data/mods/Tamable_Wildlife/bird.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Tamable_Wildlife/bird.json b/data/mods/Tamable_Wildlife/bird.json index b62c8c3ee0b70..15b800a680e01 100644 --- a/data/mods/Tamable_Wildlife/bird.json +++ b/data/mods/Tamable_Wildlife/bird.json @@ -152,7 +152,7 @@ { "id": "mon_goose_canadian_chick", "type": "MONSTER", - "copy-from": "mon_goose_canadian", + "copy-from": "mon_goose_canadian_chick", "petfood": { "food": [ "BIRDFOOD" ], "feed": "The %s seems to like you! It runs around your legs and seems friendly.", From 9dd6cb566dc9debdf3793a9a7d42eb2ff4c46733 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 12:22:36 +0200 Subject: [PATCH 33/36] expand tropicata brazilian blacklist --- .../blacklists/default_blacklist.json | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/data/mods/TropiCataclysm/blacklists/default_blacklist.json b/data/mods/TropiCataclysm/blacklists/default_blacklist.json index cd9d288603db3..5c305c29f6888 100644 --- a/data/mods/TropiCataclysm/blacklists/default_blacklist.json +++ b/data/mods/TropiCataclysm/blacklists/default_blacklist.json @@ -3,11 +3,13 @@ "type": "MONSTER_BLACKLIST", "monsters": [ "mon_grouse", + "mon_grouse_chick", "mon_goose_canadian", + "mon_goose_canadian_chick", "mon_pheasant", - "mon_grouse_chick", "mon_pheasant_chick", - "mon_goose_canadian_chick", + "mon_turkey", + "mon_turkey_chick", "mon_cardinal", "mon_cardinal_chick", "mon_robin", @@ -18,6 +20,16 @@ "mon_chickadee_chick", "mon_waxwing", "mon_waxwing_chick", + "mon_woodpecker", + "mon_woodpecker_chick", + "mon_grebe", + "mon_grebe_chick", + "mon_hummingbird", + "mon_hummingbird_chick", + "mon_coot", + "mon_coot_chick", + "mon_cormorant", + "mon_cormorant_chick", "mon_fish_brown_trout", "mon_fry_brown_trout", "mon_fish_brook_trout", From 5bc1667511e4b7df9d6ebc38d402b7d783fed603 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:15:40 +0200 Subject: [PATCH 34/36] Update egg.json --- data/json/items/comestibles/egg.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 05eaf3b5aee51..8c5b3de4ad6d8 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1220,9 +1220,10 @@ "name": { "str": "ruby-throated hummingbird egg" }, "spoils_in": "7 days", "copy-from": "egg_chicken", - "proportional": { "weight": 0.01, "calories": 0.01 }, + "proportional": { "weight": 0.01 }, "volume": "1 ml", - "//": "Volume defined manually because proportional rounded it down to 0", + "calories": 1, + "//": "Volume and calories defined manually because proportional rounded them down to 0", "rot_spawn": "GROUP_EGG_HUMMINGBIRD" }, { From fd6fa3c2c0db3b20b7e1cf4505f815dca1ec9a75 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sun, 18 Aug 2024 18:24:40 +0200 Subject: [PATCH 35/36] HP calculation adjustments --- data/json/monsters/bird.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 9fd20cb9b221d..00ec0e7437ed8 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -133,7 +133,7 @@ "copy-from": "mon_bird_flightless_base", "volume": "2667 ml", "weight": "2 kg", - "hp": 7, + "hp": 5, "speed": 95, "color": "white", "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 2 }, @@ -152,7 +152,6 @@ "copy-from": "mon_bird_flying_base", "volume": "860 ml", "weight": "645 g", - "hp": 2, "speed": 140, "color": "brown", "reproduction": { "baby_egg": "egg_grouse", "baby_count": 11, "baby_timer": 35 } @@ -269,7 +268,7 @@ "copy-from": "mon_bird_water_base", "volume": "1387 ml", "weight": "1040 g", - "hp": 3, + "hp": 2, "color": "brown", "reproduction": { "baby_egg": "egg_duck", "baby_count": 13, "baby_timer": 88 }, "baby_flags": [ "SPRING" ] @@ -295,7 +294,7 @@ "looks_like": "mon_duck", "volume": "2400 ml", "weight": "1800 g", - "hp": 6, + "hp": 4, "color": "white", "reproduction": { "baby_egg": "egg_duck_domestic", "baby_count": 8, "baby_timer": 14 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], @@ -325,7 +324,7 @@ "copy-from": "mon_bird_water_base", "volume": "5333 ml", "weight": "4 kg", - "hp": 14, + "hp": 11, "aggression": 0, "morale": 15, "anger_triggers": [ "PLAYER_CLOSE", "FRIEND_ATTACKED" ], @@ -342,7 +341,7 @@ "volume": "8 L", "weight": "6 kg", "//": "3.6-5.4kg for females, 6.8-11kg for males. We don't differentiate genders, so lets take a rough middle ground.", - "hp": 21, + "hp": 16, "speed": 140, "color": "brown", "reproduction": { "baby_egg": "egg_turkey", "baby_count": 17, "baby_timer": 151 } @@ -367,7 +366,7 @@ "looks_like": "mon_turkey", "volume": "10667 ml", "weight": "8 kg", - "hp": 26, + "hp": 20, "color": "white", "reproduction": { "baby_egg": "egg_turkey_domestic", "baby_count": 10, "baby_timer": 21 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ], @@ -588,7 +587,7 @@ "copy-from": "mon_bird_water_base", "volume": "5 L", "weight": "3750 g", - "hp": 13, + "hp": 10, "looks_like": "mon_goose_canadian", "aggression": 1, "morale": 15, @@ -664,7 +663,7 @@ "description": "An aquatic bird with a long snake-like neck. While often considered coastal birds, they feel just as at home in freshwater habitats.", "volume": "2467 ml", "weight": "1850 g", - "hp": 6, + "hp": 5, "speed": 110, "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 7, "baby_timer": 98 } }, From e25e90b1f5c89cf3082409b05b89b591a8b27fb7 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:52:51 +0200 Subject: [PATCH 36/36] fix the typo or I'll lose my mind --- data/json/monsters/bird.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json index 00ec0e7437ed8..122345bc3d57c 100644 --- a/data/json/monsters/bird.json +++ b/data/json/monsters/bird.json @@ -3,7 +3,7 @@ "abstract": "mon_bird_flying_base", "type": "MONSTER", "name": { "str": "flying bird abstract" }, - "description": "This is an abstract monsters for other flying birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can fly, but cannot swim.", + "description": "This is an abstract monster for other flying birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can fly, but cannot swim.", "bodytype": "bird", "default_faction": "small_animal", "categories": [ "WILDLIFE" ], @@ -48,7 +48,7 @@ "abstract": "mon_bird_flightless_base", "type": "MONSTER", "name": { "str": "flightless bird abstract" }, - "description": "This is an abstract monsters for other flightless birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can neither fly nor swim.", + "description": "This is an abstract monster for other flightless birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can neither fly nor swim.", "copy-from": "mon_bird_flying_base", "speed": 105, "delete": { "flags": [ "FLIES" ] } @@ -57,7 +57,7 @@ "abstract": "mon_bird_water_base", "type": "MONSTER", "name": { "str": "water bird abstract" }, - "description": "This is an abstract monsters for other water birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can both fly and swim.", + "description": "This is an abstract monster for other water birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can both fly and swim.", "copy-from": "mon_bird_flying_base", "speed": 85, "extend": { "flags": [ "SWIMS" ] }