feat(content): monstergroup for gunstores, milsurp, etc (#3620)

Add monstergroup for gunstores, milsurp, etc
cataclysmbnteam · Nov 11, 2023 · 9752bcd · 9752bcd
1 parent c2dd98c
commit 9752bcd
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 10 deletions.
diff --git a/data/json/mapgen/gunsmith.json b/data/json/mapgen/gunsmith.json
@@ -104,7 +104,8 @@
         { "item": "large_repairkit", "x": [ 9, 10 ], "y": 8, "chance": 30 },
         { "item": "television", "x": 14, "y": 16, "chance": 60 },
         { "item": "laptop", "x": 17, "y": 15, "chance": 30 }
-      ]
+      ],
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 2, 21 ], "y": 2, "chance": 2, "repeat": [ 2, 3 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/mil_surplus.json b/data/json/mapgen/mil_surplus.json
@@ -32,7 +32,8 @@
         "..|&  |4YYYUUYUU<|LL|@|.",
         "..|----YYYYYYYYYY-----|."
       ],
-      "palettes": [ "mil_surplus" ]
+      "palettes": [ "mil_surplus" ],
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 2, 21 ], "y": 1, "chance": 2, "repeat": [ 1, 2 ] } ]
     }
   },
   {
@@ -129,7 +130,8 @@
         ".----------------------.",
         "........................"
       ],
-      "palettes": [ "mil_surplus" ]
+      "palettes": [ "mil_surplus" ],
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 2, 21 ], "y": 1, "chance": 2, "repeat": [ 1, 2 ] } ]
     }
   },
   {
@@ -269,7 +271,8 @@
         { "chance": 75, "repeat": [ 1, 4 ], "item": "mil_surplus", "x": [ 14, 15 ], "y": [ 11, 18 ] },
         { "chance": 75, "repeat": [ 1, 4 ], "item": "mil_surplus", "x": [ 9, 10 ], "y": [ 9, 10 ] },
         { "chance": 3, "repeat": [ 1, 4 ], "item": "pwr_armor_acc", "x": [ 9, 10 ], "y": [ 9, 10 ] }
-      ]
+      ],
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 13, 21 ], "y": [ 2, 3 ], "chance": 2, "repeat": [ 1, 2 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/s_gun.json b/data/json/mapgen/s_gun.json
@@ -128,7 +128,7 @@
         { "item": "ear_plugs", "x": 3, "y": 15, "chance": 50, "repeat": 2 },
         { "item": "powered_earmuffs", "x": 3, "y": 15, "chance": 30 }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] } ]
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 2, 21 ], "y": 2, "chance": 2, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -276,7 +276,8 @@
         { "group": "guns_rifle_common_display", "x": 16, "y": [ 9, 10 ], "chance": 85, "repeat": [ 1, 3 ] },
         { "group": "mags_common", "x": [ 14, 16 ], "y": 12, "chance": 100, "repeat": [ 1, 8 ] },
         { "group": "mags_rare", "x": [ 14, 16 ], "y": 13, "chance": 75, "repeat": [ 1, 3 ] }
-      ]
+      ],
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 2, 21 ], "y": 0, "chance": 2, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -411,8 +412,8 @@
       "items": { "B": { "item": "bed", "chance": 65, "repeat": [ 1, 3 ] } },
       "monster": { "7": { "monster": "mon_zombie_cop" } },
       "place_monsters": [
-        { "monster": "GROUP_ZOMBIE", "x": [ 11, 13 ], "y": [ 17, 19 ], "density": 0.08 },
-        { "monster": "GROUP_ZOMBIE", "x": 18, "y": [ 14, 15 ], "density": 0.08 }
+        { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 11, 13 ], "y": [ 17, 19 ], "density": 0.08 },
+        { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": 18, "y": [ 14, 15 ], "density": 0.08 }
       ],
       "place_fields": [
         { "field": "fd_blood", "x": [ 10, 11 ], "y": [ 14, 15 ], "repeat": [ 2, 4 ] },
@@ -539,7 +540,8 @@
         { "chance": 95, "item": "guns_common_display", "x": 19, "y": [ 5, 7 ] },
         { "chance": 45, "item": "trash", "x": 13, "y": 12 },
         { "chance": 45, "item": "trash", "x": 10, "y": 12 }
-      ]
+      ],
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 2, 21 ], "y": 2, "chance": 2, "repeat": [ 2, 3 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/store/s_hunting.json b/data/json/mapgen/store/s_hunting.json
@@ -98,7 +98,7 @@
         { "group": "tools_hunting", "x": [ 14, 20 ], "y": [ 8, 9 ], "chance": 70, "repeat": [ 12, 14 ] },
         { "group": "tools_hunting", "x": [ 14, 20 ], "y": [ 11, 12 ], "chance": 70, "repeat": [ 12, 14 ] }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": 2, "chance": 2, "repeat": [ 2, 3 ] } ]
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 2, 21 ], "y": 2, "chance": 2, "repeat": [ 2, 3 ] } ]
     }
   },
   {

diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
@@ -620,6 +620,30 @@
       { "monster": "mon_feral_human_tool", "starts": 250, "freq": 20, "cost_multiplier": 1 }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_ZOMBIE_GUNSTORE",
+    "//": "Elevated chance of survivor zombies/ferals",
+    "default": "mon_zombie",
+    "monsters": [
+      { "monster": "mon_zombie_fat", "freq": 100, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_tough", "freq": 50, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_rot", "freq": 25, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_crawler", "freq": 50, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_static", "freq": 25, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_cop", "freq": 50, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_swat", "freq": 25, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_soldier", "freq": 25, "cost_multiplier": 2 },
+      { "monster": "mon_dog_zombie_cop", "freq": 25, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_dog", "freq": 10, "cost_multiplier": 2 },
+      { "monster": "mon_dog_zombie_rot", "freq": 15, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_survivor", "freq": 100, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_survivor_elite", "freq": 50, "cost_multiplier": 5, "starts": 1440 },
+      { "monster": "mon_feral_survivalist", "starts": 250, "freq": 40, "cost_multiplier": 1 },
+      { "monster": "mon_feral_prepper", "starts": 500, "freq": 30, "cost_multiplier": 5 },
+      { "monster": "mon_feral_militia", "starts": 500, "freq": 30, "cost_multiplier": 10 }
+    ]
+  },
   {
     "name": "FERAL_HUMANS",
     "type": "monstergroup",