feat(balance): implement armor_multiplier for several shotgun-type …

…items lacking it (cataclysmbnteam#6036)
Firestorm01X2 · Feb 2, 2025 · 70e9157 · 70e9157
1 parent ef10251
commit 70e9157
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
@@ -51,7 +51,7 @@
     "price": "100 USD",
     "price_postapoc": "80 USD",
     "range": 20,
-    "damage": { "damage_type": "bullet", "amount": 16, "armor_penetration": 4 },
+    "damage": { "damage_type": "bullet", "amount": 16, "armor_penetration": 4, "armor_multiplier": 1.5 },
     "dispersion": 120,
     "effects": [ "COOKOFF", "EXPLOSIVE_TINY", "NEVER_MISFIRES" ]
   },
@@ -81,7 +81,7 @@
     "price_postapoc": "40 USD",
     "count": 10,
     "//": "Balanced as AP.",
-    "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36, "armor_multiplier": -1 } }
   },
   {
     "id": "20x66_frag",
@@ -123,7 +123,7 @@
     "stack_size": 20,
     "ammo_type": "20x66mm",
     "range": 20,
-    "damage": { "damage_type": "bullet", "amount": 100 },
+    "damage": { "damage_type": "bullet", "amount": 100, "armor_multiplier": 2 },
     "recoil": 2500,
     "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
   },
@@ -144,7 +144,7 @@
     "price": "15 USD",
     "price_postapoc": "40 USD",
     "//": "Balanced as FMJ",
-    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
+    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21, "armor_multiplier": 1.5 },
     "relative": { "range": 20 },
     "proportional": { "dispersion": 1.3 },
     "delete": { "effects": [ "SHOT" ] }

diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json
@@ -45,6 +45,7 @@
     "range": 0,
     "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "proportional": { "recoil": 0.334 },
+    "relative": { "damage": { "damage_type": "bullet", "armor_multiplier": 2 } },
     "extend": { "effects": [ "SHOT", "NOGIB" ] }
   },
   {

diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
@@ -52,7 +52,7 @@
     "description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
     "weight": "120 g",
     "range": 12,
-    "damage": { "damage_type": "bullet", "amount": 120 },
+    "damage": { "damage_type": "bullet", "amount": 120, "armor_multiplier": 2 },
     "recoil": 1000,
     "casing": "40x46mm_m199_casing",
     "extend": { "effects": [ "SHOT" ] }
@@ -78,7 +78,7 @@
     "description": "An improvised 40x46mm buckshot load somewhat resembling M576.  Aside from using the M118 casing normally used by HEDP shells, it performs as well as buckshot loads using the intended M199 casing.",
     "weight": "120 g",
     "range": 10,
-    "damage": { "damage_type": "bullet", "amount": 120 },
+    "damage": { "damage_type": "bullet", "amount": 120, "armor_multiplier": 2 },
     "recoil": 1000,
     "casing": "40x46mm_m118_casing",
     "extend": { "effects": [ "SHOT" ] }
@@ -92,7 +92,7 @@
     "weight": "120 g",
     "range": 10,
     "//": "Balanced as FMJ.",
-    "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42 },
+    "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42, "armor_multiplier": 1.5 },
     "recoil": 1000,
     "casing": "40x46mm_m118_casing"
   },
@@ -105,7 +105,7 @@
     "weight": "120 g",
     "range": 10,
     "//": "Balanced as FMJ.",
-    "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42 },
+    "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42, "armor_multiplier": 1.5 },
     "recoil": 1000,
     "casing": "40x46mm_m199_casing"
   },

diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
@@ -53,7 +53,7 @@
     "description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
     "weight": "340 g",
     "range": 10,
-    "damage": { "damage_type": "bullet", "amount": 130 },
+    "damage": { "damage_type": "bullet", "amount": 130, "armor_multiplier": 2 },
     "recoil": 1200,
     "casing": "40x53mm_m169_casing",
     "extend": { "effects": [ "SHOT" ] }
@@ -67,7 +67,7 @@
     "weight": "340 g",
     "range": 10,
     "//": "Balanced as FMJ.",
-    "damage": { "damage_type": "bullet", "amount": 104, "armor_penetration": 46 },
+    "damage": { "damage_type": "bullet", "amount": 104, "armor_penetration": 46, "armor_multiplier": 1.5 },
     "recoil": 1200,
     "casing": "40x53mm_m169_casing"
   }

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

diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json
@@ -38,7 +38,7 @@
     "stack_size": 10,
     "ammo_type": "flintlockshot",
     "range": 8,
-    "damage": { "damage_type": "bullet", "amount": 63 },
+    "damage": { "damage_type": "bullet", "amount": 60, "armor_multiplier": 2 },
     "dispersion": 20,
     "recoil": 1500,
     "loudness": 90,

diff --git a/data/json/items/ammo/shotcanister.json b/data/json/items/ammo/shotcanister.json
@@ -16,7 +16,7 @@
     "ammo_type": "shotcanister",
     "looks_like": "shot_scrap",
     "range": 1,
-    "damage": { "damage_type": "bullet", "amount": 10 },
+    "damage": { "damage_type": "bullet", "amount": 10, "armor_multiplier": 3 },
     "dispersion": 250,
     "loudness": 0,
     "count": 10
@@ -38,7 +38,7 @@
     "ammo_type": "shotcanister",
     "looks_like": "shot_scrap",
     "range": 2,
-    "damage": { "damage_type": "bullet", "amount": 7, "armor_penetration": 1 },
+    "damage": { "damage_type": "bullet", "amount": 7, "armor_penetration": 1, "armor_multiplier": 2.5 },
     "dispersion": 80,
     "loudness": 0,
     "count": 10
@@ -60,7 +60,7 @@
     "ammo_type": "shotcanister",
     "looks_like": "shot_scrap",
     "range": 3,
-    "damage": { "damage_type": "bullet", "amount": 13, "armor_penetration": 7 },
+    "damage": { "damage_type": "bullet", "amount": 13, "armor_penetration": 7, "armor_multiplier": 1.5 },
     "dispersion": 50,
     "loudness": 0,
     "count": 10
@@ -82,7 +82,7 @@
     "ammo_type": "shotcanister",
     "looks_like": "shot_scrap",
     "range": 2,
-    "damage": { "damage_type": "bullet", "amount": 12, "armor_penetration": 2 },
+    "damage": { "damage_type": "bullet", "amount": 12, "armor_penetration": 2, "armor_multiplier": 2 },
     "dispersion": 100,
     "loudness": 0,
     "count": 10

diff --git a/data/json/items/handloaded_bullets.json b/data/json/items/handloaded_bullets.json
@@ -14,7 +14,7 @@
     "bashing": 1,
     "ammo_type": "blunderbuss",
     "//": "Half the expected armor pernetration, additionally all blinderbuss rounds have an armor multiplier.",
-    "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 12, "armor_multiplier": 2.5 },
+    "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 12, "armor_multiplier": 2 },
     "range": 12,
     "dispersion": 60,
     "recoil": 840,
@@ -34,7 +34,7 @@
     "weight": "2 g",
     "bashing": 1,
     "ammo_type": "blunderbuss",
-    "damage": { "damage_type": "bullet", "amount": 55, "armor_multiplier": 1.5 },
+    "damage": { "damage_type": "bullet", "amount": 55, "armor_multiplier": 3 },
     "range": 6,
     "dispersion": 1000,
     "recoil": 780,