summaryrefslogtreecommitdiff
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD88
1 files changed, 47 insertions, 41 deletions
diff --git a/PKGBUILD b/PKGBUILD
index c4797e0..b9cd62c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
pkgname=cataclysm-dda
pkgver=0.E.3
_pkgver=0.E-3
-pkgrel=1.16
+pkgrel=1.17
pkgdesc="A post-apocalyptic roguelike."
#url="http://cataclysmrl.blogspot.com/"
#url="http://www.cataclysm.glyphgryph.com/"
@@ -26,24 +26,28 @@ makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle')
source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/archive/$_pkgver.tar.gz"
"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-vehicle-heater-cooler-intensity-reduced.patch"
+ "0.F_backport-tacoma-barn-door-position.patch"
+ "0.F_backport-make-firestation-shelter-wells-npc-drinkable.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-allow-bio-firestarter-on-smoker.patch"
- "0006-npcs-eat-when-hungry.patch"
- "0007-lumbermill-gasoline-not-spilled.patch"
- "0008-community-garden-fertilizer-not-spilled.patch"
- "0009-oxyacetylene-from-oxygen.patch"
- "0010-ammo-loudness-ap-times-2.patch"
- "0011-npc-can-use-soporific.patch"
- "0012-npc-can-use-gas-fuel.patch"
- "0013-22-casings-can-stack.patch"
- "0014-4570-ammo-can-be-dismantled.patch"
- "0015-stop-sleeping-on-tables.patch"
+ "0005-lumbermill-gasoline-not-spilled.patch"
+ "0006-community-garden-fertilizer-not-spilled.patch"
+ "0007-oxyacetylene-from-oxygen.patch"
+ "0008-npc-can-use-soporific.patch"
+ "0009-npc-can-use-gas-fuel.patch"
+ "0010-22-casings-can-stack.patch"
+ "0011-4570-ammo-can-be-dismantled.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"
+
"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-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"
@@ -58,17 +62,17 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
'af47a9372ba990bc97d17362c8d89847177e6cbefaa241c23bcdc670ef29d82bf150983f4c730753cabaa77a01f8e966307831cdc192a92237d5f3e8e6599d2b'
'd6b6e3572edb886eb721c50bd0e00ba110c7b226c94948189be63d5fa765cfa0785f2c5f8ffd9ce8b68f327ae20e9a1d419ad2857f5af7c069c4b8ba3ef99ac0'
'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
- 'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483'
- 'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
'85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
'58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
'd34d673fe04d4317ef3c1ac3f088b6614f7c20414cfe44aa0ff71bdc932c517c4e6295492f158ced84232af8f54d1672ae56078b156593d58bf8fe7ffc3d475d'
- '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
'9cf47504583e16ba2a826bf9431f83ffd57121becb7980bbfb6996929a6bbb5a872cd2c310c4e1d457d59205b0abac306291722aba27ab7fa5a0bf45314d8b56'
'20fbcff9879bdc06a40f56289396a03a9d6fad8aaa7ade0154c6397c0e842d0d4e12aa05fa305153bab0cffdaea670cc91882b8def07f5f422bf010c7fbbc806'
'dd36b2b64e4999c0f188c837dae1f9c76d537a08b1c5996827a4d3028b688fe023be3711380189ed5c05316b17d6ab3e59669114ec699a3a0ee32808394ad12c'
'c0d32a5edb420de5b2d95d1fed8753e9a6f45ab406aa2861dd5f038409c762ab40acdeec64b51713b71aa1453c0489a62af76534652a5c4d9634ac7e0eb431b4'
- '2ee472dca07bb8401040d4bb9358282de8fc76778bc294ce0ee255012519872f30043d7f7e9f08a7744b11c083daa07116ab2017a85786c692500b6484160f38'
+ '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
+ 'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483'
+ 'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
+ 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
'c5397b4b740966e4b75629d98021141686ac3150b3af803e59afa3b062ba561248c77cbf8e2b7f2a97a273e7fbfdd76ab76d6485344318d0cdb5bb374f46e4c3'
'f54bb10b6c5920b22942b1e312c315280afb720d3a897dce9333563cae3343668460d24b7d01bf36768974c729d92177e886f5ee0d22d746b19454a2ab6208fb'
'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -84,17 +88,17 @@ prepare() {
# 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
+ patch -Np1 -i "$srcdir"/0.F_backport-vehicle-heater-cooler-intensity-reduced.patch
# Fix tacoma barn doors being placed in the same spot twice
- patch -Np1 -i "$srcdir"/0.F-backport-tacoma-barn-door-position.patch
+ patch -Np1 -i "$srcdir"/0.F_backport-tacoma-barn-door-position.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
+ patch -Np1 -i "$srcdir"/0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch
# Various other fixes for bugs I came across
- # Fix Quiverfull house to have the correct stairs
+ # 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
@@ -106,38 +110,40 @@ prepare() {
# Fix missing floor in tacoma clinic
patch -Np1 -i "$srcdir"/0004-tacoma-clinic-add-missing-floor.patch
- # Fix smoker racks not accepting bionic firestarter
- patch -Np1 -i "$srcdir"/0005-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"/0006-npcs-eat-when-hungry.patch
-
# Fix lumbermill gasoline being spilled instead of being inside the gas pump
- patch -Np1 -i "$srcdir"/0007-lumbermill-gasoline-not-spilled.patch
+ 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"/0008-community-garden-fertilizer-not-spilled.patch
+ patch -Np1 -i "$srcdir"/0006-community-garden-fertilizer-not-spilled.patch
# Fix oxyacetylene to be craftable from oxygen tanks
- patch -Np1 -i "$srcdir"/0009-oxyacetylene-from-oxygen.patch
-
- # Fix ammo loudness mulitplying by six instead of two
- patch -Np1 -i "$srcdir"/0010-ammo-loudness-ap-times-2.patch
+ patch -Np1 -i "$srcdir"/0007-oxyacetylene-from-oxygen.patch
# Fix npc not being able to install soporific inducer
- patch -Np1 -i "$srcdir"/0011-npc-can-use-soporific.patch
+ patch -Np1 -i "$srcdir"/0008-npc-can-use-soporific.patch
# Fix npc not being able to install gasoline fuel cell
- patch -Np1 -i "$srcdir"/0012-npc-can-use-gas-fuel.patch
+ patch -Np1 -i "$srcdir"/0009-npc-can-use-gas-fuel.patch
# Fix .22 casings not stacking when every other casing stacks
- patch -Np1 -i "$srcdir"/0013-22-casings-can-stack.patch
+ patch -Np1 -i "$srcdir"/0010-22-casings-can-stack.patch
# Fix reloaded 45-70 rounds not allowing dismantling
- patch -Np1 -i "$srcdir"/0014-4570-ammo-can-be-dismantled.patch
+ patch -Np1 -i "$srcdir"/0011-4570-ammo-can-be-dismantled.patch
+
+
+ # Various other fixes for bugs I came across that modify src
+ # 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
+ 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 NPCs preferring tables, bumpers, and funnels to cots and bedrolls.
- patch -Np1 -i "$srcdir"/0015-stop-sleeping-on-tables.patch
+ # Fix Non-Player facton NPCs from becoming sleep deprived
+ patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch
}
build() {