diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-03 15:58:03 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-03 15:58:03 -0700 |
commit | 6b8d5abd7fc1d2f1d6f794640117c649eae3e01a (patch) | |
tree | 0ad0436287ad1f9bbd3cfb28f7574d5a6710592f /jc_allow-bio-firestarter-on-smoker.patch | |
parent | Updated to 2023-04-15-1344 (diff) | |
download | cataclysm-bn-6b8d5abd7fc1d2f1d6f794640117c649eae3e01a.tar.xz |
Updated to 2023-04-30-2223
Revert more ammo patches.
Revert more books patches.
Clean up old book patch.
Fix removed traits patch.
Fix bathroom fluff patch.
Remove obsolete vacutainer patch.
Rename source patches.
Diffstat (limited to 'jc_allow-bio-firestarter-on-smoker.patch')
-rw-r--r-- | jc_allow-bio-firestarter-on-smoker.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/jc_allow-bio-firestarter-on-smoker.patch b/jc_allow-bio-firestarter-on-smoker.patch deleted file mode 100644 index 21043e6..0000000 --- a/jc_allow-bio-firestarter-on-smoker.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/src/iexamine.cpp -+++ b/src/iexamine.cpp -@@ -2476,7 +2476,10 @@ - return; - } - -- if( !p.has_charges( itype_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( itype_fire, 1 ) ) { - add_msg( _( "This kiln is ready to be fired, but you have no fire source." ) ); - return; - } else { -@@ -4950,11 +4953,23 @@ - return; - } - -- p.use_charges( itype_fire, 1 ); -- for( auto &it : here.i_at( examp ) ) { -- if( it.has_flag( flag_SMOKABLE ) ) { -- it.process_rot( examp ); -- it.set_flag( flag_PROCESSING ); -+ const bool has_bionic_firestarter = p.has_bionic( bio_lighter ) && -+ p.enough_power_for( bio_lighter ); -+ -+ if( has_bionic_firestarter ) { -+ for( auto &it : g->m.i_at( examp ) ) { -+ if( it.has_flag( flag_SMOKABLE ) ) { -+ it.process_rot( examp ); -+ it.set_flag( flag_PROCESSING ); -+ } -+ } -+ } else { -+ p.use_charges( itype_fire, 1 ); -+ for( auto &it : g->m.i_at( examp ) ) { -+ if( it.has_flag( flag_SMOKABLE ) ) { -+ it.process_rot( examp ); -+ it.set_flag( flag_PROCESSING ); -+ } - } - } - here.furn_set( examp, next_smoker_type ); |