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

realistic gun maintenance #34240

Merged
merged 39 commits into from
Oct 2, 2019
Merged

realistic gun maintenance #34240

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
d50f653
better gun maint
misterprimus Sep 25, 2019
8232ad6
better gun maintenance
misterprimus Sep 26, 2019
72fc290
Update ranged.cpp
misterprimus Sep 26, 2019
68cecb0
Update src/ranged.cpp
misterprimus Sep 26, 2019
1bba8eb
Update ranged.cpp
misterprimus Sep 26, 2019
b20aa5f
Update data/json/items/gun/faults_gun.json
misterprimus Sep 26, 2019
4ad4ed2
adjust for old saves and fix integer/double conversion
misterprimus Sep 27, 2019
29d67b6
flintlock fixes and math adjustments
misterprimus Sep 27, 2019
4b64df4
finishing touches
misterprimus Sep 28, 2019
65ccb9a
Update zombie_cop.json
misterprimus Sep 28, 2019
1a7a109
Update zombie_cop.json
misterprimus Sep 28, 2019
532cbed
qrox
misterprimus Sep 28, 2019
2b694ec
Update item_group.h
misterprimus Sep 28, 2019
815a76f
Update item_group.cpp
misterprimus Sep 28, 2019
7229517
Update item_group.cpp
misterprimus Sep 28, 2019
60cf142
Update ranged.cpp
misterprimus Sep 28, 2019
6688fe6
Update item.cpp
misterprimus Sep 28, 2019
019284e
fix errors
misterprimus Sep 28, 2019
2c0397e
Update item_group.cpp
misterprimus Sep 28, 2019
2fb2039
Update ranged.cpp
misterprimus Sep 28, 2019
79cc955
Update ranged.cpp
misterprimus Sep 28, 2019
4f72d8a
Update src/item_group.h
misterprimus Sep 28, 2019
9c82c85
Update src/ranged.cpp
misterprimus Sep 28, 2019
2f2ac88
Update src/item.cpp
misterprimus Sep 28, 2019
f55fa05
Update src/item.cpp
misterprimus Sep 28, 2019
dc5c43c
Update faults_gun.json
misterprimus Sep 28, 2019
1087459
Merge branch 'better_gun_maint' of https://github.com/misterprimus/Ca…
misterprimus Sep 28, 2019
066152d
Update faults_gun.json
misterprimus Sep 28, 2019
313fece
Update ranged.cpp
misterprimus Sep 28, 2019
4a4f9c4
Update ranged.cpp
misterprimus Sep 28, 2019
1ca0e49
Update src/ranged.cpp
misterprimus Sep 28, 2019
520b459
Update ranged.cpp
misterprimus Sep 28, 2019
6614a32
Update src/ranged.cpp
misterprimus Sep 28, 2019
a1ff163
Update src/ranged.cpp
misterprimus Sep 28, 2019
1d6a2b9
Update zombie_cop.json
misterprimus Sep 28, 2019
247b48f
Update zombie_cop.json
misterprimus Sep 28, 2019
ce9efc7
various
misterprimus Sep 29, 2019
036d299
pneumatic guns should not foul
misterprimus Oct 1, 2019
176b61d
nails do not foul
misterprimus Oct 1, 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
4 changes: 2 additions & 2 deletions data/json/items/ammo/flintlock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dispersion": 90,
"recoil": 1500,
"loudness": 70,
"effects": [ "COOKOFF", "MUZZLE_SMOKE" ]
"effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
},
{
"id": "flintlock_shot",
Expand All @@ -41,6 +41,6 @@
"dispersion": 20,
"recoil": 1500,
"loudness": 90,
"effects": [ "COOKOFF", "MUZZLE_SMOKE", "SHOT" ]
"effects": [ "COOKOFF", "MUZZLE_SMOKE", "SHOT", "BLACKPOWDER" ]
}
]
10 changes: 5 additions & 5 deletions data/json/items/ammo/shot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"type": "AMMO",
"name": "blackpowder birdshot",
"proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
{
Expand All @@ -59,15 +59,15 @@
"type": "AMMO",
"name": "blackpowder dragon's breath shell",
"proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
{
"id": "bp_shot_00",
"copy-from": "shot_00",
"type": "AMMO",
"name": "blackpowder 00 shot",
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
{
Expand All @@ -76,7 +76,7 @@
"type": "AMMO",
"name": "blackpowder flechette shell",
"proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
{
Expand All @@ -85,7 +85,7 @@
"type": "AMMO",
"name": "blackpowder shotgun slug",
"proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
{
Expand Down
12 changes: 6 additions & 6 deletions data/json/items/classes/gun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": "base gun",
"symbol": "(",
"color": "light_gray",
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ]
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ]
},
{
"abstract": "flamethrower_base",
Expand All @@ -30,7 +30,7 @@
"modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ] ],
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "sights", 1 ], [ "sling", 1 ] ],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ]
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
},
{
"abstract": "pistol_base",
Expand Down Expand Up @@ -81,7 +81,7 @@
"proportional": { "reload": 0.7 },
"extend": { "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ] },
"//": "Revolvers exclude the muzzle location preventing installation of suppressors",
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
Expand All @@ -102,7 +102,7 @@
"reload": 150,
"extend": { "flags": [ "RELOAD_ONE", "NO_UNLOAD" ] },
"//": "Slower reloads, no unloading. Base, unskilled person should take 1.5 seconds per chamber. No underbarrel mods, that's where the ram goes.",
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
Expand Down Expand Up @@ -142,7 +142,7 @@
"name": "rifle with manual actions",
"name_plural": "rifles with manual actions",
"//": "Manual actions exclude the magazine location preventing installation of belt-feed adaptors",
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
Expand Down Expand Up @@ -199,7 +199,7 @@
"name": "pump action shotgun",
"reload_noise": "chuk chuk.",
"flags": [ "RELOAD_ONE", "PUMP_ACTION" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ]
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
},
{
"abstract": "smg_base",
Expand Down
16 changes: 8 additions & 8 deletions data/json/items/gun/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazines": [ [ "22", [ "a180mag" ] ] ]
},
{
Expand Down Expand Up @@ -76,7 +76,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_ONE" ]
},
{
Expand Down Expand Up @@ -109,7 +109,7 @@
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
},
{
Expand Down Expand Up @@ -147,7 +147,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down Expand Up @@ -184,7 +184,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazines": [ [ "22", [ "360_200_mag", "360_400_mag" ] ] ],
"flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ]
},
Expand Down Expand Up @@ -224,7 +224,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "22", [ "ruger1022mag", "ruger1022bigmag" ] ] ]
},
Expand Down Expand Up @@ -272,7 +272,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "22", [ "mosquitomag" ] ] ]
},
Expand Down Expand Up @@ -314,7 +314,7 @@
"dispersion": 600,
"durability": 5,
"min_cycle_recoil": 39,
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazines": [ [ "22", [ "j22mag" ] ] ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/gun/3006.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"magazine_well": 1,
"magazines": [ [ "3006", [ "blrmag" ] ] ]
},
Expand Down Expand Up @@ -72,7 +72,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "3006", [ "garandclip" ] ] ]
},
Expand Down Expand Up @@ -147,7 +147,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazines": [ [ "3006", [ "m1918mag", "m1918bigmag" ] ] ]
},
{
Expand Down Expand Up @@ -208,7 +208,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/308.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"reload": 400,
"valid_mod_locations": [ [ "brass catcher", 1 ], [ "sling", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ] ],
"modes": [ [ "DEFAULT", "low auto", 50 ], [ "AUTO", "high auto", 100 ] ],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"magazines": [ [ "308", [ "belt308" ] ] ],
"flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
},
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "32", [ "sigp230mag" ] ] ]
},
Expand Down Expand Up @@ -72,7 +72,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazines": [ [ "32", [ "skorpion61mag" ] ] ]
},
{
Expand Down Expand Up @@ -108,7 +108,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "32", [ "ppkmag" ] ] ]
},
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/gun/38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
[ "rail mount", 1 ],
[ "stock mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT" ]
},
{
Expand Down Expand Up @@ -62,7 +62,7 @@
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
},
{
Expand Down Expand Up @@ -99,7 +99,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down Expand Up @@ -202,7 +202,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "38", [ "taurus38mag" ] ] ]
}
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/gun/40.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "40", [ "glock40mag", "glock40bigmag" ] ] ]
},
Expand Down Expand Up @@ -72,7 +72,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down Expand Up @@ -108,7 +108,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "40", [ "sig40mag" ] ] ]
},
Expand Down Expand Up @@ -184,7 +184,7 @@
[ "underbarrel", 1 ],
[ "rail mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/44.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "44", [ "deaglemag" ] ] ]
},
Expand Down Expand Up @@ -106,7 +106,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_EJECT" ]
},
{
Expand Down
Loading