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.

Sign up for GitHub

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

Added OA-93 pistol and carbine #37561

Closed
wants to merge 9 commits into from
Closed

Added OA-93 pistol and carbine #37561

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e598cd0
Added items
RarkGrames Jan 30, 2020
b895a16
Added items to groups
RarkGrames Jan 30, 2020
4ab136e
Added guns to Generic Guns migration file
RarkGrames Jan 30, 2020
ec855a3
Volume tweak
RarkGrames Jan 30, 2020
1b1d519
Tweaked spawn weights
RarkGrames Jan 30, 2020
a859afb
Fixed comma
RarkGrames Jan 30, 2020
a16c189
Added pistol skill override
RarkGrames Jan 30, 2020
07bd7e8
Update 223.json
RarkGrames Jan 31, 2020
95420ca
Corrected volume
RarkGrames Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/json/itemgroups/guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
{ "item": "l_sp_9mm", "prob": 60, "charges-min": 0, "charges-max": 21 },
{ "item": "l_mp_45", "prob": 25, "charges-min": 0, "charges-max": 12 },
{ "item": "l_mp_9mm", "prob": 25, "charges-min": 0, "charges-max": 21 },
{ "item": "oa93", "prob": 5, "charges-min": 0, "charges-max": 30 },
{ "item": "ruger_lcr_22", "prob": 35, "charges-min": 0, "charges-max": 8 },
{ "item": "ruger_redhawk", "prob": 25, "charges-min": 0, "charges-max": 6 },
{ "item": "sig_40", "prob": 35, "charges-min": 0, "charges-max": 12 },
Expand Down Expand Up @@ -215,6 +216,7 @@
{ "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 20 },
{ "item": "mosin44_ebr", "prob": 10, "charges-min": 0, "charges-max": 5 },
{ "item": "mosin91_30_ebr", "prob": 20, "charges-min": 0, "charges-max": 5 },
{ "item": "oa93_carbine", "prob": 5, "charges-min": 0, "charges-max": 30 },
{ "item": "remington_700", "prob": 20, "charges-min": 0, "charges-max": 4 },
{ "item": "savage_111f", "prob": 15, "charges-min": 0, "charges-max": 3 },
{ "item": "sharps", "prob": 15, "charges-min": 0, "charges-max": 1 },
Expand Down Expand Up @@ -563,6 +565,8 @@
{ "group": "guns_improvised", "prob": 200 },
{ "item": "ar15", "prob": 5, "charges-min": 0, "charges-max": 30 },
{ "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 },
{ "item": "oa93", "prob": 1, "charges-min": 0, "charges-max": 30 },
{ "item": "oa93_carbine", "prob": 1, "charges-min": 0, "charges-max": 30 },
{ "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 },
{ "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 },
{ "item": "shotgun_410", "prob": 10, "charges-min": 0, "charges-max": 1 },
Expand Down
47 changes: 47 additions & 0 deletions data/json/items/gun/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,53 @@
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3rd burst", 3 ] ],
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
},
{
"id": "oa93",
"copy-from": "rifle_semi",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to override the skill used if this is supposed to be a pistol

"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",
Copy link

@ghost ghost Jan 30, 2020 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which weight are you using for this?
OA-96 is 4lb3oz/1899g

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second source for the pistol (Length/Weight: 17.00in. / 4.46lbs.).
The first source only states the OA-93 carbine weight.

"volume": "4383 ml",
Copy link

@ghost ghost Jan 31, 2020 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See edit, it was 4670ml. I forgot to fill my holes. 😛

"price": 125000,
"to_hit": -2,
"bashing": 9,
"material": [ "steel", "aluminum" ],
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"skill": "pistol",
"range": -6,
"ranged_damage": -16,
"dispersion": 380,
"durability": 7,
"min_cycle_recoil": 1350,
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
},
{
"id": "oa93_carbine",
"copy-from": "rifle_semi",
"looks_like": "skorpion_61",
"type": "GUN",
"name": { "str": "OA-93 carbine" },
"description": "An AR-15 derivative carbine 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. This carbine version comes with built-in folding stock and longer barrel.",
"weight": "3402 g",
"volume": "7234 ml",
"price": 125000,
"to_hit": -2,
"bashing": 9,
"material": [ "steel", "aluminum" ],
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"dispersion": 150,
"durability": 7,
"min_cycle_recoil": 1350,
"built_in_mods": [ "folding_stock" ],
"barrel_length": "67 ml",
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
},
{
"id": "rifle_223",
"copy-from": "gun_base",
Expand Down
4 changes: 3 additions & 1 deletion data/mods/Generic_Guns/firearms/gg_firearms_migration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,9 @@
"fn_fal",
"m1a",
"sks",
"mosin44"
"mosin44",
"os93",
"os93_carbine"
],
"type": "MIGRATION",
"replace": "rifle_sporter"
Expand Down