From d07f3f6784c25e5ecd57d1143b151f8600c35954 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 5 Dec 2023 11:14:05 -0800 Subject: Fix Mr Lapin meet the Isherwood quest looping. Backport street light additions Rename farm mapgen fix patch Backport campground mapgen fixes Backport tileset updates Backport energy weapon mod fixes Backport mechsuit ID card fixes --- PKGBUILD | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index b2d8b7e..b562c74 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,7 +20,7 @@ _pkgname=Cataclysm-BN-cbn pkgver=0.4 #pkgver=202310040030 #_pkgver=2023-10-04-0030 -pkgrel=9 +pkgrel=12 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -42,7 +42,14 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "backport-03_feat-balance-power-armor-updates-3625.patch" "backport-03-2_fix-bugfixes-Fix-light-and-helmet-power-helms-having.patch" "backport-03-3_feat-balance-HEAVY_WEAPON_SUPPORT-flag-for-large-mut.patch" - "backport-04_fix-farm-mapgen-3715.patch" + "backport-04_feat-content-port-game-store-3469.patch" + "backport-04-2_Add-street-lights-to-remaining-shops-port-change-to-.patch" + "backport-05_fix-farm-mapgen-3715.patch" + "backport-06_fix-campground-mapgen-3702.patch" + "backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch" + "External_Tileset_DP_Normal.png" + "backport-08_feat-Convert-non-pistol-only-energy-weapon-mods-to-b.patch" + "backport-09_feat-balance-MILITARY_MECH-flag-affects-ID-card-need.patch" "revert-01_removed-traits.patch" "revert-02_revert-book-revamp.patch" @@ -173,7 +180,14 @@ b2sums=('4d47457c12a539ed6fa1c5b1351f473e43aecfe1e4f2aafd37e7068fc166d95c7f72980 'c7d5c65d71f87439ffece8f230257c03b066f90a9b94194a21a3d7a59057d12e2fbf4378d485623c635d3e077ab864a6e90b1173c899e31004c5315d6a2145fe' '20e5409086ab1927df3eab494d804d31d0544cd5444c166b760f7a7d574ea2975ad74d4d974d2e263f557f6a1e9757422dfee95b08f39db94a916372e1a1a2b1' 'fd7a7e216e3adda177a19747b5275a7222238c939e0d815e555665adbae18665db46e04691b95022aba14cf133110607dc10f6baf7540517314ebeb1b6bf2d69' + 'c5368de53a75e45f074acfc062cddcd07fc5615ecef77fe16b37ba7cec1ee7cea6ff1bd3b8fae66d51aab5f6ea43e39c372814064b2de5f4e0774531ace07290' + '67e6dccd3f6ed1b8ffddb631b8f81a4d1162349f96b7cf6eac2f73f43a2f076c2a9fcdf328c1f130461a14d308deaf19cf9c147eee41313afa823e9d2b5c51e1' 'd48d017ccf864d9cfd30051cc3bd94ca53c9a5982cc2d65ece9da487e3c6fcded2b83f95062227d8e778085aa578bfd0ab3c7f5cde095a5def3f7e52973bc5d1' + '2561b1ee8dac83b1b26049004fb6c5719441977d89af4e56458d464acf315ee1adddb8420ee077a6ab7fb014761540bcd3aef0451452d66b72b4efc6838cf48a' + 'c7321241e4bbe4bff078eb308a044568adcf57104284446c9f24399b37ac7693ac2203beff0a1e072d3db71380516ec5bdaac7338220886bd45f1cc670b5f2bb' + 'ba9a966dc826e5190adca3439da8e98eb493072e7df0ea5383e8d3eed7e22041c74368dfff9c8666cd800a552d156b11838aa961db73a485686d8939794189f4' + '03562be8187854c02003cbb40d021e2457bd6ba346ed0b106c40ad4fe4d700f83f463041c11da1076c2ec4440f2b03c013089c451491598f47ab64750e408205' + '7bc0e4907e069b40fdf06be91155f6bc99beeed425e20072d7dfa591977504c0959ad42f497cc0f33545c205028e823ef5c9cf568e51180a1fc65c3442812f86' 'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c' 'c2d6d7f74ada2ef54079fdf3759d9875552e2894dc8b753435acc692e705a9b297674eddb4e5a01a9269a84be7a82a8fef7e5762724b4d0f065976e877a05b00' 'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe' @@ -223,7 +237,7 @@ b2sums=('4d47457c12a539ed6fa1c5b1351f473e43aecfe1e4f2aafd37e7068fc166d95c7f72980 'bc5e233c9c5b7f799a126d51d672ad510ff4f6f75a573ea8b8e994d6be07375c0b4997acef16dacad555a7f36907a361f6cc4076b97d66c4c567dc9e707bc37e' '863676b5168dc2a63ad89a5c9de6f52b65a681954c7a646c2e9a9ca4decad871ab6674df7b8e6d4fa08e90ec0696771a2c5afce358e5e9b729adbd2fc7360aef' '6478e17056a909a6674721d496047e5b3abe2deaf355d4a90461daf702281f5c21acc5e4ccee394917f07e6f2065daf9405384061d80cc2e528ddd3369765b98' - '93be2ff64a3217f92b369c067121683083859c7e939535e55f11818dc346d4862a50faa371315ad28ab54c9778c749d7684e8a7d68a18f774be3c2fe7891bd62' + '49d39404138e5e45fdb05b772636388eb7aada9dab6e549904e4b87053329d9df506ad6f390d73fb25c518299459df657ca6e02142fed9d29f4cd1c5f89734d7' '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a' '739d0a1acbf6cdd1c6e78cac75a792d475b140219ffbf8c44d4db9fa82dc93f0822763be14c81afe69ab167a611a5d89fceb3df39d28b191835e14628c369140' 'f7a9c6d083f73c780be2f7ebf4e5e8deb4001aaca39b73ec9c6a5ef69f0621b45f9c384f32bc1c86cf238052ad77cf4703cc07886ede8bc62f19433d838b282a' @@ -323,8 +337,25 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-03-2_fix-bugfixes-Fix-light-and-helmet-power-helms-having.patch patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-03-3_feat-balance-HEAVY_WEAPON_SUPPORT-flag-for-large-mut.patch + # Backport streetlights and the game store required for it + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-04_feat-content-port-game-store-3469.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-04-2_Add-street-lights-to-remaining-shops-port-change-to-.patch + # Backport some farm fixes - patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-04_fix-farm-mapgen-3715.patch + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-05_fix-farm-mapgen-3715.patch + + # Backport some campground fixes + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-06_fix-campground-mapgen-3702.patch + + # Backport some external tileset changes + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-07_feat-interface-new-UDP-external-tileset-sprite-for-s.patch + cp -f "$srcdir"/External_Tileset_DP_Normal.png data/json/external_tileset/External_Tileset_DP_Normal.png + + # Backport energy weapon mod fixes + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-08_feat-Convert-non-pistol-only-energy-weapon-mods-to-b.patch + + # Backport industrial mech incorrectly requiring a military ID card + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/backport-09_feat-balance-MILITARY_MECH-flag-affects-ID-card-need.patch # # # Reverts -- cgit v1.2.1