Enable AoE cone for shotgun-like shot ammo (cataclysmbnteam#2619)

* Enable aoe Enable aoe * remove range from dragon breath since it is socered by cone remove range from dragon breath since it is socered by cone * 20x66 20x66 * other ammo other ammo * fix: mark `20x66_shot_abstract` as `abstract` * feat: give aoe cone for blunderbuss ammo --------- Co-authored-by: Александр Мочалов <[email protected]> Co-authored-by: scarf <[email protected]>
Coolthulhu · May 2, 2023 · 6e95633 · 6e95633
1 parent 063e893
commit 6e95633
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 25 deletions.
diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
@@ -45,7 +45,7 @@
   },
   {
     "id": "20x66_exp",
-    "copy-from": "20x66_shot",
+    "copy-from": "20x66_shot_abstract",
     "type": "AMMO",
     "name": { "str": "20x66mm explosive" },
     "description": "20x66mm caseless shotgun rounds, explosive projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
@@ -59,7 +59,7 @@
   },
   {
     "id": "20x66_flare",
-    "copy-from": "20x66_shot",
+    "copy-from": "20x66_shot_abstract",
     "type": "AMMO",
     "name": { "str": "20x66mm flare" },
     "description": "20x66mm caseless shotgun rounds, signal flare type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
@@ -113,7 +113,7 @@
     "extend": { "effects": [ "INCENDIARY" ] }
   },
   {
-    "id": "20x66_shot",
+    "abstract": "20x66_shot_abstract",
     "type": "AMMO",
     "name": { "str": "20x66mm buckshot" },
     "//": "2.5x the Generic Rate of $1/shot",
@@ -134,9 +134,19 @@
     "recoil": 2500,
     "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
   },
+  {
+    "id": "20x66_shot",
+    "copy-from": "20x66_shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "20x66mm buckshot" },
+    "//": "2.5x the Generic Rate of $1/shot",
+    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 12 } ]
+  },
   {
     "id": "20x66_slug",
-    "copy-from": "20x66_shot",
+    "copy-from": "20x66_shot_abstract",
     "type": "AMMO",
     "name": { "str": "20x66mm slug" },
     "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",

diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json
@@ -43,7 +43,8 @@
     "count": 100,
     "price_postapoc": 400,
     "dispersion": 0,
-    "relative": { "range": -9 },
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "proportional": { "recoil": 0.334 },
     "extend": { "effects": [ "SHOT", "NOGIB" ] }
   },

diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
@@ -48,7 +48,8 @@
     "name": { "str": "40x46mm M576 buckshot" },
     "description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
     "weight": "120 g",
-    "range": 12,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 12 } ],
     "damage": { "damage_type": "bullet", "amount": 120 },
     "recoil": 1000,
     "casing": "40x46mm_m199_casing",
@@ -73,7 +74,8 @@
     "name": { "str": "improvised 40x46mm buckshot" },
     "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,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 12 } ],
     "damage": { "damage_type": "bullet", "amount": 120 },
     "recoil": 1000,
     "casing": "40x46mm_m118_casing",
@@ -112,7 +114,8 @@
     "name": { "str": "improvised 40x46mm flechette" },
     "description": "An improvised 40x46mm flechette load containing 70 steel darts.  Aside from using the M118 casing normally used by HEDP shells, it performs as well as flechette shells using the M199 casing.",
     "weight": "120 g",
-    "range": 10,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 12 } ],
     "//": "Balanced as AP.",
     "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
     "recoil": 1000,
@@ -126,7 +129,8 @@
     "name": { "str": "improvised 40x46mm flechette" },
     "description": "An improvised 40x46mm flechette load containing 70 steel darts, loaded into the M199 casing used by M576 buckshot shells.",
     "weight": "120 g",
-    "range": 10,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 12 } ],
     "//": "Balanced as AP.",
     "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
     "recoil": 1000,

diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
@@ -27,6 +27,8 @@
     "description": "40x53mm canister shot loaded with 17 grain flechettes.",
     "weight": "340 g",
     "//": "Balanced as AP.",
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 10 } ],
     "damage": { "damage_type": "bullet", "amount": 91, "armor_penetration": 78 },
     "recoil": 1000,
     "casing": "40x53mm_m169_casing",
@@ -50,7 +52,8 @@
     "name": { "str": "improvised 40x53mm buckshot" },
     "description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
     "weight": "340 g",
-    "range": 10,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 10 } ],
     "damage": { "damage_type": "bullet", "amount": 130 },
     "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,8 @@
     "stack_size": 20,
     "ammo_type": "410shot",
     "casing": "410shot_hull",
-    "range": 12,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 10, "length": 12 } ],
     "damage": { "damage_type": "bullet", "amount": 30 },
     "recoil": 1350,
     "loudness": 90,

diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json
@@ -37,7 +37,8 @@
     "count": 30,
     "stack_size": 10,
     "ammo_type": "flintlock",
-    "range": 4,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 10, "length": 12 } ],
     "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
@@ -44,7 +44,7 @@
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
-    "id": "shot_00",
+    "abstract": "shot_abstract",
     "type": "AMMO",
     "name": { "str": "00 shot" },
     "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces.",
@@ -66,6 +66,15 @@
     "loudness": 160,
     "effects": [ "COOKOFF", "SHOT" ]
   },
+  {
+    "id": "shot_00",
+    "copy-from": "shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "00 shot" },
+    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces.",
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 10, "length": 12 } ]
+  },
   {
     "id": "shot_beanbag",
     "copy-from": "shot_00",
@@ -105,7 +114,9 @@
     "price_postapoc": 1600,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "damage": { "damage_type": "heat", "amount": 10 },
-    "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2, "range": 0.5 },
+    "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
   },
   {
@@ -156,7 +167,7 @@
   },
   {
     "id": "shot_slug",
-    "copy-from": "shot_00",
+    "copy-from": "shot_abstract",
     "type": "AMMO",
     "name": { "str": "shotgun slug" },
     "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle.  Extremely damaging but rather inaccurate.",

diff --git a/data/json/items/ammo/shotpaper.json b/data/json/items/ammo/shotpaper.json
@@ -15,15 +15,26 @@
     "type": "AMMO",
     "name": { "str": "pyrotechnic paper 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,
-      "range": 0.5
-    },
+    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.2 }, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
   },
+  {
+    "abstract": "shot_paper_abstract",
+    "copy-from": "shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "buckshot paper cartridge" },
+    "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of 00 buckshot.",
+    "weight": "26 g",
+    "volume": "250 ml",
+    "material": [ "paper", "powder", "lead" ],
+    "color": "white",
+    "ammo_type": "shotpaper",
+    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.8 }, "recoil": 0.8, "loudness": 0.8 },
+    "extend": { "effects": [ "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "casing": "shot_hull" }
+  },
   {
     "id": "shot_paper_00",
     "copy-from": "bp_shot_00",
@@ -40,7 +51,7 @@
   },
   {
     "id": "shot_paper_slug",
-    "copy-from": "shot_paper_00",
+    "copy-from": "shot_paper_abstract",
     "type": "AMMO",
     "name": { "str": ".62 paper cartridge" },
     "description": "A paper cartridge containing a premeasured amount of black powder and a .605 inch lead ball.",

diff --git a/data/json/items/handloaded_bullets.json b/data/json/items/handloaded_bullets.json
@@ -35,7 +35,9 @@
     "bashing": 1,
     "ammo_type": "blunderbuss",
     "damage": { "damage_type": "bullet", "amount": 55, "armor_multiplier": 1.5 },
-    "range": 6,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 18, "length": 10 } ],
+    "dispersion": 1000,
     "recoil": 780,
     "effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
   },
@@ -55,7 +57,9 @@
     "ammo_type": "blunderbuss",
     "//": "Balanced as standard FMJ to allow lower damage but more penetration over shot.",
     "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 24, "armor_multiplier": 1.5 },
-    "range": 10,
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 10, "length": 12 } ],
+    "dispersion": 1000,
     "recoil": 840,
     "effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
   }