AR Pistol Audit

data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json

@@ -107,6 +107,30 @@
     "subtype": "collection",
     "entries": [ { "item": "modular_ar15", "contents-item": "retool_ar15_22" } ]
   },
+  {
+    "id": "ar_pistol",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_223rem_pistol" } ]
+  },
+  {
+    "id": "ar_pistol_long",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_223rem_short" } ]
+  },
+  {
+    "id": "ar_pistol_300",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_300blk_short" } ]
+  },
+  {
+    "id": "ar_pistol_300_long",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_300blk_medium" } ]
+  },
   {
     "id": "mdrx_223",
     "type": "item_group",

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -15,6 +15,8 @@
       { "group": "guns_pistol_common_44", "prob": 1 },
       { "group": "guns_pistol_common_10mm", "prob": 1 },
       { "group": "guns_pistol_common_762_39", "prob": 1 },
+      { "group": "guns_pistol_common_223", "prob": 17 },
+      { "group": "guns_pistol_common_300", "prob": 10 },
       { "group": "guns_pistol_common_other", "prob": 39 }
     ]
   },
@@ -53,6 +55,8 @@
       { "group": "guns_pistol_common_display_45colt", "prob": 5 },
       { "group": "guns_pistol_common_display_10mm", "prob": 1 },
       { "group": "guns_pistol_common_display_762_39", "prob": 1 },
+      { "group": "guns_pistol_common_display_223", "prob": 17 },
+      { "group": "guns_pistol_common_display_300", "prob": 10 },
       { "group": "guns_pistol_common_display_other", "prob": 46 }
     ]
   },
@@ -151,11 +155,7 @@
     "subtype": "distribution",
     "id": "guns_pistol_obscure_display",
     "//": "Very obscure pistols which are illegal to sell.",
-    "items": [
-      { "item": "ar_pistol", "prob": 35 },
-      { "group": "guns_pistol_collectible", "prob": 1 },
-      { "item": "minidraco556", "prob": 30 }
-    ]
+    "items": [ { "group": "guns_pistol_collectible", "prob": 1 }, { "item": "minidraco556", "prob": 30 } ]
   },
   {
     "type": "item_group",
@@ -1694,7 +1694,7 @@
     "items": [
       { "group": "guns_improvised", "prob": 50 },
       { "group": "modular_ar15", "prob": 13, "charges": [ 0, 30 ] },
-      { "item": "ar_pistol", "prob": 2, "charges": [ 0, 30 ] },
+      { "group": "ar_pistol", "prob": 7, "charges": [ 0, 30 ] },
       { "item": "mossberg_500", "prob": 2, "charges": [ 0, 6 ] },
       { "item": "remington_870", "prob": 2, "charges": [ 0, 5 ] },
       { "item": "benelli_sa", "variant": "m2", "prob": 2, "charges": [ 0, 4 ] },

data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json

@@ -95,6 +95,16 @@
       { "group": "nested_draco_micro", "prob": 8 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_223",
+    "items": [ { "group": "nested_ar_pistol", "prob": 8 }, { "group": "nested_ar_pistol_long", "prob": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_300",
+    "items": [ { "group": "nested_ar_pistol_300", "prob": 2 }, { "group": "nested_ar_pistol_300_long", "prob": 5 } ]
+  },
   {
     "type": "item_group",
     "id": "guns_pistol_common_other",
@@ -290,6 +300,16 @@
     "id": "guns_pistol_common_display_762_39",
     "items": [ { "item": "draco", "prob": 10 }, { "item": "draco_mini", "prob": 5 }, { "item": "draco_micro", "prob": 8 } ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_display_223",
+    "items": [ { "group": "ar_pistol", "prob": 8 }, { "group": "ar_pistol_long", "prob": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_display_300",
+    "items": [ { "group": "ar_pistol_300", "prob": 2 }, { "group": "ar_pistol_300_long", "prob": 5 } ]
+  },
   {
     "type": "item_group",
     "id": "guns_pistol_common_display_other",
@@ -510,7 +530,6 @@
     "type": "item_group",
     "id": "guns_rifle_common_worn_223",
     "items": [
-      { "item": "ar_pistol", "prob": 1, "charges": [ 0, 30 ] },
       { "item": "ruger_mini", "prob": 1, "charges": [ 0, 5 ] },
       { "item": "ak556", "prob": 2, "charges": [ 0, 30 ] },
       { "item": "ak556", "variant": "zpapm90", "prob": 1, "charges": [ 0, 30 ] },

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -1350,19 +1350,6 @@
       { "group": "on_hand_3006" }
     ]
   },
-  {
-    "id": "nested_ar_pistol",
-    "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": "ar_pistol", "charges": [ 0, 30 ] },
-      { "item": "stanag10" },
-      { "item": "stanag10", "prob": 50 },
-      { "group": "on_hand_223" }
-    ]
-  },
   {
     "id": "nested_garand",
     "type": "item_group",
@@ -1402,6 +1389,58 @@
       { "group": "on_hand_223" }
     ]
   },
+  {
+    "id": "nested_ar_pistol",
+    "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": [
+      { "group": "ar_pistol", "charges": [ 0, 30 ] },
+      { "item": "stanag10" },
+      { "item": "stanag10", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
+  {
+    "id": "nested_ar_pistol_long",
+    "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": [
+      { "group": "ar_pistol_long", "charges": [ 0, 30 ] },
+      { "item": "stanag10" },
+      { "item": "stanag10", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
+  {
+    "id": "nested_ar_pistol_300",
+    "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": [
+      { "group": "ar_pistol_300", "charges": [ 0, 30 ] },
+      { "item": "stanag10" },
+      { "item": "stanag10", "prob": 50 },
+      { "group": "on_hand_300BLK" }
+    ]
+  },
+  {
+    "id": "nested_ar_pistol_300_long",
+    "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": [
+      { "group": "ar_pistol_300_long", "charges": [ 0, 30 ] },
+      { "item": "stanag10" },
+      { "item": "stanag10", "prob": 50 },
+      { "group": "on_hand_300BLK" }
+    ]
+  },
   {
     "id": "nested_cx4",
     "type": "item_group",

data/json/items/gun/22.json

@@ -277,7 +277,7 @@
   {
     "id": "cp33",
     "copy-from": "pistol_base",
-    "looks_like": "ar_pistol",
+    "looks_like": "modular_ar_pistol",
     "type": "GUN",
     "name": { "str": "high capacity handgun" },
     "description": "A large capacity handgun, chambered in .22 and feeding from quad stack magazines.  Used both recreationally and in competition.",
@@ -365,7 +365,7 @@
   },
   {
     "id": "ruger_charger",
-    "looks_like": "ar_pistol",
+    "looks_like": "modular_ar_pistol",
     "type": "GUN",
     "//": "Stats are from https://ruger.com/products/22Charger/specSheets/4923.html",
     "reload_noise_volume": 10,

data/json/items/gun/223.json

@@ -27,64 +27,28 @@
     "melee_damage": { "bash": 12 }
   },
   {
-    "id": "ar_pistol",
-    "copy-from": "rifle_semi",
+    "id": "modular_ar_pistol",
+    "copy-from": "pistol_base",
+    "//": "Roughly based on https://www.cheaperthandirt.com/del-ton-lima-ar-15-semi-auto-pistol-5.56-nato-7.5-barrel-30-rounds-m-lok-handguard-black/FC-848456002687.html, with the upper subtracted.",
     "looks_like": "modular_ar15",
     "type": "GUN",
     "name": { "str": "AR pistol" },
-    "description": "A compact, 7.5 inch barrel version of the classic AR-15 design, commercially marketed as a home defense weapon.",
-    "weight": "2267 g",
-    "volume": "1758 ml",
-    "longest_side": "584 mm",
-    "barrel_length": "191 mm",
-    "price": "914 USD",
+    "description": "The common AR-15 platform, with its stock removed and buffer tube covered by a sleeve.  AR pistols lack stocks, or have arm braces due to restrictions on short barreled rifles, and so without a stock, they're legally classified as a pistol.",
+    "weight": "1043 g",
+    "volume": "748 ml",
+    "longest_side": "373 mm",
+    "price": "245 USD",
     "price_postapoc": "35 USD",
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": [ "223" ],
-    "skill": "pistol",
-    "range": -6,
-    "dispersion": 380,
-    "durability": 6,
+    "ammo": [ "NULL" ],
+    "dispersion": 150,
+    "durability": 7,
     "min_cycle_recoil": 1350,
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "bore", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "rail mount", 2 ],
-      [ "sights", 1 ],
-      [ "stock mount", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "item_restriction": [
-          "stanag30",
-          "stanag5",
-          "stanag5ranger",
-          "stanag10",
-          "stanag10ranger",
-          "stanag20",
-          "stanag20ranger",
-          "stanag30ranger",
-          "stanag40",
-          "stanag40ranger",
-          "stanag50",
-          "stanag60",
-          "stanag60drum",
-          "stanag90",
-          "stanag100",
-          "stanag100drum",
-          "stanag150",
-          "survivor223mag"
-        ]
-      }
-    ],
+    "valid_mod_locations": [ [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 2 ], [ "sling", 1 ], [ "stock accessory", 2 ], [ "stock", 1 ] ],
+    "flags": [ "NO_TURRET" ],
     "melee_damage": { "bash": 9 }
   },
   {

data/json/items/gunmod/conversions.json

@@ -31,7 +31,14 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "ammo_modifier": [ "223" ],
     "magazine_adaptor": [
@@ -125,6 +132,23 @@
     "price": "269 USD 99 cent",
     "add_mod": [ [ "brass catcher", 1 ], [ "rail", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ]
   },
+  {
+    "id": "retool_ar15_223rem_pistol",
+    "copy-from": "retool_ar15_223rem",
+    "//": "Based on https://veriforcetactical.com/product/ar-15-pistol-upper-556-7-inch-m-lok-slim-profile-with-mcbs/",
+    "type": "GUNMOD",
+    "name": { "str": "Pistol .223 upper receiver" },
+    "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle's lower frame.  Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit providing a weapon with a 7.5-inch barrel chambered for .223 Remington ammunition.  These are most often found on stockless AR pistol lowers, to comply with legal restrictions on short barrels on rifles.  No such laws exist now, or at least people that can enforce them.",
+    "weight": "1134 g",
+    "volume": "718 ml",
+    "longest_side": "435 mm",
+    "integral_volume": "1295 ml",
+    "integral_weight": "1819 g",
+    "integral_longest_side": "191 mm",
+    "barrel_length": "191 mm",
+    "price": "499 USD 95 cent",
+    "add_mod": [ [ "brass catcher", 1 ], [ "rail", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ]
+  },
   {
     "id": "retool_ar15_300blk",
     "type": "GUNMOD",
@@ -143,7 +167,14 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "ammo_modifier": [ "300blk" ],
     "magazine_adaptor": [
@@ -252,7 +283,14 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "ammo_modifier": [ "50beowulf" ],
@@ -326,7 +364,14 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "ammo_modifier": [ "450" ],
@@ -417,7 +462,14 @@
     "symbol": ":",
     "color": "dark_gray",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "overwrite_min_cycle_recoil": 83,