Skip to content

Commit

Permalink
Audit the remaining vanilla birds (CleverRaven#75779)
Browse files Browse the repository at this point in the history
* HP calculation + comment cleanup

* abstracts

* revise HP calculations

* I hate moving file contents but this is nonactionable

Potentially for reversion

* waterfowl chick abstract

* speeds for abstracts

* chicken + grouse

* mallard + grouse egg

* fix tileset issues with chicks

* obsolete the golden honker

* turkey

* pheasant

* canada goose

* woodpecker

* grebe

* hummingbird + cooking requirement collection

* coot

* moorhen

* cormorant

* oops wrong name

* evil in my sight

* cormorant HP

* goots

* forgive me but I can't manage this

reorganizes some file contents

* cormorant chick needs watering

* domestic turk

* domestic duck

* domestic bird spawn shakeup

* right the wrongs

* Update bird.json

* grouse taming in mods

* Update bird.json

* expand tropicata brazilian blacklist

* Update egg.json

* HP calculation adjustments

* fix the typo or I'll lose my mind
  • Loading branch information
Karol1223 authored Aug 22, 2024
1 parent 88e7ada commit ab77a1f
Show file tree
Hide file tree
Showing 9 changed files with 411 additions and 491 deletions.
96 changes: 54 additions & 42 deletions data/json/items/comestibles/egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@
{
"type": "COMESTIBLE",
"id": "egg_grouse",
"name": { "str": "grouse egg" },
"name": { "str": "ruffed grouse egg" },
"spoils_in": "13 days",
"copy-from": "egg_chicken",
"proportional": { "volume": 0.73, "weight": 0.73, "calories": 0.73 },
"rot_spawn": "GROUP_EGG_GROUSE"
},
{
Expand Down Expand Up @@ -131,43 +133,54 @@
{
"type": "COMESTIBLE",
"id": "egg_duck",
"name": { "str": "duck egg" },
"copy-from": "egg_chicken",
"name": { "str": "mallard egg" },
"spoils_in": "14 days",
"copy-from": "egg_chicken",
"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"
},
{
"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",
"name": { "str": "goose egg" },
"spoils_in": "14 days",
"name": { "str": "Canada goose egg" },
"spoils_in": "15 days",
"copy-from": "egg_chicken",
"calories": 266,
"volume": "130 ml",
"weight": "143 g",
"vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ],
"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"
},
{
"type": "COMESTIBLE",
"id": "egg_turkey",
"name": { "str": "turkey egg" },
"spoils_in": "14 days",
"name": { "str": "wild turkey egg" },
"spoils_in": "15 days",
"copy-from": "egg_chicken",
"volume": "83 ml",
"weight": "79 g",
"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"
},
{
"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",
"name": { "str": "pheasant egg" },
"name": { "str": "ring-necked pheasant egg" },
"spoils_in": "14 days",
"copy-from": "egg_chicken",
"rot_spawn": "GROUP_EGG_PHEASANT"
Expand Down Expand Up @@ -1194,64 +1207,63 @@
{
"type": "COMESTIBLE",
"id": "egg_goose",
"name": "goose egg",
"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 },
"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"
},
{
"type": "COMESTIBLE",
"id": "egg_hummingbird",
"name": "hummingbird egg",
"spoils_in": "8 days",
"copy-from": "egg_crow",
"name": { "str": "ruby-throated hummingbird egg" },
"spoils_in": "7 days",
"copy-from": "egg_chicken",
"proportional": { "weight": 0.01 },
"volume": "1 ml",
"weight": "1 g",
"calories": 1,
"//": "Volume and calories defined manually because proportional rounded them down to 0",
"rot_spawn": "GROUP_EGG_HUMMINGBIRD"
},
{
"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"
},
{
"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"
},
{
"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"
},
{
"type": "COMESTIBLE",
"id": "egg_moorhen",
"name": "moorhen egg",
"spoils_in": "10 days",
"name": { "str": "common gallinule egg" },
"copy-from": "egg_chicken",
"proportional": { "volume": 0.73, "weight": 0.73, "calories": 0.73 },
"rot_spawn": "GROUP_EGG_MOORHEN"
},
{
"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"
Expand Down
18 changes: 11 additions & 7 deletions data/json/monstergroups/eggs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
},
{
Expand Down Expand Up @@ -79,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",
Expand All @@ -89,6 +93,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",
Expand Down Expand Up @@ -241,11 +250,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",
Expand Down
31 changes: 24 additions & 7 deletions data/json/monstergroups/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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, 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 ] },
Expand All @@ -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 ] },
Expand All @@ -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, "pack_size": [ 1, 2 ] }
]
},
{
"type": "monstergroup",
"name": "GROUP_BIRD_DOMESTIC_WATERFOWL",
"default": "mon_duck_domestic",
"is_animal": true,
"monsters": [
{ "monster": "mon_duck_domestic", "weight": 2, "pack_size": [ 1, 6 ] },
{ "monster": "mon_goose", "weight": 1, "pack_size": [ 1, 3 ] }
]
},
{
"type": "monstergroup",
"name": "GROUP_SAFE",
Expand All @@ -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 },
Expand Down Expand Up @@ -278,8 +299,6 @@
{ "group": "GROUP_SHEEPS", "weight": 10 },
{ "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 },
Expand Down Expand Up @@ -521,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 }
Expand All @@ -533,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 },
Expand Down
11 changes: 4 additions & 7 deletions data/json/monstergroups/wilderness.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
{ "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 ] },
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -565,12 +564,11 @@
"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, "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 },
{ "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 }
]
},
{
Expand Down Expand Up @@ -628,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 ] }
]
},
{
Expand All @@ -637,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 ] },
Expand Down
Loading

0 comments on commit ab77a1f

Please sign in to comment.