From 62801045a89d470d17b54a9f165011e2a5eef7e8 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sun, 22 Oct 2023 18:20:58 -0600 Subject: [PATCH] Misc gun damage fix (#68815) * Update 44.json * Update 4570.json * Update 45colt.json * Update shot.json * Update 762.json * Update shot.json --- data/json/items/gun/44.json | 2 +- data/json/items/gun/4570.json | 3 ++- data/json/items/gun/45colt.json | 2 +- data/json/items/gun/762.json | 4 ++-- data/json/items/gun/shot.json | 2 -- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 47e935afef334..ad9440e6333b0 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -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, diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json index f791fd7f82527..27a97e4100a48 100644 --- a/data/json/items/gun/4570.json +++ b/data/json/items/gun/4570.json @@ -16,6 +16,7 @@ "symbol": "(", "color": "light_blue", "ammo": [ "4570" ], + "ranged_damage": { "damage_type": "bullet", "amount": 3 }, "dispersion": 200, "durability": 8, "clip_size": 6, @@ -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, diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index 7c3c02927a7e1..30de76a632e39 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -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, diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index 3a91ea2823b95..1cd2678310d3e 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -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, @@ -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": [ diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 129864c45fcab..c069836a9dbae 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -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 ], @@ -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,