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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions data/json/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,15 @@
{ "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 }
]
},
{
"id": "mutant_tiny",
"//": "mutants so tiny they don't drop chunks of meat",
"type": "harvest",
"entries": [
{ "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.5 },
{ "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 }
]
},
{
"id": "mammal_small_fur",
"//": "does not drop stomach or other small organs",
Expand Down
128 changes: 110 additions & 18 deletions data/json/items/comestibles/egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -1032,16 +1032,6 @@
"fun": 5,
"flags": [ ]
},
{
"type": "COMESTIBLE",
"id": "egg_frog",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"copy-from": "egg_chicken",
"weight": "20 g",
"volume": "650 ml",
"description": "A large clump of frog eggs. They're gelatinous and transparent.",
"rot_spawn": "GROUP_EGG_FROG"
},
{
"type": "COMESTIBLE",
"id": "egg_goose",
Expand Down Expand Up @@ -1101,14 +1091,6 @@
"copy-from": "egg_chicken",
"rot_spawn": "GROUP_EGG_GREBE"
},
{
"type": "COMESTIBLE",
"id": "egg_toad",
"name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" },
"copy-from": "egg_frog",
"description": "A large clump of the eggs of a toad. The eggs themselves are gelatinous and transparent.",
"rot_spawn": "GROUP_EGG_TOAD"
},
{
"type": "COMESTIBLE",
"id": "egg_water_beetle",
Expand Down Expand Up @@ -1169,5 +1151,115 @@
"material": [ "egg", "veggy" ],
"fun": 5,
"flags": [ "EATEN_HOT", "FREEZERBURN" ]
},
{
"type": "COMESTIBLE",
"abstract": "egg_proxy_frog",
"copy-from": "egg_fish",
"name": { "str": "cluster of frog's eggs", "str_pl": "clusters of frog's eggs" },
"color": "brown",
"description": "A large clump of frog eggs. They're gelatinous and transparent.",
"price": 25,
"price_postapoc": 50,
"fun": -16,
"vitamins": [ [ "iron", 4 ] ]
},
{
"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" },
"description": "This is a dense cluster of dark frog's eggs, not dissimilar in appearance to caviar.",
"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",
"vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
},
{
"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" },
"description": "A thin film of frog eggs floats together atop the water in a roughly circular mass.",
"rot_spawn": "GROUP_EGG_BULLFROG_FROG"
},
{
"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",
"vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
},
{
"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" },
"description": "These eggs float in long strands, drifting in the still water.",
"use_action": [ "POISON" ],
"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" },
"rot_spawn": "GROUP_EGG_FOUL_TOAD",
"vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
},
{
"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" },
"description": "A spiral strand of frog eggs adorns a patch of underwater vegetation.",
"use_action": [ "POISON" ],
"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" },
"rot_spawn": "GROUP_EGG_ODD_TOAD",
"vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
},
{
"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" },
"description": "A loose grouping of surprisingly few frog's eggs, anchored to submerged vegetation.",
"rot_spawn": "GROUP_EGG_PEEPER_FROG"
},
{
"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" },
"rot_spawn": "GROUP_EGG_VOCAL_FROG",
"vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
},
{
"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" },
"description": "A small patch of frog's eggs rests on the water's surface.",
"rot_spawn": "GROUP_EGG_GRAY_FROG"
},
{
"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" },
"rot_spawn": "GROUP_EGG_SHIFT_FROG",
"vitamins": [ [ "iron", 4 ], [ "mutant_toxin", 8 ] ]
}
]
2 changes: 1 addition & 1 deletion data/json/mapgen/sewage_treatment.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
{ "monster": "mon_sewer_rat", "weight": 100, "cost_multiplier": 0, "pack_size": [ 3, 6 ] },
{ "monster": "mon_albino_penguin", "weight": 5, "cost_multiplier": 5, "pack_size": [ 3, 9 ] },
{ "monster": "mon_gator", "weight": 40, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
{ "monster": "mon_frog", "weight": 10, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
{ "group": "GROUP_FROGS_SEWER", "weight": 250 },
{ "monster": "mon_zombullfrog", "weight": 10, "cost_multiplier": 2 },
{ "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3 }
]
Expand Down
Loading