more police armory adjustments (#66239)

* Fix typos * fix some missing lockers * reduce frequency of prison armory bullets * slightly lower ammo spawns * lower again
CleverRaven · Jun 17, 2023 · 38bfec9 · 38bfec9
1 parent ebcf6c5
commit 38bfec9
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 41 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json
@@ -46,7 +46,11 @@
     "id": "police_armory_any_9mm",
     "//": "Pick one of multiple interchangeable 9mm variants and its ammo.",
     "subtype": "distribution",
-    "entries": [ { "group": "police_armory_usp_9mm" }, { "group": "police_armory_glock_19" }, { "group": "police_armory_m9" } ]
+    "entries": [
+      { "group": "police_armory_usp_9mm", "prob": 25 },
+      { "group": "police_armory_glock_19", "prob": 50 },
+      { "group": "police_armory_m9", "prob": 25 }
+    ]
   },
   {
     "type": "item_group",
@@ -193,8 +197,8 @@
     "entries": [
       { "group": "police_armory_box_some_9mm" },
       { "group": "police_armory_box_some_9mm", "prob": 75 },
-      { "item": "ammunition_box_308", "count": [ 5, 50 ] },
-      { "group": "police_armory_box_full_9mm", "count": [ 0, 15 ] }
+      { "item": "ammunition_box_308", "count": [ 35, 50 ] },
+      { "group": "police_armory_box_full_9mm", "count": [ 0, 10 ] }
     ]
   },
   {
@@ -204,8 +208,8 @@
     "entries": [
       { "group": "police_armory_box_some_9mmfmj" },
       { "group": "police_armory_box_some_9mmfmj", "prob": 75 },
-      { "item": "ammunition_box_308", "count": [ 5, 50 ] },
-      { "group": "police_armory_box_full_9mmfmj", "count": [ 0, 15 ] }
+      { "item": "ammunition_box_308", "count": [ 35, 50 ] },
+      { "group": "police_armory_box_full_9mmfmj", "count": [ 0, 10 ] }
     ]
   },
   {
@@ -215,8 +219,8 @@
     "entries": [
       { "group": "police_armory_box_some_9mmP" },
       { "group": "police_armory_box_some_9mmP", "prob": 50 },
-      { "item": "ammunition_box_308", "count": [ 2, 30 ] },
-      { "group": "police_armory_box_full_9mmP", "count": [ 0, 10 ] }
+      { "item": "ammunition_box_308", "count": [ 20, 30 ] },
+      { "group": "police_armory_box_full_9mmP", "count": [ 0, 3 ] }
     ]
   },
   {
@@ -226,8 +230,8 @@
     "entries": [
       { "group": "police_armory_box_some_9mmP2" },
       { "group": "police_armory_box_some_9mmP2", "prob": 50 },
-      { "item": "ammunition_box_308", "count": [ 2, 20 ] },
-      { "group": "police_armory_box_full_9mmP2", "count": [ 0, 5 ] }
+      { "item": "ammunition_box_308", "count": [ 5, 20 ] },
+      { "group": "police_armory_box_full_9mmP2", "count": [ 0, 2 ] }
     ]
   },
   {
@@ -303,7 +307,7 @@
       { "item": "fn57mag", "count": [ 1, 4 ] },
       { "group": "police_armory_full_fn57mag_57mm", "count": [ 1, 4 ] },
       { "group": "police_armory_boxes_57mm" },
-      { "group": "police_armory_boxes_57mm", "prob": 25 }
+      { "group": "police_armory_boxes_57mm", "prob": 15 }
     ]
   },
   {
@@ -316,15 +320,15 @@
       { "item": "fn57mag", "count": [ 1, 3 ] },
       { "group": "police_armory_full_fn57mag_57mm_ss", "count": [ 1, 3 ] },
       { "group": "police_armory_boxes_57mm_ss" },
-      { "group": "police_armory_boxes_57mm_ss", "prob": 20 }
+      { "group": "police_armory_boxes_57mm_ss", "prob": 10 }
     ]
   },
   {
     "id": "police_armory_full_fn57mag_57mm",
     "type": "item_group",
     "subtype": "collection",
     "container-item": "fn57mag",
-    "entries": [ { "item": "57mm_ss", "charges": [ 20, 20 ] } ]
+    "entries": [ { "item": "57mm", "charges": [ 20, 20 ] } ]
   },
   {
     "id": "police_armory_full_fn57mag_57mm_ss",
@@ -340,7 +344,7 @@
     "entries": [
       { "group": "police_armory_box_some_57mm" },
       { "group": "police_armory_box_some_57mm", "prob": 60 },
-      { "item": "ammunition_box_308", "count": [ 5, 25 ] },
+      { "item": "ammunition_box_308", "count": [ 15, 25 ] },
       { "group": "police_armory_box_full_57mm", "count": [ 0, 10 ] }
     ]
   },
@@ -352,7 +356,7 @@
       { "group": "police_armory_box_some_57mm_ss" },
       { "group": "police_armory_box_some_57mm_ss", "prob": 50 },
       { "item": "ammunition_box_308", "count": [ 5, 10 ] },
-      { "group": "police_armory_box_full_57mm_ss", "count": [ 0, 10 ] }
+      { "group": "police_armory_box_full_57mm_ss", "count": [ 0, 5 ] }
     ]
   },
   {
@@ -404,8 +408,8 @@
       { "group": "police_armory_full_sig40mag_40fmj", "count": [ 0, 4 ] },
       { "group": "police_armory_boxes_40sw" },
       { "group": "police_armory_boxes_40fmj" },
-      { "group": "police_armory_boxes_40sw", "prob": 25 },
-      { "group": "police_armory_boxes_40fmj", "prob": 25 }
+      { "group": "police_armory_boxes_40sw", "prob": 15 },
+      { "group": "police_armory_boxes_40fmj", "prob": 15 }
     ]
   },
   {
@@ -417,13 +421,13 @@
       { "item": "glock_22" },
       { "item": "glock_22", "prob": 50 },
       { "item": "glock_22", "prob": 25 },
-      { "item": "sig40mag", "count": [ 1, 6 ] },
+      { "item": "glock40mag", "count": [ 1, 6 ] },
       { "group": "police_armory_full_glock40mag_40sw", "count": [ 0, 4 ] },
       { "group": "police_armory_full_glock40mag_40fmj", "count": [ 0, 4 ] },
       { "group": "police_armory_boxes_40sw" },
       { "group": "police_armory_boxes_40fmj" },
-      { "group": "police_armory_boxes_40sw", "prob": 25 },
-      { "group": "police_armory_boxes_40fmj", "prob": 25 }
+      { "group": "police_armory_boxes_40sw", "prob": 15 },
+      { "group": "police_armory_boxes_40fmj", "prob": 15 }
     ]
   },
   {
@@ -461,8 +465,8 @@
     "entries": [
       { "group": "police_armory_box_some_40sw" },
       { "group": "police_armory_box_some_40sw", "prob": 75 },
-      { "item": "ammunition_box_308", "count": [ 5, 42 ] },
-      { "group": "police_armory_box_full_40sw", "count": [ 0, 15 ] }
+      { "item": "ammunition_box_308", "count": [ 30, 40 ] },
+      { "group": "police_armory_box_full_40sw", "count": [ 0, 10 ] }
     ]
   },
   {
@@ -472,8 +476,8 @@
     "entries": [
       { "group": "police_armory_box_some_40fmj" },
       { "group": "police_armory_box_some_40fmj", "prob": 75 },
-      { "item": "ammunition_box_308", "count": [ 5, 42 ] },
-      { "group": "police_armory_box_full_40fmj", "count": [ 0, 15 ] }
+      { "item": "ammunition_box_308", "count": [ 30, 40 ] },
+      { "group": "police_armory_box_full_40fmj", "count": [ 0, 10 ] }
     ]
   },
   {
@@ -518,7 +522,7 @@
       { "group": "police_armory_full_usp45mag_45_jhp", "count": [ 0, 4 ] },
       { "group": "police_armory_boxes_45_acp" },
       { "group": "police_armory_boxes_45_jhp" },
-      { "group": "police_armory_boxes_45_super", "prob": 60 }
+      { "group": "police_armory_boxes_45_super", "prob": 50 }
     ]
   },
   {
@@ -542,8 +546,8 @@
     "entries": [
       { "group": "police_armory_box_some_45_jhp" },
       { "group": "police_armory_box_some_45_jhp", "prob": 75 },
-      { "item": "ammunition_box_308", "count": [ 5, 40 ] },
-      { "group": "police_armory_box_full_45_jhp", "count": [ 0, 15 ] }
+      { "item": "ammunition_box_308", "count": [ 30, 40 ] },
+      { "group": "police_armory_box_full_45_jhp", "count": [ 0, 10 ] }
     ]
   },
   {
@@ -553,8 +557,8 @@
     "entries": [
       { "group": "police_armory_box_some_45_acp" },
       { "group": "police_armory_box_some_45_acp", "prob": 75 },
-      { "item": "ammunition_box_308", "count": [ 5, 40 ] },
-      { "group": "police_armory_box_full_45_acp", "count": [ 0, 15 ] }
+      { "item": "ammunition_box_308", "count": [ 30, 40 ] },
+      { "group": "police_armory_box_full_45_acp", "count": [ 0, 10 ] }
     ]
   },
   {
@@ -649,8 +653,8 @@
     "entries": [
       { "group": "police_armory_box_some_223" },
       { "group": "police_armory_box_some_223", "prob": 50 },
-      { "item": "ammunition_box_308", "count": [ 5, 75 ] },
-      { "group": "police_armory_box_full_223", "count": [ 0, 16 ] }
+      { "item": "ammunition_box_308", "count": [ 50, 75 ] },
+      { "group": "police_armory_box_full_223", "count": [ 0, 15 ] }
     ]
   },
   {
@@ -689,7 +693,7 @@
     "entries": [
       { "group": "police_armory_box_some_556" },
       { "group": "police_armory_box_some_556", "prob": 50 },
-      { "item": "ammunition_box_308", "count": [ 5, 75 ] },
+      { "item": "ammunition_box_308", "count": [ 50, 75 ] },
       { "group": "police_armory_box_full_556", "count": [ 0, 10 ] }
     ]
   },
@@ -735,8 +739,8 @@
     "entries": [
       { "group": "police_armory_box_some_308" },
       { "group": "police_armory_box_some_308", "prob": 50 },
-      { "item": "ammunition_box_308", "count": [ 3, 30 ] },
-      { "group": "police_armory_box_full_308", "count": [ 0, 6 ] }
+      { "item": "ammunition_box_308", "count": [ 15, 30 ] },
+      { "group": "police_armory_box_full_308", "count": [ 0, 5 ] }
     ]
   },
   {
@@ -796,8 +800,8 @@
     "entries": [
       { "group": "police_armory_box_some_3006" },
       { "group": "police_armory_box_some_3006", "prob": 50 },
-      { "item": "ammunition_box_308", "count": [ 4, 30 ] },
-      { "group": "police_armory_box_full_3006", "count": [ 0, 8 ] }
+      { "item": "ammunition_box_308", "count": [ 20, 30 ] },
+      { "group": "police_armory_box_full_3006", "count": [ 0, 6 ] }
     ]
   },
   {
@@ -830,10 +834,10 @@
       { "group": "police_armory_box_some_shot_beanbag", "prob": 50 },
       { "group": "police_armory_box_some_shot_he" },
       { "group": "police_armory_box_some_shot_00", "prob": 75 },
-      { "item": "ammunition_box_50bmg", "count": [ 8, 40 ] },
+      { "item": "ammunition_box_50bmg", "count": [ 25, 40 ] },
       { "group": "police_armory_box_full_shot_beanbag", "count": [ 0, 8 ] },
-      { "group": "police_armory_box_full_shot_00", "count": [ 0, 4 ], "prob": 75 },
-      { "group": "police_armory_box_full_shot_he", "count": [ 0, 2 ], "prob": 75 }
+      { "group": "police_armory_box_full_shot_00", "count": [ 0, 2 ], "prob": 50 },
+      { "group": "police_armory_box_full_shot_he", "count": [ 0, 2 ], "prob": 50 }
     ]
   },
   {

diff --git a/data/json/mapgen/police_station.json b/data/json/mapgen/police_station.json
@@ -316,6 +316,8 @@
         "l": "f_locker",
         "L": "f_locker",
         "[": "f_locker",
+        "{": "f_locker",
+        "]": "f_locker",
         "2": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "3": [ "f_gunsafe_ml", "f_gun_safe_el" ],
         "9": [ "f_gunsafe_ml", "f_gun_safe_el" ],

diff --git a/data/json/mapgen_palettes/prison.json b/data/json/mapgen_palettes/prison.json
@@ -96,9 +96,9 @@
       "0": [
         { "item": "prison_weapons", "chance": 50, "repeat": [ 1, 3 ] },
         { "item": "prison_armor", "chance": 50, "repeat": [ 1, 3 ] },
-        { "item": "police_armory_any_pistol", "chance": 25 },
-        { "item": "police_armory_any_assaultrifle", "chance": 10 },
-        { "item": "police_armory_any_shotgun", "chance": 10 }
+        { "item": "police_armory_any_pistol", "chance": 8 },
+        { "item": "police_armory_any_assaultrifle", "chance": 3 },
+        { "item": "police_armory_any_shotgun", "chance": 3 }
       ],
       "1": { "item": "SUS_office_filing_cabinet", "chance": 50 },
       "o": { "item": "novels", "chance": 70, "repeat": [ 1, 3 ] },