From 7248e4a00f0e0f996bc36eb6372ef3d56af27515 Mon Sep 17 00:00:00 2001
From: RarkGrames <50421549+RarkGrames@users.noreply.github.com>
Date: Tue, 10 Mar 2020 10:11:25 +0100
Subject: [PATCH] AR pistols (#37768)

---
 .../itemgroups/Weapons_Mods_Ammo/guns.json    |  3 ++
 data/json/items/gun/223.json                  | 46 +++++++++++++++++++
 .../firearms/gg_firearms_migration.json       |  2 +
 3 files changed, 51 insertions(+)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index c048bb7d6a613..cf7e0c1bbf217 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -254,6 +254,7 @@
     "//": "Rifles commonly owned by citizens and found in many locations.",
     "items": [
       { "item": "browning_blr", "prob": 25, "charges-min": 0, "charges-max": 4 },
+      { "item": "ar_pistol", "prob": 52, "charges-min": 0, "charges-max": 30 },
       { "item": "garand", "prob": 65, "charges-min": 0, "charges-max": 8 },
       { "item": "ar10", "prob": 20, "charges-min": 0, "charges-max": 20 },
       { "item": "ar15", "prob": 30, "charges-min": 0, "charges-max": 30 },
@@ -398,6 +399,7 @@
       { "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 1 },
       { "item": "carbine_flintlock", "prob": 140 },
       { "item": "rifle_flintlock", "prob": 180 },
+      { "item": "oa93", "prob": 3, "charges-min": 0, "charges-max": 30 },
       { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 },
       { "item": "trex_gun", "prob": 60 },
       { "item": "arx160", "prob": 40, "charges-min": 0, "charges-max": 30 },
@@ -737,6 +739,7 @@
     "items": [
       { "group": "guns_improvised", "prob": 200 },
       { "item": "ar15", "prob": 5, "charges-min": 0, "charges-max": 30 },
+      { "item": "ar_pistol", "prob": 3, "charges-min": 0, "charges-max": 30 },
       { "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 },
       { "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 },
       { "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 },
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 552d0d271edfb..958cb9bf4d437 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -45,6 +45,29 @@
     "min_cycle_recoil": 1350,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
+  {
+    "id": "ar_pistol",
+    "copy-from": "rifle_semi",
+    "looks_like": "skorpion_61",
+    "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",
+    "price": 91400,
+    "to_hit": -2,
+    "bashing": 9,
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "223",
+    "range": -6,
+    "ranged_damage": -9,
+    "dispersion": 380,
+    "durability": 6,
+    "min_cycle_recoil": 1350,
+    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+  },
   {
     "id": "h&k416a5",
     "copy-from": "rifle_auto",
@@ -184,6 +207,29 @@
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ],
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
   },
+  {
+    "id": "oa93",
+    "copy-from": "rifle_semi",
+    "looks_like": "skorpion_61",
+    "type": "GUN",
+    "name": { "str": "OA-93" },
+    "description": "An AR-15 derivative pistol manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.",
+    "weight": "2023 g",
+    "volume": "2135 ml",
+    "price": 125000,
+    "to_hit": -2,
+    "bashing": 9,
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "223",
+    "range": -6,
+    "ranged_damage": -11,
+    "dispersion": 380,
+    "durability": 6,
+    "min_cycle_recoil": 1350,
+    "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+  },
   {
     "id": "rifle_223",
     "copy-from": "gun_base",
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 9e670dda9d701..70081298fc4e6 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -247,6 +247,8 @@
       "arx160",
       "mosin91_30",
       "ar15",
+      "oa93",
+      "ar_pistol",
       "ruger_mini",
       "sig552",
       "steyr_aug",