From 7844466de562c4f346d777da5e34d0dc11642521 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 22 Feb 2020 01:14:55 -0300
Subject: Refactor Nard's travel to Tulimshar. The animation was added. Logout
 will skip the dialog and complete travel.

---
 npc/002-3/nard.txt | 62 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

(limited to 'npc/002-3')

diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index 68992ab33..d18ce909b 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -231,35 +231,13 @@ L_NotYet:
         getitem TulimMap, 1;
         mesq l("Set sail! We're going to Tulimshar!");
         next;
-        showavatar;
-        setcam 0, 0;
-        mesc l("Some time later...");
-        next;
-        restorecam;
-        showavatar NPC_NARD;  // this is handled by avatars.xml
-        mesn;
-        mesq l("Welcome to Tulimshar, @@!", strcharinfo(0));
-        mesc l("Nard gives you a map of the city so you don't get lost.");
-        next;
-        if (GSET_SOULMENHIR_MANUAL) {
-            mesn;
-            mesq l("You can explore the city as you want, but if I were you, I would ##Btouch the Soul Menhir##b, north of here, to don't respawn at Candor.");
-            next;
-        } else {
-            mesn;
-            mesq l("If you die, you'll appear near Tulimshar's Soul Menhir, which is the nearest Menhir to you. You can use @@ if you ever want to change this behavior.", b("@ucp"));
-            next;
-        }
-        mesn;
-        mesq l("Other than that, you can explore the city as you want, but as you had a memory loss, You should visit the townhall.");
-        next;
-        mesn;
-        mesq l("When you get out of the ship, it is the first building you'll see. Talk to ##BLua##b, she is an alliance representative.");
-        next;
-        mesn;
-        mesq l("The Alliance have records of everyone. And if you need another trip, talk to me!");
-        mesc l("PROTIP: Every quest you complete in a location, will make ship travels to and from them cheaper!");
-
+        PC_DEST$="Tulim";
+        addtimer nard_time(PC_DEST$)+800, .name$+"::OnNardStage";
+        addtimer nard_time(PC_DEST$), "#NardShip::OnEvent";
+        @timer_navio_running = 1;
+        warp "002-5", 39, 26;
+        closeclientdialog;
+        end;
     } else {
         mesq l("You still haven't completed your tasks.");
         mes "";
@@ -359,6 +337,32 @@ L_Tier2Ok:
     mesq l("Here, take it. If the mana goes out of your body, I'll have your class master to return the book to me.");
     close;
 
+OnNardStage:
+    showavatar NPC_NARD;  // this is handled by avatars.xml
+    mesn;
+    mesq l("Welcome to Tulimshar, @@!", strcharinfo(0));
+    mesc l("Nard gives you a map of the city so you don't get lost.");
+    next;
+    if (GSET_SOULMENHIR_MANUAL) {
+        mesn;
+        mesq l("You can explore the city as you want, but if I were you, I would ##Btouch the Soul Menhir##b, north of here, to don't respawn at Candor.");
+        next;
+    } else {
+        mesn;
+        mesq l("If you die, you'll appear near Tulimshar's Soul Menhir, which is the nearest Menhir to you. You can use @@ if you ever want to change this behavior.", b("@ucp"));
+        next;
+    }
+    mesn;
+    mesq l("Other than that, you can explore the city as you want, but as you had a memory loss, You should visit the townhall.");
+    next;
+    mesn;
+    mesq l("When you get out of the ship, it is the first building you'll see. Talk to ##BLua##b, she is an alliance representative.");
+    next;
+    mesn;
+    mesq l("The Alliance have records of everyone. And if you need another trip, talk to me!");
+    tutmes l("PROTIP: Every quest you complete in a location, will make ship travels to and from them cheaper!"), "Protip", false;
+    close;
+
 L_Close:
     close;
 
-- 
cgit v1.2.3-60-g2f50