Merge pull request #84437 from GuardianDll/matches

Author: Maleclypse

data/json/items/ammo.json

@@ -115,6 +115,7 @@
     "color": "red",
     "flags": [ "TRADER_AVOID" ],
     "material": [ "wood" ],
+    "use_action": { "type": "firestarter", "moves": 500, "moves_slow": 6000, "qualities_needed": { "STRIKING_SURFACE": 1 } },
     "ammo_type": "match"
   },
   {

data/json/items/tool/fire.json

@@ -179,6 +179,7 @@
     "symbol": ",",
     "color": "blue",
     "charges_per_use": 1,
+    "qualities": [ [ "STRIKING_SURFACE", 1 ] ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "holster": true, "ammo_restriction": { "match": 20 } } ],
     "//COMMENT": "Open flame or effectively so. ~5 seconds to transfer flame assuming optimal conditions, a minute at worst.",
     "use_action": { "type": "firestarter", "moves": 500, "moves_slow": 6000 },
@@ -221,6 +222,7 @@
     "symbol": ",",
     "color": "blue",
     "charges_per_use": 1,
+    "qualities": [ [ "STRIKING_SURFACE", 1 ] ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "holster": true, "ammo_restriction": { "match": 32 } } ],
     "//COMMENT": "Open flame or effectively so. ~5 seconds to transfer flame assuming optimal conditions, a minute at worst.",
     "use_action": { "type": "firestarter", "moves": 500, "moves_slow": 6000 },

data/json/tool_qualities.json

@@ -471,5 +471,11 @@
     "type": "tool_quality",
     "id": "THREAD_TAP",
     "name": { "str": "thread tapping" }
+  },
+  {
+    "type": "tool_quality",
+    "id": "STRIKING_SURFACE",
+    "//": "If item can be used to ignite matches.",
+    "name": { "str": "striking surface" }
   }
 ]

doc/JSON/ITEM.md

@@ -1333,7 +1333,8 @@ The contents of `use_action` fields can either be a string indicating a built-in
   "type": "firestarter",  // Start a fire, like with a lighter.
   "moves": 15,            // Number of moves it takes to start the fire. This is reduced by survival skill
   "moves_slow": 1500,     // Number of moves it takes to start a fire on something that is difficult to ignite. This is reduced by survival skill
-  "need_sunlight": true   // Whether the character needs to be in direct sunlight, e.g. to use magnifying glasses
+  "need_sunlight": true,   // Whether the character needs to be in direct sunlight, e.g. to use magnifying glasses,
+  "qualities_needed": { "WRENCH_FINE": 1 } // Tool qualities needed, e.g. "fine bolt turning 1"
 },
 "use_action": {
   "type": "unpack",                 // Unpack this item

src/iuse_actor.cpp

@@ -1383,6 +1383,7 @@ void firestarter_actor::load( const JsonObject &obj, const std::string & )
     optional( obj, false, "moves", moves_cost_fast, 100 );
     optional( obj, false, "moves_slow", moves_cost_slow, 1000 );
     optional( obj, false, "need_sunlight", need_sunlight, false );
+    optional( obj, false, "qualities_needed", qualities_needed );
 }
 
 std::unique_ptr<iuse_actor> firestarter_actor::clone() const
@@ -1532,6 +1533,30 @@ ret_val<void> firestarter_actor::can_use( const Character &p, const item &it,
         return ret_val<void>::make_failure( _( "You need direct sunlight to light a fire with this." ) );
     }
 
+    if( qualities_needed.empty() ) {
+        return ret_val<void>::make_success();
+    }
+
+    std::map<quality_id, int> unmet_reqs;
+    inventory inv;
+    inv.form_from_map( p.pos_bub( *here ), 1, &p, true, true );
+    for( const auto &quality : qualities_needed ) {
+        if( !p.has_quality( quality.first, quality.second ) &&
+            !inv.has_quality( quality.first, quality.second ) ) {
+            unmet_reqs.insert( quality );
+        }
+    }
+    if( unmet_reqs.empty() ) {
+        return ret_val<void>::make_success();
+    }
+    std::string unmet_reqs_string = enumerate_as_string( unmet_reqs.begin(), unmet_reqs.end(),
+    [&]( const std::pair<quality_id, int> &unmet_req ) {
+        return string_format( "%s %d", unmet_req.first.obj().name, unmet_req.second );
+    } );
+    return ret_val<void>::make_failure( n_gettext( "You need a tool with %s.",
+                                        "You need tools with %s.",
+                                        unmet_reqs.size() ), unmet_reqs_string );
+
     return ret_val<void>::make_success();
 }
 

src/iuse_actor.h

@@ -502,6 +502,9 @@ class firestarter_actor : public iuse_actor
          */
         bool need_sunlight = false;
 
+        /** Tool qualities needed, e.g. "fine bolt turning 1". **/
+        std::map<quality_id, int> qualities_needed;
+
         enum class start_type : int {
             NONE,
             FIRE,