Updated to 2023-04-15-1344

4 files changed, 15 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 42af283..e8a2d03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202304101240
-_pkgver=2023-04-10-1240
+pkgver=202304151344
+_pkgver=2023-04-15-1344
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -145,16 +145,16 @@ 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=('8b166143ec7b11fee45b01dfff1ccc620bc5cc5a47f6ad035347de0f20709881777b8cf4f9a1ab55ea381427afccd12aa31e765e8558c4d16906a2aedff1198b'
+b2sums=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf0fbf0651be9c1b67430f4875ab3a9c834b8d80997a94f77787a81f658'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        '1de2211ce631a43e343de2c630e525cc46f30be4983737a5c046e2e7bd4d2d67a5b31a57ba78f58c980d1ed6d26f90683fc4fa91530ceddf6b8d5012a31e8e9b'
+        'e319c834d76c0d530762842cec9ac54247bac768ba1c2d3ffe01c41de4f3bb3458696abf2791871bce2b113a712085876d8351aa826a461559a2eb2e98918c55'
         'f3549372dec640f5fc51d2c7e2c439e34dc5e9b0cbabfc689d6d449814cfd997413360a363ace85835aec5a1fc2dd8e4bb2c54135fb63f617efdb00565d1616e'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        'd6ab568373c3bae4d99e7ef1c80e1c8b1c0e4256610919d3d060d71c202dd40597ea1230b4c00c6ef04960a0da2aa436970943b94e6276725be0bb9d865508f7'
+        '8cb60c8d33e1dfdb0b5e4a6f8c5796b78ba3987ad879fd471953f36d7c1c49d10b9b30ab7361c4cb5489b43da9ae48cb5a85531c0f11ffe0ba663f33215a5e52'
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
         'd62bcb01bcb2934bf405e205a511bd076bc793bb8699dd205a5441afddfe8bbb161f7925de8294c51a528318155af4d2261e2ca2a7a2614d22053d5bbe4359a1'
         '1950d2cacc8697b3f0602f3eb232744fd0f7de4489b7747089abfa8784ec9e4433db4dcdf925d0bc37686ee14d607dcd5345e3db5b5b155a6208bde8b1706e23'
@@ -164,7 +164,7 @@ b2sums=('8b166143ec7b11fee45b01dfff1ccc620bc5cc5a47f6ad035347de0f20709881777b8cf
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         '2ebc9d61438ef1439a3dcfae7e56f2f4cb1d4410faadd2e018359b6c4711abdcd474f2eeb2d23e531a523caea19ec40d820b60c0b8cdaf04223ca9eed1119ec7'
-        '373186c55545b4e747c08db497dae0f1446d2830c862a1b8a0d1bd03d237acc9a4fa8854537c0f485528fc0ef05ec6a2f5e43a42c21689dd85178fb07667b51b'
+        '6ed6469e0a7fa3a21731baa19040e109b1a0709a633c59ca5b43d71c1515fa326be84accbfd89f883bc03200daccd5d70e2aacff652e836b178beaf4ee66ce5c'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
@@ -270,7 +270,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-04-10-1240"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-04-15-1344"|' Makefile
 
 
   # # # Hotfixes
@@ -709,8 +709,8 @@ package_cataclysm-bn-tiles() {
   # Icon
   #install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
   #install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -D "${srcdir}/icon_128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
-  install -D "${srcdir}/icon_128x128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "${srcdir}/icon_128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
+  install -Dm644 "${srcdir}/icon_128x128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm644 "${srcdir}/$pkgname.desktop" "${pkgdir}/usr/share/applications/$pkgname.desktop"
 
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
index 7720600..60ba09f 100644
--- a/ammo-10_ammo-order-fix.patch
+++ b/ammo-10_ammo-order-fix.patch
@@ -397,7 +397,7 @@
 -    "copy-from": "shot_dragon",
 -    "type": "AMMO",
 -    "name": { "str": "dragon's breath shell, reloaded" },
--    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+-    "proportional": { "price": 0.7, "damage": { "damage_type": "heat", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 -  },
@@ -442,7 +442,7 @@
 -    "copy-from": "shot_dragon",
 -    "type": "AMMO",
 -    "name": { "str": "dragon's breath shell, black powder" },
--    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
+-    "proportional": { "price": 0.6, "damage": { "damage_type": "heat", "amount": 0.8 }, "dispersion": 1.2 },
 -    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 -  },
@@ -514,7 +514,7 @@
 +    "copy-from": "shot_dragon",
 +    "type": "AMMO",
 +    "name": { "str": "dragon's breath shell, reloaded" },
-+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
++    "proportional": { "price": 0.7, "damage": { "damage_type": "heat", "amount": 0.9 }, "dispersion": 1.1 },
 +    "extend": { "effects": [ "RECYCLED" ] },
 +    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 +  },
@@ -559,7 +559,7 @@
 +    "copy-from": "shot_dragon",
 +    "type": "AMMO",
 +    "name": { "str": "dragon's breath shell, black powder" },
-+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
++    "proportional": { "price": 0.6, "damage": { "damage_type": "heat", "amount": 0.8 }, "dispersion": 1.2 },
 +    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
 +    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 +  },
diff --git a/revert-01_removed-traits.patch b/revert-01_removed-traits.patch
index fd5b772..f926d3a 100644
--- a/revert-01_removed-traits.patch
+++ b/revert-01_removed-traits.patch
@@ -24,7 +24,7 @@
      "forced_traits": [ "FLIMSY2" ],
 -    "forbidden_traits": [ "TOUGH" ],
 +    "forbidden_traits": [ "TOUGH", "DISRESISTANT" ],
-     "professions": [ "unemployed", "bionic_patient", "patient", "broken_cyborg" ],
+     "professions": [ "unemployed", "bionic_patient", "patient", "broken_cyborg", "senior" ],
      "flags": [ "CHALLENGE", "CITY_START", "LONE_START" ]
    },
 
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index 3bc6080..a36a285 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -1209,7 +1209,7 @@ index 50f6c09d56..619ab4ab64 100644
 -    "copy-from": "shot_dragon",
 -    "type": "AMMO",
 -    "name": { "str": "dragon's breath shell, reloaded" },
--    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+-    "proportional": { "price": 0.7, "damage": { "damage_type": "heat", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 -  },