Nard ship, probably final for a while - I will fix discount later

2 files changed, 44 insertions, 8 deletions

diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt
index f5a945e7d..071fea65e 100644
--- a/npc/002-1/arpan.txt
+++ b/npc/002-1/arpan.txt
@@ -165,7 +165,7 @@ L_Menu:
 L_Where:
     mes "";
     mesn;
-    mesq lg("You're on our ship, we made port to a little island and we're actually yeyending our long merchant traveling adventure at the city of Tulishmar.");
+    mesq lg("You're on our ship, we made port to a little island and we're actually yeyending our long merchant traveling adventure at the city of Tulimshar.");
     next;
     mesq l("We will be yaying there in a few days, so we will drop you off there.");
     next;
diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index ccaa684b1..08fe8357c 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -29,8 +29,10 @@
     .@gugli = getq(ShipQuests_Gugli);
     .@gado = getq(ShipQuests_ChefGado);
     .@narrator = getq(General_Narrator);
+    .@price=2000;
 
 L_Checker:
+    if (getq(CandorQuest_Barrel) == 4 && getq(CandorQuest_HAS) == 3) .@price-=500; // Check Elmo's script. You can do quests later... FOR NOW.
     if (.@gado > 3 && .@nard == 3) goto L_ChefQuestComplete;
     if (.@nard == 2) goto L_ChefQuestStart;
     if (.@nard == 3) goto L_ChefQuestGiven;
@@ -59,7 +61,7 @@ L_Checker:
     mesn;
     mesq l("Hehehe, he is a bit nervous, please forgive him, it is not everyday we have a new member in the crew!");
     next;
-    mesq l("So, how do you feel? I see that Juliet did a marvelous job! You look like you're in good health now.");
+    mesq l("So, how do you feel? I see that Juliet did a marvellous job! You look like you're in good health now.");
     next;
 
 L_Menu:
@@ -85,10 +87,10 @@ L_MenuQuest:
     //next;
     //mesq lg("We need manpower on the island... Oh forgive me, women are also welcome, of course.", "We need manpower on the island.");
     mesn;
-    mesq l("Ship travels are not free. See if you can gather some money, and I'll bring you to Tulishmar!");
+    mesq l("Ship travels are not free. See if you can gather some money, and I'll bring you to Tulimshar!");
     next;
     mesn;
-    mesq l("Why Tulishmar, you say? Because well, believe me, if you want to find out anything, the best place to ask around is Tulim!");
+    mesq l("Why Tulimshar, you say? Because well, believe me, if you want to find out anything, the best place to ask around is Tulim!");
     LOCATION$ = "Candor";
 
     //inventoryplace JohanneKey, 1;
@@ -112,7 +114,7 @@ L_Ok:
     mesn;
     mesq l("Good to know.");
     next;
-    mesq l("We have made a stop at a little island, before making it on to the port of Tulishmar.");
+    mesq l("We have made a stop at a little island, before making it on to the port of Tulimshar.");
     next;
     mesq l("It would be good for you to do some exercise, the ship isn't big enough for that.");
     next;
@@ -149,18 +151,17 @@ L_CandorIsland:
 
 L_NotYet:
     mesn;
-    .@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;
         setq General_Narrator, 1;
         set Zeny, Zeny-.@price;
         LOCATION$="Tulim";
-        mesq l("Set sail! We're going to Tulishmar!");
+        mesq l("Set sail! We're going to Tulimshar!");
     } else {
         mesq l("You still haven't completed your tasks.");
         next;
-        mesq l("You still need @@ GP for the trip to Tulishmar.", (.@price-Zeny));
+        mesq l("You still need @@ GP for the trip to Tulimshar.", (.@price-Zeny));
     }
     close;
 
@@ -169,9 +170,44 @@ L_Travel:
     mesq l("Hi @@.", strcharinfo(0));
     next;
     mesq l("You are currently at @@.", LOCATION$);
+    mes "";
+    mes l("A ship travel will cost you @@ GP.", .@price);
+
+    if (Zeny >= .@price) {
+        menu
+            rif(LOCATION$ != "Candor", l("To Candor Island.")), L_TCandor,
+            rif(LOCATION$ != "Tulim", l("To Tulimshar.")), L_TTulim,
+            l("No, I'll save my money."), -;
+    } else {
+        mes l("You still need @@ GP to afford it.", (.@price-Zeny));
+    }
+
+    close;
+
+L_TCandor:
+    set Zeny, Zeny-.@price;
+    LOCATION$="Candor";
+
+    mes "";
+    mesn;
+    mesq l("Candor Island, then? Yes, that is a pretty island, right?");
+    next;
+    mesq l("I was planning to go there soon, anyway. All aboard!");
+    close;
+
+L_TTulim:
+    set Zeny, Zeny-.@price;
+    LOCATION$="Tulim";
 
+    mes "";
+    mesn;
+    mesq l("Tulimshar, right? The oldest human city-state!");
+    next;
+    mesq l("I was planning to go there soon, anyway. All aboard!");
     close;
 
+
+// Deprecated, will be removed later
 L_Done:
     mesn;
     mesq l("Hi @@.", strcharinfo(0));