9 files changed, 49 insertions, 9 deletions
diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt
index f8adc4574..418d06049 100644
--- a/npc/002-3/doors.txt
+++ b/npc/002-3/doors.txt
@@ -1,6 +1,8 @@
+// TMW2 Scripts.
 // Evol scripts.
 // Author:
 //    Reid
+//    Jesusalva
 // Description:
 //    Doors NPCs.
 //    The third value of the .@nard variable has been removed for the beta2, it'll then be re-added for the Aurora release.
@@ -24,11 +26,16 @@
 OnTouch:
     .@nard = getq(ShipQuests_Nard);
 
-    if (getq(General_Narrator) > 0)
+    if (LOCATION$ == "Candor")
     {
         warp "005-1", 42, 107;
         close;
     }
+    if (LOCATION$ == "Tulim")
+    {
+        warp "003-1", 81, 68;
+        close;
+    }
 
     if (.@nard == 4) goto L_GotoNard;
     if (.@nard == 5) goto L_End;
diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index 3b8de10d1..2000fc733 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -4,8 +4,8 @@
 //    Reid
 // Description:
 //    Captain Nard dialogs.
-//    Nard does the introduction with a small quest.
-//    This quest is meant to teach the player how to use a weapon,and to bring food to the ship.
+//    Nard is a fair merchant ship's captain.
+//    This quest is meant to teach the player how to use a weapon.
 //    4 bits array:
 //    ShipQuests
 // Variable:
@@ -89,6 +89,7 @@ L_MenuQuest:
     mesn;
     mesq l("Why Tulishmar, you say? Because well, believe me, if you want to find out anything, the best place to ask around is Tulim!");
     setq General_Narrator, 1;
+    LOCATION$ = "Candor";
 
     //inventoryplace JohanneKey, 1;
     //setq ShipQuests_Nard, 1;
@@ -137,14 +138,12 @@ L_SpecialTask:
 L_CandorIsland:
     mes "";
     mesn;
-    mesq l("To be honest, no, never.");
+    mesq l("I never said that. I come here frequently to trade. It is you who should explore the island.");
     next;
     mesq l("This is ##BCandor Island##b. A very small community lives here.");
     next;
     mesq l("If they were any bigger, monsters would come and kill everyone.");
     next;
-    mesq l("Anyway, we're here seeking out rare goods, which we can make good profit when trading.");
-    next;
 
     goto L_MenuQuest;
 
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 826b53fb9..0d7bc10ff 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -22,6 +22,7 @@
 "npc/003-1/neko.txt",
 "npc/003-1/ninathetraveler.txt",
 "npc/003-1/sarah.txt",
+"npc/003-1/ship.txt",
 "npc/003-1/silvia.txt",
 "npc/003-1/swezanne.txt",
 "npc/003-1/tamiloc.txt",
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 46b562f7b..be0479dc3 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -13,7 +13,6 @@
 003-1,111,137,0	warp	#003-1_111_137	0,0,003-7,39,40
 003-1,107,132,0	warp	#003-1_107_132	0,0,003-7,29,31
 003-1,112,100,0	warp	#003-1_112_100	0,0,003-8,31,43
-003-1,82,68,0	warp	#003-1_82_68	0,0,002-3,35,40
 003-1,51,65,0	warp	#003-1_51_65	0,0,003-2,42,34
 003-1,115,93,0	warp	#003-1_115_93	0,0,003-8,41,28
 003-1,60,157,0	warp	#003-1_60_157	0,0,004-1,64,57
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 67c1d5707..7e3e1b5aa 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -104,7 +104,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HEADTOP, 2906);
     setunitdata(.@npcId, UDT_HEADMIDDLE, 1304);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
-    setunitdata(.@npcId, UDT_SHIELD, 1800);    // Boots
+    setunitdata(.@npcId, UDT_SHIELD, 1800);    // TODO FIXME: Display Boots
     setunitdata(.@npcId, UDT_WEAPON, 3504);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
diff --git a/npc/003-1/ship.txt b/npc/003-1/ship.txt
new file mode 100644
index 000000000..01089b546
--- /dev/null
+++ b/npc/003-1/ship.txt
@@ -0,0 +1,17 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    This script controls access to Nard's Ship, fixing variables.
+
+003-1,82,68,0	script	CandorShip	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    LOCATION$="Tulim";
+    goto L_Warp;
+
+L_Warp:
+    warp "002-3", 21, 28;
+    closedialog;
+    close;
+}
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index a8d19df94..fe3f5737c 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -6,6 +6,7 @@
 "npc/005-1/ayasha.txt",
 "npc/005-1/liana.txt",
 "npc/005-1/maya.txt",
+"npc/005-1/ship.txt",
 "npc/005-1/soul-menhir.txt",
 "npc/005-1/warpcandorbattle.txt",
 "npc/005-1/zegas.txt",
diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt
index 7524340cf..a0d244861 100644
--- a/npc/005-1/_warps.txt
+++ b/npc/005-1/_warps.txt
@@ -1,6 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 005-1: Candor Island warps
-005-1,43,107,0	warp	#005-1_43_107	0,0,002-2,21,28
 005-1,31,79,0	warp	#005-1_31_79	0,0,005-2,33,42
 005-1,34,74,0	warp	#005-1_34_74	0,0,005-3,25,42
 005-1,48,70,0	warp	#005-1_48_70	0,0,005-4,25,42
diff --git a/npc/005-1/ship.txt b/npc/005-1/ship.txt
new file mode 100644
index 000000000..72cc2932a
--- /dev/null
+++ b/npc/005-1/ship.txt
@@ -0,0 +1,17 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    This script controls access to Nard's Ship, fixing variables.
+
+005-1,43,107,0	script	CandorShip	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    LOCATION$="Candor";
+    goto L_Warp;
+
+L_Warp:
+    warp "002-3", 21, 28;
+    closedialog;
+    close;
+}