summaryrefslogtreecommitdiff
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD20
1 files changed, 15 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index aaa0fc8..633f337 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@
pkgbase=cataclysm-bn
pkgname=(cataclysm-bn cataclysm-bn-tiles)
pkgname=cataclysm-bn
-pkgver=1918
-pkgrel=1.2
+pkgver=1999
+pkgrel=1
pkgdesc="A post-apocalyptic roguelike."
#url="http://cataclysmrl.blogspot.com/"
#url="http://www.cataclysm.glyphgryph.com/"
@@ -52,12 +52,14 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
"0017-nerf-lightstep.patch"
"0018-rehide-redacted.patch"
"0019-derelict-shed-is-s.patch"
+ "0020-hk46-is-milspec.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-sleeping-on-tables.patch"
+ "jc_allow-hacker-laptop.patch"
"custom.patch"
@@ -66,7 +68,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
"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=('e110bf9850881b436505d40e701740b80489f67284232b42cbf98d66121905b387517aff4ff8921174725cc3ca376beb2684d751790afbe5d1378e6d0096da41'
+b2sums=('2280b9d7898a0e76365811fa0fd62275a4f8641f20fb3b68c566d9a7278a9bbb69202e46baa7014e7fb75bbfcf6adc7c4aa9d88769066876cdfe45b814d0d41c'
'069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
'6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -93,13 +95,15 @@ b2sums=('e110bf9850881b436505d40e701740b80489f67284232b42cbf98d66121905b387517af
'08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
'651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3'
'7e41fc3a95073008ca2d71c2266d6d1a17af7803d493b447d40b15a86184c8ce3728b8d3d36765d408b1c46633d1bfa980d878cbac2e04b51ef518d44dfb7295'
+ '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
'92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
'8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56'
'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
+ 'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
'1fe0d7a8353323381690f68d678d8f5822dc9ccf73a117485fa9df9997d66406989b801e2f9a7c10a859ac333cb0a3d5843800be26cf58f825306103a03a2e0a'
- '28047befa046b0e7db7447d672d854666a13292fb2f9d5a53e056c58dd114a33db6054208e6c1bf16a6e12f9a54b26e88ed824b3d47537755b0950aa6dd509d0'
+ 'd45f849e595131c517f644e8a39473a4bec9515894b38d2e278a0b08c64c437fa755109077e98761166ce6eed227f5b8fb4fff9444670e583a49cbc778ba92f2'
'7613dbc937adf3bc962f1b94d6403ece380e0b235da56e1732e0bcb68f8bb234e8e18c956365e1a8158db7ed45125d163896ffd5f572242278098ef228c991cb'
'8fc23de05cc0d4ea63e921dd5c575ee83715753d2f2d0b9f0d503cb14a3263af4970fa5fb19a9b8387414b501f3dc4b8b6c91db4c929f9543556a7973a84a3b1'
'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -121,7 +125,7 @@ prepare() {
sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
# Fix version
- sed -i 's|VERSION = the-fork|VERSION = 1918|' Makefile
+ sed -i 's|VERSION = the-fork|VERSION = 1999|' Makefile
# gcc11 support
@@ -202,6 +206,9 @@ prepare() {
# 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
+ patch -Np1 -i "$srcdir"/0020-hk46-is-milspec.patch
+
# Various other fixes for bugs I came across that modify src
# Fix ammo loudness mulitplying by six instead of two
@@ -219,6 +226,9 @@ prepare() {
# 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
+
# Some personal quirks that simply lack a means short of patching the source
patch -Np1 -i "$srcdir"/custom.patch