Captain Nard is now responsible for Artis<->Tulimshar route.

The Artis<->Candor route is also allowed.

6 files changed, 52 insertions, 3 deletions

diff --git a/maps/re/029-0.mcache b/maps/re/029-0.mcache
index 2d1eb9c51..653f717ee 100644
--- a/maps/re/029-0.mcache
+++ b/maps/re/029-0.mcache
diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index aed77d057..3544c3571 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -265,6 +265,7 @@ L_Travel:
         menu
             rif(Zeny >= .@price && LOCATION$ != "Candor", l("To Candor Island.")), L_TCandor,
             rif(Zeny >= .@price && LOCATION$ != "Tulim", l("To Tulimshar.")), L_TTulim,
+            rif(Zeny >= .@price && LOCATION$ != "Artis" && $FIRESOFSTEAM, l("To Artis.")), L_TArtis,
             rif(ST_TIER == 7 && gettimetick(2) < QUEST_ELEVARTEMPO ,l("Help me, I need Jesusaves Grimorie!")), L_Tier2,
             rif(ST_TIER == 9 && countitem(Lifestone) && gettimetick(2) < QUEST_ELEVARTEMPO ,l("Help me, I need Jesusaves Grimorie!")), L_Tier2Ok,
             l("No, I'll save my money."), -;
@@ -305,6 +306,22 @@ L_TTulim:
     warp "002-5", 39, 26;
     end;
 
+L_TArtis:
+    Zeny=Zeny-.@price;
+    PC_DEST$="Artis";
+    @timer_navio_running = 1;
+
+    mes "";
+    mesn;
+    mesq l("Artis, right? So Andrei Sakar summoned you?");
+    next;
+    mesq l("Hahaha, good luck out there, my friend!");
+    close2;
+    addtimer nard_time(PC_DEST$), "#NardShip::OnEvent";
+    @timer_navio_running = 1;
+    warp "002-5", 39, 26;
+    end;
+
 L_Tier2:
     mes "";
     mesn;
diff --git a/npc/002-5/main.txt b/npc/002-5/main.txt
index 8cea748df..6e5094f6e 100644
--- a/npc/002-5/main.txt
+++ b/npc/002-5/main.txt
@@ -10,6 +10,7 @@ OnEvent:
     if (@timer_navio_running == 0) end;
     if (PC_DEST$ == "Candor") goto L_Candor;
     else if (PC_DEST$ == "Tulim") goto L_Tulim;
+    else if (PC_DEST$ == "Artis") goto L_Artis;
     else goto L_Error;
     end;
 
@@ -18,7 +19,7 @@ L_Candor:
     LOCATION$ = "Candor";
     @timer_navio_running = 0;
     warp "005-1", 49, 117;
-    message strcharinfo(0), l("@@ disembarks at Candor Island.", strcharinfo(0));
+    message strcharinfo(0), l("%s disembarks at %s.", strcharinfo(0), l("Candor Island"));
     end;
 
 L_Tulim:
@@ -26,7 +27,15 @@ L_Tulim:
     EnterTown("Tulim");
     @timer_navio_running = 0;
     warp "003-1", 81, 68;
-    message strcharinfo(0), l("@@ disembarks at Tulimshar.", strcharinfo(0));
+    message strcharinfo(0), l("%s disembarks at %s.", strcharinfo(0), l("Tulimshar"));
+    end;
+
+L_Artis:
+    PC_DEST$ = "";
+    EnterTown("Artis");
+    @timer_navio_running = 0;
+    warp "029-0", 203, 85;
+    message strcharinfo(0), l("%s disembarks at %s.", strcharinfo(0), l("Artis"));
     end;
 
 L_Error:
diff --git a/npc/029-0/town.txt b/npc/029-0/town.txt
index c1e5eec51..fc7607365 100644
--- a/npc/029-0/town.txt
+++ b/npc/029-0/town.txt
@@ -4,8 +4,20 @@
 // Description:
 //  Reset LOCATION$ when entering a town
 
-029-0,203,85,0	script	#LocArtis	NPC_HIDDEN,3,3,{
+029-0,203,85,0	script	#LocArtis	NPC_HIDDEN,0,3,{
 OnTouch:
     EnterTown("Artis"); end;
 }
 
+029-0,204,85,0	script	ArtisShip	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    EnterTown("Artis");
+    goto L_Warp;
+
+L_Warp:
+    warp "002-3@"+LOCATION$, 31, 28;
+    closedialog;
+    close;
+}
+
diff --git a/npc/functions/instances.txt b/npc/functions/instances.txt
index 99ebbfe6a..ed11167d5 100644
--- a/npc/functions/instances.txt
+++ b/npc/functions/instances.txt
@@ -36,6 +36,13 @@ OnInstRestart:
     instance_set_timeout(0, 0, .TULIM_INSTID);
     instance_init(.TULIM_INSTID);
 
+    // Artis Instance
+    .ARTIS_INSTID = instance_create("002-1@ArtisInst", 0, IOT_NONE);
+    instance_attachmap("002-1", .ARTIS_INSTID, 0, "002-1@Artis");
+    instance_attachmap("002-3", .ARTIS_INSTID, 0, "002-3@Artis");
+    instance_set_timeout(0, 0, .ARTIS_INSTID);
+    instance_init(.ARTIS_INSTID);
+
 
     /* La Marine's Ship */
     // Tulim Instance
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 0c6453634..4f0761b41 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -577,6 +577,8 @@ function	script	nard_time	{
     if (LOCATION$ == "Candor") {
         if (getarg(0) == "Tulim")
             return 22000;
+        if (getarg(0) == "Artis")
+            return 60000;
 
     }
     // From Tulimshar
@@ -587,6 +589,8 @@ function	script	nard_time	{
             return 28000;
         if (getarg(0) == "Nival")
             return 52000;
+        if (getarg(0) == "Artis")
+            return 60000;
 
     }
     // From Hurnscald