Updated to 0.5.2

Offloaded tileset, soundpack, and musicpack to seperate packages.

2 files changed, 14 insertions, 39 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 875d725..ce2edaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,6 @@
 # Arch version is not BN
 # Arch version has non-functional desktop file
 # Arch version lacks additional optimization and hardening flags
-# Arch version lacks the MSX++UnDeadPeopleEdition tileset
-# Arch version lacks the @ soundpack
-# Arch version lacks the CO.AG musicpack
 # Arch version lacks numerous bugfixes I created
 # Arch version has some vanilla balancing changes I disagree with
 # Arch version segfaults due to -Wp,-D_GLIBCXX_ASSERTIONS
@@ -16,11 +13,12 @@
 pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
-_pkgname=Cataclysm-BN-cbn
-pkgver=0.5.1
+#_pkgname=Cataclysm-BN-cbn
+_pkgname=Cataclysm-BN
+pkgver=0.5.2
 #pkgver=202310040030
 #_pkgver=2023-10-04-0030
-pkgrel=4
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -32,7 +30,8 @@ options=('lto')
 depends=('ncurses' 'hicolor-icon-theme' 'gettext')
 makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle')
 #source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-experimental-$_pkgver.tar.gz"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-$pkgver.tar.gz"
+#source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-$pkgver.tar.gz" # Pre 0.5.2
+source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/v$pkgver.tar.gz"
         "cataclysm-bn.desktop"
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
@@ -153,13 +152,8 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "src-20_fix-default-mods.patch"
         
         "vampirism.patch"
-
-        "cataclysm-dda-tileset_undeadpeople.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople.git/snapshot/cataclysm-dda-tileset_undeadpeople-master.tar.xz"
-        "cataclysm-dda-mod_battle-maid-redone-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_battle-maid-redone-tileset.git/snapshot/cataclysm-dda-mod_battle-maid-redone-tileset-master.tar.xz"
-        "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=('d7321d8f209920f6ea2a7c49aa55620b9a39e08a2d8d727c05581c65ecf56dd7b84995cf31363e110b58bafac3de8cbf3ba383719686f43962dde93faf656aaa'
+b2sums=('9daaba287ef99aa3b33b6f3fbb129b97a2b4dcc265dd7affa08ccee1bdd41b4568e061aa9e8b4090346c30040e8fb6e582648ededbd14534e32d44bbac1a1546'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -234,7 +228,7 @@ b2sums=('d7321d8f209920f6ea2a7c49aa55620b9a39e08a2d8d727c05581c65ecf56dd7b84995c
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd'
         '6ce1b6808b48ba0e64a07d2ff84f0283a7b172e470c8b934ab8824afe2eaf6322927807a985f4a333544f20743f39d75f7b83591ae885fcabb344f6f2476ef74'
-        '257a9600c893dcba966007b17dffe58f507b52eb8282e624dfe441e5a78bf45210b866b7a5e2ebd6fe8e86a6ac55f427100c52396bb7c05d6e979c9f41a0059a'
+        '8cd8393b544a389f3d29465d9b817495e6fb7a8706ea967d0785688fbdeb393d0856c71deeeeca623c374bcbc85708733aab6a2f985417e5e1b1936ae7b1d4f3'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
@@ -257,11 +251,7 @@ b2sums=('d7321d8f209920f6ea2a7c49aa55620b9a39e08a2d8d727c05581c65ecf56dd7b84995c
         'a5e8bca3ccec2990098e8cf1c504ce6bec03cecef03b0450a4396d5b1e0ffc4e91592f40c3e389eea74fc53114cce0f2c1d2237a779e5ec7e6c12b2863d6c731'
         'c0ccf5af2fbf0c9bb59bd226ce17084658cbe6bc859bd8a76c292845dbf57679ac08de339d4cb90736bfa48fcc9f2f734c3fadaa5b91b0fc6e58d157c848a328'
         'a408f468a4a0b0fea78b3c1cc31be22fc913c0a27052b08e9dde523135ed473008bba6a0245d64ed9863431c3905f6e7663d19e3aa9ba769053a160bcb8bcbfa'
-        '718c242ea5b5e6546ba5a8baba8e26f1250cf41a53f538c20c392636a2430a8966bd6e66c4ca6c7d340303742a8d21ee1e083b9af081c461be3bcaf0c212fb40'
-        '99a8d66b8d3518884fdacf915add6960bd5fc14c876763f37712fa2ee3415b706d8288beda36a0551acb69dffa04152e380e8ccf53dbcc2fc1f6c51f4e95db8a'
-        'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
-        '5f0dd6dace2649c818fb16665a29c34c1894deaf85cea8e7913f8ddae66a759e1be4a327d6db03b4d9cfd7839dd51dd04856bc9493e0eb8245a759093f31150f'
-        'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
+        '718c242ea5b5e6546ba5a8baba8e26f1250cf41a53f538c20c392636a2430a8966bd6e66c4ca6c7d340303742a8d21ee1e083b9af081c461be3bcaf0c212fb40')
 
 prepare() {
 #  cd "${_pkgname}-${_pkgver}"
@@ -785,25 +775,10 @@ package_cataclysm-bn-tiles() {
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
 
-  # Tileset
-  mv "$srcdir/cataclysm-dda-tileset_undeadpeople-master" "$srcdir/undeadpeople"
-  cp --reflink -r "$srcdir/undeadpeople" "$pkgdir/usr/share/cataclysm-bn/gfx"
+  # Remove unmaintained UDP tileset
+  # Use my forked cataclysm-bn-tileset package for a working UDP tileset
   rm -rf "$pkgdir/usr/share/cataclysm-bn/gfx/MSX++UnDeadPeopleEdition"
 
-  #mv "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master" "$srcdir/battle-maid-redone-tileset"
-  cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt1" "$pkgdir/usr/share/cataclysm-bn/mods"
-  cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt2" "$pkgdir/usr/share/cataclysm-bn/mods"
-
-
-  # Sound
-  mv "$srcdir/cataclysm-dda-soundpack_jcsoundpack-master" "$srcdir/jcsoundpack"
-  cp --reflink -r "$srcdir/jcsoundpack" "$pkgdir/usr/share/cataclysm-bn/sound"
-
-  # Music
-  mv "$srcdir/cataclysm-dda-musicpack_coag-musicpack-master" "$srcdir/coag-musicpack"
-  install -Dm644 "$srcdir/coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-bn/sound/jcsoundpack/musicset.json"
-  cp --reflink -r "$srcdir/coag-musicpack/music" "$pkgdir/usr/share/cataclysm-bn/sound/jcsoundpack"
-
 
   # hack: remove overlapping files
   cd "$pkgdir/../cataclysm-bn"
diff --git a/terrain-13_fix-mapgen-palettes.patch b/terrain-13_fix-mapgen-palettes.patch
index 520c5ff..5fb3187 100644
--- a/terrain-13_fix-mapgen-palettes.patch
+++ b/terrain-13_fix-mapgen-palettes.patch
@@ -210,7 +210,7 @@
 +        "-+|s|   KSK|KSK   |s|+-|",
 +        "    |     K|K     |   x|",
          " t  +     O|O     +   t|",
-         "bb  |hh   f|f   hh|  bb|",
+         "bb  |hh   ḟ|ḟ   hh|  bb|",
 -        "bb ]|tt   C|C   tt|] bb|",
 +        "bb ]|tt   K|K   tt|] bb|",
          "--------+-----+--------|",
@@ -219,7 +219,7 @@
          "--------+-----+--------|",
 -        "bb ]|tt   C|C   tt|] bb|",
 +        "bb ]|tt   K|K   tt|] bb|",
-         "bb  |hh   f|f   hh|  bb|",
+         "bb  |hh   ḟ|ḟ   hh|  bb|",
          " t  +     O|O     +   t|",
 -        "    |     C|C     |    |",
 -        "-+|s|   CSC|CSC   |s|+-|",
@@ -238,7 +238,7 @@
        "mapping": {
          "t": { "items": [ { "item": "livingroom", "chance": 20 } ] },
          "F": { "items": [ { "item": "livingroom", "chance": 5 } ] },
-         "f": { "items": [ { "item": "fridge", "chance": 80 } ] },
+         "ḟ": { "items": [ { "item": "fridge", "chance": 80 } ] },
 -        "C": { "items": [ { "item": "kitchen", "chance": 40 } ] },
 +        "K": { "items": [ { "item": "kitchen", "chance": 40 } ] },
          "O": { "items": [ { "item": "oven", "chance": 70 } ] },