From a92b761f1288e93a10987dd10039a0f6c676e073 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Sun, 10 Nov 2024 13:23:46 -0800 Subject: [PATCH 01/39] Audit Weakpoints for Magiclysm Monsters Added weakpoints to monsters that were missing them in Magiclysm mod. Added monster abstracts when possible to make future updates / changes easier should Magiclysm specific weakpoints be created. Addressing issue #70307 and related. --- data/mods/Magiclysm/harvest.json | 13 ++++ .../mods/Magiclysm/monsters/demon_spider.json | 70 +++++++++---------- .../Magiclysm/monsters/holiday_magiclysm.json | 7 ++ 3 files changed, 54 insertions(+), 36 deletions(-) diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json index ea8595d26e537..7bec78e6a59b6 100644 --- a/data/mods/Magiclysm/harvest.json +++ b/data/mods/Magiclysm/harvest.json @@ -52,6 +52,19 @@ { "drop": "demon_chitin_plate", "type": "skin", "mass_ratio": 0.01 }, { "drop": "demon_spider_fang", "base_num": [ 0, 0 ], "scale_num": [ 0.1, 0.6 ], "max": 2, "type": "flesh" } ] + }, + { + "id": "demon_spider_queen", + "type": "harvest", + "//": "separate harvest entry for future special alchemical items", + "entries": [ + { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 }, + { "drop": "meat", "type": "flesh", "mass_ratio": 0.05 }, + { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "demon_chitin_piece", "type": "bone", "mass_ratio": 0.04 }, + { "drop": "demon_chitin_plate", "type": "skin", "mass_ratio": 0.01 }, + { "drop": "demon_spider_fang", "base_num": [ 0, 0 ], "scale_num": [ 0.1, 0.6 ], "max": 2, "type": "flesh" } + ] }, { "id": "mammal_small_fur", diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index 62c5517b29c87..9831a4074a602 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -3,41 +3,49 @@ "type": "SPECIES", "id": "DEMON_SPIDER", "description": "a huge spider", - "anger_triggers": [ "FRIEND_DIED", "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ] - }, - { - "id": "demon_spider_queen", - "type": "harvest", - "//": "separate harvest entry for future special alchemical items", - "entries": [ - { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 }, - { "drop": "meat", "type": "flesh", "mass_ratio": 0.05 }, - { "drop": "demon_chitin_piece", "type": "bone", "mass_ratio": 0.04 }, - { "drop": "demon_chitin_plate", "type": "skin", "mass_ratio": 0.01 }, - { "drop": "demon_spider_fang", "base_num": [ 0, 0 ], "scale_num": [ 0.1, 0.6 ], "max": 2, "type": "flesh" } - ] + "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ] }, { "type": "MONSTER_FACTION", "name": "demon_spider", "base_faction": "spider" }, + { + "abstract": "demon_spider_base", + "type": "MONSTER", + "name": "base demon spider", + "description": "abstract demon spider. you should't see this", + "hp": 45, + "volume": "30 L", + "weight": "40750 g", + "symbol": "s", + "color": "red", + "default_faction": "demon_spider", + "bodytype": "spider", + "speed": 150, + "species": [ "DEMON_SPIDER" ], + "material": [ "iflesh", "demon_chitin" ], + "harvest": "demon_spider", + "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PUSH_MON" ], + "weakpoint_sets": [ + "wps_arthropod", + "wps_arthropod_spider" + ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology", + "prof_wp_basic_bug", + "prof_wp_spider" + ] + }, { "id": "mon_demon_spiderling", "type": "MONSTER", "name": "demon spiderling", + "copy-from": "demon_spider_base", "description": "Despite it being the size of a small dog, you can tell this is a very young spider. Its red color is why you gave it this name; you have never seen this creature before the Cataclysm. It is quick, and its large fangs drip with venom.", - "default_faction": "demon_spider", - "bodytype": "spider", - "species": [ "DEMON_SPIDER" ], - "material": [ "iflesh", "demon_chitin" ], "diff": 2, - "volume": "30000 ml", - "weight": "40750 g", - "hp": 45, - "speed": 150, - "symbol": "s", - "color": "red", "aggression": -10, "morale": 100, "melee_skill": 6, @@ -47,20 +55,14 @@ "dodge": 7, "vision_day": 5, "vision_night": 7, - "harvest": "demon_spider", - "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PUSH_MON" ], "armor": { "bash": 1, "cut": 8, "stab": 8, "acid": 3, "heat": 80, "bullet": 8 } }, { "id": "mon_demon_spider", "type": "MONSTER", + "name": "demon spider", + "copy-from": "demon_spider_base", "description": "This spider is the size of a car. Its huge compound eyes seem to be infinite pools of blackness that seem to suck the light out of the air. Its maroon carapace is studded with wicked-looking spikes that drip with some kind of viscous black liquid that sizzles when it touches the ground.", - "name": "demon spider", - "default_faction": "demon_spider", - "bodytype": "spider", - "species": [ "DEMON_SPIDER" ], - "material": [ "iflesh", "demon_chitin" ], "diff": 7, "weight": "125 kg", "//": "monster can't be any bigger because of limits of volume on tiles. if there is a way designed around this, it should be about 3500 L", @@ -68,7 +70,6 @@ "hp": 435, "speed": 95, "symbol": "S", - "color": "red", "aggression": 50, "morale": 100, "melee_skill": 9, @@ -78,10 +79,7 @@ "dodge": 4, "vision_day": 6, "vision_night": 12, - "harvest": "demon_spider", "special_attacks": [ { "type": "spell", "spell_data": { "id": "burning_hands", "min_level": 4 }, "cooldown": 20 } ], - "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ], - "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PUSH_MON" ], "armor": { "bash": 5, "cut": 45, "stab": 60, "acid": 10, "heat": 80, "bullet": 60 } }, { @@ -100,7 +98,7 @@ "vision_day": 12, "vision_night": 18, "harvest": "demon_spider_queen", - "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PUSH_MON", "STUN_IMMUNE" ], + "extend": { "flags": [ "STUN_IMMUNE" ] }, "special_attacks": [ { "type": "spell", "spell_data": { "id": "mon_summon_demon_spiderlings" }, "cooldown": 14 } ] } ] diff --git a/data/mods/Magiclysm/monsters/holiday_magiclysm.json b/data/mods/Magiclysm/monsters/holiday_magiclysm.json index afb38dd58c6e7..7afe7e866b600 100644 --- a/data/mods/Magiclysm/monsters/holiday_magiclysm.json +++ b/data/mods/Magiclysm/monsters/holiday_magiclysm.json @@ -25,6 +25,12 @@ "path_settings": { "max_dist": 21, "avoid_traps": true, "avoid_sharp": true }, "harvest": "mutant_mammal_fur", "dissect": "dissect_feline_sample_huge", + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology" + ], + "weakpoint_sets": [ "wps_animal_quadruped" ], "reproduction": { "baby_type": { "baby_monster": "mon_yulecat_cub" }, "baby_count": 6, "baby_timer": 234 }, "baby_flags": [ "WINTER" ], "grab_strength": 50, @@ -108,6 +114,7 @@ "dodge": 6, "harvest": "demihuman", "families": [ "prof_wp_demihuman" ], + "weakpoint_sets": [ "wps_humanoid_body" ], "path_settings": { "avoid_traps": true, "avoid_sharp": true }, "fear_triggers": [ "HURT", "FIRE" ], "tracking_distance": 8, From d700e621d6084d7b65632be1f18469784c42c59f Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:14:07 -0800 Subject: [PATCH 02/39] Demon Spider consistency Move monster faction and species information for demon spiders to the dedicated JSON files instead of the monster file. --- data/mods/Magiclysm/monster_factions.json | 5 +++++ data/mods/Magiclysm/monsters/demon_spider.json | 11 ----------- data/mods/Magiclysm/species.json | 6 ++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/mods/Magiclysm/monster_factions.json b/data/mods/Magiclysm/monster_factions.json index 3584d85337b72..102b332b253fc 100644 --- a/data/mods/Magiclysm/monster_factions.json +++ b/data/mods/Magiclysm/monster_factions.json @@ -8,6 +8,11 @@ "name": "dragon_black", "friendly": [ "ooze", "lizardfolk" ] }, + { + "type": "MONSTER_FACTION", + "name": "demon_spider", + "base_faction": "spider" + }, { "type": "MONSTER_FACTION", "name": "hunllef", diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index 9831a4074a602..081af51a1ed12 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -1,15 +1,4 @@ [ - { - "type": "SPECIES", - "id": "DEMON_SPIDER", - "description": "a huge spider", - "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ] - }, - { - "type": "MONSTER_FACTION", - "name": "demon_spider", - "base_faction": "spider" - }, { "abstract": "demon_spider_base", "type": "MONSTER", diff --git a/data/mods/Magiclysm/species.json b/data/mods/Magiclysm/species.json index 02459f9f6ba91..a145a83297c2c 100644 --- a/data/mods/Magiclysm/species.json +++ b/data/mods/Magiclysm/species.json @@ -10,6 +10,12 @@ "description": "a dragon", "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK", "STALK" ] }, + { + "type": "SPECIES", + "id": "DEMON_SPIDER", + "description": "a huge spider", + "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ] + }, { "type": "SPECIES", "id": "LIZARDFOLK", From 1071897debcee39386a02defc21b5569d7190170 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:22:08 -0800 Subject: [PATCH 03/39] Lizard folk anatomy and biology Not all demihumans were getting the into_biology and gross_anatomy families. --- data/mods/Magiclysm/monsters/lizardfolk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/lizardfolk.json b/data/mods/Magiclysm/monsters/lizardfolk.json index 79fa4e6ca5750..aeb0ebde4e0d6 100644 --- a/data/mods/Magiclysm/monsters/lizardfolk.json +++ b/data/mods/Magiclysm/monsters/lizardfolk.json @@ -25,7 +25,7 @@ "dodge": 5, "harvest": "lizardfolk", "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], - "families": [ "prof_wp_demihuman" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "death_drops": [ { "item": "lizardfolk_club", "prob": 30 }, { "item": "loincloth", "prob": 40 }, From 87e5fd732010bb40dc4c2f41c10f16f07430ace2 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:33:00 -0800 Subject: [PATCH 04/39] Demihuman families continued Ogres, Orcs, and Goblins all get intro_biology and gross_anatomy. Just like Elves, Dwarves, and Ravenfolk. --- data/mods/Magiclysm/monsters/goblin.json | 4 ++-- data/mods/Magiclysm/monsters/ogre.json | 2 +- data/mods/Magiclysm/monsters/orcs.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/mods/Magiclysm/monsters/goblin.json b/data/mods/Magiclysm/monsters/goblin.json index 5337b8faadcff..38bfa11d342c2 100644 --- a/data/mods/Magiclysm/monsters/goblin.json +++ b/data/mods/Magiclysm/monsters/goblin.json @@ -21,7 +21,7 @@ "melee_dice_sides": 4, "dodge": 4, "harvest": "demihuman", - "families": [ "prof_wp_demihuman" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "vision_day": 8, "vision_night": 25, @@ -282,7 +282,7 @@ "melee_damage": [ { "damage_type": "cut", "amount": 7 } ], "dodge": 4, "harvest": "orc", - "families": [ "prof_wp_demihuman" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor" ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK" ], "vision_day": 8, diff --git a/data/mods/Magiclysm/monsters/ogre.json b/data/mods/Magiclysm/monsters/ogre.json index a11c150b4d458..71abf1c51780e 100644 --- a/data/mods/Magiclysm/monsters/ogre.json +++ b/data/mods/Magiclysm/monsters/ogre.json @@ -22,7 +22,7 @@ "dodge": 0, "harvest": "ogre", "stomach_size": 6000, - "families": [ "prof_wp_demihuman", "prof_wp_hulk" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman", "prof_wp_hulk" ], "weakpoint_sets": [ "wps_humanoid_body" ], "anger_triggers": [ "HURT", "FIRE", "PLAYER_WEAK" ], "grab_strength": 50, diff --git a/data/mods/Magiclysm/monsters/orcs.json b/data/mods/Magiclysm/monsters/orcs.json index ae907578975c1..7f7772bada1f3 100644 --- a/data/mods/Magiclysm/monsters/orcs.json +++ b/data/mods/Magiclysm/monsters/orcs.json @@ -28,7 +28,7 @@ "melee_damage": [ { "damage_type": "cut", "amount": 7 } ], "dodge": 3, "harvest": "orc", - "families": [ "prof_wp_demihuman" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK" ], "vision_day": 20, From 5ba565ba1ef3052f90c8951c773a127e7282e960 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:50:42 -0800 Subject: [PATCH 05/39] Demihuman families contined, again Workshop Elves, and Leprechauns get intro_bio and gross_anatomy. --- data/mods/Magiclysm/monsters/holiday_magiclysm.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/monsters/holiday_magiclysm.json b/data/mods/Magiclysm/monsters/holiday_magiclysm.json index 7afe7e866b600..07372c689c4de 100644 --- a/data/mods/Magiclysm/monsters/holiday_magiclysm.json +++ b/data/mods/Magiclysm/monsters/holiday_magiclysm.json @@ -86,7 +86,7 @@ "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED" ], "dodge": 3, "harvest": "demihuman", - "families": [ "prof_wp_demihuman" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body" ], "path_settings": { "avoid_traps": true, "avoid_sharp": true }, "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "PATH_AVOID_DANGER", "WARM", "CORNERED_FIGHTER" ], @@ -113,7 +113,7 @@ "melee_dice_sides": 2, "dodge": 6, "harvest": "demihuman", - "families": [ "prof_wp_demihuman" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body" ], "path_settings": { "avoid_traps": true, "avoid_sharp": true }, "fear_triggers": [ "HURT", "FIRE" ], From f50a14b175d8b722fb3ead8e00920f97ad82c9c8 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Sun, 10 Nov 2024 16:40:52 -0800 Subject: [PATCH 06/39] Assign weakpoints and families to monsters Both Monsters and Zombified versions get weakpoints and families. --- data/mods/Magiclysm/monsters/monsters.json | 105 +++++++++++++++++- .../monsters/zombified_monsters.json | 14 ++- 2 files changed, 115 insertions(+), 4 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 9c926c9b237d9..0436de8850fd1 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -25,6 +25,12 @@ "path_settings": { "max_dist": 25 }, "harvest": "owlbear", "dissect": "dissect_owlbear_sample_large", + "weakpoint_sets": [ "wps_animal_quadruped" ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology" + ], "reproduction": { "baby_type": { "baby_egg": "egg_owlbear_rock" }, "baby_count": 1, "baby_timer": 20 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "//grab": "Assuming they are grabbing you with their paws", @@ -59,6 +65,13 @@ "harvest": "exempt", "path_settings": { "avoid_traps": true, "avoid_sharp": true }, "dissect": "dissect_slime_sample_single", + "weakpoint_sets": [ + "wps_slime" + ], + "families": [ + "prof_wp_slime_basic", + "prof_wp_slime_advanced" + ], "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s melts away." }, "special_attacks": [ { @@ -98,6 +111,8 @@ "vision_night": 30, "vision_day": 30, "path_settings": { "max_dist": 35 }, + "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], "special_attacks": [ { @@ -139,6 +154,15 @@ "anger_triggers": [ ], "harvest": "mammal_small_parabolan_wool", "dissect": "dissect_cattle_sample_single", + "weakpoint_sets": [ + "wps_animal_quadruped" + ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology", + "prof_wp_ungulate" + ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "upgrades": { "age_grow": 240, "into": "mon_nightmare_sheep" }, "//": "Puberty reached in 6-9 months.", @@ -173,6 +197,15 @@ "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ], "harvest": "mammal_large_parabolan_wool", "dissect": "dissect_cattle_sample_small", + "weakpoint_sets": [ + "wps_animal_quadruped" + ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology", + "prof_wp_ungulate" + ], "reproduction": { "baby_type": { "baby_monster": "mon_hunllef_lamb" }, "baby_count": 1, "baby_timer": 275 }, "//": "Sheep are seasonal breeders. The natural sexual season is positioned so that lambs will be born in the spring when the weather is warmer and grass is available.", "baby_flags": [ "SPRING" ], @@ -227,6 +260,15 @@ "dodge": 2, "harvest": "bulette", "dissect": "dissect_bulette_sample_large", + "weakpoint_sets": [ + "wps_natural_armored" + ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology", + "prof_wp_nat_armored" + ], "anger_triggers": [ "SOUND" ], "special_attacks": [ { @@ -301,7 +343,7 @@ "vision_day": 45, "vision_night": 3, "harvest": "human_large_leather", - "families": [ "prof_wp_demihuman", "prof_wp_hulk" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman", "prof_wp_hulk" ], "weakpoint_sets": [ "wps_humanoid_body" ], "grab_strength": 50, "special_attacks": [ @@ -392,6 +434,12 @@ "vision_night": 20, "harvest": "stirge", "dissect": "dissect_stirge_sample_small", + "weakpoint_sets": [ "wps_bird_body" ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_wp_flying" + ], "special_attacks": [ { "type": "spell", "spell_data": { "id": "blood_suck", "min_level": 3 }, "cooldown": 3 } ], "anger_triggers": [ "PLAYER_CLOSE" ], "flags": [ "SEES", "SMELLS", "HEARS", "FLIES", "HIT_AND_RUN", "PATH_AVOID_FIRE", "SWARMS" ] @@ -418,6 +466,15 @@ "vision_day": 10, "vision_night": 10, "harvest": "shrieker", + "weakpoint_sets": [ + "wps_fungaloid" + ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_wp_fungaloid_basic", + "prof_wp_fungaloid_advanced" + ], "special_attacks": [ [ "SHRIEK_ALERT", 1 ] ], "anger_triggers": [ "PLAYER_CLOSE" ], "flags": [ "SEES", "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "PACIFIST" ] @@ -440,6 +497,16 @@ "dodge": 6, "harvest": "mammal_tiny", "dissect": "dissect_batrachian_sample_single", + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology", + "prof_wp_basic_amphibian" + ], + "weakpoint_sets": [ + "wps_amphibian_body", + "wps_amphibian_frog" + ], "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 5 } ], "fear_triggers": [ "PLAYER_CLOSE" ], "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS" ] @@ -470,6 +537,8 @@ "vision_day": 40, "vision_night": 40, "harvest": "lemure", + "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "anger_triggers": [ "PLAYER_CLOSE" ], "regenerates": 1, "flags": [ "SEES", "SMELLS", "HEARS", "STUMBLES", "PATH_AVOID_FIRE", "REVIVES" ] @@ -479,6 +548,7 @@ "type": "MONSTER", "name": { "str": "winter wolf", "str_pl": "winter wolves" }, "description": "A pure white dire wolf. If you squint, you can see a faint mist surrounding its coat, and ice shards slowly descend from its breath.", + "copy-from": "mon_wolf", "default_faction": "wolf", "bodytype": "dog", "categories": [ "WILDLIFE" ], @@ -531,7 +601,7 @@ "dodge": 6, "vision_night": 5, "harvest": "demihuman_fur", - "families": [ "prof_wp_demihuman" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "weakpoint_sets": [ "wps_humanoid_body" ], "dissect": "dissect_lupine_sample_large", "path_settings": { "max_dist": 10 }, @@ -564,6 +634,19 @@ "vision_day": 83, "vision_night": 60, "harvest": "exempt", + "weakpoint_sets": [ "wps_humanoid_body" ], + "weakpoints": [ + { + "id": "wing", + "name": "the wings", + "crit_mult": { "all": 0.75 }, + "difficulty": { "ranged": 2, "melee": 1 }, + "coverage_mult": { "point": 0.25 }, + "effects": [ { "effect": "staggered", "chance": 15, "message": "The %s is knocked off-balance!", "damage_required": [ 10, 100 ] } ], + "coverage": 12 + } + ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "special_attacks": [ { "id": "smash", @@ -872,6 +955,15 @@ "vision_night": 15, "harvest": "zombie_animal", "//": "Not a zombie, but otyughs are so filthy and diseased their meat is tainted anyway.", + "weakpoint_sets": [ + "wps_animal_quadruped" + ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology", + "prof_wp_ungulate" + ], "grab_strength": 60, "special_attacks": [ { @@ -921,6 +1013,15 @@ "path_settings": { "max_dist": 25, "avoid_sharp": true }, "harvest": "mutant_mammal_large_fur", "dissect": "dissect_beast_sample_large", + "weakpoint_sets": [ + "wps_animal_quadruped" + ], + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology", + "prof_wp_ungulate" + ], "special_attacks": [ { "id": "stretch_bite", "cooldown": 1, "range": 2 }, { diff --git a/data/mods/Magiclysm/monsters/zombified_monsters.json b/data/mods/Magiclysm/monsters/zombified_monsters.json index 892446fdaf14f..b8c818296db54 100644 --- a/data/mods/Magiclysm/monsters/zombified_monsters.json +++ b/data/mods/Magiclysm/monsters/zombified_monsters.json @@ -24,6 +24,8 @@ "dodge": 5, "vision_night": 5, "harvest": "zombie_fur", + "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "fear_triggers": [ "FIRE" ], "upgrades": { "half_life": 28, "into_group": "GROUP_ZOLF_UPGRADE" }, "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "KEENNOSE", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], @@ -54,6 +56,8 @@ "dodge": 5, "vision_night": 12, "harvest": "orc", + "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "bash": 24, "cut": 31, "bullet": 23 } }, @@ -61,13 +65,13 @@ "type": "MONSTER", "id": "mon_owlbear_zombie", "name": "zowlbear", + "copy-from": "mon_owlbear", "description": "This horrible mutant monster has been zombified. Though it looks weaker than its living counterpart, you feel much more hostility from its black oily eyes.", "default_faction": "zombie", "bodytype": "bear", "species": [ "MAGICAL_BEAST", "ZOMBIE" ], "volume": "435000 ml", "weight": "420 kg", - "looks_like": "mon_owlbear", "hp": 220, "speed": 105, "material": [ "flesh" ], @@ -177,6 +181,12 @@ "vision_night": 10, "path_settings": { "max_dist": 3, "avoid_traps": false, "avoid_sharp": false }, "harvest": "zombie_fur", + "families": [ + "prof_gross_anatomy", + "prof_intro_biology", + "prof_physiology" + ], + "weakpoint_sets": [ "wps_animal_quadruped" ], "grab_strength": 50, "special_attacks": [ { "id": "bite_grab", "cooldown": 8 }, [ "scratch", 6 ] ], "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "WARM", "GRABS", "STUMBLES", "BASHES", "POISON", "NO_BREATHE", "REVIVES" ], @@ -229,7 +239,7 @@ "id": "mon_catoblepas_zombie", "name": { "str": "zombified catoblepas", "str_pl": "zombified catoblepases" }, "description": "Already foul in life, this catoblepas now has oozing sores on its body and an even more rank odor. At least whatever was odd about its eyes is gone, now that they're black and filled with rage.", - "looks_like": "mon_catoblepas", + "copy-from": "mon_catoblepas", "default_faction": "zombie", "species": [ "MAGICAL_BEAST", "ZOMBIE" ], "symbol": "C", From 43145bf44d62e2257fb36f3c8409fd6c41ec17ea Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Sun, 10 Nov 2024 17:10:25 -0800 Subject: [PATCH 07/39] Catching errors in updates Fixing naming, syntax, and other errors from testing on local CDDA install. --- data/mods/Magiclysm/monsters/monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 0436de8850fd1..1faebd2ee33b3 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -261,7 +261,7 @@ "harvest": "bulette", "dissect": "dissect_bulette_sample_large", "weakpoint_sets": [ - "wps_natural_armored" + "wps_natural_armor" ], "families": [ "prof_gross_anatomy", From 987e617454307fee3d07b4296da0adbed72a71ab Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:07:13 -0800 Subject: [PATCH 08/39] Update data/mods/Magiclysm/harvest.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/harvest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json index 7bec78e6a59b6..84313630ce788 100644 --- a/data/mods/Magiclysm/harvest.json +++ b/data/mods/Magiclysm/harvest.json @@ -53,7 +53,7 @@ { "drop": "demon_spider_fang", "base_num": [ 0, 0 ], "scale_num": [ 0.1, 0.6 ], "max": 2, "type": "flesh" } ] }, - { + { "id": "demon_spider_queen", "type": "harvest", "//": "separate harvest entry for future special alchemical items", From 803dc9d4fd0314f6a6cec69ebff4e4037a968f0d Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:07:28 -0800 Subject: [PATCH 09/39] Update data/mods/Magiclysm/harvest.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/harvest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json index 84313630ce788..bc6d8cf2385ee 100644 --- a/data/mods/Magiclysm/harvest.json +++ b/data/mods/Magiclysm/harvest.json @@ -60,7 +60,7 @@ "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "meat", "type": "flesh", "mass_ratio": 0.05 }, - { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "demon_chitin_piece", "type": "bone", "mass_ratio": 0.04 }, { "drop": "demon_chitin_plate", "type": "skin", "mass_ratio": 0.01 }, { "drop": "demon_spider_fang", "base_num": [ 0, 0 ], "scale_num": [ 0.1, 0.6 ], "max": 2, "type": "flesh" } From 71b33413ae8dae53f5c0b15623c9d573e47f5de2 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:07:49 -0800 Subject: [PATCH 10/39] Update data/mods/Magiclysm/monsters/demon_spider.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../mods/Magiclysm/monsters/demon_spider.json | 45 ++++++++----------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index 081af51a1ed12..d4266c2398c1b 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -1,32 +1,23 @@ [ { - "abstract": "demon_spider_base", - "type": "MONSTER", - "name": "base demon spider", - "description": "abstract demon spider. you should't see this", - "hp": 45, - "volume": "30 L", - "weight": "40750 g", - "symbol": "s", - "color": "red", - "default_faction": "demon_spider", - "bodytype": "spider", - "speed": 150, - "species": [ "DEMON_SPIDER" ], - "material": [ "iflesh", "demon_chitin" ], - "harvest": "demon_spider", - "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PUSH_MON" ], - "weakpoint_sets": [ - "wps_arthropod", - "wps_arthropod_spider" - ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology", - "prof_wp_basic_bug", - "prof_wp_spider" - ] + "abstract": "demon_spider_base", + "type": "MONSTER", + "name": "base demon spider", + "description": "abstract demon spider. you should't see this", + "hp": 45, + "volume": "30 L", + "weight": "40750 g", + "symbol": "s", + "color": "red", + "default_faction": "demon_spider", + "bodytype": "spider", + "speed": 150, + "species": [ "DEMON_SPIDER" ], + "material": [ "iflesh", "demon_chitin" ], + "harvest": "demon_spider", + "flags": [ "SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CLIMBS", "HARDTOSHOOT", "PUSH_MON" ], + "weakpoint_sets": [ "wps_arthropod", "wps_arthropod_spider" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug", "prof_wp_spider" ] }, { "id": "mon_demon_spiderling", From c97d24f85f33cf19e4a769b1130c471ba7c0821a Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:08:07 -0800 Subject: [PATCH 11/39] Update data/mods/Magiclysm/monsters/demon_spider.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/demon_spider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index d4266c2398c1b..5ec14fbf0e6f2 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -23,7 +23,7 @@ "id": "mon_demon_spiderling", "type": "MONSTER", "name": "demon spiderling", - "copy-from": "demon_spider_base", + "copy-from": "demon_spider_base", "description": "Despite it being the size of a small dog, you can tell this is a very young spider. Its red color is why you gave it this name; you have never seen this creature before the Cataclysm. It is quick, and its large fangs drip with venom.", "diff": 2, "aggression": -10, From e0169861dc32252adedde3f3ece93ed0e4019704 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:08:17 -0800 Subject: [PATCH 12/39] Update data/mods/Magiclysm/monsters/demon_spider.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/demon_spider.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index 5ec14fbf0e6f2..408c59c607ae1 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -40,8 +40,8 @@ { "id": "mon_demon_spider", "type": "MONSTER", - "name": "demon spider", - "copy-from": "demon_spider_base", + "name": "demon spider", + "copy-from": "demon_spider_base", "description": "This spider is the size of a car. Its huge compound eyes seem to be infinite pools of blackness that seem to suck the light out of the air. Its maroon carapace is studded with wicked-looking spikes that drip with some kind of viscous black liquid that sizzles when it touches the ground.", "diff": 7, "weight": "125 kg", From 3678b2afac8016ade86692cbbe8f1d69bb36ba1d Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:08:39 -0800 Subject: [PATCH 13/39] Update data/mods/Magiclysm/monsters/holiday_magiclysm.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/holiday_magiclysm.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/mods/Magiclysm/monsters/holiday_magiclysm.json b/data/mods/Magiclysm/monsters/holiday_magiclysm.json index 07372c689c4de..7bcbc9e299ad8 100644 --- a/data/mods/Magiclysm/monsters/holiday_magiclysm.json +++ b/data/mods/Magiclysm/monsters/holiday_magiclysm.json @@ -25,11 +25,7 @@ "path_settings": { "max_dist": 21, "avoid_traps": true, "avoid_sharp": true }, "harvest": "mutant_mammal_fur", "dissect": "dissect_feline_sample_huge", - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology" - ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ], "weakpoint_sets": [ "wps_animal_quadruped" ], "reproduction": { "baby_type": { "baby_monster": "mon_yulecat_cub" }, "baby_count": 6, "baby_timer": 234 }, "baby_flags": [ "WINTER" ], From 9a0de9c734a5d99e3963af3663c7b84a13ce8ab4 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:09:57 -0800 Subject: [PATCH 14/39] Update data/mods/Magiclysm/monsters/holiday_magiclysm.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/holiday_magiclysm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/holiday_magiclysm.json b/data/mods/Magiclysm/monsters/holiday_magiclysm.json index 7bcbc9e299ad8..1ef1b13fda5bf 100644 --- a/data/mods/Magiclysm/monsters/holiday_magiclysm.json +++ b/data/mods/Magiclysm/monsters/holiday_magiclysm.json @@ -110,7 +110,7 @@ "dodge": 6, "harvest": "demihuman", "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], - "weakpoint_sets": [ "wps_humanoid_body" ], + "weakpoint_sets": [ "wps_humanoid_body" ], "path_settings": { "avoid_traps": true, "avoid_sharp": true }, "fear_triggers": [ "HURT", "FIRE" ], "tracking_distance": 8, From 39a412efe36ff692efe54ab53129278923a51525 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:10:20 -0800 Subject: [PATCH 15/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 1faebd2ee33b3..9b20af3dca914 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -25,12 +25,8 @@ "path_settings": { "max_dist": 25 }, "harvest": "owlbear", "dissect": "dissect_owlbear_sample_large", - "weakpoint_sets": [ "wps_animal_quadruped" ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology" - ], + "weakpoint_sets": [ "wps_animal_quadruped" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ], "reproduction": { "baby_type": { "baby_egg": "egg_owlbear_rock" }, "baby_count": 1, "baby_timer": 20 }, "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ], "//grab": "Assuming they are grabbing you with their paws", From 61ffa8f52c6a63fe7afa5c5048cdcab7198866c2 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:10:34 -0800 Subject: [PATCH 16/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 9b20af3dca914..61a7f50d5fb31 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -1009,15 +1009,8 @@ "path_settings": { "max_dist": 25, "avoid_sharp": true }, "harvest": "mutant_mammal_large_fur", "dissect": "dissect_beast_sample_large", - "weakpoint_sets": [ - "wps_animal_quadruped" - ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology", - "prof_wp_ungulate" - ], + "weakpoint_sets": [ "wps_animal_quadruped" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_ungulate" ], "special_attacks": [ { "id": "stretch_bite", "cooldown": 1, "range": 2 }, { From 26a3943cfb44125610faf3b8a4d6823b2ab86fd7 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:10:46 -0800 Subject: [PATCH 17/39] Update data/mods/Magiclysm/monsters/zombified_monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/zombified_monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/zombified_monsters.json b/data/mods/Magiclysm/monsters/zombified_monsters.json index b8c818296db54..bf4c2ca42e55b 100644 --- a/data/mods/Magiclysm/monsters/zombified_monsters.json +++ b/data/mods/Magiclysm/monsters/zombified_monsters.json @@ -24,7 +24,7 @@ "dodge": 5, "vision_night": 5, "harvest": "zombie_fur", - "weakpoint_sets": [ "wps_humanoid_body" ], + "weakpoint_sets": [ "wps_humanoid_body" ], "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "fear_triggers": [ "FIRE" ], "upgrades": { "half_life": 28, "into_group": "GROUP_ZOLF_UPGRADE" }, From 115f1db64d662690246f5589c83678534894493f Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:11:02 -0800 Subject: [PATCH 18/39] Update data/mods/Magiclysm/monsters/zombified_monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/zombified_monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/zombified_monsters.json b/data/mods/Magiclysm/monsters/zombified_monsters.json index bf4c2ca42e55b..29da59ea1e89b 100644 --- a/data/mods/Magiclysm/monsters/zombified_monsters.json +++ b/data/mods/Magiclysm/monsters/zombified_monsters.json @@ -56,7 +56,7 @@ "dodge": 5, "vision_night": 12, "harvest": "orc", - "weakpoint_sets": [ "wps_humanoid_body" ], + "weakpoint_sets": [ "wps_humanoid_body" ], "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "bash": 24, "cut": 31, "bullet": 23 } From 6783b9a305b75dd6c8f6d006dd88a0b9f1c51ac0 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:11:12 -0800 Subject: [PATCH 19/39] Update data/mods/Magiclysm/monsters/zombified_monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/zombified_monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/zombified_monsters.json b/data/mods/Magiclysm/monsters/zombified_monsters.json index 29da59ea1e89b..7be4ff3dec866 100644 --- a/data/mods/Magiclysm/monsters/zombified_monsters.json +++ b/data/mods/Magiclysm/monsters/zombified_monsters.json @@ -65,7 +65,7 @@ "type": "MONSTER", "id": "mon_owlbear_zombie", "name": "zowlbear", - "copy-from": "mon_owlbear", + "copy-from": "mon_owlbear", "description": "This horrible mutant monster has been zombified. Though it looks weaker than its living counterpart, you feel much more hostility from its black oily eyes.", "default_faction": "zombie", "bodytype": "bear", From 957bb996fac73febd06a1fce44b40b587f575b86 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:11:23 -0800 Subject: [PATCH 20/39] Update data/mods/Magiclysm/monsters/zombified_monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/zombified_monsters.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/mods/Magiclysm/monsters/zombified_monsters.json b/data/mods/Magiclysm/monsters/zombified_monsters.json index 7be4ff3dec866..21163689f7736 100644 --- a/data/mods/Magiclysm/monsters/zombified_monsters.json +++ b/data/mods/Magiclysm/monsters/zombified_monsters.json @@ -181,11 +181,7 @@ "vision_night": 10, "path_settings": { "max_dist": 3, "avoid_traps": false, "avoid_sharp": false }, "harvest": "zombie_fur", - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology" - ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ], "weakpoint_sets": [ "wps_animal_quadruped" ], "grab_strength": 50, "special_attacks": [ { "id": "bite_grab", "cooldown": 8 }, [ "scratch", 6 ] ], From f11141da018b342c7254e89711fa5562d7d57ca9 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:12:38 -0800 Subject: [PATCH 21/39] Update demon_spider.json Typo correction suggested by bot --- data/mods/Magiclysm/monsters/demon_spider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index 408c59c607ae1..24f5285caca19 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -3,7 +3,7 @@ "abstract": "demon_spider_base", "type": "MONSTER", "name": "base demon spider", - "description": "abstract demon spider. you should't see this", + "description": "abstract demon spider. you shouldn't see this", "hp": 45, "volume": "30 L", "weight": "40750 g", From a176b6453bd42f4f405336da2dbc44d9e97f9d93 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:15:35 -0800 Subject: [PATCH 22/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 61a7f50d5fb31..d098f374b7e07 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -951,15 +951,8 @@ "vision_night": 15, "harvest": "zombie_animal", "//": "Not a zombie, but otyughs are so filthy and diseased their meat is tainted anyway.", - "weakpoint_sets": [ - "wps_animal_quadruped" - ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology", - "prof_wp_ungulate" - ], + "weakpoint_sets": [ "wps_animal_quadruped" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_ungulate" ], "grab_strength": 60, "special_attacks": [ { From 527fdd45d09bf5e04c622546c364b72fe8c29614 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:16:00 -0800 Subject: [PATCH 23/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index d098f374b7e07..d8771a54c4437 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -630,7 +630,7 @@ "vision_day": 83, "vision_night": 60, "harvest": "exempt", - "weakpoint_sets": [ "wps_humanoid_body" ], + "weakpoint_sets": [ "wps_humanoid_body" ], "weakpoints": [ { "id": "wing", From a2a6124bd2c711916932d4359a9dffe45ae0102b Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:16:26 -0800 Subject: [PATCH 24/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index d8771a54c4437..e24bbe24f35c6 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -544,7 +544,7 @@ "type": "MONSTER", "name": { "str": "winter wolf", "str_pl": "winter wolves" }, "description": "A pure white dire wolf. If you squint, you can see a faint mist surrounding its coat, and ice shards slowly descend from its breath.", - "copy-from": "mon_wolf", + "copy-from": "mon_wolf", "default_faction": "wolf", "bodytype": "dog", "categories": [ "WILDLIFE" ], From decdb07e6cf24051d69ee60a3251bc75a87f8ca2 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:16:41 -0800 Subject: [PATCH 25/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index e24bbe24f35c6..b1da3b8f51bf2 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -533,7 +533,7 @@ "vision_day": 40, "vision_night": 40, "harvest": "lemure", - "weakpoint_sets": [ "wps_humanoid_body" ], + "weakpoint_sets": [ "wps_humanoid_body" ], "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "anger_triggers": [ "PLAYER_CLOSE" ], "regenerates": 1, From 2057eb5dc1944fb7d35d151740b6223f350e69f0 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:16:55 -0800 Subject: [PATCH 26/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index b1da3b8f51bf2..976ec68d0dd2b 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -256,15 +256,8 @@ "dodge": 2, "harvest": "bulette", "dissect": "dissect_bulette_sample_large", - "weakpoint_sets": [ - "wps_natural_armor" - ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology", - "prof_wp_nat_armored" - ], + "weakpoint_sets": [ "wps_natural_armor" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_nat_armored" ], "anger_triggers": [ "SOUND" ], "special_attacks": [ { From 7931f0b15d29b1849dbbf35b51ef5404f51bfeb1 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:17:14 -0800 Subject: [PATCH 27/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 976ec68d0dd2b..17b7108b56eb7 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -486,16 +486,8 @@ "dodge": 6, "harvest": "mammal_tiny", "dissect": "dissect_batrachian_sample_single", - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology", - "prof_wp_basic_amphibian" - ], - "weakpoint_sets": [ - "wps_amphibian_body", - "wps_amphibian_frog" - ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian" ], + "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog" ], "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 5 } ], "fear_triggers": [ "PLAYER_CLOSE" ], "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS" ] From f1728f1574a9b51e8bb696eccc421595073ea85a Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:17:26 -0800 Subject: [PATCH 28/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 17b7108b56eb7..839b49338fe40 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -455,15 +455,8 @@ "vision_day": 10, "vision_night": 10, "harvest": "shrieker", - "weakpoint_sets": [ - "wps_fungaloid" - ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_wp_fungaloid_basic", - "prof_wp_fungaloid_advanced" - ], + "weakpoint_sets": [ "wps_fungaloid" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_fungaloid_basic", "prof_wp_fungaloid_advanced" ], "special_attacks": [ [ "SHRIEK_ALERT", 1 ] ], "anger_triggers": [ "PLAYER_CLOSE" ], "flags": [ "SEES", "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "PACIFIST" ] From 9c8d6b801530bbe5d5c5b2b525edbdb656690f53 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:17:46 -0800 Subject: [PATCH 29/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 839b49338fe40..1984f4cf5c8b1 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -423,12 +423,8 @@ "vision_night": 20, "harvest": "stirge", "dissect": "dissect_stirge_sample_small", - "weakpoint_sets": [ "wps_bird_body" ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_wp_flying" - ], + "weakpoint_sets": [ "wps_bird_body" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_flying" ], "special_attacks": [ { "type": "spell", "spell_data": { "id": "blood_suck", "min_level": 3 }, "cooldown": 3 } ], "anger_triggers": [ "PLAYER_CLOSE" ], "flags": [ "SEES", "SMELLS", "HEARS", "FLIES", "HIT_AND_RUN", "PATH_AVOID_FIRE", "SWARMS" ] From 473ceb8729361720edb427085462fdbd689d12d5 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:18:01 -0800 Subject: [PATCH 30/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 1984f4cf5c8b1..06c4c9c723a58 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -193,15 +193,8 @@ "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ], "harvest": "mammal_large_parabolan_wool", "dissect": "dissect_cattle_sample_small", - "weakpoint_sets": [ - "wps_animal_quadruped" - ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology", - "prof_wp_ungulate" - ], + "weakpoint_sets": [ "wps_animal_quadruped" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_ungulate" ], "reproduction": { "baby_type": { "baby_monster": "mon_hunllef_lamb" }, "baby_count": 1, "baby_timer": 275 }, "//": "Sheep are seasonal breeders. The natural sexual season is positioned so that lambs will be born in the spring when the weather is warmer and grass is available.", "baby_flags": [ "SPRING" ], From 0ada4cef012aff183847c16f8a641388feba501b Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:18:17 -0800 Subject: [PATCH 31/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 06c4c9c723a58..5805b38f5aa01 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -150,15 +150,8 @@ "anger_triggers": [ ], "harvest": "mammal_small_parabolan_wool", "dissect": "dissect_cattle_sample_single", - "weakpoint_sets": [ - "wps_animal_quadruped" - ], - "families": [ - "prof_gross_anatomy", - "prof_intro_biology", - "prof_physiology", - "prof_wp_ungulate" - ], + "weakpoint_sets": [ "wps_animal_quadruped" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_ungulate" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ], "upgrades": { "age_grow": 240, "into": "mon_nightmare_sheep" }, "//": "Puberty reached in 6-9 months.", From 372c0aa2d5250db029d796abb6e3b65153564203 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:18:29 -0800 Subject: [PATCH 32/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 5805b38f5aa01..b5145f29f88b0 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -107,7 +107,7 @@ "vision_night": 30, "vision_day": 30, "path_settings": { "max_dist": 35 }, - "weakpoint_sets": [ "wps_humanoid_body" ], + "weakpoint_sets": [ "wps_humanoid_body" ], "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ], "special_attacks": [ From 2562538d9e3c8ef54c0d9c7d1dda87f0eee24afc Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:18:40 -0800 Subject: [PATCH 33/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index b5145f29f88b0..2265e3936ba4f 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -61,13 +61,8 @@ "harvest": "exempt", "path_settings": { "avoid_traps": true, "avoid_sharp": true }, "dissect": "dissect_slime_sample_single", - "weakpoint_sets": [ - "wps_slime" - ], - "families": [ - "prof_wp_slime_basic", - "prof_wp_slime_advanced" - ], + "weakpoint_sets": [ "wps_slime" ], + "families": [ "prof_wp_slime_basic", "prof_wp_slime_advanced" ], "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s melts away." }, "special_attacks": [ { From 7aba2d9bece5055280a51ad5f43365e96fee0a5c Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Mon, 11 Nov 2024 17:54:01 -0800 Subject: [PATCH 34/39] Update demon_spider.json Remove "." from description string which threw error in automated testing. --- data/mods/Magiclysm/monsters/demon_spider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index 24f5285caca19..b7895279aa28f 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -3,7 +3,7 @@ "abstract": "demon_spider_base", "type": "MONSTER", "name": "base demon spider", - "description": "abstract demon spider. you shouldn't see this", + "description": "abstract demon spider you shouldn't see this", "hp": 45, "volume": "30 L", "weight": "40750 g", From 7684b447407db524fa538bfd60def08316200200 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:07:13 -0800 Subject: [PATCH 35/39] Update data/mods/Magiclysm/monsters/demon_spider.json Co-authored-by: Anton Burmistrov --- data/mods/Magiclysm/monsters/demon_spider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/demon_spider.json b/data/mods/Magiclysm/monsters/demon_spider.json index b7895279aa28f..11217b7b91ac1 100644 --- a/data/mods/Magiclysm/monsters/demon_spider.json +++ b/data/mods/Magiclysm/monsters/demon_spider.json @@ -3,7 +3,7 @@ "abstract": "demon_spider_base", "type": "MONSTER", "name": "base demon spider", - "description": "abstract demon spider you shouldn't see this", + "description": { "str": "abstract demon spider you shouldn't see this", "//~": "NO_I18N" }, "hp": 45, "volume": "30 L", "weight": "40750 g", From 885e988ea6787e8d4069347fe6f9cd236ee9ea05 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 12 Nov 2024 22:01:48 -0600 Subject: [PATCH 36/39] Update monsters.json --- data/mods/Magiclysm/monsters/monsters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 2265e3936ba4f..67b3b4a5037ee 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -531,7 +531,7 @@ "id": "mon_loup_garou", "type": "MONSTER", "name": { "str": "loup garou" }, - "description": "Previously thought extinct outside of rural Quebec and Louisiana this cursed creature has been known to breed with true wolves when it isn't madly destroying any signs of humanity in its territory.", + "description": "Previously thought extinct outside of rural Quebec and Louisiana this cursed creature has been known to breed with true wolves when it isn't madly destroying any signs of humanity in its territory. These once normal men, women, elves and dwarves are now forever cursed to roam the wilderness as four legged avatars of destruction; giant, rabid, maddened wolves that never know peace when they can smell or see the creations of the mortal races. Immortal until killed it would be difficult to remember they were once mortal until cutting beneath the fur shows meat that somehow remembers a different life.", "default_faction": "wolf", "bodytype": "dog", "categories": [ "WILDLIFE" ], From e15f06394f16ad8942e92a198f4d9b091d549fb4 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Wed, 13 Nov 2024 09:02:17 -0800 Subject: [PATCH 37/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 67b3b4a5037ee..96fc8f342fd35 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -906,8 +906,6 @@ "vision_night": 15, "harvest": "zombie_animal", "//": "Not a zombie, but otyughs are so filthy and diseased their meat is tainted anyway.", - "weakpoint_sets": [ "wps_animal_quadruped" ], - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_ungulate" ], "grab_strength": 60, "special_attacks": [ { From 72ce4a269d9410324bf43529b15e65b8338a28d4 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Wed, 13 Nov 2024 09:02:49 -0800 Subject: [PATCH 38/39] Update data/mods/Magiclysm/monsters/monsters.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/mods/Magiclysm/monsters/monsters.json | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index 96fc8f342fd35..b80876ec33c21 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -585,19 +585,6 @@ "vision_day": 83, "vision_night": 60, "harvest": "exempt", - "weakpoint_sets": [ "wps_humanoid_body" ], - "weakpoints": [ - { - "id": "wing", - "name": "the wings", - "crit_mult": { "all": 0.75 }, - "difficulty": { "ranged": 2, "melee": 1 }, - "coverage_mult": { "point": 0.25 }, - "effects": [ { "effect": "staggered", "chance": 15, "message": "The %s is knocked off-balance!", "damage_required": [ 10, 100 ] } ], - "coverage": 12 - } - ], - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], "special_attacks": [ { "id": "smash", From 3e7e997b1b9ab184d2d008115f3e32896d7bbd43 Mon Sep 17 00:00:00 2001 From: mage007 <50997107+jpfalk1@users.noreply.github.com> Date: Wed, 13 Nov 2024 09:06:28 -0800 Subject: [PATCH 39/39] Update monsters.json Removed "demihuman" family for loup_garou as suggested. Also changed weakpoint set to "quadruped" from "humanoid". --- data/mods/Magiclysm/monsters/monsters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json index b80876ec33c21..d911c29dffd86 100644 --- a/data/mods/Magiclysm/monsters/monsters.json +++ b/data/mods/Magiclysm/monsters/monsters.json @@ -552,8 +552,8 @@ "dodge": 6, "vision_night": 5, "harvest": "demihuman_fur", - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_demihuman" ], - "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_gross_anatomy", "prof_intro_biology" ], + "weakpoint_sets": [ "wps_animal_quadruped" ], "dissect": "dissect_lupine_sample_large", "path_settings": { "max_dist": 10 }, "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ],