Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace baby_egg, baby_monster, baby_monster_group with struct #76266

Merged
merged 4 commits into from
Sep 10, 2024
Merged

replace baby_egg, baby_monster, baby_monster_group with struct #76266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1925b8
replace baby_egg, baby_monster, baby_monster_group with struct
GuardianDll Sep 7, 2024
825c03b
Merge branch 'master' into baby_struct
GuardianDll Sep 7, 2024
36e36a0
move test to another PR to not hold this one
GuardianDll Sep 8, 2024
362ad38
move more test stuff to test PR
GuardianDll Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions data/json/monsters/bird.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"hp": 5,
"speed": 95,
"color": "white",
"reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 2 },
"reproduction": { "baby_type": { "baby_egg": "egg_chicken" }, "baby_count": 1, "baby_timer": 2 },
"baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ],
"petfood": {
"food": [ "BIRDFOOD" ],
Expand All @@ -157,7 +157,7 @@
"weight": "645 g",
"speed": 140,
"color": "brown",
"reproduction": { "baby_egg": "egg_grouse", "baby_count": 11, "baby_timer": 35 }
"reproduction": { "baby_type": { "baby_egg": "egg_grouse" }, "baby_count": 11, "baby_timer": 35 }
},
{
"id": "mon_crow",
Expand All @@ -170,7 +170,7 @@
"color": "dark_gray",
"stomach_size": 30,
"special_attacks": [ [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ],
"reproduction": { "baby_egg": "egg_crow", "baby_count": 4, "baby_timer": 18 },
"reproduction": { "baby_type": { "baby_egg": "egg_crow" }, "baby_count": 4, "baby_timer": 18 },
"extend": { "flags": [ "EATS" ] }
},
{
Expand All @@ -185,7 +185,7 @@
"color": "dark_gray",
"stomach_size": 50,
"special_attacks": [ [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ],
"reproduction": { "baby_egg": "egg_raven", "baby_count": 5, "baby_timer": 18 },
"reproduction": { "baby_type": { "baby_egg": "egg_raven" }, "baby_count": 5, "baby_timer": 18 },
"extend": { "flags": [ "EATS" ] }
},
{
Expand All @@ -198,7 +198,7 @@
"volume": "120 ml",
"weight": "90 g",
"color": "light_blue",
"reproduction": { "baby_egg": "egg_bluejay", "baby_count": 5, "baby_timer": 18 }
"reproduction": { "baby_type": { "baby_egg": "egg_bluejay" }, "baby_count": 5, "baby_timer": 18 }
},
{
"id": "mon_cardinal",
Expand All @@ -210,7 +210,7 @@
"volume": "60 ml",
"weight": "45 g",
"color": "red",
"reproduction": { "baby_egg": "egg_cardinal", "baby_count": 3, "baby_timer": 16 }
"reproduction": { "baby_type": { "baby_egg": "egg_cardinal" }, "baby_count": 3, "baby_timer": 16 }
},
{
"id": "mon_robin",
Expand All @@ -222,7 +222,7 @@
"volume": "103 ml",
"weight": "77 g",
"color": "brown",
"reproduction": { "baby_egg": "egg_robin", "baby_count": 5, "baby_timer": 16 }
"reproduction": { "baby_type": { "baby_egg": "egg_robin" }, "baby_count": 5, "baby_timer": 16 }
},
{
"id": "mon_sparrow",
Expand All @@ -233,7 +233,7 @@
"default_faction": "bird_tiny_flying",
"volume": "40 ml",
"weight": "30 g",
"reproduction": { "baby_egg": "egg_sparrow", "baby_count": 5, "baby_timer": 16 }
"reproduction": { "baby_type": { "baby_egg": "egg_sparrow" }, "baby_count": 5, "baby_timer": 16 }
},
{
"id": "mon_chickadee",
Expand All @@ -244,7 +244,7 @@
"default_faction": "bird_tiny_flying",
"volume": "16 ml",
"weight": "12 g",
"reproduction": { "baby_egg": "egg_chickadee", "baby_count": 8, "baby_timer": 14 }
"reproduction": { "baby_type": { "baby_egg": "egg_chickadee" }, "baby_count": 8, "baby_timer": 14 }
},
{
"id": "mon_chickadee_chick",
Expand All @@ -261,7 +261,7 @@
"default_faction": "bird_tiny_flying",
"volume": "40 ml",
"weight": "30 g",
"reproduction": { "baby_egg": "egg_waxwing", "baby_count": 5, "baby_timer": 16 }
"reproduction": { "baby_type": { "baby_egg": "egg_waxwing" }, "baby_count": 5, "baby_timer": 16 }
},
{
"id": "mon_waxwing_chick",
Expand All @@ -279,7 +279,7 @@
"weight": "1040 g",
"hp": 2,
"color": "brown",
"reproduction": { "baby_egg": "egg_duck", "baby_count": 13, "baby_timer": 88 },
"reproduction": { "baby_type": { "baby_egg": "egg_duck" }, "baby_count": 13, "baby_timer": 88 },
"baby_flags": [ "SPRING" ]
},
{
Expand All @@ -305,7 +305,7 @@
"weight": "1800 g",
"hp": 4,
"color": "white",
"reproduction": { "baby_egg": "egg_duck_domestic", "baby_count": 8, "baby_timer": 14 },
"reproduction": { "baby_type": { "baby_egg": "egg_duck_domestic" }, "baby_count": 8, "baby_timer": 14 },
"baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
"petfood": {
"food": [ "BIRDFOOD" ],
Expand Down Expand Up @@ -338,7 +338,7 @@
"morale": 15,
"anger_triggers": [ "PLAYER_CLOSE", "FRIEND_ATTACKED" ],
"fear_triggers": [ "FRIEND_DIED", "FIRE", "HURT" ],
"reproduction": { "baby_egg": "egg_goose_canadian", "baby_count": 10, "baby_timer": 350 },
"reproduction": { "baby_type": { "baby_egg": "egg_goose_canadian" }, "baby_count": 10, "baby_timer": 350 },
"baby_flags": [ "SPRING" ]
},
{
Expand All @@ -353,7 +353,7 @@
"hp": 16,
"speed": 140,
"color": "brown",
"reproduction": { "baby_egg": "egg_turkey", "baby_count": 17, "baby_timer": 151 }
"reproduction": { "baby_type": { "baby_egg": "egg_turkey" }, "baby_count": 17, "baby_timer": 151 }
},
{
"id": "mon_turkey_chick",
Expand All @@ -377,7 +377,7 @@
"weight": "8 kg",
"hp": 20,
"color": "white",
"reproduction": { "baby_egg": "egg_turkey_domestic", "baby_count": 10, "baby_timer": 21 },
"reproduction": { "baby_type": { "baby_egg": "egg_turkey_domestic" }, "baby_count": 10, "baby_timer": 21 },
"baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
"petfood": {
"food": [ "BIRDFOOD" ],
Expand Down Expand Up @@ -407,7 +407,7 @@
"//": "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 },
"reproduction": { "baby_type": { "baby_egg": "egg_pheasant" }, "baby_count": 15, "baby_timer": 108 },
"baby_flags": [ "SPRING" ]
},
{
Expand Down Expand Up @@ -570,7 +570,7 @@
"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",
"reproduction": { "baby_egg": "egg_pigeon", "baby_count": 3, "baby_timer": 32 },
"reproduction": { "baby_type": { "baby_egg": "egg_pigeon" }, "baby_count": 3, "baby_timer": 32 },
"petfood": {
"food": [ "BIRDFOOD" ],
"feed": "The %s seems to like you! It runs around your legs and seems friendly.",
Expand Down Expand Up @@ -601,7 +601,7 @@
"aggression": 1,
"morale": 15,
"fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
"reproduction": { "baby_egg": "egg_goose", "baby_count": 15, "baby_timer": 35 },
"reproduction": { "baby_type": { "baby_egg": "egg_goose" }, "baby_count": 15, "baby_timer": 35 },
"baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
"petfood": {
"food": [ "BIRDFOOD" ],
Expand Down Expand Up @@ -630,7 +630,7 @@
"volume": "5 ml",
"weight": "3600 mg",
"color": "light_green",
"reproduction": { "baby_egg": "egg_hummingbird", "baby_count": 3, "baby_timer": 36 },
"reproduction": { "baby_type": { "baby_egg": "egg_hummingbird" }, "baby_count": 3, "baby_timer": 36 },
"baby_flags": [ "SPRING" ]
},
{
Expand All @@ -642,7 +642,7 @@
"default_faction": "bird_tiny_flying",
"volume": "35 ml",
"weight": "26 g",
"reproduction": { "baby_egg": "egg_woodpecker", "baby_count": 5, "baby_timer": 30 }
"reproduction": { "baby_type": { "baby_egg": "egg_woodpecker" }, "baby_count": 5, "baby_timer": 30 }
},
{
"id": "mon_hummingbird_chick",
Expand All @@ -664,7 +664,7 @@
"copy-from": "mon_bird_water_base",
"volume": "733 ml",
"weight": "550 g",
"reproduction": { "baby_egg": "egg_coot", "baby_count": 10, "baby_timer": 83 }
"reproduction": { "baby_type": { "baby_egg": "egg_coot" }, "baby_count": 10, "baby_timer": 83 }
},
{
"id": "mon_cormorant",
Expand All @@ -677,7 +677,7 @@
"weight": "1850 g",
"hp": 5,
"speed": 110,
"reproduction": { "baby_egg": "egg_cormorant", "baby_count": 7, "baby_timer": 98 }
"reproduction": { "baby_type": { "baby_egg": "egg_cormorant" }, "baby_count": 7, "baby_timer": 98 }
},
{
"id": "mon_moorhen",
Expand All @@ -688,7 +688,7 @@
"volume": "511 ml",
"weight": "383 g",
"speed": 110,
"reproduction": { "baby_egg": "egg_moorhen", "baby_count": 8, "baby_timer": 78 }
"reproduction": { "baby_type": { "baby_egg": "egg_moorhen" }, "baby_count": 8, "baby_timer": 78 }
},
{
"id": "mon_grebe",
Expand All @@ -700,7 +700,7 @@
"volume": "580 ml",
"weight": "435 g",
"color": "brown",
"reproduction": { "baby_egg": "egg_grebe", "baby_count": 8, "baby_timer": 49 }
"reproduction": { "baby_type": { "baby_egg": "egg_grebe" }, "baby_count": 8, "baby_timer": 49 }
},
{
"id": "mon_coot_chick",
Expand Down
Loading
Loading