Reorder stuff, allows travel to Nivalis (but not back from - GM Only)

2 files changed, 80 insertions, 28 deletions

diff --git a/npc/016-1/captain.txt b/npc/016-1/captain.txt
index a53243d7e..3a7f32dcc 100644
--- a/npc/016-1/captain.txt
+++ b/npc/016-1/captain.txt
@@ -18,10 +18,62 @@
         menu
             rif(LOCATION$ != "Tulim", l("To Tulimshar.")), L_TTulim,
             rif(LOCATION$ != "Hurns", l("To Hurnscald.")), L_THurns,
+            rif(LOCATION$ != "Nival" && is_gm(), l("To Nivalis.")), L_TNival,
             l("No, I'll save my money."), -;
 
     close;
 
+///// ---------- Tulimshar ----------
+L_TTulim:
+    .@x=reputation("Tulim");
+
+    if (.@x >= 14)
+        .@price-=1850;
+    else if (.@x >= 12)
+        .@price-=1750;
+    else if (.@x >= 10)
+        .@price-=1500;
+    else if (.@x >= 8)
+        .@price-=1000;
+    else if (.@x >= 6)
+        .@price-=750;
+    else if (.@x >= 4)
+        .@price-=500;
+    else if (.@x >= 2)
+        .@price-=250;
+
+    mes "";
+    mesn;
+    mesq l("It'll cost you @@ GP.", .@price);
+    mes "";
+
+    if (Zeny < .@price) {
+        mes l("You still need @@ GP to afford it.", (.@price-Zeny));
+        close;
+    }
+
+    if (askyesno() != ASK_YES)
+        close;
+
+    Zeny=Zeny-.@price;
+    PC_DEST$="Tulim";
+    @timer_navio_running = 1;
+
+    mes "";
+    mesn;
+    mesq l("Tulimshar, right? The oldest human city-state!");
+    next;
+    mesq l("I was planning to go there soon, anyway. All aboard!");
+    close2;
+    goto L_DoWarp;
+
+
+
+
+
+
+
+///// ---------- Hurnscald ----------
 L_THurns:
     .@x=reputation("Hurns");
 
@@ -66,24 +118,12 @@ L_THurns:
 
 
 
+///// ---------- Nivalis ----------
+L_TNival:
+    .@x=reputation("Nival");
 
-L_TTulim:
-    .@x=reputation("Tulim");
-
-    if (.@x >= 14)
-        .@price-=1850;
-    else if (.@x >= 12)
-        .@price-=1750;
-    else if (.@x >= 10)
-        .@price-=1500;
-    else if (.@x >= 8)
+    if (.@x >= 1)
         .@price-=1000;
-    else if (.@x >= 6)
-        .@price-=750;
-    else if (.@x >= 4)
-        .@price-=500;
-    else if (.@x >= 2)
-        .@price-=250;
 
     mes "";
     mesn;
@@ -99,17 +139,23 @@ L_TTulim:
         close;
 
     Zeny=Zeny-.@price;
-    PC_DEST$="Tulim";
-    @timer_navio_running = 1;
+    PC_DEST$="Nival";
 
     mes "";
     mesn;
-    mesq l("Tulimshar, right? The oldest human city-state!");
+    mesq l("Nivalis? It's frozen during the whole year! I hope you have good ice gear and a high level...");
     next;
     mesq l("I was planning to go there soon, anyway. All aboard!");
     close2;
     goto L_DoWarp;
 
+
+
+
+
+
+
+///// ---------------- Core Utils
 L_TooWeak:
     mesn;
     mesq l("The sea route I take is very dangerous, and full of pirates. You're too weak to travel with me.");
@@ -128,9 +174,6 @@ L_DoWarp:
     end;
 
 
-L_Close:
-    close;
-
 OnInit:
     .sex = G_MALE;
     .distance = 5;
diff --git a/npc/016-6/main.txt b/npc/016-6/main.txt
index 73f996f69..7a9579c1a 100644
--- a/npc/016-6/main.txt
+++ b/npc/016-6/main.txt
@@ -8,11 +8,20 @@
 OnEvent:
     // Handle travel
     if (@timer_navio_running == 0) end;
-    if      (PC_DEST$ == "Hurns") goto L_Hurns;
-    else if (PC_DEST$ == "Tulim") goto L_Tulim;
+    if      (PC_DEST$ == "Tulim") goto L_Tulim;
+    else if (PC_DEST$ == "Hurns") goto L_Hurns;
+    else if (PC_DEST$ == "Nival") goto L_Nival;
     else goto L_Error;
     end;
 
+L_Tulim:
+    PC_DEST$ = "";
+    LOCATION$ = "Tulim";
+    @timer_navio_running = 0;
+    warp "003-1", 119, 25;
+    message strcharinfo(0), l("@@ disembarks at Tulimshar.", strcharinfo(0));
+    goto L_CleanUp;
+
 L_Hurns:
     PC_DEST$ = "";
     LOCATION$ = "Hurns";
@@ -21,12 +30,12 @@ L_Hurns:
     message strcharinfo(0), l("@@ disembarks at Hurnscald.", strcharinfo(0));
     goto L_CleanUp;
 
-L_Tulim:
+L_Nival:
     PC_DEST$ = "";
-    LOCATION$ = "Tulim";
+    LOCATION$ = "Nival";
     @timer_navio_running = 0;
-    warp "003-1", 119, 25;
-    message strcharinfo(0), l("@@ disembarks at Tulimshar.", strcharinfo(0));
+    warp "019-2", 107, 109;
+    message strcharinfo(0), l("@@ disembarks at Nivalis.", strcharinfo(0));
     goto L_CleanUp;
 
 L_Error: