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

Add 2 new weapon to 50.json #34200

Closed
wants to merge 30 commits into from
Closed

Add 2 new weapon to 50.json #34200

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2496db3
2 new weapon
RickyVanz Sep 23, 2019
997563a
2 new magazine
RickyVanz Sep 23, 2019
ed17354
Update guns.json
RickyVanz Sep 23, 2019
d5c2da6
Update magazines.json
RickyVanz Sep 23, 2019
1d6f2c9
fix description
RickyVanz Sep 23, 2019
50030f0
fix capital misplacement.
RickyVanz Sep 23, 2019
9cebe40
fix capital misplacement 2
RickyVanz Sep 23, 2019
dc6ce82
fix magazine price (added "price_postapoc" )
RickyVanz Sep 23, 2019
597575c
capital fix
RickyVanz Sep 23, 2019
fbd605d
capital fix 2
RickyVanz Sep 23, 2019
1647db9
magazine capital fix
RickyVanz Sep 23, 2019
13977c2
price fix
RickyVanz Sep 23, 2019
f894292
price fix 2 (based on current 50 BMG price)
RickyVanz Sep 23, 2019
7a3cc0e
change to weapon's range
RickyVanz Sep 23, 2019
e0e47d4
weapon change (requested)
RickyVanz Sep 24, 2019
89d476e
magazine change (requested)
RickyVanz Sep 24, 2019
44e4ff3
final touch (requested)
RickyVanz Sep 24, 2019
dfa30da
description fix
RickyVanz Sep 24, 2019
bb1b6cc
change request
RickyVanz Sep 24, 2019
e763ab5
description fix
RickyVanz Sep 24, 2019
9ed1178
itemgroup change
RickyVanz Sep 24, 2019
c22e0b9
magazine itemgroup change
RickyVanz Sep 24, 2019
dc458cc
itemgroup re-adjustment
RickyVanz Sep 24, 2019
30a7496
probability adjustment
RickyVanz Sep 24, 2019
177cbda
small bit of change
RickyVanz Sep 24, 2019
afb865e
Merge branch 'master' into RickyVanz-weapons-update
RickyVanz Sep 25, 2019
da99ab5
moved AS-50 to obscure category
RickyVanz Sep 26, 2019
fae5ccc
removed AS 50 from group.
RickyVanz Sep 26, 2019
207c74e
Removed AS 50
RickyVanz Sep 26, 2019
eec4d06
AS 50 magazine removal
RickyVanz Sep 26, 2019
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 @@ -176,6 +176,7 @@
{ "item": "cx4", "prob": 45, "charges-min": 0, "charges-max": 15 },
{ "item": "ksub2000", "prob": 30, "charges-min": 0, "charges-max": 15 },
{ "item": "m1a", "prob": 50, "charges-min": 0, "charges-max": 5 },
{ "item": "ar50", "prob": 5, "charges-min": 0, "charges-max": 1 },
{ "item": "marlin_9a", "prob": 80, "charges-min": 0, "charges-max": 19 },
{ "item": "mosin44", "prob": 15, "charges-min": 0, "charges-max": 5 },
{ "item": "mosin91_30", "prob": 25, "charges-min": 0, "charges-max": 5 },
Expand Down Expand Up @@ -204,6 +205,8 @@
{ "item": "l_mbr_223", "prob": 10, "charges-min": 0, "charges-max": 32 },
{ "item": "l_long_45", "prob": 30, "charges-min": 0, "charges-max": 12 },
{ "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 20 },
{ "item": "ar50", "prob": 15, "charges-min": 0, "charges-max": 1 },
{ "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 },
Copy link
Member

Choose a reason for hiding this comment

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

Can you provide sources for the AS 50 being imported for the commercial market and available for sale through FFL's?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i don't have it, but lots of people i ask around internet says that there is AS 50 in US.

Copy link
Member

@tenmillimaster tenmillimaster Sep 26, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

@RickyVanz if there are, you should be able to find one for sale somewhere. Or heck, send AI an email asking if any are available/have been imported.

If it's something that has to be special ordered, it's not going to even really be common enough to put in unless you crank everything else's weights way up. Special order for Beverly hills SWAT is so so, but otherwise no.

Lots of people on the internet isn't a very good source.

Copy link
Member

Choose a reason for hiding this comment

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

"Lots of people around the internet" isn't a source. If it's not used by us armed forces or police and it's not readily available to private citizens, it doesn't belong in the game.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

allright, should i delete the AS 50?

Copy link
Member

Choose a reason for hiding this comment

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

No, leaving it in only in the swat item group is sufficient.

Copy link
Member

Choose a reason for hiding this comment

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

Nowhere, it spawns appropriately already. Just delete the AS50 additions you've made and leave the one in SWAT alone

Copy link
Contributor Author

Choose a reason for hiding this comment

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

allright, that means i replace my previously merged PR with this new one..

at least now there is variety for .50 cal, that's what users on discourse forum want 😄

{ "item": "M24", "prob": 15, "charges-min": 0, "charges-max": 20 },
{ "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 },
{ "item": "m1903", "prob": 15, "charges-min": 0, "charges-max": 5 },
Expand Down Expand Up @@ -238,6 +241,7 @@
{ "item": "rm51_assault_rifle", "prob": 25, "charges-min": 0, "charges-max": 50 },
{ "item": "rm614_lmg", "prob": 10, "charges-min": 0, "charges-max": 100 },
{ "item": "rm88_battle_rifle", "prob": 25, "charges-min": 0, "charges-max": 50 },
{ "item": "tac50", "prob": 10, "charges-min": 0, "charges-max": 5 },
{ "item": "sig552", "prob": 100, "charges-min": 0, "charges-max": 30 },
{ "item": "scar_l", "prob": 50, "charges-min": 0, "charges-max": 30 },
{ "item": "scar_h", "prob": 50, "charges-min": 0, "charges-max": 20 },
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/magazines.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
[ "hk46mag", 15 ],
[ "hk46bigmag", 5 ],
[ "m107a1mag", 50 ],
[ "as50mag", 10 ],
Copy link
Member

Choose a reason for hiding this comment

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

Don't forget this one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ahh dang it 😄

thanks for remind me.

[ "tac50mag", 10 ],
[ "m2010mag", 10 ],
[ "scarhmag", 50 ],
[ "scarhbigmag", 20 ],
Expand Down
47 changes: 47 additions & 0 deletions data/json/items/gun/50.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,52 @@
"magazine_well": 1,
"magazines": [ [ "50", [ "as50mag" ] ] ],
"flags": [ "NEVER_JAMS" ]
},
{
"id": "tac50",
"copy-from": "rifle_base",
"type": "GUN",
"name": "Mcmillan TAC-50",
"description": "A long-range anti-materiel, and anti-personnel sniper rifle made by McMillan Firearms, serving the Canadian Army since 2000 as the C15, and the Navy Seals as the Mk 15 Mod 0. This .50 caliber bolt-action rifle is capable of defeating light vehicles, radar installations and crew served weapons at extreme distances. It notably holds the longest range confirmed sniper kill, as well as the 4th and 5th longest.",
"weight": "11800 g",
"volume": "2185 ml",
"price": 870000,
"to-hit": -1,
"bashing": 12,
"material": "steel",
"ammo": "50",
"range": 45,
"ranged_damage": -5,
"dispersion": 50,
"durability": 8,
"reload": 450,
"barrel_length": 5,
"default_mods": [ "recoil_stock", "rifle_scope", "muzzle_brake", "bipod" ],
"magazine_well": 1,
"magazine": [ [ "50", [ "tac50mag" ] ] ],
"flags": [ "NEVER_JAMS" ]
},
{
"id": "ar50",
"copy-from": "rifle_base",
"type": "GUN",
"name": "ArmaLite AR-50",
"description": "A single-shot, bolt-action rifle made by ArmaLite, with great accuracy at long-range and manageable recoil. Affordable pricing and excellent performance make this weapon a popular choice.",
"weight": "15500 g",
"volume": "1511 ml",
"price": 302900,
"to-hit": -2,
"bashing": 13,
"material": "steel",
"ammo": "50",
"range": 45,
"ranged_damage": -5,
"dispersion": 95,
"durability": 8,
"reload": 400,
"barrel_length": 5,
"default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
"clip_size": 1,
"flags": [ "NEVER_JAMS", "RELOAD_ONE" ]
}
]
18 changes: 18 additions & 0 deletions data/json/items/magazine/50.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,23 @@
"reliability": 9,
"reload_time": 110,
"flags": [ "MAG_BULKY" ]
},
{
"id": "tac50mag",
"type": "MAGAZINE",
"name": "TAC-50 magazine",
"description": "5-round box magazine for Mcmillan TAC-50.",
"weight": "470 g",
"volume": "500 ml",
"price": 63000,
"price_postapoc": 43000,
"material": "steel",
"symbol": "#",
"color": "dark_gray",
"ammo_type": "50",
"capacity": 5,
"reliability": 9,
"reload_time": 150,
"flags": [ "MAG_BULKY" ]
}
]