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

Firearms Overhaul V 1.0 - Ranges converted from Real Values to Relative in game values #22756

Closed
wants to merge 76 commits into from
Closed
Show file tree
Hide file tree
Changes from 71 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
bb846ad
Update 20x66mm.json
kasanryukin Jan 13, 2018
ff066d9
Update 22.json
kasanryukin Jan 13, 2018
e769c5e
Update 223.json
kasanryukin Jan 13, 2018
96791e4
Update 300.json
kasanryukin Jan 13, 2018
389ead0
Update 3006.json
kasanryukin Jan 13, 2018
9b2e763
Update 308.json
kasanryukin Jan 13, 2018
10c4e3d
Update 32.json
kasanryukin Jan 13, 2018
c562dc5
Update 36paper.json
kasanryukin Jan 13, 2018
1242f30
Update 38.json
kasanryukin Jan 13, 2018
d40a6d9
Update 40.json
kasanryukin Jan 13, 2018
31119d2
Update 40mm.json
kasanryukin Jan 13, 2018
6efb154
Update 44.json
kasanryukin Jan 13, 2018
e2968df
Update 44paper.json
kasanryukin Jan 13, 2018
52590c4
Update 45.json
kasanryukin Jan 13, 2018
e3bbfc0
Update 454.json
kasanryukin Jan 13, 2018
d3fb9c4
Update 454.json
kasanryukin Jan 13, 2018
af71fed
Update 46.json
kasanryukin Jan 13, 2018
11649e5
Update 500.json
kasanryukin Jan 13, 2018
7e64e58
Update 545x39.json
kasanryukin Jan 13, 2018
5379591
Update 57.json
kasanryukin Jan 14, 2018
324c669
Update 700nx.json
kasanryukin Jan 14, 2018
c73a150
Update 762.json
kasanryukin Jan 14, 2018
ad944fd
Update 762R.json
kasanryukin Jan 14, 2018
0366c8f
Update 762x25.json
kasanryukin Jan 14, 2018
3e51e47
Update 8x40mm.json
kasanryukin Jan 14, 2018
bd39108
Update 9mm.json
kasanryukin Jan 14, 2018
d90a6d0
Update 9x18.json
kasanryukin Jan 14, 2018
bea82bc
Update blunderbuss.json
kasanryukin Jan 14, 2018
8eeb980
Update flammable.json
kasanryukin Jan 14, 2018
b9262da
Update metal_rail.json
kasanryukin Jan 14, 2018
56aeff5
Update nail.json
kasanryukin Jan 14, 2018
45336ee
Update shot.json
kasanryukin Jan 14, 2018
1aa36dc
Update signal_flare.json
kasanryukin Jan 14, 2018
4660710
Update ranged.json
kasanryukin Jan 14, 2018
23c7021
fixed typos
kasanryukin Jan 14, 2018
cb543bb
Update 22.json
kasanryukin Jan 14, 2018
8489193
Update 22.json
kasanryukin Jan 14, 2018
9ff3b95
Update 223.json
kasanryukin Jan 14, 2018
10bfaa3
Update 308.json
kasanryukin Jan 14, 2018
0a43da7
Update 36paper.json
kasanryukin Jan 14, 2018
020f2e7
Update 40.json
kasanryukin Jan 14, 2018
20e5f39
Update 40mm.json
kasanryukin Jan 14, 2018
fe1c277
Update 40mm.json
kasanryukin Jan 14, 2018
61473df
Update 44.json
kasanryukin Jan 14, 2018
e1f3713
Update 45.json
kasanryukin Jan 14, 2018
86da530
altered dates of advanced guns
kasanryukin Jan 17, 2018
216ee11
missed one of the leadworks guns
kasanryukin Jan 18, 2018
5219259
Update ups.json
kasanryukin Jan 19, 2018
b86b149
additional modification of language on dates
kasanryukin Jan 19, 2018
1a8fcec
Second Pass Range Enumeration
kasanryukin Jan 19, 2018
958237e
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
9303954
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
e827298
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
fcd2dca
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
1e7a5d3
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
f9ece94
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
39c0806
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
d2adaa7
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
7f7061a
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
bc3f5d3
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
663f893
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
d187b4e
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
cf346d3
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
3457e3c
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
d7f8a85
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
e550cf8
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
c6b3f7e
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
6a62f75
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
4f73f55
Second pass enumeration of ranges
kasanryukin Jan 19, 2018
dee4ba1
Formatting
kasanryukin Jan 19, 2018
f507fe4
Removed Skill block as it cause a compile conflict
kasanryukin Jan 19, 2018
4324bd6
Fixed typo
kasanryukin Jan 21, 2018
b1e570a
Fixed to comply with #22717
kasanryukin Feb 4, 2018
5b26d0d
Merge branch 'master' into master
kasanryukin Feb 6, 2018
e809bc4
fixed missing comma
kasanryukin Feb 6, 2018
9ec057f
Fixed?
kasanryukin Feb 7, 2018
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: 3 additions & 1 deletion data/json/items/gun/20x66mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "dark_gray",
"ammo": "20x66mm",
"skill": "shotgun",
"range": 6,
"range": 12,
"ranged_damage": 4,
"dispersion": 45,
"durability": 9,
Expand Down Expand Up @@ -46,6 +46,7 @@
"color": "dark_gray",
"ammo": "20x66mm",
"skill": "shotgun",
"ramge": 8,
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo. Should be "range"

"dispersion": 90,
"durability": 9,
"burst": 4,
Expand Down Expand Up @@ -77,6 +78,7 @@
"color": "dark_gray",
"ammo": "20x66mm",
"skill": "pistol",
"range": 4,
"dispersion": 250,
"durability": 9,
"default_mods": [ "pistol_stock" ],
Expand Down
8 changes: 8 additions & 0 deletions data/json/items/gun/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"color": "light_gray",
"ammo": "22",
"skill": "smg",
"range": 8,
"ranged_damage": 4,
"dispersion": 280,
"durability": 6,
Expand Down Expand Up @@ -42,6 +43,7 @@
"color": "brown",
"ammo": "22",
"skill": "rifle",
"range": 15,
"ranged_damage": 5,
"dispersion": 90,
"durability": 8,
Expand All @@ -64,6 +66,7 @@
"material": [ "steel", "wood" ],
"color": "dark_gray",
"ammo": "22",
"range": 4,
"ranged_damage": -2,
"dispersion": 520,
"durability": 6,
Expand All @@ -87,6 +90,7 @@
"color": "brown",
"ammo": "22",
"skill": "rifle",
"range": 10,
"ranged_damage": 1,
"dispersion": 180,
"durability": 6,
Expand All @@ -112,6 +116,7 @@
"color": "light_gray",
"ammo": "22",
"skill": "smg",
"range": 8,
"ranged_damage": 3,
"dispersion": 280,
"durability": 9,
Expand All @@ -137,6 +142,7 @@
"color": "brown",
"ammo": "22",
"skill": "rifle",
"range": 17,
"ranged_damage": 4,
"dispersion": 110,
"durability": 8,
Expand Down Expand Up @@ -174,6 +180,7 @@
"color": "dark_gray",
"ammo": "22",
"skill": "pistol",
"range": 5,
"ranged_damage": -1,
"dispersion": 480,
"durability": 8,
Expand All @@ -196,6 +203,7 @@
"material": [ "aluminum", "steel", "plastic" ],
"color": "dark_gray",
"ammo": "22",
"range": 4,
"dispersion": 480,
"durability": 7,
"magazine_well": 1,
Expand Down
18 changes: 16 additions & 2 deletions data/json/items/gun/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"color": "dark_gray",
"ammo": "223",
"ranged_damage": -1,
"range": 20,
"dispersion": 150,
"durability": 8,
"burst": 3,
Expand All @@ -41,6 +42,7 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"range": 20,
"dispersion": 150,
"durability": 7,
"magazines": [
Expand All @@ -66,6 +68,7 @@
"color": "dark_gray",
"ammo": "223",
"ranged_damage": -2,
"range": 13,
"dispersion": 180,
"durability": 8,
"burst": 6,
Expand All @@ -90,6 +93,7 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"range": 20,
"dispersion": 150,
"durability": 8,
"burst": 15,
Expand All @@ -116,7 +120,7 @@
"symbol": "(",
"color": "light_gray",
"ammo": "223",
"range": -8,
"range": 2,
"ranged_damage": -4,
"dispersion": 380,
"durability": 8,
Expand All @@ -138,6 +142,7 @@
"color": "dark_gray",
"ammo": "223",
"ranged_damage": "-1",
"range": 20,
"dispersion": 90,
"durability": 3,
"burst": 3,
Expand Down Expand Up @@ -173,7 +178,7 @@
"//": "Volume, range, and bullpup all point to a very large barrel on this one.",
"weight": 1200,
"volume": 4,
"range": 3,
"range": 6,
"ranged_damage": 3
}
},
Expand All @@ -190,6 +195,7 @@
"relative": {
"weight": 2000,
"volume": 7,
"range": 3,
"ranged_damage": 2,
"dispersion": 60
}
Expand Down Expand Up @@ -222,6 +228,7 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"range": 25,
"dispersion": 200,
"durability": 7,
"reload": 400,
Expand All @@ -247,6 +254,7 @@
[ "308", [ "g3mag", "g3bigmag" ] ]
],
"relative": {
"range": -3,
"ranged_damage": 1,
"durability": 1
}
Expand All @@ -266,6 +274,7 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"range":20,
"ranged_damage": -2,
"dispersion": 180,
"durability": 6,
Expand All @@ -291,6 +300,7 @@
"symbol": "(",
"color": "brown",
"ammo": "223",
"range": 14,
"ranged_damage": 1,
"dispersion": 100,
"durability": 8,
Expand All @@ -317,6 +327,7 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"range": 20,
"ranged_damage": -2,
"dispersion": 150,
"durability": 8,
Expand All @@ -340,6 +351,7 @@
"bashing": 10,
"material": [ "steel", "plastic" ],
"ammo": "223",
"range": 14,
"dispersion": 180,
"durability": 9,
"modes": [
Expand Down Expand Up @@ -369,6 +381,7 @@
"symbol": "(",
"color": "light_gray",
"ammo": "223",
"range": 14,
"dispersion": 140,
"durability": 8,
"burst": 6,
Expand Down Expand Up @@ -397,6 +410,7 @@
"color": "brown",
"ammo": "223",
"ranged_damage": -4,
"range": 12,
"dispersion": 180,
"durability": 6,
"loudness": 25,
Expand Down
3 changes: 3 additions & 0 deletions data/json/items/gun/300.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"bashing": 12,
"material": [ "steel", "plastic" ],
"ammo": "300",
"range": 19,
"dispersion": 90,
"durability": 8,
"barrel_length": 2,
Expand All @@ -36,6 +37,7 @@
"material": [ "steel", "wood" ],
"color": "brown",
"ammo": "300",
"range": 19,
"dispersion": 110,
"durability": 8,
"clip_size": 3,
Expand All @@ -57,6 +59,7 @@
"material": [ "steel", "wood" ],
"color": "brown",
"ammo": "300",
"range": 19,
"dispersion": 90,
"durability": 8,
"clip_size": 3,
Expand Down
12 changes: 11 additions & 1 deletion data/json/items/gun/3006.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"ammo": "3006",
"skill": "rifle",
"ranged_damage": -1,
"range": 20,
"dispersion": 90,
"durability": 7,
"barrel_length": 2,
Expand All @@ -41,6 +42,7 @@
"color": "brown",
"ammo": "3006",
"skill": "rifle",
"range": 13,
"dispersion": 150,
"durability": 8,
"reload": 150,
Expand All @@ -65,6 +67,7 @@
"material": [ "steel", "wood" ],
"color": "brown",
"ammo": "3006",
"range": 25,
"dispersion": 120,
"durability": 8,
"clip_size": 5,
Expand All @@ -87,6 +90,7 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "3006",
"range": 25,
"skill": "rifle",
"dispersion": 180,
"durability": 8,
Expand All @@ -113,6 +117,7 @@
"material": [ "steel", "plastic" ],
"color": "brown",
"ammo": "3006",
"range": 25,
"dispersion": 90,
"durability": 8,
"clip_size": 4,
Expand All @@ -137,6 +142,7 @@
"ammo": "3006",
"skill": "rifle",
"ranged_damage": -2,
"range": 12,
"dispersion": 180,
"durability": 6,
"loudness": 25,
Expand All @@ -154,9 +160,13 @@
"name_plural": "Survivor Special 700",
"description": "A rusty receiver, a R700 pattern barrel and half a broken crutch; all held together in the shape of a rifle with nothing more than glue, duct tape, and generous amounts of faith.",
"price": 100000,
"range": 14,
"clip_size": 1,
"valid_mod_locations": [ [ "accessories", 4 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "sights", 1 ] ],
"relative": { "durability": -3 },
"relative": {
"durability": -3,
"range": -5
},
"proportional": { "reload": 4 }
}
]
12 changes: 11 additions & 1 deletion data/json/items/gun/308.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"color": "dark_gray",
"ammo": "308",
"ranged_damage": -1,
"range": 10,
"dispersion": 150,
"durability": 8,
"burst": 10,
Expand All @@ -42,6 +43,7 @@
"color": "dark_gray",
"ammo": "308",
"ranged_damage": -2,
"range": 14,
"dispersion": 150,
"durability": 8,
"modes": [
Expand Down Expand Up @@ -70,6 +72,7 @@
"ammo": "308",
"skill": "rifle",
"ranged_damage": -1,
"range": 14,
"dispersion": 200,
"durability": 9,
"ups_charges": 1,
Expand All @@ -87,6 +90,7 @@
"description": "A highly modified version of the M14 rifle designed to cover both CQB and designated marksman roles. A very powerful and versatile rifle, if somewhat heavy.",
"weight": 4820,
"price": 195000,
"range": 20,
"material": [ "steel", "plastic" ],
"burst": 10,
"valid_mod_locations": [ [ "accessories", 4 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ]
Expand All @@ -108,6 +112,7 @@
"color": "brown",
"ammo": "308",
"ranged_damage": -1,
"range": 18,
"dispersion": 110,
"durability": 8,
"barrel_length": 2,
Expand All @@ -132,6 +137,7 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "308",
"range": 18,
"dispersion": 200,
"durability": 9,
"reload": 400,
Expand Down Expand Up @@ -159,6 +165,7 @@
"color": "dark_gray",
"ammo": "308",
"ranged_damage": -1,
"range": 20,
"dispersion": 180,
"durability": 7,
"reload": 400,
Expand Down Expand Up @@ -188,6 +195,7 @@
"color": "brown",
"ammo": "308",
"ranged_damage": -5,
"range": 12,
"dispersion": 180,
"durability": 6,
"clip_size": 6,
Expand All @@ -212,6 +220,7 @@
"symbol": "(",
"color": "brown",
"ammo": "308",
"range": 25,
"dispersion": 90,
"durability": 9,
"clip_size": 3,
Expand All @@ -228,6 +237,7 @@
"ammo": "308",
"ranged_damage": -3,
"burst": 8,
"magazine_well": 1
"magazine_well": 1,
"relative": { "range": -3 }
}
Copy link
Contributor

@BorkBorkGoesTheCode BorkBorkGoesTheCode Feb 7, 2018

Choose a reason for hiding this comment

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

This magazine_well is causing the buildbot to complain about duplicate entries. No idea why I missed it earlier.

]
Loading