Changed restock time display

Author: PatrikLundell

data/json/npcs/godco/members/NPC_Kostas_Walsman.json

@@ -168,8 +168,8 @@
     "id": "TALK_GODCO_Kostas_Interval",
     "type": "talk_topic",
     "dynamic_line": [
-      "I'm afraid I haven't gone out there for a while, maybe come back on <restock_time_point>.  These are all I have, care to take a look?",
-      "Sorry these are all I have.  However I'll be back from my next run on <restock_time_point>.  Care to take a look in the meanwhile?"
+      "I'm afraid I haven't gone out there for a while, maybe come back after <restock_time_point>.  These are all I have, care to take a look?",
+      "Sorry these are all I have.  However I'll be back from my next run after <restock_time_point>.  Care to take a look in the meanwhile?"
     ],
     "responses": [
       { "text": "Alright, I'll take a look.", "effect": "start_trade", "topic": "TALK_GODCO_Kostas_1" },

data/json/npcs/lumbermill_employees/TALK_lumbermill_merchant.json

@@ -75,7 +75,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_LUMBERMILL_RESTOCK",
-    "dynamic_line": "Workers will bring in a new shipment of lumber on <restock_time_point>."
+    "dynamic_line": "Workers will bring in a new shipment of lumber after <restock_time_point>."
   },
   {
     "type": "talk_topic",

data/json/npcs/robofac/robofac_intercom/robofac_intercom.json

@@ -1069,8 +1069,8 @@
     "id": "TALK_ROBOFAC_INTERCOM_ASK_INTERVAL",
     "type": "talk_topic",
     "dynamic_line": [
-      "We have no other disposable equipment right now.  You'll have to come back on <restock_time_point>.",
-      "No. Come back on <restock_time_point>."
+      "We have no other disposable equipment right now.  You'll have to come back after <restock_time_point>.",
+      "No. Come back after <restock_time_point>."
     ],
     "responses": [ { "text": "Right…", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } ]
   }

data/json/npcs/scrap_trader/scrap_trader.json

@@ -363,7 +363,7 @@
   {
     "id": "TALK_SCRAP_TRADER_ASK_INTERVAL",
     "type": "talk_topic",
-    "dynamic_line": "Nope, although I have a really good claim by the river.  Gonna go fetch them soon, be right back on <restock_time_point>.",
+    "dynamic_line": "Nope, although I have a really good claim by the river.  Gonna go fetch them soon, be right back after <restock_time_point>.",
     "responses": [ { "text": "Well, good luck.", "topic": "TALK_NPC_SCRAP_TRADER" } ]
   }
 ]

data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json

@@ -42,7 +42,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_RANCH_SCAVENGER_ASK_RESTOCK",
-    "dynamic_line": "Nope, current run hasn't returned yet.  Come back on <restock_time_point>.  You might find something you like.",
+    "dynamic_line": "Nope, current run hasn't returned yet.  Come back after <restock_time_point>.  You might find something you like.",
     "responses": [ { "text": "Alright, thanks.", "topic": "TALK_RANCH_SCAVENGER_1" } ]
   },
   {

src/npctalk.cpp

@@ -2452,13 +2452,15 @@ void parse_tags( std::string &phrase, const_talker const &u, const_talker const
             } else if( get_option<bool>( "SHOW_MONTHS" ) && calendar::year_length() ==  364_days ) {
                 std::pair<month, int> month_day = month_and_day( guy->restock_time() );
                 //~ 1 is month, 2 is day
-                phrase.replace( fa, l, string_format( pgettext( "month and day", "%1$s %2$d" ),
-                                                      to_string( month_day.first ), month_day.second ) );
+                phrase.replace( fa, l, string_format( pgettext( "month, day and time", "%1$s %2$d, %3$s" ),
+                                                      to_string( month_day.first ), month_day.second,
+                                                      to_string_time_of_day( guy->restock_time() ) ) );
             } else {
                 //~ 1 is season, 2 is day
-                phrase.replace( fa, l, string_format( pgettext( "season and day", "%1$s %2$d" ),
+                phrase.replace( fa, l, string_format( pgettext( "season, day, and time", "%1$s %2$d, %3$s" ),
                                                       calendar::name_season( season_of_year( guy->restock_time() ) ),
-                                                      day_of_season<int>( guy->restock_time() ) ) );
+                                                      day_of_season<int>( guy->restock_time() ) + 1,
+                                                      to_string_time_of_day( guy->restock_time() ) ) );
             }
         } else if( tag.find( "<u_val:" ) == 0 ) {
             //adding a user variable to the string