Overhaul core gun spawning item groups

CleverRaven · Apr 16, 2024 · 4e59f3c · 4e59f3c
1 parent 15c9c6b
commit 4e59f3c
Show file tree

Hide file tree

Showing 8 changed files with 1,106 additions and 578 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -87,16 +87,14 @@
     "ammo": 100,
     "subtype": "distribution",
     "entries": [
-      { "group": "guns_pistol_common", "prob": 20 },
-      { "group": "guns_rifle_common", "prob": 20 },
-      { "group": "guns_shotgun_common", "prob": 20 },
-      { "group": "guns_pistol_obscure", "prob": 60 },
-      { "group": "guns_rifle_obscure", "prob": 60 },
-      { "group": "guns_shotgun_obscure", "prob": 60 },
-      { "group": "guns_survival", "prob": 30 },
-      { "group": "ammo_obscure", "prob": 90 },
-      { "group": "ammo_reloaded", "prob": 30 },
-      { "group": "mags_obscure", "prob": 30 }
+      { "group": "guns_pistol_common", "prob": 162 },
+      { "group": "guns_rifle_common", "prob": 36 },
+      { "group": "guns_shotgun_common", "prob": 2 },
+      { "group": "guns_pistol_obscure", "prob": 81 },
+      { "group": "guns_rifle_obscure", "prob": 18 },
+      { "group": "guns_shotgun_obscure", "prob": 1 },
+      { "group": "ammo_obscure", "prob": 40 },
+      { "group": "mags_obscure", "prob": 40 }
     ]
   },
   {
@@ -106,10 +104,10 @@
     "ammo": 100,
     "subtype": "distribution",
     "entries": [
-      { "group": "guns_pistol_common", "prob": 50 },
-      { "group": "guns_rifle_common", "prob": 50 },
-      { "group": "guns_shotgun_common", "prob": 50 },
-      { "group": "guns_survival", "prob": 100 },
+      { "group": "guns_pistol_common", "prob": 81 },
+      { "group": "guns_rifle_common", "prob": 18 },
+      { "group": "guns_shotgun_common", "prob": 2 },
+      { "group": "guns_survival", "prob": 1 },
       { "item": "flaregun", "prob": 25 },
       { "item": "large_repairkit", "prob": 5, "charges": [ 0, 500 ] },
       { "item": "signal_flare", "prob": 20 },
@@ -1473,11 +1471,11 @@
       [ "tonfa_wood", 10 ],
       { "item": "shocktonfa_off", "prob": 25, "charges": [ 0, 500 ] },
       { "item": "tazer", "prob": 25, "charges": [ 0, 500 ] },
-      { "item": "remington_700", "prob": 5, "charges": [ 0, 4 ] },
-      { "item": "3006", "prob": 5, "charges": [ 1, 20 ] },
-      { "item": "ksg", "prob": 8, "charges": [ 0, 7 ] },
-      { "item": "remington_870_express", "prob": 8, "charges": [ 0, 7 ] },
-      { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 8, "charges": [ 0, 6 ] },
+      { "item": "remington_700", "prob": 1, "charges": [ 0, 4 ] },
+      { "item": "3006", "prob": 1, "charges": [ 1, 20 ] },
+      { "item": "ksg", "prob": 1, "charges": [ 0, 7 ] },
+      { "item": "remington_870_express", "prob": 1, "charges": [ 0, 7 ] },
+      { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 1, "charges": [ 0, 6 ] },
       { "item": "shot_beanbag", "prob": 25, "charges": [ 1, 10 ] },
       { "item": "rm120c", "prob": 2, "charges": [ 0, 5 ] },
       { "item": "rm20", "prob": 1, "charges": [ 0, 20 ] },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -210,23 +210,9 @@
     "type": "item_group",
     "id": "pawn_guns",
     "items": [
-      [ "win70_458", 1 ],
-      [ "combination_gun", 1 ],
-      [ "458wm", 1 ],
-      [ "sw629", 3 ],
-      { "group": "modular_deagle_44", "prob": 2 },
-      [ "m1911", 5 ],
-      [ "mosin91_30", 1 ],
-      [ "match_trigger", 3 ],
-      [ "remington_870", 9 ],
-      [ "browning_blr", 8 ],
-      [ "remington_700", 14 ],
-      [ "m1903", 1 ],
-      [ "garand", 2 ],
-      [ "moss_brownie", 5 ],
-      [ "cop_38", 5 ],
-      [ "rifle_flintlock", 1 ],
-      [ "pistol_flintlock", 1 ]
+      { "group": "guns_common", "prob": 100 },
+      { "group": "guns_rare", "prob": 10 },
+      { "group": "guns_obscure", "prob": 1 }
     ]
   },
   {

diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json
@@ -6,10 +6,10 @@
     "//2": "This group is for the contents of gunsafes",
     "subtype": "collection",
     "entries": [
-      { "group": "ammo_common_collection", "prob": 85 },
-      { "group": "ammo_rare_collection", "prob": 20 },
-      { "group": "ammo_obscure_collection", "prob": 10 },
-      { "group": "guns_rare_display", "prob": 10 }
+      { "group": "ammo_common_collection", "prob": 100 },
+      { "group": "ammo_rare_collection", "prob": 1 },
+      { "group": "ammo_obscure_collection", "prob": 1 },
+      { "group": "guns_rare_display", "prob": 1 }
     ]
   },
   {
@@ -26,15 +26,15 @@
       },
       {
         "collection": [ { "group": "guns_shotgun_obscure_display" }, { "group": "mags_shotgun_rare", "count": [ 1, 2 ] } ],
-        "prob": 10
+        "prob": 1
       },
       {
         "collection": [
           { "group": "guns_smg_display" },
           { "group": "mags_smg_common", "count": [ 1, 8 ] },
           { "group": "mags_smg_rare", "count": [ 1, 8 ] }
         ],
-        "prob": 45
+        "prob": 2
       }
     ]
   },
@@ -93,9 +93,12 @@
     "//2": "This group is for the contents of gunstore displaycases",
     "subtype": "distribution",
     "entries": [
-      { "group": "guns_rifle_rare_display", "prob": 80 },
-      { "group": "guns_pistol_rare_display", "prob": 40 },
-      { "group": "guns_shotgun_rare_display", "prob": 5 }
+      { "group": "guns_pistol_common_display", "prob": 60 },
+      { "group": "guns_rifle_common_display", "prob": 20 },
+      { "group": "guns_shotgun_common_display", "prob": 2 },
+      { "group": "guns_pistol_rare_display", "prob": 30 },
+      { "group": "guns_rifle_rare_display", "prob": 10 },
+      { "group": "guns_shotgun_rare_display", "prob": 1 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json
@@ -41,7 +41,7 @@
     "items": [
       { "group": "milspec_arsenal_9mm_gun&mags&cans", "prob": 96 },
       { "group": "milspec_arsenal_9mm_sub_gun&mags&cans", "prob": 100 },
-      { "group": "milspec_arsenal_shot_gun&mags&cans", "prob": 150 },
+      { "group": "milspec_arsenal_shot_gun&mags&cans", "prob": 15 },
       { "group": "milspec_arsenal_223_pouch_gun&mags&cans", "prob": 1000 },
       { "group": "milspec_arsenal_223_mg_gun&mags&cans", "prob": 260 },
       { "group": "milspec_arsenal_300blk_gun&mags&cans", "prob": 100 },
@@ -113,7 +113,7 @@
     "items": [
       { "group": "milspec_arsenal_9mm_gun&mags", "count": [ 1, 2 ], "prob": 96 },
       { "group": "milspec_arsenal_9mm_sub_gun&mags", "count": [ 1, 2 ], "prob": 100 },
-      { "group": "milspec_arsenal_shot_gun&mags", "count": [ 1, 2 ], "prob": 150 },
+      { "group": "milspec_arsenal_shot_gun&mags", "count": [ 1, 2 ], "prob": 15 },
       { "group": "milspec_arsenal_223_gun&mags", "count": [ 1, 2 ], "prob": 1000 },
       { "group": "milspec_arsenal_223_mg_gun&mags", "count": [ 1, 2 ], "prob": 260 },
       { "group": "milspec_arsenal_300blk_gun&mags", "count": [ 1, 2 ], "prob": 100 },