Get time set correctly and containers handeld and medicine

src/achievement.cpp

@@ -536,7 +536,7 @@ std::string achievement_tracker::ui_text() const
             achievement_completion::failed,
             achievement_->time_constraint()->target(),
             current_values()
-        }. ui_text( achievement_ );
+        } . ui_text( achievement_ );
     }
 
     // First: the achievement name and description

src/activity_actor.cpp

@@ -22,6 +22,7 @@
 #include "npc.h"
 #include "output.h"
 #include "pickup.h"
+#include "player.h"
 #include "player_activity.h"
 #include "point.h"
 #include "timed_event.h"
@@ -33,6 +34,8 @@ static const skill_id skill_computer( "computer" );
 
 static const trait_id trait_ILLITERATE( "ILLITERATE" );
 
+static const std::string flag_USE_EAT_VERB( "USE_EAT_VERB" );
+
 void hacking_activity_actor::start( player_activity &act, Character & )
 {
     act.moves_total = to_moves<int>( 5_minutes );
@@ -409,16 +412,32 @@ std::unique_ptr<activity_actor> open_gate_activity_actor::deserialize( JsonIn &j
     return actor.clone();
 }
 
-void consume_activity_actor::start( player_activity &act, Character & )
+void consume_activity_actor::start( player_activity &act, Character &who )
 {
-    act.moves_total = to_moves<int>( 5_minutes );
-    act.moves_left = to_moves<int>( 5_minutes );
+    item &comest = who.get_consumable_from( *loc.get_item() );
+
+    const int charges = std::max( comest.charges, 1 );
+    int volume = units::to_milliliter( comest.volume() ) / charges;
+    int time = 0;
+    const bool eat_verb  = comest.has_flag( flag_USE_EAT_VERB );
+    if( eat_verb || comest.get_comestible()->comesttype == "FOOD" ) {
+        time = volume / 5;//Eat 5 mL (1 teaspoon) per second
+    } else if( !eat_verb && comest.get_comestible()->comesttype == "DRINK" ) {
+        time = volume / 15;//Drink 15 mL (1 tablespoon) per second
+    } else if( comest.is_medication() ) {
+        time = 30;//Medicine/drugs takes 30 seconds this is pretty arbitrary and should probable be broken up more but seems ok for a start
+    } else {
+        debugmsg( "Consumed something that was not food, drink or medicine/drugs" );
+    }
+
+    act.moves_total = time;
+    act.moves_left = time;
 }
 
 void consume_activity_actor::do_turn( player_activity &act, Character & )
 {
-    act.moves_left = act.moves_left-1;
-    g->u.moves -= 1;
+    act.moves_left = act.moves_left - 1;
+    g->u.moves -= 100;
 }
 
 void consume_activity_actor::finish( player_activity &act, Character &who )

src/activity_handlers.cpp

@@ -3059,19 +3059,16 @@ void activity_handlers::eat_menu_do_turn( player_activity *, player * )
 
 void activity_handlers::consume_food_menu_do_turn( player_activity *, player *p )
 {
-    p->cancel_activity();
     avatar_action::eat( g->u, game_menus::inv::consume_food( g->u ) );
 }
 
 void activity_handlers::consume_drink_menu_do_turn( player_activity *, player *p )
 {
-    p->cancel_activity();
     avatar_action::eat( g->u, game_menus::inv::consume_drink( g->u ) );
 }
 
 void activity_handlers::consume_meds_menu_do_turn( player_activity *, player *p )
 {
-    p->cancel_activity();
     avatar_action::eat( g->u, game_menus::inv::consume_meds( g->u ) );
 }
 

src/avatar_action.cpp

@@ -1080,9 +1080,9 @@ void avatar_action::eat( avatar &you, item_location loc )
         return;
     }
 
-      you.assign_activity( player_activity( consume_activity_actor(
-                                            loc
-                                        ) ) );    
+    you.assign_activity( player_activity( consume_activity_actor(
+            loc
+                                          ) ) );
 }
 
 void avatar_action::plthrow( avatar &you, item_location loc,

src/ranged.cpp

@@ -2789,9 +2789,11 @@ void target_ui::draw_controls_list( int text_y )
     }
     if( mode == TargetMode::Fire || mode == TargetMode::TurretManual ) {
         lines.push_back( {5, colored( col_enabled, string_format( _( "[%c] to switch firing modes." ),
-                                      bound_key( "SWITCH_MODE" ) ) )} );
+                                      bound_key( "SWITCH_MODE" ) ) )
+                         } );
         lines.push_back( {6, colored( col_enabled, string_format( _( "[%c] to reload/switch ammo." ),
-                                      bound_key( "SWITCH_AMMO" ) ) )} );
+                                      bound_key( "SWITCH_AMMO" ) ) )
+                         } );
     }
 
     // Shrink the list until it fits