From 7ce209ce6fdcb8fe577ec0224a518ef65840a9ae Mon Sep 17 00:00:00 2001
From: Pandora <ohinchy@gmail.com>
Date: Sun, 10 Sep 2023 06:43:50 -0400
Subject: [PATCH] Rebalanced shotgun shells

Shotgun shells were fairly underpowered, doing barely any more damage than a 9mm round and with even less range. I decided to rebalance that, making shotguns able to hit much harder and much further, serving as a genuinely good option. I also greatly increased the dispersion and reduced the range of the feral biker's shotgun to compensate for this.
---
 data/json/items/ammo/shot.json       | 20 ++++++++++----------
 data/json/items/gun/monster_gun.json |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json
index 6282520ffe47..800c786f19b7 100644
--- a/data/json/items/ammo/shot.json
+++ b/data/json/items/ammo/shot.json
@@ -60,8 +60,8 @@
     "stack_size": 20,
     "ammo_type": "shot",
     "casing": "shot_hull",
-    "range": 12,
-    "damage": { "damage_type": "bullet", "amount": 50 },
+    "range": 20,
+    "damage": { "damage_type": "bullet", "amount": 100, "armor_multiplier": 2.0 },
     "recoil": 2500,
     "loudness": 160,
     "effects": [ "COOKOFF", "SHOT" ]
@@ -96,10 +96,10 @@
     "price": 100,
     "price_postapoc": 400,
     "range": 0,
-    "damage": { "damage_type": "bullet", "amount": 20, "armor_multiplier": 2.0 },
+    "damage": { "damage_type": "bullet", "amount": 100, "armor_multiplier": 3.0 },
     "dispersion": 1000,
     "loudness": 80,
-    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
+    "shape": [ "cone", { "half_angle": 15, "length": 15 } ],
     "extend": { "effects": [ "NOGIB" ] }
   },
   {
@@ -111,10 +111,10 @@
     "price": 1000,
     "price_postapoc": 1600,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "damage": { "damage_type": "heat", "amount": 10 },
+    "damage": { "damage_type": "heat", "amount": 30 },
     "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
     "range": 0,
-    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
+    "shape": [ "cone", { "half_angle": 15, "length": 15 } ],
     "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
   },
   {
@@ -128,7 +128,7 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "//": "Balanced as standard AP.",
-    "relative": { "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 30 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": -30, "armor_penetration": 30, "armor_multiplier": -1.0 } }
   },
   {
     "id": "shot_he",
@@ -141,7 +141,7 @@
     "price_postapoc": 1600,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 5,
-    "damage": { "damage_type": "bullet", "amount": 10, "armor_penetration": 0 },
+    "damage": { "damage_type": "bullet", "amount": 30, "armor_penetration": 0 },
     "extend": { "effects": [ "EXPLOSIVE" ] }
   },
   {
@@ -172,9 +172,9 @@
     "price": 400,
     "price_postapoc": 400,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "dispersion": 100,
+    "dispersion": 80,
     "//": "Balanced as FMJ",
-    "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 18 } },
+    "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -1.0 } },
     "proportional": { "recoil": 1.4 },
     "delete": { "effects": [ "SHOT" ] }
   }
diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index 67ca08407369..8772f71aa5fc 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -78,8 +78,8 @@
     "weight": "3402 g",
     "volume": "2450 ml",
     "bashing": 3,
-    "dispersion": 3250,
-    "range": 65,
+    "dispersion": 6500,
+    "range": 30,
     "durability": 9
   },
   {