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

kasanryukin · 2018-01-14T02:27:02Z

Abstract

Current ballistic calculations in game are not conducive to any firearm beyond a range of 14 tiles with any expectation of accuracy with the exception of the RM11B Sniper Rifle (reason unkown at the moment as it's the only gun with accurate fire at low skill beyond 16 tiles). Calculations only take two factors into consideration for range: recoil and dispersion. While both of these are needed numbers in the calculation, effective firing ranges of guns should also be a factor in the calculation before recoil and dispersion are factored in.

Link to Real Data Spreadsheet: https://docs.google.com/spreadsheets/d/1aGH8N2kITxZ_8i1Vyi1G-FIVfQOTL6euvKxZkYOc-FE/edit?usp=sharing

Outline

The goal of the project is an overhaul in firearms to something both viable in game, but not overtly broken like screwing around with dispersion values. Part one of the project is assigning the RANGE value to every firearm as defined in item.cpp. Numbers are based off the values listed near the end of ranged.cpp as Medium (9 tiles) and Short (4 tiles). Most SMGs and Shotguns fall between the two. Assault rifles, some carbines and some battle rifles, are upgraded to a value of Long (+5 over medium), DMRs/Hunting Rifles/Some Carbines/Some Sniper Rifles, are Upgraded to +10 over medium. Some designated sniper rifles are at +15. Launchers and anti-material weapons were largely left untouched as they already had existing values that exceed the scheme defined above.

Currently, the values don't affect actual accuracy at the extended ranges. This will be altered once code changes are committed that add range values to the math equations for calculating accuracy.

This is very much still a WIP as I'm familiarizing myself with the code related to projectile weaponry.

Edit: Secondary aim of project: Adjust dates of leadworks firearms to match game design.

Current Project Stage

Ranges have now been converted from Real Ranges to Relative Ranges. Most pistols will behave similar to each other. Shotguns have some variation on range, SMGs run the range between a pistol and home made rifle. Rifles were converted based around 14 tiles being a central range and 500m being the median range to achieve 14 tiles. Depending on the effective range of the real weapon, rifles range between 10 and 20 tiles. DMRs, Sniper Rifles, and some Lever action Rifles, fall in the 18-25 tile range. RivTech and Anti-material Sniper Systems fall at the range cap of 30 tiles. Laser weapons had ranges adjusted to fit these values. Some guns had dispersion increased or decreased (no more than 20 MoA) based on RL weapon descriptions.

Ranges adjustments are ready for review before being merged. Once the data is part of the branch, Kevin can use the ranges as part of any future changes to the firearms systems.

Adding gun ranges

added ranges

added range

added ranges, minor change to the taurus

added ranges

added range

added ranges

added ranges, increase range of the RM11B sniper to match other sniper rifles, with RivTech bonus range.

added ranges

added range

BorkBorkGoesTheCode · 2018-02-04T01:10:05Z

@kasanryukin the git is saying that your PR has merge conflicts because it can't cope with both your 308 changes and my 308 changes here: 299105f This is fixable.

kasanryukin · 2018-02-04T04:19:40Z

@BorkBorkGoesTheCode Fixed

BorkBorkGoesTheCode · 2018-02-04T04:29:39Z

Do you have a "fix merge conflicts" button in your UI at the bottom of the PR?

https://help.github.com/articles/about-merge-conflicts/

https://help.github.com/articles/resolving-a-merge-conflict-on-github/

kasanryukin · 2018-02-06T02:06:00Z

In theory I fixed it this time.

BorkBorkGoesTheCode · 2018-02-06T03:46:50Z

In gun/308.json, line 1467 is missing a comma at the end.

BorkBorkGoesTheCode · 2018-02-07T00:02:27Z

data/json/items/gun/308.json

@@ -237,7 +237,7 @@
    "ammo": "308",
    "ranged_damage": -3,
    "magazine_well": 1,
-    "relative": { "range": -3 }
+    "relative": { "range": -3 },
    "magazine_well": 1
  }


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

kasanryukin · 2018-02-07T07:17:47Z

Ok, looks like that's actually fixed it

Firestorm01X2 · 2018-02-19T19:11:04Z

And conflicts again.

BorkBorkGoesTheCode · 2018-02-19T23:06:10Z

I really dislike GitHub because of this stuff.

Firestorm01X2 · 2018-02-20T06:09:07Z

After fixing in should be reviewed. Looks like it affects too much json files and definitely will get conflicts again.

Also it is bad to delay editing ranged balance on forever.

Night-Pryanik · 2018-02-20T16:03:11Z

I really dislike GitHub because of this stuff.

That's not GitHub stuff at all. That's Git stuff.

kasanryukin · 2018-03-16T21:10:04Z

Conflicting files contain original date descriptions that were changed per Kevin's statement on when the game takes place, so I'm not going to edit them to be non-conflicting with the master branch. Merging won't directly impact firearms in any way until the code itself references any of the changes I made, but it will fix the descriptions to have non-hard set dates on firearm introduction. Marking this as ready to merge.

ZhilkinSerg · 2018-03-16T21:16:43Z

Conflicting files contain original date descriptions that were changed per Kevin's statement on when the game takes place, so I'm not going to edit them to be non-conflicting with the master branch. Merging won't directly impact firearms in any way until the code itself references any of the changes I made, but it will fix the descriptions to have non-hard set dates on firearm introduction. Marking this as ready to merge.

Merging won't be possible until all conflicts are resolved. Conflicting cpp/h will prevent successful compilation, conflicting json will cause errors during loading of data during game start.

using a script from https://gist.github.com/fungusakafungus/eb2bdf39da73c03dcb2325b3350ff24b#file-gen-mod-from-diff-sh like this: git checkout kasanryukin/master git reset c0e3b6f # fork point ./gen-mod-from-diff.sh PR22756

kevingranade · 2018-05-08T21:54:23Z

The spreadsheet is here for reference, we never had any intention of applying these adjustments this way, so I'm closing to avoid further confusion.

kasanryukin added 30 commits January 13, 2018 18:19

Update 20x66mm.json

bb846ad

Adding gun ranges

Update 22.json

ff066d9

added ranges

Update 223.json

e769c5e

added ranges

Update 300.json

96791e4

added ranges

Update 3006.json

389ead0

added ranges

Update 308.json

9b2e763

added ranges

Update 32.json

10c4e3d

added ranges

Update 36paper.json

c562dc5

added range

Update 38.json

1242f30

added ranges, minor change to the taurus

Update 40.json

d40a6d9

added ranges

Update 40mm.json

31119d2

added ranges

Update 44.json

6efb154

added ranges

Update 44paper.json

e2968df

added ranges

Update 45.json

52590c4

added ranges

Update 454.json

e3bbfc0

added range

Update 454.json

d3fb9c4

Update 46.json

af71fed

added ranges

Update 500.json

11649e5

added ranges

Update 545x39.json

7e64e58

Update 57.json

5379591

added ranges

Update 700nx.json

324c669

added ranges

Update 762.json

c73a150

added ranges

Update 762R.json

ad944fd

added ranges

Update 762x25.json

0366c8f

added ranges

Update 8x40mm.json

3e51e47

added ranges, increase range of the RM11B sniper to match other sniper rifles, with RivTech bonus range.

Update 9mm.json

bd39108

added ranges

Update 9x18.json

d90a6d0

added range

Update blunderbuss.json

bea82bc

added range

Update flammable.json

8eeb980

added range

Update metal_rail.json

b9262da

added range

Fixed to comply with #22717

b1e570a

Merge branch 'master' into master

5b26d0d

fixed missing comma

e809bc4

BorkBorkGoesTheCode reviewed Feb 7, 2018

View reviewed changes

Fixed?

9ec057f

BorkBorkGoesTheCode mentioned this pull request Feb 22, 2018

add semi-automatic mode to M2 #22995

Merged

kasanryukin changed the title ~~[REVIEW] Firearms Overhaul V 1.0 - Ranges converted from Real Values to Relative in game values.~~ [RDY] Firearms Overhaul V 1.0 - Ranges converted from Real Values to Relative in game values. Mar 16, 2018

illi-kun changed the title ~~[RDY] Firearms Overhaul V 1.0 - Ranges converted from Real Values to Relative in game values.~~ Firearms Overhaul V 1.0 - Ranges converted from Real Values to Relative in game values Mar 17, 2018

fungusakafungus mentioned this pull request Apr 1, 2018

Rewrites #22756 (Firearms Overhaul) as json-only mod #23343

Closed

ZhilkinSerg added Game: Balance Balancing of (existing) in-game features. (P5 - Long-term) Long-term WIP, may stay on the list for a while. [JSON] Changes (can be) made in JSON Mechanics: Aiming Aiming, especially aiming balance labels Apr 2, 2018

kevingranade closed this May 8, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

kasanryukin commented Jan 14, 2018 •

edited

Loading

BorkBorkGoesTheCode commented Feb 4, 2018

kasanryukin commented Feb 4, 2018

BorkBorkGoesTheCode commented Feb 4, 2018 •

edited

Loading

kasanryukin commented Feb 6, 2018

BorkBorkGoesTheCode commented Feb 6, 2018

BorkBorkGoesTheCode Feb 7, 2018 •

edited

Loading

kasanryukin commented Feb 7, 2018

Firestorm01X2 commented Feb 19, 2018

BorkBorkGoesTheCode commented Feb 19, 2018

Firestorm01X2 commented Feb 20, 2018 •

edited

Loading

Night-Pryanik commented Feb 20, 2018

kasanryukin commented Mar 16, 2018

ZhilkinSerg commented Mar 16, 2018

kevingranade commented May 8, 2018

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

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

Conversation

kasanryukin commented Jan 14, 2018 • edited Loading

Abstract

Outline

Current Project Stage

BorkBorkGoesTheCode commented Feb 4, 2018

kasanryukin commented Feb 4, 2018

BorkBorkGoesTheCode commented Feb 4, 2018 • edited Loading

kasanryukin commented Feb 6, 2018

BorkBorkGoesTheCode commented Feb 6, 2018

BorkBorkGoesTheCode Feb 7, 2018 • edited Loading

Choose a reason for hiding this comment

kasanryukin commented Feb 7, 2018

Firestorm01X2 commented Feb 19, 2018

BorkBorkGoesTheCode commented Feb 19, 2018

Firestorm01X2 commented Feb 20, 2018 • edited Loading

Night-Pryanik commented Feb 20, 2018

kasanryukin commented Mar 16, 2018

ZhilkinSerg commented Mar 16, 2018

kevingranade commented May 8, 2018

kasanryukin commented Jan 14, 2018 •

edited

Loading

BorkBorkGoesTheCode commented Feb 4, 2018 •

edited

Loading

BorkBorkGoesTheCode Feb 7, 2018 •

edited

Loading

Firestorm01X2 commented Feb 20, 2018 •

edited

Loading