From f94cd3732f27061b4e062d0118539b98b3d2f98a Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 9 Aug 2023 14:31:14 -0700 Subject: Updated to 2023-08-09-1840 --- PKGBUILD | 21 ++++++++---- npc-04_island-prison-update.patch | 71 ++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 01c8ece..b16084a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,8 +16,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202308031246 -_pkgver=2023-08-03-1246 +pkgver=202308091840 +_pkgver=2023-08-09-1840 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -118,6 +118,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "terrain-10_fix-milbase_minefield.patch" "terrain-11_clean-up-map-extras.patch" "terrain-12_add_fmc_stairs.patch" + "terrain-13_fix-lab-machinery-palette.patch" "tools-01_foldable-bottle-is-container.patch" "tools-03_shears-use-light-battery.patch" @@ -152,7 +153,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "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=('4386e0c0834934eb1c02f4a8fb663ac4e42df51efa5975df4373a96e4cd54a2da02ea96b7f5a5d356ba3be86c0719cdb80b97938af177a43290adc31c628f2c4' +b2sums=('c011a8d0f7476103c6b6725eebf7165efd7f750f1003ce32a9a166ec4b6287d88e470ac6d6413c638ad01f127137bc99ed013b564db5cccaf5917680f2ad5f6b' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -205,7 +206,7 @@ b2sums=('4386e0c0834934eb1c02f4a8fb663ac4e42df51efa5975df4373a96e4cd54a2da02ea96 '75877d9c6090a4e75529b1840f875ef04941a643c2c3b0c2e2a605c0d43d6b7ac23abf7f0316885441b8310f8a39339f2e12c7763b2d9875ee772949e6dcfcaa' '761938b9d05430a72ff1102671d963e44d647ddb63b9a6e78979f365c6cd1e98b6a3763a4b9667ca75fbf23ee3812b4f09838061e8ba101d89d6f4dbd1104dc0' 'bc5e233c9c5b7f799a126d51d672ad510ff4f6f75a573ea8b8e994d6be07375c0b4997acef16dacad555a7f36907a361f6cc4076b97d66c4c567dc9e707bc37e' - '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08' + '4b3c42cfb05c7d57644341366cc801282ebabfad6d9818f0012d433c9ba4b2b8499b20ed52486d9ee323b344bf5f6bc9c8c6a4a6c5d0a855c3022a7718d6c38d' 'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad' '93be2ff64a3217f92b369c067121683083859c7e939535e55f11818dc346d4862a50faa371315ad28ab54c9778c749d7684e8a7d68a18f774be3c2fe7891bd62' '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a' @@ -225,6 +226,7 @@ b2sums=('4386e0c0834934eb1c02f4a8fb663ac4e42df51efa5975df4373a96e4cd54a2da02ea96 'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd' 'f87e28d0b11fb19477a4d91d9d761e03293561a04543e405894cd6c1e63c0353626cb91a781410d299dc3ebcb290be6ceb822cb65c9530c356ac9d4787b322b7' '032c426a0e3a9d8282f5ce9ce4952bef051e2dedb0e56f90d9e18ccc32ea86acec84e42bcff695888f133a48b48418c59ea985dc9c5b179ca13cf9de44004618' + '05b040cf267056acbdd5fe0dcf0f4fc9c541075c33e425e74bc2b0a8420c8e76b188164022ad9af65b334dedf2b98727ba3b6b6a7419d4fdbec112ba9e3abb6a' '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d' '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac' '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1' @@ -247,9 +249,9 @@ b2sums=('4386e0c0834934eb1c02f4a8fb663ac4e42df51efa5975df4373a96e4cd54a2da02ea96 'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e' 'e0a9e8f1129650208f7a5a37680091a6d2abaa60f5d4fd7fc691854d49c9f59317ca18dbe764cb05cacd4a2a95de702bbdd072571862ee0b27bd8df3be7a5764' '7d747ca4aff9a6fea8bf4cc5ea9b6c4be65271ee3d3f9dd2ae5ac1b0cf382e252b2f26948adcfa5357fffacd7f96a3adbd914559efb6313a1374704a15f53fa7' - '547b8a4c377d56743ea034b49d11354741847c2968ddc4eb8af59098365a9671a0c093f20de71a57638a85d0abdddbb08409a45dafde9ca6c9e78846f545d904' + '9295e05268225c790bd5633cf33611177bbaf9c76143de56c066040f1f2969b435e38d190d69a1ea24caab9bd2e17864194e464d1bd1e08cd9a26bf93c225385' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' - '40992fa6797c7725cf025b59b1647f0cd382b4806af0f8617d7aea5ac68c1fb7f7e1e030734ae5ba9b6614d6577b6aa5d200b6e30ab4bee15d3be87f6afde329' + '712be0ea6edc2f16dfc4da4e4e62c46ba5e758f390fbad0709cedad66d69f20901ef7d6cfcc3e4a929efa3e7dcd4c0b4515eae11b34304361146881ebbcde997' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') prepare() { @@ -283,7 +285,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-08-03-1246"|' Makefile + sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-08-09-1840"|' Makefile # # # Hotfixes @@ -593,6 +595,11 @@ prepare() { # The roof has stairs down, but the main floor lacked a matching stairs up. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-12_add_fmc_stairs.patch + # Fix light machinery incorrectly appearing under various lab furniture + # All said items define C as the tile in question, but C is already in lab_palette as t_machinery_electronic. + # Changed all such C to K since it was unused in either lab_palette or lab_loot_home_office. + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-13_fix-lab-machinery-palette.patch + # # tool fixes echo "Applying tool fixes" diff --git a/npc-04_island-prison-update.patch b/npc-04_island-prison-update.patch index 193df11..ecb316c 100644 --- a/npc-04_island-prison-update.patch +++ b/npc-04_island-prison-update.patch @@ -1587,7 +1587,7 @@ ] --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json -@@ -733,31 +743,39 @@ +@@ -733,31 +743,42 @@ }, { "type": "item_group", @@ -1595,45 +1595,48 @@ - "//": "Police issue weapons of all types", + "id": "longguns_cop", "items": [ -- { "item": "ar15", "prob": 15, "charges-min": 0, "charges-max": 30 }, -- { "item": "cx4", "prob": 20, "charges-min": 0, "charges-max": 15 }, -- { "item": "fn57", "prob": 20, "charges-min": 0, "charges-max": 20 }, -- { "item": "fn_p90", "prob": 5, "charges-min": 0, "charges-max": 50 }, -- { "item": "glock_19", "prob": 15, "charges-min": 0, "charges-max": 15 }, -- { "item": "glock_22", "prob": 20, "charges-min": 0, "charges-max": 15 }, -- { "item": "hk_mp5", "prob": 10, "charges-min": 0, "charges-max": 30 }, -- { "item": "m9", "prob": 5, "charges-min": 0, "charges-max": 15 }, -- { "item": "mossberg_500", "prob": 15, "charges-min": 0, "charges-max": 8 }, -- { "item": "remington_700", "prob": 5, "charges-min": 0, "charges-max": 4 }, -- { "item": "remington_870", "prob": 20, "charges-min": 0, "charges-max": 6 }, -- { "item": "sig_40", "prob": 20, "charges-min": 0, "charges-max": 12 }, -- { "item": "usp_45", "prob": 10, "charges-min": 0, "charges-max": 12 }, -- { "item": "usp_9mm", "prob": 10, "charges-min": 0, "charges-max": 15 }, -- { "item": "kp32", "prob": 1, "charges-min": 0, "charges-max": 7 }, -- { "item": "kp3at", "prob": 2, "charges-min": 0, "charges-max": 6 }, -- { "item": "rugerlcp", "prob": 2, "charges-min": 0, "charges-max": 6 }, -- { "item": "kpf9", "prob": 3, "charges-min": 0, "charges-max": 7 } -+ { "item": "ar15", "prob": 20, "charges": [ 0, 30 ] }, -+ { "item": "mossberg_500", "prob": 10, "charges": [ 0, 6 ] }, -+ { "item": "remington_700", "prob": 5, "charges": [ 0, 4 ] }, -+ { "item": "remington_870", "prob": 10, "charges": [ 0, 5 ] } +- { "group": "nested_ar15", "prob": 15 }, +- { "group": "nested_cx4", "prob": 20 }, +- { "group": "nested_fn57", "prob": 20 }, +- { "group": "nested_fn_p90", "prob": 5 }, +- { "group": "nested_glock_19", "prob": 15 }, +- { "group": "nested_glock_22", "prob": 20 }, +- { "group": "nested_hk_mp5", "prob": 10 }, +- { "group": "nested_m9", "prob": 5 }, +- { "group": "nested_mossberg_500", "prob": 15 }, +- { "group": "nested_remington_700", "prob": 5 }, +- { "group": "nested_remington_870", "prob": 20 }, +- { "group": "nested_sig_40", "prob": 20 }, +- { "group": "nested_usp_45", "prob": 10 }, +- { "group": "nested_usp_9mm", "prob": 10 }, +- { "group": "nested_kp32", "prob": 1 }, +- { "group": "nested_kp3at", "prob": 2 }, +- { "group": "nested_rugerlcp", "prob": 2 }, +- { "group": "nested_kpf9", "prob": 3 } ++ { "group": "nested_ar15", "prob": 15 }, ++ { "group": "nested_mossberg_500", "prob": 15 }, ++ { "group": "nested_remington_700", "prob": 5 }, ++ { "group": "nested_remington_870", "prob": 20 } ] }, { "type": "item_group", + "id": "sidearms_cop", + "items": [ -+ { "item": "fn57", "prob": 20, "charges": [ 0, 20 ] }, -+ { "item": "glock_19", "prob": 15, "charges": [ 0, 15 ] }, -+ { "item": "glock_22", "prob": 20, "charges": [ 0, 15 ] }, -+ { "item": "m9", "prob": 5, "charges": [ 0, 15 ] }, -+ { "item": "sig_40", "prob": 20, "charges": [ 0, 12 ] }, -+ { "item": "usp_45", "prob": 10, "charges": [ 0, 12 ] }, -+ { "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] }, -+ { "item": "kp32", "prob": 1, "charges": [ 0, 7 ] }, -+ { "item": "kp3at", "prob": 2, "charges": [ 0, 6 ] }, -+ { "item": "rugerlcp", "prob": 2, "charges": [ 0, 6 ] }, -+ { "item": "kpf9", "prob": 3, "charges": [ 0, 7 ] } ++ { "group": "nested_cx4", "prob": 20 }, ++ { "group": "nested_fn57", "prob": 20 }, ++ { "group": "nested_glock_19", "prob": 15 }, ++ { "group": "nested_glock_22", "prob": 20 }, ++ { "group": "nested_m9", "prob": 5 }, ++ { "group": "nested_sig_40", "prob": 20 }, ++ { "group": "nested_usp_9mm", "prob": 10 }, ++ { "group": "nested_usp_45", "prob": 10 }, ++ { "group": "nested_kp32", "prob": 1 }, ++ { "group": "nested_kp3at", "prob": 2 }, ++ { "group": "nested_rugerlcp", "prob": 2 }, ++ { "group": "nested_kpf9", "prob": 3 }, ++ { "group": "nested_hk_mp5", "prob": 10 }, ++ { "group": "nested_fn_p90", "prob": 5 } + ] + }, + { -- cgit v1.2.1