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

2 new weapons for caliber 50 #34236

Merged
merged 20 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
2 changes: 2 additions & 0 deletions data/json/itemgroups/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@
{ "item": "m107a1", "prob": 30, "charges-min": 0, "charges-max": 10 },
{ "item": "m134", "prob": 10, "charges-min": 0, "charges-max": 100 },
{ "item": "m14ebr", "prob": 10, "charges-min": 0, "charges-max": 20 },
{ "item": "tac50", "prob": 5, "charges-min": 0, "charges-max": 5 },
{ "item": "m2010", "prob": 20, "charges-min": 0, "charges-max": 5 },
{ "item": "m240", "prob": 15, "charges-min": 0, "charges-max": 100 },
{ "item": "m249", "prob": 25, "charges-min": 0, "charges-max": 10 },
Expand Down Expand Up @@ -265,6 +266,7 @@
{ "item": "ak74", "prob": 60, "charges-min": 0, "charges-max": 30 },
{ "item": "an94", "prob": 40, "charges-min": 0, "charges-max": 30 },
{ "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 },
{ "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 1 },
{ "item": "carbine_flintlock", "prob": 140 },
{ "item": "rifle_flintlock", "prob": 180 },
{ "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 },
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/magazines.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
[ "hk46mag", 15 ],
[ "hk46bigmag", 5 ],
[ "m107a1mag", 50 ],
[ "tac50mag", 20 ],
[ "m2010mag", 10 ],
[ "scarhmag", 50 ],
[ "scarhbigmag", 20 ],
Expand Down
48 changes: 47 additions & 1 deletion data/json/items/gun/50.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"copy-from": "rifle_base",
"type": "GUN",
"name": "AI AS50",
"description": ".50 caliber anti-material rifle made by Accuracy International. with high accuracy for long range target and high fire rate, this weapon is still being used by Greek national guard.",
"description": ".50 caliber anti-materiel rifle made by Accuracy International. with high accuracy for long range target and high fire rate, this weapon is still being used by Greek national guard.",
RickyVanz marked this conversation as resolved.
Show resolved Hide resolved
"weight": "14000 g",
"volume": "3500 ml",
"price": 1500000,
Expand All @@ -109,5 +109,51 @@
"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": "3127 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", "bipod", "rifle_scope", "muzzle_brake" ],
"magazine_well": 1,
"magazines": [ [ "50", [ "tac50mag" ] ] ],
"flags": [ "NEVER_JAMS" ]
},
{
"id": "bfg50",
"copy-from": "rifle_base",
"type": "GUN",
"name": "Serbu BFG-50",
"description": "Single-shot, bolt-action rifle made by Serbu Firearms, simple and powerful, this weapon is perfect for long-range kills.",
RickyVanz marked this conversation as resolved.
Show resolved Hide resolved
"weight": "8504 g",
"volume": "1387 ml",
"price": 239500,
"to-hit": -1,
"bashing": 12,
"material": "steel",
"ammo": "50",
"range": 45,
"ranged_damage": -5,
"dispersion": 110,
"durability": 8,
"barrel_length": 5,
"default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
"clip_size": 1,
"flags": [ "NEVER_JAMS", "RELOAD_ONE" ]
}
]
17 changes: 17 additions & 0 deletions data/json/items/magazine/50.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,22 @@
"reliability": 9,
"reload_time": 110,
"flags": [ "MAG_BULKY" ]
},
{
"id": "tac50mag",
"type": "MAGAZINE",
"name": "TAC-50 magazine",
"description": "10-round box magazine for McMillan TAC-50.",
"weight": "730 g",
"volume": "500 ml",
"price": 15000,
"material": "steel",
"symbol": "#",
"color": "dark_gray",
"ammo_type": "50",
"capacity": 5,
"reliability": 9,
"reload_time": 110,
"flags": [ "MAG_BULKY" ]
}
]