From 03f13cb2ca1ecb0f225f30bcb99175ac677cb26c Mon Sep 17 00:00:00 2001
From: anothersimulacrum <42699974+anothersimulacrum@users.noreply.github.com>
Date: Thu, 7 May 2020 09:48:18 -0700
Subject: [PATCH] Remove obsolete zombie grenadier

---
 data/json/monsterdrops/zombie.json    |  25 -------
 data/json/monsters/zed_explosive.json | 101 --------------------------
 2 files changed, 126 deletions(-)

diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json
index ea6b239451b0c..81f407f400a86 100644
--- a/data/json/monsterdrops/zombie.json
+++ b/data/json/monsterdrops/zombie.json
@@ -15,31 +15,6 @@
       { "item": "depowered_armor", "count": [ 0, 1 ], "prob": 20 }
     ]
   },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "mon_zombie_grenadier",
-    "entries": [
-      { "item": "tacvest", "damage": [ 1, 4 ] },
-      { "item": "bot_grenade_hack", "count": [ 0, 3 ] },
-      { "item": "bot_flashbang_hack", "prob": 50 },
-      { "item": "bot_gasbomb_hack", "prob": 50 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "mon_zombie_grenadier_elite",
-    "entries": [
-      { "item": "tacvest", "damage": [ 1, 4 ] },
-      { "item": "molle_pack", "damage": [ 1, 4 ] },
-      { "item": "bot_grenade_hack", "count": [ 0, 4 ] },
-      { "item": "bot_flashbang_hack", "count": [ 1, 2 ], "prob": 50 },
-      { "item": "bot_gasbomb_hack", "count": [ 1, 2 ], "prob": 50 },
-      { "item": "bot_c4_hack", "count": [ 1, 2 ], "prob": 20 },
-      { "item": "bot_mininuke_hack", "prob": 1 }
-    ]
-  },
   {
     "type": "item_group",
     "subtype": "collection",
diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json
index 4d0373d08a17a..9aec13130b324 100644
--- a/data/json/monsters/zed_explosive.json
+++ b/data/json/monsters/zed_explosive.json
@@ -163,106 +163,5 @@
     "death_drops": "default_zombie_items",
     "death_function": [ "GAS" ],
     "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ]
-  },
-  {
-    "//": "Heads up: these zombies are pending removal sometime before 0.E.",
-    "id": "mon_zombie_grenadier",
-    "type": "MONSTER",
-    "name": { "str": "zombie grenadier" },
-    "description": "Once a soldier, it is dressed head to toe in combat gear.  Its hands constantly fumble at its many pouches.",
-    "default_faction": "zombie",
-    "bodytype": "human",
-    "species": [ "ZOMBIE", "HUMAN" ],
-    "diff": 20,
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 100,
-    "speed": 90,
-    "material": [ "flesh" ],
-    "symbol": "Z",
-    "color": "blue_green",
-    "aggression": 5,
-    "morale": 100,
-    "melee_skill": 5,
-    "melee_dice": 2,
-    "melee_dice_sides": 4,
-    "melee_cut": 0,
-    "armor_bash": 6,
-    "armor_cut": 6,
-    "armor_bullet": 5,
-    "vision_day": 35,
-    "vision_night": 3,
-    "harvest": "exempt",
-    "starting_ammo": { "bot_c4_hack": 2, "bot_flashbang_hack": 3, "bot_gasbomb_hack": 3, "bot_grenade_hack": 10 },
-    "special_attacks": [ [ "GRENADIER", 6 ] ],
-    "death_drops": { "subtype": "collection", "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_grenadier", 100 ] ] },
-    "death_function": [ "DETONATE" ],
-    "burn_into": "mon_zombie_scorched",
-    "flags": [
-      "SEES",
-      "HEARS",
-      "SMELLS",
-      "WARM",
-      "BASHES",
-      "GROUP_BASH",
-      "POISON",
-      "BLEED",
-      "NO_BREATHE",
-      "REVIVES",
-      "PUSH_MON",
-      "FILTHY"
-    ]
-  },
-  {
-    "id": "mon_zombie_grenadier_elite",
-    "type": "MONSTER",
-    "name": { "str": "zombie elite grenadier" },
-    "description": "Once a soldier, it is dressed head to toe in combat gear and wearing a MOLLE pack.  Its hands quickly open and close its many pouches.",
-    "default_faction": "zombie",
-    "bodytype": "human",
-    "species": [ "ZOMBIE", "HUMAN" ],
-    "diff": 30,
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 100,
-    "speed": 100,
-    "material": [ "flesh" ],
-    "symbol": "Z",
-    "color": "blue_magenta",
-    "aggression": 5,
-    "morale": 100,
-    "melee_skill": 5,
-    "melee_dice": 2,
-    "melee_dice_sides": 6,
-    "melee_cut": 0,
-    "dodge": 1,
-    "armor_bash": 8,
-    "armor_cut": 12,
-    "armor_bullet": 10,
-    "vision_day": 35,
-    "vision_night": 3,
-    "harvest": "exempt",
-    "starting_ammo": { "bot_c4_hack": 10, "bot_flashbang_hack": 10, "bot_gasbomb_hack": 10, "bot_grenade_hack": 20, "bot_mininuke_hack": 1 },
-    "special_attacks": [ [ "GRENADIER_ELITE", 3 ] ],
-    "death_drops": {
-      "subtype": "collection",
-      "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_grenadier_elite", 100 ] ]
-    },
-    "death_function": [ "DETONATE" ],
-    "burn_into": "mon_zombie_scorched",
-    "flags": [
-      "SEES",
-      "HEARS",
-      "SMELLS",
-      "WARM",
-      "BASHES",
-      "GROUP_BASH",
-      "POISON",
-      "BLEED",
-      "NO_BREATHE",
-      "REVIVES",
-      "PUSH_MON",
-      "FILTHY"
-    ]
   }
 ]