Remove Rivtech 20x66 Ammo and Guns (#76486)

* Removal * Further removal * Lint
CleverRaven · Sep 20, 2024 · 4254b22 · 4254b22
1 parent da181c9
commit 4254b22
Show file tree

Hide file tree

Showing 20 changed files with 418 additions and 555 deletions.
diff --git a/data/json/itemgroups/Labs/lab_security.json b/data/json/itemgroups/Labs/lab_security.json
@@ -63,34 +63,11 @@
     "//": "This group is for rare spawns of rivetech matched sets.",
     "subtype": "distribution",
     "entries": [
-      { "group": "SUS_rivtech_20x66", "prob": 40 },
       { "group": "SUS_rivtech_8x40", "prob": 80 },
       { "group": "SUS_rivtech_40mm", "prob": 60 },
       { "group": "SUS_rivtech_misc", "prob": 60 }
     ]
   },
-  {
-    "id": "SUS_rivtech_20x66",
-    "type": "item_group",
-    "//": "This group is for rare spawns of rivetech matched sets.",
-    "subtype": "collection",
-    "entries": [
-      { "item": "20x66_10_mag" },
-      {
-        "distribution": [
-          { "item": "20x66_beanbag", "prob": 60, "count": [ 1, 3 ] },
-          { "item": "20x66_exp", "prob": 10, "count": [ 1, 3 ] },
-          { "item": "20x66_flare", "prob": 40, "count": [ 1, 3 ] },
-          { "item": "20x66_frag", "prob": 30, "count": [ 1, 3 ] },
-          { "item": "20x66_shot", "prob": 60, "count": [ 1, 3 ] },
-          { "item": "20x66_slug", "prob": 60, "count": [ 1, 3 ] }
-        ]
-      },
-      {
-        "distribution": [ { "item": "rm120c", "prob": 50 }, { "item": "rm20", "prob": 50 }, { "item": "rm228", "prob": 40 } ]
-      }
-    ]
-  },
   {
     "id": "SUS_rivtech_8x40",
     "type": "item_group",
@@ -142,7 +119,6 @@
     "subtype": "distribution",
     "entries": [
       { "item": "recipe_caseless", "prob": 50 },
-      { "item": "rm121aux", "prob": 50 },
       {
         "collection": [ { "item": "rx12_injector" }, { "item": "ampoule", "prob": 60, "count": [ 1, 3 ] } ],
         "prob": 60

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1487,9 +1487,6 @@
       { "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 ] },
-      { "item": "20x66_beanbag", "prob": 10, "charges": [ 1, 10 ] },
       { "item": "gasbomb", "count": [ 1, 6 ], "prob": 20 },
       { "item": "m79", "prob": 8, "charges": 0 },
       { "item": "40x46mm_m651", "prob": 20, "charges": [ 1, 6 ] },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -530,7 +530,6 @@
       [ "atomic_coffeepot", 1 ],
       [ "flaregun", 10 ],
       [ "signal_flare", 15 ],
-      [ "rm120c", 2 ],
       [ "knee_pads", 10 ],
       { "item": "oxygen_tank", "prob": 10, "charges": 24 },
       { "item": "smoxygen_tank", "prob": 5, "charges": 12 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -528,28 +528,14 @@
     "id": "ammo_shotgun_rare",
     "//": "Less common shotgun ammo including that only used by police/paramilitary forces.",
     "subtype": "distribution",
-    "entries": [
-      { "item": "20x66_beanbag", "prob": 10 },
-      { "item": "20x66_flare", "prob": 10 },
-      { "item": "20x66_shot", "prob": 40 },
-      { "item": "20x66_slug", "prob": 20 },
-      { "item": "shot_dragon", "prob": 10 },
-      { "item": "shot_beanbag", "prob": 20 }
-    ]
+    "entries": [ { "item": "shot_dragon", "prob": 10 }, { "item": "shot_beanbag", "prob": 20 } ]
   },
   {
     "type": "item_group",
     "id": "ammo_shotgun_rare_collection",
     "//": "Less common shotgun ammo including that only used by police/paramilitary forces.",
     "subtype": "collection",
-    "entries": [
-      { "item": "20x66_beanbag", "prob": 20 },
-      { "item": "20x66_flare", "prob": 20 },
-      { "item": "20x66_shot", "prob": 80 },
-      { "item": "20x66_slug", "prob": 40 },
-      { "item": "shot_dragon", "prob": 20 },
-      { "item": "shot_beanbag", "prob": 40 }
-    ]
+    "entries": [ { "item": "shot_dragon", "prob": 20 }, { "item": "shot_beanbag", "prob": 40 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -630,7 +630,6 @@
     "//": "Military shotguns currently in service.",
     "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.",
     "items": [
-      { "group": "nested_rm20", "prob": 1 },
       { "group": "nested_remington_870_express", "prob": 50 },
       { "group": "nested_remington_870_breacher", "prob": 20 },
       { "group": "nested_mossberg_590", "prob": 50 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
@@ -573,23 +573,6 @@
       { "item": "410shot_slug", "prob": 174, "charges": [ 44, 80 ] }
     ]
   },
-  {
-    "id": "on_hand_20x66mm",
-    "type": "item_group",
-    "//": "a collection of ammo that would be found with a loaded gun.",
-    "subtype": "distribution",
-    "entries": [
-      { "item": "20x66_shot", "prob": 100, "charges": [ 1, 20 ] },
-      { "item": "20x66_shot", "prob": 75, "charges": [ 22, 40 ] },
-      { "item": "20x66_shot", "prob": 30, "charges": [ 44, 80 ] },
-      { "item": "20x66_beanbag", "prob": 30, "charges": [ 1, 20 ] },
-      { "item": "20x66_exp", "prob": 30, "charges": [ 1, 20 ] },
-      { "item": "20x66_frag", "prob": 30, "charges": [ 1, 20 ] },
-      { "item": "20x66_slug", "prob": 100, "charges": [ 1, 20 ] },
-      { "item": "20x66_slug", "prob": 75, "charges": [ 22, 40 ] },
-      { "item": "20x66_slug", "prob": 30, "charges": [ 44, 80 ] }
-    ]
-  },
   {
     "id": "on_hand_50beowulf",
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -2325,19 +2325,6 @@
       { "group": "on_hand_shot" }
     ]
   },
-  {
-    "id": "nested_rm20",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [
-      { "item": "rm20", "charges": [ 0, 20 ] },
-      { "item": "20x66_20_mag" },
-      { "item": "20x66_20_mag", "prob": 50 },
-      { "group": "on_hand_20x66mm" }
-    ]
-  },
   {
     "id": "nested_mossberg_590",
     "type": "item_group",

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -625,11 +625,6 @@
       { "item": "40x46mm_m651", "prob": 5 },
       { "item": "40x46mm_m576", "prob": 12 },
       { "item": "40x53mm_m1001", "prob": 6 },
-      { "item": "20x66_shot", "prob": 4 },
-      { "item": "20x66_exp", "prob": 1 },
-      { "item": "20x66_flare", "prob": 2 },
-      { "item": "20x66_frag", "prob": 1 },
-      { "item": "20x66_slug", "prob": 4 },
       { "item": "m9", "variant": "m9", "prob": 6 },
       { "item": "usp_45", "prob": 6 },
       { "group": "modular_m4a1", "prob": 7 },

diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -570,6 +570,7 @@
     "default": "8mm_caseless"
   },
   {
+    "//": "To-do: Remove when 20x66 is fully obsoleted",
     "type": "ammunition_type",
     "id": "20x66mm",
     "name": "20x66mm caseless shotgun",

diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
@@ -53,7 +53,6 @@
           "308": 60,
           "12mm": 60,
           "8x40mm": 60,
-          "20x66mm": 60,
           "stimpack_ammo": 60,
           "ampoule": 60,
           "300": 60,
@@ -652,7 +651,7 @@
         "volume_encumber_modifier": 0.25
       },
       {
-        "ammo_restriction": { "410shot": 6, "shot": 6, "20x66mm": 6, "signal_flare": 6 },
+        "ammo_restriction": { "410shot": 6, "shot": 6, "signal_flare": 6 },
         "moves": 25,
         "volume_encumber_modifier": 0.2
       }
@@ -1253,7 +1252,7 @@
     "symbol": "[",
     "looks_like": "holster",
     "color": "dark_gray",
-    "pocket_data": [ { "ammo_restriction": { "410shot": 12, "shot": 12, "20x66mm": 12, "signal_flare": 12, "308": 20 }, "moves": 30 } ],
+    "pocket_data": [ { "ammo_restriction": { "410shot": 12, "shot": 12, "signal_flare": 12, "308": 20 }, "moves": 30 } ],
     "material_thickness": 0.5,
     "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY", "PALS_MEDIUM" ],
     "armor": [ { "encumbrance": 2, "coverage": 100, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ]

diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json
@@ -103,11 +103,7 @@
     "color": "dark_gray",
     "material_thickness": 1,
     "pocket_data": [
-      {
-        "ammo_restriction": { "410shot": 25, "shot": 25, "20x66mm": 25, "signal_flare": 25 },
-        "moves": 25,
-        "volume_encumber_modifier": 0.3
-      }
+      { "ammo_restriction": { "410shot": 25, "shot": 25, "signal_flare": 25 }, "moves": 25, "volume_encumber_modifier": 0.3 }
     ],
     "flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE" ],
     "armor": [ { "encumbrance": 2, "coverage": 100, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ]
@@ -138,11 +134,7 @@
     "color": "dark_gray",
     "material_thickness": 1,
     "pocket_data": [
-      {
-        "ammo_restriction": { "410shot": 50, "shot": 50, "20x66mm": 50, "signal_flare": 50 },
-        "moves": 35,
-        "volume_encumber_modifier": 0.3
-      }
+      { "ammo_restriction": { "410shot": 50, "shot": 50, "signal_flare": 50 }, "moves": 35, "volume_encumber_modifier": 0.3 }
     ],
     "flags": [ "WATER_FRIENDLY", "OVERSIZE", "BELTED" ],
     "armor": [ { "encumbrance": 3, "coverage": 20, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] } ]