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

Amphibian Additions - Phase 1 - Non-Monstrous Frogs, Toads, and Treefrogs #67259

Merged
merged 15 commits into from
Aug 19, 2023
Merged

Amphibian Additions - Phase 1 - Non-Monstrous Frogs, Toads, and Treefrogs #67259

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
239f2f8
Rebuild of Phase 1
TheSaddestGoomba Jul 29, 2023
23383a2
Bugfix
TheSaddestGoomba Jul 29, 2023
a0333ea
Update data/json/monsters/reptile_amphibian.json
TheSaddestGoomba Jul 29, 2023
157e6a1
Update reptile_amphibian.json
TheSaddestGoomba Jul 29, 2023
cedcfcf
Clean up of new monsters and groups
TheSaddestGoomba Aug 5, 2023
2b530fa
Remove "WHISTLE" flag
TheSaddestGoomba Aug 5, 2023
f453d3e
Cleanup Abstracts
TheSaddestGoomba Aug 5, 2023
80ceb8a
Remove old monsters and replace references
TheSaddestGoomba Aug 5, 2023
d02a708
Update data/json/requirements/cooking_components.json
TheSaddestGoomba Aug 6, 2023
bd2e729
Fix missing double-spaces
TheSaddestGoomba Aug 8, 2023
e0790fd
Make abstract egg an abstract
TheSaddestGoomba Aug 10, 2023
2284b1f
Mutant meat and egg nutrition
TheSaddestGoomba Aug 11, 2023
91ba684
Restore deleted entries, set for obsoletion
TheSaddestGoomba Aug 13, 2023
d63b2b1
Mods Updates
TheSaddestGoomba Aug 15, 2023
46d8c87
Update data/mods/Megafauna/monstergroups/wilderness.json
TheSaddestGoomba Aug 15, 2023
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
122 changes: 122 additions & 0 deletions data/json/items/comestibles/egg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,5 +1169,127 @@
"material": [ "egg", "veggy" ],
"fun": 5,
"flags": [ "EATEN_HOT", "FREEZERBURN" ]
},
{
"type": "COMESTIBLE",
"id": "egg_proxy_frog",
TheSaddestGoomba marked this conversation as resolved.
Show resolved Hide resolved
"copy-from": "egg_chicken",
TheSaddestGoomba marked this conversation as resolved.
Show resolved Hide resolved
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"weight": "20 g",
"volume": "650 ml",
"description": "A large clump of frog eggs. They're gelatinous and transparent.",
"rot_spawn": "GROUP_EGG_PROXY_FROG",
"rot_spawn_chance": 60
},
{
"type": "COMESTIBLE",
"id": "egg_leo_frog",
"copy-from": "egg_proxy_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"rot_spawn": "GROUP_EGG_LEO_FROG"
},
{
"type": "COMESTIBLE",
"id": "egg_pattern_frog",
"copy-from": "egg_leo_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"rot_spawn": "GROUP_EGG_PATTERN_FROG",
"rot_spawn_chance": 70
},
{
"type": "COMESTIBLE",
"id": "egg_bullfrog_frog",
"copy-from": "egg_proxy_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"spoils_in": "14 days",
"rot_spawn": "GROUP_EGG_BULLFROG_FROG",
"rot_spawn_chance": 50
},
{
"type": "COMESTIBLE",
"id": "egg_strange_frog",
"copy-from": "egg_bullfrog_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"rot_spawn": "GROUP_EGG_STRANGE_FROG",
"rot_spawn_chance": 80
},
{
"type": "COMESTIBLE",
"id": "egg_giant_frog",
"copy-from": "egg_bullfrog_frog",
"name": { "str": "cluster of giant frog's eggs", "str_pl": "clusters of giant frog's eggs" },
"weight": "143 g",
"volume": "130 ml",
"description": "A large clump of very large frog eggs. They're gelatinous, transparent and larger even than chicken's eggs. ",
"rot_spawn": "GROUP_EGG_GIANT_FROG",
"vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ]
},
{
"type": "COMESTIBLE",
"id": "egg_fowler_toad",
"copy-from": "egg_proxy_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"rot_spawn": "GROUP_EGG_FOWLER_TOAD"
},
{
"type": "COMESTIBLE",
"id": "egg_foul_toad",
"copy-from": "egg_fowler_toad",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"spoils_in": "9 days",
"rot_spawn": "GROUP_EGG_FOUL_TOAD",
"rot_spawn_chance": 70
},
{
"type": "COMESTIBLE",
"id": "egg_freedom_toad",
"copy-from": "egg_proxy_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"rot_spawn": "GROUP_EGG_FREEDOM_TOAD"
},
{
"type": "COMESTIBLE",
"id": "egg_odd_toad",
"copy-from": "egg_freedom_toad",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"spoils_in": "9 days",
"rot_spawn": "GROUP_EGG_ODD_TOAD",
"rot_spawn_chance": 70
},
{
"type": "COMESTIBLE",
"id": "egg_peeper_frog",
"copy-from": "egg_proxy_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"spoils_in": "4 days",
"rot_spawn": "GROUP_EGG_PEEPER_FROG",
"rot_spawn_chance": 75
},
{
"type": "COMESTIBLE",
"id": "egg_vocal_frog",
"copy-from": "egg_peeper_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"spoils_in": "7 days",
"rot_spawn": "GROUP_EGG_VOCAL_FROG",
"rot_spawn_chance": 90
},
{
"type": "COMESTIBLE",
"id": "egg_gray_frog",
"copy-from": "egg_proxy_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"spoils_in": "4 days",
"rot_spawn": "GROUP_EGG_GRAY_FROG",
"rot_spawn_chance": 75
},
{
"type": "COMESTIBLE",
"id": "egg_shift_frog",
"copy-from": "egg_gray_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"spoils_in": "7 days",
"rot_spawn": "GROUP_EGG_SHIFT_FROG",
"rot_spawn_chance": 90
}
]
160 changes: 160 additions & 0 deletions data/json/monstergroups/amphibian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
[
{
"name": "GROUP_TADPOLES_ALL",
"type": "monstergroup",
"default": "mon_leo_tadpole",
"monsters": [
{ "monster": "mon_leo_tadpole", "weight": 70 },
{ "monster": "mon_pattern_tadpole", "weight": 30 },
{ "monster": "mon_bullfrog_tadpole", "weight": 80 },
{ "monster": "mon_strange_tadpole", "weight": 40 },
{ "monster": "mon_fowler_tadpole", "weight": 70 },
{ "monster": "mon_foul_tadpole", "weight": 35 },
{ "monster": "mon_freedom_tadpole", "weight": 70 },
{ "monster": "mon_odd_tadpole", "weight": 70 },
{ "monster": "mon_peeper_tadpole", "weight": 100 },
{ "monster": "mon_vocal_tadpole", "weight": 50 },
{ "monster": "mon_gray_tadpole", "weight": 70 },
{ "monster": "mon_shift_tadpole", "weight": 25 }
]
},
{
"name": "GROUP_TADPOLES_NATURAL",
"type": "monstergroup",
"default": "mon_leo_tadpole",
"monsters": [
{ "monster": "mon_leo_tadpole", "weight": 70 },
{ "monster": "mon_bullfrog_tadpole", "weight": 80 },
{ "monster": "mon_fowler_tadpole", "weight": 70 },
{ "monster": "mon_freedom_tadpole", "weight": 70 },
{ "monster": "mon_peeper_tadpole", "weight": 100 },
{ "monster": "mon_gray_tadpole", "weight": 70 }
]
},
{
"name": "GROUP_TADPOLES_STRANGE",
"type": "monstergroup",
"default": "mon_strange_tadpole",
"monsters": [
{ "monster": "mon_pattern_tadpole", "weight": 50 },
{ "monster": "mon_strange_tadpole", "weight": 100 },
{ "monster": "mon_giant_tadpole", "weight": 75 },
{ "monster": "mon_foul_tadpole", "weight": 75 },
{ "monster": "mon_odd_tadpole", "weight": 100 },
{ "monster": "mon_vocal_tadpole", "weight": 100 },
{ "monster": "mon_shift_tadpole", "weight": 50 }
]
},
{
"name": "GROUP_TADPOLES_FROGS",
"type": "monstergroup",
"default": "mon_bullfrog_tadpole",
"monsters": [
{ "monster": "mon_leo_tadpole", "weight": 100 },
{ "monster": "mon_pattern_tadpole", "weight": 25 },
{ "monster": "mon_bullfrog_tadpole", "weight": 100 },
{ "monster": "mon_strange_tadpole", "weight": 50 },
{ "monster": "mon_giant_tadpole", "weight": 50 }
]
},
{
"name": "GROUP_TADPOLES_TOADS",
"type": "monstergroup",
"default": "mon_odd_tadpole",
"monsters": [
{ "monster": "mon_fowler_tadpole", "weight": 70 },
{ "monster": "mon_foul_tadpole", "weight": 35 },
{ "monster": "mon_freedom_tadpole", "weight": 70 },
{ "monster": "mon_odd_tadpole", "weight": 35 }
]
},
{
"name": "GROUP_TADPOLES_TREEFROGS",
"type": "monstergroup",
"default": "mon_peeper_tadpole",
"monsters": [
{ "monster": "mon_peeper_tadpole", "weight": 100 },
{ "monster": "mon_vocal_tadpole", "weight": 50 },
{ "monster": "mon_gray_tadpole", "weight": 70 },
{ "monster": "mon_shift_tadpole", "weight": 35 }
]
},
{
"name": "GROUP_FROGS_ALL",
"type": "monstergroup",
"default": "mon_leo_frog",
"monsters": [
{ "monster": "mon_leo_frog", "weight": 70 },
{ "monster": "mon_pattern_frog", "weight": 30 },
{ "monster": "mon_bullfrog_frog", "weight": 80 },
{ "monster": "mon_strange_frog", "weight": 40 },
{ "monster": "mon_fowler_toad", "weight": 70 },
{ "monster": "mon_foul_toad", "weight": 35 },
{ "monster": "mon_freedom_toad", "weight": 70 },
{ "monster": "mon_odd_toad", "weight": 70 },
{ "monster": "mon_peeper_frog", "weight": 100 },
{ "monster": "mon_vocal_frog", "weight": 50 },
{ "monster": "mon_gray_frog", "weight": 70 },
{ "monster": "mon_shift_frog", "weight": 25 }
]
},
{
"name": "GROUP_FROGS_NATURAL",
"type": "monstergroup",
"default": "mon_leo_frog",
"monsters": [
{ "monster": "mon_leo_frog", "weight": 70 },
{ "monster": "mon_bullfrog_frog", "weight": 80 },
{ "monster": "mon_fowler_toad", "weight": 60 },
{ "monster": "mon_freedom_toad", "weight": 60 },
{ "monster": "mon_peeper_frog", "weight": 100 },
{ "monster": "mon_gray_frog", "weight": 60 }
]
},
{
"name": "GROUP_FROGS_STRANGE",
"type": "monstergroup",
"default": "mon_strange_frog",
"monsters": [
{ "monster": "mon_pattern_frog", "weight": 50 },
{ "monster": "mon_strange_frog", "weight": 100 },
{ "monster": "mon_foul_toad", "weight": 70 },
{ "monster": "mon_odd_toad", "weight": 100 },
{ "monster": "mon_vocal_frog", "weight": 70 },
{ "monster": "mon_shift_frog", "weight": 50 }
]
},
{
"name": "GROUP_FROGS_FROGS",
"type": "monstergroup",
"default": "mon_bullfrog_frog",
"monsters": [
{ "monster": "mon_leo_frog", "weight": 100 },
{ "monster": "mon_pattern_frog", "weight": 30 },
{ "monster": "mon_bullfrog_frog", "weight": 100 },
{ "monster": "mon_strange_frog", "weight": 50 }
]
},
{
"name": "GROUP_FROGS_TOADS",
"type": "monstergroup",
"default": "mon_odd_toad",
"monsters": [
{ "monster": "mon_fowler_toad", "weight": 70 },
{ "monster": "mon_foul_toad", "weight": 35 },
{ "monster": "mon_freedom_toad", "weight": 70 },
{ "monster": "mon_odd_toad", "weight": 35 }
]
},
{
"name": "GROUP_FROGS_TREEFROGS",
"type": "monstergroup",
"default": "mon_peeper_frog",
"monsters": [
{ "monster": "mon_peeper_frog", "weight": 100 },
{ "monster": "mon_vocal_frog", "weight": 40 },
{ "monster": "mon_gray_frog", "weight": 75 },
{ "monster": "mon_shift_frog", "weight": 25 }
]
}
]
70 changes: 70 additions & 0 deletions data/json/monstergroups/eggs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,5 +495,75 @@
"name": "GROUP_EGG_FALLFISH",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_fallfish" } ]
},
{
"name": "GROUP_EGG_PROXY_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_proxy_tadpole" } ]
},
TheSaddestGoomba marked this conversation as resolved.
Show resolved Hide resolved
{
"name": "GROUP_EGG_LEO_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_leo_tadpole" } ]
},
{
"name": "GROUP_EGG_PATTERN_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_pattern_tadpole" } ]
},
{
"name": "GROUP_EGG_BULLFROG_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_bullfrog_tadpole" } ]
},
{
"name": "GROUP_EGG_STRANGE_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_strange_tadpole" } ]
},
{
"name": "GROUP_EGG_GIANT_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_giant_tadpole" } ]
},
{
"name": "GROUP_EGG_FOWLER_TOAD",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fowler_tadpole" } ]
},
{
"name": "GROUP_EGG_FOUL_TOAD",
"type": "monstergroup",
"monsters": [ { "monster": "mon_foul_tadpole" } ]
},
{
"name": "GROUP_EGG_FREEDOM_TOAD",
"type": "monstergroup",
"monsters": [ { "monster": "mon_freedom_tadpole" } ]
},
{
"name": "GROUP_EGG_ODD_TOAD",
"type": "monstergroup",
"monsters": [ { "monster": "mon_odd_tadpole" } ]
},
{
"name": "GROUP_EGG_PEEPER_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_peeper_tadpole" } ]
},
{
"name": "GROUP_EGG_VOCAL_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_vocal_tadpole" } ]
},
{
"name": "GROUP_EGG_GRAY_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_gray_tadpole" } ]
},
{
"name": "GROUP_EGG_SHIFT_FROG",
"type": "monstergroup",
"monsters": [ { "monster": "mon_shift_tadpole" } ]
}
]
13 changes: 10 additions & 3 deletions data/json/monstergroups/misc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@
{ "monster": "mon_goose_golden", "weight": 1 },
{ "monster": "mon_llama", "weight": 10 },
{ "monster": "mon_woodlouse", "weight": 10 },
{ "monster": "mon_cicada_nymph", "weight": 10 }
{ "monster": "mon_cicada_nymph", "weight": 10 },
{ "group": "GROUP_TADPOLES_NATURAL", "weight": 10 },
{ "group": "GROUP_FROGS_NATURAL", "weight": 10 }
]
},
{
Expand Down Expand Up @@ -367,7 +369,11 @@
{ "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 },
{ "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" },
{ "monster": "mon_zombullfrog", "weight": 10, "cost_multiplier": 2 },
{ "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }
{ "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" },
{ "group": "GROUP_TADPOLES_FROGS", "weight": 100 },
{ "group": "GROUP_TADPOLES_TOADS", "weight": 100 },
{ "group": "GROUP_FROGS_FROGS", "weight": 100 },
{ "group": "GROUP_FROGS_TOADS", "weight": 100 }
]
},
{
Expand Down Expand Up @@ -495,7 +501,8 @@
{ "monster": "mon_zombie_mancroc", "weight": 100, "starts": "180 hours" },
{ "monster": "mon_toad", "weight": 100, "cost_multiplier": 0 },
{ "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 },
{ "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }
{ "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" },
{ "group": "GROUP_FROGS_STRANGE", "weight": 40 }
]
},
{
Expand Down
Loading