armored

CleverRaven · Aug 16, 2023 · 117cf76 · 117cf76
1 parent ada6813
commit 117cf76
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 39 deletions.
diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
@@ -72,11 +72,6 @@
       { "group": "GROUP_MANSION_ARMORED", "freq": 20, "cost_multiplier": 15 }
     ]
   },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_MANSION_ARMORED",
-    "monsters": [ { "monster": "mon_feral_armored_mace", "freq": 100 }, { "monster": "mon_feral_armored_battleaxe", "freq": 100 } ]
-  },
   {
     "type": "monstergroup",
     "name": "GROUP_CHUD",

diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
@@ -555,9 +555,7 @@
       { "monster": "mon_feral_maid_knife", "weight": 10 },
       { "monster": "mon_feral_fancy_rapier", "weight": 5, "cost_multiplier": 5 },
       { "monster": "mon_feral_fancy_rapier_fake", "weight": 10 },
-      { "monster": "mon_feral_fancy_crossbow", "weight": 5, "cost_multiplier": 5 },
-      { "monster": "mon_feral_armored_mace", "weight": 1, "cost_multiplier": 10 },
-      { "monster": "mon_feral_armored_battleaxe", "weight": 1, "cost_multiplier": 10 }
+      { "monster": "mon_feral_fancy_crossbow", "weight": 5, "cost_multiplier": 5 }
     ]
   },
   {
@@ -570,9 +568,7 @@
       { "monster": "mon_feral_maid_knife", "weight": 100 },
       { "monster": "mon_feral_fancy_rapier", "weight": 50, "cost_multiplier": 5 },
       { "monster": "mon_feral_fancy_rapier_fake", "weight": 100 },
-      { "monster": "mon_feral_fancy_crossbow", "weight": 50, "cost_multiplier": 5 },
-      { "monster": "mon_feral_armored_mace", "weight": 10, "cost_multiplier": 10 },
-      { "monster": "mon_feral_armored_battleaxe", "weight": 10, "cost_multiplier": 10 }
+      { "monster": "mon_feral_fancy_crossbow", "weight": 50, "cost_multiplier": 5 }
     ]
   },
   {

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
@@ -477,32 +477,6 @@
     ],
     "death_drops": "feral_fancy_death_drops_crossbow"
   },
-  {
-    "id": "mon_feral_armored_mace",
-    "type": "MONSTER",
-    "copy-from": "mon_feral_maid_broom",
-    "name": { "str": "armored feral" },
-    "color": "i_magenta",
-    "description": "Clad in ancient armor and with a mace in hand, this maniac walks around in search of their next prey.  You can see stains of dried blood all over their mace.",
-    "melee_skill": 3,
-    "melee_dice": 3,
-    "melee_dice_sides": 7,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_syn_armored" ],
-    "death_drops": "feral_armored_death_drops_mace",
-    "armor": { "bash": 20, "cut": 20, "stab": 15, "bullet": 12 }
-  },
-  {
-    "id": "mon_feral_armored_battleaxe",
-    "type": "MONSTER",
-    "copy-from": "mon_feral_armored_mace",
-    "color": "i_magenta",
-    "name": { "str": "armored feral" },
-    "description": "Clad in ancient armor and with a battle axe in hand, this maniac walks around in search of their next prey.  You can see stains of dried blood all over their axe.",
-    "melee_damage": [ { "damage_type": "cut", "amount": 15 } ],
-    "death_drops": "feral_armored_death_drops_battleaxe"
-  },
   {
     "id": "mon_feral_prepper",
     "type": "MONSTER",

diff --git a/data/mods/Mythos-Creatures/monstergroups/mythos.json b/data/mods/Mythos-Creatures/monstergroups/mythos.json
@@ -538,8 +538,6 @@
       { "monster": "mon_feral_fancy_rapier", "weight": 5, "cost_multiplier": 5 },
       { "monster": "mon_feral_fancy_rapier_fake", "weight": 10 },
       { "monster": "mon_feral_fancy_crossbow", "weight": 5, "cost_multiplier": 5 },
-      { "monster": "mon_feral_armored_mace", "weight": 1, "cost_multiplier": 10 },
-      { "monster": "mon_feral_armored_battleaxe", "weight": 1, "cost_multiplier": 10 },
       { "monster": "mon_shoggoth", "weight": 1, "cost_multiplier": 10, "starts": "3 days" },
       { "monster": "mon_shoggoth", "weight": 2, "cost_multiplier": 10, "starts": "7 days", "pack_size": [ 1, 2 ] },
       { "monster": "mon_shoggoth", "weight": 3, "cost_multiplier": 10, "starts": "28 days", "pack_size": [ 1, 3 ] },