Merge pull request CleverRaven#73114 from Standing-Storm/queller

[MoM] Add zombie breaker, change MoM zombies to copy-from mon_zombie_base
I-am-Erk · Apr 19, 2024 · 1e92462 · 1e92462
2 parents d30757e + 3522bfe
commit 1e92462
Show file tree

Hide file tree

Showing 3 changed files with 157 additions and 126 deletions.
diff --git a/data/mods/MindOverMatter/monstergroups/zombie_upgrades.json b/data/mods/MindOverMatter/monstergroups/zombie_upgrades.json
@@ -10,9 +10,10 @@
     "default": "mon_zombie_blank",
     "monsters": [
       { "monster": "mon_zombie_blank", "weight": 450 },
-      { "monster": "mon_zombie_nullpsi", "weight": 400 },
-      { "monster": "mon_zombie_psi_void", "weight": 140 },
-      { "monster": "mon_zombie_master", "weight": 10 }
+      { "monster": "mon_zombie_nullpsi", "weight": 225 },
+      { "monster": "mon_zombie_concentration_ender", "weight": 200 },
+      { "monster": "mon_zombie_psi_void", "weight": 100 },
+      { "monster": "mon_zombie_master", "weight": 25 }
     ]
   }
 ]
diff --git a/data/mods/MindOverMatter/monsters/monster_eoc_spells.json b/data/mods/MindOverMatter/monsters/monster_eoc_spells.json
@@ -99,5 +99,73 @@
     "id": "pigeon_aura",
     "condition": "u_is_character",
     "effect": [ { "math": [ "u_vitamin('passenger_pigeon_aura')", "+=", "400 + rand(100)" ] } ]
+  },
+  {
+    "id": "null_break_concentration_spell",
+    "type": "SPELL",
+    "name": "[Ψ]Breaker end powers",
+    "description": "Breaker's power that ends concentration.  It's a bug if you have it.",
+    "valid_targets": [ "hostile" ],
+    "flags": [ "NO_PROJECTILE", "NO_EXPLOSION_SFX" ],
+    "effect": "effect_on_condition",
+    "effect_str": "EOC_NULL_BREAK_CONCENTRATION",
+    "shape": "blast",
+    "max_level": 1,
+    "min_damage": 1,
+    "max_damage": 2,
+    "min_range": 25
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_NULL_BREAK_CONCENTRATION",
+    "condition": {
+      "and": [
+        { "u_has_effect": "effect_telepathic_psi_armor" },
+        { "x_in_y_chance": { "x": { "math": [ "u_spell_level('telepathic_shield')" ] }, "y": 12 } }
+      ]
+    },
+    "effect": [ { "u_message": "Icy fingers crawl across the surface of your mind, but your powers repel them.", "type": "bad" } ],
+    "false_effect": [
+      {
+        "run_eocs": [
+          {
+            "id": "EOC_NULL_BREAK_CONCENTRATION_2",
+            "condition": { "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "1" ] },
+            "effect": [
+              {
+                "run_eocs": [
+                  {
+                    "id": "EOC_NULL_BREAK_CONCENTRATION_3",
+                    "condition": {
+                      "x_in_y_chance": {
+                        "x": {
+                          "math": [
+                            "5 - u_has_proficiency('prof_concentration_basic') - u_has_proficiency('prof_concentration_intermediate') - u_has_proficiency('prof_concentration_master')"
+                          ]
+                        },
+                        "y": 5
+                      }
+                    },
+                    "effect": [
+                      { "u_message": "An icy dagger seems to stab into your brain.", "type": "bad" },
+                      { "math": [ "u_pain()", "+=", "rand(3) + 1" ] },
+                      { "run_eocs": "EOC_END_PSI_POWERS_MAINTAINED" }
+                    ],
+                    "false_effect": [
+                      { "u_message": "Icy fingers crawl across your brain for a moment.", "type": "bad" },
+                      { "math": [ "u_pain()", "+=", "1" ] }
+                    ]
+                  }
+                ]
+              }
+            ],
+            "false_effect": [
+              { "u_message": "Icy fingers crawl across your brain for a moment.", "type": "bad" },
+              { "math": [ "u_pain()", "+=", "1" ] }
+            ]
+          }
+        ]
+      }
+    ]
   }
 ]
diff --git a/data/mods/MindOverMatter/monsters/zombies.json b/data/mods/MindOverMatter/monsters/zombies.json
@@ -8,59 +8,24 @@
   },
   {
     "id": "mon_zombie_blank",
+    "copy-from": "mon_zombie_base",
     "type": "MONSTER",
     "name": { "str": "zombie blank" },
-    "description": "This zombie looks fairly ordinary, other than walking more quickly than the standard shambling.  But there's something subtly wrong about it.  When you look directly at it, gray static flickers on the edge of your vision and you hear a very low droning hum.",
-    "default_faction": "zombie",
-    "bodytype": "human",
+    "description": "This zombie looks fairly ordinary, other than walking slightly more quickly than the standard shambling.  But there's something subtly wrong about it.  When you look directly at it, gray static flickers on the edge of your vision and you hear a very low droning hum.",
     "species": [ "ZOMBIE", "HUMAN", "PSI_NULL" ],
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 100,
-    "speed": 100,
-    "material": [ "flesh" ],
+    "proportional": { "speed": 1.15 },
     "symbol": "Z",
     "color": "dark_gray_white",
-    "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "aggression": 100,
-    "morale": 100,
-    "melee_skill": 4,
-    "melee_dice": 1,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "bash", "amount": 2 } ],
-    "dodge": 3,
+    "dodge": 1,
     "bleed_rate": 50,
+    "vision_day": 30,
     "vision_night": 5,
     "emit_fields": [ { "emit_id": "emit_anti_psi", "delay": "1 s" } ],
-    "weakpoint_sets": [ "wps_humanoid_body" ],
-    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
-    "harvest": "zombie_humanoid",
-    "grab_strength": 20,
-    "special_attacks": [ { "id": "grab" }, { "id": "bite_humanoid", "cooldown": 5 }, { "id": "scratch_humanoid" } ],
-    "death_drops": "default_zombie_death_drops",
     "death_function": { "effect": { "id": "delete_nullifying_fields_monster", "hit_self": true } },
-    "burn_into": "mon_zombie_scorched",
-    "fungalize_into": "mon_zombie_fungus",
     "upgrades": { "half_life": 30, "into_group": "GROUP_ZOMBIE_BLANK_UPGRADE" },
-    "flags": [
-      "SEES",
-      "HEARS",
-      "STUMBLES",
-      "WARM",
-      "GRABS",
-      "BASHES",
-      "GROUP_BASH",
-      "POISON",
-      "NO_BREATHE",
-      "REVIVES",
-      "PUSH_MON",
-      "FILTHY",
-      "FIREPROOF",
-      "ENERVATE_IMMUNE",
-      "TELEPORT_IMMUNE",
-      "TEEP_IMMUNE",
-      "TELEKIN_IMMUNE"
-    ],
+    "extend": {
+      "flags": [ "FIREPROOF", "ENERVATE_IMMUNE", "PHOTOKIN_MONSTER_IMMUNE", "TELEPORT_IMMUNE", "TEEP_IMMUNE", "TELEKIN_IMMUNE" ]
+    },
     "//": "Heat armor is needed to make it immune to pyrokinesis.",
     "armor": {
       "electric": 1,
@@ -73,37 +38,24 @@
   },
   {
     "id": "mon_zombie_nullpsi",
+    "copy-from": "mon_zombie_base",
     "type": "MONSTER",
     "name": { "str": "zombie null" },
     "description": "This zombie's limbs are elongated and its torso is stretched, causing it to occasionally drop on all fours to skitter faster than a normal walk.  When you look directly at it, gray static flickers on the edge of your vision and you hear a very low droning hum.",
-    "default_faction": "zombie",
-    "bodytype": "human",
     "species": [ "ZOMBIE", "HUMAN", "PSI_NULL" ],
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 110,
-    "speed": 120,
-    "material": [ "flesh" ],
+    "proportional": { "hp": 1.375, "speed": 1.55 },
     "symbol": "Z",
     "color": "dark_gray_white",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "aggression": 100,
-    "morale": 100,
     "melee_skill": 5,
     "melee_dice": 2,
     "melee_dice_sides": 4,
     "melee_damage": [ { "damage_type": "bash", "amount": 2 } ],
-    "dodge": 4,
+    "dodge": 3,
     "bleed_rate": 50,
+    "vision_day": 30,
     "vision_night": 5,
     "emit_fields": [ { "emit_id": "emit_anti_psi", "delay": "1 s" } ],
-    "weakpoints": [
-      { "name": "the head", "armor_mult": { "physical": 0.5 }, "coverage": 3 },
-      { "name": "the eye", "armor_mult": { "physical": 0 }, "coverage": 1 },
-      { "name": "the leg", "armor_mult": { "physical": 0.75 }, "coverage": 3 }
-    ],
-    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
-    "harvest": "zombie_humanoid",
     "grab_strength": 40,
     "special_attacks": [
       { "id": "grab" },
@@ -136,30 +88,64 @@
         "monster_message": "%1$s looks at %3$s and the static on the edge of your vision flickers."
       }
     ],
-    "death_drops": "default_zombie_death_drops",
     "death_function": { "effect": { "id": "delete_nullifying_fields_monster", "hit_self": true } },
-    "burn_into": "mon_zombie_scorched",
-    "upgrades": { "half_life": 45, "into": "mon_zombie_psi_void" },
-    "fungalize_into": "mon_zombie_fungus",
-    "flags": [
-      "SEES",
-      "HEARS",
-      "STUMBLES",
-      "WARM",
-      "GRABS",
-      "BASHES",
-      "GROUP_BASH",
-      "POISON",
-      "NO_BREATHE",
-      "REVIVES",
-      "PUSH_MON",
-      "FILTHY",
-      "FIREPROOF",
-      "ENERVATE_IMMUNE",
-      "TELEPORT_IMMUNE",
-      "TEEP_IMMUNE",
-      "TELEKIN_IMMUNE"
+    "upgrades": { "half_life": 30, "into": "mon_zombie_psi_void" },
+    "extend": {
+      "flags": [ "FIREPROOF", "ENERVATE_IMMUNE", "PHOTOKIN_MONSTER_IMMUNE", "TELEPORT_IMMUNE", "TEEP_IMMUNE", "TELEKIN_IMMUNE" ]
+    },
+    "//": "Heat armor is needed to make it immune to pyrokinesis.",
+    "armor": {
+      "electric": 1,
+      "heat": 999,
+      "psi_telekinetic_damage": 999,
+      "psi_telepathic_damage": 999,
+      "psi_teleporter_teleporting_damage": 999,
+      "psi_enervation_damage": 999
+    }
+  },
+  {
+    "id": "mon_zombie_concentration_ender",
+    "copy-from": "mon_zombie_base",
+    "type": "MONSTER",
+    "name": { "str": "zombie breaker" },
+    "description": "An enormous hump takes up most of this zombie's back, fusing its head directly into its torso.  It moves slowly but seems more aware than most of its kind, constantly looking around rather than staring blankly ahead.  When you look directly at it, you feel a cold chill at the base of your skull.",
+    "species": [ "ZOMBIE", "HUMAN", "PSI_NULL" ],
+    "proportional": { "hp": 2 },
+    "symbol": "Z",
+    "color": "dark_gray_white",
+    "scents_tracked": [ "sc_human", "sc_fetid" ],
+    "melee_skill": 4,
+    "dodge": 1,
+    "bleed_rate": 50,
+    "vision_day": 35,
+    "vision_night": 5,
+    "emit_fields": [ { "emit_id": "emit_anti_psi", "delay": "1 s" } ],
+    "grab_strength": 30,
+    "special_attacks": [
+      { "id": "grab" },
+      { "id": "bite_humanoid", "cooldown": 5 },
+      {
+        "id": "scratch",
+        "cooldown": 10,
+        "damage_max_instance": [ { "damage_type": "bash", "amount": 6, "armor_multiplier": 0.8 } ],
+        "hit_dmg_u": "%1$s strikes at your %2$s!",
+        "hit_dmg_npc": "%1$s strikes at <npcname>!",
+        "miss_msg_u": "%1$s strikes at you, but you dodge!",
+        "miss_msg_npc": "%1$s tries to strike at <npcname>, but they dodge!",
+        "no_dmg_msg_u": "%1$s strikes at your %2$s, but fails to penetrate armor.",
+        "no_dmg_msg_npc": "%1$s tries to strike at <npcname>, but fails to penetrate armor."
+      },
+      {
+        "id": "zombie_anti_concentration_spell",
+        "type": "spell",
+        "spell_data": { "id": "null_break_concentration_spell" },
+        "cooldown": 15,
+        "monster_message": "%1$s looks at %3$s and the static on the edge of your vision flickers."
+      }
     ],
+    "extend": {
+      "flags": [ "FIREPROOF", "ENERVATE_IMMUNE", "PHOTOKIN_MONSTER_IMMUNE", "TELEPORT_IMMUNE", "TEEP_IMMUNE", "TELEKIN_IMMUNE" ]
+    },
     "//": "Heat armor is needed to make it immune to pyrokinesis.",
     "armor": {
       "electric": 1,
@@ -172,37 +158,24 @@
   },
   {
     "id": "mon_zombie_psi_void",
+    "copy-from": "mon_zombie_base",
     "type": "MONSTER",
     "name": { "str": "nether-void" },
     "description": "Thoughts of old creepy Internet memes arise unbidden as you see this zombie.  It's almost ten feet fall but incredibly thin, with spindly legs and with arms that hang down almost all the way to the ground.  Occasionally, it drops on all fours to clamber with uncanny speed over some bit of rubble.  When you look directly at it, gray static flickers on the edge of your vision and you hear a very low droning hum.",
-    "default_faction": "zombie",
-    "bodytype": "human",
     "species": [ "ZOMBIE", "HUMAN", "PSI_NULL" ],
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 110,
-    "speed": 140,
-    "material": [ "flesh" ],
+    "proportional": { "hp": 1.3, "spoed": 2 },
     "symbol": "Z",
     "color": "dark_gray_white",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "aggression": 100,
-    "morale": 100,
     "melee_skill": 5,
     "melee_dice": 2,
     "melee_dice_sides": 5,
     "melee_damage": [ { "damage_type": "bash", "amount": 2 } ],
     "dodge": 5,
     "bleed_rate": 50,
+    "vision_day": 35,
     "vision_night": 5,
     "emit_fields": [ { "emit_id": "emit_anti_psi", "delay": "1 s" } ],
-    "weakpoints": [
-      { "name": "the head", "armor_mult": { "physical": 0.5 }, "coverage": 3 },
-      { "name": "the eye", "armor_mult": { "physical": 0 }, "coverage": 1 },
-      { "name": "the leg", "armor_mult": { "physical": 0.75 }, "coverage": 3 }
-    ],
-    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
-    "harvest": "zombie_humanoid",
     "grab_strength": 50,
     "special_attacks": [
       { "id": "ranged_pull", "range": 3 },
@@ -237,32 +210,21 @@
         "monster_message": "%1$s looks at %3$s and the static on the edge of your vision creeps inward for a moment."
       }
     ],
-    "death_drops": "default_zombie_death_drops",
     "death_function": { "effect": { "id": "delete_nullifying_fields_monster", "hit_self": true } },
-    "burn_into": "mon_zombie_scorched",
-    "fungalize_into": "mon_zombie_fungus",
-    "flags": [
-      "SEES",
-      "HEARS",
-      "STUMBLES",
-      "WARM",
-      "GRABS",
-      "BASHES",
-      "GROUP_BASH",
-      "POISON",
-      "CLIMBS",
-      "SLUDGEPROOF",
-      "NO_BREATHE",
-      "REVIVES",
-      "PUSH_MON",
-      "PRIORITIZE_TARGETS",
-      "FILTHY",
-      "FIREPROOF",
-      "ENERVATE_IMMUNE",
-      "TELEPORT_IMMUNE",
-      "TEEP_IMMUNE",
-      "TELEKIN_IMMUNE"
-    ],
+    "extend": {
+      "flags": [
+        "CLIMBS",
+        "SLUDGEPROOF",
+        "PUSH_MON",
+        "PRIORITIZE_TARGETS",
+        "FIREPROOF",
+        "ENERVATE_IMMUNE",
+        "PHOTOKIN_MONSTER_IMMUNE",
+        "TELEPORT_IMMUNE",
+        "TEEP_IMMUNE",
+        "TELEKIN_IMMUNE"
+      ]
+    },
     "//": "Heat armor is needed to make it immune to pyrokinesis.",
     "armor": {
       "electric": 1,