From 9b71533ef70184a67c288ec6b2e257da6bb63fa3 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Thu, 5 Sep 2024 12:05:06 +0200 Subject: [PATCH] coyote --- data/json/harvest.json | 6 ++++ data/json/monstergroups/mammal.json | 10 +++++++ .../mutant_vertebrate_reproduction.json | 6 +++- data/json/monstergroups/wilderness.json | 2 +- data/json/monsters/mammal.json | 2 +- data/json/monsters/mutant_mammal.json | 28 +++++++++++++++++-- 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index e485cb18ea897..4c2424114114f 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -2397,6 +2397,12 @@ "copy-from": "mammal_tiny", "extend": { "entries": [ { "drop": "skull_canis_small", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 } ] } }, + { + "id": "dog_tiny_with_skull_mutant", + "type": "harvest", + "copy-from": "mutant_tiny", + "extend": { "entries": [ { "drop": "skull_canis_small", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 } ] } + }, { "id": "llama_with_skull", "type": "harvest", diff --git a/data/json/monstergroups/mammal.json b/data/json/monstergroups/mammal.json index 49391b65ad84c..cae450b29897e 100644 --- a/data/json/monstergroups/mammal.json +++ b/data/json/monstergroups/mammal.json @@ -189,6 +189,16 @@ { "monster": "mon_tusked_moose_calf", "weight": 50, "starts": "70 days", "conditions": [ "SPRING", "SUMMER" ] } ] }, + { + "name": "GROUP_COYOTE", + "type": "monstergroup", + "//": "Not doing the whole weird thing with timers and weight halving for babies as the groups above me did. I have no idea what's that hoping to accomplish and nobody else seems to either.", + "monsters": [ + { "monster": "mon_coyote", "weight": 38 }, + { "monster": "mon_coyote_mutant_shark", "weight": 1, "starts": "272 days" }, + { "monster": "mon_coyote_mutant_venom", "weight": 1, "starts": "272 days" } + ] + }, { "name": "GROUP_STRAY_DOGS", "type": "monstergroup", diff --git a/data/json/monstergroups/mutant_vertebrate_reproduction.json b/data/json/monstergroups/mutant_vertebrate_reproduction.json index bb96d470a1664..bde8be9b69352 100644 --- a/data/json/monstergroups/mutant_vertebrate_reproduction.json +++ b/data/json/monstergroups/mutant_vertebrate_reproduction.json @@ -7,7 +7,11 @@ { "name": "REPRODUCTION_MUT_COYOTE", "type": "monstergroup", - "monsters": [ { "monster": "mon_moose_calf", "weight": 19 }, { "monster": "mon_tusked_moose_calf", "weight": 1 } ] + "monsters": [ + { "monster": "mon_coyote_pup", "weight": 38 }, + { "monster": "mon_coyote_pup_mutant_shark", "weight": 1 }, + { "monster": "mon_coyote_pup_mutant_venom", "weight": 1 } + ] }, { "name": "REPRODUCTION_MUT_RATTLESNAKE", diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json index c4ca9ecbeb7af..2777966b2d2a1 100644 --- a/data/json/monstergroups/wilderness.json +++ b/data/json/monstergroups/wilderness.json @@ -169,7 +169,7 @@ { "group": "GROUP_REINDEERS", "weight": 3, "cost_multiplier": 3, "pack_size": [ 2, 6 ], "event": "christmas" }, { "monster": "mon_fox_gray", "weight": 1, "cost_multiplier": 0 }, { "monster": "mon_fox_red", "weight": 1, "cost_multiplier": 0 }, - { "monster": "mon_coyote", "weight": 1, "cost_multiplier": 2, "pack_size": [ 1, 6 ] }, + { "group": "GROUP_COYOTE", "weight": 1, "cost_multiplier": 2, "pack_size": [ 1, 6 ] }, { "group": "GROUP_MOOSE", "weight": 1, "cost_multiplier": 3, "pack_size": [ 1, 3 ] } ] }, diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index d58bd6b509b8c..6aa365513c6c0 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -910,7 +910,7 @@ "dodge": 4, "vision_night": 20, "path_settings": { "max_dist": 10 }, - "reproduction": { "baby_monster": "mon_coyote_pup", "baby_count": 4, "baby_timer": 63 }, + "reproduction": { "baby_monster_group": "REPRODUCTION_MUT_COYOTE", "baby_count": 4, "baby_timer": 63 }, "//": "Average litter size of 4 pups, with gestation taking 63 days, but pupping occurs only from March to May", "baby_flags": [ "SPRING" ], "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE", "PLAYER_NEAR_BABY" ], diff --git a/data/json/monsters/mutant_mammal.json b/data/json/monsters/mutant_mammal.json index 2af009b1f480a..b706c9e500841 100644 --- a/data/json/monsters/mutant_mammal.json +++ b/data/json/monsters/mutant_mammal.json @@ -145,9 +145,19 @@ { "id": "scratch_grab_required" } ], "stomach_size": 500, + "reproduction": { "baby_monster": "mon_coyote_pup_mutant_shark", "baby_count": 4, "baby_timer": 63 }, "harvest": "dog_with_skull_fur_mutant", - "path_settings": { "max_dist": 7 }, - "extend": { "flags": [ "NO_BREED" ] } + "path_settings": { "max_dist": 7 } + }, + { + "id": "mon_coyote_pup_mutant_shark", + "type": "MONSTER", + "name": { "str": "grinning coyote pup" }, + "description": "A cute coyote pup. Though, on a closer look, something is off about it.", + "copy-from": "mon_coyote_pup", + "melee_damage": [ { "damage_type": "cut", "amount": 4 } ], + "upgrades": { "age_grow": 68, "into": "mon_coyote_mutant_shark" }, + "harvest": "dog_tiny_with_skull_mutant" }, { "id": "mon_coyote_mutant_venom", @@ -159,8 +169,20 @@ "melee_dice_sides": 8, "melee_damage": [ { "damage_type": "cut", "amount": 4 } ], "path_settings": { "max_dist": 7 }, + "reproduction": { "baby_monster": "mon_coyote_pup_mutant_venom", "baby_count": 4, "baby_timer": 63 }, "harvest": "dog_with_skull_fur_mutant", - "extend": { "flags": [ "NO_BREED", "BADVENOM" ] } + "extend": { "flags": [ "BADVENOM" ] } + }, + { + "id": "mon_coyote_pup_mutant_venom", + "type": "MONSTER", + "name": { "str": "slavering coyote pup" }, + "description": "A cute coyote pup. Though, on a closer look, something is off about it.", + "copy-from": "mon_coyote_pup", + "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], + "upgrades": { "age_grow": 68, "into": "mon_coyote_mutant_venom" }, + "harvest": "dog_tiny_with_skull_mutant", + "extend": { "flags": [ "BADVENOM" ] } }, { "id": "mon_deer_mutant_spider",