Merge pull request CleverRaven#77766 from jpfalk1/audit_magiclysm_mon…

…ster_dissection

[Magiclysm] Update proficiency families and weakpoints for Magiclysm monsters

data/mods/Magiclysm/harvest.json

@@ -53,6 +53,19 @@
       { "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",
     "type": "harvest",

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",

data/mods/Magiclysm/monsters/demon_spider.json

@@ -1,43 +1,31 @@
 [
   {
-    "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" }
-    ]
-  },
-  {
-    "type": "MONSTER_FACTION",
-    "name": "demon_spider",
-    "base_faction": "spider"
+    "abstract": "demon_spider_base",
+    "type": "MONSTER",
+    "name": "base demon spider",
+    "description": { "str": "abstract demon spider you shouldn't see this", "//~": "NO_I18N" },
+    "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,28 +35,21 @@
     "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",
-    "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" ],
+    "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",
     "//": "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",
     "volume": "1000 L",
     "hp": 435,
     "speed": 95,
     "symbol": "S",
-    "color": "red",
     "aggression": 50,
     "morale": 100,
     "melee_skill": 9,
@@ -78,10 +59,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 +78,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 } ]
   }
 ]

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,

data/mods/Magiclysm/monsters/holiday_magiclysm.json

@@ -25,6 +25,8 @@
     "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,
@@ -81,7 +83,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" ],
@@ -109,7 +111,8 @@
     "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" ],
     "tracking_distance": 8,

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 },

data/mods/Magiclysm/monsters/monsters.json

@@ -25,6 +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" ],
     "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 +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" ],
     "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s melts away." },
     "special_attacks": [
       {
@@ -98,6 +102,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 +145,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" ],
     "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ],
     "upgrades": { "age_grow": 240, "into": "mon_nightmare_sheep" },
     "//": "Puberty reached in 6-9 months.",
@@ -173,6 +181,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" ],
     "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 +237,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" ],
     "anger_triggers": [ "SOUND" ],
     "special_attacks": [
       {
@@ -301,7 +313,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 +404,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" ],
     "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 +432,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" ],
     "special_attacks": [ [ "SHRIEK_ALERT", 1 ] ],
     "anger_triggers": [ "PLAYER_CLOSE" ],
     "flags": [ "SEES", "NOHEAD", "POISON", "IMMOBILE", "NO_BREATHE", "PACIFIST" ]
@@ -440,6 +456,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" ],
     "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 5 } ],
     "fear_triggers": [ "PLAYER_CLOSE" ],
     "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS" ]
@@ -470,6 +488,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 +499,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" ],
@@ -510,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" ],
@@ -531,8 +552,8 @@
     "dodge": 6,
     "vision_night": 5,
     "harvest": "demihuman_fur",
-    "families": [ "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" ],
@@ -921,6 +942,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" ],
     "special_attacks": [
       { "id": "stretch_bite", "cooldown": 1, "range": 2 },
       {

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,

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,