Add grenade-crafting and caseless-crating mods

Update other mods

1 files changed, 29 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c5520cc..ce1a596 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E.2
 _pkgver=0.E-2
-pkgrel=1.27
+pkgrel=1.28
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -34,8 +34,10 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "cataclysm-dda-mod_backport_heatercooler-fix.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_backport_heatercooler-fix.git/snapshot/cataclysm-dda-mod_backport_heatercooler-fix-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_faction-camp-recipe-expansion.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_faction-camp-recipe-expansion.git/snapshot/cataclysm-dda-mod_faction-camp-recipe-expansion-master.tar.xz"
-        "cataclysm-dda-mod_hk-loadout.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_hk-loadout.git/snapshot/cataclysm-dda-mod_hk-loadout-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_caseless-crafting.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_caseless-crafting.git/snapshot/cataclysm-dda-mod_caseless-crafting-master.tar.xz"
+        "cataclysm-dda-mod_grenade-crafting.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_grenade-crafting.git/snapshot/cataclysm-dda-mod_grenade-crafting-master.tar.xz"
+        "cataclysm-dda-mod_hk-loadout.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_hk-loadout.git/snapshot/cataclysm-dda-mod_hk-loadout-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=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5565c86a4efc528f8b6a429a2e9ca6b3a905d5877a3edb4cd150c50638'
@@ -48,9 +50,11 @@ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5
         '20b6ddfe8d3296a5ebdc2bf027e1e4871480dc02069712689a02c032b3f4587287f46a3969cd097bae55fbfbf7d9d21c6bb06b84bcbf1ba40a95d0cfb432d1a2'
         '36625d21245d5bb9769b1e7916ed8d644cdf56efa1c64c15c8b76d9cd90cdfa7c35324bebdf71426687d6f18b53aa1fb9675d0ba1ea93432ad001b0a54615682'
         '083713ad07d085bc9120812a354f294bcad12cf4b53a0e6da52bccc2a7319490740191740affb658b2ba2b3de91dda081e62e948bbe62b8f6e2f4613f71a0687'
-        'e5d405c8699ac94839669b3f91039d27a92a80edff0ba3638da10937092b3987bf6d77eb460b34d6258d6a642638f2b927381f0f6acb56ea7d90399cb1e8bde8'
         'f9f5975639792afb2411cec7d9e8580c9a82b1e1aaa38d7df9ebeae6d5aee36e061e4fbbf2836e538bd58898bda4062df201eb2abbc2009500a8b77e0c249074'
-        'bffc334cf9d72a29b915c66633852dae2d58d82eb872ee9b0f7e9e25eb5438343933b578e16933f761a17e01f78d2b3eaa151d1892447765095660389d84f285')
+        'ef41120eeaa0ea584a5efbed55cbd48814cadbb2ea0ca1b063032375841bb9b8aa6fb07b636811f5ca24ee1995333e5515c4143380d6e85e6cc0f4e50006e6d1'
+        '0b743bc6c8c187ab876ab972676cee7f0d7e7a46b3e73fc9f77b7d86eae2eddb5a970bb02215ea0ff5de5f9b94322cb97b6803e2b9fd526b9438d779dcb845c1'
+        'e5d405c8699ac94839669b3f91039d27a92a80edff0ba3638da10937092b3987bf6d77eb460b34d6258d6a642638f2b927381f0f6acb56ea7d90399cb1e8bde8'
+        '1389fd46a92b191d2814530ff8c86ee85fffff3b0a5c34c40520bbd50f7ed65c51c4d994c32aea80166ef22f643b4423e70a2af37111513c0d26d09465f9c9f5')
 
 # official docs say to use lua51
 # but makefile supports lua52?
@@ -92,19 +96,31 @@ package_cataclysm-dda() {
   cp --reflink '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/battle-maid-redone"
-  cp --reflink -r "$srcdir/battle-maid-redone" "$pkgdir/usr/share/cataclysm-dda/mods"
   mv "$srcdir/cataclysm-dda-mod_backport_heatercooler-fix-master" "$srcdir/backport_heatercooler-fix"
   cp --reflink -r "$srcdir/backport_heatercooler-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
+
   mv "$srcdir/cataclysm-dda-mod_hack-fix-master" "$srcdir/hack-fix"
   cp --reflink -r "$srcdir/hack-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
-  mv "$srcdir/cataclysm-dda-mod_hk-loadout-master" "$srcdir/hk-loadout"
-  cp --reflink -r "$srcdir/hk-loadout" "$pkgdir/usr/share/cataclysm-dda/mods"
-  mv "$srcdir/cataclysm-dda-mod_recipe-fixes-master" "$srcdir/recipe-fixes"
-  cp --reflink -r "$srcdir/recipe-fixes" "$pkgdir/usr/share/cataclysm-dda/mods"
+
   mv "$srcdir/cataclysm-dda-mod_faction-camp-recipe-expansion-master" "$srcdir/faction-camp-recipe-expansion"
   cp --reflink -r "$srcdir/faction-camp-recipe-expansion" "$pkgdir/usr/share/cataclysm-dda/mods"
 
+  mv "$srcdir/cataclysm-dda-mod_recipe-fixes-master" "$srcdir/recipe-fixes"
+  cp --reflink -r "$srcdir/recipe-fixes" "$pkgdir/usr/share/cataclysm-dda/mods"
+
+  mv "$srcdir/cataclysm-dda-mod_caseless-crafting-master" "$srcdir/caseless-crafting"
+  cp --reflink -r "$srcdir/caseless-crafting" "$pkgdir/usr/share/cataclysm-dda/mods"
+
+  mv "$srcdir/cataclysm-dda-mod_grenade-crafting-master" "$srcdir/grenade-crafting"
+  cp --reflink -r "$srcdir/grenade-crafting" "$pkgdir/usr/share/cataclysm-dda/mods"
+
+  mv "$srcdir/cataclysm-dda-mod_hk-loadout-master" "$srcdir/hk-loadout"
+  cp --reflink -r "$srcdir/hk-loadout" "$pkgdir/usr/share/cataclysm-dda/mods"
+
+  mv "$srcdir/cataclysm-dda-mod_battle-maid-redone-master" "$srcdir/battle-maid-redone"
+  cp --reflink -r "$srcdir/battle-maid-redone" "$pkgdir/usr/share/cataclysm-dda/mods"
+
+
   # License
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
@@ -128,10 +144,13 @@ package_cataclysm-dda-tiles() {
   # Mods
   mv "$srcdir/cataclysm-dda-tileset_msx-tileset-master" "$srcdir/msx-tileset"
   cp --reflink -r "$srcdir/msx-tileset" "$pkgdir/usr/share/cataclysm-dda/gfx"
+
   mv "$srcdir/cataclysm-dda-mod_msx-tileset-fix-master" "$srcdir/msx-tileset-fix"
   cp --reflink -r "$srcdir/msx-tileset-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
+
   mv "$srcdir/cataclysm-dda-soundpack_jcsoundpack-master" "$srcdir/jcsoundpack"
   cp --reflink -r "$srcdir/jcsoundpack" "$pkgdir/usr/share/cataclysm-dda/sound"
+
   mv "$srcdir/cataclysm-dda-musicpack_coag-musicpack-master" "$srcdir/coag-musicpack"
   install -Dm644 "$srcdir/coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-dda/sound/jcsoundpack/musicset.json"
   cp --reflink -r "$srcdir/coag-musicpack/music" "$pkgdir/usr/share/cataclysm-dda/sound/jcsoundpack"