From 6eac7f0521eb884081d2c1226a5800fec3c550cd Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 2 Oct 2023 23:14:39 -0700
Subject: Updates to shot and shotpaper.

---
 json/items/ammo/shot.json      | 6 ++++--
 json/items/ammo/shotpaper.json | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'json/items')

diff --git a/json/items/ammo/shot.json b/json/items/ammo/shot.json
index 2a4b718..a3c078c 100644
--- a/json/items/ammo/shot.json
+++ b/json/items/ammo/shot.json
@@ -12,6 +12,7 @@
     "material": [ "plastic", "powder" ],
     "symbol": "=",
     "color": "red",
+    "dispersion": 10,
     "count": 20,
     "stack_size": 20,
     "ammo_type": "shot",
@@ -39,7 +40,6 @@
     "price_postapoc": 400,
     "range": 0,
     "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
-    "dispersion": 1000,
     "loudness": 80,
     "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "extend": { "effects": [ "NOGIB" ] }
@@ -154,6 +154,7 @@
     "copy-from": "shot_00",
     "type": "AMMO",
     "name": { "str": "00 shot, black powder" },
+    "proportional": { "price": 0.6, "damage": { "damage_type": "heat", "amount": 0.8 }, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -209,7 +210,8 @@
     "type": "AMMO",
     "name": { "str": "00 shot, scrap loaded" },
     "description": "A shotgun shell filled with whatever was lying around.  They are more damaging than birdshot, but fairly inaccurate.",
-    "proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.6 }, "dispersion": 1.2 },
+    "dispersion": 60,
+    "proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.75, "armor_multiplier": 1.25 } },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
diff --git a/json/items/ammo/shotpaper.json b/json/items/ammo/shotpaper.json
index e11bc94..e12d272 100644
--- a/json/items/ammo/shotpaper.json
+++ b/json/items/ammo/shotpaper.json
@@ -11,6 +11,7 @@
     "material": [ "paper", "powder", "lead" ],
     "symbol": "=",
     "color": "white",
+    "dispersion": 20,
     "count": 20,
     "stack_size": 20,
     "ammo_type": "shotpaper",
@@ -33,7 +34,7 @@
     "type": "AMMO",
     "name": { "str": "20ga paper birdshot" },
     "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of birdshot.  Used mostly for hunting small game or fowl.",
-    "damage": { "damage_type": "bullet", "amount": 40 },
+    "damage": { "damage_type": "bullet", "amount": 40, "armor_multiplier": 3.0 },
     "proportional": { "recoil": 0.6, "loudness": 0.8 },
     "extend": { "effects": [ "NOGIB" ] }
   },
@@ -43,7 +44,8 @@
     "type": "AMMO",
     "name": { "str": "20ga paper pyrotechnic cartridge" },
     "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of flammable metals.  When fired, burning chunks of metal and sparks will shoot out of the barrel, igniting everything in their path.",
-    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.2 }, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
+    "damage": { "damage_type": "heat", "amount": 24 },
+    "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
     "range": 0,
     "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
-- 
cgit v1.2.1