diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-01-18 05:01:02 -0800 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-01-18 05:01:02 -0800 |
commit | 42209cb39a6d278e0c3ad9dafd13bba47d3f9adb (patch) | |
tree | 45be71d6fb9f07a843180e65c2b46a995d3a7ba7 /0005-allow-bio-firestarter-on-smoker.patch | |
parent | Update ammo names patch (diff) | |
download | cataclysm-bn-42209cb39a6d278e0c3ad9dafd13bba47d3f9adb.tar.xz |
Revert the npc sleep on tables patch
Add patch to prevent non-faction NPCs becoming sleep deprived
Diffstat (limited to '0005-allow-bio-firestarter-on-smoker.patch')
-rw-r--r-- | 0005-allow-bio-firestarter-on-smoker.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/0005-allow-bio-firestarter-on-smoker.patch b/0005-allow-bio-firestarter-on-smoker.patch deleted file mode 100644 index e81a493..0000000 --- a/0005-allow-bio-firestarter-on-smoker.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/src/iexamine.cpp -+++ b/src/iexamine.cpp -@@ -4868,18 +4868,30 @@ - return; - } - -- if( !p.has_charges( "fire", 1 ) ) { -+ const bool has_bionic_firestarter = p.has_bionic( bio_lighter ) && -+ p.enough_power_for( bio_lighter ); -+ -+ if( !has_bionic_firestarter && !p.has_charges( "fire", 1 ) ) { - add_msg( _( "This smoking rack is ready to be fired, but you have no fire source." ) ); - return; - } else if( !query_yn( _( "Fire the smoking rack?" ) ) ) { - return; - } - -- p.use_charges( "fire", 1 ); -- for( auto &it : g->m.i_at( examp ) ) { -- if( it.has_flag( flag_SMOKABLE ) ) { -- it.process_temperature_rot( 1, examp, nullptr ); -- it.set_flag( flag_PROCESSING ); -+ if( has_bionic_firestarter ) { -+ for( auto &it : g->m.i_at( examp ) ) { -+ if( it.has_flag( flag_SMOKABLE ) ) { -+ it.process_temperature_rot( 1, examp, nullptr ); -+ it.set_flag( flag_PROCESSING ); -+ } -+ } -+ } else { -+ p.use_charges( "fire", 1 ); -+ for( auto &it : g->m.i_at( examp ) ) { -+ if( it.has_flag( flag_SMOKABLE ) ) { -+ it.process_temperature_rot( 1, examp, nullptr ); -+ it.set_flag( flag_PROCESSING ); -+ } - } - } - g->m.furn_set( examp, next_smoker_type ); |