diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-12-30 21:58:12 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-12-30 21:58:12 -0800 |
| commit | d4bc63a8f8ee37ec2de2f43734a60ca045e517c3 (patch) | |
| tree | d49d6000c1d82e7add7cfcccf873f85224ab823c /src-03_allow-bio-firestarter-on-smoker.patch | |
| parent | Fix Mr Lapin meet the Isherwood quest looping. (diff) | |
| download | cataclysm-bn-d4bc63a8f8ee37ec2de2f43734a60ca045e517c3.tar.xz | |
Updated to 0.5.1
Removed obsolete mods.
Revert removal of Alonso.
Revert biodiesel working in petrol engines.
Revert hard skill caps.
Revert three more broken limb changesets.
Revert another ammo rebalance changeset.
Revert craftable smokeless gunpowder changeset.
Revised book chapters revert patch.
Fix some bad terrain in the godco patch.
Fix some bad terrain in the prison island patch.
Diffstat (limited to 'src-03_allow-bio-firestarter-on-smoker.patch')
| -rw-r--r-- | src-03_allow-bio-firestarter-on-smoker.patch | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src-03_allow-bio-firestarter-on-smoker.patch b/src-03_allow-bio-firestarter-on-smoker.patch index 21043e6..5210727 100644 --- a/src-03_allow-bio-firestarter-on-smoker.patch +++ b/src-03_allow-bio-firestarter-on-smoker.patch @@ -12,31 +12,28 @@ add_msg( _( "This kiln is ready to be fired, but you have no fire source." ) ); return; } else { -@@ -4950,11 +4953,23 @@ +@@ -4950,10 +4953,21 @@ 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 ); +- if( it->has_flag( flag_SMOKABLE ) ) { +- 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 ); ++ for( auto &it : here.i_at( examp ) ) { ++ if( it->has_flag( flag_SMOKABLE ) ) { ++ 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 ); ++ for( auto &it : here.i_at( examp ) ) { ++ if( it->has_flag( flag_SMOKABLE ) ) { ++ it->set_flag( flag_PROCESSING ); + } } } |