Updated to 2023-05-13-1541

3 files changed, 29 insertions, 43 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6230871..3a5d0bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202305131228
-_pkgver=2023-05-13-1228
+pkgver=202305131541
+_pkgver=2023-05-13-1541
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -147,7 +147,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=('309c81a1bfd45df958c1ec83475b5ea0528a78575d1d8a1862c65fae0aa573779340a8bf662b8dc18750a46d59d9abe7e0db5e96f6079253b3870b89418abbca'
+b2sums=('981169ad9cf589e31b05bf40fe5947d93276e77d68eb45b050fac00becb700de494c5450fed488f8123228699fe2a21c794d9f660e2fc911e12a03dd72895910'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -158,7 +158,7 @@ b2sums=('309c81a1bfd45df958c1ec83475b5ea0528a78575d1d8a1862c65fae0aa573779340a8b
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
         '8cb60c8d33e1dfdb0b5e4a6f8c5796b78ba3987ad879fd471953f36d7c1c49d10b9b30ab7361c4cb5489b43da9ae48cb5a85531c0f11ffe0ba663f33215a5e52'
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
-        '2e4ddf74604a1c816284d2d7b9e6e4494f4989406370edd454b8e080bf9a4d80e9974a5554a2da826003076b78715b3ea58e429b17ca4d71fd56996bae5eef03'
+        '07dca7e1c81f4eeb4c29f5489b9025f244c9500a336c4b6424b679bd0cee1567b8510ef0dc3e78d7df9263131f352eaa322daff42172d9cd12deb5d9e81883db'
         '1950d2cacc8697b3f0602f3eb232744fd0f7de4489b7747089abfa8784ec9e4433db4dcdf925d0bc37686ee14d607dcd5345e3db5b5b155a6208bde8b1706e23'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
@@ -169,7 +169,7 @@ b2sums=('309c81a1bfd45df958c1ec83475b5ea0528a78575d1d8a1862c65fae0aa573779340a8b
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         '2ebc9d61438ef1439a3dcfae7e56f2f4cb1d4410faadd2e018359b6c4711abdcd474f2eeb2d23e531a523caea19ec40d820b60c0b8cdaf04223ca9eed1119ec7'
-        'bf027ddc3fda6067cdd770f330987def83957ffe975ab36ad046558bf46e32a645b04f85efc57e1d337158e0afa297fd0c493e091e8d2e5e31d2f31ed5237c9e'
+        '3ac6e8027230400c1e86466b2143ab1bde4455a8381862a6e6d35c5deefee3369021312a3e070bbc5978bdf78fee691096bad3084e4303d3ffa642d14fbdb2f6'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
@@ -273,7 +273,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-05-13-1228"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-05-13-1541"|' Makefile
 
 
   # # # Hotfixes
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
index 5ca1d91..fdface4 100644
--- a/ammo-10_ammo-order-fix.patch
+++ b/ammo-10_ammo-order-fix.patch
@@ -1,6 +1,6 @@
 --- a/data/json/items/ammo/20x66mm.json
 +++ b/data/json/items/ammo/20x66mm.json
-@@ -1,7 +1,40 @@
+@@ -1,7 +1,38 @@
  [
    {
 +    "abstract": "20x66_shot_abstract",
@@ -31,9 +31,7 @@
 +    "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 } ]
++    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded."
 +  },
 +  {
      "id": "20x66_beanbag",
@@ -101,7 +99,7 @@
      "id": "20x66_frag",
      "copy-from": "20x66_slug",
      "type": "AMMO",
-@@ -110,52 +156,5 @@
+@@ -110,50 +156,5 @@
      "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
      "count": 10,
      "extend": { "effects": [ "INCENDIARY" ] }
@@ -135,9 +133,7 @@
 -    "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 } ]
+-    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded."
 -  },
 -  {
 -    "id": "20x66_slug",
@@ -449,8 +445,7 @@
      "abstract": "shot_abstract",
      "type": "AMMO",
      "name": { "str": "00 shot" },
-@@ -76,20 +32,6 @@
-     "shape": [ "cone", { "half_angle": 10, "length": 12 } ]
+@@ -76,19 +32,5 @@
    },
    {
 -    "id": "shot_beanbag",
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index 1aa877b..c7c7940 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -123,7 +123,7 @@ index 530278fd5d8..352b67d154c 100644
      "description": "A low velocity 40x46mm HEDP grenade.  It can penetrate 2 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
      "weight": "230 g",
      "damage": { "damage_type": "bullet", "amount": 200, "armor_penetration": 30 },
-@@ -44,12 +44,12 @@
+@@ -44,11 +44,11 @@
      "id": "40x46mm_m576",
      "copy-from": "40x46mm_grenade",
      "type": "AMMO",
@@ -131,8 +131,7 @@ index 530278fd5d8..352b67d154c 100644
 +    "name": { "str": "40x46mm M576 buckshot" },
      "description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
      "weight": "120 g",
-     "range": 0,
-     "shape": [ "cone", { "half_angle": 15, "length": 12 } ],
+     "range": 12,
 -    "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 4 },
 +    "damage": { "damage_type": "bullet", "amount": 120 },
      "recoil": 1000,
@@ -147,7 +146,7 @@ index 530278fd5d8..352b67d154c 100644
      "description": "A low velocity 40mm tear gas canister.  It is effective for riot control and driving infantry from entrenched positions",
      "weight": "290 g",
      "damage": { "damage_type": "bullet", "amount": 15 },
-@@ -69,38 +69,26 @@
+@@ -69,37 +69,25 @@
      "id": "40x46mm_buckshot_m118",
      "copy-from": "40x46mm_grenade",
      "type": "AMMO",
@@ -156,8 +155,7 @@ index 530278fd5d8..352b67d154c 100644
 +    "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": 0,
-     "shape": [ "cone", { "half_angle": 15, "length": 12 } ],
+     "range": 10,
 -    "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 4 },
 +    "damage": { "damage_type": "bullet", "amount": 120 },
      "recoil": 1000,
@@ -209,7 +207,7 @@ index 530278fd5d8..352b67d154c 100644
      "recoil": 1000,
      "casing": "40x46mm_m199_casing"
    },
-@@ -119,12 +108,13 @@
+@@ -119,11 +108,12 @@
      "id": "40x46mm_flechette_m118",
      "copy-from": "40x46mm_grenade",
      "type": "AMMO",
@@ -218,15 +216,14 @@ index 530278fd5d8..352b67d154c 100644
 +    "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": 0,
-     "shape": [ "cone", { "half_angle": 15, "length": 12 } ],
+     "range": 10,
 -    "damage": { "damage_type": "bullet", "amount": 75, "armor_penetration": 6 },
 +    "//": "Balanced as AP.",
 +    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
      "recoil": 1000,
      "casing": "40x46mm_m118_casing",
      "extend": { "effects": [ "SHOT" ] }
-@@ -132,12 +122,13 @@
+@@ -132,11 +122,12 @@
      "id": "40x46mm_flechette_m199",
      "copy-from": "40x46mm_grenade",
      "type": "AMMO",
@@ -235,8 +232,7 @@ index 530278fd5d8..352b67d154c 100644
 +    "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": 0,
-     "shape": [ "cone", { "half_angle": 15, "length": 12 } ],
+     "range": 10,
 -    "damage": { "damage_type": "bullet", "amount": 75, "armor_penetration": 6 },
 +    "//": "Balanced as AP.",
 +    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
@@ -247,7 +243,7 @@ diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.js
 index 4541de0dab2..aeb0d2e732e 100644
 --- a/data/json/items/ammo/40x53mm.json
 +++ b/data/json/items/ammo/40x53mm.json
-@@ -22,12 +22,13 @@
+@@ -22,11 +22,12 @@
      "id": "40x53mm_m1001",
      "copy-from": "40x53mm_grenade",
      "type": "AMMO",
@@ -256,8 +252,7 @@ index 4541de0dab2..aeb0d2e732e 100644
      "description": "40x53mm canister shot loaded with 17 grain flechettes.",
      "weight": "340 g",
 +    "//": "Balanced as AP.",
-     "range": 0,
-     "shape": [ "cone", { "half_angle": 15, "length": 10 } ],
+     "range": 10,
 -    "damage": { "damage_type": "bullet", "amount": 150, "armor_penetration": 10 },
 +    "damage": { "damage_type": "bullet", "amount": 91, "armor_penetration": 78 },
      "recoil": 1000,
@@ -271,7 +266,7 @@ index 4541de0dab2..aeb0d2e732e 100644
 +    "name": { "str": "40x53mm M430A1 HEDP" },
      "description": "A high velocity 40x53mm HEDP grenade.  It can penetrate 3 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
      "weight": "340 g",
-@@ -47,12 +48,12 @@
+@@ -47,11 +48,11 @@
      "id": "40x53mm_buckshot_m169",
      "copy-from": "40x53mm_grenade",
      "type": "AMMO",
@@ -279,8 +274,7 @@ index 4541de0dab2..aeb0d2e732e 100644
 +    "name": { "str": "improvised 40x53mm buckshot" },
      "description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
      "weight": "340 g",
-     "range": 0,
-     "shape": [ "cone", { "half_angle": 15, "length": 10 } ],
+     "range": 10,
 -    "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 4 },
 +    "damage": { "damage_type": "bullet", "amount": 130 },
      "recoil": 1200,
@@ -408,11 +402,10 @@ index f7fc54e73da..c51ab370e4a 100644
      "dispersion": 90,
      "recoil": 1500,
      "loudness": 70,
-@@ -37,8 +38,8 @@
+@@ -37,7 +38,7 @@
      "stack_size": 10,
      "ammo_type": "flintlock",
-     "range": 0,
-     "shape": [ "cone", { "half_angle": 10, "length": 12 } ],
+     "range": 4,
 -    "damage": { "damage_type": "bullet", "amount": 45 },
 +    "damage": { "damage_type": "bullet", "amount": 63 },
      "dispersion": 20,
@@ -527,25 +520,23 @@ index 1d6da22013b..937239328dd 100644
      "range": 12,
      "dispersion": 60,
      "recoil": 840,
-@@ -33,8 +34,8 @@
+@@ -33,7 +34,7 @@
      "weight": "2 g",
      "bashing": 1,
      "ammo_type": "blunderbuss",
 -    "damage": { "damage_type": "bullet", "amount": 60 },
 +    "damage": { "damage_type": "bullet", "amount": 55, "armor_multiplier": 1.5 },
-     "range": 0,
-     "shape": [ "cone", { "half_angle": 18, "length": 10 } ],
+     "range": 6,
      "recoil": 780,
      "effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
-@@ -52,8 +53,9 @@
+@@ -52,7 +53,8 @@
      "weight": "3 g",
      "bashing": 1,
      "ammo_type": "blunderbuss",
 -    "damage": { "damage_type": "bullet", "amount": 53, "armor_penetration": 12 },
 +    "//": "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": 0,
-     "shape": [ "cone", { "half_angle": 10, "length": 12 } ],
+     "range": 10,
      "recoil": 840,
      "effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
 diff --git a/data/json/items/migration.json b/data/json/items/migration.json