Obsolete ACRs

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -404,8 +404,7 @@
       { "group": "nested_scar_l", "prob": 50 },
       { "group": "nested_scar_h", "prob": 50 },
       { "group": "nested_m110a1", "prob": 50 },
-      { "group": "nested_M24", "prob": 15 },
-      { "group": "nested_acr_300blk", "prob": 15 }
+      { "group": "nested_M24", "prob": 15 }
     ]
   },
   {
@@ -437,7 +436,6 @@
       { "group": "nested_arx160", "prob": 40 },
       { "group": "nested_psl", "prob": 10 },
       { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 },
-      { "group": "nested_acr_300blk", "prob": 15 },
       { "group": "nested_type99", "prob": 20 },
       { "group": "nested_type99_sniper", "prob": 5 },
       { "group": "nested_ak308", "prob": 25 },
@@ -465,8 +463,6 @@
       { "group": "modular_m4a1", "prob": 45 },
       { "item": "m14ebr", "prob": 15 },
       { "item": "arx160", "prob": 10 },
-      { "item": "modular_m16_auto_rifle", "variant": "modular_acr", "prob": 25 },
-      { "item": "acr_300blk", "prob": 15 },
       { "item": "hk417_13", "prob": 40 },
       { "item": "m2carbine", "prob": 5 },
       { "item": "ak308", "prob": 10 },

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -1625,7 +1625,7 @@
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "modular_m16_auto_rifle", "variant": "modular_acr", "charges": [ 0, 30 ] },
+      { "item": "modular_m16_auto_rifle", "variant": "modular_m16a3", "charges": [ 0, 30 ] },
       { "item": "stanag10" },
       { "item": "stanag10", "prob": 50 },
       { "group": "on_hand_223" }
@@ -2014,19 +2014,6 @@
       { "group": "on_hand_308" }
     ]
   },
-  {
-    "id": "nested_acr_300blk",
-    "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": "acr_300blk", "charges": [ 0, 30 ] },
-      { "item": "stanag30" },
-      { "item": "stanag30", "prob": 50 },
-      { "group": "on_hand_300BLK" }
-    ]
-  },
   {
     "id": "nested_ak47",
     "type": "item_group",

data/json/items/gun/223.json

@@ -365,7 +365,7 @@
     "melee_damage": { "bash": 12 }
   },
   {
-    "//": "Figured having 'm16' in the name would make it more understandable, seeing as I named 2 of the .223 rifle groups/names after it. ACR is grouped with it due to similar length.",
+    "//": "Figured having 'm16' in the name would make it more understandable, seeing as I named 2 of the .223 rifle groups/names after it.",
     "id": "modular_m16_auto_rifle",
     "copy-from": "modular_m16a4",
     "type": "GUN",
@@ -377,11 +377,6 @@
         "id": "modular_m16a3",
         "name": { "str": "M16A3 rifle" },
         "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years.  It is a gas-operated, rotating bolt rifle known for its accuracy and controllable recoil.  This one is a relatively rare M16A3, with full auto capability."
-      },
-      {
-        "id": "modular_acr",
-        "name": { "str": "Remington ACR carbine" },
-        "description": "This carbine was developed for military use in the early 21st century.  It is damaging and accurate, though its rate of fire is a bit slower than competing carbines."
       }
     ],
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],

data/json/items/gun/300BLK.json

@@ -1,55 +1,4 @@
 [
-  {
-    "id": "acr_300blk",
-    "copy-from": "rifle_auto",
-    "looks_like": "modular_ar15",
-    "type": "GUN",
-    "name": { "str": "Remington ACR .300BLK" },
-    "description": "This carbine was developed for military use in the early 21st century.  It is damaging and accurate, though its rate of fire is a bit slower than competing carbines.  This version is chambered for the .300 AAC Blackout round.",
-    "weight": "3419 g",
-    "volume": "3310 ml",
-    "longest_side": "938 mm",
-    "barrel_length": "419 mm",
-    "price": "2 kUSD 343 USD",
-    "price_postapoc": "55 USD",
-    "to_hit": -1,
-    "material": [ "steel", "plastic" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "300blk" ],
-    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
-    "dispersion": 150,
-    "durability": 8,
-    "min_cycle_recoil": 1700,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_volume": "250 ml",
-    "built_in_mods": [ "folding_stock" ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "item_restriction": [
-          "stanag30",
-          "stanag5",
-          "stanag5ranger",
-          "stanag10",
-          "stanag10ranger",
-          "stanag20",
-          "stanag20ranger",
-          "stanag30ranger",
-          "stanag40",
-          "stanag50",
-          "stanag60",
-          "stanag60drum",
-          "stanag90",
-          "stanag100",
-          "stanag100drum",
-          "stanag150",
-          "survivor223mag"
-        ]
-      }
-    ],
-    "melee_damage": { "bash": 12 }
-  },
   {
     "id": "iwi_tavor_x95_300blk",
     "copy-from": "rifle_semi",

data/json/obsoletion_and_migration_0.I/migration_items.json

@@ -1917,5 +1917,10 @@
     "id": "stabilizer_mod",
     "type": "MIGRATION",
     "replace": "rail_laser_sight"
+  },
+  {
+    "id": "acr_300blk",
+    "type": "MIGRATION",
+    "replace": "sig_mcx_rattler_sbr"
   }
 ]

data/mods/Generic_Guns/firearms/gg_firearms_migration.json

@@ -232,7 +232,6 @@
   {
     "id": [
       "m1918",
-      "acr_300blk",
       "hk417_13",
       "modular_m16a4",
       "m16a4",

data/mods/Military_Professions/prof/spc.json

@@ -28,7 +28,7 @@
           { "item": "diving_watch" },
           { "item": "ballistic_vest_esapi" },
           {
-            "item": "acr_300blk",
+            "item": "sig_mcx_rattler_sbr",
             "ammo-item": "300blk_ss",
             "charges": 30,
             "contents-item": [ "shoulder_strap", "acog_scope", "grip", "suppressor" ]

data/mods/TEST_DATA/item_demographics.json

@@ -872,11 +872,7 @@
         { "type": "762R", "weight": 4, "items": { "mosin44": 1, "mosin91_30": 1, "psl": 1 } },
         { "type": "270win", "weight": 3, "items": { "remington700_270": 1 } },
         { "type": "410shot", "weight": 3, "items": { "saiga_410": 1, "shotgun_410": 1 } },
-        {
-          "type": "300blk",
-          "weight": 2,
-          "items": { "acr_300blk": 1, "iwi_tavor_x95_300blk": 1, "sig_mcx_rattler_sbr": 1 }
-        },
+        { "type": "300blk", "weight": 2, "items": { "iwi_tavor_x95_300blk": 1, "sig_mcx_rattler_sbr": 1 } },
         { "type": "123ln", "weight": 1, "items": { "pamd68": 1, "pamd71z": 1 } },
         {
           "type": "10mm",
@@ -1079,7 +1075,6 @@
           "weight": 357,
           "items": {
             "1895sbl": 1,
-            "acr_300blk": 1,
             "ak308": 1,
             "ak47": 1,
             "ak556": 1,

data/mods/TEST_DATA/legacy_to_hit.json

@@ -15,7 +15,6 @@
       "UPS_ON",
       "UPS_off",
       "acidbomb",
-      "acr_300blk",
       "adjustable_stock",
       "advanced_gpnvg",
       "airsoft_helmet",

data/mods/classic_zombies/items/blacklists.json

@@ -27,7 +27,6 @@
       "m9",
       "90two40",
       "90two40mag",
-      "acr_300blk",
       "alien_pod_resin",
       "arm",
       "arx160",

data/mods/classic_zombies/items/guns.json

@@ -12,12 +12,13 @@
         "id": "modular_m16a3",
         "name": { "str": "C7" },
         "description": "The standard issue rifle for the Canadian armed forces, featuring a 20 in. long barrel and full auto capabilities when fed from STANAG magazines.",
-        "weight": 1
+        "weight": 100
       },
       {
-        "id": "modular_acr",
+        "id": "c7a1",
         "name": { "str": "C7A1" },
-        "description": "This is the updated model of the C7 carbine, using a modified Weaver rail instead of a carrying handle/iron sight assembly to assist in mounting optics."
+        "description": "This is the updated model of the C7 carbine, using a modified Weaver rail instead of a carrying handle/iron sight assembly to assist in mounting optics.",
+        "weight": 5
       }
     ]
   },

tools/json_tools/gun_variant_validator.py

@@ -111,7 +111,6 @@
     "weatherby_5",
     "win70",
     "mr73",
-    "acr_300blk",
     "iwi_tavor_x95_300blk",
     "sig_mcx_rattler_sbr",
     "p226_357sig",