Flamethrowers count as firestarters for lighting up bombs (CleverRave…

…n#77227) * Added `firestarter` `use_action` to `flamethrower_base` * Guns may use charges too
ShnitzelX2 · Oct 22, 2024 · aeaca88 · aeaca88
1 parent d961ddc
commit aeaca88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json
@@ -49,7 +49,8 @@
     "reload": 4,
     "flags": [ "NEVER_JAMS", "FIRESTARTER" ],
     "ammo_to_fire": 100,
-    "faults": [  ]
+    "faults": [  ],
+    "use_action": { "type": "firestarter" }
   },
   {
     "abstract": "launcher_base",

diff --git a/src/item.cpp b/src/item.cpp
@@ -12462,7 +12462,7 @@ bool item::use_charges( const itype_id &what, int &qty, std::list<item> &used,
             return VisitResponse::NEXT;
         }
 
-        if( e->is_tool() ) {
+        if( e->is_tool() || e->is_gun() ) {
             if( e->typeId() == what || ( in_tools && e->ammo_current() == what ) ) {
                 int n;
                 if( carrier ) {