diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 317 |
1 files changed, 199 insertions, 118 deletions
@@ -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 MSX++UnDeadPeopleEdition Legacy tileset +# Arch version lacks the MSX++UnDeadPeopleEdition tileset # Arch version lacks the @ soundpack # Arch version lacks the CO.AG musicpack pkgbase=cataclysm-dda pkgname=(cataclysm-dda cataclysm-dda-tiles) pkgname=cataclysm-dda -pkgver=0.E.3 -_pkgver=0.E-3 -pkgrel=2.10 +pkgver=0.F.3 +_pkgver=0.F-3 +pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -27,74 +27,86 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/ "cataclysm-dda.desktop" "cataclysm-dda-tiles.desktop" - "0.F_backport-vehicle-heater-cooler-intensity-reduced.patch" - "0.F_backport-tacoma-barn-door-position.patch" - "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch" - "0.F_backport-map-note-colours.patch" - - "0001-quiverfull-house-correct-stairs.patch" - "0002-ankle-ammo-pouch-is-not-a-backpack.patch" - "0003-inconsistent-ammo-names.patch" - "0004-tacoma-clinic-add-missing-floor.patch" - "0005-lumbermill-gasoline-not-spilled.patch" - "0006-community-garden-fertilizer-not-spilled.patch" - "0007-oxyacetylene-from-oxygen.patch" - "0008-npc-can-use-more-bionics.patch" - "0009-22-casings-can-stack.patch" - "0010-4570-ammo-can-be-dismantled.patch" - "0011-add-missing-mre.patch" - "0012-fix-doors-for-npcs.patch" - "0013-fix-20x66mm-loudness.patch" - "0014-portable-generator-engine.patch" - "0015-normalize-drone-volume.patch" + "ammo-01_bugs.patch" + + "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" + + "foods-01_fix-food-materials.patch" + + "itemgroups-01_hk46-is-milspec.patch" + "itemgroups-02_fix-shelter-batteries.patch" + + "meds-01_antibiotics-unhealthy.patch" + + "mutations-01_fix-evac3-background-visible.patch" + + "npc-01_dialogue-fixes.patch" + + "recipes-01_dragon-can-be-dismantled.patch" + + "terrain-01_tacoma-clinic-add-missing-floor.patch" + "terrain-02_make-firestation-shelter-wells-npc-drinkable.patch" + + "tools-01_foldable-bottle-is-container.patch" + "tools-02_normalize-drone-volume.patch" + + "vehicles-01_portable-generator-engine.patch" + + "etc-01_fix-rubbersplosion.patch" + "etc-02_add-missing-price-postapoc.patch" "jc_ammo-loudness-ap-times-2.patch" "jc_allow-bio-firestarter-on-smoker.patch" - "jc_npcs-eat-when-hungry.patch" "jc_stop-non-faction-npc-sleep-depirvation.patch" + "jc_stop-non-faction-npc-malnourishment.patch" "jc_stop-sleeping-on-tables.patch" + "jc_allow-hacker-laptop.patch" + "jc_more-military-base-overmap.patch" + "jc_npc-eat-from-further-camp.patch" - "custom.patch" + "vampirism.patch" - "cataclysm-dda-tileset_undeadpeople-legacy.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople-legacy.git/snapshot/cataclysm-dda-tileset_undeadpeople-legacy-master.tar.xz" "cataclysm-dda-tileset_undeadpeople.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople.git/snapshot/cataclysm-dda-tileset_undeadpeople-master.tar.xz" - #"cataclysm-dda-mod_vampire-stuff-redone-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_vampire-stuff-redone-tileset.git/snapshot/cataclysm-dda-mod_vampire-stuff-redone-tileset-master.tar.xz" "cataclysm-dda-mod_battle-maid-redone-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_battle-maid-redone-tileset.git/snapshot/cataclysm-dda-mod_battle-maid-redone-tileset-master.tar.xz" "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=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0dd45e3d81a46b908b08e07b58a11a42ece4dd306f3e282805da121299f' +b2sums=('2e715ff131ce654b0ad6f18cb465b80ab55a09e5d48434a7d209454c9a2a952970f572bb81539bf071efe1292310f5b922c75a6c86ba360cca13dbeb91e13996' '8cff87d80bf30b86f995f77a97cc1ddb7b809148d100f3c0d74e706fe59eac52de55710fb7aed1abd59836c05f2474c7d68455736aac4f229d1cdf806d7240a1' '8ffff827ed464af678497da5129eb69d3d1a4c6994bbcc00ef7f7b240cd04e7961c3c0ac52d6940252241406c04e647fac19c9327847afced33988eb15973ba8' - '3659d59eec3167bdb647cb622f15fe899516980ac92972393589574db23a580368b449812ec75ec74cfb86082a1c12896fc9f26b7c16c36ed9ad8506d41eac67' - 'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3' - '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc' - 'd429bdf583ba6a69814f3a33a983650bcaa61b8edaed6560491972478515adb996482af248b10df8b4435bfad487ecba6c2ca0a249a4daee54994117a2742055' - '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa' - '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3' - '33a6f33ca9066ea7e190f017e0d57bd23b0ffb458944bd2a6f20f04ec7e1db43c34b64e606f2c0207ce500957230325116e9e00d92c51be280bda899c34d5580' + 'f71229fbaf2260602909187ba3894423a04c8625dc41813f2898faf4dcbeb6053007ea082201b1be68a59f6cbfd67e9e6a00d293e77c2f6bc1e225e3dc09ef9c' + '7ca2d6bbccb4ecb6495d9b7cc114194364c454f40163ac9420c5dceb2027429c9737bb837748987bf8e8b3143bef25552fc9bd7ae5d25a31f8df94ecb093bdc2' + 'a00106a04f63aeed03a81fb2a3ca6f321fa5c21d0d342753a56c9cccc9000dda9d6e2204368f00aa37c75ce35967b9ea2537b3e7a48ce6a486343c8c2d7f239f' + '900ec02ec9ec29a0b56341bbc9e947821e4c2c1f3e8914b2e59f317a2860d5b989afe5d1cd8585c60eb13b546167294a9253ad87a64775ad1d7152854bf6707a' + 'dd9026522976071a8cece8b935ab494e6a0e129b9242b043be3fbaa1478f75bedfbfab662d6286012fd5849e7b6bc097dea5de085d556bbfe1420d41ebddf81f' + '4d91e3555c0979bb59f8841588aefcb041e04b035931ec95bea519cb2c6df49e72029fa38104b7c80c157114d62203ce57b877dc338f3d2b8a6a5fb5dcef4784' + '31294c958b9c3d73cf460682f4a1260392b4e87fc04417e0d4ba02be73c3bd43f84537b30bcab09b7879f58c51cc2191d34ccef2f5fcec4d3dad7b1c522146e6' + '8c946f6f8302b7d184663d79805be93f22578ce11c18f7dbe8fabdddf85cd1cc0617af180fec1cbf3419e310fe57b510b9b961ba2b16c93ef8a66e45258d326e' + '33cbee2d251a4abf2ec507b31245205877d47152bd39000ea3058089b1fa45bbcb3624a7bbc58f394b1dd9710290f99c1708e3ece8221c71d760d67ff6965449' + '794ac1cfe88250e1717f3093ce999b1bd2cfaaaa3800d7ad0a13b720efbcc2795ed8c82d558b6b5909a8359178c70f21fe41b1c9ffe726a7a89537140801ef90' + 'd6421c0f12e7c1a08eee1918c349e7d88e21d5ab980a65ad5798ef3b61319bd4570ecaf8d007d9905f471b623c3633a31c471f34fe5955a8f71229dc0bc52dda' 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' - '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8' - '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501' - 'd34d673fe04d4317ef3c1ac3f088b6614f7c20414cfe44aa0ff71bdc932c517c4e6295492f158ced84232af8f54d1672ae56078b156593d58bf8fe7ffc3d475d' - '23a13fccf6514caa6ca23476fe2ce6df180720038c4bb2caa971ef42b31f214b07ed95650d2cb3df173590c8bec02986aced516a6b266cff557b5dcfb7d8ce48' - 'dd36b2b64e4999c0f188c837dae1f9c76d537a08b1c5996827a4d3028b688fe023be3711380189ed5c05316b17d6ab3e59669114ec699a3a0ee32808394ad12c' - 'c0d32a5edb420de5b2d95d1fed8753e9a6f45ab406aa2861dd5f038409c762ab40acdeec64b51713b71aa1453c0489a62af76534652a5c4d9634ac7e0eb431b4' - '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c' - '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3' - 'c1b6e59c840aee812570d9fb30f045b371473282c2289aaefe66483e6aae995fb93549882811fcb869d77f1c27a62ba4e486a8e20327846fd0602926739296ae' - '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a' - '8203bb062d72559da908a5020963503303c0aaa4a2ab61e57cfb713f58de40f1cb50b8b6dfbeec3a9addc41cbec5ae17fbf57230c3614f9b69fe6b0c55bf3fad' - '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' - 'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483' - 'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904' - 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600' - 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' - '8e5dbd01fff578c594b14f13c9108857888fe31169683692c17d813ccbac735c0cd68ac07b6c8351ea59457effa8f758b542f5e2c0a07568cb53b0a448c1620e' - 'b6a6c9c1791bc625b773aa1d0b90f98f0821aa06807353f1c179cbbb9090391e9ab7fe8d567a029bcf94dddf31c40d3e525d1033d2de81520726c0e69021f278' - '89a5a7548bb0d47c78e12db3c915f1f9647ebba66baf8e3f4ab9579f8023585a1ca8e4c33224b4290d37a6b97aaa2bca3d785b1c6a066a661fac80d80c4dea21' - '020f01c7cafede24e9eca44facf3beb638b51248ece3ff0d6f27af385c980c4a4c31cd9d69f1082c0204d13cddc39415c72d88e489ef689d72e35f6070f60b40' - 'f54bb10b6c5920b22942b1e312c315280afb720d3a897dce9333563cae3343668460d24b7d01bf36768974c729d92177e886f5ee0d22d746b19454a2ab6208fb' + '531f35be92feecdcc78faf4f76a538a075a144848b122616594eef7a0954aa6e2876f0007635a92f4be635060d0b58d943cd99dcec2889031363f7dd8d3bc58d' + '71ddf9190b79669f7e63973ce5b4b3fe0de5d78f52bd76fbe63608a5f330ea757458af2172d5588b59ba48f99c6f43ec051a066ff6bc07c13dd2c5e05d8161f7' + '8d6fd37497c2ce3c6e65933dded7cd27e165e74ce92cef01b4f1522cd550c8a4f227434d3e566f94e493c385226cf6ff52374d05686b203fd28fdca3babb471c' + 'b5567d516b344ceb382bb0253e2b87c90ddc5379afb76a7d384aec0829a6d8a3de2a1f55740871cd286a8cfa23ca635ee9e3f81faa9839dc10fb209955b63c78' + '22779d1418f24d382431078a3fe35790edbbcfa94ed4c9bf2b2698fe00dbe87466c3dc460b3f02710440db63cf1aa255ab6cf589b06d1e0cf49f512657d588b1' + '75b1410a950f3d964ed8b610af86f1a60f22ce4a4ebf242370a76e1c66f913c287f1b02dfa77c6d5901c77b060b6f432df06ed322b26fa71d180775f64afc57b' + '623a0b62417b626817e33f376c14df69211313388ab65451f5eec0c512ee61bfe54871e57f3a6d873392110b538ea7ad18d5e8ac100a71f7fc036a6818d602c2' + 'fd1fabe15fa3127cfa2b5e60928ee9b48a98bd6e1e5f8f66a3f6625e7d7e076e7eae3048f1bb5a8b4c554679b4a28de30b97eedcb979050d9115c1f2685aae7d' + 'f346172ac4fdac9ffd7000901f6b145ff45df8abf6c8d495204c08af1e9a34809259819925ebbd0a1e54336701a1d0409671acae6c7c538dfd77ab4d4a506be1' + '8bb83ab44365599cd58efef13ad0ddf7e6fbc62bf09523c029323efe2bfe2e80ed42dfbd790ade66d26e35e59de623133edb51b0a6dd81637928c205a08c1fc8' + 'd5287ddb4c38fbca9e6440e5243c718437660c9cf20a836baf1569575f6d953de8995641e6ec20a2a8859b9eefb5b975c416c4fe6f92f0916a5e21c3328d4fce' + '4e40bc796ebd7941f76d9f11cfa62d7fa6d83c386f325bbec7f2cac99619c059cbf4611fb40ca0d78c8aa2cd3dd15a14de1f144d6f853e96939924caa87dac75' + '831acc3935f1554a8385c804138a3d83423c5843824e7fbe01334c5d07accd826d9e14805584e6b91d9c6cdc4dbed99ffe32763440da07479f4f5480fbdb941b' + 'f13c5d89fdaf60621297e86537fc84992bec9d60446dfe41731abde53997223094b91cbf8173636241bc17ebd1f28cf3a33ece604ae67ea0b3c9b6a128c182f6' + 'a52e780086bfbc44e02de637ec03e99f4aacfc7471f9bc6f8650ad5b36694e4d17a2dcbbf8838e6ed2cd7ef85f43e82035771ad7f283c66dd55e2e4c4358ab84' + 'ea1ab36365d19be71bd6052e98082a8feb6bbdbe487e8e5795143ceb495059d157b034834bd532a80ccc5a16daa3c355dd56316a27936d441b7c9cc85e40f450' + 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' + '9d0e17552338c9d92ff696f1834a5d99c29d5dfbab6903b620410f62527a0ba60720c9ceec8e203b737f784ade8a53dbaca428ac7cc439f3f4f765aac7f1170f' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') prepare() { @@ -105,107 +117,179 @@ prepare() { sed -i 's/-Os/-O3/' Makefile - # Backports from 0.F - # Fix Vehicle Heater and Cooler to be less severe - patch -Np1 -i "$srcdir"/0.F_backport-vehicle-heater-cooler-intensity-reduced.patch + # # # Hotfixes + #echo "Applying hotfixes" + - # Fix tacoma barn doors being placed in the same spot twice - patch -Np1 -i "$srcdir"/0.F_backport-tacoma-barn-door-position.patch + # # # Various fixes for bugs I came across + # # Ammo fixes + echo "Applying ammo fixes" + # Fix mulitple inconsistent ammuntion names and handloaded status. + # Also Change reloaded_50bmg to be based on 50bmg: The id and description make it pretty clear that reloaded_50bmg is not supposed to be based on Match rounds. + # Also set a fixed loudness of 20x66mm shotgun shells like that of other shotguns: Other shotguns have fixed loudness to work around how the short range factors causes them to be far quieter than one would otherwise expect. + # Also 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 -i "$srcdir"/ammo-01_bugs.patch - # 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 - # Map note colour and symbols - patch -Np1 -i "$srcdir"/0.F_backport-map-note-colours.patch + # # armor fixes + echo "Applying armor fixes" + # Fix Ankle Ammo Pouch to not look like a backpack: + # SDG added a tile for ammo pouches to bypass this bug, but this fix still makes sense. + patch -Np1 -i "$srcdir"/armor-01_ankle-ammo-pouch-is-not-a-backpack.patch + # Fix fingerless survivor gloves losing base warmth: + # They lose warmth already from the lack of coverage, no need to double up. + patch -Np1 -i "$srcdir"/armor-02_fix-survivor-fingerless-gloves-warmth.patch - # Various other fixes for bugs I came across - # 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 - patch -Np1 -i "$srcdir"/0002-ankle-ammo-pouch-is-not-a-backpack.patch + # # bionics fixes + echo "Applying bionic fixes" + # Fix npc not being able to install some additional CBMs: + # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels. + patch -Np1 -i "$srcdir"/bionics-01_npc-can-use-more-bionics.patch - # Fix mulitple inconsistent ammuntion names and handloaded status - patch -Np1 -i "$srcdir"/0003-inconsistent-ammo-names.patch - # Fix missing floor in tacoma clinic - patch -Np1 -i "$srcdir"/0004-tacoma-clinic-add-missing-floor.patch + # # food fixes + echo "Applying food fixes" + # Fix several foods not being marked as the correct material: + # This prevents odd outcomes such as carnivores drinking almond/soy milk and eating peanut butter. + patch -Np1 -i "$srcdir"/foods-01_fix-food-materials.patch - # 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 - patch -Np1 -i "$srcdir"/0006-community-garden-fertilizer-not-spilled.patch + # # itemgroups fixes + echo "Applying itemgroup fixes" + # Stop police and SWAT carrying 4.6mm magazines despite having no compatible weapons: + # The H&K UCP was removed from the base game some time ago. + patch -Np1 -i "$srcdir"/itemgroups-01_hk46-is-milspec.patch - # Fix oxyacetylene to be craftable from oxygen tanks - patch -Np1 -i "$srcdir"/0007-oxyacetylene-from-oxygen.patch + # Fix items in unlooted, unused lockers and cabinets missing batteries: + # They need to be marked as the battery contained inside the item. + patch -Np1 -i "$srcdir"/itemgroups-02_fix-shelter-batteries.patch + + + # # monster fixes + echo "Applying medicine fixes" + # Add -4 health to antibiotics: + # weak are -2, strong are -10, this feels like a nice middle ground. + patch -Np1 -i "$srcdir"/meds-01_antibiotics-unhealthy.patch - # Fix npc not being able to install some additional CBMs: - # 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 - patch -Np1 -i "$srcdir"/0009-22-casings-can-stack.patch + # # monster fixes + #echo "Applying monster fixes" - # Fix reloaded 45-70 rounds not allowing dismantling when every other non-caseless does - patch -Np1 -i "$srcdir"/0010-4570-ammo-can-be-dismantled.patch - # Fix the pepperjack beef and burrito bowl MREs never dropping - patch -Np1 -i "$srcdir"/0011-add-missing-mre.patch + # # mutation fixes + echo "Applying mutation fixes" + # Fix Evacuee 3 background 3 being player visible: + # It was missing "player_display": false + patch -Np1 -i "$srcdir"/mutations-01_fix-evac3-background-visible.patch - # 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 - patch -Np1 -i "$srcdir"/0013-fix-20x66mm-loudness.patch + # # npc fixes + echo "Applying NPC fixes" + # Assorted typos in NPC dialogue. + patch -Np1 -i "$srcdir"/npc-01_dialogue-fixes.patch - # 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 - patch -Np1 -i "$srcdir"/0015-normalize-drone-volume.patch + # # recipe fixes + echo "Applying recipe fixes" + # Fix reloaded dragon shot not allowing dismantling when every other non-caseless round does. + patch -Np1 -i "$srcdir"/recipes-01_dragon-can-be-dismantled.patch - # Various other fixes for bugs I came across that modify src - # Fix ammo loudness mulitplying by six instead of two + # # terrain and overmap fixes + echo "Applying terrain and overmap fixes" + # Fix missing floor in the tacoma clinic: + # The hospital is still a mess. :/ + patch -Np1 -i "$srcdir"/terrain-01_tacoma-clinic-add-missing-floor.patch + + # Fix npcs unable to drink from firestation and shelter basecamps wells: + # They were missing the water_well blueprint_provides. + patch -Np1 -i "$srcdir"/terrain-02_make-firestation-shelter-wells-npc-drinkable.patch + + + # # tool fixes + echo "Applying tool fixes" + # Mark the foldable plastic bottle and steel water bottle as containers: + # Being counted as tools didn't seem to fit their role. + patch -Np1 -i "$srcdir"/tools-01_foldable-bottle-is-container.patch + + # Normalize the manhack volumes to that of the base grenade/explosive: + # I don't see how a c-4 manhack could be 1/4 the volume of a stick of c-4. + # Grenade hacks were also thrice as big as the base grenade. + patch -Np1 -i "$srcdir"/tools-02_normalize-drone-volume.patch + + + # # vehicle fixes + echo "Applying vehicle fixes" + # Replace the portable generator twin engine with a large 1 cylinder: + # This way it can actually function as is. + patch -Np1 -i "$srcdir"/vehicles-01_portable-generator-engine.patch + + + + # # Uncategorized for now + echo "Applying uncategorized fixes" + # Fix rubber items dismantling into 10x item volume of rubber. + patch -Np1 -i "$srcdir"/etc-01_fix-rubbersplosion.patch + + # Add price_postapoc to a number of items that did not have one set. + patch -Np1 -i "$srcdir"/etc-02_add-missing-price-postapoc.patch + + + # # # Various other fixes for bugs I came across that modify src + echo "Applying source code fixes" + # 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 NPCs not eating until they drop below normal weight and not becoming full from eating the basecamp stockpile - patch -Np1 -i "$srcdir"/jc_npcs-eat-when-hungry.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 NPCs preferring tables to cots or woodstoves to the floor + # 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. patch -Np1 -i "$srcdir"/jc_stop-sleeping-on-tables.patch + # Allow the hacker_laptop to utilize the extra functions. + patch -Np1 -i "$srcdir"/jc_allow-hacker-laptop.patch + + # Port the revised military base layout from BN to DDA + # Expand the overmap tiles for the miltiary base to be less MMMM + patch -Np1 -i "$srcdir"/jc_more-military-base-overmap.patch + + # Allow npcs to pull food from the camp larder at the full range of tiles camp actions can be assigned from: + # Should allow bases larger than 3x3 to have less food micromanagment for NPCs. + patch -Np1 -i "$srcdir"/jc_npc-eat-from-further-camp.patch + - # Some personal quirks that simply lack a means short of patching the source - patch -Np1 -i "$srcdir"/custom.patch + # # # Additional changes + echo "Applying vampirism patch" + # Add vampire mutation lines and modify a number of functions to facilitate these traits. + patch -Np1 -i "$srcdir"/vampirism.patch } build() { cd "Cataclysm-DDA-$_pkgver" #export CFLAGS="$CFLAGS -fPIE" - export CXXFLAGS="$CXXFLAGS -fPIE" + export CXXFLAGS="$CXXFLAGS -flto=auto -flto-odr-type-merging -fPIE" export LDFLAGS="$LDFLAGS,-pie" # tests "ifdef TILES" so "TILES=0" will enable tiles! # DYNAMIC_LINKING appears to be a windows flag? - make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 ZLEVELS=1 LTO=1 LOCALIZE=1 LANGUAGES=all - make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 ZLEVELS=1 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 RUNTESTS=0 LOCALIZE=1 LANGUAGES=all + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 RUNTESTS=0 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 ./lang/compile_mo.sh } package_cataclysm-dda() { cd "Cataclysm-DDA-$_pkgver" - make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LTO=1 LOCALIZE=1 LANGUAGES=all install + make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all install # Docs install -d "$pkgdir/usr/share/doc/cataclysm-dda" @@ -236,18 +320,15 @@ package_cataclysm-dda-tiles() { depends=('cataclysm-dda' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer') cd "Cataclysm-DDA-$_pkgver" - make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 ZLEVELS=1 TILES=1 SOUND=1 LTO=1 LOCALIZE=1 LANGUAGES=all install + make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 install # Icon - install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" - install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -D 'build-data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" + install -D 'build-data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "${srcdir}/$pkgname.desktop" "${pkgdir}/usr/share/applications/$pkgname.desktop" install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - # Tilesset (Legacy) - mv "$srcdir/cataclysm-dda-tileset_undeadpeople-legacy-master" "$srcdir/undeadpeople-legacy" - cp --reflink -r "$srcdir/undeadpeople-legacy" "$pkgdir/usr/share/cataclysm-dda/gfx" # Tileset mv "$srcdir/cataclysm-dda-tileset_undeadpeople-master" "$srcdir/undeadpeople" |