diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 96 |
1 files changed, 53 insertions, 43 deletions
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202108271610 -_pkgver=2021-08-27-1610 -pkgrel=4 +pkgver=202109041536 +_pkgver=2021-09-04-1536 +pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -59,6 +59,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "0024-ammo-order-fix.patch" "0026-fix-brioche-cooking-time.patch" "0027-fix-missing-ammo-frag-effects.patch" + "0028-royal-jelly-is-honey.patch" + "0029-fix-survivor-fingerless-gloves-warmth.patch" "jc_ammo-loudness-ap-times-2.patch" "jc_allow-bio-firestarter-on-smoker.patch" @@ -76,7 +78,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=('f4d9b3d26e3d33893fa918086ba538ae4de0874908b18474a7930fabe761711e96406845d68432a99f4e8fb59ec184cf18ae4ae4574c4e27c6619b1b227b0583' +b2sums=('92a5970290209ac0631b6e86d8d3bf903be2ba190be0a9d6a9997fb6dac1a8af92e744dd5e56165383eeeef7371169bfa6cff6e25e5aaa2226c432d4d8e8a81a' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -108,6 +110,8 @@ b2sums=('f4d9b3d26e3d33893fa918086ba538ae4de0874908b18474a7930fabe761711e9640684 'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962' 'c37cd997666836479a7a17a57c007ded373c03b10c59c68d594675a41a362cbff9d1b584581bff899d31221e8719cd51516904fa0f72ae343c6ea06ed4acc70d' '040363cea9b3492f8a0f8daba44c179c871ba691dea688c15f3ad6994f78d530b4f74b283b9c64e4f5a2b1268805e60d4ea154d3dc8246200c50907054f5b5ef' + 'e9274d894e94606ba0f15e85c7d5e6dcfdd93922f5361dd988542e63e5f2d434971a5360600869184c490dc34f7104214a71620c577ee0fe217c9636e91b2076' + 'd9cad0cef682927c07e3f7398b6e57b21b68f9069b99fab363d0e3f329337f25fafa216a82a431ee23a2de3f67a0ed68d024c1a932b76f58aeb5e9a49cfe5e6e' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' 'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9' 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600' @@ -115,10 +119,10 @@ b2sums=('f4d9b3d26e3d33893fa918086ba538ae4de0874908b18474a7930fabe761711e9640684 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' 'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9' '749badf61daf2957ecc1ad880628e8ffa1fac70e08523151c86f17fec2e6a5e65240fa2545f54936163bdb1dc677a258d138ebccada1c54694d2a39d830d2755' - '6ef7242c46b80bd4701629a75a7ac667ff2db76d30c975c743488ab5be51ecffd746f78a4c636e4318610d09613484961f07e4ac1c52817f1f6230c4b0a50abb' + '1d3eb730c5da98882cbd2ceb321cf246ffe1391d7df3f066d11ee3c1ac77887d7a0f03fe166374966ee7bd8bcdbf66ef962986cda6095df3f0f743745426d9b6' 'b72be57fc41fb7fd405ab362eb40cf94eb0cd31d502877d1e7bfb95610053f0f08cc950af3e55c07dfb63fcc2024c477a13b48390c8c249e3bcb89d2a957e9c2' '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104' - 'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206' + 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' '83ea75e6c14667c134bf683f330235c40c7bb94c65e19a6fc4a09ba38da254d09264a86cba4cafcbcf9b79916bd8e16976cb1b49be2475fe315616a3cc857820' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') @@ -137,125 +141,131 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2021-08-27-1610|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2021-09-04-1536|' Makefile # Backports from 0.F - # Fix tacoma barn doors being placed in the same spot twice + # Fix tacoma barn doors being placed in the same spot twice. patch -Np1 -i "$srcdir"/0.F_backport-tacoma-barn-door-position.patch - # Fix npcs unable to drink from firestation and shelter basecamps wells + # Fix npcs unable to drink from firestation and shelter basecamps wells. patch -Np1 -i "$srcdir"/0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch - # Fix radio, e-ink reader music, tactical tonfa not working with UPS + # Fix radio, e-ink reader music, tactical tonfa not working with UPS. patch -Np1 -i "$srcdir"/0.F_backport-radio-can-use-ups.patch # Various other fixes for bugs I came across - # Fix Quiverfull house to have the correct stairs that modify json + # Fix Quiverfull house to have the correct stairs that modify json. patch -Np1 -i "$srcdir"/0001-quiverfull-house-correct-stairs.patch - # Fix Ankle Ammo Pouch to not look like a backpack + # Fix Ankle Ammo Pouch to not look like a backpack. patch -Np1 -i "$srcdir"/0002-ankle-ammo-pouch-is-not-a-backpack.patch - # Fix mulitple inconsistent ammuntion names and handloaded status + # Fix mulitple inconsistent ammuntion names and handloaded status. patch -Np1 -i "$srcdir"/0003-inconsistent-ammo-names.patch - # Fix missing floor in tacoma clinic + # Fix missing floor in tacoma clinic. The hospital is still a mess. :/ patch -Np1 -i "$srcdir"/0004-tacoma-clinic-add-missing-floor.patch - # Fix lumbermill gasoline being spilled instead of being inside the gas pump + # Fix lumbermill gasoline being spilled instead of being inside the gas pump. patch -Np1 -i "$srcdir"/0005-lumbermill-gasoline-not-spilled.patch - # Fix community garden liquid fertilizer being in a pit instead of in the storage tanks + # Fix community garden liquid fertilizer being in a pit instead of in the storage tanks. patch -Np1 -i "$srcdir"/0006-community-garden-fertilizer-not-spilled.patch # Fix npc not being able to install some additional CBMs: - # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels + # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels. patch -Np1 -i "$srcdir"/0008-npc-can-use-more-bionics.patch - # Fix .22 casings not stacking when every other casing stacks + # Fix .22 casings not stacking when every other casing stacks. patch -Np1 -i "$srcdir"/0009-22-casings-can-stack.patch - # Fix reloaded 45-70 rounds and reloaded dragon shot were not allowing dismantling when every other non-caseless does + # Fix reloaded 45-70 rounds and reloaded dragon shot were not allowing dismantling when every other non-caseless does. patch -Np1 -i "$srcdir"/0010-4570-dragon-can-be-dismantled.patch - # Fix the pepperjack beef and burrito bowl MREs never dropping + # Fix the pepperjack beef and burrito bowl MREs never dropping. patch -Np1 -i "$srcdir"/0011-add-missing-mre.patch - # Fix some doors being unusable by npcs (incorrect door flag) + # Fix some doors being unusable by npcs (incorrect door flag). patch -Np1 -i "$srcdir"/0012-fix-doors-for-npcs.patch - # Fix the loudness of 20x66mm shotgun shells like other shotguns + # Fix the loudness of 20x66mm shotgun shells like other shotguns. patch -Np1 -i "$srcdir"/0013-fix-20x66mm-loudness.patch - # Replace the portable generator twin engine with a large 1 cylinder so it can actually function as is + # Replace the portable generator twin engine with a large 1 cylinder so it can actually function as is. patch -Np1 -i "$srcdir"/0014-portable-generator-engine.patch - # Normalize the manhack volumes to that of the base grenade/explosive + # Normalize the manhack volumes to that of the base grenade/explosive. patch -Np1 -i "$srcdir"/0015-normalize-drone-volume.patch # Prefix medical zombies with "zombie" like other zombies. patch -Np1 -i "$srcdir"/0016-medical-zombies-called-zombies.patch - # Light Step feels too powerful in Bright Nights + # Light Step feels too powerful in Bright Nights. patch -Np1 -i "$srcdir"/0017-nerf-lightstep.patch - # Re-hide something that feels like spoilers + # Re-hide something that feels like spoilers. patch -Np1 -i "$srcdir"/0018-rehide-redacted.patch - # Set the overmap note for Derelict Shed to s to better match use of the first letter + # Set the overmap note for Derelict Shed to s to better match use of the first letter. patch -Np1 -i "$srcdir"/0019-derelict-shed-is-s.patch - # Stop police and SWAT carrying 4.6mm magazines despite having no compatible weapons + # Stop police and SWAT carrying 4.6mm magazines despite having no compatible weapons. patch -Np1 -i "$srcdir"/0020-hk46-is-milspec.patch - # Mark the foldable plastic bottle and steel water bottle as containers + # Mark the foldable plastic bottle and steel water bottle as containers. patch -Np1 -i "$srcdir"/0021-foldable-bottle-is-container.patch - # Fix Evacuee 3 background 3 being player visible + # Fix Evacuee 3 background 3 being player visible. patch -Np1 -i "$srcdir"/0022-fix-evac3-background-visible.patch - # Fix rubber items dismantling into 10x item volume of rubber + # Fix rubber items dismantling into 10x item volume of rubber. patch -Np1 -i "$srcdir"/0023-fix-rubbersplosion.patch - # Fix ammo ordering so as to not prevent those items being modded + # Fix ammo ordering so as to not prevent those items being modded. patch -Np1 -i "$srcdir"/0024-ammo-order-fix.patch - # Fix brioche bun missing a cooking time + # Fix brioche bun missing a cooking time. patch -Np1 -i "$srcdir"/0026-fix-brioche-cooking-time.patch - # Fix ammo fragmentation and explosive effects that are missing + # Fix ammo fragmentation and explosive effects that are missing. patch -Np1 -i "$srcdir"/0027-fix-missing-ammo-frag-effects.patch + # Fix royal jelly not being marked as honey. + patch -Np1 -i "$srcdir"/0028-royal-jelly-is-honey.patch + + # Fix fingerless survivor gloves losing base warmth, as they lose warmth already from the lack of coverage. + patch -Np1 -i "$srcdir"/0029-fix-survivor-fingerless-gloves-warmth.patch + # Various other fixes for bugs I came across that modify src - # Fix ammo loudness mulitplying by six instead of two + # Fix ammo loudness mulitplying by six instead of two. patch -Np1 -i "$srcdir"/jc_ammo-loudness-ap-times-2.patch - # Fix smoker racks not accepting bionic firestarter + # Fix smoker racks not accepting bionic firestarter. patch -Np1 -i "$srcdir"/jc_allow-bio-firestarter-on-smoker.patch - # Fix Non-Player facton NPCs from becoming sleep deprived + # Fix Non-Player facton NPCs from becoming sleep deprived. patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch - # Fix Non-Player facton NPCs from becoming malnourished + # Fix Non-Player facton NPCs from becoming malnourished. patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-malnourishment.patch - # Fix NPCs preferring tables to cots or woodstoves to the floor + # Fix NPCs preferring tables to cots or woodstoves to the floor. patch -Np1 -i "$srcdir"/jc_stop-sleeping-on-tables.patch - # Allow the hacker_laptop to utilize the extra functions + # Allow the hacker_laptop to utilize the extra functions. patch -Np1 -i "$srcdir"/jc_allow-hacker-laptop.patch - # Restore the Infection Immune Trait and Revert Infection Resistant to as before + # Restore the Infection Immune Trait and Revert Infection Resistant to as before. patch -Np1 -i "$srcdir"/jc_restore-inf-immune.patch - # Some personal quirks that simply lack a means short of patching the source + # Some personal quirks that simply lack a means short of patching the source. patch -Np1 -i "$srcdir"/custom.patch - # Expand the vampirism patchset to add an entirely new food category so vampires can only drink blood + # Expand the vampirism patchset to add an entirely new food category so vampires can only drink blood. patch -Np1 -i "$srcdir"/custom-2.patch } |