diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 29 |
1 files changed, 23 insertions, 6 deletions
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202110041824 -_pkgver=2021-10-04-1824 -pkgrel=4 +pkgver=202110161440 +_pkgver=2021-10-16-1440 +pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -62,6 +62,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "0028-fix-food-materials.patch" "0029-fix-survivor-fingerless-gloves-warmth.patch" "0031-vacutainer-is-not-a-weapon.patch" + "0032-shears-use-light-battery.patch" + "0033-add-missing-price-postapoc.patch" "jc_ammo-loudness-ap-times-2.patch" "jc_allow-bio-firestarter-on-smoker.patch" @@ -70,6 +72,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "jc_stop-sleeping-on-tables.patch" "jc_allow-hacker-laptop.patch" "jc_restore-removed-traits.patch" + "jc_more-military-base-overmap.patch" "custom.patch" @@ -78,7 +81,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=('52f0904513815f7ac55887dfe8d0b565b77edf2e52d11a1d4ba0faeed8a277b976a8eba95b455e269ac978346a40f7fbff6afbb514692a5c417c5529b5d37204' +b2sums=('28d01fe9a265419ad941d4ad2ca4cd1a5aafdc2e46dc1d734b718a60e3039e303f8c6b42d437a4d5a37731457863d34ebca9e2decffafba41697ca15fd4f1883' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -87,7 +90,7 @@ b2sums=('52f0904513815f7ac55887dfe8d0b565b77edf2e52d11a1d4ba0faeed8a277b976a8eba '51b1324506179f7fadd8bc187eb8db939494483597b0b7b63909cec66f4e94b27888ccfa926bbd2ff8b0e80108ecc373118c202a177fc2ebd4f5231f87f09a83' '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa' '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3' - '57e830004122ad835f84fd45c0965b7801b7355dcfef22c4e83969460f181d86110a7e37cc87a196238aa745ac8c9db99f97cf87edf7ef0fd8cfd16cf38d22cc' + '34dacfc4f338b68ecbb449e4726dc77a6876aae1c4ac31e0df4526a4df237d43ff3dcdd1d77d9266fb74d96f36b36fb93bbf1992e827504a313fdd1f3bfaf0ed' 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8' '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501' @@ -113,6 +116,8 @@ b2sums=('52f0904513815f7ac55887dfe8d0b565b77edf2e52d11a1d4ba0faeed8a277b976a8eba '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871' 'd9cad0cef682927c07e3f7398b6e57b21b68f9069b99fab363d0e3f329337f25fafa216a82a431ee23a2de3f67a0ed68d024c1a932b76f58aeb5e9a49cfe5e6e' 'a45b2a53b6725dfd4780049a7522befe49c2a0c4efa4fb1dcb5cf53c7af18d329d2ba02aa6ac150342a3e66a46fd17f5e6e76a8db15c677a237edbb5cf4f5af7' + '653930e35eac5dc7bd9fa3bfe0cbe89a36284431dc53cab95697da6b45d4c63af854d884f6b63fd45fde9c53a334a7e4f5600378c57b3b2ae2f881ef5d8fd0e3' + '5a5a61ccb7e2e343fb6de2e3426688485a2f4ad65d4b001d8bd542907fd8ceb9315da7fd9e5f89a5aa6210edcd5f334c73657fc16349000d6f6a394303e22000' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' 'dede4f0774159243f87121e4d53107bb9de31f9658823fc7ab02124974b87defecf3ab0f2edf6779f2fe1ca437f16f83bf193cf3143fd5eb3a686b731319c11f' 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600' @@ -120,6 +125,7 @@ b2sums=('52f0904513815f7ac55887dfe8d0b565b77edf2e52d11a1d4ba0faeed8a277b976a8eba 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' 'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099' '2aff3bb0804a1860bc95e25433b10f11c185bb954a2e9dc6fbee912d8d453498f9140d516ea4f31fc545861f266400db5d830092dbe21a48b22a07fd3d62a393' + '7835b2a650b7619af28e52273df6f279bac209528937abb32940f40b0572bc97c09573b139248213ab59e3a68ab7a5a96bb54adab742c2fc56d56f0e36732091' 'b01c79202a2ddc6e6e3e2b97f767f5535e29213bd675238fad20f5ac26b639a111424a3d2861fe2e760b73a1d3c1d909e0360390caf1f21a6fc169b0bee4d665' '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' @@ -141,7 +147,10 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2021-10-04-1824|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2021-10-16-1440|' Makefile + + + # Hotfixes # Backports from 0.F @@ -241,6 +250,12 @@ prepare() { # Fix blood draw kit being categorized as a weapon. patch -Np1 -i "$srcdir"/0031-vacutainer-is-not-a-weapon.patch + # Fix electric shears not using batteries nor charging via UPS. + patch -Np1 -i "$srcdir"/0032-shears-use-light-battery.patch + + # Add price_postapoc to a number of items that did not have one set. + patch -Np1 -i "$srcdir"/0033-add-missing-price-postapoc.patch + # Various other fixes for bugs I came across that modify src # Fix ammo loudness mulitplying by six instead of two. @@ -264,6 +279,8 @@ prepare() { # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller. patch -Np1 -i "$srcdir"/jc_restore-removed-traits.patch + # Expand the overmap tiles for the miltiary base to be less MMMM + patch -Np1 -i "$srcdir"/jc_more-military-base-overmap.patch # A series of changes to add both gynoid and vampire mutation lines. patch -Np1 -i "$srcdir"/custom.patch |