Merge pull request #76727 from Holli-Git/22-ammo-spawn-fix

Adjust .22 Ammo Spawns
CleverRaven · Oct 3, 2024 · cdba3a4 · cdba3a4
2 parents 49ba287 + ee31152
commit cdba3a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -261,10 +261,8 @@
     "subtype": "distribution",
     "entries": [
       { "item": "223", "prob": 60, "charges": [ 1, 30 ] },
-      { "item": "22_cb", "prob": 30, "charges": [ 1, 100 ] },
-      { "item": "22_fmj", "prob": 50, "charges": [ 1, 80 ] },
-      { "item": "22_lr", "prob": 100, "charges": [ 1, 80 ] },
-      { "item": "22_ratshot", "prob": 30, "charges": [ 1, 100 ] },
+      { "item": "22_lr", "prob": 210, "charges": [ 1, 80 ] },
+      { "item": "22_ratshot", "prob": 1, "charges": [ 1, 100 ] },
       { "item": "270win_jsp", "prob": 25, "charges": [ 1, 20 ] },
       { "item": "3006", "prob": 19, "charges": [ 1, 20 ] },
       { "item": "3006_jsp", "prob": 6, "charges": [ 1, 20 ] },
@@ -283,10 +281,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "223", "prob": 40 },
-      { "item": "22_cb", "prob": 30 },
-      { "item": "22_fmj", "prob": 50 },
-      { "item": "22_lr", "prob": 40 },
-      { "item": "22_ratshot", "prob": 30 },
+      { "item": "22_lr", "prob": 150 },
+      { "item": "22_ratshot", "prob": 1 },
       { "item": "270win_jsp", "prob": 25 },
       { "item": "3006", "prob": 25 },
       { "item": "3006_incendiary", "prob": 1 },
@@ -301,10 +297,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "223", "prob": 10, "charges": [ 0, 6 ] },
-      { "item": "22_cb", "prob": 20, "charges": [ 0, 6 ] },
-      { "item": "22_fmj", "prob": 15, "charges": [ 0, 6 ] },
-      { "item": "22_lr", "prob": 20, "charges": [ 0, 6 ] },
-      { "item": "22_ratshot", "prob": 10, "charges": [ 0, 6 ] },
+      { "item": "22_lr", "prob": 65, "charges": [ 0, 6 ] },
+      { "item": "22_ratshot", "prob": 1, "charges": [ 0, 6 ] },
       { "item": "270win_jsp", "prob": 2, "charges": [ 0, 6 ] },
       { "item": "3006", "prob": 9, "charges": [ 0, 6 ] },
       { "item": "3006_jsp", "prob": 3, "charges": [ 0, 6 ] },
@@ -385,9 +379,7 @@
     "//": "Ammo for hunting rifles found within hunting supply stores and related locations.",
     "subtype": "distribution",
     "entries": [
-      { "item": "22_fmj", "prob": 50, "charges": [ 1, 80 ] },
-      { "item": "22_lr", "prob": 50, "charges": [ 1, 80 ] },
-      { "item": "22_ratshot", "prob": 30, "charges": [ 1, 100 ] },
+      { "item": "22_lr", "prob": 130, "charges": [ 1, 80 ] },
       { "item": "270win_jsp", "prob": 30, "charges": [ 1, 20 ] },
       { "item": "3006", "prob": 23, "charges": [ 1, 20 ] },
       { "item": "3006_jsp", "prob": 7, "charges": [ 1, 20 ] },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
@@ -350,18 +350,9 @@
     "//": "a collection of ammo that would be found with a loaded gun.",
     "subtype": "distribution",
     "entries": [
-      { "item": "22_cb", "prob": 100, "charges": [ 1, 150 ] },
-      { "item": "22_fmj", "prob": 100, "charges": [ 1, 150 ] },
-      { "item": "22_cb", "prob": 75, "charges": [ 165, 300 ] },
-      { "item": "22_fmj", "prob": 75, "charges": [ 165, 300 ] },
-      { "item": "22_cb", "prob": 30, "charges": [ 330, 600 ] },
-      { "item": "22_fmj", "prob": 30, "charges": [ 330, 600 ] },
       { "item": "22_lr", "prob": 100, "charges": [ 1, 150 ] },
-      { "item": "22_ratshot", "prob": 100, "charges": [ 1, 150 ] },
       { "item": "22_lr", "prob": 75, "charges": [ 165, 300 ] },
-      { "item": "22_ratshot", "prob": 75, "charges": [ 165, 300 ] },
-      { "item": "22_lr", "prob": 30, "charges": [ 330, 600 ] },
-      { "item": "22_ratshot", "prob": 30, "charges": [ 330, 600 ] }
+      { "item": "22_lr", "prob": 30, "charges": [ 330, 600 ] }
     ]
   },
   {