summaryrefslogtreecommitdiff
path: root/src-03_allow-bio-firestarter-on-smoker.patch
blob: 21043e670631de6b0328a4b306602b029da65e28 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
--- 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 );