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.

Sign up for GitHub

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

Jump to bottom

Update aiming [RDY] #17962

Merged
merged 42 commits into from Aug 12, 2016
Merged

Update aiming [RDY] #17962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
9e3dd44
Fix setting of standard_npc stats
mugling Aug 8, 2016
887d4da
Update unit tests to use new function signature
mugling Aug 8, 2016
98cb055
Simplify trig calculation
mugling Aug 8, 2016
5e43fbc
Refactor MIN_RECOIL as extern to aid adjustment
mugling Aug 8, 2016
992bd4d
Use defined accuracy levels
mugling Aug 8, 2016
bad1e47
Calculate gun and ammo dispersion concurrently
mugling Aug 8, 2016
f836012
Implement player::recoil_current()
mugling Aug 8, 2016
c308805
Use deterministic random
mugling Aug 8, 2016
198db6a
Extend unit tests to cover range calculation
mugling Aug 8, 2016
cea3092
Implement R graphs
mugling Aug 8, 2016
652a7e6
Add standard S1 NPC
mugling Aug 8, 2016
3e1c204
Increase effect of aiming
mugling Aug 8, 2016
d834aee
Aiming speed depends only on base item
mugling Aug 8, 2016
75a6070
Reduce effect of skill on dispersion
mugling Aug 8, 2016
d7187e4
Reduce stat penalties for typical players
mugling Aug 8, 2016
def1ab6
Simplify Character::skill_dispersion
mugling Aug 8, 2016
da3f0dd
Factor out common trig code
mugling Aug 8, 2016
94f6400
Refactor get/set of recoil
mugling Aug 8, 2016
ba7bf97
Drop stat penalties
mugling Aug 8, 2016
15196c4
Replace driving_recoil with recoil_vehicle()
mugling Aug 8, 2016
a63f0d1
Allow setting of stats for standard_npc
mugling Aug 8, 2016
af9a560
Store and manipulate recoil as double
mugling Aug 8, 2016
699674a
Calculate aim adjustment per move
mugling Aug 8, 2016
f54c84d
Use linear aiming algorithm
mugling Aug 8, 2016
3325126
Show total aiming time in item::info and stats dump
mugling Aug 9, 2016
a3e476c
Merge branch 'master' into arc3
mugling Aug 9, 2016
5a9ec65
Merge branch 'master' into arc3
mugling Aug 9, 2016
c67fa32
Derive aim_speed from item volume
mugling Aug 9, 2016
f960fba
DEX affects aiming speed
mugling Aug 9, 2016
f7e2494
Change aim_speed as aim_cost
mugling Aug 10, 2016
f08de71
Refactor sight selection
mugling Aug 10, 2016
c2689f0
Require PER for long range shots
mugling Aug 10, 2016
7c1e860
Test case S1 should be VARSIZE = FIT
mugling Aug 10, 2016
18e5fb9
Clothing affects speed (hands) and sights (eyes)
mugling Aug 10, 2016
1844aeb
Support passing options to stats dumper
mugling Aug 10, 2016
5f73a47
Add further test models
mugling Aug 10, 2016
7eeded1
Better variable naming
mugling Aug 10, 2016
5d53b5f
Simplify player::gun_engagement_range()
mugling Aug 11, 2016
9869c09
Simplify as player::gun_current_range()
mugling Aug 11, 2016
24c9727
Refactor loop (expand)
mugling Aug 11, 2016
0f40c97
Aim in blocks of 10
mugling Aug 11, 2016
8e3b25e
Drop missed definitions of aim_speed
mugling Aug 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions data/json/items/archery.json
View file
Open in desktop
Expand Up @@ -819,7 +819,6 @@
"range" : 6,
"dispersion" : 180,
"sight_dispersion": 90,
"aim_speed" : 4,
"durability" : 6,
"clip_size" : 1,
"valid_mod_locations": [[ "accessories", 2 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]]
Expand All @@ -844,7 +843,6 @@
"range" : 10,
"dispersion" : 150,
"sight_dispersion": 90,
"aim_speed" : 4,
"durability" : 6,
"clip_size" : 1,
"reload" : 800,
Expand All @@ -870,7 +868,6 @@
"range" : 30,
"dispersion" : 330,
"sight_dispersion": 90,
"aim_speed" : 4,
"recoil" : 30,
"durability" : 6,
"clip_size" : 1,
Expand All @@ -896,7 +893,6 @@
"range" : 8,
"dispersion" : 500,
"sight_dispersion": 90,
"aim_speed" : 4,
"recoil" : 30,
"durability" : 6,
"clip_size" : 10,
Expand Down
7 changes: 1 addition & 6 deletions data/json/items/classes/gun.json
View file
Open in desktop
Expand Up @@ -14,7 +14,6 @@
"skill": "launcher",
"ammo": "gasoline",
"ammo_effects": [ "NO_BOOM", "FLARE" ],
"aim_speed": 10,
"reload": 4,
"flags": [ "FIRE_100", "NEVER_JAMS" ]
},
Expand All @@ -34,7 +33,6 @@
"type": "GUN",
"name": "base pistol",
"skill": "pistol",
"aim_speed": 4,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "magazine", 1 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ]
},
{
Expand All @@ -53,7 +51,6 @@
"type": "GUN",
"name": "base rifle",
"skill": "rifle",
"aim_speed": 8,
"valid_mod_locations": [ [ "accessories", 4 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "magazine", 1 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ]
},
{
Expand Down Expand Up @@ -83,7 +80,6 @@
"name": "base shotgun",
"skill": "shotgun",
"ammo": "shot",
"aim_speed": 6,
"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 @@ -100,7 +96,6 @@
"copy-from": "gun_base",
"type": "GUN",
"name": "base SMG",
"skill": "smg",
"aim_speed": 6
"skill": "smg"
}
]
1 change: 0 additions & 1 deletion data/json/items/gun/12mm.json
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@
"ranged_damage": 45,
"dispersion": 45,
"sight_dispersion": 60,
"aim_speed": 6,
"recoil": 150,
"durability": 8,
"ups_charges": 5,
Expand Down
3 changes: 0 additions & 3 deletions data/json/items/gun/20x66mm.json
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
"ranged_damage": 4,
"dispersion": 45,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": 75,
"durability": 9,
"clip_size": 5,
Expand All @@ -43,7 +42,6 @@
"skill": "shotgun",
"dispersion": 90,
"sight_dispersion": 75,
"aim_speed": 4,
"durability": 9,
"burst": 4,
"valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
Expand All @@ -68,7 +66,6 @@
"skill": "pistol",
"dispersion": 270,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": 225,
"durability": 9,
"clip_size": 2,
Expand Down
8 changes: 0 additions & 8 deletions data/json/items/gun/22.json
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
"ranged_damage": 4,
"dispersion": 180,
"sight_dispersion": 105,
"aim_speed": 3,
"recoil": 10,
"durability": 6,
"burst": 30,
Expand Down Expand Up @@ -48,7 +47,6 @@
"ranged_damage": 5,
"dispersion": 30,
"sight_dispersion": 60,
"aim_speed": 6,
"recoil": -75,
"durability": 8,
"clip_size": 19,
Expand All @@ -75,7 +73,6 @@
"ranged_damage": -1,
"dispersion": 300,
"sight_dispersion": 120,
"aim_speed": 2,
"recoil": 30,
"durability": 6,
"clip_size": 4,
Expand All @@ -101,7 +98,6 @@
"ranged_damage": 1,
"dispersion": 105,
"sight_dispersion": 60,
"aim_speed": 6,
"recoil": 30,
"durability": 6,
"loudness": 25,
Expand Down Expand Up @@ -129,7 +125,6 @@
"ranged_damage": 3,
"dispersion": 200,
"sight_dispersion": 80,
"aim_speed": 2,
"recoil": 5,
"durability": 9,
"burst": 20,
Expand Down Expand Up @@ -157,7 +152,6 @@
"ranged_damage": 4,
"dispersion": 10,
"sight_dispersion": 60,
"aim_speed": 6,
"recoil": -75,
"durability": 8,
"barrel_length": 2,
Expand Down Expand Up @@ -197,7 +191,6 @@
"ranged_damage": -1,
"dispersion": 300,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": 60,
"durability": 8,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
Expand All @@ -222,7 +215,6 @@
"skill": "pistol",
"dispersion": 255,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": 75,
"durability": 7,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
Expand Down
5 changes: 1 addition & 4 deletions data/json/items/gun/223.json
View file
Open in desktop
Expand Up @@ -183,8 +183,7 @@
"weight": 1200,
"volume": 4,
"range": 3,
"ranged_damage": 3,
"aim_speed": 2
"ranged_damage": 3
}
},
{
Expand All @@ -202,7 +201,6 @@
"volume": 7,
"ranged_damage": 2,
"dispersion": 60,
"aim_speed": 2,
"recoil": -150
}
},
Expand All @@ -217,7 +215,6 @@
"relative": {
"weight": 1200,
"volume": 2,
"aim_speed": -2,
"recoil": -50
}
},
Expand Down
4 changes: 0 additions & 4 deletions data/json/items/gun/3006.json
View file
Open in desktop
Expand Up @@ -17,7 +17,6 @@
"skill": "rifle",
"ranged_damage": -1,
"sight_dispersion": 60,
"aim_speed": 6,
"recoil": -60,
"durability": 7,
"barrel_length": 2,
Expand All @@ -42,7 +41,6 @@
"skill": "rifle",
"dispersion": 2,
"sight_dispersion": 60,
"aim_speed": 6,
"recoil": -15,
"durability": 8,
"reload": 150,
Expand Down Expand Up @@ -91,7 +89,6 @@
"skill": "rifle",
"dispersion": 75,
"sight_dispersion": 60,
"aim_speed": 6,
"recoil": 30,
"durability": 8,
"burst": 5,
Expand Down Expand Up @@ -142,7 +139,6 @@
"ranged_damage": -2,
"dispersion": 60,
"sight_dispersion": 150,
"aim_speed": 6,
"recoil": 150,
"durability": 6,
"loudness": 25,
Expand Down
3 changes: 0 additions & 3 deletions data/json/items/gun/32.json
View file
Open in desktop
Expand Up @@ -17,7 +17,6 @@
"skill": "pistol",
"dispersion": 150,
"sight_dispersion": 105,
"aim_speed": 3,
"durability": 8,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
"magazine_well": 1,
Expand All @@ -40,7 +39,6 @@
"skill": "smg",
"dispersion": 240,
"sight_dispersion": 105,
"aim_speed": 3,
"recoil": -10,
"durability": 6,
"burst": 8,
Expand All @@ -65,7 +63,6 @@
"skill": "pistol",
"dispersion": 150,
"sight_dispersion": 105,
"aim_speed": 3,
"durability": 8,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
"magazine_well": 1,
Expand Down
3 changes: 0 additions & 3 deletions data/json/items/gun/38.json
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@
"ranged_damage": -1,
"dispersion": 300,
"sight_dispersion": 150,
"aim_speed": 1,
"recoil": 80,
"durability": 3,
"clip_size": 2,
Expand All @@ -46,7 +45,6 @@
"range": 3,
"dispersion": 225,
"sight_dispersion": 120,
"aim_speed": 2,
"recoil": 30,
"durability": 6,
"clip_size": 4,
Expand Down Expand Up @@ -118,7 +116,6 @@
"skill": "pistol",
"dispersion": 210,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": 90,
"durability": 7,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
Expand Down
3 changes: 0 additions & 3 deletions data/json/items/gun/40.json
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
"ranged_damage": 1,
"dispersion": 240,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": 90,
"durability": 6,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
Expand Down Expand Up @@ -48,7 +47,6 @@
"skill": "pistol",
"dispersion": 210,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": 120,
"durability": 7,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
Expand Down Expand Up @@ -79,7 +77,6 @@
"ranged_damage": -1,
"dispersion": 250,
"sight_dispersion": 100,
"aim_speed": 4,
"recoil": 100,
"durability": 6,
"loudness": 25,
Expand Down
5 changes: 0 additions & 5 deletions data/json/items/gun/40mm.json
View file
Open in desktop
Expand Up @@ -35,7 +35,6 @@
"ammo": "40mm",
"dispersion": 270,
"sight_dispersion": 120,
"aim_speed": 2,
"recoil": 75,
"durability": 9,
"clip_size": 1,
Expand All @@ -57,7 +56,6 @@
"ranged_damage": 3,
"dispersion": 150,
"sight_dispersion": 120,
"aim_speed": 2,
"recoil": -75,
"durability": 8,
"clip_size": 1,
Expand All @@ -80,7 +78,6 @@
"ranged_damage": 1,
"dispersion": 180,
"sight_dispersion": 120,
"aim_speed": 6,
"recoil": 270,
"durability": 8,
"reload": 400,
Expand All @@ -107,7 +104,6 @@
"ammo": "40mm",
"dispersion": 270,
"sight_dispersion": 120,
"aim_speed": 2,
"recoil": -15,
"durability": 8,
"clip_size": 6,
Expand All @@ -129,7 +125,6 @@
"ammo": "40mm",
"dispersion": 150,
"sight_dispersion": 120,
"aim_speed": 3,
"recoil": 30,
"durability": 9,
"clip_size": 4,
Expand Down
1 change: 0 additions & 1 deletion data/json/items/gun/44.json
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
"ranged_damage": -1,
"dispersion": 405,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": 45,
"durability": 7,
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
Expand Down
5 changes: 0 additions & 5 deletions data/json/items/gun/45.json
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@
"skill": "smg",
"dispersion": 105,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": -150,
"durability": 7,
"burst": 8,
Expand Down Expand Up @@ -45,7 +44,6 @@
"ranged_damage": 1,
"dispersion": 75,
"sight_dispersion": 105,
"aim_speed": 3,
"recoil": -45,
"durability": 8,
"burst": 4,
Expand Down Expand Up @@ -100,7 +98,6 @@
"ranged_damage": 4,
"dispersion": 5,
"sight_dispersion": 60,
"aim_speed": 6,
"recoil": 150,
"durability": 9,
"clip_size": 7,
Expand Down Expand Up @@ -167,7 +164,6 @@
"skill": "smg",
"dispersion": 300,
"sight_dispersion": 105,
"aim_speed": 3,
"durability": 7,
"burst": 30,
"valid_mod_locations": [ [ "accessories", 3 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
Expand Down Expand Up @@ -220,7 +216,6 @@
"ranged_damage": 2,
"dispersion": 120,
"sight_dispersion": 90,
"aim_speed": 4,
"recoil": -15,
"durability": 7,
"burst": 6,
Expand Down