Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AR pistols #37768

Merged
merged 11 commits into from
Mar 10, 2020
3 changes: 3 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,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 },
Expand Down Expand Up @@ -274,6 +275,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 },
Expand Down Expand Up @@ -562,6 +564,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 },
Expand Down
48 changes: 48 additions & 0 deletions data/json/items/gun/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,30 @@
"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,
"barrel_length": 0,
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
},
{
"id": "h&k416a5",
"copy-from": "rifle_auto",
Expand Down Expand Up @@ -325,6 +349,30 @@
"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,
"barrel_length": 0,
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
},
{
"id": "rifle_223",
"copy-from": "gun_base",
Expand Down
2 changes: 2 additions & 0 deletions data/mods/Generic_Guns/firearms/gg_firearms_migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@
"arx160",
"mosin91_30",
"ar15",
"oa93",
"ar_pistol",
"ruger_mini",
"sig552",
"steyr_aug",
Expand Down