From b417c4b089561925a13aedfb455623615927bd92 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 31 May 2021 14:09:18 -0700 Subject: Updated to 1918 Fix VERSION again More reflink Remove obsolete ZLEVELS=1 cmakeflag Update custom patch so vampire and gynoid dreams work --- PKGBUILD | 28 ++++++++++++++++------------ custom.patch | 26 +++++++++++++++++++++++++- icon_128x128.png | Bin 0 -> 19094 bytes 3 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 icon_128x128.png diff --git a/PKGBUILD b/PKGBUILD index 1ab3953..aaa0fc8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,8 +12,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn -pkgver=1834 -pkgrel=1 +pkgver=1918 +pkgrel=1.2 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -26,6 +26,7 @@ makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle') source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/$pkgver.tar.gz" "cataclysm-bn.desktop" "cataclysm-bn-tiles.desktop" + "icon_128x128.png" "gcc11.patch" "0.F_backport-tacoma-barn-door-position.patch" @@ -65,9 +66,10 @@ 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=('9506e22590c26d87e9fbb47e3cfabd975ac36268eba7db36a034743a45d417d3499497d67a6ec7909eb964de41053594c9c2826ad4c4341d1604eb7ff19cbd4d' +b2sums=('e110bf9850881b436505d40e701740b80489f67284232b42cbf98d66121905b387517aff4ff8921174725cc3ca376beb2684d751790afbe5d1378e6d0096da41' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' + '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' '96c1c66079ec3e0a5ed19f22318f7db826d88fecd0a42181388454bce6781a5b5703dd492430fcb6a0a663e3fddfb1b5cee0bbfb29cdcf0c5f41d789781a8c23' 'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3' '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc' @@ -96,8 +98,8 @@ b2sums=('9506e22590c26d87e9fbb47e3cfabd975ac36268eba7db36a034743a45d417d3499497d '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56' 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600' 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' - '8d2085a7c7f0a38ea4feb213a99f2bd93ec98e91aa564f3aa54e39b9ed1dd901f0629c3c0715ce00d84286f3831e8901131eecd0e0e9e79bbbe7928673f4e081' - '5a2b07c6b220700df7186c85f1e382b3f2f94d2c86e7c75141d6dc425b9a97000afb35391fe12563bde6f4ccb42724ea11f84f1d855bbbae9a6fb75a00ef5af7' + '1fe0d7a8353323381690f68d678d8f5822dc9ccf73a117485fa9df9997d66406989b801e2f9a7c10a859ac333cb0a3d5843800be26cf58f825306103a03a2e0a' + '28047befa046b0e7db7447d672d854666a13292fb2f9d5a53e056c58dd114a33db6054208e6c1bf16a6e12f9a54b26e88ed824b3d47537755b0950aa6dd509d0' '7613dbc937adf3bc962f1b94d6403ece380e0b235da56e1732e0bcb68f8bb234e8e18c956365e1a8158db7ed45125d163896ffd5f572242278098ef228c991cb' '8fc23de05cc0d4ea63e921dd5c575ee83715753d2f2d0b9f0d503cb14a3263af4970fa5fb19a9b8387414b501f3dc4b8b6c91db4c929f9543556a7973a84a3b1' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') @@ -119,7 +121,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = the-fork|VERSION = 1834|' Makefile + sed -i 's|VERSION = the-fork|VERSION = 1918|' Makefile # gcc11 support @@ -231,15 +233,15 @@ build() { # 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 LTO=1 LOCALIZE=1 LANGUAGES=all + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 ./lang/compile_mo.sh } package_cataclysm-bn() { cd "Cataclysm-BN-$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 LTO=1 LOCALIZE=1 LANGUAGES=all install # Docs install -d "$pkgdir/usr/share/doc/cataclysm-bn" @@ -255,12 +257,12 @@ package_cataclysm-bn() { cd lang/mo for i in *; do install -d "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES" - cp "${i}/LC_MESSAGES/cataclysm-bn.mo" "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES" + cp --reflink "${i}/LC_MESSAGES/cataclysm-bn.mo" "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES" done # Help cd ./../.. - cp -r --no-preserve=ownership "./data/help" "${pkgdir}/usr/share/${pkgname}/" + cp -r --reflink --no-preserve=ownership "./data/help" "${pkgdir}/usr/share/${pkgname}/" # install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" } @@ -270,12 +272,14 @@ package_cataclysm-bn-tiles() { depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer') cd "Cataclysm-BN-$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 LTO=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 "${srcdir}/icon_128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" + install -D "${srcdir}/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" diff --git a/custom.patch b/custom.patch index 15b5ef5..8affbee 100644 --- a/custom.patch +++ b/custom.patch @@ -159,7 +159,31 @@ "TROGLO2", "TROGLO3", "URSINE_FUR", -+ "VAMPSKIN", ++ "VAMP_SKIN", "VISCOUS" ], "order": 1500 +--- a/src/player_hardcoded_effects.cpp ++++ b/src/player_hardcoded_effects.cpp +@@ -114,7 +114,9 @@ + static const trait_id trait_NOPAIN( "NOPAIN" ); + static const trait_id trait_SEESLEEP( "SEESLEEP" ); + static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" ); ++static const trait_id trait_THRESH_GYNOID( "THRESH_GYNOID" ); + static const trait_id trait_THRESH_MYCUS( "THRESH_MYCUS" ); ++static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" ); + static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); + + static void eff_fun_onfire( player &u, effect &it ) +@@ -1095,6 +1097,11 @@ + // Determine the strength of effects or dreams based upon category strength + int strength = 0; // Category too weak for any effect or dream + if( crossed_threshold() ) { ++ if( has_trait( trait_THRESH_VAMP ) ) { ++ highcat = "VAMP"; ++ } else if( has_trait( trait_THRESH_GYNOID ) ) { ++ highcat = "GYNOID"; ++ } + strength = 4; // Post-human. + } else if( highest >= 20 && highest < 35 ) { + strength = 1; // Low strength diff --git a/icon_128x128.png b/icon_128x128.png new file mode 100644 index 0000000..7aae88c Binary files /dev/null and b/icon_128x128.png differ -- cgit v1.2.1