From d5fdd6c98e5c324a4402b2e179374105c77ee045 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 12 Oct 2022 19:11:57 -0400 Subject: [PATCH 1/8] [DinoMod] mutating hadrosaurs --- data/mods/DinoMod/monsters/mutant_dino.json | 76 +++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 data/mods/DinoMod/monsters/mutant_dino.json diff --git a/data/mods/DinoMod/monsters/mutant_dino.json b/data/mods/DinoMod/monsters/mutant_dino.json new file mode 100644 index 0000000000000..1bc9ecf1c60db --- /dev/null +++ b/data/mods/DinoMod/monsters/mutant_dino.json @@ -0,0 +1,76 @@ +[ + { + "type": "MONSTER", + "id": "mon_hadrosaurus_mutant1", + "name": { "str_sp": "fungal dusted hadrosaur" }, + "looks_like": "mon_parasaurolophus", + "species": "DINOSAUR", + "default_faction": "hadrosaur", + "aggro_character": false, + "symbol": "D", + "color": "yellow", + "bodytype": "bear", + "material": [ "flesh" ], + "aggression": -10, + "morale": 25, + "melee_skill": 4, + "dodge": 4, + "families": [ "prof_intro_biology", "prof_wp_dino" ], + "weakpoint_sets": [ "wps_dinosaur_body" ], + "baby_flags": [ "SPRING", "SUMMER" ], + "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 1 }, + "flags": [ + "SEES", + "SMELLS", + "HEARS", + "ANIMAL", + "PATH_AVOID_DANGER_1", + "PET_MOUNTABLE", + "PET_WONT_FOLLOW", + "BASHES", + "DESTROYS", + "PUSH_MON", + "SWIMS" + ], + "harvest": "mammal_large_leather", + "fear_triggers": [ "PLAYER_CLOSE", "HURT", "FRIEND_DIED" ], + "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ], + "categories": [ "DINOSAUR", "WILDLIFE" ], + "volume": "1000 L", + "weight": "1000 kg", + "//": "When large weights and volumes are fixed this should be 3000 L and 3000 kg", + "speed": 80, + "melee_dice": 2, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "bash", "amount": 2 } ], + "armor_bash": 4, + "armor_cut": 4, + "armor_bullet": 3, + "hp": 250, + "description": "A bulky, beaked dinosaur with hooved front legs. The head has been dusted with fungal spores and an angry red rash is forming around them.", + "special_attacks": [ + { "type": "leap", "cooldown": 10, "max_range": 2, "allow_no_target": true }, + { "id": "stomp_DinoMod", "cooldown": 20, "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ] } + ], + "upgrades": { "age_grow": 120, "into": "mon_hadrosaurus_mutant2" } + }, + { + "type": "MONSTER", + "id": "mon_hadrosaurus_mutant2", + "name": { "str_sp": "ravenous hadrosaur" }, + "looks_like": "mon_parasaurolophus", + "species": "DINOSAUR", + "default_faction": "hadrosaur", + "aggro_character": false, + "symbol": "D", + "color": "yellow", + "bodytype": "bear", + "copy-from": "mon_hadrosaurus_mutant1", + "aggression": 10, + "speed": 100, + "hp": 200, + "melee_dice": 4, + "description": "A bulky, beaked dinosaur with hooved front legs and two heads. The four eyes are wide and rolling.", + "upgrades": { } + } +] From 87582824acbd6d84e91e4e3ee0588d88997bdcea Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 12 Oct 2022 19:14:05 -0400 Subject: [PATCH 2/8] fungalize --- data/mods/DinoMod/monsters/dinosaur.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json index 6f263a552db29..2afc4075dbed8 100644 --- a/data/mods/DinoMod/monsters/dinosaur.json +++ b/data/mods/DinoMod/monsters/dinosaur.json @@ -1722,6 +1722,7 @@ "armor_bullet": 3, "hp": 250, "zombify_into": "mon_zadrosaurus", + "fungalize_into": "mon_hadrosaurus_mutant1", "description": "A bulky, beaked dinosaur with hooved front legs and strong clawed back legs.", "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 2, "allow_no_target": true }, From ec2e55a0cf31d254680d2e8b8de92ee69a2d2b6f Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 12 Oct 2022 19:17:43 -0400 Subject: [PATCH 3/8] mutant harvest --- data/mods/DinoMod/monsters/mutant_dino.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/DinoMod/monsters/mutant_dino.json b/data/mods/DinoMod/monsters/mutant_dino.json index 1bc9ecf1c60db..6ea089b1f51d8 100644 --- a/data/mods/DinoMod/monsters/mutant_dino.json +++ b/data/mods/DinoMod/monsters/mutant_dino.json @@ -71,6 +71,7 @@ "hp": 200, "melee_dice": 4, "description": "A bulky, beaked dinosaur with hooved front legs and two heads. The four eyes are wide and rolling.", - "upgrades": { } + "upgrades": { }, + "harvest": "mutant_bird_flightless" } ] From 18d4822c18ec8aa8a4bfe9b670053ca48c947b3f Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 12 Oct 2022 19:19:34 -0400 Subject: [PATCH 4/8] hadrosaur faction --- data/mods/DinoMod/monster_factions.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/mods/DinoMod/monster_factions.json b/data/mods/DinoMod/monster_factions.json index acb29bfd17845..feaf5408a0a9a 100644 --- a/data/mods/DinoMod/monster_factions.json +++ b/data/mods/DinoMod/monster_factions.json @@ -42,6 +42,13 @@ "friendly": [ "herbivore_young" ], "hate": [ "plant" ] }, + { + "type": "MONSTER_FACTION", + "name": "hadrosaur", + "base_faction": "herbivore_dino", + "friendly": [ "herbivore_young" ], + "hate": [ "fungus" ] + }, { "type": "MONSTER_FACTION", "name": "insectivore_young", From 93396eb39738b6ecfd7e04611e469e28447da560 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 12 Oct 2022 19:50:09 -0400 Subject: [PATCH 5/8] no fungal damage --- data/mods/DinoMod/monsters/mutant_dino.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/mods/DinoMod/monsters/mutant_dino.json b/data/mods/DinoMod/monsters/mutant_dino.json index 6ea089b1f51d8..71cf51bd7abf2 100644 --- a/data/mods/DinoMod/monsters/mutant_dino.json +++ b/data/mods/DinoMod/monsters/mutant_dino.json @@ -30,11 +30,12 @@ "BASHES", "DESTROYS", "PUSH_MON", - "SWIMS" + "SWIMS", + "NO_FUNG_DMG" ], "harvest": "mammal_large_leather", - "fear_triggers": [ "PLAYER_CLOSE", "HURT", "FRIEND_DIED" ], - "anger_triggers": [ "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ], + "fear_triggers": [ "FRIEND_DIED" ], + "anger_triggers": [ "HURT", "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ], "categories": [ "DINOSAUR", "WILDLIFE" ], "volume": "1000 L", "weight": "1000 kg", From 0b832369060094b7801b8bcc2f373d96a42080dc Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 12 Oct 2022 19:52:36 -0400 Subject: [PATCH 6/8] saurornitholestes egg hatching fix --- data/mods/DinoMod/monstergroups/monstergroups_egg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/DinoMod/monstergroups/monstergroups_egg.json b/data/mods/DinoMod/monstergroups/monstergroups_egg.json index e6641de87818a..4a0cdad608903 100644 --- a/data/mods/DinoMod/monstergroups/monstergroups_egg.json +++ b/data/mods/DinoMod/monstergroups/monstergroups_egg.json @@ -235,7 +235,7 @@ { "name": "GROUP_EGG_saurornitholestes", "type": "monstergroup", - "monsters": [ { "monster": "mon_velociraptor_hatchling" } ] + "monsters": [ { "monster": "mon_saurornitholestes_hatchling" } ] }, { "name": "GROUP_EGG_velociraptor", From ec602a1c34dc185ba1000529117d9f3e029fa0ca Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 12 Oct 2022 19:55:49 -0400 Subject: [PATCH 7/8] use hadrosaur faction --- data/mods/DinoMod/monsters/dinosaur.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json index 2afc4075dbed8..b1645861be297 100644 --- a/data/mods/DinoMod/monsters/dinosaur.json +++ b/data/mods/DinoMod/monsters/dinosaur.json @@ -1711,6 +1711,7 @@ "copy-from": "mon_camptosaurus", "volume": "1000 L", "weight": "1000 kg", + "default_faction": "hadrosaur", "//": "When large weights and volumes are fixed this should be 3000 L and 3000 kg", "bodytype": "bear", "speed": 80, From 604f1e9af64a2c7dc60ddbb99249d27928307ae0 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 12 Oct 2022 20:09:25 -0400 Subject: [PATCH 8/8] Update dictionary.txt --- tools/spell_checker/dictionary.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index cad800a6ecb1a..18fc1da08e128 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -161,6 +161,7 @@ batching batlike batrachian bday +beaked beartrap beebalm beeeeeeeeep @@ -802,6 +803,7 @@ gutskin guvnah gymnocladus h +hadrosaur hadrosaurus haematopoiesis haft @@ -858,6 +860,7 @@ holybook homebrewing homovorus honeygold +hooved hosomaki hotcut hotkey