Add ship to Nivalis

6 files changed, 24 insertions, 3 deletions

diff --git a/maps/re/019-2.mcache b/maps/re/019-2.mcache
index ab484241f..dbed9f864 100644
--- a/maps/re/019-2.mcache
+++ b/maps/re/019-2.mcache
diff --git a/npc/016-1/captain.txt b/npc/016-1/captain.txt
index f666d9e8f..877549428 100644
--- a/npc/016-1/captain.txt
+++ b/npc/016-1/captain.txt
@@ -136,8 +136,6 @@ L_TNival:
     mes "";
     mesn;
     mesq l("It'll cost you @@ GP.", .@price);
-    mesc l("WARNING: As of r7.2 \"Frozen Jesusalva\", there's currently no ship route to carry you back."), 1;
-    mesc l("Continue at your own risk."), 1;
     mes "";
 
     if (Zeny < .@price) {
diff --git a/npc/016-1/doors.txt b/npc/016-1/doors.txt
index 2e947aaac..0c7ebd604 100644
--- a/npc/016-1/doors.txt
+++ b/npc/016-1/doors.txt
@@ -15,6 +15,10 @@ OnTouch:
         warp "003-1", 119, 25;
         close;
     }
+    if (LOCATION$ == "Nival") {
+        warp "019-2", 119, 113;
+        close;
+    }
     mesc l("Oh noes! The door is locked!! Quick! Call a GM!!!"), 1;
     close;
 }
diff --git a/npc/016-6/main.txt b/npc/016-6/main.txt
index 7a9579c1a..6bc30145f 100644
--- a/npc/016-6/main.txt
+++ b/npc/016-6/main.txt
@@ -34,7 +34,7 @@ L_Nival:
     PC_DEST$ = "";
     LOCATION$ = "Nival";
     @timer_navio_running = 0;
-    warp "019-2", 107, 109;
+    warp "019-2", 119, 113;
     message strcharinfo(0), l("@@ disembarks at Nivalis.", strcharinfo(0));
     goto L_CleanUp;
 
diff --git a/npc/019-2/_import.txt b/npc/019-2/_import.txt
index b55aa0eca..6d964fb0a 100644
--- a/npc/019-2/_import.txt
+++ b/npc/019-2/_import.txt
@@ -4,4 +4,5 @@
 "npc/019-2/_warps.txt",
 "npc/019-2/angela.txt",
 "npc/019-2/guards.txt",
+"npc/019-2/ship.txt",
 "npc/019-2/sign.txt",
diff --git a/npc/019-2/ship.txt b/npc/019-2/ship.txt
new file mode 100644
index 000000000..fb1297ad2
--- /dev/null
+++ b/npc/019-2/ship.txt
@@ -0,0 +1,18 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    This script controls access to Ships, fixing variables.
+
+019-2,120,113,0	script	NivalShip	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    LOCATION$="Nival";
+    goto L_Warp;
+
+L_Warp:
+    warp "016-1@"+LOCATION$, 21, 26;
+    closedialog;
+    close;
+}
+