Updated to 2022-02-22-1022

Removed obsolete missing-ammo-frag-effects patch

2 files changed, 7 insertions, 34 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 93e4109..cb82e8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202202192349
-_pkgver=2022-02-19-2349
-pkgrel=2
+pkgver=202202221022
+_pkgver=2022-02-22-1022
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -39,7 +39,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
-        "ammo-04_fix-missing-ammo-frag-effects.patch"
         "ammo-05_22-casings-can-stack.patch"
         "ammo-10_ammo-order-fix.patch"
 
@@ -120,7 +119,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('12f8b5dac86c42ca1207e854dd1682d7c617dfbd6e50d19eb47807a7ae062f757edfbfa5ff71c927861a94c7a4cf692f4bdb79044b537ba4799378abbed25081'
+b2sums=('56676b3f0e8d849424df0be88dd5818e8f050c2eff28d7a283b98b3582857be2c2bfdba7ad74082c09fbf816a0765b063b4dec06e9e64b43e99534c96af08bef'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -131,7 +130,6 @@ b2sums=('12f8b5dac86c42ca1207e854dd1682d7c617dfbd6e50d19eb47807a7ae062f757edfbfa
         '88668ebe3c1f66da6515043c799872082fdc7ddd85c31a1713e5753caa6ed862c047a910af80fa4f5717f0b921a863c7de24b1985a9a8242d129ca14f120a988'
         '0b782de320b3e459380cd618d5db2f3998a6dae879a84a3e4c58b1c61ecb1109f7a63485c2d6c77682eb62ba4a4aa4763a1f25eadde52486f1ce481acbf02504'
         '3fb051162e4dfc5aca3d4f41ebea18ac85d661f0ebba056a807a2a6ecf34ca117a11aeb286790f5ea6f9c6528d6b6981076da405ea0992ce8870bbe6951bdc2d'
-        '040363cea9b3492f8a0f8daba44c179c871ba691dea688c15f3ad6994f78d530b4f74b283b9c64e4f5a2b1268805e60d4ea154d3dc8246200c50907054f5b5ef'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         '22b06ee2014dac33808ba9c32269eeb8a58b36f8ecfb651fcea859d231272838e63328e8938d130afcdb9670341d1dd34f997f36ad7be3c7bd7a178533f43702'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
@@ -185,9 +183,9 @@ b2sums=('12f8b5dac86c42ca1207e854dd1682d7c617dfbd6e50d19eb47807a7ae062f757edfbfa
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         '1de3fed057adb6c0d41c97bbb5af2b753147ea8f8ac7023759684054aead266100dc8c8e0cc261c7a5cf922e4194e8cabaf626fb5f7974c6036edc64f25cc8f9'
-        '41c36f0ccbf382feb7091c07d6195642e93622dcaadb779f05a1b87f08b607538370cda3946b6b6cc3e699035aa918c347d6874e0e4923af761ca772060c4d9e'
+        'a920a8ef9f2a99e421b8e72a3c7c4964f63dcd88da6f1cfa6f1d175fa3ac910338705709937341a0e20ad7da806466dee9f79ac60dbad3a5ae55a1874ec610d1'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
-        '478dcbaf71c7d2a4245f55f232525be1fdfc6d7f1c339777a9ba6df2606551c3c011ca5686ec0864db8a17874efb9731b52a645b5c0b7d4ae7ac36e34932f735'
+        'ec8f713c6fae84f6659f76d4edc0f237766329080e33e65a5affc5d0c37cc7906b0daaaa1f275d89c8ddacb5db0ee16b69222956c9f2c402ce44b55aa040ead0'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
@@ -205,7 +203,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-02-19-2349|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-02-22-1022|' Makefile
 
 
   # # # Hotfixes
@@ -244,9 +242,6 @@ prepare() {
   # The id and description make it pretty clear that reloaded_50bmg is not supposed to be based on Match rounds.
   patch -Np1 -i "$srcdir"/ammo-03_fix-reloaded-50bmg.patch
 
-  # Replace several ammo fragmentation and explosive effects that are missing in BN with other ones.
-  patch -Np1 -i "$srcdir"/ammo-04_fix-missing-ammo-frag-effects.patch
-
   # Fix .22 casings not stacking when every other casing stacks.
   patch -Np1 -i "$srcdir"/ammo-05_22-casings-can-stack.patch
 
diff --git a/ammo-04_fix-missing-ammo-frag-effects.patch b/ammo-04_fix-missing-ammo-frag-effects.patch
deleted file mode 100644
index 6bb1c78..0000000
--- a/ammo-04_fix-missing-ammo-frag-effects.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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