Merge branch 'master' into testserver

Conflicts solved with -X theirs

1 files changed, 3 insertions, 1 deletions

diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index f4b08c1cf..e8ce86333 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -57,7 +57,7 @@ L_Checker:
     mesq l("Ship travels are not free. Also, I have a few friends on the Island, and I would like you to check out on them.");
     next;
     showavatar NPC_ELMO;
-    setcamnpc "Elmo";
+    setcamnpc instance_npcname("Elmo");
     mesn l("Elmo");
     mesq l("I, Elmo, captain's deputy, will help you to make the maximum possible money in Candor!");
     mesc l("Talk to Elmo to get an EXP UP Boost until level 15!"), 2;
@@ -72,6 +72,7 @@ L_Checker:
     mesc l("EXP Gain raised in @@% for one hour!", .@BONUS), 2;
     next;
     showavatar NPC_NARD;
+    setcamnpc;
     mesn;
     mesq l("After that, we're going to Tulimshar. Tulim is the most important city on the world, and the Alliance have an office there.");
     next;
@@ -224,6 +225,7 @@ L_NotYet:
         next;
         mesn;
         mesq l("The Alliance have records of everyone. And if you need another trip, talk to me!");
+        mesc l("PROTIP: Every quest you complete in a location, will make ship travels to and from them cheaper!");
 
     } else {
         mesq l("You still haven't completed your tasks.");