From 9eb9aad27e1bafeca3c0675785df24e1eafe5865 Mon Sep 17 00:00:00 2001
From: NetSysFire <59517351+NetSysFire@users.noreply.github.com>
Date: Thu, 1 Dec 2022 23:07:49 +0100
Subject: [PATCH] fix ferals in hazardous waste sarcophagus

---
 data/json/mapgen/hazardous_waste_sarcophagus.json |  3 ++-
 data/json/monstergroups/zombies.json              | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/data/json/mapgen/hazardous_waste_sarcophagus.json b/data/json/mapgen/hazardous_waste_sarcophagus.json
index ea25137b15d2a..7eda136c26376 100644
--- a/data/json/mapgen/hazardous_waste_sarcophagus.json
+++ b/data/json/mapgen/hazardous_waste_sarcophagus.json
@@ -263,7 +263,8 @@
         { "square": "radiation", "amount": [ 10, 30 ], "x": 24, "y": 24, "x2": 47, "y2": 47 }
       ],
       "monster": { " ": { "monster": "mon_zombie", "chance": 10 } },
-      "monsters": { "~": { "monster": "GROUP_VANILLA", "chance": 20, "density": 0.1 } },
+      "//": "The government would not put live humans into a highly irradiated cavern with lots of maneating zombies.  Right?  Right?!",
+      "monsters": { "~": { "monster": "GROUP_VANILLA_NO_FERAL", "chance": 20, "density": 0.1 } },
       "computers": {
         "5": {
           "name": "SRCF Security Terminal",
diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
index 71c3c0d51494b..66b5a64382e63 100644
--- a/data/json/monstergroups/zombies.json
+++ b/data/json/monstergroups/zombies.json
@@ -177,7 +177,7 @@
   },
   {
     "type": "monstergroup",
-    "name": "GROUP_VANILLA",
+    "name": "GROUP_VANILLA_NO_FERAL",
     "default": "mon_zombie",
     "monsters": [
       { "monster": "mon_zombie", "weight": 264, "cost_multiplier": 0 },
@@ -187,11 +187,20 @@
       { "monster": "mon_zombie_rot", "weight": 60, "cost_multiplier": 0 },
       { "monster": "mon_zombie_dog", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_zombie_crawler", "weight": 30, "cost_multiplier": 0 },
+      { "monster": "mon_zombie_brainless", "weight": 30, "cost_multiplier": 0 }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_VANILLA",
+    "default": "mon_zombie",
+    "//": "Normalized to 1000",
+    "monsters": [
+      { "group": "GROUP_VANILLA_NO_FERAL", "weight": 891, "cost_multiplier": 0 },
       { "monster": "mon_feral_human_pipe", "weight": 40, "cost_multiplier": 0 },
       { "monster": "mon_feral_human_crowbar", "weight": 40, "cost_multiplier": 0 },
       { "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 0 },
-      { "monster": "mon_feral_sapien_spear", "weight": 9, "cost_multiplier": 2 },
-      { "monster": "mon_zombie_brainless", "weight": 30, "cost_multiplier": 0 }
+      { "monster": "mon_feral_sapien_spear", "weight": 9, "cost_multiplier": 2 }
     ]
   },
   {