-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Closed
Changes from 71 commits
Commits
Show all changes
76 commits
Select commit
Hold shift + click to select a range
bb846ad
Update 20x66mm.json
kasanryukin ff066d9
Update 22.json
kasanryukin e769c5e
Update 223.json
kasanryukin 96791e4
Update 300.json
kasanryukin 389ead0
Update 3006.json
kasanryukin 9b2e763
Update 308.json
kasanryukin 10c4e3d
Update 32.json
kasanryukin c562dc5
Update 36paper.json
kasanryukin 1242f30
Update 38.json
kasanryukin d40a6d9
Update 40.json
kasanryukin 31119d2
Update 40mm.json
kasanryukin 6efb154
Update 44.json
kasanryukin e2968df
Update 44paper.json
kasanryukin 52590c4
Update 45.json
kasanryukin e3bbfc0
Update 454.json
kasanryukin d3fb9c4
Update 454.json
kasanryukin af71fed
Update 46.json
kasanryukin 11649e5
Update 500.json
kasanryukin 7e64e58
Update 545x39.json
kasanryukin 5379591
Update 57.json
kasanryukin 324c669
Update 700nx.json
kasanryukin c73a150
Update 762.json
kasanryukin ad944fd
Update 762R.json
kasanryukin 0366c8f
Update 762x25.json
kasanryukin 3e51e47
Update 8x40mm.json
kasanryukin bd39108
Update 9mm.json
kasanryukin d90a6d0
Update 9x18.json
kasanryukin bea82bc
Update blunderbuss.json
kasanryukin 8eeb980
Update flammable.json
kasanryukin b9262da
Update metal_rail.json
kasanryukin 56aeff5
Update nail.json
kasanryukin 45336ee
Update shot.json
kasanryukin 1aa36dc
Update signal_flare.json
kasanryukin 4660710
Update ranged.json
kasanryukin 23c7021
fixed typos
kasanryukin cb543bb
Update 22.json
kasanryukin 8489193
Update 22.json
kasanryukin 9ff3b95
Update 223.json
kasanryukin 10bfaa3
Update 308.json
kasanryukin 0a43da7
Update 36paper.json
kasanryukin 020f2e7
Update 40.json
kasanryukin 20e5f39
Update 40mm.json
kasanryukin fe1c277
Update 40mm.json
kasanryukin 61473df
Update 44.json
kasanryukin e1f3713
Update 45.json
kasanryukin 86da530
altered dates of advanced guns
kasanryukin 216ee11
missed one of the leadworks guns
kasanryukin 5219259
Update ups.json
kasanryukin b86b149
additional modification of language on dates
kasanryukin 1a8fcec
Second Pass Range Enumeration
kasanryukin 958237e
Second pass enumeration of ranges
kasanryukin 9303954
Second pass enumeration of ranges
kasanryukin e827298
Second pass enumeration of ranges
kasanryukin fcd2dca
Second pass enumeration of ranges
kasanryukin 1e7a5d3
Second pass enumeration of ranges
kasanryukin f9ece94
Second pass enumeration of ranges
kasanryukin 39c0806
Second pass enumeration of ranges
kasanryukin d2adaa7
Second pass enumeration of ranges
kasanryukin 7f7061a
Second pass enumeration of ranges
kasanryukin bc3f5d3
Second pass enumeration of ranges
kasanryukin 663f893
Second pass enumeration of ranges
kasanryukin d187b4e
Second pass enumeration of ranges
kasanryukin cf346d3
Second pass enumeration of ranges
kasanryukin 3457e3c
Second pass enumeration of ranges
kasanryukin d7f8a85
Second pass enumeration of ranges
kasanryukin e550cf8
Second pass enumeration of ranges
kasanryukin c6b3f7e
Second pass enumeration of ranges
kasanryukin 6a62f75
Second pass enumeration of ranges
kasanryukin 4f73f55
Second pass enumeration of ranges
kasanryukin dee4ba1
Formatting
kasanryukin f507fe4
Removed Skill block as it cause a compile conflict
kasanryukin 4324bd6
Fixed typo
kasanryukin b1e570a
Fixed to comply with #22717
kasanryukin 5b26d0d
Merge branch 'master' into master
kasanryukin e809bc4
fixed missing comma
kasanryukin 9ec057f
Fixed?
kasanryukin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,6 +16,7 @@ | |
"color": "dark_gray", | ||
"ammo": "308", | ||
"ranged_damage": -1, | ||
"range": 10, | ||
"dispersion": 150, | ||
"durability": 8, | ||
"burst": 10, | ||
|
@@ -42,6 +43,7 @@ | |
"color": "dark_gray", | ||
"ammo": "308", | ||
"ranged_damage": -2, | ||
"range": 14, | ||
"dispersion": 150, | ||
"durability": 8, | ||
"modes": [ | ||
|
@@ -70,6 +72,7 @@ | |
"ammo": "308", | ||
"skill": "rifle", | ||
"ranged_damage": -1, | ||
"range": 14, | ||
"dispersion": 200, | ||
"durability": 9, | ||
"ups_charges": 1, | ||
|
@@ -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 ] ] | ||
|
@@ -108,6 +112,7 @@ | |
"color": "brown", | ||
"ammo": "308", | ||
"ranged_damage": -1, | ||
"range": 18, | ||
"dispersion": 110, | ||
"durability": 8, | ||
"barrel_length": 2, | ||
|
@@ -132,6 +137,7 @@ | |
"symbol": "(", | ||
"color": "dark_gray", | ||
"ammo": "308", | ||
"range": 18, | ||
"dispersion": 200, | ||
"durability": 9, | ||
"reload": 400, | ||
|
@@ -159,6 +165,7 @@ | |
"color": "dark_gray", | ||
"ammo": "308", | ||
"ranged_damage": -1, | ||
"range": 20, | ||
"dispersion": 180, | ||
"durability": 7, | ||
"reload": 400, | ||
|
@@ -188,6 +195,7 @@ | |
"color": "brown", | ||
"ammo": "308", | ||
"ranged_damage": -5, | ||
"range": 12, | ||
"dispersion": 180, | ||
"durability": 6, | ||
"clip_size": 6, | ||
|
@@ -212,6 +220,7 @@ | |
"symbol": "(", | ||
"color": "brown", | ||
"ammo": "308", | ||
"range": 25, | ||
"dispersion": 90, | ||
"durability": 9, | ||
"clip_size": 3, | ||
|
@@ -228,6 +237,7 @@ | |
"ammo": "308", | ||
"ranged_damage": -3, | ||
"burst": 8, | ||
"magazine_well": 1 | ||
"magazine_well": 1, | ||
"relative": { "range": -3 } | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. |
||
] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo. Should be "range"