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

Add 2 new weapon to 50.json #34200

Closed
wants to merge 30 commits into from
Closed
Changes from 1 commit
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
Prev Previous commit
Next Next commit
2 new magazine
RickyVanz authored Sep 23, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 997563aee10dc4d1bc38c277f6d0b608f546deed
34 changes: 34 additions & 0 deletions data/json/items/magazine/50.json
Original file line number Diff line number Diff line change
@@ -44,5 +44,39 @@
"reliability": 9,
"reload_time": 110,
"flags": [ "MAG_BULKY" ]
},
{
"id": "dsr50mag",
"type": "MAGAZINE",
"name": "DSR-50 Magazine",
RickyVanz marked this conversation as resolved.
Show resolved Hide resolved
"description": "3-Round box magazine for DSR-50.",
RickyVanz marked this conversation as resolved.
Show resolved Hide resolved
"weight": "470 g",
"volume": "500 ml",
"price": 15000,
RickyVanz marked this conversation as resolved.
Show resolved Hide resolved
"material": "steel",
"symbol": "#",
"color": "dark_gray",
"ammo_type": "50",
"capacity": 3,
"reliability": 9,
"reload_time": 150,
"flags": [ "MAG_BULKY" ]
},
{
"id": "hecate2mag",
"type": "MAGAZINE",
"name": "Hecate II Magazine",
RickyVanz marked this conversation as resolved.
Show resolved Hide resolved
"description": "7-Round box magazine for PGM Hecate II",
RickyVanz marked this conversation as resolved.
Show resolved Hide resolved
"weight": "560 g",
"volume": "500 ml",
"price": 15000,
RickyVanz marked this conversation as resolved.
Show resolved Hide resolved
"material": "steel",
"symbol": "#",
"color": "dark_gray",
"ammo_type": "50",
"capacity": 7,
"reliability": 8,
"reload_time": 150,
"flags": [ "MAG_BULKY" ]
}
]