From 0660bea7009dcc07c2f3f879a6ccab2c3fe24243 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 12 Jun 2023 20:23:46 -0700 Subject: Updated to 2023-05-29-1207 --- PKGBUILD | 20 +++++---- foods-06_sealed-foods-not-full.patch | 81 ++++++++++++++++++++++++++++++++++++ npc-01_isherwood-update.patch | 10 ----- npc-08_nurse-takes-more-meds.patch | 4 +- revert-02_revert-book-revamp.patch | 9 +++- 5 files changed, 103 insertions(+), 21 deletions(-) create mode 100644 foods-06_sealed-foods-not-full.patch diff --git a/PKGBUILD b/PKGBUILD index 5f1398f..911081d 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=202305151323 -_pkgver=2023-05-15-1323 +pkgver=202305291207 +_pkgver=2023-05-29-1207 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -72,6 +72,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "foods-03_fix-mutant-bad-taste.patch" "foods-04_allow-canned-corn-as-veggy.patch" "foods-05_fix-missing-price-postapoc.patch" + "foods-06_sealed-foods-not-full.patch" "itemgroups-01_hk46-is-milspec.patch" "itemgroups-02_add-missing-mre.patch" @@ -147,12 +148,12 @@ 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=('41fd0bb08ee765400d80a116002b4a0608a1e554fa4dae950aae862c5d63ea561cc1e47b9d12a7b63f5c0a80329bb7674063b8f28a69206cbab8b7fde95388f3' +b2sums=('46b173c5a7a3f8394e671497fd69a303ae2f9808800603e9f2205645d02a332b280176d66baa1e3d9f37c9395ad63ea834ba1a3ef1dce2ec4096eddaf1445ebe' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' 'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c' - 'b143b75105f875159b7766b316c6e36feeba21bc5151fc11bb85785949e905dd964ec14b818e9424cc94773a001eb406cd5ef50fe1f73aacc7f2f82a3545b7ee' + '32b815e0bec49cd7f3a84fc25bd6926c752af923a1cf7ecc1fbb07d4cc5b484ec2854c3f05e3ffa45fd69ee37679c145c4486d2210ce7ba5de2025fadbf8a86c' 'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe' '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a' '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac' @@ -183,6 +184,7 @@ b2sums=('41fd0bb08ee765400d80a116002b4a0608a1e554fa4dae950aae862c5d63ea561cc1e47 '7da2d555f4b21da6704675400dc97367ff3e6bb60213d86c972b6740f074bcef98482ad7f759ddbee09f67d0ee8687c26c425d697ab586a784385971aec72bb0' 'c3b8dcce2fe41c8d9dab2d35d56304f426e06f9a6a220fcb2f413ac4aa32c7f466e2001cc7bf0bbf6127aeef55c837bb344f08afbb392f202c4ad8ce83a592a9' 'd0a2fcd9b3e88d15f817204c7799b0a2b7cd7f9bb830efc97970e9da466a2f458a414be8de93049078c1e5568238e6ee9c8ec22a296401f6dc569dfcc299b289' + '2274e759f16d9c20d19f0cec700bc0cae0b4c8e7543fc7afa0658e6065d4e91c9da7175209e48cc6660af9bd3cf1c6f488522b6fba9a6055103e5f493439fd87' '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46' '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c' 'dae75d9cd00f1f3ceabf257f1d82d245ace6582cf7ea98a40c1d1eb9b7e1832cb2a0c13f25c814a05a70931c42a06694a67829ea55554cc680eaa8ddf16c84a8' @@ -193,14 +195,14 @@ b2sums=('41fd0bb08ee765400d80a116002b4a0608a1e554fa4dae950aae862c5d63ea561cc1e47 '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d' 'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768' '0793bb7aa67d3989ef093cc17e6d9dd6d2e3999562fe1039b44f0fb9297623bda49271cb7b17d7fab4dc14299e0e5f13eb8f3711dbffc10bf7ffa68838f0585b' - '51cc7077b9bf14507a8fa95523af7179097d3ca6ec22be356e9fc8e2547c8c5f5e5df6d0cc4c3bfab37319bd8d59e4ac947074dde277843645b171af47b3fcc9' + '75877d9c6090a4e75529b1840f875ef04941a643c2c3b0c2e2a605c0d43d6b7ac23abf7f0316885441b8310f8a39339f2e12c7763b2d9875ee772949e6dcfcaa' '761938b9d05430a72ff1102671d963e44d647ddb63b9a6e78979f365c6cd1e98b6a3763a4b9667ca75fbf23ee3812b4f09838061e8ba101d89d6f4dbd1104dc0' 'bc5e233c9c5b7f799a126d51d672ad510ff4f6f75a573ea8b8e994d6be07375c0b4997acef16dacad555a7f36907a361f6cc4076b97d66c4c567dc9e707bc37e' '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08' 'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad' '93be2ff64a3217f92b369c067121683083859c7e939535e55f11818dc346d4862a50faa371315ad28ab54c9778c749d7684e8a7d68a18f774be3c2fe7891bd62' '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a' - '96c3fa92c54ac02f46a43781699e3bd457e57527fb5211037c0ed7be837d714c12c5d81696c6bddeb45ef2cb37220e73fa5c65016a10ca62e97545f941b7e611' + '739d0a1acbf6cdd1c6e78cac75a792d475b140219ffbf8c44d4db9fa82dc93f0822763be14c81afe69ab167a611a5d89fceb3df39d28b191835e14628c369140' 'f7a9c6d083f73c780be2f7ebf4e5e8deb4001aaca39b73ec9c6a5ef69f0621b45f9c384f32bc1c86cf238052ad77cf4703cc07886ede8bc62f19433d838b282a' '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b' '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d' @@ -273,7 +275,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-05-15-1323"|' Makefile + sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-05-29-1207"|' Makefile # # # Hotfixes @@ -415,6 +417,10 @@ prepare() { # Fruit slices were several times as valuable as canned fruit. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-05_fix-missing-price-postapoc.patch + # Fix several sealed foods spawning only half full: + # And one spawning double-full. + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/foods-06_sealed-foods-not-full.patch + # # itemgroups fixes echo "Applying itemgroup fixes" diff --git a/foods-06_sealed-foods-not-full.patch b/foods-06_sealed-foods-not-full.patch new file mode 100644 index 0000000..29fe344 --- /dev/null +++ b/foods-06_sealed-foods-not-full.patch @@ -0,0 +1,81 @@ +--- a/data/json/itemgroups/Food/food.json ++++ b/data/json/itemgroups/Food/food.json +@@ -16,13 +16,13 @@ + { "item": "fish_pickled", "prob": 30, "charges": 2, "container-item": "jar_glass_sealed" }, + { "item": "meat_canned", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_canned", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "apple_canned", "prob": 30, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "can_tomato", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "apple_canned", "prob": 30, "charges": 24, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "can_tomato", "prob": 40, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "meat_pickled", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "potted_meat", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_pickled", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "fish_pickled", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "sauce_red", "prob": 60, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "sauce_red", "prob": 60, "charges": 48, "container-item": "jar_3l_glass_sealed" }, + { "item": "kompot", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" } + ] + }, +@@ -249,15 +249,15 @@ + { "item": "potted_meat", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed" }, + { "item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "apple_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "apple_canned", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "offal_canned", "prob": 1, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "can_tomato", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "potted_meat", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "sauce_red", "prob": 4, "charges": 48, "container-item": "jar_3l_glass_sealed" }, + { "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "group": "big_canned_food", "prob": 4 } + ] +@@ -270,8 +270,8 @@ + { "item": "can_beans", "prob": 4, "charges": 12, "container-item": "can_food_big" }, + { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "can_food_big" }, + { "item": "can_pineapple", "prob": 3, "charges": 12, "container-item": "can_food_big" }, +- { "item": "can_corn", "prob": 3, "charges": 6, "container-item": "can_food_big" }, +- { "item": "sauce_red", "prob": 3, "charges": 96, "container-item": "can_food_big" }, ++ { "item": "can_corn", "prob": 3, "charges": 12, "container-item": "can_food_big" }, ++ { "item": "sauce_red", "prob": 3, "charges": 48, "container-item": "can_food_big" }, + { "item": "coffee_raw", "prob": 6, "charges": 240, "container-item": "can_food_big" } + ] + }, + +--- a/data/json/itemgroups/SUS/domestic.json ++++ b/data/json/itemgroups/SUS/domestic.json +@@ -148,7 +148,7 @@ + { + "distribution": [ + { "item": "coffee_raw", "prob": 50 }, +- { "item": "coffee_raw", "prob": 50, "charges": [ 1, 200 ], "container-item": "can_food_big" } ++ { "item": "coffee_raw", "prob": 50, "charges": 240, "container-item": "can_food_big" } + ], + "prob": 80 + }, + +--- a/data/json/itemgroups/collections_domestic.json ++++ b/data/json/itemgroups/collections_domestic.json +@@ -552,13 +552,13 @@ + { "item": "thermos", "prob": 15 }, + { "item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "apple_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "can_tomato", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "apple_canned", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" }, + { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +- { "item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, ++ { "item": "sauce_red", "prob": 4, "charges": 48, "container-item": "jar_3l_glass_sealed" }, + { "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, + { "group": "big_canned_food", "prob": 4 } + ] diff --git a/npc-01_isherwood-update.patch b/npc-01_isherwood-update.patch index 8a73b55..8ab7913 100644 --- a/npc-01_isherwood-update.patch +++ b/npc-01_isherwood-update.patch @@ -190,16 +190,6 @@ { "skill": "gun", "bonus": { "rng": [ 4, 8 ] } }, { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "survival", "bonus": { "rng": [ 3, 6 ] } }, -@@ -67,7 +67,8 @@ - { "item": "crossbow", "prob": 20 }, - { "item": "shortbow", "prob": 5 }, - { "item": "compbow", "prob": 15 }, -- { "item": "compositebow", "prob": 15 }, -+ { "item": "recurbow", "prob": 15 }, -+ { "item": "reflexbow", "prob": 10 }, - { "item": "longbow", "prob": 10 }, - { "item": "hand_crossbow", "prob": 15 }, - { "item": "selfbow", "prob": 5 } @@ -96,7 +97,7 @@ { "item": "cheese_hard", "prob": 50 }, { "item": "vinegar", "prob": 55 }, diff --git a/npc-08_nurse-takes-more-meds.patch b/npc-08_nurse-takes-more-meds.patch index 03b27ea..0724172 100644 --- a/npc-08_nurse-takes-more-meds.patch +++ b/npc-08_nurse-takes-more-meds.patch @@ -1,6 +1,6 @@ --- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json -@@ -36,25 +36,64 @@ +@@ -36,25 +36,62 @@ "repeat_responses": { "for_item": [ - "1st_aid", @@ -36,7 +36,6 @@ + "inj_vitb", + "inj_iron", + "iodine", -+ "makeshift_stethoscope", + "medical_gauze", + "medical_tape", "morphine", @@ -52,7 +51,6 @@ + "prussian_blue", "quikclot", + "saline", -+ "stethoscope", + "tea_bark", + "thermometer", + "thorazine", diff --git a/revert-02_revert-book-revamp.patch b/revert-02_revert-book-revamp.patch index d932ec1..d49a0eb 100644 --- a/revert-02_revert-book-revamp.patch +++ b/revert-02_revert-book-revamp.patch @@ -406,7 +406,7 @@ "//": "The ids below represent the Aarne-Thompson System of folklore classification. Do not change.", "snippet_category": [ { -@@ -217,458 +180,46 @@ +@@ -217,465 +180,53 @@ ] }, { @@ -854,6 +854,13 @@ - "time": "10 m" + "fun": -2 }, + { + "id": "necropolis_datasheet", + "type": "BOOK", + "name": { "str": "reclamation team report" }, + "description": "A short written report on the findings of a team sent to reclaim an underground civil defense shelter. It lists several hazards and technical problems encountered during their exploration of the site, but mentions several military systems they expect could be repaired and used for communication.", + "copy-from": "necropolis_freq" + }, { "id": "news_regional", "type": "BOOK", -- cgit v1.2.1