Make purifying water take a reasonable amount of time

data/json/items/chemicals_and_resources.json

@@ -1007,6 +1007,7 @@
     "weight": "1 g",
     "color": "white",
     "use_action": "WATER_PURIFIER",
+    "purification_factor": 0,
     "container": "bottle_plastic_small",
     "comestible_type": "MED",
     "symbol": "!",

data/json/items/tool/cooking.json

@@ -125,6 +125,7 @@
     "max_charges": 150,
     "charges_per_use": 1,
     "use_action": "WATER_PURIFIER",
+    "purification_factor": 2,
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
   {
@@ -1000,6 +1001,7 @@
     "ammo": "battery",
     "charges_per_use": 1,
     "use_action": "WATER_PURIFIER",
+    "purification_factor": 1,
     "flags": [ "ALLOWS_REMOTE_USE" ],
     "magazines": [
       [

data/json/items/tool/misc.json

@@ -411,7 +411,8 @@
     "initial_charges": 4000,
     "max_charges": 4000,
     "charges_per_use": 1,
-    "use_action": "WATER_PURIFIER"
+    "use_action": "WATER_PURIFIER",
+    "purification_factor": 4
   },
   {
     "id": "makeshift_halberd",

data/json/player_activities.json

@@ -864,5 +864,14 @@
     "suspendable": false,
     "based_on": "neither",
     "no_resume": true
+  },
+  {
+    "id": "ACT_PURIFY_WATER",
+    "type": "activity_type",
+    "activity_level": "NO_EXERCISE",
+    "verb": "purifying the water",
+    "rooted": true,
+    "based_on": "time",
+    "auto_needs": true
   }
 ]

doc/JSON_INFO.md

@@ -1845,6 +1845,7 @@ CBMs can be defined like this:
 "cooks_like": "meat_cooked" // (Optional) If the item is used in a recipe, replaces it with its cooks_like
 "parasites": 10,            // (Optional) Probability of becoming parasitised when eating
 "contamination": [ { "disease": "bad_food", "probability": 5 } ],         // (Optional) List of diseases carried by this comestible and their associated probability. Values must be in the [0, 100] range.
+"purification_factor": 0,   // (Optional) If item is used to purify water, additional multiplicative factor to the time taken. 0 results in a constant time.
 ```
 
 ### Containers
@@ -2001,6 +2002,7 @@ Alternately, every item (book, tool, armor, even food) can be used as a gunmod i
 "ammo": [ "NULL" ],       // Ammo types used for reloading
 "revert_to": "torch_done", // Transforms into item when charges are expended
 "use_action": "firestarter" // Action performed when tool is used, see special definition below
+"purification_factor": 1    // (OPTIONAL) If item is used to purify water, additional multiplicative factor to the time taken. 0 results in a constant time.
 ```
 
 ### Seed Data

src/activity_actor.cpp

@@ -374,6 +374,41 @@ std::unique_ptr<activity_actor> migration_cancel_activity_actor::deserialize( Js
     return migration_cancel_activity_actor().clone();
 }
 
+void purify_water_activity_actor::start( player_activity &act, Character & )
+{
+    act.moves_total = moves;
+    act.moves_left = moves;
+}
+
+void purify_water_activity_actor::finish( player_activity &act, Character & )
+{
+    liquid.convert( "water_clean" ).poison = 0;
+
+    act.set_to_null();
+}
+
+void purify_water_activity_actor::serialize( JsonOut &jsout ) const
+{
+    jsout.start_object();
+
+    jsout.member( "moves", moves );
+    jsout.member( "liquid", liquid );
+
+    jsout.end_object();
+}
+
+std::unique_ptr<activity_actor> purify_water_activity_actor::deserialize( JsonIn &jsin )
+{
+    purify_water_activity_actor actor( new item(), 1 );
+
+    JsonObject data = jsin.get_object();
+
+    data.read( "moves", actor.moves );
+    data.read( "liquid", actor.liquid );
+
+    return actor.clone();
+}
+
 namespace activity_actors
 {
 

src/activity_actor.h

@@ -176,6 +176,31 @@ class migration_cancel_activity_actor : public activity_actor
         static std::unique_ptr<activity_actor> deserialize( JsonIn &jsin );
 };
 
+class purify_water_activity_actor : public activity_actor
+{
+    private:
+        item &liquid;
+        int moves;
+
+    public:
+        purify_water_activity_actor( item *liquid, int moves = 1 ) : liquid( *liquid ), moves( moves ) {}
+
+        activity_id get_type() const override {
+            return activity_id( "ACT_PURIFY_WATER" );
+        }
+
+        void start( player_activity &act, Character & ) override;
+        void do_turn( player_activity &, Character & ) override {};
+        void finish( player_activity &, Character & ) override;
+
+        std::unique_ptr<activity_actor> clone() const override {
+            return std::make_unique<purify_water_activity_actor>( *this );
+        }
+
+        void serialize( JsonOut &jsout ) const override;
+        static std::unique_ptr<activity_actor> deserialize( JsonIn &jsin );
+};
+
 namespace activity_actors
 {
 

src/item_factory.cpp

@@ -1690,6 +1690,7 @@ void Item_factory::load( islot_tool &slot, const JsonObject &jo, const std::stri
     assign( jo, "revert_to", slot.revert_to, strict );
     assign( jo, "revert_msg", slot.revert_msg, strict );
     assign( jo, "sub", slot.subtype, strict );
+    assign( jo, "purification_factor", slot.purification_factor, 0 );
 
     if( jo.has_array( "rand_charges" ) ) {
         if( jo.has_member( "initial_charges" ) ) {
@@ -1824,6 +1825,7 @@ void Item_factory::load( islot_comestible &slot, const JsonObject &jo, const std
     assign( jo, "spoils_in", slot.spoils, strict, 1_hours );
     assign( jo, "cooks_like", slot.cooks_like, strict );
     assign( jo, "smoking_result", slot.smoking_result, strict );
+    assign( jo, "purification_factor", slot.purification_factor, 0 );
 
     for( const JsonObject &jsobj : jo.get_array( "contamination" ) ) {
         slot.contamination.emplace( diseasetype_id( jsobj.get_string( "disease" ) ),

src/itype.h

@@ -104,6 +104,7 @@ struct islot_tool {
     int charges_per_use = 0;
     int turns_per_charge = 0;
     int power_draw = 0;
+    int purification_factor = 1;
 
     std::vector<int> rand_charges;
 };
@@ -189,6 +190,9 @@ struct islot_comestible {
         /** Chance the above monster group spawns*/
         int rot_spawn_chance = 10;
 
+        /** Additional multiplicative time factor for purifying water. 0 means a constant time */
+        int purification_factor = 0;
+
     private:
         /** effect on morale when consuming */
         int fun = 0;

src/iuse.cpp

@@ -2107,7 +2107,7 @@ int iuse::water_purifier( player *p, item *it, bool, const tripoint & )
         p->add_msg_if_player( m_info, _( "You cannot do that while mounted." ) );
         return 0;
     }
-    auto obj = g->inv_map_splice( []( const item & e ) {
+    item_location obj = g->inv_map_splice( []( const item & e ) {
         return !e.contents.empty() && e.contents.front().typeId() == "water";
     }, _( "Purify what?" ), 1, _( "You don't have water to purify." ) );
 
@@ -2122,9 +2122,25 @@ int iuse::water_purifier( player *p, item *it, bool, const tripoint & )
         return 0;
     }
 
-    p->moves -= to_moves<int>( 2_seconds );
+    int factor;
+    if( it->type->tool != NULL ) {
+        factor = it->type->tool->purification_factor;
+    } else if( it->type->comestible != NULL ) {
+        factor = it->type->comestible->purification_factor;
+    } else {
+        debugmsg( "ERROR: Water purifier not a tool or comestible" );
+        return 0;
+    }
+
+    /** A factor of 0 represents a constant time to purify, such as with water purification tablets. */
+    if( factor == 0 ) {
+        p->assign_activity( player_activity( purify_water_activity_actor( &obj->contents.front(),
+                                             to_moves<int>( 30_minutes ) ) ) );
+    } else {
+        p->assign_activity( player_activity( purify_water_activity_actor( &obj->contents.front(),
+                                             to_moves<int>( 2_minutes * liquid.charges * factor ) ) ) );
+    }
 
-    liquid.convert( "water_clean" ).poison = 0;
     return liquid.charges;
 }