Skip to content

Commit

Permalink
Misc gun damage fix (#68815)
Browse files Browse the repository at this point in the history
* Update 44.json

* Update 4570.json

* Update 45colt.json

* Update shot.json

* Update 762.json

* Update shot.json
  • Loading branch information
Holli-Git authored Oct 23, 2023
1 parent aed22a9 commit 6280104
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion data/json/items/gun/44.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"color": "dark_gray",
"range": 7,
"ammo": [ "44" ],
"ranged_damage": { "damage_type": "bullet", "amount": 2 },
"ranged_damage": { "damage_type": "bullet", "amount": 10 },
"dispersion": 180,
"durability": 8,
"blackpowder_tolerance": 32,
Expand Down
3 changes: 2 additions & 1 deletion data/json/items/gun/4570.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"symbol": "(",
"color": "light_blue",
"ammo": [ "4570" ],
"ranged_damage": { "damage_type": "bullet", "amount": 3 },
"dispersion": 200,
"durability": 8,
"clip_size": 6,
Expand Down Expand Up @@ -88,7 +89,7 @@
"symbol": "(",
"ammo": [ "4570" ],
"skill": "rifle",
"ranged_damage": { "damage_type": "bullet", "amount": 4 },
"ranged_damage": { "damage_type": "bullet", "amount": 12 },
"dispersion": 100,
"durability": 8,
"clip_size": 1,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/45colt.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"color": "brown",
"range": 7,
"ammo": [ "45colt" ],
"ranged_damage": { "damage_type": "bullet", "amount": 5 },
"ranged_damage": { "damage_type": "bullet", "amount": 10 },
"dispersion": 180,
"durability": 7,
"clip_size": 14,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/762.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"material": [ "steel", "wood" ],
"color": "brown",
"ammo": [ "762" ],
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
"ranged_damage": { "damage_type": "bullet", "amount": 3 },
"dispersion": 90,
"durability": 8,
"min_cycle_recoil": 1832,
Expand Down Expand Up @@ -179,7 +179,7 @@
"color": "brown",
"ammo": [ "762" ],
"dispersion": 240,
"ranged_damage": { "damage_type": "bullet", "amount": -5 },
"ranged_damage": { "damage_type": "bullet", "amount": -10 },
"durability": 7,
"min_cycle_recoil": 1832,
"valid_mod_locations": [
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@
"barrel_volume": "505 ml",
"default_mods": [ "grip" ],
"built_in_mods": [ "wire_stock" ],
"modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "3 rd.", 3 ] ],
"valid_mod_locations": [
[ "barrel", 1 ],
[ "bore", 1 ],
Expand Down Expand Up @@ -732,7 +731,6 @@
"price_postapoc": 2250,
"to_hit": -1,
"material": [ "steel", "wood" ],
"ranged_damage": { "damage_type": "bullet", "amount": -2 },
"dispersion": 860,
"durability": 6,
"clip_size": 6,
Expand Down

0 comments on commit 6280104

Please sign in to comment.