Additions and changes to ferals, and some other things (#56074)

* Monsterdrops (ammunition) * Zombie militiamen * Traps on layer 12 removed Spike pit may appear right where the door is. (Can be worked around by breaking down the wall, buuuut) ferals with armor similar or more stronger than the feral soldier, will also follow the feral soldier's color symbol (shaded background magenta) (gives impression of armor) * sec ferals too, * Soldiers may have spare mags
CleverRaven · Mar 25, 2022 · 87ba4f3 · 87ba4f3
1 parent f5166bc
commit 87ba4f3
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 26 deletions.
diff --git a/data/json/mapgen/house/house_fortified.json b/data/json/mapgen/house/house_fortified.json
@@ -63,10 +63,7 @@
         { "group": "survivor_weapons", "x": [ 1, 10 ], "y": [ 12, 17 ], "chance": 40, "ammo": 50, "magazine": 100 },
         { "group": "survivor_weapons", "x": [ 21, 21 ], "y": [ 13, 15 ], "chance": 50, "ammo": 50, "magazine": 100 }
       ],
-      "place_monsters": [
-        { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 },
-        { "monster": "GROUP_PREPPER_HOUSE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 }
-      ]
+      "place_monsters": [ { "monster": "GROUP_PREPPER_HOUSE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.5 } ]
     }
   },
   {

diff --git a/data/json/mapgen/house/house_garage_prepper.json b/data/json/mapgen/house/house_garage_prepper.json
@@ -103,7 +103,7 @@
           "magazine": 95
         }
       ],
-      "place_monsters": [ { "monster": "GROUP_PREPPER_HOUSE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
+      "place_monsters": [ { "monster": "GROUP_PREPPER_HOUSE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.5 } ]
     }
   },
   {

diff --git a/data/json/mapgen/house/house_prepper.json b/data/json/mapgen/house/house_prepper.json
@@ -63,8 +63,7 @@
         { "item": "gear_survival", "x": [ 18, 21 ], "y": 21, "chance": 50, "repeat": [ 1, 4 ] }
       ],
       "place_monsters": [
-        { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 2, 3 ] },
-        { "monster": "GROUP_PREPPER_HOUSE", "x": [ 2, 21 ], "y": [ 13, 21 ] },
+        { "monster": "GROUP_PREPPER_HOUSE", "x": [ 2, 21 ], "y": [ 13, 21 ], "density": 2 },
         { "monster": "GROUP_PEST", "x": [ 2, 21 ], "y": [ 13, 21 ], "chance": 3 }
       ]
     }

diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json
@@ -273,7 +273,6 @@
         { "point": "trap", "id": "tr_spike_pit", "x": [ 3, 19 ], "y": 8 },
         { "point": "trap", "id": "tr_spike_pit", "x": [ 3, 20 ], "y": 9 },
         { "point": "trap", "id": "tr_spike_pit", "x": [ 3, 20 ], "y": 11 },
-        { "point": "trap", "id": "tr_spike_pit", "x": [ 3, 20 ], "y": 12 },
         { "point": "trap", "id": "tr_spike_pit", "x": [ 4, 20 ], "y": 13 },
         { "point": "trap", "id": "tr_spike_pit", "x": [ 4, 19 ], "y": 14 },
         { "point": "trap", "id": "tr_spike_pit", "x": [ 3, 19 ], "y": 15 },

diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json
@@ -88,7 +88,9 @@
       { "group": "underwear", "damage": [ 1, 4 ] },
       { "group": "clothing_glasses", "prob": 5 },
       { "group": "clothing_watch", "prob": 5 },
-      { "group": "wallets", "damage": [ 1, 4 ] }
+      { "group": "wallets", "damage": [ 1, 4 ] },
+      { "item": "m9mag", "prob": 50, "ammo-item": "9mm", "charges": [ 0, 10 ] },
+      { "item": "m9mag", "prob": 50, "ammo-item": "9mm", "charges": [ 0, 15 ] }
     ]
   },
   {
@@ -444,6 +446,7 @@
       { "group": "feral_handgun", "prob": 100, "damage": [ 1, 4 ] },
       { "group": "clothing_outdoor_set", "damage": [ 1, 4 ] },
       { "group": "bags", "damage": [ 1, 4 ], "prob": 100 },
+      { "group": "fired_mags_9mm", "prob": 80 },
       { "group": "book_survival", "prob": 40 },
       { "group": "survivor_knife", "damage": [ 1, 4 ] },
       { "group": "gear_survival", "prob": 55, "damage": [ 1, 4 ] },
@@ -465,6 +468,7 @@
       { "group": "clothing_outdoor_set", "damage": [ 1, 4 ] },
       { "group": "bags", "damage": [ 1, 4 ], "prob": 100 },
       { "group": "book_survival", "prob": 60 },
+      { "group": "survivorzed_gloves", "damage": [ 0, 4 ] },
       { "group": "survivor_knife", "damage": [ 1, 4 ] },
       { "group": "gear_survival", "prob": 60, "damage": [ 1, 4 ] },
       { "group": "survivor_cutting", "prob": 100, "damage": [ 1, 4 ] },
@@ -482,21 +486,29 @@
     "magazine": 100,
     "ammo": 20,
     "entries": [
-      { "group": "mon_zombie_milbase_personnel_death_drops", "prob": 100, "damage": [ 1, 4 ] },
-      { "item": "holster", "contents-group": "military_standard_pistols", "damage": [ 1, 4 ] },
+      { "group": "clothing_military", "damage": [ 0, 4 ] },
+      { "group": "clothing_military_headwear", "prob": 40, "damage": [ 0, 4 ] },
+      { "item": "two_way_radio", "charges": [ 0, 300 ], "prob": 25 },
+      { "group": "wallets_military", "prob": 5 },
+      { "group": "clothing_glasses", "damage": [ 0, 4 ], "prob": 5 },
+      { "item": "wristwatch", "damage": [ 0, 4 ], "prob": 33 },
+      { "group": "pocket_cigar", "prob": 5 },
+      { "group": "misc_smoking_legal", "prob": 10 },
+      { "item": "knife_combat", "prob": 100, "container-item": "sheath" },
       { "item": "kevlar", "prob": 50, "damage": [ 2, 4 ] },
       { "item": "wearable_light", "prob": 100, "charges": [ 0, 100 ], "damage": [ 1, 4 ] },
       { "group": "feral_autogun", "prob": 100, "damage": [ 1, 4 ] },
       { "group": "survivor_grenades", "prob": 20 },
       { "group": "bags", "damage": [ 1, 4 ], "prob": 100 },
       { "group": "book_survival", "prob": 70 },
-      { "group": "survivor_knife", "damage": [ 1, 4 ] },
       { "group": "gear_survival", "prob": 70, "damage": [ 1, 4 ] },
       { "group": "stash_food", "prob": 70 },
       { "group": "mil_food", "prob": 39 },
       { "group": "mil_food_nodrugs", "prob": 40 },
       { "group": "shelter", "prob": 30 },
-      { "group": "used_survival_kit", "prob": 80, "damage": [ 1, 4 ] }
+      { "group": "used_survival_kit", "prob": 80, "damage": [ 1, 4 ] },
+      { "item": "stanag30", "prob": 50, "ammo-item": "223", "charges": [ 0, 10 ] },
+      { "item": "stanag30", "prob": 50, "ammo-item": "556", "charges": [ 0, 30 ] }
     ]
   },
   {
@@ -505,15 +517,23 @@
     "magazine": 100,
     "ammo": 10,
     "id": "feral_handgun",
-    "items": [ [ "glock_19", 200 ], [ "hptjhp", 200 ], [ "uzi", 200 ], [ "sw_619", 200 ], [ "glock_17", 200 ] ]
+    "items": [ [ "glock_19", 350 ], [ "uzi", 350 ], [ "glock_17", 350 ] ]
   },
   {
     "type": "item_group",
     "subtype": "distribution",
     "magazine": 100,
     "ammo": 10,
     "id": "feral_autogun",
-    "items": [ [ "scar_l", 200 ], [ "m4_carbine", 200 ], [ "ruger_mini", 200 ], [ "ar_pistol", 200 ], [ "ar15", 200 ] ]
+    "items": [ [ "m4_carbine", 500 ], [ "ar15", 500 ] ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "magazine": 30,
+    "ammo": 15,
+    "id": "fired_mags_9mm",
+    "items": [ [ "glockmag", 350 ], [ "glock17_17", 350 ], [ "uzimag", 350 ] ]
   },
   {
     "id": "mon_feral_soldier_death_drops",
@@ -532,7 +552,9 @@
       { "item": "e_tool", "prob": 15, "damage": [ 1, 4 ] },
       { "item": "mask_gas", "prob": 5, "charges": [ 0, 100 ], "damage": [ 1, 4 ] },
       { "item": "two_way_radio", "prob": 15, "charges": [ 0, 100 ], "damage": [ 1, 4 ] },
-      { "item": "knife_combat", "prob": 100, "damage": [ 3, 4 ] }
+      { "item": "knife_combat", "prob": 100, "damage": [ 3, 4 ] },
+      { "item": "stanag30", "prob": 50, "ammo-item": "556", "charges": [ 0, 10 ] },
+      { "item": "stanag30", "prob": 50, "ammo-item": "556", "charges": [ 0, 30 ] }
     ]
   }
 ]
diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
@@ -203,7 +203,7 @@
     "name": "GROUP_PREPPER_HOUSE",
     "default": "mon_zombie",
     "monsters": [
-      { "monster": "mon_zombie", "weight": 400, "cost_multiplier": 0 },
+      { "monster": "mon_zombie_milbase_personnel", "weight": 400, "cost_multiplier": 0, "starts": "540 hours" },
       { "monster": "mon_zombie_tough", "weight": 180, "cost_multiplier": 0 },
       { "monster": "mon_feral_prepper", "weight": 180, "cost_multiplier": 5 },
       { "monster": "mon_feral_survivalist", "weight": 180, "cost_multiplier": 10 },

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
@@ -74,7 +74,7 @@
     "speed": 100,
     "material": [ "flesh" ],
     "symbol": "@",
-    "color": "magenta",
+    "color": "i_magenta",
     "aggression": 30,
     "morale": 100,
     "melee_skill": 3,
@@ -290,7 +290,7 @@
     "speed": 100,
     "material": [ "flesh" ],
     "symbol": "@",
-    "color": "magenta",
+    "color": "i_magenta",
     "aggression": 30,
     "morale": 100,
     "melee_skill": 6,
@@ -453,6 +453,7 @@
     "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,
@@ -469,6 +470,7 @@
     "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_cut": 15,
@@ -495,7 +497,7 @@
     "melee_dice": 2,
     "melee_dice_sides": 6,
     "melee_cut": 0,
-    "dodge": 4,
+    "dodge": 3,
     "armor_bash": 4,
     "armor_cut": 4,
     "armor_bullet": 4,
@@ -559,7 +561,7 @@
     "melee_dice": 2,
     "melee_dice_sides": 7,
     "melee_cut": 9,
-    "dodge": 4,
+    "dodge": 3,
     "armor_bash": 4,
     "armor_cut": 4,
     "armor_bullet": 4,
@@ -593,7 +595,7 @@
     "id": "mon_feral_militia",
     "type": "MONSTER",
     "name": { "str": "mad militia" },
-    "description": "Wearing a tactical camo uniform with a kevlar vest, this person seems to have been a militia member, now turned feral.  Their hands grip an automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their forehead illuminates their presence and surroundings.",
+    "description": "Wearing a tactical camo uniform with a kevlar vest, this person seems to have been a militia member, now turned feral.  Their hands grip unto a semi-automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their forehead illuminates their presence and surroundings.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "HUMAN" ],
@@ -603,14 +605,14 @@
     "speed": 110,
     "material": [ "flesh" ],
     "symbol": "@",
-    "color": "magenta",
+    "color": "i_magenta",
     "aggression": 75,
     "morale": 20,
-    "melee_skill": 7,
+    "melee_skill": 6,
     "melee_dice": 2,
     "melee_dice_sides": 3,
-    "melee_cut": 3,
-    "dodge": 4,
+    "melee_cut": 0,
+    "dodge": 3,
     "armor_bash": 5,
     "armor_cut": 7,
     "armor_bullet": 10,