diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-09-11 13:29:33 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-09-11 13:29:33 -0700 |
commit | ceb9f49045e4bed1a074752ca68d48a59a9d0a01 (patch) | |
tree | a6d95e711254ada6c4c8b6f711cd447f36276f44 /0005-allow-bio-firestarter-on-smoker.patch | |
parent | Rebuild for several mod updates (diff) | |
download | cataclysm-bn-ceb9f49045e4bed1a074752ca68d48a59a9d0a01.tar.xz |
Many rebuilds from mod updates
New hotfixes
Diffstat (limited to '0005-allow-bio-firestarter-on-smoker.patch')
-rw-r--r-- | 0005-allow-bio-firestarter-on-smoker.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/0005-allow-bio-firestarter-on-smoker.patch b/0005-allow-bio-firestarter-on-smoker.patch new file mode 100644 index 0000000..e81a493 --- /dev/null +++ b/0005-allow-bio-firestarter-on-smoker.patch @@ -0,0 +1,39 @@ +--- 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 ); |