Polishing up at Nard, you may travel to Tulim in peace, but no going back to Candor!

1 files changed, 13 insertions, 5 deletions

diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index 745f42ddf..ccaa684b1 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -39,8 +39,8 @@ L_Checker:
     if (.@nard > 4) goto L_Already;
     if (.@gugli == 2) goto L_Done;
     if (.@nard == 1) goto L_NotYet;
+    if (.@narrator == 1) goto L_Travel;
     if (LOCATION$ != "") goto L_NotYet;
-    if (.@narrator == 1) goto L_NotYet; // TODO
 
     mesn;
     mesq l("Hello.");
@@ -149,21 +149,29 @@ L_CandorIsland:
 
 L_NotYet:
     mesn;
-    .@price=2000-Zeny; // TODO: The price is 2 kGP, not 2 Billions
+    .@price=2000; // TODO: The price is 2 kGP, not 2 Billions
     if (Zeny >= .@price) {
         mesq l("Ten, fifty, thousand... Yep, this is the amount I've asked for.");
         next;
-        mesq l("Set sail! We're going to Tulishmar!");
-        set Zeny, Zeny-.@price;
         setq General_Narrator, 1;
+        set Zeny, Zeny-.@price;
         LOCATION$="Tulim";
+        mesq l("Set sail! We're going to Tulishmar!");
     } else {
         mesq l("You still haven't completed your tasks.");
         next;
-        mesq l("You still need @@ GP for the trip to Tulishmar.", .@price);
+        mesq l("You still need @@ GP for the trip to Tulishmar.", (.@price-Zeny));
     }
     close;
 
+L_Travel:
+    mesn;
+    mesq l("Hi @@.", strcharinfo(0));
+    next;
+    mesq l("You are currently at @@.", LOCATION$);
+
+    close;
+
 L_Done:
     mesn;
     mesq l("Hi @@.", strcharinfo(0));