Fixes for the balance fixes

Reduced 00 shot damage down to 80 and birdshot to 50, and reverted cone length for birdshot and dragon's breath back to 8. Also adjusted the range and damage of the 20x66mm shot to have more range and the .410 shot to have the same range as the 00 shot, and the damage of both now has the same ratio as it did before the previous buff. Paper birdshot was buffed to match the same previous damage ratio, and flintlock ammo was given a range buff as well. The shot had a range of 4 before now, wtf.
cataclysmbnteam · Sep 10, 2023 · 9427694 · 9427694
1 parent d70fe53
commit 9427694
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
@@ -67,7 +67,7 @@
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
-    "range": 20,
+    "range": 28,
     "damage": { "damage_type": "heat", "amount": 16 },
     "dispersion": 200,
     "recoil": 100,
@@ -129,8 +129,8 @@
     "count": 20,
     "stack_size": 20,
     "ammo_type": "20x66mm",
-    "range": 12,
-    "damage": { "damage_type": "bullet", "amount": 60 },
+    "range": 20,
+    "damage": { "damage_type": "bullet", "amount": 100 },
     "recoil": 2500,
     "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
   },
@@ -152,8 +152,8 @@
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "//": "Balanced as FMJ",
-    "damage": { "damage_type": "bullet", "amount": 48, "armor_penetration": 21 },
-    "relative": { "range": 12 },
+    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
+    "relative": { "range": 20 },
     "proportional": { "dispersion": 1.3 },
     "delete": { "effects": [ "SHOT" ] }
   }

diff --git a/data/json/items/ammo/410shot.json b/data/json/items/ammo/410shot.json
@@ -16,8 +16,8 @@
     "stack_size": 20,
     "ammo_type": "410shot",
     "casing": "410shot_hull",
-    "range": 12,
-    "damage": { "damage_type": "bullet", "amount": 30 },
+    "range": 20,
+    "damage": { "damage_type": "bullet", "amount": 53 },
     "recoil": 1350,
     "loudness": 90,
     "effects": [ "COOKOFF", "SHOT" ]

diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json
@@ -14,7 +14,7 @@
     "count": 30,
     "stack_size": 10,
     "ammo_type": "flintlock",
-    "range": 6,
+    "range": 12,
     "//": "Balanced as FMJ",
     "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 22 },
     "dispersion": 90,
@@ -37,7 +37,7 @@
     "count": 30,
     "stack_size": 10,
     "ammo_type": "flintlock",
-    "range": 4,
+    "range": 8,
     "damage": { "damage_type": "bullet", "amount": 63 },
     "dispersion": 20,
     "recoil": 1500,

diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json
@@ -61,7 +61,7 @@
     "ammo_type": "shot",
     "casing": "shot_hull",
     "range": 20,
-    "damage": { "damage_type": "bullet", "amount": 100, "armor_multiplier": 2.0 },
+    "damage": { "damage_type": "bullet", "amount": 80, "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": 100, "armor_multiplier": 3.0 },
+    "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
     "dispersion": 1000,
     "loudness": 80,
-    "shape": [ "cone", { "half_angle": 15, "length": 15 } ],
+    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "extend": { "effects": [ "NOGIB" ] }
   },
   {
@@ -114,7 +114,7 @@
     "damage": { "damage_type": "heat", "amount": 30 },
     "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
     "range": 0,
-    "shape": [ "cone", { "half_angle": 15, "length": 15 } ],
+    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
   },
   {
@@ -128,7 +128,7 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "//": "Balanced as standard AP.",
-    "relative": { "damage": { "damage_type": "bullet", "amount": -30, "armor_penetration": 30, "armor_multiplier": -1.0 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } }
   },
   {
     "id": "shot_he",
@@ -174,7 +174,7 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "dispersion": 80,
     "//": "Balanced as FMJ",
-    "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -1.0 } },
+    "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -0.5 } },
     "proportional": { "recoil": 1.4 },
     "delete": { "effects": [ "SHOT" ] }
   }

diff --git a/data/json/items/ammo/shotpaper.json b/data/json/items/ammo/shotpaper.json
@@ -5,7 +5,7 @@
     "type": "AMMO",
     "name": { "str": "birdshot paper cartridge" },
     "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": 10 },
+    "damage": { "damage_type": "bullet", "amount": 40 },
     "proportional": { "recoil": 0.6, "loudness": 0.8 },
     "extend": { "effects": [ "NOGIB" ] }
   },