test

75 files changed, 413 insertions, 1318 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index b8ecdfa9f..118bbba7d 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -12,23 +12,15 @@
 OnTalk:
     setcamnpc;
     mesn "Elmo";
-    mesq lg("This girl is lucky we found her before a shark did. I have no idea where she comes from. By the way, did you recognised the logo on her raft?", "This guy is lucky we found him before a shark did. I have no idea where he comes from. By the way, did you recognised the logo on his raft?");
+    mesq lg("This girl is lucky we found her before a shark did. I have no idea where she comes from.", "This guy is lucky we found him before a shark did. I have no idea where he comes from.");
     next;
 
     mesn "Magic Arpan";
-    mesq lg("Yaya, it certainly is not from a trade ship, but it doesn't looks like it was from a pirate ship either.");
+    mesq lg("Yaya, it certainly was not from a trade ship, but it doesn't looks like it was from a pirate ship either.");
     next;
 
     mesn "Elmo";
-    mesq l("I wonder where that raft came from...");
-    next;
-
-    mesn "Magic Arpan";
-    mesq l("In the worst scenario possible, the monsters finally decided to attack warships.");
-    next;
-
-    mesn "Elmo";
-    mesq l("It's probably nothing so dramatic. But a warship? Makes sense. Do you think we should inform the capt'n about it?");
+    mesq l("It could be from a warship to a random civilian vessel. Well, this is not important now.");
     next;
 
     mesn "Magic Arpan";
@@ -36,7 +28,7 @@ OnTalk:
     next;
 
     mesn "Elmo";
-    mesq lg("Alright, I'm going to his room, keep an eye on her, we still don't know if she's friend or foe...", "Alright, I'm going to his room, keep an eye on him, we still don't know if he's friend or foe...");
+    mesq lg("Alright, I'm going to the capt'n room, keep an eye on her, we still don't know if she's friend or foe...", "Alright, I'm going to the capt'n room, keep an eye on him, we still don't know if he's friend or foe...");
     next;
 
     mesn "Magic Arpan";
@@ -52,7 +44,7 @@ OnTalk:
     next;
 
     mesn "Elmo";
-    mesq l("Hehe... Ok, I'm going to inform the capt'n up there.");
+    mesq lg("Hehe... Ok, I'm going to inform the capt'n up there that the girl is fine.", "Hehe... Ok, I'm going to inform the capt'n up there that the boy is fine.");
     next;
 
     mesn "Magic Arpan";
diff --git a/npc/002-1/_import.txt b/npc/002-1/_import.txt
index fc6ddd14e..56410529a 100644
--- a/npc/002-1/_import.txt
+++ b/npc/002-1/_import.txt
@@ -2,13 +2,13 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/002-1/_mobs.txt",
 "npc/002-1/_savepoints.txt",
-"npc/002-1/_warps.txt",
 "npc/002-1/alige.txt",
 "npc/002-1/arpan.txt",
 "npc/002-1/chefgado.txt",
 "npc/002-1/chest.txt",
 "npc/002-1/dan.txt",
 "npc/002-1/devis.txt",
+"npc/002-1/doors.txt",
 "npc/002-1/hammock.txt",
 "npc/002-1/knife.txt",
 "npc/002-1/mapflags.txt",
diff --git a/npc/002-1/_warps.txt b/npc/002-1/_warps.txt
deleted file mode 100644
index a3d236338..000000000
--- a/npc/002-1/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 002-1: Second Deck warps
-002-1,72,30,0	warp	#002-1_72_30	0,0,002-3,42,26
diff --git a/npc/002-1/doors.txt b/npc/002-1/doors.txt
new file mode 100644
index 000000000..14b32518b
--- /dev/null
+++ b/npc/002-1/doors.txt
@@ -0,0 +1,15 @@
+// TMW2 Scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Doors NPCs.
+
+002-1,72,30,0	script	AreaNPC#002-1d	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    if (LOCATION$ == "") 
+        warp "002-3", 42, 26;
+    else
+        warp "002-3@"+LOCATION$, 42, 26;
+    close;
+}
diff --git a/npc/002-1/peter.txt b/npc/002-1/peter.txt
index 24ee6917b..56cca9eeb 100644
--- a/npc/002-1/peter.txt
+++ b/npc/002-1/peter.txt
@@ -309,7 +309,7 @@ L_Reward:
     mesq l("Good job!") + " " + l("Here's your reward!");
     getexp 100, 0;
     Zeny = Zeny + 1000;
-    message strcharinfo(0), l("You receive @@ E!", 1000);
+    message strcharinfo(0), l("You receive @@ GP!", 1000);
 
     goto L_CleaningClose;
 
@@ -334,6 +334,6 @@ OnNoGoodTick:
 
 OnInit:
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
diff --git a/npc/002-2/_import.txt b/npc/002-2/_import.txt
index c5d03ceaa..5b662cf60 100644
--- a/npc/002-2/_import.txt
+++ b/npc/002-2/_import.txt
@@ -1,2 +1,5 @@
 // Map 002-2: Hold
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/002-2/doors.txt",
+"npc/002-2/mapflags.txt",
+"npc/002-2/ratto.txt",
diff --git a/npc/002-2/doors.txt b/npc/002-2/doors.txt
new file mode 100644
index 000000000..d22e02669
--- /dev/null
+++ b/npc/002-2/doors.txt
@@ -0,0 +1,72 @@
+// Evol scripts.
+// Authors:
+//    Ablu
+//    Alastrim
+//    Reid
+// Description:
+//    Doors NPCs.
+
+002-2,48,29,0	script	DoorUpwards	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    if (mobcount("002-2","all") > 0) goto L_Warn;
+
+    goto L_Warp;
+
+L_Warn:
+    .@q = getq(ShipQuests_Peter);
+    if (.@q == 5) goto L_Warp;
+
+    mesn "Narrator";
+    mes col(l("There are still some rattos left! Do you want to abort the quest?"), 9);
+    next;
+
+    menu
+        l("Yes."), L_Warp,
+        l("No."), -;
+
+    warp "002-2", 48, 28;
+    closeclientdialog;
+    close;
+
+L_Warp:
+    if (LOCATION$ == "") 
+        warp "002-1", 72, 36;
+    else
+        warp "002-1@"+LOCATION$, 72, 36;
+    closeclientdialog;
+    close;
+}
+
+002-2,24,31,0	script	LeftDoor	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    mesn "Narrator";
+    mes col(l("It seems that you need a key to open this door."), 9);
+    next;
+    mes col(l("What do you want to do?"), 9);
+    next;
+
+    menu
+        rif(countitem(718) > 0, l("Use the key.")), L_Warp,
+        l("Break the door."), L_Break,
+        l("Go away."), -;
+
+    closeclientdialog;
+    close;
+
+L_Break:
+
+    mes "";
+    mesn "Narrator";
+    mes col(l("You hear a loud scream. It must be the creaking of the wooden door..."), 9);
+
+    close;
+
+L_Warp:
+    mes "";
+    mesn "Narrator";
+    mes col(l("Wait, it seems someone is blocking the door from the other side!"), 9);
+
+    close;
+}
diff --git a/npc/002-2/mapflags.txt b/npc/002-2/mapflags.txt
new file mode 100644
index 000000000..b2449ecd6
--- /dev/null
+++ b/npc/002-2/mapflags.txt
@@ -0,0 +1 @@
+002-2	mapflag	nosave	002-1,72,36
diff --git a/npc/002-2/ratto.txt b/npc/002-2/ratto.txt
new file mode 100644
index 000000000..32499f437
--- /dev/null
+++ b/npc/002-2/ratto.txt
@@ -0,0 +1,68 @@
+// Evol scripts.
+// Authors:
+//    Ablu
+//    Alastrim
+//    Reid
+// Description:
+//    Ratto killer.
+
+// $@RAT_SAILOR_CONTROL array explanation:
+// [1] = Shows status of ratto number 1 (1 is dead and 0 is alive).
+// [2] = Shows status of ratto number 2 (1 is dead and 0 is alive).
+// [3] = Shows status of ratto number 3 (1 is dead and 0 is alive).
+// [4] = Shows status of ratto number 4 (1 is dead and 0 is alive).
+// [5] = Shows how many seconds passed since ratto number 1 died.
+// [6] = Shows how many seconds passed since ratto number 2 died.
+// [7] = Shows how many seconds passed since ratto number 3 died.
+// [8] = Shows how many seconds passed since ratto number 4 died.
+// [9] = Shows how many seconds passed since the player started the quest.
+
+002-2,47,30,0	script	RattosControl	NPC_HIDDEN,{
+
+OnSpawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
+    close;
+
+OnRatto1Respawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
+    $@RAT_SAILOR_CONTROL[1] = 0;
+    $@RAT_SAILOR_CONTROL[5] = 0;
+    end;
+
+OnRatto2Respawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
+    $@RAT_SAILOR_CONTROL[2] = 0;
+    $@RAT_SAILOR_CONTROL[6] = 0;
+    end;
+
+OnRatto3Respawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
+    $@RAT_SAILOR_CONTROL[3] = 0;
+    $@RAT_SAILOR_CONTROL[7] = 0;
+    end;
+
+OnRatto4Respawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
+    $@RAT_SAILOR_CONTROL[4] = 0;
+    $@RAT_SAILOR_CONTROL[8] = 0;
+    end;
+
+OnRatto1Death:
+    $@RAT_SAILOR_CONTROL[1] = 1;
+    end;
+
+OnRatto2Death:
+    $@RAT_SAILOR_CONTROL[2] = 1;
+    end;
+
+OnRatto3Death:
+    $@RAT_SAILOR_CONTROL[3] = 1;
+    end;
+
+OnRatto4Death:
+    $@RAT_SAILOR_CONTROL[4] = 1;
+    end;
+}
diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt
index 9a31365db..813d0c15e 100644
--- a/npc/002-3/_import.txt
+++ b/npc/002-3/_import.txt
@@ -1,6 +1,5 @@
 // Map 002-3: First Deck
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/002-3/_warps.txt",
 "npc/002-3/billybons.txt",
 "npc/002-3/doors.txt",
 "npc/002-3/juliet.txt",
diff --git a/npc/002-3/_warps.txt b/npc/002-3/_warps.txt
deleted file mode 100644
index 939438c45..000000000
--- a/npc/002-3/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 002-3: First Deck warps
-002-3,42,25,0	warp	#002-3_42_25	0,0,002-1,72,29
diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt
index eaf44f732..4bf062b16 100644
--- a/npc/002-3/doors.txt
+++ b/npc/002-3/doors.txt
@@ -35,10 +35,9 @@ OnTouch:
         close;
     }
 
-    // None of these checks will ever return positive
+    // None of these checks will ever return positive, but were kept when delay is applied.
     if (.@nard == 4) goto L_GotoNard;
     if (.@nard == 5) goto L_End;
-    if (.@nard > 0 && countitem(718) > 0) goto L_Key;
 
     setcamnpc "Julia";
     mesn "Julia";
@@ -52,10 +51,6 @@ OnTouch:
 
     close;
 
-L_Key:
-    warp "005-1", 42, 107;
-    close;
-
 L_GotoNard:
     setcamnpc "Julia";
     mesn "Julia";
@@ -76,6 +71,37 @@ L_End:
     restorecam;
    
     close;
+
+
+OnInterIfInit:
+
+    // Candor Instance (we do all tests for debugmes here)
+    .CANDOR_INSTID = instance_create("002-1@CandorInst", 0, IOT_NONE);
+    if (.CANDOR_INSTID < 0) debugmes "Error: No instance ID";
+    else {
+        debugmes "created new instance id: " + str(.CANDOR_INSTID);
+        .CANDOR1$=instance_attachmap("002-1", .CANDOR_INSTID, 0, "002-1@Candor");
+        if (.CANDOR1$ == "") debugmes "Error: Map 002-1 CANDY failed";
+
+        .CANDOR3$=instance_attachmap("002-3", .CANDOR_INSTID, 0, "002-3@Candor");
+        if (.CANDOR3$ == "") debugmes "Error: Map 002-3 CANDY failed";
+
+        .CANDOR4$=instance_attachmap("002-4", .CANDOR_INSTID, 0, "002-4@Candor");
+        if (.CANDOR4$ == "") debugmes "Error: Map 002-4 CANDY failed";
+
+        debugmes "Nard's Ship in Candor instance is set.";
+        instance_set_timeout(1000000, 1000000, .CANDOR_INSTID);
+        instance_init(.CANDOR_INSTID);
+    }
+
+    // Tulim Instance
+    .TULIM_INSTID = instance_create("002-1@TulimInst", 0, IOT_NONE);
+    instance_attachmap("002-1", .TULIM_INSTID, 0, "002-1@Tulim");
+    instance_attachmap("002-3", .TULIM_INSTID, 0, "002-3@Tulim");
+    instance_attachmap("002-4", .TULIM_INSTID, 0, "002-4@Tulim");
+    instance_set_timeout(1000000, 1000000, .TULIM_INSTID);
+    instance_init(.TULIM_INSTID);
+    end;
 }
 
 002-3,44,28,0	script	AreaNPC#doors5	NPC_HIDDEN,0,0,{
@@ -86,6 +112,19 @@ OnTouch:
     close;
 
 L_Warp:
-    warp "002-4", 20, 27;
+    if (LOCATION$ == "") 
+        warp "002-4", 20, 27;
+    else
+        warp "002-4@"+LOCATION$, 20, 27;
+    close;
+}
+
+002-3,42,25,0	script	AreaNPC#002-3d	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    if (LOCATION$ == "") 
+        warp "002-1", 72, 29;
+    else
+        warp "002-1@"+LOCATION$, 72, 29;
     close;
 }
diff --git a/npc/002-4/_import.txt b/npc/002-4/_import.txt
index 52297249f..5def6f5d9 100644
--- a/npc/002-4/_import.txt
+++ b/npc/002-4/_import.txt
@@ -1,5 +1,5 @@
 // Map 002-4: Nard's Room
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/002-4/_warps.txt",
+"npc/002-4/doors.txt",
 "npc/002-4/elmo.txt",
 "npc/002-4/nard.txt",
diff --git a/npc/002-4/_warps.txt b/npc/002-4/_warps.txt
deleted file mode 100644
index d3af640aa..000000000
--- a/npc/002-4/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 002-4: Nard's Room warps
-002-4,19,27,0	warp	#002-4_19_27	0,0,002-3,43,28
diff --git a/npc/002-4/doors.txt b/npc/002-4/doors.txt
new file mode 100644
index 000000000..b8162cdd1
--- /dev/null
+++ b/npc/002-4/doors.txt
@@ -0,0 +1,15 @@
+// TMW2 Scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Doors NPCs.
+
+002-4,19,27,0	script	AreaNPC#002-4d	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    if (LOCATION$ == "") 
+        warp "002-3", 43, 28;
+    else
+        warp "002-3@"+LOCATION$, 43, 28;
+    close;
+}
diff --git a/npc/003-1-2/_import.txt b/npc/003-1-2/_import.txt
index 2b6b015f7..6237ae196 100644
--- a/npc/003-1-2/_import.txt
+++ b/npc/003-1-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 003-1-2: Tulimshar Jeweler
+// Map 003-1-2: Tulimshar Wall
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-1-2/_mobs.txt",
 "npc/003-1-2/_warps.txt",
diff --git a/npc/003-1-2/_mobs.txt b/npc/003-1-2/_mobs.txt
index 531b82111..fbebe95b6 100644
--- a/npc/003-1-2/_mobs.txt
+++ b/npc/003-1-2/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-1-2: Tulimshar Jeweler mobs
+// Map 003-1-2: Tulimshar Wall mobs
 003-1-2,34,36,15,3	monster	Black Scorpion	1074,2,35000,150000
diff --git a/npc/003-1-2/_warps.txt b/npc/003-1-2/_warps.txt
index 84eaa9b60..6fd6be463 100644
--- a/npc/003-1-2/_warps.txt
+++ b/npc/003-1-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-1-2: Tulimshar Jeweler warps
+// Map 003-1-2: Tulimshar Wall warps
 003-1-2,33,34,0	warp	#003-1-2_33_34	0,0,003-1,81,119
 003-1-2,19,34,0	warp	#003-1-2_19_34	0,0,003-1,53,119
 003-1-2,48,34,0	warp	#003-1-2_48_34	0,0,003-1,116,119
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 945272462..2005aee9d 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -71,15 +71,6 @@ OnInit:
 }

 

 

-function	script	CheckGuard	{

-    .questCheck = .questCheck + 1;

-            l("Oh Welcome then.");

-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

-            l("Oh! You found me well played !.");

-            narrator("You receive 5 exp.");

-    getexp 5,0;

-    close;

-}

 003-1,98,100,0	script	Guard Philip	NPC_GUARD1,{

     legiontalk;

     if (getq(TulimsharQuest_WaterForGuard) == 1)

@@ -178,10 +169,6 @@ OnInit:
 }

 003-1,58,100,0	script	Guard Popaul	NPC_GUARD1,{

     legiontalk;

-    if (getq(TulimsharQuest_WaterForGuard) == 1)

-    {

-        //CheckGuard(); // TODO: TBD

-    }

     end;

     

 OnTimer1000:

@@ -216,7 +203,7 @@ OnInit:
     .distance = 1;

     end;

 }

-003-2,41,37,0	script	Guard Youn	NPC_GUARD1,{

+003-2,41,37,0	script	Guard Yuna	NPC_GUARD2,{

     legiontalk;

     end;

 OnInit:

@@ -226,10 +213,6 @@ OnInit:
 }

 003-1,54,52,0	script	Guard Maxim	NPC_GUARD1,{

     legiontalk;

-    if (getq(TulimsharQuest_WaterForGuard) == 1)

-    {

-        //CheckGuard(); // TODO: TBD

-    }

     end;

     

 OnTimer1000:

@@ -264,10 +247,6 @@ OnInit:
 }

 003-1,50,36,0	script	Guard Totor	NPC_GUARD1,{

     legiontalk;

-    if (getq(TulimsharQuest_WaterForGuard) == 1)

-    {

-        //CheckGuard(); // TODO: TBD

-    }

     end;

     

 OnTimer1000:

@@ -292,10 +271,6 @@ OnInit:
 }

 003-1,53,36,0	script	Guard Roukin	NPC_GUARD1,{

     legiontalk;

-    if (getq(TulimsharQuest_WaterForGuard) == 1)

-    {

-        //CheckGuard(); // TODO: TBD

-    }

     end;

     

 OnTimer1000:

@@ -335,10 +310,6 @@ OnInit:
 }

 003-1,35,34,0	script	Guard Falko	NPC_GUARD1,{

     legiontalk;

-    if (getq(TulimsharQuest_WaterForGuard) == 1)

-    {

-        //CheckGuard(); // TODO: TBD

-    }

     end;

     

 OnTimer1000:

@@ -373,10 +344,6 @@ OnInit:
 }

 003-1,102,80,0	script	Guard Tetric	NPC_GUARD1,{

     legiontalk;

-    if (getq(TulimsharQuest_WaterForGuard) == 1)

-    {

-        //CheckGuard(); // FIXME and everywhere else: Missing Function

-    }

     end;

     

 OnTimer1000:

diff --git a/npc/003-1/michel.txt b/npc/003-1/michel.txt
index 1a810b3e2..350caddef 100644
--- a/npc/003-1/michel.txt
+++ b/npc/003-1/michel.txt
@@ -3,8 +3,34 @@
 
 003-1,89,109,0	script	Michel	NPC_BACCHUS,{
 
+    mesn;
+    mesq l("All hail the ones who proven their worth before the whole Alliance!");
+    mes "";
 
-hello;
+	.@nb = query_sql("select name, karma from `char` ORDER BY karma DESC LIMIT 5", .@name$, .@value);
+	mes l("##BHall Of Fame: TOP5##b");
+	mes("1."+.@name$[0]+" ("+.@value[0]+")");
+	mes("2."+.@name$[1]+" ("+.@value[1]+")");
+	mes("3."+.@name$[2]+" ("+.@value[2]+")");
+	mes("4."+.@name$[3]+" ("+.@value[3]+")");
+	mes("5."+.@name$[4]+" ("+.@value[4]+")");
+
+    mes "";
+    if (getgmlevel()) mes "##BGM Information##b";
+    if (getgmlevel()) mes "We are currently relying in Karma to generate this Hall Of Fame.";
+    if (getgmlevel()) mes "";
+    if (getgmlevel()) mes "##B Manual Edition ##b";
+    if (getgmlevel()) mes "To reliably change Karma values, you must use @set Karma.";
+    if (getgmlevel()) mes "But before, check on MySQL the previous karma value, because this command overrides it.";
+    if (getgmlevel()) mes "Therefore, it is advised to DON'T change this by hand.";
+    if (getgmlevel()) mes "";
+    if (getgmlevel()) mes "##B Scripting Edition ##b";
+    if (getgmlevel()) mes "Is known to work. This hall of fame will need a few minutes to update itself.";
+    if (getgmlevel()) mes "";
+    if (getgmlevel()) mes "##B Technical Notes ##b";
+    if (getgmlevel()) mes "In future we may start Fame field directly (but it is not displayed on client, thus, we decided to use Karma).";
+    //if (getgmlevel()) set Karma, Karma + 5;
+    close;
 
 OnInit:
     .sex = G_MALE;
diff --git a/npc/003-1/ship.txt b/npc/003-1/ship.txt
index 327db573f..5dd5b9479 100644
--- a/npc/003-1/ship.txt
+++ b/npc/003-1/ship.txt
@@ -11,7 +11,7 @@ OnTouch:
     goto L_Warp;
 
 L_Warp:
-    warp "002-3", 31, 28;
+    warp "002-3@"+LOCATION$, 31, 28;
     closedialog;
     close;
 }
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 7d1adb984..306056b84 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -27,14 +27,6 @@ L_Heroics:
     else if (.@d == 6) .@deed$="impressed even the High Council!";
     else .@deed$="is awesome like me!"; // Should not happen
 
-	/*.@nb = query_sql("select name, fame from `char` ORDER BY fame DESC LIMIT 5", .@name$, .@fame);
-	mes("Hall Of Fame: TOP5");
-	mes("1."+.@name$[0]+"("+.@fame[0]+")"); // Will return a person with the biggest fame value.
-	mes("2."+.@name$[1]+"("+.@fame[1]+")");
-	mes("3."+.@name$[2]+"("+.@fame[2]+")");
-	mes("4."+.@name$[3]+"("+.@fame[3]+")");
-	mes("5."+.@name$[4]+"("+.@fame[4]+")");*/
-
     mesq l("I hope to one day be like @@, who @@", $MOST_HEROIC$, .@deed$);
     close;
 
diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt
index 9c49b1d13..c7177951e 100644
--- a/npc/003-2/estard.txt
+++ b/npc/003-2/estard.txt
@@ -1,18 +1,12 @@
+// TMW-2 Scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Manages party and guild.
+
 // Evol scripts.
 // Author:
 //    Reid
-// Description:
-//    Light Armor shop keeper.
-// Variables:
-//    ArtisQuests_Enora
-// Values:
-//    0    Default.
-//    1    BlackSmith quest delivered.
-//    2    Chelios Quest given.
-//    3    Chelios Quest done.
-//    4    BlackSmith gave the sword.
-//    5    Light Armor Shop quest delivered.
-//    6    Light Armor Shop gave the cloths.
 
 003-2,32,34,0	script	Estard	NPC_PLAYER,{
 
@@ -52,8 +46,12 @@
     }
 
 
-    speech S_LAST_NEXT,
-        lg("Welcome miss.", "Good day sir.");
+    mesn;
+    mesq lg("Welcome miss.", "Good day sir.");
+
+    if (getcharid(2) > 0)
+        mesq l("You are part of the \"@@\" guild.", getguildname(getcharid(2)));
+    next;
 
     do
     {
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 0a2e71742..58d75b010 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -1,5 +1,7 @@
+// TMW-2 Script.
 // Author:
 //    Saulc
+//    Jesusalva
 
 003-3,36,34,0	script	Malindou	NPC_LLOYD,{
 
@@ -8,58 +10,13 @@
 //    gumi
 //    Reid
 // Description:
-//    Lloyd the banker NPC.
-// Variables:
-//    0  ArtisQuests_Lloyd
-//    1  ArtisQuests_Fexil
-//    2  ArtisQuests_Enora
-// Quest states:
-//    00  -- Never talked
-//    01  -- Registred on the Guild
-//    10  -- not started
-//    11  -- Lloyd warned about the quest
-//    20  -- Default.
-//    21  -- BlackSmith quest delivered.
-//    22  -- Chelios Quest given.
-//    23  -- Chelios Quest done.
-
-
-    function enora_quest {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Black iron... That is a very specific request that you have for me!"),
-            l("Let me check in my inventory book..."),
-            l("..."),
-            l("Yes, I have some! \"5x Black Iron Ingots\""),
-            lg("Is this for you or somebody else? Because you need to be registered to obtain these materials.");
-
-        switch (selectd(ArtisQuests_Enora,
-                        l("This is for my own use."),
-                        l("Chelios asked me to get it.")))
-        {
-            case 1:
-                speech S_FIRST_BLANK_LINE,
-                    l("This is your first time asking for something, you won't pay this time, take it as a sign of good faith!"),
-                    l("If you need something in the future, do not hesitate to pass by here, our stock is full of boxes collecting dust.");
-                emotion E_WINK;
-                break;
-            case 2:
-                speech S_FIRST_BLANK_LINE,
-                    l("Chelios... He is part of the Blacksmith House, is he not?"),
-                    l("Since Don settled in Tulimshar he and his band refused to register to the Merchant Guild."),
-                    l("I will close an eye for once, but only because it's your first time asking for something!"),
-                    l("Sometimes a good merchant needs to reach out first. It's on the house, give Chelios my regards!");
-                emotion E_WINK;
-                break;
-        }
-        setq ArtisQuests_Enora, 3;
+//    banker NPC.
 
-        return;
-    }
 
     function explain_guild {
         speech S_LAST_NEXT,
             l("The guild is in charge of the commerce regularization throughout Tulimshar and its surroundings."),
-            l("With the help of the town hall and the Legion of Aemil we organize some auction and we help local merchants to launch their businesses."),
+            l("With the help of the town hall we organize some auction and we help local merchants to launch their businesses."),
             l("We also feature some services like a storage and a bank for members."),
             l("Registration is open to everybody, but newcomers need to pay a fee for all of the paperwork.");
 
@@ -73,7 +30,7 @@
     function first_visit {
         speech S_LAST_NEXT,
             l("Welcome!"),
-            l("My name is Malindou, I am a representative of the Merchant Guild of Tulimshar.");
+            l("My name is Malindou, I am a representative of the Merchant Guild on Tulimshar.");
 
         selectd(l("My name is @@...", strcharinfo(0)));
 
@@ -106,7 +63,7 @@
 
         .@price = 15000;
         speech S_LAST_NEXT,
-            l("The fee is of @@ E. So, do you want to register?", .@price);
+            l("The fee is of @@ GP. So, do you want to register?", .@price);
 
         switch (selectd(l("Yes."),
                         l("I don't have the time now.")))
@@ -133,39 +90,6 @@
         return;
     }
 
-    function paper_to_deliver {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Now that you bring up that topic, that reminds me of something..."),
-            l("Earlier today there was this young seller named Fexil that passed by here."),
-            l("He asked to lend some money and a place to open his store, I think that he asked for a place on the merchant squares on the south-west of the city..."),
-            l("Anyway, he forgot his permit when he left the building."),
-            l("Could you bring it to him?");
-
-        do
-        {
-            .@q = selectd(ArtisQuests_Fexil,
-                          l("Ok, I will bring it to him."),
-                          l("I need more information first."),
-                          l("I don't have the time."));
-            switch (.@q)
-            {
-                case 1:
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("Thank you for this!");
-                    setq ArtisQuests_Fexil, 1;
-                    break;
-                case 2:
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("You should look for a seller named Fexil around the merchant square."),
-                        l("Ask other merchants, they might know where he is.");
-                    break;
-                case 3:
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("No problem, come back later if you changed your mind!");
-                    break;
-            }
-        } while (.@q == 2);
-    }
 
     if (getq(ArtisQuests_Lloyd) == 0)
     {
@@ -177,63 +101,45 @@
     }
 
     speech S_LAST_NEXT,
-        l("Welcome to the Merchant Guild of Tulimshar"),
+        l("Welcome to the Merchant Guild of Tulimshar."),
         l("What do you want today?");
 
     do
     {
-        .@enora = getq(ArtisQuests_Enora);
 
         selectd
-            rif(.@enora == 2, l("I'm looking for some black iron ingots.")),
             l("I would like to store some items."),
             l("I would like to perform money transactions."),
             l("What is this guild for?"),
-            l("Does the guild has any work for me right now?"),
             l("Bye.");
 
         switch (@menu)
         {
             case 1:
-                enora_quest;
-                break;
-            case 2:
                 openstorage;
                 closedialog;
                 close;
                 break;
-            case 3:
+            case 2:
                 MerchantGuild_Bank;
                 break;
-            case 4:
+            case 3:
                 mes "";
                 explain_guild;
                 break;
-            case 5:
-                if (getq(ArtisQuests_Fexil) >= 1)
-                {
-                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                        l("There are no tasks for you right now.");
-                    continue;
-                }
-
-                paper_to_deliver;
-
-                continue;
         }
-        if (@menu != 6)
+        if (@menu != 4)
         {
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT | S_NO_NPC_NAME,
                 l("Something else?");
         }
-    } while (@menu != 6);
+    } while (@menu != 4);
 
     closedialog;
     goodbye;
     close;
 
 OnInit:
-    .quest_debug = ArtisQuests_Lloyd;
     .sex = G_MALE;
     .distance = 4;
     end;
diff --git a/npc/003-4/_import.txt b/npc/003-4/_import.txt
index b6c9bd0bb..a15662b0e 100644
--- a/npc/003-4/_import.txt
+++ b/npc/003-4/_import.txt
@@ -1,3 +1,3 @@
-// Map 003-4: Omar House
+// Map 003-4: Forgotten Shop
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-4/_warps.txt",
diff --git a/npc/003-4/_warps.txt b/npc/003-4/_warps.txt
index c935a6424..2334fc919 100644
--- a/npc/003-4/_warps.txt
+++ b/npc/003-4/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-4: Omar House warps
+// Map 003-4: Forgotten Shop warps
 003-4,39,39,0	warp	#003-4_39_39	0,0,003-1,54,138
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
index 2c17e59b5..ea51a54be 100644
--- a/npc/005-1/ayasha.txt
+++ b/npc/005-1/ayasha.txt
@@ -1,30 +1,43 @@
 // Author:

 //    Crazyfefe

-//    Jesusalva (fixes)

-

+//    Jesusalva

+// Description:

+//  Ayasha takes care of the children of Candor Village, and is in charge of protecting them.

+//  The kids sometimes go play outside of city walls, and this makes her upset.

+//  Even if no attack happened in Candor for a while.

+// Variables:

+//  CandorQuest_HAS

+//      0: Not met

+//      1: Already met

+//      2: Quest ongoing

+//      3: Found all kids

+//      4: Reward given

 

 005-1,52,81,0	script	Ayasha	NPC_HUMAN_FEMALE_NOOB,{

+    showavatar NPC_HUMAN_FEMALE_NOOB;  // this is handled by avatars.xml

 

-    

     function quest_findAllKids

     {

-        setq CandorQuest_HAS, 1;

-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

-            l("Good luck!");

+        setq CandorQuest_HAS, 2;

+        mesn;

+        mesq l("Good luck!");

         close;

     }

 

     .@has = getq(CandorQuest_HAS);

     if (.@has == 0)

     {

-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

-            l("Hello! Can you help me to find all kids?");

+        speech S_LAST_NEXT,

+            l("Ah, the kids are playing hide and seek, but I am afraid they went too far. A monster attack could start anytime, after all."),

+            l("I am currently very worried with them. They're just children! They don't know how to fight!"),

+            l("Could you perhaps help me to find all kids?");

         do

         {

             select

                 l("Yes!"),

-                menuaction(l("I can't, sorry."));

+                l("I can't, sorry.");

 

+            setq CandorQuest_HAS, 1;

             switch (@menu)

             {

                 case 1:

@@ -35,24 +48,47 @@
     }

     else if (.@has == 1)

     {

-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

-            l("You still haven't found all of them yet.");

-        close;

+        mesn;

+        mesq l("Even if the city has not been attacked on the last few years, I can't help but be concerned while the kids are playing hide and seek."),

+        next;

+        mesq l("Could you perhaps help me to find all kids?");

+        next;

+

+        do

+        {

+            select

+                l("Yes!"),

+                l("I can't, sorry.");

+

+            switch (@menu)

+            {

+                case 1:

+                    quest_findAllKids;

+                    break;

+            }

+        } while (@menu != 2);

     }

     else if (.@has == 2)

     {

-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

+        mesn;

+        mesq l("You still haven't found all of them yet.");

+        close;

+    }

+    else if (.@has == 3)

+    {

+        speech S_LAST_NEXT,

             l("Thank you, here is your reward and... some pocket money.");

             narrator("You receive 30 exp and 50 GP.");

         getexp 30, 0;

         Zeny = (Zeny + 50);

-        setq CandorQuest_HAS, 3;

+        setq CandorQuest_HAS, 4;

         close;

     }

     else

     {

-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

-            l("Thank you for your help.");

+        mesn;

+        mesq l("Thank you for your help.");

+        if (BaseLevel >= 24 && gettimetick(2) > .RENT_TIME) goto L_Sword;

         close;

     }

 

@@ -60,9 +96,43 @@
     //goodbye;

     close;

 

+L_Sword:

+    menu

+        l("The children are safe, could you rent me your sword?"), L_Rent,

+        l("You're welcome!"), -;

+    close;

+

+L_Rent:

+    // This code is equivalent to: speech S_FIRST_BLANK_LINE | S_LAST_NEXT

+    mes "";

+    mesn;

+    mesq l("Ah, I guess you want to fight at the cave north of me...");

+    next;

+    mesq l("The children are safe, aren't they...?");

+    next;

+    mesq l("I can rent it to you for 500 GP, during 15 minutes. Deal?");

+    next;

+    menu

+        rif(Zeny >= 500 && gettimetick(2) > .RENT_TIME, l("Deal!")), L_DoRent,

+        l("Maybe later."), -;

+    close;

+

+L_DoRent:

+    if (gettimetick(2) <= .RENT_TIME) mesq l("Sorry, you was taking too long to decide and I've rented my sword to somebody else.");

+    if (gettimetick(2) <= .RENT_TIME) close;

+    .RENT_TIME=gettimetick(2)+(15*60);

+    set Zeny, Zeny - 500;

+    // Here must use item ID

+    rentitem 3518, (15*60);

+    mes "";

+    mesn;

+    mesq l("Here it is. Take care with it!");

+    close;

+

 OnInit:

     .sex = G_FEMALE;

     .distance = 5;

+    .RENT_TIME=0; // TODO: This could easily be a $GLOBAL_VARIABLE

     end;

 }

 

@@ -84,7 +154,7 @@ L_KidsTally:
     if (@kids_count == 6)

     {

         message strcharinfo(0), "That must have been the last kid.";

-        setq CandorQuest_HAS, 2;

+        setq CandorQuest_HAS, 3;

     }

     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,

         l("Oh! You found me. Good job!");

@@ -110,7 +180,7 @@ L_Already:
 }

 005-1,69,90,0	script	Charda	NPC_CHILD8,{

     @kids = 0;

-    if (getq(CandorQuest_HAS) == 1)

+    if (getq(CandorQuest_HAS) == 2)

     {

         CheckEnfant();

     } else {

@@ -127,7 +197,7 @@ OnInit:
 }

 005-1,23,84,0	script	Faris	NPC_CHILD7,{

     @kids = 1;

-    if (getq(CandorQuest_HAS) == 1)

+    if (getq(CandorQuest_HAS) == 2)

     {

         CheckEnfant();

     } else {

@@ -142,7 +212,7 @@ OnInit:
 }

 005-1,84,21,0	script	Ghada	NPC_CHILD5,{

     @kids = 2;

-    if (getq(CandorQuest_HAS) == 1)

+    if (getq(CandorQuest_HAS) == 2)

     {

         CheckEnfant();

     } else {

@@ -157,7 +227,7 @@ OnInit:
 }

 005-1,38,58,0	script	Latif	NPC_HUMAN_M_ARTIS,{

     @kids = 3;

-    if (getq(CandorQuest_HAS) == 1)

+    if (getq(CandorQuest_HAS) == 2)

     {

         CheckEnfant();

     } else {

@@ -172,7 +242,7 @@ OnInit:
 }

 005-1,18,43,0	script	Rasin	NPC_CHILD3,{

     @kids = 4;

-    if (getq(CandorQuest_HAS) == 1)

+    if (getq(CandorQuest_HAS) == 2)

     {

         CheckEnfant();

     } else {

@@ -187,7 +257,7 @@ OnInit:
 }

 005-1,38,65,0	script	Lilly	NPC_CHILD6,{

     @kids = 5;

-    if (getq(CandorQuest_HAS) == 1)

+    if (getq(CandorQuest_HAS) == 2)

     {

         CheckEnfant();

     } else {

diff --git a/npc/005-1/ship.txt b/npc/005-1/ship.txt
index 95394abaf..929d5a73c 100644
--- a/npc/005-1/ship.txt
+++ b/npc/005-1/ship.txt
@@ -11,7 +11,7 @@ OnTouch:
     goto L_Warp;
 
 L_Warp:
-    warp "002-3", 31, 28;
+    warp "002-3@"+LOCATION$, 31, 28;
     closedialog;
     close;
 }
diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt
index ec2f001af..14f539bd9 100644
--- a/npc/005-1/zegas.txt
+++ b/npc/005-1/zegas.txt
@@ -66,7 +66,7 @@ L_Close:
 
 OnInit:
     .sex = G_FEMALE;
-    .distance = 2;
+    .distance = 4;
     end;
 }
 
diff --git a/npc/005-2/_import.txt b/npc/005-2/_import.txt
index 2ec41cb54..d5850de36 100644
--- a/npc/005-2/_import.txt
+++ b/npc/005-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 005-2: Merchant Guild
+// Map 005-2: Saxso's House
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/005-2/_mobs.txt",
 "npc/005-2/_warps.txt",
diff --git a/npc/005-2/_mobs.txt b/npc/005-2/_mobs.txt
index 2986f2952..56667f482 100644
--- a/npc/005-2/_mobs.txt
+++ b/npc/005-2/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 005-2: Merchant Guild mobs
+// Map 005-2: Saxso's House mobs
 005-2,43,40,0,0	monster	Saxso Ghost	1076,1,35000,300000
diff --git a/npc/005-2/_warps.txt b/npc/005-2/_warps.txt
index 137c98af4..430abf8e4 100644
--- a/npc/005-2/_warps.txt
+++ b/npc/005-2/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 005-2: Merchant Guild warps
+// Map 005-2: Saxso's House warps
 005-2,33,43,0	warp	#005-2_33_43	0,0,005-1,31,80
diff --git a/npc/005-3/_import.txt b/npc/005-3/_import.txt
index 5465ca016..e47ad86f9 100644
--- a/npc/005-3/_import.txt
+++ b/npc/005-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 005-3: Merchant Guild
+// Map 005-3: Storage House
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/005-3/_mobs.txt",
 "npc/005-3/_warps.txt",
diff --git a/npc/005-3/_mobs.txt b/npc/005-3/_mobs.txt
index 8e2a8474b..5b8cc1a28 100644
--- a/npc/005-3/_mobs.txt
+++ b/npc/005-3/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 005-3: Merchant Guild mobs
+// Map 005-3: Storage House mobs
 005-3,34,37,10,3	monster	Cave Maggot	1027,8,35000,300000
diff --git a/npc/005-3/_warps.txt b/npc/005-3/_warps.txt
index d32c88bb9..6fb61c763 100644
--- a/npc/005-3/_warps.txt
+++ b/npc/005-3/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 005-3: Merchant Guild warps
+// Map 005-3: Storage House warps
 005-3,25,43,0	warp	#005-3_25_43	0,0,005-1,34,75
diff --git a/npc/005-4/_import.txt b/npc/005-4/_import.txt
index 000bb26f5..e93dfbbcf 100644
--- a/npc/005-4/_import.txt
+++ b/npc/005-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 005-4: Merchant Guild
+// Map 005-4: Armor Shop
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/005-4/_warps.txt",
 "npc/005-4/rosen.txt",
diff --git a/npc/005-4/_warps.txt b/npc/005-4/_warps.txt
index 97c3f55a7..78e6d570c 100644
--- a/npc/005-4/_warps.txt
+++ b/npc/005-4/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 005-4: Merchant Guild warps
+// Map 005-4: Armor Shop warps
 005-4,25,43,0	warp	#005-4_25_43	0,0,005-1,48,71
diff --git a/npc/005-4/tolchi.txt b/npc/005-4/tolchi.txt
index f74f19bc8..0a40082ca 100644
--- a/npc/005-4/tolchi.txt
+++ b/npc/005-4/tolchi.txt
@@ -3,6 +3,8 @@
 //    Saulc
 // Variables:
 //    CandorQuests_Tolchi
+// Description:
+//   Tolchi crafts weapons at Rosen & Tolchi shop
 // Values:
 //    0    Default.
 //    1    BlackSmith quest ask for 1 iron oore
@@ -30,7 +32,7 @@
             if (countitem("Iron Ingot") == 0)
             {           
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("You don't have the item.");
+                    l("You don't have the Iron Ingot.");
                     goodbye;
                 close;
             }
@@ -39,14 +41,14 @@
             getexp 1500,0; 
             setq CandorQuest_Tolchi, 3;
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Thanks mate that all i need ! Have a good day !");  
+            l("Thanks mate, that is everything I need! Have a good day!");  
         }
         if (.@tolchi == 1)
         {
             if (countitem("Coal") <= 2)
             {           
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("You don't have the item.");
+                    l("You don't have the three Coal lumps.");
                     goodbye;
                 close;
             }
@@ -60,7 +62,7 @@
             if (countitem("Iron Ore") == 0)
             {           
                 speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("You don't have the item.");
+                    l("You don't have the Iron Ore.");
                     goodbye;                 
                 close;
             }
@@ -140,7 +142,7 @@
     if (BaseLevel <= 4 || BaseLevel <= 9 && .@tolchi == 1 || BaseLevel <= 14 && .@tolchi == 2)
     {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        l("You aren't strong enought. Come Back Later.");
+        l("You aren't strong enough. Come back later.");
         goodbye;
         close;
     }
@@ -148,7 +150,7 @@
     if (.@tolchi == 3)
     {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        l("Hey ! How are you today ? Thanks again for your help.");
+        l("Hey! How are you today? Thanks again for your help.");
         goodbye;
         close;
     }
diff --git a/npc/005-5/cynric.txt b/npc/005-5/cynric.txt
index edb8beff7..72b03e6ce 100644
--- a/npc/005-5/cynric.txt
+++ b/npc/005-5/cynric.txt
@@ -15,8 +15,8 @@
 
     function explain_guild {
         speech S_LAST_NEXT,
-            l("The guild is in charge of the commerce regularization throughout Artis and its surroundings."),
-            l("With the help of the town hall and the Legion of Aemil we organize some auction and we help local merchants to launch their businesses."),
+            l("The guild is in charge of the commerce regularization throughout Candor and its surroundings."),
+            l("With the help of the town hall we organize some auction and we help local merchants to launch their businesses."),
             l("We also feature some services like a storage and a bank for members."),
             l("Registration is open to everybody, but newcomers need to pay a fee for all of the paperwork.");
 
@@ -30,7 +30,7 @@
     function first_visit {
         speech S_LAST_NEXT,
             l("Welcome!"),
-            l("My name is Cynric, I am a representative of the Merchant Guild.");
+            l("My name is Cynric, I am a representative of the Merchant Guild on Candor.");
 
         selectd(l("My name is @@...", strcharinfo(0)));
 
@@ -63,7 +63,7 @@
 
         .@price = 7700;
         speech S_LAST_NEXT,
-            l("The fee is of @@ E. So, do you want to register?", .@price);
+            l("The fee is of @@ GP. So, do you want to register?", .@price);
 
         switch (selectd(l("Yes."),
                         l("I don't have the time now.")))
@@ -100,52 +100,39 @@
     }
 
     speech S_LAST_NEXT,
-        l("Welcome to the Merchant Guild!"),
+        l("Welcome to the Merchant Guild of Tulimshar."),
         l("What do you want today?");
 
     do
     {
-        .@enora = getq(ArtisQuests_Enora);
 
         selectd
-            rif(.@enora == 2, l("I'm looking for some black iron ingots.")),
             l("I would like to store some items."),
             l("I would like to perform money transactions."),
             l("What is this guild for?"),
-            l("Does the guild has any work for me right now?"),
             l("Bye.");
 
         switch (@menu)
         {
             case 1:
-                //enora_quest;
-                mes "";
-                mesn;
-                mesq l("We have none.");
-                break;
-            case 2:
                 openstorage;
                 closedialog;
                 close;
                 break;
-            case 3:
+            case 2:
                 MerchantGuild_Bank;
                 break;
-            case 4:
+            case 3:
                 mes "";
                 explain_guild;
                 break;
-            case 5:
-                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                    l("There are no tasks for you right now.");
-                continue;
         }
-        if (@menu != 6)
+        if (@menu != 4)
         {
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT | S_NO_NPC_NAME,
                 l("Something else?");
         }
-    } while (@menu != 6);
+    } while (@menu != 4);
 
     closedialog;
     goodbye;
@@ -155,13 +142,5 @@ OnInit:
     .sex = G_MALE;
     .distance = 4;
     end;
-
-OnPCLoginEvent:
-    if (#MerchantBank)
-    {
-        BankVault += max(0, #MerchantBank);
-        #MerchantBank = 0;
-    }
-    end;
 }
 
diff --git a/npc/005-6/morgan.txt b/npc/005-6/morgan.txt
index 44df10a63..62632d96f 100644
--- a/npc/005-6/morgan.txt
+++ b/npc/005-6/morgan.txt
@@ -1,8 +1,9 @@
-005-6,30,37,0	script	Morgan	NPC_RUMLY,{
+005-6,30,37,0	script	Morgan	NPC_RUMLY_FEMALE,{
 
 hello;
 
 OnInit:
-    .sex = G_MALE;
+    .sex = G_FEMALE;
+    .distance = 5;
     end;
 }
diff --git a/npc/_import.txt b/npc/_import.txt
index 708cf36e2..a8988caff 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -30,6 +30,7 @@
 @include "npc/005-5/_import.txt"
 @include "npc/005-6/_import.txt"
 @include "npc/005-7/_import.txt"
+@include "npc/007-1/_import.txt"
 @include "npc/008-1/_import.txt"
 @include "npc/008-2-0/_import.txt"
 @include "npc/008-2-1/_import.txt"
diff --git a/npc/commands/debug-quest.txt b/npc/commands/debug-quest.txt
index 6042dcf57..0da95f402 100644
--- a/npc/commands/debug-quest.txt
+++ b/npc/commands/debug-quest.txt
@@ -1,96 +1,6 @@
 // TODO: This script must be auto-generated from db/quests.conf to be of any use
 function	script	GlobalQuestDebug	{
 
-    function qDebugShip {
-        function qDebugGugli {
-            do
-            {
-                clear;
-                setnpcdialogtitle l("Quest debug") + " - " + l("Prologue") + " - Gugli";
-                mes l("This menu gives access to quest debug menus for @@ quest subquests.", "Gugli");
-                next;
-                mes l("Please select a quest:");
-
-                menuint
-                    menuimage("actions/back", l("Go back")), -1,
-                    l("Gugli (main quest)"), ShipQuests_Gugli,
-                    "Ale", ShipQuests_Ale,
-                    "Astapolos", ShipQuests_Astapolos,
-                    "Gulukan", ShipQuests_Gulukan,
-                    "Jalad", ShipQuests_Jalad,
-                    "Q'Muller", ShipQuests_QMuller,
-                    "Tibbo", ShipQuests_Tibbo;
-
-                switch (@menuret)
-                {
-                    case -1: return;
-                    default: callfunc "QuestDebug" + @menuret;
-                }
-            } while (1);
-        }
-
-        do
-        {
-            clear;
-            setnpcdialogtitle l("Quest debug") + " - " + l("Prologue");
-            mes l("This menu gives access to quest debug menus for @@ quests.", l("Prologue"));
-            next;
-            mes l("Please select a quest:");
-
-            menuint
-                menuimage("actions/back", l("Go back")), -1,
-                "Julia", ShipQuests_Julia,
-                "Arpan", ShipQuests_Arpan,
-                "Alige", ShipQuests_Alige,
-                "Peter", ShipQuests_Peter,
-                "Nard", ShipQuests_Nard,
-                l("Knife"), ShipQuests_Knife,
-                l("Money"), ShipQuests_ArpanMoney,
-                l("Door"), ShipQuests_Door,
-                "Couwan", ShipQuests_Couwan,
-                l("Treasure Chest"), ShipQuests_TreasureChest,
-                "Gugli", ShipQuests_Gugli,
-                "Gado", ShipQuests_ChefGado;
-
-            switch (@menuret)
-            {
-                case 16: qDebugGugli; break;
-                case -1: return;
-                default: callfunc "QuestDebug" + @menuret;
-            }
-        } while (1);
-    }
-
-    function qDebugArtis {
-        do
-        {
-            clear;
-            setnpcdialogtitle l("Quest debug") + " - " + l("Artis");
-            mes l("This menu gives access to quest debug menus for @@ quests.", "Artis");
-            next;
-            mes l("Please select a quest:");
-
-            menuint
-                menuimage("actions/back", l("Go back")), -1,
-                l("Lazy Brother"), ArtisQuests_LazyBrother,
-                l("Urchin"), ArtisQuests_Urchin,
-                l("Catching a piou"), ArtisQuests_CatchPiou,
-                "Eugene (" + l("fisherman") + ")", ArtisQuests_Fishman,
-                "Q'Onan", ArtisQuests_QOnan,
-                "Enora", ArtisQuests_Enora,
-                "Fexil", ArtisQuests_Fexil,
-                "Lloyd", ArtisQuests_Lloyd,
-                l("Mona's dad"), ArtisQuests_MonaDad,
-                l("Artis legion progress"), Artis_Legion_Progress;
-
-            switch (@menuret)
-            {
-                case -1: return;
-                default: callfunc "QuestDebug" + @menuret;
-            }
-        } while (1);
-    }
-
     function qDebugGeneral {
         do
         {
@@ -102,10 +12,6 @@ function	script	GlobalQuestDebug	{
 
             menuint
                 menuimage("actions/back", l("Go back")), -1,
-                rif(1==2, l("Cookies")), General_Cookies,
-                rif(1==2, "Rumly"), General_Rumly,
-                rif(1==2, l("Narrator")), General_Narrator,
-                rif(1==2, "Janus"), General_Janus,
                 l("Custom"), -136;
 
             switch (@menuret)
@@ -121,7 +27,7 @@ function	script	GlobalQuestDebug	{
                         setq .@quest, .@value;
 
                     return;
-                default: callfunc "QuestDebug" + @menuret;
+                default: return;
             }
         } while (1);
     }
@@ -135,17 +41,13 @@ function	script	GlobalQuestDebug	{
         mes l("Please select a category:");
 
         select
-            rif(1==2, l("Prologue")),
-            rif(1==2, l("Artis")),
             l("Other"),
             rif(getarg(0,0), menuimage("actions/back", l("Return to Debug menu")));
 
         switch (@menu)
         {
-            case 1: qDebugShip; break;
-            case 2: qDebugArtis; break;
-            case 3: qDebugGeneral; break;
-            case 4: return;
+            case 1: qDebugGeneral; break;
+            default: return;
         }
     } while (1);
 }
diff --git a/npc/functions/quest-debug/000-ShipQuests_Julia.txt b/npc/functions/quest-debug/000-ShipQuests_Julia.txt
deleted file mode 100644
index e4e0ec2cd..000000000
--- a/npc/functions/quest-debug/000-ShipQuests_Julia.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-// Julia quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug0	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Julia";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Julia));
-        mes "---";
-        mes l("Related quests:");
-        mes "ShipQuests_Nard: " + getq(ShipQuests_Nard);
-        mes "ShipQuests_ChefGado: " + getq(ShipQuests_ChefGado);
-        mes "General_Narrator: " + getq(General_Narrator);
-        next;
-
-        GenericQuestDebug ShipQuests_Julia,
-            menuimage("actions/manage", l("Debug Nard quest")), -1,
-            menuimage("actions/manage", l("Debug Gado quest")), -2,
-            menuimage("actions/manage", l("Debug Narrator")), -3,
-            l("Does not have the quest"), 0,
-            l("Got the quest"), 1,
-            l("Completed"), 2;
-
-        switch (@menuret)
-        {
-            case -1: callfunc "QuestDebug4"; break;
-            case -2: callfunc "QuestDebug17"; break;
-            case -3: callfunc "QuestDebug28"; break;
-            default: if (@menuret < 0) return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/001-ShipQuests_Arpan.txt b/npc/functions/quest-debug/001-ShipQuests_Arpan.txt
deleted file mode 100644
index 26c496466..000000000
--- a/npc/functions/quest-debug/001-ShipQuests_Arpan.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// Arpan quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug1	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Arpan";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Arpan));
-        next;
-
-        GenericQuestDebug ShipQuests_Arpan,
-            l("Arpan is waiting for you"), 0,
-            l("Arpan told you to open the chest"), 1,
-            l("You opened the chest"), 2,
-            l("Completed"), 3;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/002-ShipQuests_Alige.txt b/npc/functions/quest-debug/002-ShipQuests_Alige.txt
deleted file mode 100644
index 36d0ce23e..000000000
--- a/npc/functions/quest-debug/002-ShipQuests_Alige.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// Alige quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug2	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Alige";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Alige));
-        next;
-
-        GenericQuestDebug ShipQuests_Alige,
-            l("Does not have the quest"), 0,
-            l("First encounter"), 1,
-            l("Alige asks for food"), 2,
-            l("Completed"), 3;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/003-ShipQuests_Peter.txt b/npc/functions/quest-debug/003-ShipQuests_Peter.txt
deleted file mode 100644
index e08e1eb24..000000000
--- a/npc/functions/quest-debug/003-ShipQuests_Peter.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Peter quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug3	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Peter";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Peter));
-        next;
-
-        GenericQuestDebug ShipQuests_Peter,
-            l("Does not have the quest"), 0,
-            l("Peter needs help"), 6,
-            l("Peter asks to kill rattos"), 1,
-            l("Killed rattos"), 2,
-            l("Got no reward"), 3,
-            l("Peter asks to kill rattos again"), 4,
-            l("Peter gave reward"), 5;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/004-ShipQuests_Nard.txt b/npc/functions/quest-debug/004-ShipQuests_Nard.txt
deleted file mode 100644
index 9ec51cd87..000000000
--- a/npc/functions/quest-debug/004-ShipQuests_Nard.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-// Nard quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug4	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Nard";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Nard));
-        mes "---";
-        mes l("Subquests:");
-        mes "ShipQuests_Gugli: " + getq(ShipQuests_Gugli);
-        mes "ShipQuests_ChefGado: " + getq(ShipQuests_ChefGado);
-        next;
-
-        GenericQuestDebug ShipQuests_Nard,
-            l("Does not have the quest"), 0,
-            l("Nard asks to help crew"), 1,
-            menuimage("actions/manage", l("Debug Gugli quest")), -1,
-            l("Completed Gugli's task"), 2,
-            l("Nard asks to solve conflict"), 3,
-            menuimage("actions/manage", l("Debug Gado quest")), -2,
-            l("Solved conflict"), 4,
-            l("Official crew member"), 5,
-            l("Talked to narrator"), 6;
-
-        switch (@menuret)
-        {
-            case -1: callfunc "QuestDebug16"; break;
-            case -2: callfunc "QuestDebug17"; break;
-            default: if (@menuret < 0) return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/005-ShipQuests_Knife.txt b/npc/functions/quest-debug/005-ShipQuests_Knife.txt
deleted file mode 100644
index a5ec1ae86..000000000
--- a/npc/functions/quest-debug/005-ShipQuests_Knife.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Knife quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug5	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Knife";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Knife));
-        next;
-
-        GenericQuestDebug ShipQuests_Knife,
-            l("Does not have the quest"), 0,
-            l("Got the knife"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/006-ShipQuests_ArpanMoney.txt b/npc/functions/quest-debug/006-ShipQuests_ArpanMoney.txt
deleted file mode 100644
index 00e2fbea8..000000000
--- a/npc/functions/quest-debug/006-ShipQuests_ArpanMoney.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Money quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug6	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_ArpanMoney";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_ArpanMoney));
-        next;
-
-        GenericQuestDebug ShipQuests_ArpanMoney,
-            l("Does not have the quest"), 0,
-            l("Elmo told about money"), 1,
-            l("Arpan gave money"), 2;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/007-ShipQuests_Door.txt b/npc/functions/quest-debug/007-ShipQuests_Door.txt
deleted file mode 100644
index 88aa00abe..000000000
--- a/npc/functions/quest-debug/007-ShipQuests_Door.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Door quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug7	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Door";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Door));
-        next;
-
-        GenericQuestDebug ShipQuests_Door,
-            l("Does not have the quest"), 0,
-            l("Heard conversation"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/008-ShipQuests_Couwan.txt b/npc/functions/quest-debug/008-ShipQuests_Couwan.txt
deleted file mode 100644
index 3df0cdbf0..000000000
--- a/npc/functions/quest-debug/008-ShipQuests_Couwan.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Couwan quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug8	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Couwan";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Couwan));
-        next;
-
-        GenericQuestDebug ShipQuests_Couwan,
-            l("Does not have the quest"), 0,
-            l("Couwan asks to deliver box"), 1,
-            l("Delivered box, got reward"), 2;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/009-ShipQuests_TreasureChest.txt b/npc/functions/quest-debug/009-ShipQuests_TreasureChest.txt
deleted file mode 100644
index 97adef46f..000000000
--- a/npc/functions/quest-debug/009-ShipQuests_TreasureChest.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Treasure chest quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug9	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_TreasureChest";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_TreasureChest));
-        next;
-
-        GenericQuestDebug ShipQuests_TreasureChest,
-            l("Does not have the quest"), 0,
-            l("Opened treasure chest"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/010-ShipQuests_Ale.txt b/npc/functions/quest-debug/010-ShipQuests_Ale.txt
deleted file mode 100644
index e54221224..000000000
--- a/npc/functions/quest-debug/010-ShipQuests_Ale.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Part of Gugli quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug10	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Ale";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Ale));
-        next;
-
-        GenericQuestDebug ShipQuests_Ale,
-            l("Does not have the quest"), 0,
-            l("Got the package"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/011-ShipQuests_Astapolos.txt b/npc/functions/quest-debug/011-ShipQuests_Astapolos.txt
deleted file mode 100644
index aca065edb..000000000
--- a/npc/functions/quest-debug/011-ShipQuests_Astapolos.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Part of Gugli quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug11	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Astapolos";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Astapolos));
-        next;
-
-        GenericQuestDebug ShipQuests_Astapolos,
-            l("Does not have the quest"), 0,
-            l("Got the package"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/012-ShipQuests_Gulukan.txt b/npc/functions/quest-debug/012-ShipQuests_Gulukan.txt
deleted file mode 100644
index fac7ccded..000000000
--- a/npc/functions/quest-debug/012-ShipQuests_Gulukan.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Part of Gugli quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug12	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Gulukan";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Gulukan));
-        next;
-
-        GenericQuestDebug ShipQuests_Gulukan,
-            l("Does not have the quest"), 0,
-            l("Got the package"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/013-ShipQuests_Jalad.txt b/npc/functions/quest-debug/013-ShipQuests_Jalad.txt
deleted file mode 100644
index 9ae6ed2a2..000000000
--- a/npc/functions/quest-debug/013-ShipQuests_Jalad.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Part of Gugli quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug13	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Jalad";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Jalad));
-        next;
-
-        GenericQuestDebug ShipQuests_Jalad,
-            l("Does not have the quest"), 0,
-            l("Got the package"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/014-ShipQuests_QMuller.txt b/npc/functions/quest-debug/014-ShipQuests_QMuller.txt
deleted file mode 100644
index 8a25ee653..000000000
--- a/npc/functions/quest-debug/014-ShipQuests_QMuller.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Part of Gugli quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug14	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_QMuller";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_QMuller));
-        next;
-
-        GenericQuestDebug ShipQuests_QMuller,
-            l("Does not have the quest"), 0,
-            l("Got the package"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/015-ShipQuests_Tibbo.txt b/npc/functions/quest-debug/015-ShipQuests_Tibbo.txt
deleted file mode 100644
index 84280ebfe..000000000
--- a/npc/functions/quest-debug/015-ShipQuests_Tibbo.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Part of Gugli quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug15	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Tibbo";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Tibbo));
-        next;
-
-        GenericQuestDebug ShipQuests_Tibbo,
-            l("Does not have the quest"), 0,
-            l("Got the package"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/016-ShipQuests_Gugli.txt b/npc/functions/quest-debug/016-ShipQuests_Gugli.txt
deleted file mode 100644
index e4868ff48..000000000
--- a/npc/functions/quest-debug/016-ShipQuests_Gugli.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-// Part of Gugli quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug16	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_Gugli";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_Gugli));
-        mes "---";
-        mes l("Subquests:");
-        mes "ShipQuests_Ale: " + getq(ShipQuests_Ale);
-        mes "ShipQuests_Astapolos: " + getq(ShipQuests_Astapolos);
-        mes "ShipQuests_Gulukan: " + getq(ShipQuests_Gulukan);
-        mes "ShipQuests_Jalad: " + getq(ShipQuests_Jalad);
-        mes "ShipQuests_QMuller: " + getq(ShipQuests_QMuller);
-        mes "ShipQuests_Tibbo: " + getq(ShipQuests_Tibbo);
-        next;
-
-        GenericQuestDebug ShipQuests_Gugli,
-            l("Does not have the quest"), 0,
-            l("Gugli asks to collect packages"), 1,
-            menuimage("actions/manage", l("Reset subquests")), -1,
-            menuimage("actions/manage", l("Set subquests as completed")), -2,
-            l("Got reward from gugli"), 2;
-
-        switch (@menuret)
-        {
-            case 0:
-            case 2:
-            case -1:
-            case -2:
-                .@v = (@menuret == -2 || @menuret == 2);
-                setq ShipQuests_Ale, .@v;
-                setq ShipQuests_Astapolos, .@v;
-                setq ShipQuests_Gulukan, .@v;
-                setq ShipQuests_Jalad, .@v;
-                setq ShipQuests_QMuller, .@v;
-                setq ShipQuests_Tibbo, .@v;
-                break;
-            default: if (@menuret < 0) return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/017-ShipQuests_ChefGado.txt b/npc/functions/quest-debug/017-ShipQuests_ChefGado.txt
deleted file mode 100644
index 05e8cdb09..000000000
--- a/npc/functions/quest-debug/017-ShipQuests_ChefGado.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Gado quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug17	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ShipQuests_ChefGado";
-        mes "---";
-        mes l("Quest state: @@", getq(ShipQuests_ChefGado));
-        next;
-
-        GenericQuestDebug ShipQuests_ChefGado,
-            l("Does not have the quest"), 0,
-            l("Nard asks to solve conflict"), 1,
-            l("Got poison from Gado"), 2,
-            l("Poisoned Julia"), 3,
-            l("Completed, Gado wins"), 4,
-            l("Completed, Julia wins (returned poison)"), 5,
-            l("Completed, Julia wins"), 6;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/018-General_Cookies.txt b/npc/functions/quest-debug/018-General_Cookies.txt
deleted file mode 100644
index 16c7bcd75..000000000
--- a/npc/functions/quest-debug/018-General_Cookies.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Cookie quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug18	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "General_Cookies";
-        mes "---";
-        mes l("Quest state: @@", getq(General_Cookies));
-        next;
-
-        GenericQuestDebug General_Cookies,
-            l("Does not have the quest"), 0,
-            l("Got a cookie"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/019-ArtisQuests_LazyBrother.txt b/npc/functions/quest-debug/019-ArtisQuests_LazyBrother.txt
deleted file mode 100644
index 41733adf8..000000000
--- a/npc/functions/quest-debug/019-ArtisQuests_LazyBrother.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-// Lazy brother quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug19	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ArtisQuests_LazyBrother";
-        mes "---";
-        mes l("Quest state: @@", getq(ArtisQuests_LazyBrother));
-        next;
-
-        GenericQuestDebug ArtisQuests_LazyBrother,
-            l("Does not have the quest"), 0,
-            l("Katja asked for help"), 1,
-            l("Found bobo, didn't tell Katja"), 2,
-            l("Told bobo to go home"), 3,
-            l("Katja gave reward"), 4;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/020-ArtisQuests_Urchin.txt b/npc/functions/quest-debug/020-ArtisQuests_Urchin.txt
deleted file mode 100644
index 3a092e478..000000000
--- a/npc/functions/quest-debug/020-ArtisQuests_Urchin.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Urchin quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug20	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ArtisQuests_Urchin";
-        mes "---";
-        mes l("Quest state: @@", getq(ArtisQuests_Urchin));
-        next;
-
-        GenericQuestDebug ArtisQuests_Urchin,
-            l("Does not have the quest"), 0,
-            l("Moon needs @@", l("Croc Claw")), 1,
-            l("Found @@, got exp", l("Croc Claw")), 2;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/021-ArtisQuests_CatchPiou.txt b/npc/functions/quest-debug/021-ArtisQuests_CatchPiou.txt
deleted file mode 100644
index f9c45339e..000000000
--- a/npc/functions/quest-debug/021-ArtisQuests_CatchPiou.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Piou quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug21	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ArtisQuests_CatchPiou";
-        mes "---";
-        mes l("Quest state: @@", getq(ArtisQuests_CatchPiou));
-        next;
-
-        GenericQuestDebug ArtisQuests_CatchPiou,
-            l("Does not have the quest"), 0,
-            l("Salem asks to catch piou"), 1,
-            l("Returned piou to Salem"), 2;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/022-ArtisQuests_Fishman.txt b/npc/functions/quest-debug/022-ArtisQuests_Fishman.txt
deleted file mode 100644
index 0a193e6fe..000000000
--- a/npc/functions/quest-debug/022-ArtisQuests_Fishman.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Eugene quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug22	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ArtisQuests_Fishman";
-        mes "---";
-        mes l("Quest state: @@", getq(ArtisQuests_Fishman));
-        next;
-
-        GenericQuestDebug ArtisQuests_Fishman,
-            l("Does not have the quest"), 0,
-            l("Eugene needs tentacles"), 1,
-            l("Gave tentacles, got reward"), 2;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/023-ArtisQuests_QOnan.txt b/npc/functions/quest-debug/023-ArtisQuests_QOnan.txt
deleted file mode 100644
index 02eaa8f60..000000000
--- a/npc/functions/quest-debug/023-ArtisQuests_QOnan.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// Q'Onan quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug23	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ArtisQuests_QOnan";
-        mes "---";
-        mes l("Quest state: @@", getq(ArtisQuests_QOnan));
-        next;
-
-        GenericQuestDebug ArtisQuests_QOnan,
-            l("Does not have the quest"), 0,
-            l("Q'Onan asks to find chest"), 1,
-            l("Found the chest"), 2,
-            l("Gave to Q'Onan, got reward"), 3;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/026-General_Rumly.txt b/npc/functions/quest-debug/026-General_Rumly.txt
deleted file mode 100644
index c533c27a0..000000000
--- a/npc/functions/quest-debug/026-General_Rumly.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// Rumly quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug26	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "General_Rumly";
-        mes "---";
-        mes l("Quest state: @@", getq(General_Rumly));
-        next;
-
-        GenericQuestDebug General_Rumly,
-            l("Does not have the quest"), 0,
-            l("Rumly needs your help"), 1,
-            l("Rumly wants @@", l("Plushroom")), 2,
-            l("Gave @@ to Rumly", l("Plushroom")), 3;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/027-ArtisQuests_Enora.txt b/npc/functions/quest-debug/027-ArtisQuests_Enora.txt
deleted file mode 100644
index 9121ceb30..000000000
--- a/npc/functions/quest-debug/027-ArtisQuests_Enora.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-// Newbie quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug27	{
-    do
-    {
-        clear();
-        setnpcdialogtitle(l("Quest debug"));
-        mes("ArtisQuests_Enora");
-        mes("---");
-        mes(l("Quest state: @@, @@",
-            getq(ArtisQuests_Enora),
-            getq2(ArtisQuests_Enora)));
-        next();
-
-        GenericQuestDebug(ArtisQuests_Enora,
-            l("Does not have the quest"), 0,
-            l("Enora asks to visit Chelios"), 1,
-            l("Chelios asks to visit Lloyd"), 2,
-            l("Lloyd gave package"), 3,
-            l("Chelios made sword"), 4,
-            l("Enora asks to visit Resa"), 5,
-            l("Resa gave package"), 6,
-            l("Enora asks to visit Q'Pid"), 7,
-            l("Lost the riddle"), 8,
-            l("Ivan gave package"), 9,
-            l("Enora asks to kill fluffies"), 10,
-            l("Completed, got reward"), 11);
-
-        switch (@menuret)
-        {
-            case 0:
-            case 1:
-            case 2:
-            case 3:
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-            case 9:
-            case 10: setq(ArtisQuests_Enora, getq(ArtisQuests_Enora), 0); break;
-            case 11: setq(ArtisQuests_Enora, getq(ArtisQuests_Enora), 10); break;
-            default: if (@menuret < 0) return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/028-General_Narrator.txt b/npc/functions/quest-debug/028-General_Narrator.txt
deleted file mode 100644
index 408668b7a..000000000
--- a/npc/functions/quest-debug/028-General_Narrator.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Narrator debug
-// Author:
-//    gumi
-
-function	script	QuestDebug28	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "General_Narrator";
-        mes "---";
-        mes l("Quest state: @@", getq(General_Narrator));
-        next;
-
-        GenericQuestDebug General_Narrator,
-            l("Game introduction"), 0,
-            l("Visited Artis at least once"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/029-ArtisQuests_Fexil.txt b/npc/functions/quest-debug/029-ArtisQuests_Fexil.txt
deleted file mode 100644
index 9c0d7945d..000000000
--- a/npc/functions/quest-debug/029-ArtisQuests_Fexil.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// Fexil quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug29	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ArtisQuests_Fexil";
-        mes "---";
-        mes l("Quest state: @@", getq(ArtisQuests_Fexil));
-        next;
-
-        GenericQuestDebug ArtisQuests_Fexil,
-            l("Does not have the quest"), 0,
-            l("Lloyd gave pass"), 1,
-            l("Fexil needs help"), 2,
-            l("Fexil wants to buy fur"), 3;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/030-ArtisQuests_Lloyd.txt b/npc/functions/quest-debug/030-ArtisQuests_Lloyd.txt
deleted file mode 100644
index 0afb019c8..000000000
--- a/npc/functions/quest-debug/030-ArtisQuests_Lloyd.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Lloyd quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug30	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ArtisQuests_Lloyd";
-        mes "---";
-        mes l("Quest state: @@", getq(ArtisQuests_Lloyd));
-        next;
-
-        GenericQuestDebug ArtisQuests_Lloyd,
-            l("Does not have the quest"), 0,
-            l("Registered"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/031-General_Janus.txt b/npc/functions/quest-debug/031-General_Janus.txt
deleted file mode 100644
index f97b4fbeb..000000000
--- a/npc/functions/quest-debug/031-General_Janus.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-// Janus quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug31	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "General_Janus";
-        mes "---";
-        mes l("Quest state: @@", getq(General_Janus));
-        next;
-
-        GenericQuestDebug General_Janus,
-            l("Does not have the quest"), 0,
-            l("Talked to Janus"), 1,
-            l("Can create party"), 2,
-            l("Can create guild"), 3;
-
-        switch (@menuret)
-        {
-            case 0:
-            case 1: skill NV_BASIC, min(6, getskilllv(NV_BASIC)), 0; break;
-            case 2:
-            case 3: skill NV_BASIC, max(7, getskilllv(NV_BASIC)), 0; break;
-            default: if (@menuret < 0) return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/032-ArtisQuests_MonaDad.txt b/npc/functions/quest-debug/032-ArtisQuests_MonaDad.txt
deleted file mode 100644
index 68ba67fe9..000000000
--- a/npc/functions/quest-debug/032-ArtisQuests_MonaDad.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Mona quest debug
-// Author:
-//    gumi
-
-function	script	QuestDebug32	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "ArtisQuests_MonaDad";
-        mes "---";
-        mes l("Quest state: @@", getq(ArtisQuests_MonaDad));
-        next;
-
-        GenericQuestDebug ArtisQuests_MonaDad,
-            l("Does not have the quest"), 0,
-            l("Mona's dad is missing"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/033-Artis_Legion_Progress.txt b/npc/functions/quest-debug/033-Artis_Legion_Progress.txt
deleted file mode 100644
index c4ea5558a..000000000
--- a/npc/functions/quest-debug/033-Artis_Legion_Progress.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Mona quest debug
-// Authors:
-//    gumi
-//    monwarez
-
-function	script	QuestDebug33	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "Artis_Legion_Progress";
-        mes "---";
-        mes l("Quest state: @@", getq(Artis_Legion_Progress));
-        next;
-
-        GenericQuestDebug Artis_Legion_Progress,
-            l("Does not have the quest"), 0,
-            l("Sent to training"), 1,
-            l("Finished  training"), 2,
-            l("Sent to battle"), 3,
-            l("Finished battle"), 4,
-            l("Sent to Q'Anon"), 5;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 468f39d03..ad1f8d70e 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -48,39 +48,6 @@
 
 // quest debug
 "npc/functions/quest-debug/functions.txt",
-"npc/functions/quest-debug/000-ShipQuests_Julia.txt",
-"npc/functions/quest-debug/001-ShipQuests_Arpan.txt",
-"npc/functions/quest-debug/002-ShipQuests_Alige.txt",
-"npc/functions/quest-debug/003-ShipQuests_Peter.txt",
-"npc/functions/quest-debug/004-ShipQuests_Nard.txt",
-"npc/functions/quest-debug/005-ShipQuests_Knife.txt",
-"npc/functions/quest-debug/006-ShipQuests_ArpanMoney.txt",
-"npc/functions/quest-debug/007-ShipQuests_Door.txt",
-"npc/functions/quest-debug/009-ShipQuests_TreasureChest.txt",
-"npc/functions/quest-debug/010-ShipQuests_Ale.txt",
-"npc/functions/quest-debug/011-ShipQuests_Astapolos.txt",
-"npc/functions/quest-debug/012-ShipQuests_Gulukan.txt",
-"npc/functions/quest-debug/013-ShipQuests_Jalad.txt",
-"npc/functions/quest-debug/014-ShipQuests_QMuller.txt",
-"npc/functions/quest-debug/015-ShipQuests_Tibbo.txt",
-"npc/functions/quest-debug/016-ShipQuests_Gugli.txt",
-"npc/functions/quest-debug/017-ShipQuests_ChefGado.txt",
-"npc/functions/quest-debug/018-General_Cookies.txt",
-"npc/functions/quest-debug/019-ArtisQuests_LazyBrother.txt",
-"npc/functions/quest-debug/020-ArtisQuests_Urchin.txt",
-"npc/functions/quest-debug/021-ArtisQuests_CatchPiou.txt",
-"npc/functions/quest-debug/022-ArtisQuests_Fishman.txt",
-"npc/functions/quest-debug/023-ArtisQuests_QOnan.txt",
-// 24: quest removed (Halloween_VisitArtis)
-// 25: quest removed (Halloween_BarrelQuest)
-"npc/functions/quest-debug/026-General_Rumly.txt",
-"npc/functions/quest-debug/027-ArtisQuests_Enora.txt",
-"npc/functions/quest-debug/028-General_Narrator.txt",
-"npc/functions/quest-debug/029-ArtisQuests_Fexil.txt",
-"npc/functions/quest-debug/030-ArtisQuests_Lloyd.txt",
-"npc/functions/quest-debug/031-General_Janus.txt",
-"npc/functions/quest-debug/032-ArtisQuests_MonaDad.txt",
-"npc/functions/quest-debug/033-Artis_Legion_Progress.txt",
 
 // Item functions
 "npc/items/croconut.txt",