From 9259c50a1b6d94a8db5b6deba8064c147a40e762 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 7 Feb 2023 10:52:14 -0800 Subject: Updated to 2023-01-28-1414 Added bionic price-postapoc patch. Added installable black box patch. Added NPC reloadable gas masks patch. --- PKGBUILD | 31 ++++++-- bionics-02_fix-bionic-prices.patch | 20 +++++ npc-11_npcs-reload-gas-mask.patch | 112 +++++++++++++++++++++++++++ vehicles-03_black-box-can-be-installed.patch | 14 ++++ 4 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 bionics-02_fix-bionic-prices.patch create mode 100644 npc-11_npcs-reload-gas-mask.patch create mode 100644 vehicles-03_black-box-can-be-installed.patch diff --git a/PKGBUILD b/PKGBUILD index 1957693..adde013 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,9 +15,9 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202301241843 -_pkgver=2023-01-24-1843 -pkgrel=1 +pkgver=202301281414 +_pkgver=2023-01-28-1414 +pkgrel=2 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -53,6 +53,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "armor-02_fix-survivor-fingerless-gloves-warmth.patch" "bionics-01_npc-can-use-more-bionics.patch" + "bionics-02_fix-bionic-prices.patch" "faction-01_more-factions.patch" "faction-03_fix-food-supply-calculations.patch" @@ -86,6 +87,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "npc-08_nurse-takes-more-meds.patch" "npc-09_broker-takes-more-foods.patch" "npc-10_bunker-merchant.patch" + "npc-11_npcs-reload-gas-mask.patch" "npc-20_dialogue-fixes.patch" "recipes-01_4570-dragon-can-be-dismantled.patch" @@ -106,6 +108,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "vehicles-01_portable-generator-engine.patch" "vehicles-02_fix-fbi-car-name.patch" + "vehicles-03_black-box-can-be-installed.patch" "etc-01_fix-rubbersplosion.patch" "etc-02_add-missing-price-postapoc.patch" @@ -128,7 +131,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=('fbd57a8fc1a6582653ecbceec434e8eb4671045f925900cb843ecbc9b9387a3ecc0c6cb8af96ec3f54658c723e2c399ab8a7a22fac3a828551af58412af2680d' +b2sums=('acf9139e8432942d2032657416c1e8ef141025a7191c4639069a5dfff891053c82399c525ea6fc1a4e78e77dc2b3399c74b8fa04037c46e232d29bde83ca1d2f' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -149,6 +152,7 @@ b2sums=('fbd57a8fc1a6582653ecbceec434e8eb4671045f925900cb843ecbc9b9387a3ecc0c6cb '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4' 'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65' '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3' + 'ee31032c9d960e4290dea08a97037f8566e35743e949d3d38f6e9ae76a736118d23c34ce7cd1b99d40460047f9fb6e54c52b156587bb76458942139e18dd82d8' '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c' '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837' 'a611964c224c7751c3afeaadb159135e5ed5d87d3ed254be63b4b12450f4f63f414c90f8e29f3d14c0b854f4c9938bf5d12db69d2e258f1947e353302ca07da7' @@ -173,6 +177,7 @@ b2sums=('fbd57a8fc1a6582653ecbceec434e8eb4671045f925900cb843ecbc9b9387a3ecc0c6cb 'ac1a522d84fcfdea371027d05d486b752f921d03280d3db38766945ddb22c8ece946a2a67cbba656c31486c68a49a557d692e971fd7fd8b220865a3178628674' '3bf7da4e2efabe6b050aa357ec74c120e184a0a1bc6d4342fbb03a3c0cd0bae58c9fc1cda5f69ffdcc7e48a34f51f4a18107163f99348d2504096bccfd1766a9' '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b' + '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d' 'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e' '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f' '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3' @@ -189,6 +194,7 @@ b2sums=('fbd57a8fc1a6582653ecbceec434e8eb4671045f925900cb843ecbc9b9387a3ecc0c6cb '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1' '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a' '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41' + '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0' 'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994' '989a8c00cba128496272e1f4aedd7a88099c93e8ac4ba7aebe2100907d3223affbcb21ba6290a50d9c0b3afb0a38d059774bebc63aeb7d0d337afdae2466ec27' '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a' @@ -202,7 +208,7 @@ b2sums=('fbd57a8fc1a6582653ecbceec434e8eb4671045f925900cb843ecbc9b9387a3ecc0c6cb '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b' 'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e' 'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5' - '9d2a56646b054c22ab15bce9c4bf94c45686236c41760ddfd559e77f05a4dee6e66f116ed80878571d9bdeeaf28412e963ef0ce7efb9531dac8852517079dd3a' + '4cfaecffb9d8d7ea41edb6ebaaf1ba19566355c726d07e2da44166c5179ec7ecf39f9b33c149f4371fbedb840b9086c3e4bfd1fac08a32c09dd13faf6b7efc6b' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' '14ef4cc6b05f8d9b0d6196c4b6f35cc8083bdf4820c19c320551158b47b570ee6b385f3d6b9888f614fb9d5325265feae810a2c5fff4a0deb42b01612bad6517' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') @@ -238,7 +244,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2023-01-24-1843"|' Makefile + sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2023-01-28-1414"|' Makefile # # # Hotfixes @@ -315,6 +321,10 @@ prepare() { # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels. patch -Np1 -i "$srcdir"/bionics-01_npc-can-use-more-bionics.patch + # Fix some CBMs having excessively high price_postapoc values: + # All other CBMs are fixed to 1000, so these now are too. + patch -Np1 -i "$srcdir"/bionics-02_fix-bionic-prices.patch + # # faction fixes echo "Applying faction fixes" @@ -427,6 +437,11 @@ prepare() { # Port the bunker merchant from DDA patch -Np1 -i "$srcdir"/npc-10_bunker-merchant.patch + # Fix npcs failing to reload activated gas masks: + # Most masks lacked a "charges_per_use: 1" field, required for npcs to know they can reload it. + # They still won't activate a fresh mask on their own though. :/ + patch -Np1 -i "$srcdir"/npc-11_npcs-reload-gas-mask.patch + # Assorted typos in NPC dialogue. # Fix Jack Isherwood mission listing 10 jars, when it is actually 20. patch -Np1 -i "$srcdir"/npc-20_dialogue-fixes.patch @@ -502,6 +517,10 @@ prepare() { # The stock name was clearly a typo of some sort. patch -Np1 -i "$srcdir"/vehicles-02_fix-fbi-car-name.patch + # Fix the black box to actually be installable: + # No tool provided screwing 3 and wrenching 3. + patch -Np1 -i "$srcdir"/vehicles-03_black-box-can-be-installed.patch + # # Uncategorized for now echo "Applying uncategorized fixes" diff --git a/bionics-02_fix-bionic-prices.patch b/bionics-02_fix-bionic-prices.patch new file mode 100644 index 0000000..027d1f5 --- /dev/null +++ b/bionics-02_fix-bionic-prices.patch @@ -0,0 +1,20 @@ +--- a/data/json/items/bionics.json ++++ b/data/json/items/bionics.json +@@ -1245,7 +1245,7 @@ + "name": { "str": "Linguistic Coprocessor CBM" }, + "description": "A microcomputer installed into the left hemisphere of your brain to increase the speed that it processes language. When installed, it provides a passive boost to reading speed.", + "price": 100000, +- "price_postapoc": 50000, ++ "price_postapoc": 1000, + "difficulty": 5 + }, + { +@@ -1255,7 +1255,7 @@ + "name": { "str": "Dopamine Stimulators CBM" }, + "description": "A set of tiny bionic nerve stimulators that install into the reward center of your brain. When run with bionic power, it periodically releases a hit of dopamine and other reward chemicals, inducing a state of euphoria and suppressing fear.", + "price": 1000000, +- "price_postapoc": 100000, ++ "price_postapoc": 1000, + "difficulty": 8 + }, + { diff --git a/npc-11_npcs-reload-gas-mask.patch b/npc-11_npcs-reload-gas-mask.patch new file mode 100644 index 0000000..6c25b02 --- /dev/null +++ b/npc-11_npcs-reload-gas-mask.patch @@ -0,0 +1,112 @@ +--- a/data/json/items/tool_armor.json ++++ b/data/json/items/tool_armor.json +@@ -1109,7 +1109,8 @@ + "max_charges": 100, + "initial_charges": 100, + "ammo": "gasfilter_s", +- "use_action": "GASMASK" ++ "use_action": "GASMASK", ++ "charges_per_use": 1 + }, + { + "id": "mask_gas", +@@ -1136,7 +1137,8 @@ + "max_charges": 100, + "initial_charges": 100, + "ammo": "gasfilter_m", +- "use_action": "GASMASK" ++ "use_action": "GASMASK", ++ "charges_per_use": 1 + }, + { + "id": "mask_gas_xl", +@@ -1163,7 +1165,8 @@ + "initial_charges": 100, + "ammo": "gasfilter_m", + "use_action": "GASMASK", +- "flags": [ "OVERSIZE", "SLEEP_IGNORE" ] ++ "flags": [ "OVERSIZE", "SLEEP_IGNORE" ], ++ "charges_per_use": 1 + }, + { + "id": "mask_fsurvivor", +@@ -1191,7 +1194,8 @@ + "initial_charges": 100, + "ammo": "gasfilter_m", + "use_action": "GASMASK", +- "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ] ++ "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ], ++ "charges_per_use": 1 + }, + { + "id": "mask_fsurvivorxl", +@@ -1219,7 +1223,8 @@ + "initial_charges": 100, + "ammo": "gasfilter_m", + "use_action": "GASMASK", +- "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "SUN_GLASSES", "SLEEP_IGNORE" ] ++ "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "SUN_GLASSES", "SLEEP_IGNORE" ], ++ "charges_per_use": 1 + }, + { + "id": "mask_bunker", +@@ -1248,7 +1253,8 @@ + "encumbrance": 20, + "coverage": 100, + "qualities": [ [ "GLARE", 2 ] ], +- "material_thickness": 3 ++ "material_thickness": 3, ++ "charges_per_use": 1 + }, + { + "id": "mask_hsurvivor", +@@ -1276,7 +1282,8 @@ + "environmental_protection": 1, + "environmental_protection_with_filter": 15, + "qualities": [ [ "GLARE", 1 ] ], +- "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ] ++ "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ], ++ "charges_per_use": 1 + }, + { + "id": "mask_lsurvivor", +@@ -1333,7 +1340,8 @@ + "environmental_protection": 1, + "environmental_protection_with_filter": 15, + "qualities": [ [ "GLARE", 1 ] ], +- "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ] ++ "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ], ++ "charges_per_use": 1 + }, + { + "id": "mask_survivorxl", +@@ -1361,7 +1369,8 @@ + "environmental_protection": 1, + "environmental_protection_with_filter": 15, + "qualities": [ [ "GLARE", 1 ] ], +- "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "SUN_GLASSES", "SLEEP_IGNORE" ] ++ "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "SUN_GLASSES", "SLEEP_IGNORE" ], ++ "charges_per_use": 1 + }, + { + "id": "mask_wsurvivor", +@@ -1389,7 +1398,8 @@ + "environmental_protection": 1, + "environmental_protection_with_filter": 15, + "qualities": [ [ "GLARE", 1 ] ], +- "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ] ++ "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES", "SLEEP_IGNORE" ], ++ "charges_per_use": 1 + }, + { + "id": "mask_wsurvivorxl", +@@ -1417,7 +1427,8 @@ + "environmental_protection": 1, + "environmental_protection_with_filter": 15, + "qualities": [ [ "GLARE", 1 ] ], +- "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "SUN_GLASSES", "SLEEP_IGNORE" ] ++ "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "SUN_GLASSES", "SLEEP_IGNORE" ], ++ "charges_per_use": 1 + }, + { + "id": "goggles_nv", diff --git a/vehicles-03_black-box-can-be-installed.patch b/vehicles-03_black-box-can-be-installed.patch new file mode 100644 index 0000000..aef147b --- /dev/null +++ b/vehicles-03_black-box-can-be-installed.patch @@ -0,0 +1,14 @@ +--- a/data/json/vehicleparts/vehicle_parts.json ++++ b/data/json/vehicleparts/vehicle_parts.json +@@ -637,7 +637,10 @@ + "broken_color": "dark_gray", + "flags": [ "NO_REPAIR" ], + "requirements": { +- "install": { "skills": [ [ "mechanics", 2 ] ], "qualities": [ { "id": "SCREW", "level": 3 }, { "id": "WRENCH", "level": 3 } ] }, ++ "install": { ++ "skills": [ [ "mechanics", 2 ] ], ++ "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ] ++ }, + "removal": { "skills": [ [ "mechanics", 2 ] ], "using": [ [ "vehicle_screw", 1 ] ] } + }, + "breaks_into": [ -- cgit v1.2.1