diff options
| -rw-r--r-- | PKGBUILD | 47 |
1 files changed, 20 insertions, 27 deletions
@@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN pkgver=0.6.0 #pkgver=202310040030 #_pkgver=2023-10-04-0030 -pkgrel=11 +pkgrel=13 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -47,7 +47,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "revert-01_removed-traits.patch" "revert-02_revert-book-revamp.patch" "revert-03_generic-nv.patch" - "revert-04_telescopic-lenses.patch" "revert-06_Obsolete-useless-hub01-basement-1457.patch" "revert-07_Remove-handload-quality-distinction-1481.patch" "revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch" @@ -66,7 +65,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "revert-26_fix-npc-splints-and-clean-up-iterator-errors-3592.patch" "revert-27_fix-NPCs-keep-their-splints-on-3589.patch" "revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch" - #"revert-29_feat-balance-port-Mainline-Nonperishable-Overhaul-s-.patch" "revert-30_feat-content-weapon-mount-obsoletion-part-1-4179.patch" "revert-31_restore-vague-nether-healing.patch" @@ -78,7 +76,8 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "armor-01_ankle-ammo-pouch-is-not-a-backpack.patch" "armor-02_fix-survivor-fingerless-gloves-warmth.patch" - "bionics-01_npc-can-use-more-bionics.patch" + "bionics-01_restore-telescopic-eyes.patch" + "bionics-02_npc-can-use-more-bionics.patch" "faction-01_more-factions.patch" "faction-03_fix-food-supply-calculations.patch" @@ -147,6 +146,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "etc-02_add-missing-price-postapoc.patch" "etc-03_fix-abstracts.patch" + "etc-04_plastic-scrap-is-stackable.patch" "src-01_radio-can-use-ups.patch" "src-02_ammo-loudness-ap-times-2.patch" @@ -187,7 +187,6 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c' '2b42190f1d7189a38b3424efe64fd1b3921919a4f6fc872462ef684587de94b900e93f159597ab3e6f576268fed3e6966cddc3fa7250e1b746095fd7a2cbf6e9' 'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe' - '5b0e957a5f80ea878c554711dab2fe6759deb3371532cd0f149cfc7a54ec914f445a4aeeff4263df58c947f03fe7be30f2ef175b9a81708e668fd037f9b8ccf8' '36d8e081f0c374202942a6f5c50781768e45ac1c7df4b7861ef63577ec5f86c160518f2aec8b3cf9d0507061ed177286e38ef8015e7d0636c85faa2eb93f876c' '4a03288ecc9bb0f342add15413bdc060cb071105d35a4f53d4cce121956e4d95e2b7a9ab9dd9fbf1009c5f54c34776e1f724c3fd171eb5b6ff41db0dbe2fce07' '8ed59f0237d4becee71c5f79dd434972eda3a02c56c29642f69c8ac7e638d866df633e0e087b4392bb74017b6ea3641fd6155d86f0c71fc188be19e7a81cc23b' @@ -214,7 +213,8 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 '6f79418343f29e3758e826417e475d957e0c372fab8c06855f5a86b4636ce6e8c68a770a4a3ec327361ec69d042d627062b2c2db23e5e437cef855683242545e' 'bf952e4c5e8ad3851f2ab5a812fdf65e0a6e7e1726150d7fa6cb582f4408eed85edc7b8cf9dabc07fab62217d14fa7ee5493b45bddb282da44247291e84c990d' 'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65' - '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3' + '658aa3ee025c940bcf378a226c9a68ab700aa4cde0ec97533f5ae9c0e851aa69830dd0a56bcfe76f88e3aead22e317c8c77f1d547206161414ab8773096beae6' + 'f0e398b0cf8d10a9e967b9706d368ddcd445912aebf47cb7f1dda9d8f49436d2793e96139e4de22376d96e0d0fb22942621d566fe888bd108f84eb038dc7c561' '58472d7cb093bd983833033bceededcc8c55b15ab2fdea10784c8292a30084e16c0f37a94006c8fa61dcbf9d00c2869503955972f746f592f3f851aec8f2f977' '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837' 'a611964c224c7751c3afeaadb159135e5ed5d87d3ed254be63b4b12450f4f63f414c90f8e29f3d14c0b854f4c9938bf5d12db69d2e258f1947e353302ca07da7' @@ -242,8 +242,8 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 '09ad88d1eebdb6433c2429cea4b775384b65d6cd52945e0de536dbac9fb6d9c345bec9bb49ede6fc6ce01a73e8297d3c8901c4e91d1b5a12eebc36ffd8c21ac4' '4a914e5120c223e6c1e221c692a1da7e67c13c2afbe273c54e214f7c4391805a13ee21fab5441104976caa5ee2eb8bdaccec89349b4e2eb823060e198f28d15a' '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a' - '739d0a1acbf6cdd1c6e78cac75a792d475b140219ffbf8c44d4db9fa82dc93f0822763be14c81afe69ab167a611a5d89fceb3df39d28b191835e14628c369140' - '50d4022cfac2d651f9e9746dc3590a63aab38ea11ae098abe04a7d509873c560e6999113dcffa64a0545e2ea25deb99edc9ae05fa00ecfb5984a4c155cd942d7' + '4a62198757fce259506600b44736c9859ba27325c6aecd1262a5457ece3563f29448b76f2429138445776a830dc22aa7687f58b1d58afe802735c8ebe4d906f3' + '8ec0d6dddb25698858c969814317767c9e22c63ee12155d0bb8f140883bbb00d4faf3d04d4c93ebf0349d37451d91ddc29849a766f15f058a20b124f1f934944' 'd5fcf6d5c7984d08cd6992809b3259f90196af5e8e4953754c04f722fea06ae995e1d51fbbea8cb462b7f896026c709928252413dbda4cec553684a6d2b5fca8' '0449ffab9ecf7183253cfb56c7bf489ca6f0a2002f96caa37f2cdb9c77e51e7f8561589e5179496cfb6760b1e8c34a5aefcce4fe0790cab81db3409582a2c835' 'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a' @@ -267,6 +267,7 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 '83d5a89f14ff8d79f90e677def2f58b1a8a0430ec16bbe3865315b63b3702e699bae157235e70a4c613e84f05b0f7ecf8de4ecef789cb8146edfbe92020c89f0' '60fac0fd3c098c8a38f634372b889c4ac7d2d61f1e08fd79b6216ee6a7116cadc06b974ab2ea5efc74801a9f4a8ad029dde973d1494f6467c57ac860be64acad' 'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273' + '097ddc360c282ba90b341f9df9e049056f462beb8f85de98551b9338ff96062cf85e4cd0a9ebf6896160f8143aa5d36ab406cb6ba73d361f364d379ee094b8cb' 'ccf74105e4268eaa35ba2a79b21c89ea5ce22f5d23c297688f5731681926536cfe0f430347fb6e6e70cac8110c7c64ca944b696b0248796434cf667db171e058' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' '1d54ef96ff6875878ac6a6992de7e23a7b98cb5b68d7e444c4f02a6628f657ad26efc757fbeaff34fc89d41fa440d8b57bd0eb437a9d04ad1e06a31ba148061c' @@ -286,7 +287,7 @@ b2sums=('1a311f72d159194d8737b75a484d015caf75a1920b1e9eaa0bdbcd9c0bb8aceda1f59a5 '5724d2bf6a163c7d4f4d1f3496550ce522c1cf980e0504fed67cd09d821a00115da94659ded9a3acdb0f0263c799733004c44d778cba8fdeafc6792c8a64ba97' '7fa5c97ffcc890baf991099e9b7a8b40821a50cb40a50502e7264a35892468536a222b34506b40a8151322af18ba19702cb6cb20c571b87ad7a6577aefe4ab6a' '5c605faf9fd815e39427722bf6f953cebbe77945e82b7415b7fecfba51978788298fac179ab0b26d28fc948679356f34dc2c475361c82d0149f9a9be04192ff1' - '978657c7b665b57acc5bffcafff55d289775c47bb7c45b924e89c09571bafbe85c5a122c40d9a76add3719c09ad237525493ae08d5501c174fc96720339e59d3') + '11ed6cc089964c4dc171b91f83f5ac041ced4b480151f77b21febafe392342ba4931af9c71266d4694a0ed236012ce2cbbb6ad58ff32721766cc4b88f9abe7e4') prepare() { # cd "${_pkgname}-${_pkgver}" @@ -359,10 +360,6 @@ prepare() { # Revert no gun mount slots patch patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-30_feat-content-weapon-mount-obsoletion-part-1-4179.patch - # Revert easy-mode changes making numerous food never rot - # offload to recipe rebalance mod - #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-29_feat-balance-port-Mainline-Nonperishable-Overhaul-s-.patch - # Revert craftable smokeless gunpowder. Not realistic and makes black powder obsolete. patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch @@ -396,9 +393,7 @@ prepare() { patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch # Revert ammo reblance 6,7,8 - #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-10_still-another-ammo-patch-to-undo.patch patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-09_undo-yet-more-ammo-balancing.patch - #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch # Fix the duplication of 4570_bp patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch @@ -416,9 +411,6 @@ prepare() { # Revert generic night vision. patch -NRp1 --no-backup-if-mismatch -i "$srcdir"/revert-03_generic-nv.patch - # Revert telescopic lenses. - patch -NRp1 --no-backup-if-mismatch -i "$srcdir"/revert-04_telescopic-lenses.patch - # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/revert-01_removed-traits.patch @@ -426,14 +418,6 @@ prepare() { # # # Various fixes for bugs I came across # # Ammo fixes echo "Applying ammo fixes" - # Fix mulitple inconsistent ammunition names and handloaded status. - # Offladed to ammo rebalance mod - #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch - - # Fix black powder scrap shot not being flagged as black powder. - # Offloaded to ammo rebalance mod - #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch - # Fix ammo ordering so as to not prevent those items being modded: # Having copy-from items occuring earlier in a json than the item being copied from prevents items based on it being modified. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-10_ammo-order-fix.patch @@ -466,9 +450,13 @@ prepare() { # # bionics fixes echo "Applying bionic fixes" + # Restore telescopic eyes. + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-01_restore-telescopic-eyes.patch + # Fix npc not being able to install some additional CBMs: # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels. - patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-01_npc-can-use-more-bionics.patch + # telescopic eyes, respirator, linguistic coprocessor, enhanced memory banks + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-02_npc-can-use-more-bionics.patch # # faction fixes @@ -723,6 +711,10 @@ prepare() { # This fixes some erroneous weapon listings in custom martial arts. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-03_fix-abstracts.patch + # Make plastic scraps stackable: + # As this also requires the type to be changed, this cannot be offloaded as a mod. + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-04_plastic-scrap-is-stackable.patch + # # # Various other fixes for bugs I came across that modify src echo "Applying source code fixes" @@ -799,6 +791,7 @@ prepare() { # Fix triffid queens from destroying terrain and burrowing to the center of the Earth: # The growplants function was destroying the terrain, not the furniture. # And since p is somehow being lost, the new terrain was never added. + # This workaround has the side effect of making triffid terraforming silent, but its better than burrowing. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-19_triffids-do-not-burrow.patch # Prevent gunmods from being holstered: (Still in testing) |