Use EnterTown() on ships

8 files changed, 32 insertions, 17 deletions

diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index 66f7e4b6e..aed77d057 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -229,7 +229,7 @@ L_NotYet:
         // Double sure
         setq ShipQuests_Julia, 3;
         Zeny = Zeny-.@price;
-        LOCATION$="Tulim";
+        EnterTown("Tulim");
         getitem TulimMap, 1;
         mesq l("Set sail! We're going to Tulimshar!");
         next;
diff --git a/npc/002-5/main.txt b/npc/002-5/main.txt
index 99980daaf..8cea748df 100644
--- a/npc/002-5/main.txt
+++ b/npc/002-5/main.txt
@@ -23,7 +23,7 @@ L_Candor:
 
 L_Tulim:
     PC_DEST$ = "";
-    LOCATION$ = "Tulim";
+    EnterTown("Tulim");
     @timer_navio_running = 0;
     warp "003-1", 81, 68;
     message strcharinfo(0), l("@@ disembarks at Tulimshar.", strcharinfo(0));
diff --git a/npc/003-1/ship.txt b/npc/003-1/ship.txt
index 780db1bc0..e23765dc3 100644
--- a/npc/003-1/ship.txt
+++ b/npc/003-1/ship.txt
@@ -7,7 +7,7 @@
 003-1,82,68,0	script	TulimShip	NPC_HIDDEN,0,0,{
 
 OnTouch:
-    LOCATION$="Tulim";
+    EnterTown("Tulim");
     goto L_Warp;
 
 L_Warp:
@@ -19,7 +19,7 @@ L_Warp:
 003-1,120,25,0	script	TulimShip#M	NPC_HIDDEN,0,0,{
 
 OnTouch:
-    LOCATION$="Tulim";
+    EnterTown("Tulim");
     goto L_Warp;
 
 L_Warp:
diff --git a/npc/012-1/ship.txt b/npc/012-1/ship.txt
index 7a7b15c32..b478e3571 100644
--- a/npc/012-1/ship.txt
+++ b/npc/012-1/ship.txt
@@ -7,7 +7,7 @@
 012-1,157,65,0	script	HurnsShip#M	NPC_HIDDEN,0,0,{
 
 OnTouch:
-    LOCATION$="Hurns";
+    EnterTown("Hurns");
     goto L_Warp;
 
 L_Warp:
diff --git a/npc/016-6/main.txt b/npc/016-6/main.txt
index 6bc30145f..8cddb6f34 100644
--- a/npc/016-6/main.txt
+++ b/npc/016-6/main.txt
@@ -16,7 +16,7 @@ OnEvent:
 
 L_Tulim:
     PC_DEST$ = "";
-    LOCATION$ = "Tulim";
+    EnterTown("Tulim");
     @timer_navio_running = 0;
     warp "003-1", 119, 25;
     message strcharinfo(0), l("@@ disembarks at Tulimshar.", strcharinfo(0));
@@ -24,7 +24,7 @@ L_Tulim:
 
 L_Hurns:
     PC_DEST$ = "";
-    LOCATION$ = "Hurns";
+    EnterTown("Hurns");
     @timer_navio_running = 0;
     warp "012-1", 156, 65;
     message strcharinfo(0), l("@@ disembarks at Hurnscald.", strcharinfo(0));
@@ -32,7 +32,7 @@ L_Hurns:
 
 L_Nival:
     PC_DEST$ = "";
-    LOCATION$ = "Nival";
+    EnterTown("Nival");
     @timer_navio_running = 0;
     warp "019-2", 119, 113;
     message strcharinfo(0), l("@@ disembarks at Nivalis.", strcharinfo(0));
diff --git a/npc/019-2/ship.txt b/npc/019-2/ship.txt
index fb1297ad2..b51633c2b 100644
--- a/npc/019-2/ship.txt
+++ b/npc/019-2/ship.txt
@@ -7,7 +7,7 @@
 019-2,120,113,0	script	NivalShip	NPC_HIDDEN,0,0,{
 
 OnTouch:
-    LOCATION$="Nival";
+    EnterTown("Nival");
     goto L_Warp;
 
 L_Warp:
diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt
index 90c190c32..df2bed34c 100644
--- a/npc/functions/savepoint.txt
+++ b/npc/functions/savepoint.txt
@@ -1,6 +1,21 @@
-// Deprecated
+// TMW2 Script
+// Author: Jesusalva
+// Description: Save utils
 
 function	script	savepointparticle	{
     debugmes "[ERROR] Usage of savepointparticle() is deprecated.";
     return;
 }
+
+// TODO: Implement elsewhere
+// Warps home and updates LOCATION$
+function	script	teleporthome	{
+    warp "Save", 0, 0;
+    .@i=array_find($@LOCMASTER_MAP$, getmap());
+    if (.@i >= 0)
+        EnterTown($@LOCMASTER_LOC$[.@i]);
+    else
+        debugmes("[ERROR] Invalid Town Map for Time Flask: %s", getmap());
+    return;
+}
+
diff --git a/npc/items/lofteleporter.txt b/npc/items/lofteleporter.txt
index e7acfdc62..e92307490 100644
--- a/npc/items/lofteleporter.txt
+++ b/npc/items/lofteleporter.txt
@@ -72,37 +72,37 @@ OnUse:
         case 2:
             warp "017-1", 120, 89;
             TELEPORTER_TIME=loftel_time(35, .@x);
-            LOCATION$="LoF";
+            EnterTown("LoF");
             @timer_navio_running=0;
             break;
         case 3:
             warp "003-1", 41, 49;
             TELEPORTER_TIME=loftel_time(35, .@x);
-            LOCATION$="Tulim";
+            EnterTown("Tulim");
             @timer_navio_running=0;
             break;
         case 4:
             warp "024-1", 155, 82;
             TELEPORTER_TIME=loftel_time(120, .@x);
-            LOCATION$="Frostia";
+            EnterTown("Frostia");
             @timer_navio_running=0;
             break;
         case 5:
             warp "009-1", 113, 91;
             TELEPORTER_TIME=loftel_time(120, .@x);
-            LOCATION$="Halin";
+            EnterTown("Halin");
             @timer_navio_running=0;
             break;
         case 6:
             warp "018-5", 111, 53;
             TELEPORTER_TIME=loftel_time(150, .@x);
-            LOCATION$="Lilit";
+            EnterTown("Lilit");
             @timer_navio_running=0;
             break;
         case 7:
-            warp "Save", 0, 0;
             TELEPORTER_TIME=loftel_time(30, .@x);
-            //LOCATION$="Save";
+            //EnterTown("Save");
+            teleporthome();
             @timer_navio_running=0;
             break;
     }