From 5bef40b21d3533cf0d851b35dab9d77e422944c2 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 22 Aug 2021 10:16:03 -0700 Subject: Updated to 2021-08-22-0722 Remove no longer neccessary metal doors patch Remove now obsolete hunger patch Update restore infection immune patch to account for the removal of tetanus --- 0025-fix-open-metal-doors.patch | 11 ----- PKGBUILD | 22 +++------- jc_npcs-eat-when-hungry.patch | 29 ------------- jc_restore-inf-immune.patch | 92 ----------------------------------------- 4 files changed, 6 insertions(+), 148 deletions(-) delete mode 100644 0025-fix-open-metal-doors.patch delete mode 100644 jc_npcs-eat-when-hungry.patch diff --git a/0025-fix-open-metal-doors.patch b/0025-fix-open-metal-doors.patch deleted file mode 100644 index f0369ef..0000000 --- a/0025-fix-open-metal-doors.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/data/json/furniture_and_terrain/terrain-doors.json -+++ b/data/json/furniture_and_terrain/terrain-doors.json -@@ -2152,7 +2152,7 @@ - "symbol": "+", - "looks_like": "t_door_metal_lab_o", - "color": "cyan", -- "move_cost": 1, -+ "move_cost": 2, - "roof": "t_flat_roof", - "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "BURROWABLE" ], - "bash": { diff --git a/PKGBUILD b/PKGBUILD index 00ec88f..8ba2b2a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,9 +13,9 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202108171012 -_pkgver=2021-08-17-1012 -pkgrel=3 +pkgver=202108220722 +_pkgver=2021-08-22-0722 +pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -57,12 +57,10 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "0022-fix-evac3-background-visible.patch" "0023-fix-rubbersplosion.patch" "0024-ammo-order-fix.patch" - "0025-fix-open-metal-doors.patch" "0026-fix-brioche-cooking-time.patch" "jc_ammo-loudness-ap-times-2.patch" "jc_allow-bio-firestarter-on-smoker.patch" - "jc_npcs-eat-when-hungry.patch" "jc_stop-non-faction-npc-sleep-depirvation.patch" "jc_stop-non-faction-npc-malnourishment.patch" "jc_stop-sleeping-on-tables.patch" @@ -77,7 +75,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=('a382f7bbd31862cb4568d9510718d4586931294629f99cd753ae9f494532a854946d2dafbe3bf4700fe2577693d1a1c989d6cf902e8d52eb9f744106e5e5e479' +b2sums=('ca059606bcb3e92ae9ad5ecd50bd2a6f0ef53f5ec9629db815b34df1cbad3797037a1bd68bcdc0c78f67de49afb7f8759c64f36c142baf63bdfc989d7bc482d9' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -107,16 +105,14 @@ b2sums=('a382f7bbd31862cb4568d9510718d4586931294629f99cd753ae9f494532a854946d2da 'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768' 'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994' 'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962' - '067dc37b995fc75ee720a4738c9ba43774c57331d53da4d82edcd954c94baf4e40c101aa20bdba7fa5c5ae2fda836c5b7405f7837c19b41bb4b2e9e25c44d242' 'c37cd997666836479a7a17a57c007ded373c03b10c59c68d594675a41a362cbff9d1b584581bff899d31221e8719cd51516904fa0f72ae343c6ea06ed4acc70d' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' 'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9' - '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56' 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600' 'e5d7b75d3bced70d5f77bd8860c53f888b1f2495b4a6bf0b1284e3fc1e831a58bc691b4a11419cd7d14427165158d7ebf3f5c690733e4f3ee5194b9bf9bd001a' 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' 'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9' - '0bc675f798113cc744337ac2864c54510af89fc59450a3bf250cc49c1a1b17ebeddc007e38491978d367555ed7f4895266d68f50f01d30f79a7cacdc01f0f207' + '749badf61daf2957ecc1ad880628e8ffa1fac70e08523151c86f17fec2e6a5e65240fa2545f54936163bdb1dc677a258d138ebccada1c54694d2a39d830d2755' '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42' 'e923c7c29e9301a1afe9a4679a96a1a58f0b6541e86181980e8283160347dfe166f63c53edb9b2a6d62be3713f74e7bb34bddb1798cafb88388922e22170cc96' '0cf2d5cbf60c4c4a52cb7f2ecd4dd1757a811e3b0b6b5606f4417ba95901479bfc3fc9270377d5c4d855a94cd841e07229415dacce3475dcb7f03b01ebc3b949' @@ -139,7 +135,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2021-08-17-1012|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2021-08-22-0722|' Makefile # Backports from 0.F @@ -224,9 +220,6 @@ prepare() { # Fix ammo ordering so as to not prevent those items being modded patch -Np1 -i "$srcdir"/0024-ammo-order-fix.patch - # Fix the t_door_metal_locked_o not allowing vehicles to pass - patch -Np1 -i "$srcdir"/0025-fix-open-metal-doors.patch - # Fix brioche bun missing a cooking time patch -Np1 -i "$srcdir"/0026-fix-brioche-cooking-time.patch @@ -238,9 +231,6 @@ prepare() { # Fix smoker racks not accepting bionic firestarter patch -Np1 -i "$srcdir"/jc_allow-bio-firestarter-on-smoker.patch - # Fix NPCs not eating until they drop below normal weight and not becoming full from eating the basecamp stockpile - patch -Np1 -i "$srcdir"/jc_npcs-eat-when-hungry.patch - # Fix Non-Player facton NPCs from becoming sleep deprived patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch diff --git a/jc_npcs-eat-when-hungry.patch b/jc_npcs-eat-when-hungry.patch deleted file mode 100644 index 1c7bf0c..0000000 --- a/jc_npcs-eat-when-hungry.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/npcmove.cpp -+++ b/src/npcmove.cpp -@@ -1858,7 +1858,9 @@ - } - - if( one_in( 3 ) && ( get_thirst() > thirst_levels::thirsty || -- get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() * 0.95 ) ) { -+ get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() * 0.95 || -+ ( get_hunger() > 160 && -+ ( get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() ) ) ) ) { - if( consume_food_from_camp() ) { - return npc_noop; - } -@@ -3820,13 +3822,14 @@ - return true; - } - faction *yours = g->u.get_faction(); -- int camp_kcals = std::min( std::max( 0, 19 * get_healthy_kcal() / 20 - get_stored_kcal() - -+ int camp_kcals = std::min( std::max( 0, get_healthy_kcal() - get_stored_kcal() - - stomach.get_calories() ), yours->food_supply ); - if( camp_kcals > 0 ) { - complain_about( "camp_food_thanks", 1_hours, "", false ); - mod_hunger( -camp_kcals ); - mod_stored_kcal( camp_kcals ); - yours->food_supply -= camp_kcals; -+ stomach.mod_calories( camp_kcals ); - return true; - } - complain_about( "camp_larder_empty", 1_hours, "", false ); diff --git a/jc_restore-inf-immune.patch b/jc_restore-inf-immune.patch index 399702f..dd95626 100644 --- a/jc_restore-inf-immune.patch +++ b/jc_restore-inf-immune.patch @@ -1,95 +1,3 @@ ---- a/src/game.cpp -+++ b/src/game.cpp -@@ -224,6 +224,7 @@ - - static const trait_id trait_BADKNEES( "BADKNEES" ); - static const trait_id trait_ILLITERATE( "ILLITERATE" ); -+static const trait_id trait_INFIMMUNE( "INFIMMUNE" ); - static const trait_id trait_INFRESIST( "INFRESIST" ); - static const trait_id trait_LEG_TENT_BRACE( "LEG_TENT_BRACE" ); - static const trait_id trait_M_IMMUNE( "M_IMMUNE" ); -@@ -9443,8 +9444,11 @@ - body_part_name_accusative( bp->token ), - m.has_flag_ter( "SHARP", dest_loc ) ? m.tername( dest_loc ) : m.furnname( - dest_loc ) ); -- if( !u.has_trait( trait_INFRESIST ) ) { -- u.add_effect( effect_tetanus, 1_turns, num_bp ); -+ if( ( u.has_trait( trait_INFRESIST ) ) && ( one_in( 1024 ) ) ) { -+ u.add_effect( effect_tetanus, 1_turns, num_bp, true ); -+ } else if( ( !u.has_trait( trait_INFIMMUNE ) || !u.has_trait( trait_INFRESIST ) ) && -+ ( one_in( 256 ) ) ) { -+ u.add_effect( effect_tetanus, 1_turns, num_bp, true ); - } - } - } ---- a/src/trapfunc.cpp -+++ b/src/trapfunc.cpp -@@ -50,6 +50,7 @@ - static const efftype_id effect_slimed( "slimed" ); - static const efftype_id effect_tetanus( "tetanus" ); - -+static const trait_id trait_INFIMMUNE( "INFIMMUNE" ); - static const trait_id trait_INFRESIST( "INFRESIST" ); - static const trait_id trait_WINGS_BIRD( "WINGS_BIRD" ); - static const trait_id trait_WINGS_BUTTERFLY( "WINGS_BUTTERFLY" ); -@@ -161,8 +162,13 @@ - c->deal_damage( nullptr, hit, d ); - - player *n = dynamic_cast( c ); -- if( n != nullptr && !n->has_trait( trait_INFRESIST ) ) { -- n->add_effect( effect_tetanus, 1_turns, num_bp ); -+ if( n != nullptr ) { -+ if( ( n->has_trait( trait_INFRESIST ) ) && ( one_in( 512 ) ) ) { -+ n->add_effect( effect_tetanus, 1_turns, num_bp, true ); -+ } else if( ( !n->has_trait( trait_INFIMMUNE ) || !n->has_trait( trait_INFRESIST ) ) && -+ ( one_in( 128 ) ) ) { -+ n->add_effect( effect_tetanus, 1_turns, num_bp, true ); -+ } - } - c->check_dead_state(); - } else { -@@ -196,8 +202,11 @@ - } else { - c->deal_damage( nullptr, bodypart_id( "foot_l" ), damage_instance( DT_CUT, rng( 6, 10 ) ) ); - c->deal_damage( nullptr, bodypart_id( "foot_r" ), damage_instance( DT_CUT, rng( 6, 10 ) ) ); -- if( !n->has_trait( trait_INFRESIST ) ) { -- n->add_effect( effect_tetanus, 1_turns, num_bp ); -+ if( ( n->has_trait( trait_INFRESIST ) ) && ( one_in( 256 ) ) ) { -+ n->add_effect( effect_tetanus, 1_turns, num_bp, true ); -+ } else if( ( !n->has_trait( trait_INFIMMUNE ) || !n->has_trait( trait_INFRESIST ) ) && -+ ( one_in( 35 ) ) ) { -+ n->add_effect( effect_tetanus, 1_turns, num_bp, true ); - } - } - c->check_dead_state(); -@@ -855,8 +864,11 @@ - n->add_msg_if_player( m_bad, _( "The spikes impale your %s!" ), - body_part_name_accusative( hit->token ) ); - n->deal_damage( nullptr, hit, damage_instance( DT_CUT, damage ) ); -- if( !n->has_trait( trait_INFRESIST ) ) { -- n->add_effect( effect_tetanus, 1_turns, num_bp ); -+ if( ( n->has_trait( trait_INFRESIST ) ) && ( one_in( 256 ) ) ) { -+ n->add_effect( effect_tetanus, 1_turns, num_bp, true ); -+ } else if( ( !n->has_trait( trait_INFIMMUNE ) || !n->has_trait( trait_INFRESIST ) ) && -+ ( one_in( 35 ) ) ) { -+ n->add_effect( effect_tetanus, 1_turns, num_bp, true ); - } - } - } else if( z != nullptr ) { -@@ -939,8 +951,11 @@ - n->add_msg_if_player( m_bad, _( "The glass shards slash your %s!" ), - body_part_name_accusative( hit->token ) ); - n->deal_damage( nullptr, hit, damage_instance( DT_CUT, damage ) ); -- if( !n->has_trait( trait_INFRESIST ) ) { -- n->add_effect( effect_tetanus, 1_turns, num_bp ); -+ if( ( n->has_trait( trait_INFRESIST ) ) && ( one_in( 256 ) ) ) { -+ n->add_effect( effect_tetanus, 1_turns, num_bp, true ); -+ } else if( ( !n->has_trait( trait_INFIMMUNE ) || !n->has_trait( trait_INFRESIST ) ) && -+ ( one_in( 35 ) ) ) { -+ n->add_effect( effect_tetanus, 1_turns, num_bp, true ); - } - } - } else if( z != nullptr ) { --- a/src/player.cpp +++ b/src/player.cpp @@ -84,6 +84,7 @@ -- cgit v1.2.1