Rebuild for updated mods

Add recipe-fixes mod

1 files changed, 20 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a5a6b8e..a6e3c45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,16 @@
 # # I maintain this because:
 # Arch version lacks additional optimization and hardening flags
 # Arch version has non-functional desktop file
-# Arch version lacks the awesome MSX++UnDeadPeopleEdition tileset
-# Arch version lacks a soundpack
-# Arch version lacks a musicpack
+# Arch version lacks the MSX++UnDeadPeopleEdition tileset
+# Arch version lacks the @ soundpack
+# Arch version lacks the CO.AG musicpack
 # Arch version lacks my custom mods
 
 pkgbase=cataclysm-dda
 pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E
-pkgrel=1.12
+pkgrel=1.13
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -32,6 +32,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/a
         "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"
         "cataclysm-dda-mod_hack-fix.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_hack-fix.git/snapshot/cataclysm-dda-mod_hack-fix-master.tar.xz"
         "cataclysm-dda-mod_hk-fix.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_hk-fix.git/snapshot/cataclysm-dda-mod_hk-fix-master.tar.xz"
+        "cataclysm-dda-mod_recipe-fixes.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_recipe-fixes.git/snapshot/cataclysm-dda-mod_recipe-fixes-master.tar.xz"
         "cataclysm-dda-mod_battle-maid-redone.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_battle-maid-redone.git/snapshot/cataclysm-dda-mod_battle-maid-redone-master.tar.xz"
         )
 b2sums=('730e4730b1ab02769bdd054d1bbf5815fd44e7b185f7d5798168cdbfbddfba243646516ace93b07ebd6866c73bba96d8a4aa8597c87fbe93d34f3fafab7a5856'
@@ -39,10 +40,11 @@ b2sums=('730e4730b1ab02769bdd054d1bbf5815fd44e7b185f7d5798168cdbfbddfba243646516
         '8ffff827ed464af678497da5129eb69d3d1a4c6994bbcc00ef7f7b240cd04e7961c3c0ac52d6940252241406c04e647fac19c9327847afced33988eb15973ba8'
         '29a87e1ae6814546dcf2e2d70b0b49dba6de26ed4636d93cec0193a1b7eb4ac2e5b8c071a936f7996118c6293bbfaf8f63752c4e051b7be14d84261eaa94594b'
         'e6c6b3a4cd40e57819d148fdc1f0462332d0cfab37d2021161988cbd4142acf9b5029b70df40fe5b8e286a43398488b248a702e48846da22c8490b7cd5ac182f'
-        '631086a3e2365562dacd644b709702a12476081949e7b328822def646de90a72e916a4a59f17923a56b714f5b2c8acba108c6a22bc4944d1adbc20376baf2401'
+        'b158232e8f1df808b3f98e48fa1a5016bf121ed1d1a5650ba8505b6eae75932945ef19672241ee2a324d048a61744568fb46a85990eab0a24df5e10419808593'
         '353fed5883383063b2b2d3a81f3a5d5364a0351d037f5456e9d89d4eeee3b20b3e1f9c74c3d458193deb8ac1fa41d73d86e8364a623a6344c32c55437f362d4b'
         'eb4f2c80f9452215eaf89b074fe556afef043d7fcd49768242d09e1a0e707da9f7912e598a81b2cbf60cda8715ab5e452ceaaa0f2377c90f50a3816b11ffddf0'
-        '855ac28bc6b2277819fb617fd0dfd23e786fc67054bd1ac81d961e973ead115f354ed94d7a5d19f4a0e262a5f177bce40f0cf8686f0ce4c22e3af6a309aa705c'
+        '7498b57dd0d4a21ed12a5a59344d03b590ce64f96eb47d5375c755c6e19c19aa11762a27bc52cfcc7104d9263b0bdcd2ec2b67c53ec51268140c69f06cea35fd'
+        '056c950be3e5c5917321d837af5244345f41412a217698f023226d4f9bcca0dffa2bde2f12826b5ddd436e86e373730b608d1806e586fd21d4185ee1d0e2787c'
         '7fe03158cd5e05c175601a70952444b7c1d4b33b4e006bbe2de16afe82374ff870c4fb3dc25c9b11878cf1700f1580bd07ffc7a51eadfec2d21ac7218a654223')
 
 # official docs say to use lua51
@@ -83,9 +85,16 @@ package_cataclysm-dda() {
   # undo symlink
   rm "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md"
   cp 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md"
+
+  # Mods
+  mv "$srcdir/cataclysm-dda-mod_battle-maid-redone-master" "$srcdir/cataclysm-dda-mod_battle-maid-redone"
   cp -r "$srcdir/cataclysm-dda-mod_battle-maid-redone" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-mod_hack-fix-master" "$srcdir/cataclysm-dda-mod_hack-fix"
   cp -r "$srcdir/cataclysm-dda-mod_hack-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-mod_hk-fix-master" "$srcdir/cataclysm-dda-mod_hk-fix"
   cp -r "$srcdir/cataclysm-dda-mod_hk-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-mod_recipe-fixes-master" "$srcdir/cataclysm-dda-mod_recipe-fixes"
+  cp -r "$srcdir/cataclysm-dda-mod_recipe-fixes" "$pkgdir/usr/share/cataclysm-dda/mods"
 
   # License
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -107,9 +116,14 @@ package_cataclysm-dda-tiles() {
 
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+  # Mods
+  mv "$srcdir/cataclysm-dda-tileset_msx-tileset-master" "$srcdir/cataclysm-dda-tileset_msx-tileset"
   cp -r "$srcdir/cataclysm-dda-tileset_msx-tileset" "$pkgdir/usr/share/cataclysm-dda/gfx"
+  mv "$srcdir/cataclysm-dda-mod_msx-tileset-fix-master" "$srcdir/cataclysm-dda-mod_msx-tileset-fix"
   cp -r "$srcdir/cataclysm-dda-mod_msx-tileset-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-soundpack_damalsksoundpack-master" "$srcdir/cataclysm-dda-soundpack_damalsksoundpack"
   cp -r "$srcdir/cataclysm-dda-soundpack_damalsksoundpack" "$pkgdir/usr/share/cataclysm-dda/sound"
+  mv "$srcdir/cataclysm-dda-musicpack_coag-musicpack-master" "$srcdir/cataclysm-dda-musicpack_coag-musicpack"
   install -Dm644 "$srcdir/cataclysm-dda-musicpack_coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-dda/sound/cataclysm-dda-soundpack_damalsksoundpack/musicset.json"
   cp -r "$srcdir/cataclysm-dda-musicpack_coag-musicpack/music" "$pkgdir/usr/share/cataclysm-dda/sound/cataclysm-dda-soundpack_damalsksoundpack"