Extensive tweaks to gun spawns in various mapgen

CleverRaven · Apr 16, 2024 · 00f9d95 · 00f9d95
1 parent 4e59f3c
commit 00f9d95
Show file tree

Hide file tree

Showing 16 changed files with 178 additions and 180 deletions.
diff --git a/data/json/mapgen/basement/basement_guns.json b/data/json/mapgen/basement/basement_guns.json
@@ -48,36 +48,35 @@
       },
       "furniture": { "#": "f_counter", "]": "f_bookcase", "h": "f_chair", "s": "f_gunsafe_ml", "{": "f_rack" },
       "place_loot": [
-        { "group": "guns_smg_rare", "x": 6, "y": 2, "chance": 20, "magazine": 100 },
-        { "group": "guns_rifle_rare", "x": 7, "y": 2, "chance": 30, "magazine": 100 },
-        { "group": "mags_pistol_rare", "x": 8, "y": 2, "chance": 75 },
-        { "group": "guns_pistol_common", "x": 9, "y": 2, "chance": 90, "magazine": 100 },
-        { "group": "mags_pistol_common", "x": 10, "y": 2, "chance": 100, "repeat": [ 1, 3 ] },
-        { "group": "guns_rifle_common", "x": 11, "y": 2, "chance": 80, "magazine": 100 },
-        { "group": "guns_shotgun_common", "x": 12, "y": 2, "chance": 80, "magazine": 100 },
-        { "group": "mags_rifle_common", "x": 13, "y": 2, "chance": 100, "repeat": [ 1, 3 ] },
-        { "group": "guns_smg_common", "x": 14, "y": 2, "chance": 70, "magazine": 100 },
-        { "group": "guns_pistol_rare", "x": 15, "y": 2, "chance": 40, "magazine": 100 },
-        { "group": "mags_smg_common", "x": 16, "y": 2, "chance": 70, "repeat": [ 1, 2 ] },
-        { "group": "guns_shotgun_rare_static", "x": 17, "y": 2, "chance": 30, "magazine": 100 },
-        { "group": "ammo_shotgun_reloaded", "x": 6, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "ammo_rifle_reloaded", "x": 7, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "ammo_shotgun_common", "x": 8, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "ammo_pistol_reloaded", "x": 9, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "ammo_rifle_reloaded", "x": 10, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "ammo_rifle_common", "x": 11, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "ammo_smg_common", "x": 12, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "ammo_pistol_common", "x": 13, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
-        { "group": "ammo_rifle_common", "x": 14, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "ammo_pistol_common", "x": 15, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "ammo_pistol_reloaded", "x": 16, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
-        { "group": "ammo_shotgun_common", "x": 17, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
+        { "group": "guns_rare", "x": 6, "y": 2, "chance": 20, "magazine": 100 },
+        { "group": "guns_rare", "x": 7, "y": 2, "chance": 20, "magazine": 100 },
+        { "group": "mags_rare", "x": 8, "y": 2, "chance": 20 },
+        { "group": "guns_common", "x": 9, "y": 2, "chance": 100, "magazine": 100 },
+        { "group": "mags_common", "x": 10, "y": 2, "chance": 100, "repeat": [ 1, 3 ] },
+        { "group": "guns_common", "x": 11, "y": 2, "chance": 100, "magazine": 100 },
+        { "group": "guns_common", "x": 12, "y": 2, "chance": 100, "magazine": 100 },
+        { "group": "mags_common", "x": 13, "y": 2, "chance": 100, "repeat": [ 1, 3 ] },
+        { "group": "guns_common", "x": 14, "y": 2, "chance": 100, "magazine": 100 },
+        { "group": "guns_rare", "x": 15, "y": 2, "chance": 20, "magazine": 100 },
+        { "group": "mags_common", "x": 16, "y": 2, "chance": 70, "repeat": [ 1, 2 ] },
+        { "group": "guns_rare_static", "x": 17, "y": 2, "chance": 30, "magazine": 100 },
+        { "group": "ammo_reloaded", "x": 6, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
+        { "group": "ammo_reloaded", "x": 7, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
+        { "group": "ammo_common", "x": 8, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "ammo_reloaded", "x": 9, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
+        { "group": "ammo_reloaded", "x": 10, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "ammo_common", "x": 11, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
+        { "group": "ammo_common", "x": 12, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "ammo_common", "x": 13, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
+        { "group": "ammo_common", "x": 14, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "ammo_common", "x": 15, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "ammo_reloaded", "x": 16, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
+        { "group": "ammo_common", "x": 17, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
         { "group": "book_gunref", "x": 14, "y": [ 10, 11 ], "chance": 60 },
         { "group": "gunmod_common", "x": 4, "y": 11, "chance": 100 },
-        { "group": "guns_obscure", "x": 6, "y": 11, "chance": 100, "ammo": 100, "magazine": 100 },
-        { "group": "museum_guns", "x": 6, "y": 11, "chance": 70, "ammo": 70, "magazine": 90 },
+        { "group": "guns_obscure", "x": 6, "y": 11, "chance": 10, "ammo": 100, "magazine": 100 },
         { "group": "tools_common", "x": 20, "y": 12, "chance": 100 },
-        { "group": "gunmod_rare", "x": 18, "y": 13, "chance": 30 },
+        { "group": "gunmod_rare", "x": 18, "y": 13, "chance": 10 },
         { "group": "gunmod_rare", "x": 19, "y": 13, "chance": 100 }
       ],
       "place_monsters": [

diff --git a/data/json/mapgen/basement/basement_survival.json b/data/json/mapgen/basement/basement_survival.json
@@ -120,7 +120,7 @@
         { "group": "gear_survival", "x": 13, "y": 14, "chance": 75 },
         { "group": "gear_survival", "x": 13, "y": 15, "chance": 75 },
         {
-          "group": "guns_survival",
+          "group": "guns_common",
           "x": 19,
           "y": [ 3, 4 ],
           "chance": 100,
@@ -129,8 +129,8 @@
           "magazine": 100
         },
         { "group": "ammo_reloaded", "x": 19, "y": 5, "chance": 100, "repeat": [ 1, 3 ], "magazine": 100 },
-        { "group": "guns_pistol_common", "x": 15, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 },
-        { "group": "guns_pistol_common", "x": 21, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 },
+        { "group": "guns_common", "x": 15, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 },
+        { "group": "guns_common", "x": 21, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 },
         { "group": "clothing_outdoor_set", "x": 15, "y": 10, "chance": 30 },
         { "group": "clothing_outdoor_set", "x": 21, "y": 10, "chance": 30 },
         { "item": "blanket", "x": 16, "y": 10, "chance": 30 },

diff --git a/data/json/mapgen/farm_supply.json b/data/json/mapgen/farm_supply.json
@@ -519,7 +519,7 @@
         "à": {
           "item": {
             "subtype": "collection",
-            "entries": [ { "group": "guns_rifle_common_display", "prob": 40 }, { "group": "guns_shotgun_common_display", "prob": 60 } ]
+            "entries": [ { "group": "guns_rifle_common_display", "prob": 60 }, { "group": "guns_shotgun_common_display", "prob": 40 } ]
           },
           "chance": 7,
           "repeat": [ 0, 2 ]

diff --git a/data/json/mapgen/gas_stations/gas_station_bunker.json b/data/json/mapgen/gas_stations/gas_station_bunker.json
@@ -261,9 +261,9 @@
         "i": { "item": "SUS_office_desk", "chance": 70 },
         "p": { "item": "clothing_male", "chance": 70, "repeat": 3 },
         "P": [
-          { "item": "guns_pistol_milspec", "chance": 60, "repeat": 3 },
-          { "item": "ammo_pistol_milspec", "chance": 60, "repeat": 3 },
-          { "item": "prison_armor", "chance": 60, "repeat": 3 }
+          { "item": "guns_pistol_milspec", "chance": 60 },
+          { "item": "ammo_pistol_milspec", "chance": 60 },
+          { "item": "prison_armor", "chance": 60 }
         ],
         "n": { "item": "SUS_bathroom_sink", "chance": 90 }
       },
@@ -431,10 +431,10 @@
         "D": { "item": "textbooks", "chance": 80, "repeat": [ 1, 12 ] },
         "Y": [ { "item": "mut_lab", "chance": 33, "repeat": [ 1, 2 ] }, { "item": "chem_lab", "chance": 75, "repeat": [ 1, 3 ] } ],
         "B": [
-          { "item": "guns_rifle_milspec", "chance": 40, "repeat": [ 1, 4 ] },
-          { "item": "guns_smg_milspec", "chance": 40, "repeat": [ 1, 4 ] },
-          { "item": "ammo_rifle_milspec", "chance": 40, "repeat": [ 1, 4 ] },
-          { "item": "ammo_smg_milspec", "chance": 40, "repeat": [ 1, 4 ] }
+          { "item": "guns_rifle_milspec", "chance": 40 },
+          { "item": "guns_smg_milspec", "chance": 40 },
+          { "item": "ammo_rifle_milspec", "chance": 40 },
+          { "item": "ammo_smg_milspec", "chance": 40 }
         ]
       },
       "place_loot": [

diff --git a/data/json/mapgen/gas_stations/s_gas.json b/data/json/mapgen/gas_stations/s_gas.json
@@ -287,9 +287,9 @@
         { "item": "road", "x": [ 20, 20 ], "y": [ 13, 14 ], "chance": 80, "repeat": [ 1, 4 ] },
         { "item": "camping", "x": [ 9, 9 ], "y": [ 15, 15 ], "chance": 90, "repeat": [ 1, 10 ] },
         { "item": "magazines", "x": [ 9, 9 ], "y": [ 13, 15 ], "chance": 90, "repeat": [ 1, 25 ] },
-        { "item": "softdrugs", "x": [ 8, 8 ], "y": [ 13, 15 ], "chance": 80, "repeat": [ 1, 8 ] }
+        { "item": "softdrugs", "x": [ 8, 8 ], "y": [ 13, 15 ], "chance": 80, "repeat": [ 1, 8 ] },
+        { "item": "nested_shotgun_s", "x": 3, "y": 20, "chance": 10 }
       ],
-      "place_item": [ { "item": "shotgun_s", "x": 3, "y": 20 }, { "item": "shot_00", "x": 7, "y": 19, "chance": 50 } ],
       "place_monster": [ { "group": "GROUP_ZOMBIE_GAS", "x": [ 5, 10 ], "y": [ 6, 10 ], "repeat": [ 1, 2 ], "chance": 25 } ]
     }
   },

diff --git a/data/json/mapgen/house/house_garage_prepper.json b/data/json/mapgen/house/house_garage_prepper.json
@@ -85,7 +85,7 @@
         ]
       },
       "place_loot": [
-        { "group": "guns_survival", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 80, "ammo": 100, "magazine": 100 },
+        { "group": "guns_survival", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 50, "ammo": 100, "magazine": 100 },
         { "group": "tools_common", "x": [ 14, 16 ], "y": [ 11, 11 ], "chance": 80, "repeat": [ 1, 3 ] },
         { "group": "supplies_fuel", "x": [ 14, 14 ], "y": [ 3, 6 ], "chance": 90, "repeat": [ 1, 2 ] },
         { "group": "mischw", "x": [ 14, 16 ], "y": [ 11, 11 ], "chance": 65, "repeat": [ 1, 3 ] },
@@ -98,8 +98,8 @@
           "group": "guns_survival",
           "x": [ 15, 16 ],
           "y": [ 8, 9 ],
-          "chance": 70,
-          "repeat": [ 1, 3 ],
+          "chance": 60,
+          "repeat": [ 1, 2 ],
           "ammo": 75,
           "magazine": 95
         }

diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json
@@ -675,9 +675,9 @@
         "V": [ { "item": "tools_common", "chance": 50, "repeat": [ 0, 1 ] } ],
         "U": [
           { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 10 ] },
-          { "item": "guns_obscure", "chance": 50, "repeat": [ 1, 2 ] },
-          { "item": "ammo_obscure", "chance": 50, "repeat": [ 2, 4 ] },
-          { "item": "mags_obscure", "chance": 50, "repeat": [ 2, 3 ] }
+          { "item": "guns_common", "chance": 50, "repeat": [ 1, 2 ] },
+          { "item": "ammo_common", "chance": 50, "repeat": [ 2, 4 ] },
+          { "item": "mags_common", "chance": 50, "repeat": [ 2, 3 ] }
         ],
         "^": [ { "item": "mil_base_iv", "chance": 70 } ]
       },