From 0d7d3750ad337337a75d4f8a10a3039b36f2393d Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 2 Sep 2021 19:37:08 -0700
Subject: Add patch for explosive ammo lacking matching effects

---
 0027-fix-missing-ammo-frag-effects.patch | 22 ++++++++++++++++++++++
 PKGBUILD                                 |  7 ++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 0027-fix-missing-ammo-frag-effects.patch

diff --git a/0027-fix-missing-ammo-frag-effects.patch b/0027-fix-missing-ammo-frag-effects.patch
new file mode 100644
index 0000000..6bb1c78
--- /dev/null
+++ b/0027-fix-missing-ammo-frag-effects.patch
@@ -0,0 +1,22 @@
+--- a/json/items/ammo/shot.json
++++ b/data/json/items/ammo/shot.json
+@@ -172,7 +172,7 @@
+     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+     "count": 5,
+     "damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 0 },
+-    "extend": { "effects": [ "EXPLOSIVE_HESHOT" ] }
++    "extend": { "effects": [ "EXPLOSIVE_TINY" ] }
+   },
+   {
+     "id": "shot_scrap",
+--- a/data/json/items/ammo/50.json
++++ b/data/json/items/ammo/50.json
+@@ -61,7 +61,7 @@
+     "price_postapoc": 7500,
+     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+     "description": "This variant of the .50 BMG round makes the most of the caliber's potential payload delivery: the tip is loaded with an incendiary mix, which ignites on impact, detonating the RDX or PETN charge.  This also ignites a secondary zirconium powder incendiary charge that surrounds a tungsten carbide penetrator, both encased by a mild steel cup.  Fragments from the cup and burning metallic powder follow the penetrator through armored targets, increasing lethality.  These rare, complicated, and expensive rounds are not likely to be manufactured again; use them wisely.",
+-    "effects": [ "INCENDIARY", "EXPLOSIVE_RAUFOSS" ],
++    "effects": [ "INCENDIARY", "FRAG_SMALL" ],
+     "//": "mk 211 is estimated to be as effective as 20mm, which would have 65kJ energy, or 255 damage. ~181 damage is fair.",
+     "relative": { "damage": { "damage_type": "stab", "amount": 50, "armor_penetration": 20 } },
+     "dispersion": 100
diff --git a/PKGBUILD b/PKGBUILD
index e68e197..0269d5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202108271610
 _pkgver=2021-08-27-1610
-pkgrel=3
+pkgrel=4
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -58,6 +58,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "0023-fix-rubbersplosion.patch"
         "0024-ammo-order-fix.patch"
         "0026-fix-brioche-cooking-time.patch"
+        "0027-fix-missing-ammo-frag-effects.patch"
 
         "jc_ammo-loudness-ap-times-2.patch"
         "jc_allow-bio-firestarter-on-smoker.patch"
@@ -106,6 +107,7 @@ b2sums=('f4d9b3d26e3d33893fa918086ba538ae4de0874908b18474a7930fabe761711e9640684
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962'
         'c37cd997666836479a7a17a57c007ded373c03b10c59c68d594675a41a362cbff9d1b584581bff899d31221e8719cd51516904fa0f72ae343c6ea06ed4acc70d'
+        '040363cea9b3492f8a0f8daba44c179c871ba691dea688c15f3ad6994f78d530b4f74b283b9c64e4f5a2b1268805e60d4ea154d3dc8246200c50907054f5b5ef'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
@@ -223,6 +225,9 @@ prepare() {
   # Fix brioche bun missing a cooking time
   patch -Np1 -i "$srcdir"/0026-fix-brioche-cooking-time.patch
 
+  # Fix ammo fragmentation and explosive effects that are missing
+  patch -Np1 -i "$srcdir"/0027-fix-missing-ammo-frag-effects.patch
+
 
   # Various other fixes for bugs I came across that modify src
   # Fix ammo loudness mulitplying by six instead of two
-- 
cgit v1.2.1