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

Razorclaws & Mutant Fish drop mutant meat #37197

Merged
merged 1 commit into from
Jan 19, 2020
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
18 changes: 18 additions & 0 deletions data/json/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@
{ "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
]
},
{
"id": "mutant_fish",
"type": "harvest",
"entries": [
{ "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.38 },
{ "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
{ "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
]
},
{
"id": "shellfish",
"type": "harvest",
Expand All @@ -47,6 +56,15 @@
{ "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.1 }
]
},
{
"id": "mutant_shellfish",
"type": "harvest",
"message": "You carefully crack open its exoskeleton to get at the flesh beneath",
"entries": [
{ "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.32 },
{ "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.1 }
]
},
{
"id": "mon_broken_cyborg",
"type": "harvest",
Expand Down
6 changes: 3 additions & 3 deletions data/json/monsters/fish.json
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@
"melee_cut": 2,
"dodge": 5,
"luminance": 0,
"harvest": "fish_large",
"harvest": "mutant_fish",
"reproduction": { "baby_egg": "egg_fish", "baby_count": 1, "baby_timer": 6 },
"baby_flags": [ "SPRING" ],
"death_function": [ "NORMAL" ],
Expand Down Expand Up @@ -646,7 +646,7 @@
"melee_cut": 2,
"dodge": 5,
"luminance": 0,
"harvest": "fish_large",
"harvest": "mutant_fish",
"reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 150 },
"baby_flags": [ "AUTUMN" ],
"death_function": [ "NORMAL" ],
Expand Down Expand Up @@ -676,7 +676,7 @@
"dodge": 6,
"vision_day": 1,
"vision_night": 30,
"harvest": "fish_large",
"harvest": "mutant_fish",
"reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 19 },
"baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ],
"path_settings": { "max_dist": 5 },
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsters/monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"armor_cut": 30,
"vision_day": 30,
"vision_night": 20,
"harvest": "shellfish",
"harvest": "mutant_shellfish",
"path_settings": { "max_dist": 50 },
"special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ],
Expand Down Expand Up @@ -2107,7 +2107,7 @@
"armor_cut": 18,
"vision_day": 30,
"vision_night": 15,
"harvest": "shellfish",
"harvest": "mutant_shellfish",
"path_settings": { "max_dist": 50 },
"special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ],
"anger_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ],
Expand Down