Skip to content

Commit

Permalink
Merge pull request CleverRaven#71003 from Karol1223/mmm-fleshy
Browse files Browse the repository at this point in the history
Some mutant animal harvest fixes + Mutant salmon evolution
  • Loading branch information
Maleclypse authored Jan 17, 2024
2 parents da483b6 + 0888c6c commit b327d00
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions data/json/monsters/fish.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@
"melee_dice_sides": 1,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
"harvest": "mutant_fish",
"dissect": "dissect_fish_sample_single",
"flags": [ "SEES", "SWIMS", "AQUATIC", "WATER_CAMOUFLAGE" ]
},
{
Expand Down Expand Up @@ -1234,7 +1236,7 @@
"dissect": "dissect_fish_sample_small",
"reproduction": { "baby_egg": "egg_mutant_salmon", "baby_count": 3, "baby_timer": 30 },
"baby_flags": [ "AUTUMN" ],
"upgrades": { "half_life": 30, "into": "mon_mutant_salmon_huge" },
"upgrades": { "age_grow": 30, "into": "mon_mutant_salmon_huge" },
"anger_triggers": [ "HURT" ],
"flags": [ "SEES", "HEARS", "SWIMS", "AQUATIC" ]
},
Expand Down Expand Up @@ -1266,7 +1268,7 @@
"dissect": "dissect_fish_sample_large",
"reproduction": { "baby_egg": "egg_mutant_salmon", "baby_count": 3, "baby_timer": 30 },
"baby_flags": [ "AUTUMN" ],
"upgrades": { "half_life": 42, "into": "mon_mutant_salmon_mega" },
"upgrades": { "age_grow": 42, "into": "mon_mutant_salmon_mega" },
"anger_triggers": [ "HURT", "PLAYER_CLOSE" ],
"flags": [ "SEES", "HEARS", "SWIMS", "AQUATIC" ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/insect_spider.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
"bleed_rate": 60,
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
"harvest": "meatslug",
"harvest": "mutant_meatslug",
"dissect": "dissect_troglobite_sample_large",
"reproduction": { "baby_egg": "egg_worm", "baby_count": 1, "baby_timer": 30 },
"baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/mammal.json
Original file line number Diff line number Diff line change
Expand Up @@ -2516,7 +2516,7 @@
"anger_triggers": [ "HURT" ],
"fear_triggers": [ "PLAYER_CLOSE" ],
"placate_triggers": [ "PLAYER_WEAK" ],
"harvest": "mammal_large_fur",
"harvest": "mutant_mammal_large_fur",
"dissect": "dissect_cattle_sample_single",
"families": [ "prof_intro_biology", "prof_physiology" ],
"upgrades": { "age_grow": 120, "into": "mon_tusked_moose" },
Expand Down

0 comments on commit b327d00

Please sign in to comment.