Merge pull request #223 from wushin/moving-tutorial

Move Tutorial to Hurnscald
author: Wushin <pasekei@gmail.com> 2015-01-07 21:25:14 -0600
committer: Wushin <pasekei@gmail.com> 2015-01-07 21:25:14 -0600
commit: b734af239e8ff1e7ea746ea327fb84c62be09b7e (patch)
tree: cbc5f399ccf8dd226056887a70b9a313f88bee6e /world/map/npc
parent: 2c09797ebd2c03b2cbe9a458f8ea8d1fbd04ccff (diff)
parent: 61c88ec162713b980f30e6e5111c1cfbd9f23d3a (diff)
download: serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.gz
serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.bz2
serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.xz
serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.zip
304 files changed, 1899 insertions, 2748 deletions
diff --git a/world/map/npc/001-1/_import.txt b/world/map/npc/001-1/_import.txt
index de0b02ab..de158a13 100644
--- a/world/map/npc/001-1/_import.txt
+++ b/world/map/npc/001-1/_import.txt
@@ -1,31 +1,25 @@
-// Map 001-1: South Tulimshar
+// Map 001-1: Tulimshar Port
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 001-1.gat
 npc: npc/001-1/_mobs.txt
 npc: npc/001-1/_warps.txt
-npc: npc/001-1/banker.txt
-npc: npc/001-1/barber.txt
-npc: npc/001-1/bard.txt
-npc: npc/001-1/bernard.txt
-npc: npc/001-1/bleacher.txt
+npc: npc/001-1/adrian.txt
+npc: npc/001-1/ched.txt
 npc: npc/001-1/children.txt
 npc: npc/001-1/constable.txt
 npc: npc/001-1/dock.txt
-npc: npc/001-1/elanore.txt
-npc: npc/001-1/entertainer.txt
+npc: npc/001-1/eomie.txt
+npc: npc/001-1/ferry_master.txt
+npc: npc/001-1/gate_guards.txt
 npc: npc/001-1/gossip.txt
 npc: npc/001-1/guards.txt
-npc: npc/001-1/guide.txt
-npc: npc/001-1/luca.txt
+npc: npc/001-1/inac.txt
 npc: npc/001-1/mapflags.txt
-npc: npc/001-1/merchant.txt
-npc: npc/001-1/mikhail.txt
-npc: npc/001-1/monster_guide.txt
+npc: npc/001-1/north_shops.txt
 npc: npc/001-1/npcs.txt
-npc: npc/001-1/rewards_master.txt
-npc: npc/001-1/sandra.txt
-npc: npc/001-1/sarah.txt
-npc: npc/001-1/soul-menhir.txt
-npc: npc/001-1/trader.txt
-npc: npc/001-1/traveler.txt
-npc: npc/001-1/vincent.txt
+npc: npc/001-1/sewer_east.txt
+npc: npc/001-1/sewer_north.txt
+npc: npc/001-1/stat_reset.txt
+npc: npc/001-1/tinris.txt
+npc: npc/001-1/tombstones.txt
+npc: npc/001-1/weellos.txt
diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index 3b2cd620..4c4e54b5 100644
--- a/world/map/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
@@ -1,26 +1,11 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// South Tulimshar mobs
+// Tulimshar Port mobs
 
-001-1.gat,45,86,2,1|monster|Scorpion|1003,1,30000ms,30000ms,Mob001-1::On1003
-001-1.gat,43,85,2,1|monster|Scorpion|1003,1,60000ms,30000ms,Mob001-1::On1003
-001-1.gat,45,87,1,1|monster|Scorpion|1003,1,90000ms,30000ms,Mob001-1::On1003
-001-1.gat,45,85,1,1|monster|Scorpion|1003,1,180000ms,30000ms,Mob001-1::On1003
-001-1.gat,42,86,1,1|monster|Scorpion|1003,1,270000ms,30000ms,Mob001-1::On1003
-001-1.gat,43,87,2,1|monster|Scorpion|1003,1,360000ms,30000ms,Mob001-1::On1003
-001-1.gat,83,28,11,12|monster|Maggot|1002,5,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,115,26,13,9|monster|Maggot|1002,3,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,124,53,15,13|monster|Maggot|1002,10,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,120,64,15,13|monster|Maggot|1002,11,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,53,23,26,4|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,68,67,9,10|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,99,81,24,4|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,139,65,12,23|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,113,47,8,11|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,132,38,11,12|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,77,49,17,13|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,21,74,6,18|monster|Maggot|1002,2,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,122,59,17,22|monster|GiantMaggot|1006,1,100000ms,30000ms,Mob001-1::On1006
-001-1.gat,137,25,15,7|monster|FireGoblin|1011,1,61000ms,60000ms,Mob001-1::On1011
+001-1.gat,32,59,10,11|monster|GreenSlime|1005,8,100000ms,30000ms,Mob001-1::On1005
+001-1.gat,45,100,10,11|monster|GreenSlime|1005,8,100000ms,30000ms,Mob001-1::On1005
+001-1.gat,37,75,8,34|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033
+001-1.gat,86,84,65,55|monster|Maggot|1002,11,100000ms,30000ms,Mob001-1::On1002
+001-1.gat,86,84,65,55|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033
 
 
 001-1.gat,0,0,0|script|Mob001-1|-1
@@ -32,18 +17,13 @@ On1002:
     callfunc "MobPoints";
     end;
 
-On1003:
-    set @mobID, 1003;
+On1005:
+    set @mobID, 1005;
     callfunc "MobPoints";
     end;
 
-On1006:
-    set @mobID, 1006;
-    callfunc "MobPoints";
-    end;
-
-On1011:
-    set @mobID, 1011;
+On1033:
+    set @mobID, 1033;
     callfunc "MobPoints";
     end;
 }
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index d113ba85..7d8ef0d6 100644
--- a/world/map/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
@@ -1,8 +1,17 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// South Tulimshar warps
+// Tulimshar Port warps
 
-001-1.gat,44,87|warp|To Sandstorm Desert|3,-1,002-1.gat,58,14
-001-1.gat,44,20|warp|To North Tulimshar|3,-1,021-1.gat,55,145
-001-1.gat,125,21|warp|To North Tulimshar|0,-1,021-1.gat,136,146
-001-1.gat,32,70|warp|To Tulimshar Indoor|-1,-1,001-2.gat,25,34
-001-1.gat,75,40|warp|To Tulimshar Indoor|-1,-1,001-2.gat,71,72
+001-1.gat,63,119|warp|South Tulimshar|3,-1,002-1.gat,63,21
+001-1.gat,103,119|warp|South Tulimshar|3,-1,002-1.gat,103,21
+001-1.gat,55,71|warp|To Government Building|-1,-1,001-2.gat,31,27
+001-1.gat,52,71|warp|To Government Building|-1,-1,001-2.gat,28,27
+001-1.gat,49,71|warp|To Government Building|-1,-1,001-2.gat,25,27
+001-1.gat,114,99|warp|To Tulimshar Forge|-1,-1,001-2.gat,25,64
+001-1.gat,27,32|warp|To MIT|-1,-1,001-2.gat,28,101
+001-1.gat,37,32|warp|To MIT|-1,-1,001-2.gat,71,101
+001-1.gat,55,34|warp|To Tulimshar Castle|0,-1,001-2.gat,104,101
+001-1.gat,52,22|warp|Council Chambers|-1,-1,001-2.gat,95,52
+001-1.gat,57,22|warp|Council Chambers|-1,-1,001-2.gat,114,52
+001-1.gat,28,23|warp|To MIT|-1,-1,001-2.gat,28,87
+001-1.gat,28,44|warp|Sewers|-1,-1,021-3.gat,29,61
+001-1.gat,59,98|warp|To Bank|-1,-1,001-2.gat,65,25
diff --git a/world/map/npc/022-1/adrian.txt b/world/map/npc/001-1/adrian.txt
index 7d76cf9d..4f9722d0 100644
--- a/world/map/npc/022-1/adrian.txt
+++ b/world/map/npc/001-1/adrian.txt
@@ -5,7 +5,7 @@
 // state 2: Adrian gave the luggage to the player
 // state 3: player gave luggage to Kylian and Kylian asks who to talk to for the shop license
 
-022-1.gat,58,54,0|script|Adrian|213
+001-1.gat,113,64,0|script|Adrian|213
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
diff --git a/world/map/npc/001-1/banker.txt b/world/map/npc/001-1/banker.txt
deleted file mode 100644
index cd5e84df..00000000
--- a/world/map/npc/001-1/banker.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-
-001-1.gat,58,50,0|script|Tybalt|107
-{
-    callfunc "ClearVariables";
-    set @npcname$, "Tybalt";
-    callfunc "Banker";
-    set @npcname$, "";
-    close;
-}
diff --git a/world/map/npc/001-1/barber.txt b/world/map/npc/001-1/barber.txt
deleted file mode 100644
index f1e0262a..00000000
--- a/world/map/npc/001-1/barber.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-
-001-1.gat,52,36,0|script|Nicolas|100
-{
-    mes "[Nicolas the Barber]";
-    mes "\"Do you need a barber?\"";
-    next;
-    callfunc "Barber";
-    mes "[Nicolas the Barber]";
-    mes "\"Come again!\"";
-    close;
-}
diff --git a/world/map/npc/024-1/ched.txt b/world/map/npc/001-1/ched.txt
index 0137ed55..7dfc4ed7 100644
--- a/world/map/npc/024-1/ched.txt
+++ b/world/map/npc/001-1/ched.txt
@@ -1,10 +1,7 @@
 // Student at Tulimshar's magic academy
 
-024-1.gat,69,56,0|script|Ched|113
+001-1.gat,43,48,0|script|Ched|113
 {
-    if (isin("024-1.gat", 62, 52, 65, 57)) goto L_Garden;
-    if (isin("024-1.gat", 66, 43, 80, 54)) goto L_Canyon;
-
     mes "[Ched]";
     mes "\"I'm trying to get a spell to work. It's supposed to combine two potions, but I can't seem to figure out which two those are...\"";
     next;
@@ -21,28 +18,8 @@ L_Next:
     next;
     mes "[Ched]";
     mes "\"Maybe I should go back to `detect magic' until I can cast that one properly.\"";
-    close;
+    goto L_Done;
 
 L_Done:
     close;
-
-L_Garden:
-    if (BaseLevel < 40)
-        goto L_Warp;
-    mes "[Ched]";
-    mes "\"Be careful of those plants. They can be dangerous,\"";
-    close;
-
-L_Canyon:
-    if (BaseLevel < 40)
-        goto L_Warp;
-    mes "[Ched]";
-    mes "\"I'm not allowed back there.\"";
-    close;
-
-L_Warp:
-    warp "024-1.gat", 71, 56;
-    mes "[Ched]";
-    mes "\"You can't be back there.\"";
-    close;
 }
diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 7213370c..3ce987c1 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -1,6 +1,6 @@
 // Aisha
 
-001-1.gat,95,29,0|script|Aisha|108
+001-1.gat,102,27,0|script|Aisha|108
 {
     set @TEMP,rand(10);
     if(@TEMP == 1) goto L_1;
diff --git a/world/map/npc/001-1/constable.txt b/world/map/npc/001-1/constable.txt
index 0b167873..0d8bc06c 100644
--- a/world/map/npc/001-1/constable.txt
+++ b/world/map/npc/001-1/constable.txt
@@ -1,9 +1,9 @@
 //
 
-001-1.gat,37,35,0|script|Constable Perry Graf|150
+001-1.gat,50,74,0|script|Constable Perry Graf|150
 {
-//    set @npcname$, "Constable Perry Graf";
-    set @canSkip, 1;
+    mes "[Constable Perry Graf]";
+    mes "\"Hello, make sure the rules are followed.\"";
     callfunc "GameRules";
     close;
 }
diff --git a/world/map/npc/001-1/dock.txt b/world/map/npc/001-1/dock.txt
index 4677097d..941e222a 100644
--- a/world/map/npc/001-1/dock.txt
+++ b/world/map/npc/001-1/dock.txt
@@ -1,8 +1,27 @@
-// Ferry Sign
+// The ferry dock
 // Author: Wushin
-001-1.gat,48,71,0|script|Ferry Schedule#1|396
+
+// Ferry Sign
+001-1.gat,61,71,0|script|Ferry Schedule#2|396
 {
     callfunc "FerryManifest";
     end;
 }
 
+001-1.gat,75,70,0|script|Tulimshar Koga|395,8,3
+{
+    callfunc "BoardFerry";
+    close;
+}
+
+001-1.gat,70,70,0|script|#TulimsharDock|127
+{
+    end;
+OnCommandArrive:
+    enablenpc "Tulimshar Koga";
+    end;
+
+OnCommandWarp:
+    disablenpc "Tulimshar Koga";
+    end;
+}
diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/001-1/eomie.txt
index 35d9acae..ab6a72bc 100644
--- a/world/map/npc/024-1/eomie.txt
+++ b/world/map/npc/001-1/eomie.txt
@@ -18,7 +18,7 @@
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
 
-024-1.gat,72,94,0|script|Eomie|164
+001-1.gat,71,23,0|script|Eomie|164
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
@@ -96,9 +96,7 @@ L_Mine: // player asked how to get Ice Cubes
     mes "[Eomie]";
     mes "\"Hm, that's a difficult task, indeed. Naturally you will find them on the continent of Kaizei, which is high up in the north and covered with snow most time of the year. But it might be difficult to get there.\"";
     next;
-    mes "\"I heard that Ice Goblins were seen in the caves that are East of Nivalis. Maybe you can find Ice Cubes in there.\"";
-    next;
-    mes "\"Though they don't let in everyone. Miners, Soldiers and sometimes an adventurer. I suggest you talk to Lieutenant Dausen about that.\"";
+    mes "\"I heard that Ice Goblins were seen in the caves that are around Nivalis. Maybe you can find Ice Cubes in there.\"";
     goto L_Close;
 
 L_CastedSpell: // @state >= 9 but below 14
diff --git a/world/map/npc/001-1/ferry_master.txt b/world/map/npc/001-1/ferry_master.txt
new file mode 100644
index 00000000..6454d310
--- /dev/null
+++ b/world/map/npc/001-1/ferry_master.txt
@@ -0,0 +1,21 @@
+//
+
+001-1.gat,64,75,0|script|Ferry Master#tulimshar|138
+{
+    mes "[Ferry Master]";
+    mes "\"Hello! Do you need something?\"";
+    goto L_Main;
+
+L_Main:
+    menu
+        "How do I use the ferry?", L_Explain,
+        "Nothing I guess", L_Close;
+
+L_Explain:
+    mes "[Ferry Master]";
+    callfunc "FerryHelp";
+    goto L_Main;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/001-1/gate_guards.txt b/world/map/npc/001-1/gate_guards.txt
new file mode 100644
index 00000000..5eb44e36
--- /dev/null
+++ b/world/map/npc/001-1/gate_guards.txt
@@ -0,0 +1,26 @@
+// Guard near the magic school
+001-1.gat,39,33,0|script|Guard#school|104
+{
+    mes "[Guard]";
+    mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
+    close;
+}
+001-1.gat,56,47,0|script|Guard#castle|104
+{
+    mes "[Guard]";
+    mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
+    close;
+}
+
+001-1.gat,61,99,0|script|Guard#east3|104
+{
+    mes "[Guard]";
+    mes "\"The Palace is North of here. That is where you will find the Council of Wizards.\"";
+    close;
+}
+001-1.gat,53,72,0|script|Guard#govt_out|123
+{
+    mes "[Guard]";
+    mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
+    close;
+}
diff --git a/world/map/npc/001-1/gossip.txt b/world/map/npc/001-1/gossip.txt
index 28d4455d..5d3bb671 100644
--- a/world/map/npc/001-1/gossip.txt
+++ b/world/map/npc/001-1/gossip.txt
@@ -1,32 +1,19 @@
 // NPC to provide hints on progression of linear quest chain in Tulimshar
 
-001-1.gat,49,31,0|script|Gladys|154
+001-1.gat,66,104,0|script|Gladys|154
 {
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
-
-    set @guards, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-    set @bermik, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
-    set @sarah, ((QUEST_SouthTulimshar & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
-    set @vincent, ((QUEST_SouthTulimshar & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
-    set @sandra, ((QUEST_SouthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
-
     mes "[Gladys, Town Gossip]";
     mes "\"Hello deary!  I hear some of the most fascinating rumors and bits of news. I just heard a bit more today!\"";
     mes "\"Would you like me to let you in on the good stuff?\"";
     menu
-        "Sure!", L_Yes,
+        "Lt. Dausen", L_Intro,
+        "Fieri", L_Cook,
+        "Sarah", L_Sarah,
+        "Sandra", L_Sandra,
+        "Desert Mine", L_Desert,
+        "Ferry", L_Ferry,
         "No thanks.", L_No;
 
-L_Yes:
-    if (@bermik < 4)  goto L_Intro;
-    if (@bermik < 6)  goto L_Mik;
-    if (@sarah < 2)   goto L_Sarah;
-    if (@vincent < 2) goto L_Vinc;
-    if (@sandra < 2)  goto L_Sandra;
-    if (@guards < 28) goto L_Desert;
-    goto L_Ferry;
-
 L_No:
     mes "[Gladys, Town Gossip]";
     mes "\"Very well. Come back whenever you like. I am always getting juicy bits of news!\"";
@@ -35,65 +22,35 @@ L_No:
 L_Intro:
     mes "[Gladys, Town Gossip]";
     mes "\"Have you met our lovely guard captain yet?  He usually keeps a post just outside the gates where he can keep an eye on things. He likes to talk to new adventurers too.\"";
-    next;
-    mes "[Gladys, Town Gossip]";
-    mes "\"I also overheard some of the children in the square talking today. I think they are having trouble with some of their chores. Kids these days...\"";
-    next;
-    mes "The old lady trails off and starts muttering to herself about hills and snow. Perhaps it's best to leave her alone for now.";
     goto L_Close;
 
-L_Mik:
+L_Cook:
     mes "[Gladys, Town Gossip]";
-    mes "\"That nice young boy Bernard gave me some of the soup you helped him make. It was lovely!\"";
+    mes "\"I hear the kitchen at the Magic Insitute of Tulimshar needs help.\"";
     next;
-    mes "[Gladys, Town Gossip]";
-    mes "\"One of the ladies in my quilting club mentioned giving a task to her grandson. I have my doubts about whether he ever finished it...\"";
+    mes "\"The only thing bigger then a wizard's ego is their waistline. Hehe.\"";
     goto L_Close;
 
 L_Sarah:
     mes "[Gladys, Town Gossip]";
-    mes "\"Ethel, the lady in my quilting club, told me you helped her grandson with his chore. That was awfully nice of you!\"";
-    next;
-    mes "[Gladys, Town Gossip]";
-    mes "\"Do you believe what parents will let their kids do these days?!  I heard about this girl at the far side of town who does nothing but eat sweets all day!  Honestly, what is the world coming to?\"";
-    goto L_Close;
-
-L_Vinc:
-    mes "[Gladys, Town Gossip]";
-    mes "\"I just got news of an exciting new business opportunity!  There's supposed to be a new entrepreneur in town somewhere making toys. You should get in on the ground floor!\"";
+    mes "\"Do you believe what parents will let their kids do these days?!  I heard about this girl in the south east side of town who does nothing but eat sweets all day!  Honestly, what is the world coming to?\"";
     goto L_Close;
 
 L_Sandra:
     mes "[Gladys, Town Gossip]";
-    mes "\"How's that toy business working out? Pretty good tip, huh?\"";
-    next;
-    mes "[Gladys, Town Gossip]";
-    mes "\"I've been hearing reports of you all over town!  I think there's only one little girl you haven't assisted, but she's a strange one...always messing about with bugs. Yuck!\"";
+    mes "\"The students and wizards at the Magic Institute of Tulimshar are always looking for people to gather reagents for spells as they are far too busy studing.\"";
     goto L_Close;
 
 L_Desert:
-    if (Sex == 0) set @person$, "gal";
-    if (Sex == 1) set @person$, "guy";
-
-    mes "[Gladys, Town Gossip]";
-    mes "\"Well, if it isn't " + strcharinfo(0) + "!  Our local hero and supernice " + @person$ + ".\"";
-    mes "\"The whole town is buzzing about you now!\"";
-    next;
     mes "[Gladys, Town Gossip]";
     mes "\"If you're still looking for adventure, I would suggest talking to some of the guards. I hear there is a monster threat outside the city walls!\"";
     goto L_Close;
 
 L_Ferry:
     mes "[Gladys, Town Gossip]";
-    mes "I heard that there is a handsome sailor in the north of town who will take people to exotic new places!  I'm saving my pennies!\"";
+    mes "I heard that there is a ferry in the north of town that will take people to exotic new places!\"";
     goto L_Close;
 
 L_Close:
-    set @person$, "";
-    set @guards, 0;
-    set @bermik, 0;
-    set @sarah, 0;
-    set @vincent, 0;
-    set @sandra, 0;
     close;
 }
diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt
index c481e098..358604eb 100644
--- a/world/map/npc/001-1/guards.txt
+++ b/world/map/npc/001-1/guards.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,48,79,0|script|Ekinu|104
+001-1.gat,103,99,0|script|Ekinu|104
 {
     mes "[Ekinu the Town Guard]";
     mes "\"What a disaster... I can't believe that we managed to rebuild the town so quickly.\"";
@@ -75,7 +75,7 @@ L_Close:
     close;
 }
 
-001-1.gat,40,79,0|script|Ryan|104
+001-1.gat,107,42,0|script|Ryan|104
 {
     if (getskilllv(SKILL_MAGIC)) goto L_message;
 
diff --git a/world/map/npc/021-1/inac.txt b/world/map/npc/001-1/inac.txt
index b2ed01bd..7d5f6e4d 100644
--- a/world/map/npc/021-1/inac.txt
+++ b/world/map/npc/001-1/inac.txt
@@ -1,6 +1,6 @@
 //
 
-021-1.gat,53,103,0|script|Inac|156
+001-1.gat,58,81,0|script|Inac|156
 {
     set @halloween_npc_id, $@halloween_npc_inac;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/001-1/mapflags.txt b/world/map/npc/001-1/mapflags.txt
index 08b77ab5..896cff6a 100644
--- a/world/map/npc/001-1/mapflags.txt
+++ b/world/map/npc/001-1/mapflags.txt
@@ -1,2 +1,2 @@
 001-1.gat|mapflag|town
-001-1.gat|mapflag|resave|001-1,57,71
+001-1.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt
deleted file mode 100644
index 6205f79a..00000000
--- a/world/map/npc/001-1/merchant.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-//
-
-001-1.gat,38,50,0|shop|Neko|101,CactusDrink:*50,CactusPotion:*70,Beer:*175,ChickenLeg:*500
diff --git a/world/map/npc/001-1/north_shops.txt b/world/map/npc/001-1/north_shops.txt
new file mode 100644
index 00000000..a207ccaf
--- /dev/null
+++ b/world/map/npc/001-1/north_shops.txt
@@ -0,0 +1,8 @@
+// Northern shopping plaza
+001-1.gat,106,105,0|shop|Neko|101,TonoriDelight:*50,CactusDrink:*50,CactusPotion:*70,RoastedMaggot:*110,Beer:*175,ChickenLeg:*500
+001-1.gat,111,108,0|shop|Inar|108,CottonShirt:*300,SerfHat:*500,CottonShorts:*1000,CottonBoots:*2000,DesertShirt:*2000,CottonHeadband:*3000,DesertHat:*9600
+001-1.gat,48,79,0|script|Well|400
+{
+    callfunc "WaterBottle";
+    end;
+}
diff --git a/world/map/npc/001-1/npcs.txt b/world/map/npc/001-1/npcs.txt
index 5d59ddd6..add8cd90 100644
--- a/world/map/npc/001-1/npcs.txt
+++ b/world/map/npc/001-1/npcs.txt
@@ -1,27 +1,76 @@
-// Talk NPCs to help make trek interesting around the Bazaar.
+001-1.gat,49,82,0|script|Cyndala|210
+{
+    set @npcname$, "Cyndala";
 
-001-1.gat,46,26,0|script|Yalina|209
+    mes "[" + @npcname$ + "]";
+    mes "\"I used to visit the beach, but then the green slimes went crazy. I heard they ate a bunch of pirates that robbed some of Tulimshar's gold ships.\"";
+    next;
+    mes "\"Good riddance!\"";
+    set @npcname$, "";
+    close;
+}
+001-1.gat,100,79,0|script|Marikel|211
 {
-    set @npcname$, "Yalina";
+    set @npcname$, "Marikel";
 
     mes "[" + @npcname$ + "]";
-    mes "\"Ian knows a lot!  I had so many questions he helped me with!\"";
+    mes "\"Working on the docks can be hard nowadays.\"";
     next;
-    mes "\"He rewards those that know what they are doing. When Elanore stops healing you, check in with Ian.\"";
+    mes "\"At least it pays well.\"";
+    menu
+        "Why does it pay well?",L_Marikel_1,
+        "Pfft! Working on the docks is for the birds.",L_Marikel_2;
+
+L_Marikel_1:
+    mes "[" + @npcname$ + "]";
+    mes "\"Tulimshar is the wealthiest and most powerful city in the world!\"";
+    close;
+
+L_Marikel_2:
+    mes "[" + @npcname$ + "]";
+    mes "\"Yeah, killing monsters may pay well, but I'd need more hazard pay than a tower mason to hunt monsters.\"";
     next;
-    mes "\"Oh, just one more thing, Gladys may gossip a lot, but when I'm confused, she tends to know something that might help me out.\"";
-    set @npcname$, "";
+    mes "\"I'll just play safe and stick to putting our stock away. Be careful, the monsters outside the city can be dangerous.\"";
+    next;
+    mes "\"The Sandstorm mine, just South of Tulimshar, is blocked from most but miners, soldiers and seasoned monster slayers.\"";
     close;
 }
 
-001-1.gat,84,72,0|script|Cyndala|210
+001-1.gat,105,53,0|script|Joelin|212
 {
-    set @npcname$, "Cyndala";
+    set @npcname$, "Joelin";
 
     mes "[" + @npcname$ + "]";
-    mes "\"I used to visit the beach, but then the green slimes went crazy. I heard they ate a bunch of pirates that robbed some of Tulimshar's gold ships.\"";
+    mes "\"My ship's to set sail soon. We'll tour around the Acean Isles, then back around to Argaes, then here in Tonori.\"";
     next;
-    mes "\"Good riddance!\"";
+    mes "\"Tulimshar's Fleets also are sending exploration teams to build a dock in Nivalis on Kaizei, which I'm not really hoping for. It's cold up there!\"";
+    close;
+}
+
+001-1.gat,107,53,0|script|Harper|213
+{
+    set @npcname$, "Harper";
+
+    mes "[" + @npcname$ + "]";
+    mes "\"My captain knows an awlful lot about the world's continents.\"";
+    close;
+}
+001-1.gat,75,99,0|script|Swezanne|206
+{
+    set @npcname$, "Swezanne";
+
+    mes "[" + @npcname$ + "]";
+    mes "\"Just through over this bridge is the bazaar. I go to the Bazaar and shop at Neko's.\"";
+    close;
+}
+001-1.gat,92,107,0|script|Michel|215
+{
+    set @npcname$, "Michel";
+
+    mes "[" + @npcname$ + "]";
+    mes "\"Elanore is a magician in Southern Tulimshar that helps young adventurers by healing their battle wounds. When they are experienced enough, she stops healing them.\"";
+    next;
+    mes "\"You can find her by going out the south gate and to the east.\"";
     set @npcname$, "";
     close;
 }
diff --git a/world/map/npc/021-1/sewer_east.txt b/world/map/npc/001-1/sewer_east.txt
index 4a0b22d8..2b1e7bc4 100644
--- a/world/map/npc/021-1/sewer_east.txt
+++ b/world/map/npc/001-1/sewer_east.txt
@@ -1,6 +1,6 @@
 // The Sewer Grate
 
-021-1.gat,145,136,0|script|#tulimsharsewer2|45,0,0
+001-1.gat,117,110,0|script|#tulimsharsewer2|45,0,0
 {
     mes "Descend into the sewers?";
     next;
diff --git a/world/map/npc/021-1/sewer_north.txt b/world/map/npc/001-1/sewer_north.txt
index 9c4ed277..ce33cca3 100644
--- a/world/map/npc/021-1/sewer_north.txt
+++ b/world/map/npc/001-1/sewer_north.txt
@@ -1,6 +1,6 @@
 // The Sewer Grate
 
-021-1.gat,124,41,0|script|#tulimsharsewer1|45,0,0
+001-1.gat,58,83,0|script|#tulimsharsewer1|45,0,0
 {
     mes "Descend into the sewers?";
     next;
@@ -9,7 +9,7 @@
         "Nevermind.", L_Close;
 
 L_Sewer:
-    warp "021-3",125,35;
+    warp "021-3",57,100;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/001-1/stat_reset.txt b/world/map/npc/001-1/stat_reset.txt
new file mode 100644
index 00000000..61d1328b
--- /dev/null
+++ b/world/map/npc/001-1/stat_reset.txt
@@ -0,0 +1,8 @@
+//
+
+001-1.gat,117,105,0|script|Malivox|103
+{
+    set @NpcName$, "Malivox";
+    callfunc "StatReset";
+    close;
+}
diff --git a/world/map/npc/024-1/tinris.txt b/world/map/npc/001-1/tinris.txt
index e4465cd3..c2b52d85 100644
--- a/world/map/npc/024-1/tinris.txt
+++ b/world/map/npc/001-1/tinris.txt
@@ -17,7 +17,7 @@
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
 
-024-1.gat,82,64,0|script|Tinris|160
+001-1.gat,69,29,0|script|Tinris|160
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
diff --git a/world/map/npc/001-1/tombstones.txt b/world/map/npc/001-1/tombstones.txt
new file mode 100644
index 00000000..2dfd3178
--- /dev/null
+++ b/world/map/npc/001-1/tombstones.txt
@@ -0,0 +1,76 @@
+// RIPs in Noble memorial
+
+001-1.gat,56,103,0|script|RIP#1|400
+{
+
+    mes "~ wushin ~";
+    mes "Tonori swallowed him whole.";
+    close;
+}
+
+001-1.gat,57,103,0|script|RIP#2|400
+{
+
+    mes "~ Nard ~";
+    mes "Crushed by a loom.";
+    close;
+}
+
+001-1.gat,58,103,0|script|RIP#3|400
+{
+
+    mes "~ tux9th ~";
+    mes "Eaten by bugs.";
+    close;
+}
+
+001-1.gat,59,103,0|script|RIP#4|400
+{
+
+    mes "~ o11c ~";
+    mes "He asked for it. So they gave it to him.";
+    close;
+}
+
+001-1.gat,60,103,0|script|RIP#5|400
+{
+
+    mes "~ " + strcharinfo(0) + " ~";
+    mes "The tombstone is blank and the grave freshly dug.";
+    close;
+}
+001-1.gat,56,106,0|script|RIP#6|400
+{
+
+    mes "~ Cassy ~";
+    mes "Eaten by trolls.";
+    close;
+}
+
+001-1.gat,57,106,0|script|RIP#7|400
+{
+    mes "~ George ~";
+    mes "Eaten by Snakes.";
+    close;
+}
+
+001-1.gat,58,106,0|script|RIP#8|400
+{
+    mes "~ Kieron ~";
+    mes "He was right, monsters were in the cave.";
+    close;
+}
+
+001-1.gat,59,106,0|script|RIP#9|400
+{
+    mes "~ William ~";
+    mes "Kieron was definitely right.";
+    close;
+}
+
+001-1.gat,60,106,0|script|RIP#10|400
+{
+    mes "~ Tyer ~";
+    mes "An experiement went wrong.";
+    close;
+}
diff --git a/world/map/npc/021-1/weellos.txt b/world/map/npc/001-1/weellos.txt
index 9f34e6a5..7400402a 100644
--- a/world/map/npc/021-1/weellos.txt
+++ b/world/map/npc/001-1/weellos.txt
@@ -1,7 +1,7 @@
 // A historian
 // takes part in quest given by 021-2/kylian.txt
 
-021-1.gat,130,125,0|script|Weellos|103
+001-1.gat,55,25,0|script|Weellos|103
 {
     set @halloween_npc_id, $@halloween_npc_weellos;
     callfunc "TrickOrTreat";
@@ -9,10 +9,16 @@
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowWeellosNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
-    if isin("021-1.gat", 130, 120, 140, 125) goto L_In;
+    if isin("001-1.gat", 48, 20, 61, 28) goto L_In;
 
     mes "[Weellos]";
-    mes "\"This is a very historic building. One of the oldest in the area. It's been turned into a museum.\"";
+    mes "\"This is a very historic building. One of the oldest in the area.\"";
+    next;
+    mes "\"It's the current seat of the council of wizards.\"";
+    next;
+    mes "\"It's also holds the Magic Institute of Tulimshar.\"";
+    next;
+    mes "\"Part of It's been turned into a museum as well\"";
     goto L_BeforeClose;
 
 // If the player is inside the fence with Weellos
diff --git a/world/map/npc/001-2/_import.txt b/world/map/npc/001-2/_import.txt
index ae570981..6ad9ffe0 100644
--- a/world/map/npc/001-2/_import.txt
+++ b/world/map/npc/001-2/_import.txt
@@ -3,10 +3,18 @@
 map: 001-2.gat
 npc: npc/001-2/_mobs.txt
 npc: npc/001-2/_warps.txt
-npc: npc/001-2/casino.txt
-npc: npc/001-2/dedication.txt
+npc: npc/001-2/bank.txt
+npc: npc/001-2/david.txt
+npc: npc/001-2/fieri.txt
+npc: npc/001-2/forge_shops.txt
+npc: npc/001-2/government_building.txt
+npc: npc/001-2/heathin.txt
+npc: npc/001-2/jhedia.txt
+npc: npc/001-2/manakins.txt
 npc: npc/001-2/mapflags.txt
-npc: npc/001-2/omar.txt
-npc: npc/001-2/phaet.txt
-npc: npc/001-2/shops.txt
-npc: npc/001-2/troupe_leader.txt
+npc: npc/001-2/pauline.txt
+npc: npc/001-2/sandra.txt
+npc: npc/001-2/tathin.txt
+npc: npc/001-2/tondar.txt
+npc: npc/001-2/wizards.txt
+npc: npc/001-2/yanis.txt
diff --git a/world/map/npc/001-2/_warps.txt b/world/map/npc/001-2/_warps.txt
index 50745da6..6a310169 100644
--- a/world/map/npc/001-2/_warps.txt
+++ b/world/map/npc/001-2/_warps.txt
@@ -1,13 +1,18 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // South Tulimshar Indoor warps
 
-001-2.gat,25,35|warp|To Outside|-1,-1,001-1.gat,32,72
-001-2.gat,44,25|warp|To Second Floor|-1,0,001-2.gat,65,25
-001-2.gat,64,25|warp|To First Floor|-1,-1,001-2.gat,43,25
-001-2.gat,67,30|warp|To Bedroom|-1,-1,001-2.gat,103,23
-001-2.gat,76,30|warp|To Deposit|-1,-1,001-2.gat,131,23
-001-2.gat,69,22|warp|To Casino|0,-1,001-2.gat,32,72
-001-2.gat,103,22|warp|To Second Floor|0,-1,001-2.gat,67,29
-001-2.gat,131,22|warp|To Second Floor|0,-1,001-2.gat,76,29
-001-2.gat,32,73|warp|To Second Floor|-1,-1,001-2.gat,69,23
-001-2.gat,71,73|warp|To Outside|-1,-1,001-1.gat,75,42
+001-2.gat,25,65|warp|To Outside|-1,-1,001-1.gat,114,100
+001-2.gat,28,102|warp|To Outside|-1,-1,001-1.gat,27,33
+001-2.gat,28,86|warp|To Light|-1,-1,001-1.gat,28,22
+001-2.gat,105,102|warp|To Outside|0,-1,001-1.gat,54,35
+001-2.gat,25,28|warp|To Outside|-1,-1,001-1.gat,49,72
+001-2.gat,28,28|warp|To Outside|-1,-1,001-1.gat,52,72
+001-2.gat,31,28|warp|To Outside|-1,-1,001-1.gat,55,72
+001-2.gat,71,102|warp|To Outside|-1,-1,001-1.gat,37,33
+001-2.gat,105,73|warp|Council Chambers|2,-1,001-2.gat,104,42
+001-2.gat,105,43|warp|Main Floor|2,-1,001-2.gat,104,74
+001-2.gat,114,53|warp|Parapet|-1,-1,001-1.gat,57,23
+001-2.gat,95,53|warp|Parapet|-1,-1,001-1.gat,52,23
+001-2.gat,57,90|warp|Lighthouse|-1,-1,001-2.gat,35,94
+001-2.gat,36,95|warp|MainFloor|-1,0,001-2.gat,58,90
+001-2.gat,65,26|warp|Outside|-1,-1,001-1.gat,59,99
diff --git a/world/map/npc/068-2/bank.txt b/world/map/npc/001-2/bank.txt
index 328d98ae..b5bab670 100644
--- a/world/map/npc/068-2/bank.txt
+++ b/world/map/npc/001-2/bank.txt
@@ -1,5 +1,5 @@
-// Another banker
-068-2.gat,29,83,0|script|Hydusun|149
+// A Banker
+001-2.gat,63,17,0|script|Hydusun|149
 {
     set @npcname$, "Hydusun";
     callfunc "Banker";
diff --git a/world/map/npc/024-1/david.txt b/world/map/npc/001-2/david.txt
index b3a56dc4..fc9e3fd7 100644
--- a/world/map/npc/024-1/david.txt
+++ b/world/map/npc/001-2/david.txt
@@ -1,4 +1,4 @@
-024-1.gat,70,70,0|script|David|120
+001-2.gat,92,88,0|script|David|120
 {
     set @Potion_EXP, 2000;
 
diff --git a/world/map/npc/001-2/fieri.txt b/world/map/npc/001-2/fieri.txt
new file mode 100644
index 00000000..1264be4e
--- /dev/null
+++ b/world/map/npc/001-2/fieri.txt
@@ -0,0 +1,131 @@
+// Variables used: nibble 0 of QUEST_SouthTulimshar
+
+001-2.gat,114,89,0|script|Fieri|117
+{
+    set @state, ((QUEST_SouthTulimshar & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT);
+
+    if (@state >= 4) goto L_Done2;
+    if (@state == 3) goto L_Progress2;
+    if (@state == 2) goto L_Done1;
+    if (@state == 1) goto L_Progress;
+
+    set @TEMP, rand(2);
+    if(@TEMP == 1) goto L_Opening1;
+    goto L_Opening0;
+
+L_Opening0:
+    mes "[Fieri]";
+    mes "\"The Wizards are always hungry. All the magic all the time, sapping their energy.";
+    mes "Could I ask a favor of you?\"";
+    next;
+    goto L_Ask;
+
+L_Opening1:
+    mes "[Fieri]";
+    mes "\"These Wizards eat like a store house full of maggots.";
+    mes "At this rate I'll have nothing left to cook. Can you help me with a task?\"";
+    next;
+    goto L_Ask;
+
+L_Ask:
+    menu
+        "Yes.", L_Yes,
+        "No.", L_Close;
+
+L_Yes:
+    set @TEMP, rand(2);
+    if(@TEMP == 1) goto L_Req1;
+    goto L_Req0;
+
+L_Req0:
+    mes "[Fieri]";
+    mes "\"Great!  I need a Beer for my Tonori Delight.\"";
+    next;
+    goto L_Set;
+
+L_Req1:
+    mes "[Fieri]";
+    mes "\"Bring me a Beer. I'll give you something if you do.\"";
+    next;
+    goto L_Set;
+
+L_Set:
+    set @state, 1;
+    callsub S_Update_Var;
+    mes "[Fieri]";
+    mes "\"Please bring it to me!\"";
+    goto L_Close;
+
+L_Progress:
+    if (countitem("Beer") < 1) goto L_NotEnough;
+    mes "[Fieri]";
+    mes "\"Oooh, perfect! It's perfect!";
+    mes "You brought me my Beer!  Here, have some cake for your troubles.\"";
+    getinventorylist;
+    if (@inventorylist_count - (countitem("Beer") == 1) > 99 - (countitem("CherryCake") == 0) ) goto L_TooMany;
+    delitem "Beer", 1;
+    getexp 100, 0;
+    getitem "CherryCake", 5;
+    set @state, 2;
+    callsub S_Update_Var;
+    next;
+    mes "\"Now let's see...\"";
+    goto L_Close;
+
+L_Progress2:
+    if (countitem("MaggotSlime") < 3) goto L_NotEnough1;
+    mes "[Fieri]";
+    mes "\"Nice!  They're perfect, just perfect!";
+    mes "You brought me the 3 Maggot Slimes! Here, have some Tonori Delight as reward.\"";
+    getinventorylist;
+    if ((@inventorylist_count - (countitem("MaggotSlime") == 3) > 99  - (countitem("TonoriDelight") == 0) )) goto L_TooMany;
+    delitem "MaggotSlime", 3;
+    getexp 100, 0;
+    getitem "TonoriDelight", 3;
+    set @state, 4;
+    callsub S_Update_Var;
+    goto L_Close;
+
+L_NotEnough:
+    mes "[Fieri]";
+    mes "\"Oh, please hurry and bring me a Beer. The Wizards need their Tonori Delight!\"";
+    goto L_Close;
+
+L_NotEnough1:
+    mes "[Fieri]";
+    mes "\"Please do hurry and bring me 3 Maggot Slimes, so I can finish the Tonori Delight!\"";
+    goto L_Close;
+
+L_Done1:
+    mes "[Fieri]";
+    mes "\"Thank you so much!\"";
+    mes "\"But... I need some more ingredients.\"";
+    next;
+    mes "\"I need 3 Maggot Slimes for that.\"";
+    mes "\"Bring them to me, and I'll give you something nice.\"";
+    set @state, 3;
+    callsub S_Update_Var;
+    goto L_Close;
+
+L_Done2:
+    mes "[Fieri]";
+    mes "\"I hope you like Tonori Delight as much as I do, because, you see...\"";
+    next;
+    mes "\"Tonori Delight is life!\"";
+    goto L_Close;
+
+L_Close:
+    set @TEMP, 0;
+    set @state, 0;
+    close;
+
+L_TooMany:
+    next;
+    mes "[Fieri]";
+    mes "\"You don't have room for my reward. I'll wait until you do.\"";
+    goto L_Close;
+
+S_Update_Var:
+    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_6_MASK) | (@state << NIBBLE_6_SHIFT));
+    return;
+}
diff --git a/world/map/npc/001-2/forge_shops.txt b/world/map/npc/001-2/forge_shops.txt
new file mode 100644
index 00000000..5f2ab3ba
--- /dev/null
+++ b/world/map/npc/001-2/forge_shops.txt
@@ -0,0 +1,4 @@
+// Forge Shops
+
+001-2.gat,30,60,0|shop|Gungnir|311,SlingShot:*500,SlingBullet:*1,ShortBow:*8000,Arrow:*1,IronArrow:*4
+001-2.gat,25,59,0|shop|Mjolnir|377,Knife:*50,SharpKnife:*100,Dagger:*1000,LeatherShirt:*2000,LeatherShield:*2000
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/001-2/government_building.txt
index 441b77a0..f201f192 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/001-2/government_building.txt
@@ -1,7 +1,7 @@
 // The government builing in the south west
 
 // A clerk
-021-2.gat,27,17,0|script|Estard|107
+001-2.gat,25,21,0|script|Estard|107
 {
     mes "[Estard]";
     mes "\"Hello what can I do for you?\"";
@@ -135,44 +135,8 @@ S_give_rings:
     return;
 }
 
-021-2.gat,36,17,0|script|Tathin|107
-{
-    mes "[Tathin]";
-    mes "\"Hello what Can I do for you?\"";
-    next;
-
-    set @halloween_npc_id, $@halloween_npc_tathin;
-    callfunc "TrickOrTreat";
-
-    goto L_Base_Menu;
-
-L_Base_Menu:
-    menu
-        "I'd like to join a party.", L_Give_Party,
-        "I'd like to create my own party.", L_Give_Make_Party,
-        "Nothing, I guess.", L_Close;
-
-L_Give_Party:
-    mes "[Tathin]";
-    mes "\"You'll need to be invited by an existing member of a party to join it. You may also create your own party.\"";
-    next;
-    mes "[Tathin]";
-    mes "\"Remember, parties cannot share experience if any members are more than 10 levels apart.\"";
-    menu
-      "I'd like to create my own party.", L_Give_Make_Party,
-      "Goodbye.", L_Close;
-
-L_Give_Make_Party:
-    mes "[Tathin]";
-    mes "\"You can create parties with the 'new' or 'create' commands on the Party tab in the client. Parties need to have unique names.\"";
-    close;
-
-L_Close:
-    close;
-}
-
 // Guard
-021-2.gat,20,19,0|script|Guard#govt_in|123,1,1
+001-2.gat,22,21,0|script|Guard#govt_in|123
 {
     mes "[Guard]";
     mes "\"You can't come back here.\"";
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/001-2/heathin.txt
index 4bd9aae7..113b1b7e 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/001-2/heathin.txt
@@ -1,6 +1,6 @@
 //Items for NPC are incomplete. Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
 
-021-2.gat,70,129,0|script|Heathin|147
+001-2.gat,23,55,0|script|Heathin|147
 {
     set @TARROW_REQ_TERRA_ORE, 1;
     set @TARROW_REQ_COAL, 5;
@@ -337,7 +337,7 @@ S_Update_Mask:
     set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_6_MASK)) | (@state << NIBBLE_6_SHIFT);
     return;
 }
-021-2.gat,72,129,0|script|HeathinDebug|147
+001-2.gat,25,55,0|script|HeathinDebug|147
 {
     mes "[Heathin Debug]";
     mes "Debug Action";
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/001-2/jhedia.txt
index cc2f9165..fdee36c9 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/001-2/jhedia.txt
@@ -1,6 +1,6 @@
 // Ingot maker takes iron ore, gives ingots for future crafting purposes.
 
-021-2.gat,70,124,0|script|Jhedia|160
+001-2.gat,23,50,0|script|Jhedia|160
 {
     set @Cost_Per_Ingot, 1000;
     set @Iron_Ore_Per, 5;
diff --git a/world/map/npc/021-2/manakins.txt b/world/map/npc/001-2/manakins.txt
index 85f757a5..23a59909 100644
--- a/world/map/npc/021-2/manakins.txt
+++ b/world/map/npc/001-2/manakins.txt
@@ -1,19 +1,19 @@
 // Display Manakins. 
 
 // Forge
-021-2.gat,76,131,0|script|Terranite Armor#Female|401
+001-2.gat,29,57,0|script|Terranite Armor#Female|401
 {
     mes "Terranite Armor complete set, made to order, inquire with Heathin";
     close;
 }
 
-021-2.gat,81,131,0|script|Terranite Armor#Male|402
+001-2.gat,34,57,0|script|Terranite Armor#Male|402
 {
     mes "Terranite Armor complete set, made to order, inquire with Heathin";
     close;
 }
 
-021-2.gat,81,136,0|script|Terranite|403
+001-2.gat,34,62,0|script|Terranite|403
 {
     mes "Ahhh! A Terranite! Wait it appears to just be a display model.";
     close;
@@ -21,25 +21,25 @@
 
 // Museum
 
-021-2.gat,71,161,0|script|Talponian#Female|404
+001-2.gat,91,39,0|script|Talponian#Female|404
 {
     mes "A Female Talponian.";
     close;
 }
 
-021-2.gat,77,161,0|script|Talponian#Male|405
+001-2.gat,91,44,0|script|Talponian#Male|405
 {
     mes "A Male Talponian.";
     close;
 }
 
-021-2.gat,83,161,0|script|Gispaan#Female|406
+001-2.gat,118,39,0|script|Gispaan#Female|406
 {
     mes "A Female Gispaan.";
     close;
 }
 
-021-2.gat,89,161,0|script|Gispaan#Male|407
+001-2.gat,118,44,0|script|Gispaan#Male|407
 {
     mes "A Male Gispaan.";
     close;
diff --git a/world/map/npc/001-2/mapflags.txt b/world/map/npc/001-2/mapflags.txt
index 41bab423..3a1f27a7 100644
--- a/world/map/npc/001-2/mapflags.txt
+++ b/world/map/npc/001-2/mapflags.txt
@@ -1,2 +1,2 @@
 001-2.gat|mapflag|town
-001-2.gat|mapflag|resave|001-1,57,71
+001-2.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/021-1/pauline.txt b/world/map/npc/001-2/pauline.txt
index c2884c19..b8833251 100644
--- a/world/map/npc/021-1/pauline.txt
+++ b/world/map/npc/001-2/pauline.txt
@@ -12,7 +12,7 @@
 //  @pauline_ingredient2$   Second ingredient input.
 //  @pauline_REWARD         amount of XP gained for telling her ingredients for each spell.
 
-021-1.gat,55,66,0|script|Pauline|208
+001-2.gat,77,78,0|script|Pauline|208
 {
 
 //Bitmasking
@@ -171,7 +171,7 @@ L_Pass2Mouboo:
 
 L_TrySpellMouboo:
     mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-mouboo") + ".";
-    monster "021-1.gat", 55,68, "Good", 1028, 1;
+    monster "001-1.gat", 55,68, "Good", 1028, 1;
     mes "[Pauline]";
     mes "\"It worked!\"";
     set @pauline_state, 3;
@@ -229,7 +229,7 @@ L_Pass2Pinkie:
 
 L_TrySpellPinkie:
     mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-pinkie") + ".";
-    monster "021-1.gat", 54,68, "Good", 1018, 1;
+    monster "001-1.gat", 54,68, "Good", 1018, 1;
     mes "[Pauline]";
     mes "\"It worked!\"";
     set @pauline_state, 4;
@@ -272,7 +272,7 @@ S_Update_Mask:
     return;
 }
 
-021-1.gat,53,66,0|script|PaulineDebug|208
+001-2.gat,79,74,0|script|PaulineDebug|208
 {
 //load Bitmasks;
     set @Pauline_MASK, NIBBLE_4_MASK;
diff --git a/world/map/npc/001-1/sandra.txt b/world/map/npc/001-2/sandra.txt
index 13ae156b..48632e58 100644
--- a/world/map/npc/001-1/sandra.txt
+++ b/world/map/npc/001-2/sandra.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 3 of QUEST_SouthTulimshar
 
-001-1.gat,110,71,0|script|Sandra|114
+001-2.gat,98,88,0|script|Sandra|114
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
deleted file mode 100644
index 9d71508d..00000000
--- a/world/map/npc/001-2/shops.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// Bartender
-
-001-2.gat,21,27,0|shop|Bartender#Casino|112,Beer:*175,Cake:*30,CherryCake:*100
diff --git a/world/map/npc/001-2/tathin.txt b/world/map/npc/001-2/tathin.txt
new file mode 100644
index 00000000..491eb151
--- /dev/null
+++ b/world/map/npc/001-2/tathin.txt
@@ -0,0 +1,29 @@
+001-2.gat,28,21,0|script|Tathin|107
+{
+    mes "[Tathin]";
+    mes "\"Hello what Can I do for you?\"";
+    next;
+
+    menu
+        "I'd like to join a party.", L_Give_Party,
+        "I'd like to create my own party.", L_Give_Make_Party,
+        "Nothing, I guess.", L_Close;
+
+L_Give_Party:
+    mes "[Tathin]";
+    mes "\"You'll need to be invited by an existing member of a party to join it. You may also create your own party.\"";
+    next;
+    mes "[Tathin]";
+    mes "\"Remember, parties cannot share experience if any members are more than 10 levels apart.\"";
+    menu
+      "I'd like to create my own party.", L_Give_Make_Party,
+      "Goodbye.", L_Close;
+
+L_Give_Make_Party:
+    mes "[Tathin]";
+    mes "\"You can create parties with the 'new' or 'create' commands on the Party tab in the client. Parties need to have unique names.\"";
+    close;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/024-1/tondar.txt b/world/map/npc/001-2/tondar.txt
index 473c86e9..5c15dddb 100644
--- a/world/map/npc/024-1/tondar.txt
+++ b/world/map/npc/001-2/tondar.txt
@@ -1,6 +1,6 @@
 // A professor at Tulimshar's magic academy
 
-024-1.gat,83,51,0|script|Tondar|168
+001-2.gat,95,79,0|script|Tondar|168
 {
     mes "[Tondar]";
     mes "\"We're not accepting any new students right now.\"";
diff --git a/world/map/npc/001-2/wizards.txt b/world/map/npc/001-2/wizards.txt
new file mode 100644
index 00000000..587c999c
--- /dev/null
+++ b/world/map/npc/001-2/wizards.txt
@@ -0,0 +1,60 @@
+// Council of Ruling Wizards Room
+
+// manaseed
+001-2.gat,104,19,0|script|Desert Mana Seed#_M|166
+{
+    end;
+}
+
+// 
+001-2.gat,99,22,0|script|Wizard#1|355
+{
+    end;
+}
+
+//
+001-2.gat,92,24,0|script|Wizard#2|356
+{
+    end;
+}
+
+//
+001-2.gat,92,30,0|script|Wizard#3|357
+{
+    end;
+}
+
+//
+001-2.gat,99,32,0|script|Wizard#4|358
+{
+    end;
+}
+
+//
+001-2.gat,110,22,0|script|Wizard#5|359
+{
+    end;
+}
+
+//
+001-2.gat,117,24,0|script|Wizard#6|360
+{
+    end;
+}
+
+//
+001-2.gat,117,30,0|script|Wizard#7|361
+{
+    end;
+}
+
+//
+001-2.gat,110,32,0|script|Wizard#8|362
+{
+    end;
+}
+//
+001-2.gat,104,27,0|script|Arch-Wizard#9|354
+{
+    end;
+}
diff --git a/world/map/npc/021-2/yanis.txt b/world/map/npc/001-2/yanis.txt
index 0cc28962..67175704 100644
--- a/world/map/npc/021-2/yanis.txt
+++ b/world/map/npc/001-2/yanis.txt
@@ -1,11 +1,17 @@
 // Government official taking care about shop licenses
 // involved in quest given by 021-1/imec.txt and 021-2/kylian.txt
 
-021-2.gat,33,17,0|script|Yanis|107
+001-2.gat,31,21,0|script|Yanis|107
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowYanisNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
     set @imec, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
+    set @halloween_npc_id, $@halloween_npc_yanis;
+    callfunc "TrickOrTreat";
+
+    goto L_Base_Menu;
+
+L_Base_Menu:
 
     mes "[Yanis]";
     mes "\"Welcome. I'm handling issues with trading licenses for the shop owners in Tulimshar. Can I help you?\"";
diff --git a/world/map/npc/001-3/_warps.txt b/world/map/npc/001-3/_warps.txt
index e8e35ee1..66eb5137 100644
--- a/world/map/npc/001-3/_warps.txt
+++ b/world/map/npc/001-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar Arena warps
 
-001-3.gat,73,28|warp|To Tulimshar Indoor|-1,-1,001-2.gat,23,24
+001-3.gat,73,28|warp|To Tulimshar Indoor|-1,-1,002-2.gat,74,59
diff --git a/world/map/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt
index c02a9a17..e6b11a0f 100644
--- a/world/map/npc/001-3/guards.txt
+++ b/world/map/npc/001-3/guards.txt
@@ -16,7 +16,7 @@ L_Sure:
     mes "\"Ok.\"";
     next;
     if(DUELS & $@DuelPvpBit) goto L_FightClub;
-    warp "001-2.gat", 25, 23;
+    warp "002-2.gat", 74, 59;
     close;
 
 L_FightClub:
diff --git a/world/map/npc/001-3/mapflags.txt b/world/map/npc/001-3/mapflags.txt
index 75eb45d1..7f8170b1 100644
--- a/world/map/npc/001-3/mapflags.txt
+++ b/world/map/npc/001-3/mapflags.txt
@@ -1 +1,2 @@
-001-3.gat|mapflag|nosave|001-2,128,24
+001-3.gat|mapflag|nosave|002-2,74,59
+001-3.gat|mapflag|resave|002-2,74,59
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index bb56994f..a3f95fc6 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -1,10 +1,22 @@
-// Map 002-1: Sandstorm Desert
+// Map 002-1: Tulimshar South
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 002-1.gat
 npc: npc/002-1/_mobs.txt
 npc: npc/002-1/_warps.txt
+npc: npc/002-1/anwar.txt
+npc: npc/002-1/bard.txt
+npc: npc/002-1/dock.txt
+npc: npc/002-1/elanore.txt
+npc: npc/002-1/gaurds.txt
+npc: npc/002-1/itka.txt
 npc: npc/002-1/lieutenant_dausen.txt
+npc: npc/002-1/luca.txt
 npc: npc/002-1/mapflags.txt
+npc: npc/002-1/mine_debug.txt
 npc: npc/002-1/nickos.txt
 npc: npc/002-1/nomads.txt
+npc: npc/002-1/npcs.txt
+npc: npc/002-1/sarah.txt
+npc: npc/002-1/soul-menhir.txt
 npc: npc/002-1/stewen.txt
+npc: npc/002-1/traveler.txt
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index e795040e..02f897df 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -1,20 +1,19 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Sandstorm Desert mobs
-
-002-1.gat,0,0,0,0|monster|Maggot|1002,20,1000ms,500ms,Mob002-1::On1002
-002-1.gat,95,97,16,9|monster|Maggot|1002,10,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,94,35,11,4|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,68,59,7,6|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,57,86,15,8|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,27,85,7,8|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,44,35,3,2|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,38,29,3,2|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,62,91,24,6|monster|Maggot|1002,3,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,60,73,38,40|monster|FireGoblin|1011,15,100000ms,30000ms,Mob002-1::On1011
-002-1.gat,82,24,34,15|monster|Scorpion|1003,8,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,32,35,34,33|monster|Scorpion|1003,8,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,26,73,20,24|monster|Scorpion|1003,8,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,95,75,15,17|monster|BlackScorpion|1009,1,100000ms,1800000ms,Mob002-1::On1009
+// Tulimshar South mobs
+
+002-1.gat,93,62,24,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1.gat,112,62,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1.gat,108,73,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1.gat,62,28,3,15|monster|Maggot|1002,6,100000ms,30000ms,Mob002-1::On1002
+002-1.gat,74,96,24,33|monster|Scorpion|1003,12,100000ms,30000ms,Mob002-1::On1003
+002-1.gat,113,114,10,7|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1.gat,43,61,10,70|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
+002-1.gat,70,92,49,19|monster|Scorpion|1003,10,100000ms,30000ms,Mob002-1::On1003
+002-1.gat,40,93,19,20|monster|RedScorpion|1004,10,100000ms,30000ms,Mob002-1::On1004
+002-1.gat,42,40,8,29|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
+002-1.gat,33,75,9,40|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
+002-1.gat,99,62,37,9|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
+002-1.gat,73,105,20,21|monster|FireGoblin|1011,6,100000ms,30000ms,Mob002-1::On1011
 
 
 002-1.gat,0,0,0|script|Mob002-1|-1
@@ -31,8 +30,8 @@ On1003:
     callfunc "MobPoints";
     end;
 
-On1009:
-    set @mobID, 1009;
+On1004:
+    set @mobID, 1004;
     callfunc "MobPoints";
     end;
 
@@ -40,4 +39,9 @@ On1011:
     set @mobID, 1011;
     callfunc "MobPoints";
     end;
+
+On1033:
+    set @mobID, 1033;
+    callfunc "MobPoints";
+    end;
 }
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index f201c926..de28087f 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -1,10 +1,19 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Sandstorm Desert warps
+// Tulimshar South warps
 
-002-1.gat,58,13|warp|To South Tulimshar|3,-1,001-1.gat,44,86
-002-1.gat,79,99|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49
-002-1.gat,20,94|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,33
-002-1.gat,104,92|warp|To Mystics House|-1,-1,002-2.gat,28,29
-002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40
-002-1.gat,12,67|warp|To Beach|-1,3,003-1.gat,171,76
-002-1.gat,28,13|warp|To Beach|1,-1,004-1.gat,84,114
+002-1.gat,63,20|warp|North Tulimshar|3,-1,001-1.gat,63,118
+002-1.gat,103,20|warp|North Tulimshar|3,-1,001-1.gat,103,118
+002-1.gat,119,95|warp|To Snake Desert|-1,1,006-1.gat,21,47
+002-1.gat,92,114|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49
+002-1.gat,33,109|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,35
+002-1.gat,109,45|warp|To Weavers Shop|-1,-1,002-2.gat,75,100
+002-1.gat,115,45|warp|To Weavers Shop|-1,-1,002-2.gat,83,100
+002-1.gat,99,43|warp|To Jeweler|-1,-1,002-2.gat,120,66
+002-1.gat,114,35|warp|To Trainer|-1,-1,002-2.gat,78,131
+002-1.gat,110,29|warp|To Trainer|-1,-1,002-2.gat,68,122
+002-1.gat,73,35|warp|To Tulimshar Indoor|-1,-1,002-2.gat,44,33
+002-1.gat,57,35|warp|To KPS|-1,-1,002-2.gat,120,94
+002-1.gat,67,29|warp|To Tulimshar Indoor|-1,-1,002-2.gat,23,109
+002-1.gat,113,107|warp|To Snake Cave|-1,-1,005-3.gat,52,35
+002-1.gat,49,20|warp|To Sea Cave|-1,-1,004-3.gat,24,94
+002-1.gat,57,26|warp|Omar's House|-1,-1,002-2.gat,119,131
diff --git a/world/map/npc/022-1/anwar.txt b/world/map/npc/002-1/anwar.txt
index 5de4532e..707e577e 100644
--- a/world/map/npc/022-1/anwar.txt
+++ b/world/map/npc/002-1/anwar.txt
@@ -16,7 +16,7 @@
 // state 13: Anwar asked to bring present to Eomie
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
-022-1.gat,41,46,0|script|Anwar|156
+002-1.gat,95,67,0|script|Anwar|156
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
@@ -48,7 +48,7 @@ L_Sure:
     next;
     mes "\"I can't go there myself, since this area of the city is full of sneaky ragtags and they will rob my field if I leave here. Could you go to the magic school and ask for some magic enhancement for my field?\"";
     next;
-    mes "\"To find the school just follow the street south and then go west.\"";
+    mes "\"To find the school just follow the street north back into town. The school is the castle at the north end of town.\"";
     set @state, 1;
     callsub S_Update_Mask;
     goto L_Close;
@@ -127,9 +127,10 @@ L_GiveGiftStuff:
 
 L_Hint:
     mes "[Anwar]";
-    mes "\"As far as I know Cotton Cloth is given out as reward for hunting monsters. You should talk to Aidan on the bazaar.\"";
+    mes "\"As far as I know Cotton Cloth is given out as reward for hunting monsters. You should talk to Aidan in Candor.\"";
     next;
-    mes "\"And silk cocoons come from Silkworms. They live in the woodland area around Hurnscald. You can get there by taking the ferry.\"";
+    mes "\"Otherwise Cotton Cloth can be sheared from Mouboo and silk cocoons come from Silkworms.";
+    mes "They live in the woodland area around Hurnscald. You can get there by taking the ferry.\"";
     goto L_Close;
 
 L_GiveTinris: // @state >= 11 but below 13
diff --git a/world/map/npc/001-1/bard.txt b/world/map/npc/002-1/bard.txt
index 6b0d7d77..c977b136 100644
--- a/world/map/npc/001-1/bard.txt
+++ b/world/map/npc/002-1/bard.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,40,73,0|script|Bard|152
+002-1.gat,91,33,0|script|Bard|152
 {
     setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
         "\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
diff --git a/world/map/npc/002-1/dock.txt b/world/map/npc/002-1/dock.txt
new file mode 100644
index 00000000..f902006d
--- /dev/null
+++ b/world/map/npc/002-1/dock.txt
@@ -0,0 +1,5 @@
+002-1.gat,67,65,0|script|Ferry Schedule#3|396
+{
+    callfunc "FerryManifest";
+    end;
+}
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/002-1/elanore.txt
index ce330f8a..fec70d44 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/002-1/elanore.txt
@@ -17,7 +17,7 @@ function|script|ElanoreFix
     return;
 }
 
-001-1.gat,58,68,0|script|Elanore#_M|108
+002-1.gat,75,62,0|script|Elanore#_M|108
 {
     set @has_magic, getskilllv(SKILL_MAGIC);
 
@@ -46,7 +46,7 @@ function|script|ElanoreFix
     set @Q_status, @STATUS_INITIAL;
     callsub S_update_var;
     if (sc_check(sc_poison)) goto L_CurePoison;
-    if (BaseLevel > 10) goto L_NoHeal;
+    if (BaseLevel > 20) goto L_NoHeal;
     set @TEMP,rand(4);
     if(@TEMP == 1) goto L_Heal2;
     if(@TEMP == 2) goto L_Heal3;
@@ -123,8 +123,8 @@ L_NoHeal:
 
 L_NoHealMessage:
     mes "[Elanore the Healer]";
-    mes "\"I'm sorry but unless you are young and in need, I can't help you, and your level is already higher than ten.";
-    mes "With so many people still injured from the earthquake, I really have no time to help.";
+    mes "\"I'm sorry but unless you are young and in need, I can't help you, and your level is already higher than twenty.";
+    mes "With so many gaurds still injured, I really have no time to help.";
     mes "You can get some rest in the inn near here.\"";
     goto L_Close;
 
diff --git a/world/map/npc/002-1/gaurds.txt b/world/map/npc/002-1/gaurds.txt
new file mode 100644
index 00000000..d7fb023f
--- /dev/null
+++ b/world/map/npc/002-1/gaurds.txt
@@ -0,0 +1,19 @@
+// Guards by the gates to the port
+002-1.gat,100,21,0|script|Guard#port1|104
+{
+    mes "[Guard]";
+    mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
+    close;
+}
+002-1.gat,61,27,0|script|Guard#port2|104
+{
+    mes "[Guard]";
+    mes "\"You wouldn't believe the refuse that comes in from the docks.\"";
+    close;
+}
+002-1.gat,83,48,0|script|Guard#east1|104
+{
+    mes "[Guard]";
+    mes "\"I make sure less desirables don't bother the Nobles.\"";
+    close;
+}
diff --git a/world/map/npc/002-1/itka.txt b/world/map/npc/002-1/itka.txt
new file mode 100644
index 00000000..fec553d8
--- /dev/null
+++ b/world/map/npc/002-1/itka.txt
@@ -0,0 +1,21 @@
+// Outside the Hotel
+002-1.gat,66,39,0|script|Itka|114
+{
+    mes "[Itka]";
+    mes "\"This hotel is the best!\"";
+    next;
+    mes "\"It has a Baker, a Barber, a Casino and a Theatre.\"";
+    next;
+    mes "\"Come on inside now!\"";
+    close;
+
+OnTimer300000:
+    npctalk "Come to The Wizard's Rest!";
+    setnpctimer 0;
+    end;
+
+OnInit:
+    if (debug >= 2) end;
+    initnpctimer;
+    end;
+}
diff --git a/world/map/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt
index f8a6cf66..c945a296 100644
--- a/world/map/npc/002-1/lieutenant_dausen.txt
+++ b/world/map/npc/002-1/lieutenant_dausen.txt
@@ -1,7 +1,7 @@
 // Lieutenant in charge of monitoring the monster threat surrounding the city.
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,54,27,0|script|Lieutenant Dausen|122
+002-1.gat,63,67,0|script|Lieutenant Dausen|122
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -17,28 +17,16 @@
     if (@state == 2) goto L_LD_Woe_Is_Me;
     if (@state == 1) goto L_LD_Drinks;
 
-    set @bermik, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
-    set @sarah, ((QUEST_SouthTulimshar & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
-    set @vincent, ((QUEST_SouthTulimshar & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
-    set @sandra, ((QUEST_SouthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
-
-    if ((@state == 0) && (@bermik >= 6) && (@sarah >= 2) && (@vincent >= 2) && (@sandra >= 2))
-        goto L_LD_Start;
-
     mes "[Lieutenant Dausen]";
     mes "\"Hello. I am Lieutenant Dausen. I monitor the monster threat around the city to ensure the safety of its citizens.\"";
-    next;
-
     if (@state)
         goto L_Close;
-    mes "[Lieutenant Dausen]";
-    mes "\"I may have a job for you, stranger, but first I would like to learn more about you. Go walk among the citizens of Tulimshar, see if any of them could use some help. Once you have established a good reputation, word will get to me.\"";
-    goto L_Close;
+    goto L_LD_Start;
 
 L_LD_Start:
     set @state, 1;
     callsub S_Update_Var;
-    mes "[Lieutenant Dausen]";
+    next;
     mes "\"Out here in the desert, it sure does get hot!  My men and I get thirsty rather quickly. Cactus Drinks are our favourite; if you can get some for us, we'd surely appreciate your effort. About 10 would do.\"";
     goto L_Close;
 
@@ -134,10 +122,6 @@ L_LD_Key:
 
 L_Close:
     set @state, 0;
-    set @bermik, 0;
-    set @sarah, 0;
-    set @vincent, 0;
-    set @sandra, 0;
     close;
 
 S_Update_Var:
diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/002-1/luca.txt
index af1b1487..c6c47647 100644
--- a/world/map/npc/001-1/luca.txt
+++ b/world/map/npc/002-1/luca.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,108,55,0|script|Luca|102
+002-1.gat,112,26,0|script|Luca|102
 {
     set @EXP_BRAWLING, 2000;
 
diff --git a/world/map/npc/002-1/mapflags.txt b/world/map/npc/002-1/mapflags.txt
index 2fabcfb8..91b323a1 100644
--- a/world/map/npc/002-1/mapflags.txt
+++ b/world/map/npc/002-1/mapflags.txt
@@ -1 +1 @@
-002-1.gat|mapflag|resave|001-1,57,71
+002-1.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/002-1/mine_debug.txt b/world/map/npc/002-1/mine_debug.txt
new file mode 100644
index 00000000..d9ee55dc
--- /dev/null
+++ b/world/map/npc/002-1/mine_debug.txt
@@ -0,0 +1,81 @@
+// Mine Debug
+// Author: Wushin
+
+function|script|DesertMineDebug
+{
+    mes "[Mine Debug]";
+    mes "What would you like to do?";
+    menu
+        "Reset", L_Reset,
+        "Set", L_Set,
+        "Show", L_Show,
+        "nothing.", L_Close;
+
+L_Reset:
+    set @state, 0;
+    callsub S_Update_Var;
+    goto L_Close;
+
+L_Set:
+    mes "Values are between 0 and 28";
+    mes "8 is Mine Start";
+    mes "18 is Angry Scorpions Start";
+    mes "20 is Underground Palace Start";
+    mes "26 is Giant Cave Maggot Start";
+    input @state;
+    callsub S_Update_Var;
+    goto L_Close;
+
+L_Show:
+    set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
+    mes "Current State: " + @state;
+    goto L_Close;
+
+L_Close:
+    set @state, 0;
+    close;
+
+S_Update_Var:
+    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
+    return;
+}
+002-1.gat,61,69,0|script|Mine Debug#1|122
+{
+    callfunc "DesertMineDebug";
+    end;
+
+OnInit:
+    if (!debug)
+        disablenpc "Mine Debug#1";
+    end;
+}
+002-3.gat,45,49,6|script|Mine Debug#2|109
+{
+    callfunc "DesertMineDebug";
+    end;
+
+OnInit:
+    if (!debug)
+        disablenpc "Mine Debug#2";
+    end;
+}
+002-4.gat,88,99,6|script|Mine Debug#3|109
+{
+    callfunc "DesertMineDebug";
+    end;
+
+OnInit:
+    if (!debug)
+        disablenpc "Mine Debug#3";
+    end;
+}
+002-5.gat,43,96,6|script|Mine Debug#4|340
+{
+    callfunc "DesertMineDebug";
+    end;
+
+OnInit:
+    if (!debug)
+        disablenpc "Mine Debug#4";
+    end;
+}
diff --git a/world/map/npc/002-1/nickos.txt b/world/map/npc/002-1/nickos.txt
index 39c1cc66..2377bbaf 100644
--- a/world/map/npc/002-1/nickos.txt
+++ b/world/map/npc/002-1/nickos.txt
@@ -1,7 +1,7 @@
 // Sandstorm mine guard
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,28,94,0|script|Nickos|123
+002-1.gat,46,108,0|script|Nickos|123
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/nomads.txt b/world/map/npc/002-1/nomads.txt
index 456bc2b6..987d10ce 100644
--- a/world/map/npc/002-1/nomads.txt
+++ b/world/map/npc/002-1/nomads.txt
@@ -1,6 +1,6 @@
 //
 
-002-1.gat,92,100,0|script|Samuel|132
+002-1.gat,101,114,0|script|Samuel|132
 {
     mes "[Samuel the Nomad]";
     mes "\"This is really a nice place.\"";
@@ -8,7 +8,7 @@
     close;
 }
 
-002-1.gat,102,100,0|script|Elijah|128
+002-1.gat,105,114,0|script|Elijah|128
 {
     mes "[Elijah the Nomad]";
     mes "\"It's nice to find a respite like this...\"";
diff --git a/world/map/npc/002-1/npcs.txt b/world/map/npc/002-1/npcs.txt
new file mode 100644
index 00000000..a2ae00ac
--- /dev/null
+++ b/world/map/npc/002-1/npcs.txt
@@ -0,0 +1,24 @@
+002-1.gat,96,23,0|script|Jeric|214
+{
+    set @npcname$, "Jeric";
+
+    mes "[" + @npcname$ + "]";
+    mes "\"My father is an adventurer.\"";
+    next;
+    mes "\"After he proved himself around town, the guards let him fight monsters in the Sandstorm mine.\"";
+    set @npcname$, "";
+    close;
+}
+002-1.gat,112,48,0|script|Silvia|207
+{
+    set @npcname$, "Silvia";
+
+    mes "[" + @npcname$ + "]";
+    mes "\"If you follow the road west, then north, you will arrive at the Bazaar in Northern Tulimshar.\"";
+    next;
+    mes "\"If you go west, then north, you'll see the Wizard Academy my parents just sent me to.\"";
+    next;
+    mes "\"The Academy is good, but I wish I had more free time. It takes a lot of intelligence to get what the teachers are talking about.\"";
+    set @npcname$, "";
+    close;
+}
diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/002-1/sarah.txt
index a355684a..15eeb83b 100644
--- a/world/map/npc/001-1/sarah.txt
+++ b/world/map/npc/002-1/sarah.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 1 of QUEST_SouthTulimshar
 
-001-1.gat,137,78,0|script|Sarah|106
+002-1.gat,93,43,0|script|Sarah|106
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/soul-menhir.txt b/world/map/npc/002-1/soul-menhir.txt
index 792f256e..9fe0c06a 100644
--- a/world/map/npc/001-1/soul-menhir.txt
+++ b/world/map/npc/002-1/soul-menhir.txt
@@ -1,11 +1,11 @@
 //
 
-001-1.gat,38,69,0|script|Soul Menhir#tulimshar|345
+002-1.gat,58,60,0|script|Soul Menhir#tulimshar|345
 {
     callfunc "ClearVariables";
     set @map$, "001-1.gat";
-    setarray @Xs, 37, 38, 39, 37, 39, 37, 39;
-    setarray @Ys, 68, 68, 68, 69, 69, 70, 70;
+    setarray @Xs, 57, 58, 59, 57, 59, 57, 59;
+    setarray @Ys, 59, 59, 59, 60, 60, 61, 61;
     set @x, 0;
     set @y, 0;
     callfunc "SoulMenhir";
diff --git a/world/map/npc/002-1/stewen.txt b/world/map/npc/002-1/stewen.txt
index 727c0ee3..461451fe 100644
--- a/world/map/npc/002-1/stewen.txt
+++ b/world/map/npc/002-1/stewen.txt
@@ -1,7 +1,7 @@
 // East sandstorm guard
 // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
 
-002-1.gat,106,76,0|script|Stewen|123
+002-1.gat,116,93,0|script|Stewen|123
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/traveler.txt b/world/map/npc/002-1/traveler.txt
index e91da7c0..567d8667 100644
--- a/world/map/npc/001-1/traveler.txt
+++ b/world/map/npc/002-1/traveler.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-001-1.gat,39,67,0|script|Nina the Traveler|103
+002-1.gat,60,41,0|script|Nina the Traveler|103
 {
     set @NpcName$, "Nina";
     set @NpcTravelBit, $@tulimshar_bit;
diff --git a/world/map/npc/002-2/_import.txt b/world/map/npc/002-2/_import.txt
index 0cccabbf..673ba2d1 100644
--- a/world/map/npc/002-2/_import.txt
+++ b/world/map/npc/002-2/_import.txt
@@ -3,5 +3,22 @@
 map: 002-2.gat
 npc: npc/002-2/_mobs.txt
 npc: npc/002-2/_warps.txt
+npc: npc/002-2/bakery.txt
+npc: npc/002-2/barber.txt
+npc: npc/002-2/bleacher.txt
+npc: npc/002-2/casino.txt
+npc: npc/002-2/dedication.txt
+npc: npc/002-2/eurni.txt
+npc: npc/002-2/hetchel.txt
+npc: npc/002-2/imec.txt
+npc: npc/002-2/inya.txt
+npc: npc/002-2/kps.txt
+npc: npc/002-2/kylian.txt
+npc: npc/002-2/latoy.txt
 npc: npc/002-2/mapflags.txt
-npc: npc/002-2/traveler.txt
+npc: npc/002-2/omar.txt
+npc: npc/002-2/phaet.txt
+npc: npc/002-2/rebecca.txt
+npc: npc/002-2/shops.txt
+npc: npc/002-2/stranger.txt
+npc: npc/002-2/troupe_leader.txt
diff --git a/world/map/npc/002-2/_warps.txt b/world/map/npc/002-2/_warps.txt
index e370ad8f..fc78534b 100644
--- a/world/map/npc/002-2/_warps.txt
+++ b/world/map/npc/002-2/_warps.txt
@@ -1,4 +1,22 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Sandstorm Desert Indoors warps
 
-002-2.gat,28,30|warp|To Sand Storm|-1,-1,002-1.gat,104,93
+002-2.gat,44,34|warp|Outside|-1,-1,002-1.gat,73,36
+002-2.gat,44,20|warp|First Floor|0,-1,002-2.gat,45,78
+002-2.gat,46,79|warp|First Floor|0,-1,002-2.gat,43,21
+002-2.gat,46,55|warp|Penthouse|0,-1,002-2.gat,44,109
+002-2.gat,45,110|warp|Second Floor|0,-1,002-2.gat,45,56
+002-2.gat,23,110|warp|Outside|-1,-1,002-1.gat,67,30
+002-2.gat,34,20|warp|Casino|-1,-1,002-2.gat,79,69
+002-2.gat,37,20|warp|Theatre|-1,-1,002-2.gat,72,31
+002-2.gat,72,32|warp|First Floor|-1,-1,002-2.gat,37,21
+002-2.gat,79,70|warp|First Floor|-1,-1,002-2.gat,34,21
+002-2.gat,40,20|warp|Salon|-1,-1,002-2.gat,126,35
+002-2.gat,126,36|warp|First Floor|-1,-1,002-2.gat,40,21
+002-2.gat,75,101|warp|Outside|-1,-1,002-1.gat,109,46
+002-2.gat,83,101|warp|Outside|-1,-1,002-1.gat,115,46
+002-2.gat,78,132|warp|Outside|-1,-1,002-1.gat,114,36
+002-2.gat,68,121|warp|Outside|-1,-1,002-1.gat,110,28
+002-2.gat,120,67|warp|Outside|-1,-1,002-1.gat,99,44
+002-2.gat,120,95|warp|Outside|-1,-1,002-1.gat,57,36
+002-2.gat,119,132|warp|To Outside|-1,-1,002-1.gat,57,27
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/002-2/bakery.txt
index acde18f2..b97c41c1 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/002-2/bakery.txt
@@ -1,7 +1,7 @@
 // The bakery
 
 // The chef
-021-2.gat,95,21,0|script|Riskim|148
+002-2.gat,21,22,0|script|Riskim|148
 {
     mes "[Riskim]";
     mes "";
@@ -120,7 +120,7 @@ L_End:
 }
 
 // Server
-021-2.gat,82,23,0|script|Sara|108
+002-2.gat,28,31,0|script|Sara|108
 {
     mes "[Sara]";
     mes "";
@@ -129,19 +129,19 @@ L_End:
 }
 
 // The cashier
-021-2.gat,89,21,0|shop|Drabur|112,WhiteCake:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,Cake:*30,CherryCake:*100,OrangeCupcake:*270,Milk:*1500,XmasCake:*70
+002-2.gat,25,22,0|shop|Drabur|112,WhiteCake:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,Cake:*30,CherryCake:*100,OrangeCupcake:*270,Milk:*1500,XmasCake:*70
 
-// Stockroom boy
-021-2.gat,133,21,0|script|Iormo|160
+// Bus boy
+002-2.gat,21,28,0|script|Iormo|160
 {
     mes "[Iormo]";
     mes "";
-    mes "\"This stock room can get messy.\"";
+    mes "\"This room can get messy.\"";
     close;
 }
 
 // An old couple eating at the bakery
-021-2.gat,71,22,0|script|Rynoh|159
+002-2.gat,24,27,0|script|Rynoh|159
 {
     mes "[Rynoh]";
     mes "";
@@ -149,7 +149,7 @@ L_End:
     close;
 }
 
-021-2.gat,73,22,0|script|Ontas|154
+002-2.gat,26,27,0|script|Ontas|154
 {
     mes "[Ontas]";
     mes "";
diff --git a/world/map/npc/021-2/barber.txt b/world/map/npc/002-2/barber.txt
index d057786d..eb1a5821 100644
--- a/world/map/npc/021-2/barber.txt
+++ b/world/map/npc/002-2/barber.txt
@@ -1,5 +1,5 @@
 // A barber (later we can make it so certain styles need to come from him, for a price)
-021-2.gat,72,101,0|script|Issay|156
+002-2.gat,117,30,0|script|Issay|156
 {
     mes "[Issay the Barber]";
     mes "\"Do you need a change of style?\"";
diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/002-2/bleacher.txt
index f6fd399c..3391a62c 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/002-2/bleacher.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,29,50,0|script|Candide|156
+002-2.gat,72,92,0|script|Candide|156
 {
     mes "[Candide]";
     mes "\"I've figured out how that volcanic ash bleaches cloth.";
diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/002-2/casino.txt
index ad0b625b..4733bb63 100644
--- a/world/map/npc/001-2/casino.txt
+++ b/world/map/npc/002-2/casino.txt
@@ -1,7 +1,7 @@
 // Casino
 
 // takes part in quest given by 021-2/kylian.txt
-001-2.gat,32,72,0|script|#CasinoEntrance|32767,1,1
+002-2.gat,79,68,0|script|#CasinoEntrance|32767,13,0
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowCasinoNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
@@ -15,34 +15,34 @@ L_End:
     end;
 }
 
-001-2.gat,39,32,0|script|Valdo|117
+002-2.gat,86,29,0|script|Valdo|117
 {
     mes "[Valdo the Worker]";
     mes "\"Please let me work. I'm really in a hurry!\"";
     close;
 }
 
-001-2.gat,37,65,0|script|Slots#1|400
+002-2.gat,84,62,0|script|Slots#1|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,39,65,0|script|Slots#2|400
+002-2.gat,86,62,0|script|Slots#2|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,41,65,0|script|Slots#3|400
+002-2.gat,88,62,0|script|Slots#3|400
 {
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins:*10
+002-2.gat,78,56,0|shop|MoneyChanger|124,CasinoCoins:*10
 
-001-2.gat,28,63,0|script|BlackJack|107
+002-2.gat,75,60,0|script|BlackJack|107
 {
     mes "[Croupier]";
     mes "\"Would you like to play Black Jack?";
@@ -117,7 +117,7 @@ L_Close:
     close;
 }
 
-001-2.gat,22,69,0|script|Roulette|107
+002-2.gat,69,67,0|script|Roulette|107
 {
     mes "[Croupier]";
     mes "\"Good evening monsieur...";
diff --git a/world/map/npc/001-2/dedication.txt b/world/map/npc/002-2/dedication.txt
index 03268df0..4ab9ba22 100644
--- a/world/map/npc/001-2/dedication.txt
+++ b/world/map/npc/002-2/dedication.txt
@@ -1,6 +1,6 @@
 // Dedication to Irene Christina
 
-001-2.gat,76,68,0|script|#IreneDedication|400
+002-2.gat,116,123,0|script|#IreneDedication|400
 {
     mes "~ Irene Christina ~";
     mes "The song in this house is dedicated to Irene.";
diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/002-2/eurni.txt
index e24d774c..a084acbc 100644
--- a/world/map/npc/021-1/eurni.txt
+++ b/world/map/npc/002-2/eurni.txt
@@ -1,6 +1,6 @@
 //
 
-021-1.gat,141,113,0|script|Eurni|136
+002-2.gat,22,77,0|script|Eurni|136
 {
     set @halloween_npc_id, $@halloween_npc_eurni;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/068-2/hetchel.txt b/world/map/npc/002-2/hetchel.txt
index c81d0cf1..b595bd88 100644
--- a/world/map/npc/068-2/hetchel.txt
+++ b/world/map/npc/002-2/hetchel.txt
@@ -17,7 +17,7 @@
 //
 //  @silkpants_state: variable indicating silkpant quest status.
 
-068-2.gat,62,83,0|script|Hetchel|376
+002-2.gat,76,92,0|script|Hetchel|376
 {
     set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
     set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
@@ -408,7 +408,7 @@ L_Close:
     close;
 }
 
-068-2.gat,60,83,0|script|HetchelDebug|376
+002-2.gat,73,95,0|script|HetchelDebug|376
 {
 set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
 set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/002-2/imec.txt
index 1c280253..851dd49b 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/002-2/imec.txt
@@ -2,9 +2,10 @@
 // after finishing this, daily quest with scorpion stingers
 // Using bit 8 and 9 of QUEST_NorthTulimshar (first half of nibble 2)
 // author: Jenalya
-021-1.gat,120,31,0|script|Imec|162
+002-2.gat,36,75,0|script|Imec|162
 {
     set @state, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
+    set @EXP, 90;
     set @money, 500;
 
     if (@state >= 3) goto L_Stingers;
@@ -20,12 +21,12 @@
     next;
     mes "[Imec]";
     mes "\"You can do an errand for me. I just finished writing a petition to the Council about my shop.";
-    mes "If you bring it to the government building near the bazaar, I'll give you a small reward.\"";
+    mes "If you bring it to the government building near the docks, I'll give you a small reward.\"";
     goto L_Offer;
 
 L_Offer:
     menu
-        "What is in that government building and where is it?",L_Explain,
+        "Where are the docks and what is the government building?",L_Explain,
         "Ok, sounds good.",L_Next,
         "No!",L_Close;
 
@@ -39,7 +40,7 @@ L_Next:
 
 L_Explain:
     mes "[Imec]";
-    mes "\"Follow the road to the south past the bakery, then go west when you reach the town walls. It's right before the gate to the bazaar.\"";
+    mes "\"Follow the road to the north through the gate, then go west when you reach the docks. It's right before the castle mount.\"";
     next;
     mes "\"In the building there are several offices. If you want to join or form a party, you have to pay your taxes there first.\"";
     next;
@@ -70,6 +71,7 @@ L_Return:
 L_Next1:
     mes "[Imec]";
     mes "\"What? Ah, right. Here, have this.\"";
+    getexp @EXP, 0;
     set Zeny, Zeny + @money;
     set @state, 3;
     callsub S_Update_Mask;
diff --git a/world/map/npc/068-2/inya.txt b/world/map/npc/002-2/inya.txt
index 1958478c..322d0eb3 100644
--- a/world/map/npc/068-2/inya.txt
+++ b/world/map/npc/002-2/inya.txt
@@ -1,9 +1,9 @@
 //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
 //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic?
 
-068-2.gat,29,56,0|shop|#InyaShop|127,SimpleRing:*100000
+002-2.gat,116,61,0|shop|#InyaShop|127,SimpleRing:*100000
 
-068-2.gat,29,56,0|script|Inya|106
+002-2.gat,116,61,0|script|Inya|106
 {
     mes "[Inya]";
     mes "\"I am Inya, a jeweler of fine rings. I sell and make rings.\"";
diff --git a/world/map/npc/021-2/kps.txt b/world/map/npc/002-2/kps.txt
index fb6ce235..a17df1a3 100644
--- a/world/map/npc/021-2/kps.txt
+++ b/world/map/npc/002-2/kps.txt
@@ -4,7 +4,7 @@
 // reuse the 4 bits
 // To Mark 4 Different NPCs.
 // setarray $@kps_npc_bits, $@knowYanisNT, $@knowLatoyNT, $@knowWeellosNT, $@knowCasinoNT;
-021-2.gat,27,124,0|script|KPS Manager|191
+002-2.gat,120,89,0|script|KPS Manager|191
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
     set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT);
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/002-2/kylian.txt
index 5a162242..7f832b87 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/002-2/kylian.txt
@@ -57,14 +57,14 @@ OnInit:
     set $@delivery_exp_mod, 10;
     end;
 }
-021-2.gat,25,67,0|script|#KylianOut|32767,1,1
+002-2.gat,44,107,0|script|#KylianOut|32767,1,1
 {
     set @KylianNTLicense, 0;
     set @KylianNTSightSeeing, 0;
     set @KylianNTCasino, 0;
     end;
 }
-021-2.gat,89,55,0|script|Kylian|193
+002-2.gat,43,101,0|script|Kylian|193
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
@@ -84,7 +84,7 @@ OnInit:
 
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
-    set @bernard, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
+    set @fieri, ((QUEST_SouthTulimshar & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT);
 
     if (@state == 15) goto L_Done;
     if (@state >= 11) goto L_Helping;
@@ -200,10 +200,10 @@ L_HistBuild:
 L_Food: // @state == 5
     mes "[Kylian]";
     mes "\"While I'm out, I could also get something to eat. Maybe some typical dish for this region. Do you have a good suggestion for that?\"";
-    if (@bernard < 4) // didn't yet help Bernard to make his soup
+    if (@fieri < 4) // didn't yet help Fieri make Tonori Delight
         goto L_Close;
     menu
-        "Bernard on the bazaar makes a great soup.",L_SoupBer,
+        "Fieri at the castle makes great Tonori Delight.",L_SoupBer,
         "No idea, I'll try to find out.",L_Close;
 
 L_SoupBer:
@@ -216,12 +216,12 @@ L_SoupBer:
 
 L_SightSeeingDone:
     mes "[Kylian]";
-    mes "\"I'm going to see the historic building you told me about and try this local soup on the bazaar. Thank you for the suggestions.\"";
+    mes "\"I'm going to see the historic building you told me about and try this local food at the castle. Thank you for the suggestions.\"";
     goto L_Close;
 
 L_Casino: // @state == 6 and logged out sometime between getting to that state and now
     mes "[Kylian]";
-    mes "\"Hello. I just came back from my sight-seeing tour. And this soup from Bernard really was delicious. I wonder what it's made of...\"";
+    mes "\"Hello. I just came back from my sight-seeing tour. And this Tonori Delight really was delicious. I wonder what it's made of...\"";
     next;
     mes "\"However, I was wondering if you know about a good place to spend the evening? Some place to have fun?\"";
     if (!(QUEST_NorthTulimshar & $@knowCasinoNT))
@@ -247,7 +247,7 @@ L_Clothes: // @state == 7
     if (!(QUEST_NorthTulimshar & $@knowLatoyNT))
         goto L_Close;
     menu
-        "At the market near the harbor district...",L_HarborDistrict,
+        "Latoy's shop. On the west side of Tulimshar.",L_HarborDistrict,
         "Mh, I don't know.",L_Close;
 
 L_HarborDistrict:
@@ -256,7 +256,7 @@ L_HarborDistrict:
     set @state, 8;
     callfunc "SetKylianQuest";
     set @KylianNTCasino, 1;
-    mes "You explain about Latoy and his high quality shop.";
+    mes "You explain about Latoy and the high quality shop.";
     mes "[Kylian]";
     mes "\"This seems to be exactly what I need. Thanks a lot.\"";
     goto L_Close;
@@ -348,7 +348,7 @@ L_Close:
     set @fun_money, 0;
     set @fun_exp, 0;
     set @inventorylist_count, 0;
-    set @bernard, 0;
+    set @fieri, 0;
     // NOT set to zero: @KylianNTLicense, @KylianNTSightSeeing and @KylianNTCasino
     // those are used to check if the player logged out in the meanwhile
     close;
@@ -362,7 +362,7 @@ function|script|KylianDebug
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
     callfunc "ClearVarTMW_Quest";
-    set @bernard, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
+    set @fieri, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
     set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT);
     set @run_cnt, ((QUEST_NorthTulimshar & TWOBIT_9_MASK) >> TWOBIT_9_SHIFT);
     goto L_Menu;
@@ -404,7 +404,7 @@ L_MoreWorkTimer:
 L_Close:
     close;
 }
-021-2.gat,87,55,0|script|KylianDebug#1|193
+002-2.gat,40,101,0|script|KylianDebug#1|193
 {
     callfunc "KylianDebug";
     end;
@@ -413,7 +413,7 @@ OnInit:
         disablenpc "KylianDebug#1";
     end;
 }
-021-2.gat,29,124,0|script|KylianDebug#2|193
+002-2.gat,118,89,0|script|KylianDebug#2|193
 {
     callfunc "KylianDebug";
     end;
diff --git a/world/map/npc/068-2/latoy.txt b/world/map/npc/002-2/latoy.txt
index ee28555b..4c847af7 100644
--- a/world/map/npc/068-2/latoy.txt
+++ b/world/map/npc/002-2/latoy.txt
@@ -1,9 +1,9 @@
 // A snobby store that won't sell to the player
 // takes part in quest given by 021-2/kylian.txt
 
-068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt:*2000,SilkRobe:*40000,SerfHat:*500,DesertHat:*9600
+002-2.gat,86,93,0|shop|#LatoyShop|127,SilkHeadband:*20000,SilkGloves:*20000,SilkPants:*30000,SilkRobe:*40000
 
-068-2.gat,92,83,0|script|Latoy|106
+002-2.gat,86,93,0|script|Latoy|106
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
diff --git a/world/map/npc/002-2/mapflags.txt b/world/map/npc/002-2/mapflags.txt
index c23a7f11..5448030e 100644
--- a/world/map/npc/002-2/mapflags.txt
+++ b/world/map/npc/002-2/mapflags.txt
@@ -1 +1 @@
-002-2.gat|mapflag|resave|001-1,57,71
+002-2.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/002-2/omar.txt
index c67bd44f..048f129c 100644
--- a/world/map/npc/001-2/omar.txt
+++ b/world/map/npc/002-2/omar.txt
@@ -21,7 +21,7 @@ function|script|KadiyaSubquestConsts
     return;
 }
 
-001-2.gat,70,60,0|script|Omar|162
+002-2.gat,117,126,0|script|Omar|162
 {
     callfunc "ElanoreFix";
     callfunc "KadiyaSubquestConsts";
@@ -178,7 +178,7 @@ S_update_var:
     return;
 }
 
-001-2.gat,76,59,0|script|Kadiya|174
+002-2.gat,124,124,0|script|Kadiya|174
 {
     set @child_number, 7;
     callfunc "XmasList";
diff --git a/world/map/npc/001-2/phaet.txt b/world/map/npc/002-2/phaet.txt
index aa0c9848..eb464e1e 100644
--- a/world/map/npc/001-2/phaet.txt
+++ b/world/map/npc/002-2/phaet.txt
@@ -1,6 +1,6 @@
 //
 
-001-2.gat,132,25,0|script|Phaet|125,0,0
+002-2.gat,75,56,0|script|Phaet|125,0,0
 {
     mes "[Phaet the Royal Guard]";
     mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
diff --git a/world/map/npc/002-2/rebecca.txt b/world/map/npc/002-2/rebecca.txt
new file mode 100644
index 00000000..54244115
--- /dev/null
+++ b/world/map/npc/002-2/rebecca.txt
@@ -0,0 +1,84 @@
+//
+
+002-2.gat,44,27,0|script|Rebecca|118
+{
+    set @npcname$, "Rebecca the Inn Keeper";
+    set @cost, 100;
+    mes "[" + @npcname$ + "]"; 
+    mes "\"Welcome to 'The Wizard's Rest'\"";
+    goto L_MainMenu;
+
+L_MainMenu:
+    mes "\"How may I help you?\"";
+    menu
+        "Can I get a room?", L_Inn,
+        "Any interesting guests?", L_Guests,
+        "Bakery?", L_Bakery,
+        "Barber?", L_Barber,
+        "Casino?", L_Casino,
+        "Theatre?", L_Theatre,
+        "Pvp?", L_Pvp,
+        "I don't need any help, thanks.", L_Close;
+
+L_Guests:
+    mes "\"We had a very rich business man show up the other day.\"";
+    next;
+    mes "\"He caused quite a stir when he paid for the penthouse so far in advance.";
+    mes "I hear he is looking for help.\"";
+    next;
+    mes "\"Other then that feel free to mingle with the guests.\"";
+    next;
+    mes "\"You can find them in the door behind me.\"";
+    goto L_Close;
+
+
+L_Bakery:
+    mes "\"Ahh yes, the World Famous Riskim's bakery.\"";
+    next;
+    mes "\"They only use the finest ingredients like Acorn Flour";
+    mes "to make some of the tastest treats in Tonori.\"";
+    next;
+    mes "Second only to the Wizards' private chef, Fieri.\"";
+    goto L_MainMenu;
+
+L_Barber:
+    mes "\"Issay the barber of Tonori can be found through the door behind me\"";
+    next;
+    mes "\"The master stylist can do anything with anyones hair.\"";
+    next;
+    mes "\"He always welcomes walk ins.\"";
+    goto L_MainMenu;
+
+L_Casino:
+    mes "\"Games, Games, Games.\"";
+    next;
+    mes "\"Test your luck or skill in the Casino. From Blackjack to Pvp.\"";
+    next;
+    mes "\"Win or Lose, you'll still have fun!\"";
+    goto L_MainMenu;
+
+L_Theatre:
+    mes "\"A touring troop from Hurnscald just arrived.\"";
+    next;
+    mes "\"The are currently rehearsing for their next show.\"";
+    next;
+    mes "\"Feel free to talk to the troupe leader, they are in the theatre behind me.\"";
+    goto L_MainMenu;
+
+L_Pvp:
+    mes "\"Yes, our Casino has Pvp in the Casino behind me.\"";
+    next;
+    mes "\"Test your self against other players and gamble on the outcome.\"";
+    next;
+    mes "\"Fame and glory awaits you gladiator!\"";
+    goto L_MainMenu;
+
+L_Inn:
+    callfunc "Inn";
+    goto L_Close;
+
+L_Close:
+    set @npcname$, "";
+    set @cost, 0;
+    close;
+}
diff --git a/world/map/npc/002-2/shops.txt b/world/map/npc/002-2/shops.txt
new file mode 100644
index 00000000..87986111
--- /dev/null
+++ b/world/map/npc/002-2/shops.txt
@@ -0,0 +1,3 @@
+// Bartender
+
+002-2.gat,68,25,0|shop|Bartender#Casino|112,Beer:*175,Cake:*30,CherryCake:*100
diff --git a/world/map/npc/003-1/stranger.txt b/world/map/npc/002-2/stranger.txt
index 65f7abd9..563af742 100644
--- a/world/map/npc/003-1/stranger.txt
+++ b/world/map/npc/002-2/stranger.txt
@@ -1,4 +1,4 @@
-003-1.gat,35,25,0|script|Stranger|192
+002-2.gat,38,57,0|script|Stranger|192
 {
     set @IRONINGOT, 5;
     set @PINKANTENNA, 21;
diff --git a/world/map/npc/001-2/troupe_leader.txt b/world/map/npc/002-2/troupe_leader.txt
index 64eef7b2..c736899d 100644
--- a/world/map/npc/001-2/troupe_leader.txt
+++ b/world/map/npc/002-2/troupe_leader.txt
@@ -1,6 +1,6 @@
 //
 
-001-2.gat,34,23,0|script|Troupe Leader|165
+002-2.gat,81,21,0|script|Troupe Leader|165
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt
index 47aab35a..bab4c837 100644
--- a/world/map/npc/002-3/_import.txt
+++ b/world/map/npc/002-3/_import.txt
@@ -7,3 +7,4 @@ npc: npc/002-3/mapflags.txt
 npc: npc/002-3/merchant.txt
 npc: npc/002-3/mining_camp_barrier.txt
 npc: npc/002-3/nathan.txt
+npc: npc/002-3/traveler.txt
diff --git a/world/map/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt
index e7ed3d83..b4f2078d 100644
--- a/world/map/npc/002-3/_warps.txt
+++ b/world/map/npc/002-3/_warps.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar Mining Camp warps
 
-002-3.gat,22,87|warp|To Beach|-1,-1,043-1.gat,85,55
-002-3.gat,85,51|warp|To Sand Storm Upper|-1,-1,002-1.gat,79,101
-002-3.gat,51,36|warp|To Sand Storm|-1,-1,002-1.gat,20,96
+002-3.gat,22,87|warp|Deep Caves|-1,-1,043-3.gat,31,27
+002-3.gat,85,51|warp|To Sand Storm Upper|-1,-1,002-1.gat,92,115
+002-3.gat,51,36|warp|To Sand Storm|-1,-1,002-1.gat,33,110
diff --git a/world/map/npc/002-2/traveler.txt b/world/map/npc/002-3/traveler.txt
index 945bc82e..ff53af8f 100644
--- a/world/map/npc/002-2/traveler.txt
+++ b/world/map/npc/002-3/traveler.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-002-2.gat,25,28,0|script|Jena the Traveler|103
+002-3.gat,25,28,0|script|Jena the Traveler|103
 {
     set @NpcName$, "Jena";
     set @NpcTravelBit, $@tul_mine_bit;
diff --git a/world/map/npc/003-1/_import.txt b/world/map/npc/003-1/_import.txt
deleted file mode 100644
index 4ab3384f..00000000
--- a/world/map/npc/003-1/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// Map 003-1: Beach
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 003-1.gat
-npc: npc/003-1/_mobs.txt
-npc: npc/003-1/_warps.txt
-npc: npc/003-1/mapflags.txt
-npc: npc/003-1/stranger.txt
diff --git a/world/map/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt
deleted file mode 100644
index a2ea4b4c..00000000
--- a/world/map/npc/003-1/_mobs.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach mobs
-
-003-1.gat,158,68,28,96|monster|GiantMaggot|1006,10,100000ms,30000ms,Mob003-1::On1006
-003-1.gat,0,0,0,0|monster|SeaSlime|1033,15,100000ms,30000ms,Mob003-1::On1033
-003-1.gat,120,31,22,22|monster|SeaSlime|1033,5,100000ms,30000ms,Mob003-1::On1033
-003-1.gat,119,68,105,101|monster|GreenSlime|1005,35,100000ms,30000ms,Mob003-1::On1005
-003-1.gat,134,69,76,71|monster|RedScorpion|1004,20,100000ms,30000ms,Mob003-1::On1004
-003-1.gat,35,25,10,3|monster|MountainSnake|1026,1,700000ms,600000ms,Mob003-1::On1026
-
-
-003-1.gat,0,0,0|script|Mob003-1|-1
-{
-    end;
-
-On1004:
-    set @mobID, 1004;
-    callfunc "MobPoints";
-    end;
-
-On1005:
-    set @mobID, 1005;
-    callfunc "MobPoints";
-    end;
-
-On1006:
-    set @mobID, 1006;
-    callfunc "MobPoints";
-    end;
-
-On1026:
-    set @mobID, 1026;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/003-1/_warps.txt b/world/map/npc/003-1/_warps.txt
deleted file mode 100644
index 0d99d333..00000000
--- a/world/map/npc/003-1/_warps.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach warps
-
-003-1.gat,172,77|warp|To Sandstorm Desert|-1,3,002-1.gat,13,66
-003-1.gat,141,19|warp|To Beach|1,-1,004-1.gat,37,110
-003-1.gat,48,36|warp|To Beach House|-1,-1,003-2.gat,22,28
-003-1.gat,59,29|warp|To Beach Storage|-1,-1,003-2.gat,56,28
-003-1.gat,114,117|warp|To Beach|2,-1,043-1.gat,44,20
diff --git a/world/map/npc/003-1/mapflags.txt b/world/map/npc/003-1/mapflags.txt
deleted file mode 100644
index 682c6a82..00000000
--- a/world/map/npc/003-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-003-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/003-2/_import.txt b/world/map/npc/003-2/_import.txt
deleted file mode 100644
index 8f9dba48..00000000
--- a/world/map/npc/003-2/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 003-2: Beach House
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 003-2.gat
-npc: npc/003-2/_mobs.txt
-npc: npc/003-2/_warps.txt
-npc: npc/003-2/mapflags.txt
diff --git a/world/map/npc/003-2/_mobs.txt b/world/map/npc/003-2/_mobs.txt
deleted file mode 100644
index 7a08ce43..00000000
--- a/world/map/npc/003-2/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach House mobs
-
-
-
-003-2.gat,0,0,0|script|Mob003-2|-1
-{
-    end;
-}
diff --git a/world/map/npc/003-2/_warps.txt b/world/map/npc/003-2/_warps.txt
deleted file mode 100644
index 56865f1e..00000000
--- a/world/map/npc/003-2/_warps.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach House warps
-
-003-2.gat,22,29|warp|To Outside|-1,-1,003-1.gat,48,37
-003-2.gat,56,29|warp|To Outside|-1,-1,003-1.gat,59,30
diff --git a/world/map/npc/003-2/mapflags.txt b/world/map/npc/003-2/mapflags.txt
deleted file mode 100644
index be495b87..00000000
--- a/world/map/npc/003-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-003-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/004-1/_import.txt b/world/map/npc/004-1/_import.txt
deleted file mode 100644
index eccf8063..00000000
--- a/world/map/npc/004-1/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 004-1: Beach
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 004-1.gat
-npc: npc/004-1/_mobs.txt
-npc: npc/004-1/_warps.txt
-npc: npc/004-1/mapflags.txt
diff --git a/world/map/npc/004-1/_mobs.txt b/world/map/npc/004-1/_mobs.txt
deleted file mode 100644
index 4802574a..00000000
--- a/world/map/npc/004-1/_mobs.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach mobs
-
-004-1.gat,39,57,8,29|monster|SeaSlime|1033,5,100000ms,30000ms,Mob004-1::On1033
-004-1.gat,33,83,9,40|monster|SeaSlime|1033,11,100000ms,30000ms,Mob004-1::On1033
-004-1.gat,28,103,11,14|monster|SeaSlime|1033,7,100000ms,30000ms,Mob004-1::On1033
-004-1.gat,71,104,27,20|monster|GiantMaggot|1006,5,100000ms,30000ms,Mob004-1::On1006
-004-1.gat,76,68,21,49|monster|RedScorpion|1004,13,100000ms,30000ms,Mob004-1::On1004
-004-1.gat,68,25,19,10|monster|GiantMaggot|1006,2,100000ms,30000ms,Mob004-1::On1006
-004-1.gat,93,27,2,3|monster|BlackScorpion|1009,1,120000ms,60000ms,Mob004-1::On1009
-
-
-004-1.gat,0,0,0|script|Mob004-1|-1
-{
-    end;
-
-On1004:
-    set @mobID, 1004;
-    callfunc "MobPoints";
-    end;
-
-On1006:
-    set @mobID, 1006;
-    callfunc "MobPoints";
-    end;
-
-On1009:
-    set @mobID, 1009;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/004-1/_warps.txt b/world/map/npc/004-1/_warps.txt
deleted file mode 100644
index e3c1776b..00000000
--- a/world/map/npc/004-1/_warps.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach warps
-
-004-1.gat,63,96|warp|To Pirate Caves|-1,-1,004-3.gat,24,94
-004-1.gat,84,115|warp|To Sandstorm Desert|1,-1,002-1.gat,28,14
-004-1.gat,80,31|warp|To Beach House|-1,-1,004-2.gat,21,28
-004-1.gat,86,27|warp|To Second Floor|-1,-1,004-2.gat,57,65
-004-1.gat,68,19|warp|To Beach|1,-1,041-1.gat,101,94
-004-1.gat,37,111|warp|To Beach|1,-1,003-1.gat,141,20
diff --git a/world/map/npc/004-1/mapflags.txt b/world/map/npc/004-1/mapflags.txt
deleted file mode 100644
index 194405b8..00000000
--- a/world/map/npc/004-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-004-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/004-2/_import.txt b/world/map/npc/004-2/_import.txt
deleted file mode 100644
index f4d7ac2b..00000000
--- a/world/map/npc/004-2/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// Map 004-2: Buccaneer's Den
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 004-2.gat
-npc: npc/004-2/_mobs.txt
-npc: npc/004-2/_warps.txt
-npc: npc/004-2/mapflags.txt
-npc: npc/004-2/pirate_cave_exit.txt
diff --git a/world/map/npc/004-2/_mobs.txt b/world/map/npc/004-2/_mobs.txt
deleted file mode 100644
index 8d94f675..00000000
--- a/world/map/npc/004-2/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Buccaneer's Den mobs
-
-
-
-004-2.gat,0,0,0|script|Mob004-2|-1
-{
-    end;
-}
diff --git a/world/map/npc/004-2/_warps.txt b/world/map/npc/004-2/_warps.txt
deleted file mode 100644
index 99d99a88..00000000
--- a/world/map/npc/004-2/_warps.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Buccaneer's Den warps
-
-004-2.gat,75,30|warp|To Entrance|0,-1,004-2.gat,38,21
-004-2.gat,39,20|warp|To Room|0,-1,004-2.gat,74,29
-004-2.gat,21,29|warp|To Outside|-1,-1,004-1.gat,80,32
-004-2.gat,62,28|warp|To Basement|-1,-1,004-2.gat,21,61
-004-2.gat,20,62|warp|To First Floor|-1,-1,004-2.gat,63,27
-004-2.gat,68,66|warp|To First Floor|0,-1,004-2.gat,35,19
-004-2.gat,36,18|warp|To Second Floor|0,-1,004-2.gat,67,65
-004-2.gat,57,66|warp|To Roof|-1,-1,004-1.gat,86,28
diff --git a/world/map/npc/004-2/mapflags.txt b/world/map/npc/004-2/mapflags.txt
deleted file mode 100644
index 8424c17f..00000000
--- a/world/map/npc/004-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-004-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/004-2/pirate_cave_exit.txt b/world/map/npc/004-2/pirate_cave_exit.txt
deleted file mode 100644
index c5149098..00000000
--- a/world/map/npc/004-2/pirate_cave_exit.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-// The Secret Pirate Cave Entrance
-
-004-2.gat,33,62,0|script|#piratecave1|45,1,1
-{
-    mes "[Trapdoor]";
-    mes "\"Descend into the caves?\"";
-    next;
-    menu
-        "Yes.", L_PirateCave,
-        "Nevermind", L_Close;
-
-L_PirateCave:
-    warp "004-3",80,23;
-    goto L_Close;
-
-L_Close:
-    close; 
-}
diff --git a/world/map/npc/004-3/_warps.txt b/world/map/npc/004-3/_warps.txt
index 507b3d9d..dfdfa8be 100644
--- a/world/map/npc/004-3/_warps.txt
+++ b/world/map/npc/004-3/_warps.txt
@@ -1,10 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Pirate Caves First Floor warps
 
-004-3.gat,24,95|warp|To West Beach|-1,-1,004-1.gat,63,98
+004-3.gat,24,95|warp|To West Beach|-1,-1,002-1.gat,49,21
 004-3.gat,49,80|warp|To Pirate Caves|-1,-1,004-4.gat,49,83
 004-3.gat,31,73|warp|To Pirate Caves|-1,-1,004-4.gat,31,70
 004-3.gat,49,56|warp|To Pirate Caves|-1,-1,004-4.gat,49,51
 004-3.gat,90,64|warp|To Pirate Caves|-1,-1,004-4.gat,90,68
-004-3.gat,80,22|warp|To West Beach House|-1,-1,004-2.gat,30,61
+004-3.gat,80,22|warp|To West Beach House|-1,-1,021-3.gat,44,142
 004-3.gat,77,40|warp|To Pirate Caves|-1,-1,004-4.gat,78,34
diff --git a/world/map/npc/004-3/mapflags.txt b/world/map/npc/004-3/mapflags.txt
index 736aefe5..a6af2bfc 100644
--- a/world/map/npc/004-3/mapflags.txt
+++ b/world/map/npc/004-3/mapflags.txt
@@ -1 +1 @@
-004-3.gat|mapflag|resave|001-1,57,71
+004-3.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/004-4/mapflags.txt b/world/map/npc/004-4/mapflags.txt
index 47d2d4fc..5a8e7b9e 100644
--- a/world/map/npc/004-4/mapflags.txt
+++ b/world/map/npc/004-4/mapflags.txt
@@ -1 +1 @@
-004-4.gat|mapflag|resave|001-1,57,71
+004-4.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/004-5/mapflags.txt b/world/map/npc/004-5/mapflags.txt
index 34d312dc..4bdc0a1b 100644
--- a/world/map/npc/004-5/mapflags.txt
+++ b/world/map/npc/004-5/mapflags.txt
@@ -1 +1 @@
-004-5.gat|mapflag|resave|001-1,57,71
+004-5.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/005-1/_import.txt b/world/map/npc/005-1/_import.txt
deleted file mode 100644
index 1b386a11..00000000
--- a/world/map/npc/005-1/_import.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Map 005-1: Snake Desert
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 005-1.gat
-npc: npc/005-1/_mobs.txt
-npc: npc/005-1/_warps.txt
-npc: npc/005-1/mapflags.txt
-npc: npc/005-1/npcs.txt
-npc: npc/005-1/spirit.txt
-npc: npc/005-1/traveler.txt
-npc: npc/005-1/tree.txt
diff --git a/world/map/npc/005-1/_mobs.txt b/world/map/npc/005-1/_mobs.txt
deleted file mode 100644
index 22f80e0f..00000000
--- a/world/map/npc/005-1/_mobs.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snake Desert mobs
-
-005-1.gat,0,0,0,0|monster|Maggot|1002,1,100000ms,30000ms,Mob005-1::On1002
-005-1.gat,0,0,0,0|monster|Snake|1010,1,100000ms,30000ms,Mob005-1::On1010
-005-1.gat,71,77,9,6|monster|Snake|1010,2,40000ms,50000ms,Mob005-1::On1010
-005-1.gat,92,25,8,5|monster|Snake|1010,3,40000ms,50000ms,Mob005-1::On1010
-005-1.gat,99,68,95,52|monster|GiantMaggot|1006,20,100000ms,30000ms,Mob005-1::On1006
-005-1.gat,91,15,66,23|monster|BlackScorpion|1009,7,100000ms,30000ms,Mob005-1::On1009
-005-1.gat,99,87,85,32|monster|BlackScorpion|1009,8,100000ms,30000ms,Mob005-1::On1009
-005-1.gat,30,43,21,25|monster|GreenSlime|1005,3,100000ms,30000ms,Mob005-1::On1005
-005-1.gat,118,70,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob005-1::On1005
-005-1.gat,163,71,32,65|monster|Snake|1010,8,100000ms,30000ms,Mob005-1::On1010
-005-1.gat,122,52,77,84|monster|Maggot|1002,20,100000ms,30000ms,Mob005-1::On1002
-
-
-005-1.gat,0,0,0|script|Mob005-1|-1
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1005:
-    set @mobID, 1005;
-    callfunc "MobPoints";
-    end;
-
-On1006:
-    set @mobID, 1006;
-    callfunc "MobPoints";
-    end;
-
-On1009:
-    set @mobID, 1009;
-    callfunc "MobPoints";
-    end;
-
-On1010:
-    set @mobID, 1010;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/005-1/_warps.txt b/world/map/npc/005-1/_warps.txt
deleted file mode 100644
index a4622df6..00000000
--- a/world/map/npc/005-1/_warps.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snake Desert warps
-
-005-1.gat,19,41|warp|To Sandstorm Desert|-1,2,002-1.gat,107,79
-005-1.gat,89,23|warp|To Snake Pit|-1,-1,005-3.gat,52,35
-005-1.gat,71,75|warp|To Snake Pit|-1,-1,005-3.gat,33,84
-005-1.gat,167,108|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,168,107|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,169,106|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,170,105|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,171,104|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,172,103|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,173,102|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,174,101|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,175,100|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,176,99|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,177,98|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,178,97|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,179,96|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
-005-1.gat,74,48|warp|To Druid Tree|-1,-1,005-1.gat,74,39
-005-1.gat,74,40|warp|To Druid Tree|-1,-1,005-1.gat,74,49
diff --git a/world/map/npc/005-1/mapflags.txt b/world/map/npc/005-1/mapflags.txt
deleted file mode 100644
index 3ede3802..00000000
--- a/world/map/npc/005-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-005-1.gat|mapflag|resave|005-1,80,30
diff --git a/world/map/npc/005-1/npcs.txt b/world/map/npc/005-1/npcs.txt
deleted file mode 100644
index 6eed9735..00000000
--- a/world/map/npc/005-1/npcs.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-
-
-//005-1.gat,66,75,0|script|Kieron|132
-//{
-//    mes "[Kieron]";
-//    mes "\"Be careful if you're going in that cave,";
-//    mes "it's packed full of monsters.\"";
-//    close;
-//}
-
-005-1.gat,91,23,0|script|William|131
-{
-    mes "[William]";
-    mes "\"Going in the cave?";
-    mes "You better watch your step, last time I checked it was full of monsters!\"";
-    close;
-}
diff --git a/world/map/npc/005-1/traveler.txt b/world/map/npc/005-1/traveler.txt
deleted file mode 100644
index 0d6f2eee..00000000
--- a/world/map/npc/005-1/traveler.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// This is a teleportation (warp) NPC. Its purpose is to offer expensive, fast trips throughout the world.
-// Author: Wombat, wushin
-// cost depending on level and adapted to new scripting guidelines: Jenalya
-
-005-1.gat,73,36,0|script|Kieron the Traveler|103
-{
-    set @NpcName$, "Kieron";
-    set @NpcTravelBit, $@druid_tree_bit;
-    callfunc "Traveler";
-    end;
-}
diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt
index f275f267..d13405f5 100644
--- a/world/map/npc/005-3/_mobs.txt
+++ b/world/map/npc/005-3/_mobs.txt
@@ -1,13 +1,25 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Snake Pit mobs
 
-005-3.gat,0,0,0,0|monster|Snake|1010,175,0ms,0ms,Mob005-3::On1010
+005-3.gat,58,57,62,57|monster|Snake|1010,50,100000ms,30000ms,Mob005-3::On1010
+005-3.gat,58,57,62,57|monster|BlackScorpion|1009,15,100000ms,30000ms,Mob005-3::On1009
+005-3.gat,58,57,62,57|monster|GiantMaggot|1006,20,100000ms,30000ms,Mob005-3::On1006
 
 
 005-3.gat,0,0,0|script|Mob005-3|-1
 {
     end;
 
+On1006:
+    set @mobID, 1006;
+    callfunc "MobPoints";
+    end;
+
+On1009:
+    set @mobID, 1009;
+    callfunc "MobPoints";
+    end;
+
 On1010:
     set @mobID, 1010;
     callfunc "MobPoints";
diff --git a/world/map/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt
index 2f757add..b49daa39 100644
--- a/world/map/npc/005-3/_warps.txt
+++ b/world/map/npc/005-3/_warps.txt
@@ -1,5 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Snake Pit warps
 
-005-3.gat,52,33|warp|To Outside|-1,-1,005-1.gat,89,25
-005-3.gat,33,82|warp|To Outside|-1,-1,005-1.gat,71,77
+005-3.gat,52,33|warp|To Outside|-1,-1,002-1.gat,113,109
+005-3.gat,63,46|warp|Snake Mountain|-1,-1,006-3.gat,89,45
+005-3.gat,85,49|warp|Snake Mountain|-1,-1,006-3.gat,125,65
+005-3.gat,86,30|warp|To Outside|-1,-1,006-1.gat,55,47
+005-3.gat,73,60|warp|To Outside|-1,-1,006-1.gat,51,69
+005-3.gat,78,88|warp|Sandy Dungeon|-1,-1,043-3.gat,116,37
+005-3.gat,33,82|warp|Sandy Dungeon|-1,-1,043-3.gat,31,35
diff --git a/world/map/npc/005-3/mapflags.txt b/world/map/npc/005-3/mapflags.txt
index 65920d4d..8916c392 100644
--- a/world/map/npc/005-3/mapflags.txt
+++ b/world/map/npc/005-3/mapflags.txt
@@ -1 +1 @@
-005-3.gat|mapflag|resave|005-1,80,30
+005-3.gat|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/005-4/_import.txt b/world/map/npc/005-4/_import.txt
deleted file mode 100644
index d48c6a1c..00000000
--- a/world/map/npc/005-4/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// Map 005-4: Electricity Boss Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 005-4.gat
-npc: npc/005-4/_mobs.txt
-npc: npc/005-4/_warps.txt
diff --git a/world/map/npc/005-4/_mobs.txt b/world/map/npc/005-4/_mobs.txt
deleted file mode 100644
index cc3a7de8..00000000
--- a/world/map/npc/005-4/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Electricity Boss Cave mobs
-
-
-
-005-4.gat,0,0,0|script|Mob005-4|-1
-{
-    end;
-}
diff --git a/world/map/npc/005-4/_warps.txt b/world/map/npc/005-4/_warps.txt
deleted file mode 100644
index 6d2cb2de..00000000
--- a/world/map/npc/005-4/_warps.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Electricity Boss Cave warps
-
-005-4.gat,37,36|warp|To Snake Pit|0,-1,005-3.gat,85,50
diff --git a/world/map/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index 492ddf7d..b3f17a58 100644
--- a/world/map/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
@@ -5,5 +5,8 @@ npc: npc/006-1/_mobs.txt
 npc: npc/006-1/_warps.txt
 npc: npc/006-1/mapflags.txt
 npc: npc/006-1/mika.txt
+npc: npc/006-1/miriam.txt
 npc: npc/006-1/pachua.txt
+npc: npc/006-1/spirit.txt
 npc: npc/006-1/traveler.txt
+npc: npc/006-1/tree.txt
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index 7b5aaf95..9a376631 100644
--- a/world/map/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
@@ -1,32 +1,48 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Desert Mountains mobs
 
-006-1.gat,25,34,12,31|monster|Snake|1010,3,100000ms,30000ms,Mob006-1::On1010
-006-1.gat,36,29,9,16|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
-006-1.gat,34,41,4,6|monster|MountainSnake|1026,1,30000ms,75000ms,Mob006-1::On1026
-006-1.gat,55,37,27,23|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026
+006-1.gat,49,52,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
+006-1.gat,53,36,16,13|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026
 006-1.gat,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,118,43,22,40|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,115,49,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,88,47,36,11|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,105,72,25,16|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,75,106,16,22|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,102,97,36,29|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,65,65,49,30|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,95,120,38,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,54,120,29,7|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,36,98,33,35|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003
+006-1.gat,113,41,12,37|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,113,51,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,86,46,29,5|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,105,73,21,14|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,73,102,8,13|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,104,100,11,15|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,82,72,25,16|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,95,114,17,4|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,57,119,18,2|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,33,97,27,33|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003
+006-1.gat,58,49,3,3|monster|GreenSlime|1005,3,100000ms,30000ms,Mob006-1::On1005
+006-1.gat,34,50,5,4|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
+006-1.gat,96,92,20,48|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
+006-1.gat,35,97,28,29|monster|Maggot|1002,20,100000ms,30000ms,Mob006-1::On1002
+006-1.gat,28,73,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
+006-1.gat,33,59,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
+006-1.gat,37,73,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
+006-1.gat,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
 
 
 006-1.gat,0,0,0|script|Mob006-1|-1
 {
     end;
 
+On1002:
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    end;
+
 On1003:
     set @mobID, 1003;
     callfunc "MobPoints";
     end;
 
+On1005:
+    set @mobID, 1005;
+    callfunc "MobPoints";
+    end;
+
 On1010:
     set @mobID, 1010;
     callfunc "MobPoints";
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index 91459352..551d74a2 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -1,42 +1,32 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Desert Mountains warps
 
-006-1.gat,18,31|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,40,26|warp|To Desert Mountains Cav|-1,-1,006-3.gat,40,28
-006-1.gat,60,58|warp|To Desert Mountains Cav|-1,-1,006-3.gat,60,70
-006-1.gat,62,30|warp|To Desert Mountains Cav|-1,-1,006-3.gat,62,32
-006-1.gat,55,27|warp|To Desert Mountains Cav|-1,-1,006-3.gat,55,29
-006-1.gat,77,44|warp|To Desert Mountains Cav|-1,-1,006-3.gat,77,46
-006-1.gat,86,24|warp|To Desert Mountains Cav|-1,-1,006-3.gat,86,26
-006-1.gat,91,24|warp|To Desert Mountains Cav|-1,-1,006-3.gat,91,26
-006-1.gat,104,44|warp|To Desert Mountains Cav|-1,-1,006-3.gat,104,46
-006-1.gat,122,24|warp|To Desert Mountains Cav|-1,-1,006-3.gat,122,26
-006-1.gat,114,49|warp|To Desert Mountains Cav|-1,-1,006-3.gat,114,51
-006-1.gat,110,56|warp|To Desert Mountains Cav|-1,-1,006-3.gat,110,58
-006-1.gat,125,59|warp|To Desert Mountains Cav|-1,-1,006-3.gat,125,61
-006-1.gat,92,63|warp|To Desert Mountains Cav|-1,-1,006-3.gat,92,65
-006-1.gat,112,74|warp|To Desert Mountains Cav|-1,-1,006-3.gat,112,76
-006-1.gat,121,110|warp|To Desert Mountains Cav|-1,-1,006-3.gat,121,112
-006-1.gat,79,120|warp|To Desert Mountains Cav|-1,-1,006-3.gat,79,122
-006-1.gat,38,121|warp|To Desert Mountains Cav|-1,-1,006-3.gat,38,123
-006-1.gat,74,90|warp|To Desert Mountains Cav|-1,-1,006-3.gat,74,92
-006-1.gat,51,90|warp|To Desert Mountains Cav|-1,-1,006-3.gat,51,92
+006-1.gat,40,26|warp|To Desert Mountain Cave|-1,-1,006-3.gat,40,28
+006-1.gat,60,58|warp|To Desert Mountain Cave|-1,-1,006-3.gat,60,70
+006-1.gat,62,30|warp|To Desert Mountain Cave|-1,-1,006-3.gat,62,32
+006-1.gat,55,27|warp|To Desert Mountain Cave|-1,-1,006-3.gat,55,29
+006-1.gat,77,44|warp|To Desert Mountain Cave|-1,-1,006-3.gat,77,46
+006-1.gat,86,24|warp|To Desert Mountain Cave|-1,-1,006-3.gat,86,26
+006-1.gat,91,24|warp|To Desert Mountain Cave|-1,-1,006-3.gat,91,26
+006-1.gat,98,46|warp|To Desert Mountain Cave|-1,-1,006-3.gat,104,46
+006-1.gat,114,22|warp|To Desert Mountain Cave|-1,-1,006-3.gat,122,26
+006-1.gat,114,49|warp|To Desert Mountain Cave|-1,-1,006-3.gat,114,51
+006-1.gat,102,53|warp|To Desert Mountain Cave|-1,-1,006-3.gat,110,58
+006-1.gat,117,57|warp|To Desert Mountain Cave|-1,-1,006-3.gat,125,61
+006-1.gat,92,63|warp|To Desert Mountain Cave|-1,-1,006-3.gat,92,65
+006-1.gat,112,74|warp|To Desert Mountain Cave|-1,-1,006-3.gat,112,76
+006-1.gat,111,110|warp|To Desert Mountain Cave|-1,-1,032-3.gat,56,60
+006-1.gat,83,117|warp|To Desert Mountain Cave|-1,-1,006-3.gat,79,121
+006-1.gat,38,121|warp|To Desert Mountain Cave|-1,-1,006-3.gat,38,123
+006-1.gat,74,90|warp|To Desert Mountain Cave|-1,-1,006-3.gat,74,92
+006-1.gat,51,90|warp|To Desert Mountain Cave|-1,-1,006-3.gat,51,92
 006-1.gat,30,123|warp|To Outback Cave|-1,-1,032-3.gat,128,33
-006-1.gat,19,30|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,20,29|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,21,28|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,22,27|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,23,26|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,24,25|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,25,24|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,26,23|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,27,22|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,28,21|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,29,20|warp|To Snake Desert|-1,-1,005-1.gat,172,101
-006-1.gat,30,19|warp|To Snake Desert|-1,-1,005-1.gat,172,101
 006-1.gat,33,85|warp|To Pachua's Village|-1,-1,006-2.gat,58,43
 006-1.gat,23,85|warp|To Pachua's Village|-1,-1,006-2.gat,48,43
 006-1.gat,23,100|warp|To Pachua's Village|-1,-1,006-2.gat,67,64
 006-1.gat,21,108|warp|To Pachua's Village|-1,-1,006-2.gat,65,72
 006-1.gat,37,26|warp|To Desert Mountains|-1,-1,006-1.gat,37,23
 006-1.gat,37,24|warp|To Desert Mountains|-1,-1,006-1.gat,37,27
+006-1.gat,55,46|warp|Snake Cave|-1,-1,005-3.gat,86,31
+006-1.gat,20,48|warp|To Sandstorm Desert|-1,0,002-1.gat,118,95
+006-1.gat,51,68|warp|Snake Cave|-1,-1,005-3.gat,73,59
diff --git a/world/map/npc/032-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index d4daaafd..4279e3d5 100644
--- a/world/map/npc/032-1/miriam.txt
+++ b/world/map/npc/006-1/miriam.txt
@@ -18,8 +18,13 @@
 // after you gained the speed skill, all variables are reset to zero.
 //#############################################
 
-032-1.gat,55,20,0|script|Miriam|175
+006-1.gat,115,111,0|script|Miriam|175
 {
+    setarray @npc_loc, 115, 111, 2;
+    callfunc "PCtoNPCRange";
+    if (@npc_check)
+        goto L_Close;
+
     if (getskilllv(SKILL_SPEED)) goto L_fast;
     if (getequipid(equip_torso) < 0) goto L_naked;
     if (QUEST_MIRIAM == 0) goto L_intro;
diff --git a/world/map/npc/005-1/spirit.txt b/world/map/npc/006-1/spirit.txt
index 6e2784d2..5f7d06fb 100644
--- a/world/map/npc/005-1/spirit.txt
+++ b/world/map/npc/006-1/spirit.txt
@@ -90,7 +90,7 @@ L_Q_magic:
     mes "\"Good, good... that's the right attitude!  Yes, I can teach you magic, but first you must prove that you are worthy to be my student!\"";
     next;
     mes "[Earth Spirit]";
-    mes "\"North-west of here sits and old, dead tree. Well, not completely dead, not yet, but almost. It's nothing special. Well, maybe a little, but not really. I want you to cut off one of its branches.\"";
+    mes "\"North-east of here sits and old, dead tree. Well, not completely dead, not yet, but almost. It's nothing special. Well, maybe a little, but not really. I want you to cut off one of its branches.\"";
     next;
     menu
         "No way.", L_silly_close,
@@ -246,7 +246,7 @@ L_Q_tree_how:
 
 L_Q_tree_where:
     mes "[Earth Spirit]";
-    mes "\"North-west of here.\"";
+    mes "\"North-east of here.\"";
     next;
     goto L_main;
 
@@ -286,13 +286,13 @@ S_update_var:
     return;
 }
 
-005-1.gat,118,70,0|script|#EarthImp0#_M|400
+006-1.gat,63,79,0|script|#EarthImp0#_M|400
 {
     callfunc "EarthImpTouch";
     end;
 }
 
-005-1.gat,119,70,0|script|#EarthImp1#_M|400
+006-1.gat,64,79,0|script|#EarthImp1#_M|400
 {
     callfunc "EarthImpTouch";
     end;
diff --git a/world/map/npc/005-1/tree.txt b/world/map/npc/006-1/tree.txt
index 27840370..dbef23f2 100644
--- a/world/map/npc/005-1/tree.txt
+++ b/world/map/npc/006-1/tree.txt
@@ -155,13 +155,13 @@ L_Close:
 
 }
 
-005-1.gat,79,41,0|script|#DruidTree0#_M|400
+006-1.gat,82,59,0|script|#DruidTree0#_M|400
 {
     callfunc "QuestTreeTouch";
     end;
 }
 
-005-1.gat,80,41,0|script|#DruidTree1#_M|400
+006-1.gat,83,59,0|script|#DruidTree1#_M|400
 {
     callfunc "QuestTreeTouch";
     end;
diff --git a/world/map/npc/006-3/_warps.txt b/world/map/npc/006-3/_warps.txt
index c0744946..5c130a60 100644
--- a/world/map/npc/006-3/_warps.txt
+++ b/world/map/npc/006-3/_warps.txt
@@ -6,17 +6,18 @@
 006-3.gat,62,30|warp|To Desert Mountains|-1,-1,006-1.gat,62,32
 006-3.gat,86,24|warp|To Desert Mountains|-1,-1,006-1.gat,86,26
 006-3.gat,91,24|warp|To Desert Mountains|-1,-1,006-1.gat,91,26
-006-3.gat,122,24|warp|To Desert Mountains|-1,-1,006-1.gat,122,26
+006-3.gat,122,24|warp|To Desert Mountains|-1,-1,006-1.gat,114,24
 006-3.gat,114,49|warp|To Desert Mountains|-1,-1,006-1.gat,114,51
-006-3.gat,104,44|warp|To Desert Mountains|-1,-1,006-1.gat,104,46
+006-3.gat,104,44|warp|To Desert Mountains|-1,-1,006-1.gat,98,48
 006-3.gat,77,44|warp|To Desert Mountains|-1,-1,006-1.gat,77,46
 006-3.gat,60,68|warp|To Desert Mountains|-1,-1,006-1.gat,60,60
 006-3.gat,92,63|warp|To Desert Mountains|-1,-1,006-1.gat,92,65
 006-3.gat,112,74|warp|To Desert Mountains|-1,-1,006-1.gat,112,76
-006-3.gat,110,56|warp|To Desert Mountains|-1,-1,006-1.gat,110,58
-006-3.gat,125,59|warp|To Desert Mountains|-1,-1,006-1.gat,125,61
+006-3.gat,110,56|warp|To Desert Mountains|-1,-1,006-1.gat,102,55
+006-3.gat,125,59|warp|To Desert Mountains|-1,-1,006-1.gat,117,59
 006-3.gat,74,90|warp|To Desert Mountains|-1,-1,006-1.gat,74,92
 006-3.gat,51,90|warp|To Desert Mountains|-1,-1,006-1.gat,51,92
 006-3.gat,38,121|warp|To Desert Mountains|-1,-1,006-1.gat,38,123
-006-3.gat,79,120|warp|To Desert Mountains|-1,-1,006-1.gat,79,122
-006-3.gat,121,110|warp|To Desert Mountains|-1,-1,006-1.gat,121,112
+006-3.gat,79,120|warp|To Desert Mountains|-1,-1,006-1.gat,83,119
+006-3.gat,125,66|warp|Snake Cave|-1,-1,005-3.gat,85,50
+006-3.gat,89,46|warp|Snake Cave|-1,-1,005-3.gat,63,47
diff --git a/world/map/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt
index 8808364d..677d39ba 100644
--- a/world/map/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
@@ -5,8 +5,10 @@ npc: npc/008-1/_mobs.txt
 npc: npc/008-1/_warps.txt
 npc: npc/008-1/andra.txt
 npc: npc/008-1/annualeaster.txt
+npc: npc/008-1/banu.txt
 npc: npc/008-1/diryn.txt
 npc: npc/008-1/dock.txt
 npc: npc/008-1/george.txt
 npc: npc/008-1/hinnak.txt
 npc: npc/008-1/mapflags.txt
+npc: npc/008-1/mikhail.txt
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index 546a93a2..0c528a66 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -3,8 +3,8 @@
 
 008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20ms,0ms,Mob008-1::On1014
 008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20ms,0ms,Mob008-1::On1018
-008-1.gat,0,0,0,0|monster|SpikyMushroom|1019,18,20ms,0ms,Mob008-1::On1019
-008-1.gat,0,0,0,0|monster|Snail|1041,5,30ms,0ms,Mob008-1::On1041
+008-1.gat,0,0,0,0|monster|ManaBug|1131,18,30ms,0ms,Mob008-1::On1131
+008-1.gat,0,0,0,0|monster|Maggot|1002,30,30ms,0ms,Mob008-1::On1002
 008-1.gat,0,0,0,0|monster|MauvePlant|1029,2,270000ms,180000ms,Mob008-1::On1029
 008-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob008-1::On1035
 008-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob008-1::On1037
@@ -16,6 +16,11 @@
 {
     end;
 
+On1002:
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    end;
+
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
@@ -26,11 +31,6 @@ On1018:
     callfunc "MobPoints";
     end;
 
-On1019:
-    set @mobID, 1019;
-    callfunc "MobPoints";
-    end;
-
 On1029:
     set @mobID, 1029;
     callfunc "MobPoints";
@@ -51,13 +51,13 @@ On1038:
     callfunc "MobPoints";
     end;
 
-On1041:
-    set @mobID, 1041;
+On1055:
+    set @mobID, 1055;
     callfunc "MobPoints";
     end;
 
-On1055:
-    set @mobID, 1055;
+On1131:
+    set @mobID, 1131;
     callfunc "MobPoints";
     end;
 }
diff --git a/world/map/npc/021-1/banu.txt b/world/map/npc/008-1/banu.txt
index db3830dc..957d74d4 100644
--- a/world/map/npc/021-1/banu.txt
+++ b/world/map/npc/008-1/banu.txt
@@ -3,12 +3,12 @@
 // Using bit 10 and 11 of QUEST_NorthTulimshar (second half of nibble 2)
 // author: Jenalya
 
-021-1.gat,102,54,0|script|Banu|154
+008-1.gat,70,42,0|script|Banu|154
 {
     set @state, ((QUEST_NorthTulimshar & TWOBIT_5_MASK) >> TWOBIT_5_SHIFT);
-    set @EXP, 30;
-    set @money_water, 200;
-    set @money_knife, 60;
+    set @EXP, 100;
+    set @money_water, 250;
+    set @money_knife, 100;
 
     if (@state >= 3) goto L_Done;
     if (@state == 2) goto L_Knife;
@@ -28,7 +28,7 @@ L_Next:
 
     mes "She smiles.";
     mes "[Banu]";
-    mes "\"Here is my Empty Bottle. There is a well right over there at the market.\"";
+    mes "\"Here is my Empty Bottle. There is a well right over there at Hurnscald.\"";
     getitem "EmptyBottle", 1;
     set @state, 1;
     callsub S_Update_Mask;
@@ -50,7 +50,7 @@ L_Water:
     mes "\"Ah, that's refreshing. Thank you. You're a good kid. Have this for your expenses.";
     mes "Maybe you can do me another favor?\"";
     next;
-    mes "\"I need a new Knife. Mjolnir in the Tulimshar forge to the north east of here is selling some. But it's such a long way for my old legs.";
+    mes "\"I need a new Knife. Peter in the Hurnscald forge to the South of here is selling some. But it's such a long way for my old legs.";
     mes "Would you go to get me a Knife?\"";
     goto L_Close;
 
@@ -77,11 +77,11 @@ L_Done:
     mes "[Banu]";
     set @rand, rand(3);
     if (@rand == 0)
-        mes "\"I spent all my life here in Tulimshar. It's a good place to live.\"";
+        mes "\"I spent all my life here in Hurnscald. It's a good place to live.\"";
     if (@rand == 1)
-        mes "\"Did you see the kids playing hide and seek? Ah, when I was young I used to play with my good friend Sorfina. She lives in the suburbs now, north of Tulimshar.\"";
+        mes "\"Did you see the kids playing hide and seek? Ah, when I was young I used to play with my good friend Sorfina. She lives in Candor now, East of Hurnscald by boat.\"";
     if (@rand == 2)
-        mes "\"Tulimshar is ruled by a council of wise wizards.\"";
+        mes "\"Tonori is ruled by a council of wise wizards.\"";
     goto L_Close;
 
 L_NoWater:
diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt
index d24355bd..c4c701d3 100644
--- a/world/map/npc/008-1/dock.txt
+++ b/world/map/npc/008-1/dock.txt
@@ -1,25 +1,43 @@
 // The ferry dock
 
-008-1.gat,134,63,0|script|Ferry Schedule#5|397
+008-1.gat,134,69,0|script|Ferry Schedule#5|397
 {
     callfunc "FerryManifest";
     end;
 }
 
-008-1.gat,147,64,0|script|Hurnscald Koga|395,8,3
+008-1.gat,147,64,0|script|Hurnscald North Koga|395,8,3
 {
     callfunc "BoardFerry";
     close;
 }
 
-008-1.gat,120,44,0|script|#HurnscaldDock|127
+008-1.gat,120,44,0|script|#Hurnscald NorthDock|127
 {
     end;
 OnCommandArrive:
-    enablenpc "Hurnscald Koga";
+    enablenpc "Hurnscald North Koga";
     end;
 
 OnCommandWarp:
-    disablenpc "Hurnscald Koga";
+    disablenpc "Hurnscald North Koga";
+    end;
+}
+
+008-1.gat,147,75,0|script|Hurnscald South Koga|395,8,3
+{
+    callfunc "BoardCandorFerry";
+    close;
+}
+
+008-1.gat,65,25,0|script|#Hurnscald SouthDock|127
+{
+    end;
+OnCommandArrive:
+    enablenpc "Hurnscald South Koga";
+    end;
+
+OnCommandWarp:
+    disablenpc "Hurnscald South Koga";
     end;
 }
diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt
index af36f75f..24679b34 100644
--- a/world/map/npc/008-1/george.txt
+++ b/world/map/npc/008-1/george.txt
@@ -1,6 +1,6 @@
 //
 
-008-1.gat,136,36,0|script|George#pirate|138
+008-1.gat,135,62,0|script|George#pirate|138
 {
     set @halloween_npc_id, $@halloween_npc_george;
     callfunc "TrickOrTreat";
@@ -9,21 +9,36 @@
     if (getequipid(equip_head) == 622) goto L_Bandana;
     if (getequipid(equip_head) == 621) goto L_EyePatch;
     mes "[George the Pirate]";
-    mes "\"Arrrrh! 'Tis some kind of treasure map!\"";
-    close;
+    mes "\"Yar! Do you need something, matey?\"";
+    goto L_Main;
+
+L_Main:
+    menu
+        "Can you explain the Ferry?", L_Explain,
+        "Nothing I guess", L_Close;
 
 L_Pirate:
     mes "[George the Pirate]";
     mes "\"Arrrrh! Ye be wearing a pirate's hat!\"";
-    close;
+    goto L_Main;
 
 L_Bandana:
     mes "[George the Pirate]";
     mes "\"Arrrrh! Ye remind me of my old first mate!\"";
-    close;
+    goto L_Main;
 
 L_EyePatch:
     mes "[George the Pirate]";
     mes "\"Arrrrh! Looks like ye lost an eye there!\"";
+    goto L_Main;
+
+L_Explain:
+    mes "[George the Pirate]";
+    mes "\"Arrr matey! I helped pioneer the trade routes between Hurnscald and the rest of the World, so now merchants and adventurers can travel to and fro without any hassle of dodging wolvern, yarr.\"";
+    next;
+    callfunc "FerryHelp";
+    goto L_Main;
+
+L_Close:
     close;
 }
diff --git a/world/map/npc/001-1/mikhail.txt b/world/map/npc/008-1/mikhail.txt
index bc8406fc..9de0480c 100644
--- a/world/map/npc/001-1/mikhail.txt
+++ b/world/map/npc/008-1/mikhail.txt
@@ -1,6 +1,6 @@
 // Variables used: nibble 0 of QUEST_SouthTulimshar
 
-001-1.gat,54,43,0|script|Mikhail|120
+008-1.gat,135,25,0|script|Mikhail|120
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -14,14 +14,16 @@
 
 L_Convince_Mikhail_First:
     mes "[Mikhail]";
-    mes "\"Hello...\"";
+    mes "\"Hello... I'm supposed to be helping Bernard from the Inn but...\"";
+    mes "His eyes grow wide";
+    mes "\"Eeekkk another one.\"";
     mes "";
-    mes "It seems that the boy would like to say more, but does not dare to open up to you. Maybe you should help someone else first, so that he sees your intentions are good.";
+    mes "It seems that the boy would like to say more, but seems too terrified at the moment. Maybe you should help someone else first, so that he sees your intentions are good.";
     goto L_Close;
 
 L_Start:
     mes "[Mikhail]";
-    mes "\"My grandma sent me to get five Maggot Slimes from the maggots in the desert, but they scare me so bad!\"";
+    mes "\"Bernard sent me to get five Maggot Slimes from the maggots in the fields, but they scare me so bad!\"";
     next;
     mes "\"You look like a nice person. Would you go get them for me?\"";
     menu
@@ -56,7 +58,7 @@ L_get:
     set @state, 6;
     callsub S_Update_Var;
     mes "[Mikhail]";
-    mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
+    mes "\"Ooh!  Thank you so much!  I can get back to Bernard now!\"";
     goto L_Close;
 
 L_Done:
diff --git a/world/map/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt
index 1901a872..402d39ab 100644
--- a/world/map/npc/009-1/_import.txt
+++ b/world/map/npc/009-1/_import.txt
@@ -4,6 +4,7 @@ map: 009-1.gat
 npc: npc/009-1/_mobs.txt
 npc: npc/009-1/_warps.txt
 npc: npc/009-1/dock.txt
+npc: npc/009-1/guide.txt
 npc: npc/009-1/jack.txt
 npc: npc/009-1/mapflags.txt
 npc: npc/009-1/milly.txt
diff --git a/world/map/npc/001-1/guide.txt b/world/map/npc/009-1/guide.txt
index 69a0231d..0be17d68 100644
--- a/world/map/npc/001-1/guide.txt
+++ b/world/map/npc/009-1/guide.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,32,27,0|script|Ian|102
+009-1.gat,92,29,0|script|Ian|102
 {
     // This line is only relevant for players, who started before the timestamp was introduced.
     // Set the graduation cap flag at the right position.
@@ -99,7 +99,7 @@ L_Quests:
     mes "So be nice and help people along the way!\"";
     next;
     mes "[Ian the Guide]";
-    mes "\"If you are looking for a place to get started, I heard that the guard captain just outside the gates is looking for help.\"";
+    mes "\"If you are looking for a place to get started, I heard that the farmers just outside the gates are looking for help.\"";
     next;
     goto L_Menu_A;
 
@@ -142,7 +142,9 @@ L_Stats:
 
 L_Magic:
     mes "[Ian the Guide]";
-    mes "\"In decades past, there was a Mana Seed south of Tulimshar, from which people could draw magical energies. Unfortunately, the seed is gone.";
+    mes "\"The only active Mana Seed remaining is West of here somewhere, Ask Wyara, they may know more about it.\"";
+    next;
+    mes "\"In decades past, there was a Mana Seed in Tulimshar, from which people could draw magical energies. Unfortunately, the seed went dorment.";
     mes "However, I've overheard the bard mentioning something about this recently... if you are interested in magic, try talking to him!\"";
     next;
     goto L_Menu_A;
@@ -155,7 +157,7 @@ L_Key:
 
 L_Laws:
     mes "[Ian the Guide]";
-    mes "\"The constable can help you with them.\"";
+    callfunc "GameRules";
     next;
     goto L_Menu_A;
 
diff --git a/world/map/npc/009-2/_import.txt b/world/map/npc/009-2/_import.txt
index f3e16386..080bfeb6 100644
--- a/world/map/npc/009-2/_import.txt
+++ b/world/map/npc/009-2/_import.txt
@@ -5,8 +5,10 @@ npc: npc/009-2/_mobs.txt
 npc: npc/009-2/_warps.txt
 npc: npc/009-2/airlia.txt
 npc: npc/009-2/alan.txt
+npc: npc/009-2/bernard.txt
 npc: npc/009-2/doctor.txt
 npc: npc/009-2/drunks.txt
+npc: npc/009-2/entertainer.txt
 npc: npc/009-2/inspector.txt
 npc: npc/009-2/kfahr.txt
 npc: npc/009-2/lena.txt
@@ -19,5 +21,7 @@ npc: npc/009-2/peter.txt
 npc: npc/009-2/richard.txt
 npc: npc/009-2/selim.txt
 npc: npc/009-2/shops.txt
+npc: npc/009-2/trader.txt
 npc: npc/009-2/waitress.txt
 npc: npc/009-2/wyara.txt
+npc: npc/009-2/yalina.txt
diff --git a/world/map/npc/001-1/bernard.txt b/world/map/npc/009-2/bernard.txt
index 9084f020..307e7591 100644
--- a/world/map/npc/001-1/bernard.txt
+++ b/world/map/npc/009-2/bernard.txt
@@ -1,16 +1,17 @@
 // Variables used: nibble 0 of QUEST_SouthTulimshar
 
-001-1.gat,35,43,0|script|Bernard|117
+009-2.gat,67,79,0|script|Bernard|117
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
     set @state, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
 
-    if(@state >= 4) goto L_Done2;
-    if(@state == 3) goto L_Progress2;
-    if(@state == 2) goto L_Done1;
-    if(@state == 1) goto L_Progress;
+    if (@state >= 6) goto L_Done3;
+    if (@state >= 4) goto L_Done2;
+    if (@state == 3) goto L_Progress2;
+    if (@state == 2) goto L_Done1;
+    if (@state == 1) goto L_Progress;
 
     set @TEMP, rand(2);
     if(@TEMP == 1) goto L_Opening1;
@@ -18,13 +19,15 @@
 
 L_Opening0:
     mes "[Bernard]";
-    mes "\"Tulimshar is crawling with maggots. Hey, I need a favor, could you help me a bit?\"";
+    mes "\"The fields are crawling with maggots. Where is Mikhail? What is taking them so long?";
+    mes "Could I ask a favor of you?\"";
     next;
     goto L_Ask;
 
 L_Opening1:
     mes "[Bernard]";
-    mes "\"The taste of maggots in soup is... unforgettable, they taste simply divine!  Would you help me kill some?\"";
+    mes "\"The taste of maggots in soup is... unforgettable, they taste simply divine!";
+    mes "I sent someone to kill me some maggots and they have yet to return. Would you help me kill some?\"";
     next;
     goto L_Ask;
 
@@ -115,6 +118,12 @@ L_Done2:
     mes "\"Beer is life!\"";
     goto L_Close;
 
+L_Done3:
+    mes "[Bernard]";
+    mes "\"My help, Mikhail, finally returned with the slimes I needed.";
+    mes "I wonder what took him so long?\"";
+    goto L_Close;
+
 L_Close:
     set @TEMP, 0;
     set @state, 0;
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/009-2/entertainer.txt
index 3bc2e141..1b2b9622 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/009-2/entertainer.txt
@@ -1,6 +1,6 @@
 // Emote NPC allows for players to learn the emote skill
 
-001-1.gat,30,43,0|script|Entertainer|165
+009-2.gat,61,49,0|script|Entertainer|165
 {
     mes "[Entertainer]";
     mes "\"Yes how can I help you?\"";
diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index 2c739055..4d248819 100644
--- a/world/map/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
@@ -1,4 +1,5 @@
 // Nicholas' Apprentice and Armorsmith
+009-2.gat,183,57,0|shop|#PeterShop|127,Knife:*50,SharpKnife:*100,Dagger:*1000
 
 009-2.gat,183,57,0|script|Peter|157
 {
@@ -30,6 +31,7 @@
         "Light Plate ("+@peter_light_plate_coal+" coal, "+@peter_light_plate_ingot+" ingots and "+@peter_light_plate_money+" GP).", L_Peter_Light_Plate,
         "Warlord Plate ("+@peter_warlord_plate_coal+" coal, "+@peter_warlord_plate_ingot+" ingots and "+@peter_warlord_plate_money+" GP).", L_Peter_Warlord_Plate,
         "Do you know anything else than armor crafting?", L_Peter_New_Skills,
+        "Do you have anything else for sale?", L_Shop,
         "Nevermind.", L_Close;
 
 L_Peter_Chain_Mail:
@@ -64,6 +66,10 @@ L_Peter_New_Skills:
         "Sure!", L_Peter_Warlord_Boots,
         "No thanks, that sounds too heavy for me.", L_Close;
 
+L_Shop:
+    close2;
+    shop "#PeterShop";
+
 L_Peter_Warlord_Boots:
     set @peter_crafting_coal, @peter_warlord_boots_coal;
     set @peter_crafting_iron_ingot, @peter_warlord_boots_ingot;
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index d0da9413..e400c3ef 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -20,7 +20,7 @@
 
 // Archer Shop
 // sells bow, short bow, arrows and iron arrows
-009-2.gat,97,24,0|shop|Apprentice|120,Arrow:*2,IronArrow:*4,Bow:*1000,ShortBow:*3000
+009-2.gat,97,24,0|shop|Apprentice|120,SlingBullet:*1,Arrow:*2,IronArrow:*4,Bow:*1000,ShortBow:*3000
 
 // Potion Shop
 // sells cactus drink, cactus potion, iron potion, concentration potion, and slow poison potion
diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/009-2/trader.txt
index c4c9fd12..572cad1b 100644
--- a/world/map/npc/001-1/trader.txt
+++ b/world/map/npc/009-2/trader.txt
@@ -3,7 +3,7 @@
 // Updated by: TheKandiman
 // Reviewed by: Wombat
 
-001-1.gat,57,31,0|script|Trader|115
+009-2.gat,39,93,0|script|Trader|115
 {
     set @Ironprice, 1000;
     set @Sulphurprice, 1200;
@@ -11,7 +11,7 @@
     if (BaseLevel >= 25) goto L_Trade;
 
     mes "[Trader]";
-    mes "\"Hello. I came here to trade wares with the people of Tulimshar. Unfortunately for you, I've traded everything I had.\"";
+    mes "\"Hello. I came here to trade wares with the people of Hurnscald. Unfortunately for you, I've traded everything I had.\"";
     next;
     menu
         "Oh. I'll go then.", L_Close,
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index 65c16fc7..f8df574a 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -46,12 +46,14 @@ L_Main:
             "Can you help me use the mana seed?", L_Q_manaseed_unabsorbed,
             "Can you help me learn magic?", L_Magic,
             "I would like to buy potions.", L_Shop,
+            "Can you reset my stats?", L_StatReset,
             "Bye!", L_Close;
     if (!(!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED)))
         menu
             "What do you know about...", L_Question,
             "Can you help me learn magic?", L_Magic,
             "I would like to buy potions.", L_Shop,
+            "Can you reset my stats?", L_StatReset,
             "Bye!", L_Close;
     goto L_Shop;
 
@@ -60,6 +62,11 @@ L_Shop:
     mes "\"Please have a look at the shelf behind me.\"";
     close;
 
+L_StatReset:
+    set @NpcName$, "Wyara";
+    callfunc "StatReset";
+    goto L_Close;
+
 L_Question:
     callfunc "MagicTalkOptionsSetup";
     set @ignore, @QQ_WYARA;
diff --git a/world/map/npc/009-2/yalina.txt b/world/map/npc/009-2/yalina.txt
new file mode 100644
index 00000000..92055b48
--- /dev/null
+++ b/world/map/npc/009-2/yalina.txt
@@ -0,0 +1,11 @@
+009-2.gat,148,47,0|script|Yalina|209
+{
+    set @npcname$, "Yalina";
+
+    mes "[" + @npcname$ + "]";
+    mes "\"Ian knows a lot!  I had so many questions he helped me with!\"";
+    next;
+    mes "\"He rewards those that know what they are doing. When the Nurse stops healing you, check in with Ian.\"";
+    set @npcname$, "";
+    close;
+}
diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index 2ccde6e5..3e0430fd 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -2,8 +2,9 @@
 // Hurnscald Cave mobs
 
 009-3.gat,0,0,0,0|monster|YellowSlime|1007,20,0ms,0ms,Mob009-3::On1007
-009-3.gat,0,0,0,0|monster|BlackScorpion|1009,25,0ms,0ms,Mob009-3::On1009
-009-3.gat,0,0,0,0|monster|RedSlime|1008,35,0ms,0ms,Mob009-3::On1008
+009-3.gat,62,75,125,150|monster|BlackScorpion|1009,25,0ms,0ms,Mob009-3::On1009
+009-3.gat,63,75,126,150|monster|RedSlime|1008,35,0ms,0ms,Mob009-3::On1008
+009-3.gat,145,75,110,151|monster|CaveMaggot|1056,20,100000ms,30000ms,Mob009-3::On1056
 
 
 009-3.gat,0,0,0|script|Mob009-3|-1
@@ -24,4 +25,9 @@ On1009:
     set @mobID, 1009;
     callfunc "MobPoints";
     end;
+
+On1056:
+    set @mobID, 1056;
+    callfunc "MobPoints";
+    end;
 }
diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt
index e209acea..156afe85 100644
--- a/world/map/npc/011-1/_mobs.txt
+++ b/world/map/npc/011-1/_mobs.txt
@@ -13,12 +13,19 @@
 011-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob011-1::On1038
 011-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob011-1::On1055
 011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028
+011-1.gat,1,1,0,0|monster|ManaBug|1131,18,30ms,0ms,Mob011-1::On1131
+011-1.gat,92,44,35,28|monster|Maggot|1002,10,30ms,0ms,Mob011-1::On1002
 
 
 011-1.gat,0,0,0|script|Mob011-1|-1
 {
     end;
 
+On1002:
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    end;
+
 On1013:
     set @mobID, 1013;
     callfunc "MobPoints";
@@ -73,4 +80,9 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
+
+On1131:
+    set @mobID, 1131;
+    callfunc "MobPoints";
+    end;
 }
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index fa887b14..79bac221 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -5,12 +5,20 @@
 011-4.gat,93,114,39,39|monster|CaveSnake|1021,1,100000ms,30000ms,Mob011-4::On1021
 011-4.gat,0,0,0,0|monster|CaveSnake|1021,40,0ms,0ms,Mob011-4::On1021
 011-4.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0ms,0ms,Mob011-4::On1019
+011-4.gat,60,78,56,75|monster|CaveMaggot|1056,10,100000ms,30000ms,Mob011-4::On1056
+011-4.gat,63,21,110,35|monster|CaveMaggot|1056,10,100000ms,30000ms,Mob011-4::On1056
+011-4.gat,0,0,0,0|monster|Bat|1017,20,180000ms,40000ms,Mob011-4::On1017
 
 
 011-4.gat,0,0,0|script|Mob011-4|-1
 {
     end;
 
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
 On1019:
     set @mobID, 1019;
     callfunc "MobPoints";
@@ -20,4 +28,9 @@ On1021:
     set @mobID, 1021;
     callfunc "MobPoints";
     end;
+
+On1056:
+    set @mobID, 1056;
+    callfunc "MobPoints";
+    end;
 }
diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt
index 37014a76..20ce05c1 100644
--- a/world/map/npc/013-2/notes.txt
+++ b/world/map/npc/013-2/notes.txt
@@ -72,6 +72,19 @@ L_Close:
     next;
     mes "You feel the floor disappear below your feet...";
     next;
+    if (QUEST_MIRIAM_start != 0)
+        goto L_cheat;
+    goto L_Warp;
+
+// If you try to use the notes to warp to pachua the quest will fail.
+L_cheat:
+    set QUEST_MIRIAM_cheat, 1;
+    set QUEST_MIRIAM_run, gettimetick(2) - QUEST_MIRIAM_start;
+    set QUEST_MIRIAM_start, 0;
+    message strcharinfo(0), "You were supposed to actually run to this place. You are not sure if this is going to work for Miriam...";
+    goto L_Warp;
+
+L_Warp:
     set @dest, rand(BaseLevel);
     if (@dest < 10)
         goto L_PlaceOne;
@@ -80,24 +93,15 @@ L_Close:
     goto L_PlaceThree;
 
 L_PlaceOne:
-    warp "006-1.gat",125,111;
+    warp "006-1.gat",83,60;
     goto L_Close;
 
 L_PlaceTwo:
-    warp "032-1.gat",77,22;
+    warp "006-1.gat",77,22;
     goto L_Close;
 
 L_PlaceThree:
     warp "006-1.gat",33,93;
-    if (QUEST_MIRIAM_start != 0) goto L_cheat;
-    goto L_Close;
-
-// If you try to use the notes to warp to pachua the quest will fail.
-L_cheat:
-    set QUEST_MIRIAM_cheat, 1;
-    set QUEST_MIRIAM_run, gettimetick(2) - QUEST_MIRIAM_start;
-    set QUEST_MIRIAM_start, 0;
-    message strcharinfo(0), "You were supposed to actually run to this place. You are not sure if this is going to work for Miriam...";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/017-9/_warps.txt b/world/map/npc/017-9/_warps.txt
index 1a89c0b0..03859972 100644
--- a/world/map/npc/017-9/_warps.txt
+++ b/world/map/npc/017-9/_warps.txt
@@ -3,6 +3,6 @@
 
 017-9.gat,22,20|warp|To Nivalis|-1,-1,020-1.gat,60,75
 017-9.gat,26,21|warp|To Hurnscald|-1,-1,009-1.gat,43,45
-017-9.gat,30,20|warp|To Tumlishar|-1,-1,001-1.gat,33,65
+017-9.gat,30,20|warp|To Tumlishar|-1,-1,001-1.gat,55,118
 017-9.gat,26,28|warp|To second warpzone|-1,-1,017-2.gat,26,23
 017-9.gat,31,28|warp|To Crypt|-1,-1,027-2.gat,118,109
diff --git a/world/map/npc/017-9/secret.txt b/world/map/npc/017-9/secret.txt
index 050773a6..49261537 100644
--- a/world/map/npc/017-9/secret.txt
+++ b/world/map/npc/017-9/secret.txt
@@ -18,7 +18,7 @@ L_close:
     close;
 }
 
-001-1.gat,32,65,0|script|#SecretDoor3|127,0,0
+001-1.gat,54,118,0|script|#SecretDoor3|127,0,0
 {
     if (getgmlevel() < 40 && !debug) goto L_close;
     warp "017-9.gat", 30, 22;
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index d2aa5d7d..3536b5b6 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -2,7 +2,7 @@
 // Woodland Mining Camp mobs
 
 018-1.gat,136,79,9,41|monster|SeaSlime|1033,10,100000ms,30000ms,Mob018-1::On1033
-018-1.gat,108,87,53,25|monster|LogHead|1025,10,100000ms,30000ms,Mob018-1::On1025
+018-1.gat,108,87,53,25|monster|ManaBug|1131,10,100000ms,30000ms,Mob018-1::On1131
 018-1.gat,116,44,6,7|monster|SeaSlime|1033,3,100000ms,30000ms,Mob018-1::On1033
 018-1.gat,119,56,13,6|monster|PinkFlower|1014,2,100000ms,30000ms,Mob018-1::On1014
 018-1.gat,175,28,17,19|monster|JackO|1022,1,180000ms,120000ms,Mob018-1::On1022
@@ -27,12 +27,18 @@
 018-1.gat,160,31,11,18|monster|RedSlime|1008,5,100000ms,50000ms,Mob018-1::On1008
 018-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob018-1::On1037
 018-1.gat,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob018-1::On1055
+018-1.gat,134,80,14,39|monster|Maggot|1002,15,30ms,0ms,Mob018-1::On1002
 
 
 018-1.gat,0,0,0|script|Mob018-1|-1
 {
     end;
 
+On1002:
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    end;
+
 On1007:
     set @mobID, 1007;
     callfunc "MobPoints";
@@ -58,11 +64,6 @@ On1022:
     callfunc "MobPoints";
     end;
 
-On1025:
-    set @mobID, 1025;
-    callfunc "MobPoints";
-    end;
-
 On1030:
     set @mobID, 1030;
     callfunc "MobPoints";
@@ -92,4 +93,9 @@ On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
     end;
+
+On1131:
+    set @mobID, 1131;
+    callfunc "MobPoints";
+    end;
 }
diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index e80abda4..64b7c42d 100644
--- a/world/map/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
@@ -7,25 +7,23 @@
 018-3.gat,28,157,3,2|monster|PinkFlower|1014,1,60000ms,30000ms,Mob018-3::On1014
 018-3.gat,99,111,17,41|monster|YellowSlime|1007,10,90000ms,30000ms,Mob018-3::On1007
 018-3.gat,134,140,12,8|monster|Maggot|1002,3,80000ms,40000ms,Mob018-3::On1002
-018-3.gat,132,137,15,25|monster|Spider|1012,8,300000ms,120000ms,Mob018-3::On1012
+018-3.gat,82,149,73,26|monster|Spider|1012,8,300000ms,120000ms,Mob018-3::On1012
 018-3.gat,102,172,131,13|monster|BlackScorpion|1009,20,60000ms,10000ms,Mob018-3::On1009
 018-3.gat,174,37,10,31|monster|YellowSlime|1007,5,180000ms,120000ms,Mob018-3::On1007
-018-3.gat,87,153,78,22|monster|Snake|1010,10,60000ms,10000ms,Mob018-3::On1010
 018-3.gat,148,148,13,24|monster|Bat|1017,3,180000ms,40000ms,Mob018-3::On1017
-018-3.gat,153,97,18,22|monster|YellowSlime|1007,6,80000ms,40000ms,Mob018-3::On1007
+018-3.gat,136,87,21,7|monster|YellowSlime|1007,6,80000ms,40000ms,Mob018-3::On1007
 018-3.gat,81,77,27,21|monster|RedSlime|1008,15,80000ms,40000ms,Mob018-3::On1008
 018-3.gat,111,80,5,6|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob018-3::On1009
 018-3.gat,175,122,5,40|monster|Snake|1010,15,40000ms,20000ms,Mob018-3::On1010
-018-3.gat,98,75,1,2|monster|FireSkull|1023,1,120000ms,30000ms,Mob018-3::On1023
-018-3.gat,100,75,1,2|monster|PoisonSkull|1024,1,120000ms,30000ms,Mob018-3::On1024
-018-3.gat,171,95,15,19|monster|BlackScorpion|1009,5,60000ms,30000ms,Mob018-3::On1009
-018-3.gat,134,87,17,7|monster|RedSlime|1008,10,60000ms,30000ms,Mob018-3::On1008
+018-3.gat,172,94,17,17|monster|RedSlime|1008,10,60000ms,30000ms,Mob018-3::On1008
 018-3.gat,59,95,11,8|monster|Spider|1012,15,60000ms,30000ms,Mob018-3::On1012
 018-3.gat,77,92,23,7|monster|BlackScorpion|1009,15,60000ms,30000ms,Mob018-3::On1009
 018-3.gat,94,55,16,8|monster|Snake|1010,5,60000ms,30000ms,Mob018-3::On1010
 018-3.gat,133,39,12,17|monster|Spider|1012,10,60000ms,30000ms,Mob018-3::On1012
 018-3.gat,111,33,30,16|monster|Snake|1010,15,60000ms,30000ms,Mob018-3::On1010
-018-3.gat,68,101,5,4|monster|Snake|1010,4,60000ms,30000ms,Mob018-3::On1010
+018-3.gat,68,101,5,4|monster|CaveSnake|1021,4,60000ms,30000ms,Mob018-3::On1021
+018-3.gat,153,96,18,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob018-3::On1056
+018-3.gat,99,99,17,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob018-3::On1056
 
 
 018-3.gat,0,0,0|script|Mob018-3|-1
@@ -77,13 +75,13 @@ On1017:
     callfunc "MobPoints";
     end;
 
-On1023:
-    set @mobID, 1023;
+On1021:
+    set @mobID, 1021;
     callfunc "MobPoints";
     end;
 
-On1024:
-    set @mobID, 1024;
+On1056:
+    set @mobID, 1056;
     callfunc "MobPoints";
     end;
 }
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
deleted file mode 100644
index 9a1b1507..00000000
--- a/world/map/npc/021-1/_import.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map 021-1: North Tulimshar
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 021-1.gat
-npc: npc/021-1/_mobs.txt
-npc: npc/021-1/_warps.txt
-npc: npc/021-1/bakery.txt
-npc: npc/021-1/banu.txt
-npc: npc/021-1/eurni.txt
-npc: npc/021-1/gate_guards.txt
-npc: npc/021-1/hideandseek.txt
-npc: npc/021-1/imec.txt
-npc: npc/021-1/inac.txt
-npc: npc/021-1/mapflags.txt
-npc: npc/021-1/north_shops.txt
-npc: npc/021-1/npcs.txt
-npc: npc/021-1/pauline.txt
-npc: npc/021-1/sewer_east.txt
-npc: npc/021-1/sewer_north.txt
-npc: npc/021-1/sewer_west.txt
-npc: npc/021-1/weellos.txt
diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt
deleted file mode 100644
index 285a62e1..00000000
--- a/world/map/npc/021-1/_mobs.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// North Tulimshar mobs
-
-021-1.gat,126,86,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
-021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
-021-1.gat,95,124,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
-021-1.gat,103,53,6,2|monster|Maggot|1002,5,100000ms,30000ms,Mob021-1::On1002
-021-1.gat,98,24,2,2|monster|SeaSlime|1033,1,150000ms,100000ms,Mob021-1::On1033
-
-
-021-1.gat,0,0,0|script|Mob021-1|-1
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
deleted file mode 100644
index daa1a89d..00000000
--- a/world/map/npc/021-1/_warps.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// North Tulimshar warps
-
-021-1.gat,128,119|warp|To Tulimshar Musuem|0,-1,021-2.gat,71,177
-021-1.gat,144,22|warp|To Tulimshar Noble|3,-1,068-1.gat,34,105
-021-1.gat,157,44|warp|To Tulimshar Castle|-1,0,069-1.gat,21,44
-021-1.gat,157,97|warp|To Tulimshar Castle|-1,0,069-1.gat,21,97
-021-1.gat,135,119|warp|To Tulimshar Musuem|-1,-1,021-2.gat,90,177
-021-1.gat,55,146|warp|To South Tulimshar|3,-1,001-1.gat,44,21
-021-1.gat,136,147|warp|To South Tulimshar|0,-1,001-1.gat,125,22
-021-1.gat,53,133|warp|To Government Building|-1,-1,021-2.gat,27,29
-021-1.gat,55,133|warp|To Government Building|-1,-1,021-2.gat,33,29
-021-1.gat,57,133|warp|To Government Building|-1,-1,021-2.gat,39,29
-021-1.gat,103,99|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27
-021-1.gat,103,96|warp|To Bakery|-1,-1,021-2.gat,122,23
-021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73
-021-1.gat,53,98|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66
-021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,70,63
-021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109
-021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109
-021-1.gat,132,30|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138
-021-1.gat,133,24|warp|To Tulimshar Forge|-1,-1,021-2.gat,75,92
-021-1.gat,125,27|warp|To Tulimshar Forge|-1,-1,021-2.gat,124,68
-021-1.gat,125,30|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138
-021-1.gat,43,109|warp|To Store|-1,-1,021-2.gat,28,129
diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
deleted file mode 100644
index 20dc49d5..00000000
--- a/world/map/npc/021-1/bakery.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Outside the bakery
-
-021-1.gat,103,103,0|shop|Ara|163,WhiteCake:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,CherryCake:*100
-
-021-1.gat,108,102,0|script|Itka|114
-{
-    mes "[Itka]";
-    mes "\"This bakery is the best!\"";
-    close;
-
-OnTimer300000:
-    npctalk "Come to the bakery!";
-    setnpctimer 0;
-    end;
-
-OnInit:
-    if (debug >= 2) end;
-    initnpctimer;
-    end;
-}
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
deleted file mode 100644
index 752718e8..00000000
--- a/world/map/npc/021-1/gate_guards.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-// Various guards at gates
-
-// Guards by the gates to the port
-021-1.gat,70,23,0|script|Guard#port1|104
-{
-    mes "[Guard]";
-    mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
-    close;
-}
-
-021-1.gat,110,23,0|script|Guard#port2|104
-{
-    mes "[Guard]";
-    mes "\"You wouldn't believe the refuse that comes in from the docks.\"";
-    close;
-}
-
-// Guard near the magic school
-021-1.gat,46,65,0|script|Guard#school|104
-{
-    mes "[Guard]";
-    mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
-    close;
-}
-
-// Guards by the gates to East Tulimshar
-021-1.gat,146,23,0|script|Guard#east1|104
-{
-    mes "[Guard]";
-    mes "\"I make sure less desirables don't enter the Noble District.\"";
-    close;
-}
-021-1.gat,156,42,0|script|Guard#east2|104
-{
-    mes "[Guard]";
-    mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
-    close;
-}
-
-021-1.gat,156,95,0|script|Guard#east3|104
-{
-    mes "[Guard]";
-    mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\"";
-    close;
-}
-
-// Near the bazaar, outside the government building
-021-1.gat,55,136,0|script|Guard#govt_out|123
-{
-    mes "[Guard]";
-    mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
-    close;
-}
diff --git a/world/map/npc/021-1/mapflags.txt b/world/map/npc/021-1/mapflags.txt
deleted file mode 100644
index ffa56dfe..00000000
--- a/world/map/npc/021-1/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-021-1.gat|mapflag|town
-021-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
deleted file mode 100644
index 3211b2b8..00000000
--- a/world/map/npc/021-1/north_shops.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Northern shopping plaza
-
-// More high-end stuff to satisfy the richer people in Royal Tulimshar
-
-// Some clothing
-021-1.gat,135,36,0|shop|Inar|108,CottonShirt:*300,CottonShorts:*1000,CottonBoots:*2000,CottonHeadband:*3000
-
-021-1.gat,129,40,0|script|Well|400
-{
-    callfunc "WaterBottle";
-    end;
-}
-
-// An officer (for security)
-021-1.gat,128,37,0|script|Officer|150
-{
-    mes "[Officer]";
-    mes "I'm here for extra security for this market.";
-    close;
-}
diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt
deleted file mode 100644
index 50d18a6a..00000000
--- a/world/map/npc/021-1/npcs.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-
-021-1.gat,77,42,0|script|Jeric|214
-{
-    set @npcname$, "Jeric";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"My father is an adventurer.\"";
-    next;
-    mes "\"After he proved himself around town, the guards let him fight monsters in the Sandstorm mine.\"";
-    set @npcname$, "";
-    close;
-}
-
-021-1.gat,76,67,0|script|Silvia|207
-{
-    set @npcname$, "Silvia";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"If you follow the road west, then south, you will arrive at the Bazaar in Southern Tulimshar.\"";
-    next;
-    mes "\"If you go west, then north, you'll see the Wizard Academy my parents just sent me to.\"";
-    next;
-    mes "\"The Academy is good, but I wish I had more free time. It takes a lot of intelligence to get what the teachers are talking about.\"";
-    set @npcname$, "";
-    close;
-}
-
-021-1.gat,51,123,0|script|Michel|215
-{
-    set @npcname$, "Michel";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"Elanore is a magician in Southern Tulimshar that helps young adventurers by healing their battle wounds. When they are experienced enough, she stops healing them.\"";
-    next;
-    mes "\"You can find her by going through the Bazaar and to the East.\"";
-    set @npcname$, "";
-    close;
-}
diff --git a/world/map/npc/021-1/sewer_west.txt b/world/map/npc/021-1/sewer_west.txt
deleted file mode 100644
index b629c342..00000000
--- a/world/map/npc/021-1/sewer_west.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// The Sewer Grate
-
-021-1.gat,52,104,0|script|#tulimsharsewer3|45,0,0
-{
-    mes "Descend into the sewers?";
-    next;
-    menu
-        "Yes.", L_Sewer,
-        "Nevermind.", L_Close;
-
-L_Sewer:
-    warp "021-3",57,101;
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt
deleted file mode 100644
index 67974f1a..00000000
--- a/world/map/npc/021-2/_import.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// Map 021-2: North Tulimshar Indoor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 021-2.gat
-npc: npc/021-2/_mobs.txt
-npc: npc/021-2/_warps.txt
-npc: npc/021-2/bakery.txt
-npc: npc/021-2/barber.txt
-npc: npc/021-2/forge_shops.txt
-npc: npc/021-2/government_building.txt
-npc: npc/021-2/heathin.txt
-npc: npc/021-2/jhedia.txt
-npc: npc/021-2/kps.txt
-npc: npc/021-2/kylian.txt
-npc: npc/021-2/manakins.txt
-npc: npc/021-2/mapflags.txt
-npc: npc/021-2/rebecca.txt
-npc: npc/021-2/yanis.txt
diff --git a/world/map/npc/021-2/_mobs.txt b/world/map/npc/021-2/_mobs.txt
deleted file mode 100644
index 6feaf1ea..00000000
--- a/world/map/npc/021-2/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// North Tulimshar Indoor mobs
-
-
-
-021-2.gat,0,0,0|script|Mob021-2|-1
-{
-    end;
-}
diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt
deleted file mode 100644
index 9eb18a2a..00000000
--- a/world/map/npc/021-2/_warps.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// North Tulimshar Indoor warps
-
-021-2.gat,46,97|warp|To Lobby|0,-1,021-2.gat,44,55
-021-2.gat,46,155|warp|To Second Floor|0,-1,021-2.gat,92,62
-021-2.gat,92,64|warp|To Suites|0,-1,021-2.gat,46,158
-021-2.gat,44,53|warp|To Common Beds|0,-1,021-2.gat,46,96
-021-2.gat,46,179|warp|To Common Beds|0,-1,021-2.gat,46,91
-021-2.gat,46,90|warp|To Suites|0,-1,021-2.gat,46,178
-021-2.gat,71,179|warp|To Outside|0,-1,021-1.gat,128,121
-021-2.gat,90,179|warp|To Outside|-1,-1,021-1.gat,135,121
-021-2.gat,27,30|warp|To Outside|-1,-1,021-1.gat,53,135
-021-2.gat,39,30|warp|To Outside|-1,-1,021-1.gat,57,135
-021-2.gat,91,28|warp|To Outside|-1,-1,021-1.gat,103,101
-021-2.gat,122,24|warp|To Roof|-1,-1,021-1.gat,103,97
-021-2.gat,118,24|warp|To First Floor|0,-1,021-2.gat,79,23
-021-2.gat,80,22|warp|To Second Floor|0,-1,021-2.gat,117,23
-021-2.gat,70,64|warp|To Roof|-1,-1,021-1.gat,52,96
-021-2.gat,25,67|warp|To Outside|-1,-1,021-1.gat,53,100
-021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58
-021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
-021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
-021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125
-021-2.gat,84,123|warp|To Second Floor|-1,0,021-2.gat,81,95
-021-2.gat,79,139|warp|To Outside|-1,-1,021-1.gat,132,32
-021-2.gat,72,139|warp|To Outside|-1,-1,021-1.gat,125,32
-021-2.gat,124,69|warp|To Outside|-1,-1,021-1.gat,125,28
-021-2.gat,75,93|warp|To Outside|-1,-1,021-1.gat,133,25
-021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135
diff --git a/world/map/npc/021-2/forge_shops.txt b/world/map/npc/021-2/forge_shops.txt
deleted file mode 100644
index 4e30fe50..00000000
--- a/world/map/npc/021-2/forge_shops.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// Forge Shops
-
-021-2.gat,77,134,0|shop|Gungnir|311,SlingShot:*500,SlingBullet:*1,ShortBow:*8000,Arrow:*1,IronArrow:*4
-021-2.gat,71,133,0|shop|Mjolnir|377,Knife:*50,SharpKnife:*100,Dagger:*1000,LeatherShirt:*2000,LeatherShield:*2000
diff --git a/world/map/npc/021-2/mapflags.txt b/world/map/npc/021-2/mapflags.txt
deleted file mode 100644
index d3dd0e16..00000000
--- a/world/map/npc/021-2/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-021-2.gat|mapflag|town
-021-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/021-2/rebecca.txt b/world/map/npc/021-2/rebecca.txt
deleted file mode 100644
index 37df8d65..00000000
--- a/world/map/npc/021-2/rebecca.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-
-021-2.gat,26,54,0|script|Rebecca|118
-{
-    set @npcname$, "Rebecca the Inn Keeper";
-    set @cost, 100;
-    callfunc "Inn";
-    set @npcname$, "";
-    set @cost, 0;
-    close;
-}
diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt
index 78b2ad47..d4d62bef 100644
--- a/world/map/npc/021-3/_mobs.txt
+++ b/world/map/npc/021-3/_mobs.txt
@@ -7,21 +7,23 @@
 021-3.gat,129,82,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
 021-3.gat,140,38,16,8|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob021-3::On1108
 021-3.gat,79,98,33,31|monster|BlackScorpion|1009,4,100000ms,1800000ms,Mob021-3::On1009
-021-3.gat,52,53,2,17|monster|Snake|1010,2,40000ms,50000ms,Mob021-3::On1010
+021-3.gat,52,53,2,17|monster|GreenSlime|1005,4,40000ms,50000ms,Mob021-3::On1005
 021-3.gat,93,31,28,22|monster|SeaSlime|1033,6,100000ms,30000ms,Mob021-3::On1033
+021-3.gat,121,128,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
+021-3.gat,47,139,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
 
 
 021-3.gat,0,0,0|script|Mob021-3|-1
 {
     end;
 
-On1009:
-    set @mobID, 1009;
+On1005:
+    set @mobID, 1005;
     callfunc "MobPoints";
     end;
 
-On1010:
-    set @mobID, 1010;
+On1009:
+    set @mobID, 1009;
     callfunc "MobPoints";
     end;
 
diff --git a/world/map/npc/021-3/_warps.txt b/world/map/npc/021-3/_warps.txt
index 192f6c95..1abe90e3 100644
--- a/world/map/npc/021-3/_warps.txt
+++ b/world/map/npc/021-3/_warps.txt
@@ -1,6 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Central Tulimshar Sewers warps
 
-021-3.gat,143,127|warp|To Central Tulimshar|-1,-1,021-1.gat,147,137
-021-3.gat,125,33|warp|To Central Tulimshar|-1,-1,021-1.gat,124,39
-021-3.gat,57,99|warp|To Central Tulimshar|-1,-1,021-1.gat,50,105
+021-3.gat,143,127|warp|To Central Tulimshar|-1,-1,001-1.gat,117,109
+021-3.gat,57,99|warp|To Central Tulimshar|-1,-1,001-1.gat,60,84
+021-3.gat,29,62|warp|To Beach|-1,-1,001-1.gat,28,45
+021-3.gat,44,143|warp|To Sea Cave|-1,-1,004-3.gat,80,23
diff --git a/world/map/npc/021-3/mapflags.txt b/world/map/npc/021-3/mapflags.txt
index d02af5d8..07afc1c8 100644
--- a/world/map/npc/021-3/mapflags.txt
+++ b/world/map/npc/021-3/mapflags.txt
@@ -1 +1 @@
-021-3.gat|mapflag|resave|001-1,57,71
+021-3.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/022-1/_import.txt b/world/map/npc/022-1/_import.txt
deleted file mode 100644
index 543a85c0..00000000
--- a/world/map/npc/022-1/_import.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Map 022-1: Tulimshar Port
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 022-1.gat
-npc: npc/022-1/_mobs.txt
-npc: npc/022-1/_warps.txt
-npc: npc/022-1/adrian.txt
-npc: npc/022-1/anwar.txt
-npc: npc/022-1/dock.txt
-npc: npc/022-1/ferry_master.txt
-npc: npc/022-1/mapflags.txt
-npc: npc/022-1/npcs.txt
diff --git a/world/map/npc/022-1/_mobs.txt b/world/map/npc/022-1/_mobs.txt
deleted file mode 100644
index 51ade3ee..00000000
--- a/world/map/npc/022-1/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Port mobs
-
-
-
-022-1.gat,0,0,0|script|Mob022-1|-1
-{
-    end;
-}
diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
deleted file mode 100644
index f5f26146..00000000
--- a/world/map/npc/022-1/_warps.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Port warps
-
-022-1.gat,19,38|warp|To Tulismhar Suburbs|-1,2,042-1.gat,96,40
-022-1.gat,30,20|warp|To Lighthouse Beach|0,-1,023-1.gat,107,146
-022-1.gat,73,110|warp|To North Tulimshar|3,-1,021-1.gat,73,23
-022-1.gat,113,110|warp|To North Tulimshar|3,-1,021-1.gat,113,23
-022-1.gat,40,82|warp|To Tulimshar Suburbs|-1,-1,042-1.gat,116,85
diff --git a/world/map/npc/022-1/dock.txt b/world/map/npc/022-1/dock.txt
deleted file mode 100644
index 8da5b8aa..00000000
--- a/world/map/npc/022-1/dock.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-// The ferry dock
-// Author: Wushin
-
-// Ferry Sign
-022-1.gat,62,36,0|script|Ferry Schedule#2|396
-{
-    callfunc "FerryManifest";
-    end;
-}
-
-022-1.gat,65,71,0|script|Ferry Schedule#3|396
-{
-    callfunc "FerryManifest";
-    end;
-}
-
-022-1.gat,85,71,0|script|Tulimshar South Koga|395,6,2
-{
-    callfunc "BoardFerry";
-    close;
-}
-
-022-1.gat,80,62,0|script|#Tulimshar SouthDock|127
-{
-    end;
-OnCommandArrive:
-    enablenpc "Tulimshar South Koga";
-    end;
-
-OnCommandWarp:
-    disablenpc "Tulimshar South Koga";
-    end;
-}
-
-022-1.gat,60,24,0|script|Tulimshar North Koga|395,4,4
-{
-    callfunc "BoardCandorFerry";
-    close;
-}
-
-022-1.gat,65,25,0|script|#Tulimshar NorthDock|127
-{
-    end;
-OnCommandArrive:
-    enablenpc "Tulimshar North Koga";
-    end;
-
-OnCommandWarp:
-    disablenpc "Tulimshar North Koga";
-    end;
-}
diff --git a/world/map/npc/022-1/ferry_master.txt b/world/map/npc/022-1/ferry_master.txt
deleted file mode 100644
index d9594bcd..00000000
--- a/world/map/npc/022-1/ferry_master.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-
-022-1.gat,71,71,0|script|Ferry Master|138
-{
-    mes "[Ferry Master]";
-    mes "\"Hello! Do you need something?\"";
-    goto L_Main;
-
-L_Main:
-    menu
-        "How do I use the ferry?", L_Explain,
-        "Nothing I guess", L_Close;
-
-L_Explain:
-    mes "[Ferry Master]";
-    mes "\"You wait on the dock for the ship to come in. You'll be given a chance to board the boat when it comes into port.\"";
-    mes "\"It lingers in port to allow you some time to board in case you are running behind.\"";
-    mes "\"Once on the ship, it will sail to different ports and annouce where it is docking.\"";
-    next;
-    mes "\"There are 2 Ferrys, both ferrys are free to ride.\"";
-    mes "\"The Main ferry travels from Argeas, Kaizei and Tonori. It docks in the major ports Hurnscald, Nivalis and the Tulimshar South Dock.\"";
-    mes "\"The Candor Ferry only travels betwen Candor and the Tulimshar North Dock.\"";
-    next;
-    mes "\"Refreshments and supplies are offered aboard both ships during the voyage.\"";
-    mes "\"We also have some slot machines in case you get bored.\"";
-    goto L_Main;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/022-1/mapflags.txt b/world/map/npc/022-1/mapflags.txt
deleted file mode 100644
index 1977e88c..00000000
--- a/world/map/npc/022-1/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-022-1.gat|mapflag|town
-022-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/022-1/npcs.txt b/world/map/npc/022-1/npcs.txt
deleted file mode 100644
index b94f790e..00000000
--- a/world/map/npc/022-1/npcs.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-
-022-1.gat,35,36,0|script|Marikel|211
-{
-    set @npcname$, "Marikel";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"Working on the docks can be hard nowadays.\"";
-    next;
-    mes "\"At least it pays well.\"";
-    menu
-        "Why does it pay well?",L_Marikel_1,
-        "Pfft! Working on the docks is for the birds.",L_Marikel_2;
-
-L_Marikel_1:
-    mes "[" + @npcname$ + "]";
-    mes "\"Tulimshar is the wealthiest and most powerful city in the world!\"";
-    close;
-
-L_Marikel_2:
-    mes "[" + @npcname$ + "]";
-    mes "\"Yeah, killing monsters may pay well, but I'd need more hazard pay than a tower mason to hunt monsters.\"";
-    next;
-    mes "\"I'll just play safe and stick to putting our stock away. Be careful, the monsters outside the city can be dangerous.\"";
-    next;
-    mes "\"The Sandstorm mine, just South of Tulimshar, is blocked from most but miners, soldiers and seasoned monster slayers.\"";
-    close;
-}
-
-022-1.gat,65,46,0|script|Joelin|212
-{
-    set @npcname$, "Joelin";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"My ship's to set sail soon. We'll tour around the Acean Isles, then back around to Argaes, then here in Tonori.\"";
-    next;
-    mes "\"Tulimshar's Fleets also are sending exploration teams to build a dock in Nivalis on Kaizei, which I'm not really hoping for. It's cold up there!\"";
-    close;
-}
-
-022-1.gat,67,46,0|script|Harper|213
-{
-    set @npcname$, "Harper";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"My captain knows an awlful lot about the world's continents.\"";
-    close;
-}
-
-022-1.gat,75,99,0|script|Swezanne|206
-{
-    set @npcname$, "Swezanne";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"Just through those gates is Northern Tulimshar. In Southern Tulimshar I go to the Bazaar and talk with Aidan about monster points.\"";
-    close;
-}
diff --git a/world/map/npc/023-1/_import.txt b/world/map/npc/023-1/_import.txt
deleted file mode 100644
index b850d7ea..00000000
--- a/world/map/npc/023-1/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 023-1: Tulimshar Lighthouse Beach
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 023-1.gat
-npc: npc/023-1/_mobs.txt
-npc: npc/023-1/_warps.txt
-npc: npc/023-1/mapflags.txt
diff --git a/world/map/npc/023-1/_mobs.txt b/world/map/npc/023-1/_mobs.txt
deleted file mode 100644
index c892d844..00000000
--- a/world/map/npc/023-1/_mobs.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Lighthouse Beach mobs
-
-023-1.gat,70,41,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119
-023-1.gat,84,33,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-1::On1120
-023-1.gat,58,28,6,6|monster|Grenadier|1121,1,100000ms,30000ms,Mob023-1::On1121
-023-1.gat,80,99,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-1::On1120
-023-1.gat,86,117,19,2|monster|Grenadier|1121,1,100000ms,30000ms,Mob023-1::On1121
-023-1.gat,55,126,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119
-023-1.gat,47,86,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119
-023-1.gat,102,67,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-1::On1120
-023-1.gat,105,90,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119
-023-1.gat,62,60,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-1::On1119
-023-1.gat,93,49,13,11|monster|Grenadier|1121,1,100000ms,30000ms,Mob023-1::On1121
-023-1.gat,64,95,1,46|monster|AngrySeaSlime|1109,3,150000ms,100000ms,Mob023-1::On1109
-023-1.gat,45,54,5,38|monster|AngrySeaSlime|1109,3,150000ms,100000ms,Mob023-1::On1109
-
-
-023-1.gat,0,0,0|script|Mob023-1|-1
-{
-    end;
-
-On1109:
-    set @mobID, 1109;
-    callfunc "MobPoints";
-    end;
-
-On1119:
-    set @mobID, 1119;
-    callfunc "MobPoints";
-    end;
-
-On1120:
-    set @mobID, 1120;
-    callfunc "MobPoints";
-    end;
-
-On1121:
-    set @mobID, 1121;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/023-1/_warps.txt b/world/map/npc/023-1/_warps.txt
deleted file mode 100644
index 6d04f18e..00000000
--- a/world/map/npc/023-1/_warps.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Lighthouse Beach warps
-
-023-1.gat,108,148|warp|To Tulismhar Docks|0,-1,022-1.gat,30,22
-023-1.gat,65,146|warp|To Tulismhar Suburbs|0,-1,042-1.gat,65,24
-023-1.gat,75,134|warp|To Lighthouse Caves|-1,-1,023-3.gat,75,132
-023-1.gat,71,117|warp|To Lighthouse Caves|-1,-1,023-3.gat,71,114
-023-1.gat,83,114|warp|To Lighthouse Caves|-1,-1,023-3.gat,83,112
-023-1.gat,107,120|warp|To Lighthouse Caves|-1,-1,023-3.gat,106,118
-023-1.gat,105,114|warp|To Lighthouse Caves|-1,-1,023-3.gat,106,115
-023-1.gat,70,95|warp|To Lighthouse Caves|-1,-1,023-3.gat,70,93
-023-1.gat,48,80|warp|To Lighthouse Caves|-1,-1,023-3.gat,48,78
-023-1.gat,61,36|warp|To Lighthouse Caves|-1,-1,023-3.gat,61,39
-023-1.gat,36,34|warp|To Lighthouse |-1,-1,023-2.gat,31,38
-023-1.gat,37,23|warp|To Lighthouse |-1,-1,023-2.gat,31,33
-023-1.gat,66,101|warp|To Other Side Of Bridge|-1,2,023-1.gat,61,100
-023-1.gat,62,101|warp|To Other Side Of Bridge|-1,2,023-1.gat,67,100
diff --git a/world/map/npc/023-1/mapflags.txt b/world/map/npc/023-1/mapflags.txt
deleted file mode 100644
index 0db48b57..00000000
--- a/world/map/npc/023-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-023-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/023-2/_import.txt b/world/map/npc/023-2/_import.txt
deleted file mode 100644
index ceb63a25..00000000
--- a/world/map/npc/023-2/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 023-2: Lighthouse
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 023-2.gat
-npc: npc/023-2/_mobs.txt
-npc: npc/023-2/_warps.txt
-npc: npc/023-2/mapflags.txt
diff --git a/world/map/npc/023-2/_mobs.txt b/world/map/npc/023-2/_mobs.txt
deleted file mode 100644
index 89768e20..00000000
--- a/world/map/npc/023-2/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Lighthouse mobs
-
-
-
-023-2.gat,0,0,0|script|Mob023-2|-1
-{
-    end;
-}
diff --git a/world/map/npc/023-2/_warps.txt b/world/map/npc/023-2/_warps.txt
deleted file mode 100644
index 1c25c857..00000000
--- a/world/map/npc/023-2/_warps.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Lighthouse warps
-
-023-2.gat,31,40|warp|To Lighthouse Beach|-1,-1,023-1.gat,36,35
-023-2.gat,31,31|warp|To Lighthouse Beach|-1,-1,023-1.gat,36,23
diff --git a/world/map/npc/023-2/mapflags.txt b/world/map/npc/023-2/mapflags.txt
deleted file mode 100644
index 84596948..00000000
--- a/world/map/npc/023-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-023-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/023-3/_import.txt b/world/map/npc/023-3/_import.txt
deleted file mode 100644
index b9b116f0..00000000
--- a/world/map/npc/023-3/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 023-3: Tulimshar Beach Caves
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 023-3.gat
-npc: npc/023-3/_mobs.txt
-npc: npc/023-3/_warps.txt
-npc: npc/023-3/mapflags.txt
diff --git a/world/map/npc/023-3/_mobs.txt b/world/map/npc/023-3/_mobs.txt
deleted file mode 100644
index 26b0f4f8..00000000
--- a/world/map/npc/023-3/_mobs.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Beach Caves mobs
-
-023-3.gat,91,77,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-3::On1119
-023-3.gat,127,85,7,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-3::On1120
-023-3.gat,98,28,7,7|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-3::On1120
-023-3.gat,120,45,7,7|monster|Thug|1119,1,100000ms,30000ms,Mob023-3::On1119
-023-3.gat,51,107,12,5|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob023-3::On1120
-023-3.gat,69,52,66,8|monster|Thug|1119,1,100000ms,30000ms,Mob023-3::On1119
-
-
-023-3.gat,0,0,0|script|Mob023-3|-1
-{
-    end;
-
-On1119:
-    set @mobID, 1119;
-    callfunc "MobPoints";
-    end;
-
-On1120:
-    set @mobID, 1120;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/023-3/_warps.txt b/world/map/npc/023-3/_warps.txt
deleted file mode 100644
index 3c95fb55..00000000
--- a/world/map/npc/023-3/_warps.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Beach Caves warps
-
-023-3.gat,75,134|warp|To Lighthouse Beach|-1,-1,023-1.gat,75,136
-023-3.gat,71,117|warp|To Lighthouse Beach|-1,-1,023-1.gat,71,119
-023-3.gat,83,114|warp|To Lighthouse Beach|-1,-1,023-1.gat,83,116
-023-3.gat,106,120|warp|To Lighthouse Beach|-1,-1,023-1.gat,107,122
-023-3.gat,106,112|warp|To Lighthouse Beach|-1,-1,023-1.gat,105,112
-023-3.gat,70,95|warp|To Lighthouse Beach|-1,-1,023-1.gat,70,97
-023-3.gat,48,80|warp|To Lighthouse Beach|-1,-1,023-1.gat,48,82
-023-3.gat,61,36|warp|To Lighthouse Beach|-1,-1,023-1.gat,61,34
diff --git a/world/map/npc/023-3/mapflags.txt b/world/map/npc/023-3/mapflags.txt
deleted file mode 100644
index 8d7ca6b9..00000000
--- a/world/map/npc/023-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-023-3.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/024-1/_import.txt b/world/map/npc/024-1/_import.txt
deleted file mode 100644
index fac35b9a..00000000
--- a/world/map/npc/024-1/_import.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Map 024-1: Tulimshar Canyon
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 024-1.gat
-npc: npc/024-1/_mobs.txt
-npc: npc/024-1/_warps.txt
-npc: npc/024-1/ched.txt
-npc: npc/024-1/david.txt
-npc: npc/024-1/eomie.txt
-npc: npc/024-1/mapflags.txt
-npc: npc/024-1/tinris.txt
-npc: npc/024-1/tondar.txt
diff --git a/world/map/npc/024-1/_mobs.txt b/world/map/npc/024-1/_mobs.txt
deleted file mode 100644
index 7df01305..00000000
--- a/world/map/npc/024-1/_mobs.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Canyon mobs
-
-024-1.gat,89,52,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob024-1::On1002
-024-1.gat,40,45,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob024-1::On1002
-024-1.gat,90,37,10,7|monster|Maggot|1002,4,100000ms,30000ms,Mob024-1::On1002
-024-1.gat,96,25,3,10|monster|SeaSlime|1033,1,100000ms,30000ms,Mob024-1::On1033
-024-1.gat,33,45,24,20|monster|BlackScorpion|1009,3,100000ms,30000ms,Mob024-1::On1009
-024-1.gat,93,35,5,6|monster|GiantMaggot|1006,1,100000ms,30000ms,Mob024-1::On1006
-024-1.gat,63,54,3,6|monster|Maggot|1002,1,100000ms,30000ms,Mob024-1::On1002
-
-
-024-1.gat,0,0,0|script|Mob024-1|-1
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1006:
-    set @mobID, 1006;
-    callfunc "MobPoints";
-    end;
-
-On1009:
-    set @mobID, 1009;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/024-1/_warps.txt b/world/map/npc/024-1/_warps.txt
deleted file mode 100644
index f579b33f..00000000
--- a/world/map/npc/024-1/_warps.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Canyon warps
-
-024-1.gat,86,74|warp|To North Tulimshar|3,-1,021-1.gat,49,65
-024-1.gat,80,48|warp|To Tulimshar Magic Scho|0,-1,024-2.gat,26,26
-024-1.gat,86,48|warp|To Tulimshar Magic Scho|-1,-1,024-2.gat,42,27
-024-1.gat,80,30|warp|To Magic Passage|-1,-1,042-3.gat,56,45
diff --git a/world/map/npc/024-1/mapflags.txt b/world/map/npc/024-1/mapflags.txt
deleted file mode 100644
index 7cfb1c4d..00000000
--- a/world/map/npc/024-1/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-024-1.gat|mapflag|town
-024-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/024-2/_import.txt b/world/map/npc/024-2/_import.txt
deleted file mode 100644
index 685cb331..00000000
--- a/world/map/npc/024-2/_import.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Map 024-2: Tulimshar Magic School
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 024-2.gat
-npc: npc/024-2/_mobs.txt
-npc: npc/024-2/_warps.txt
-npc: npc/024-2/barrier.txt
-npc: npc/024-2/mapflags.txt
-npc: npc/024-2/tyer.txt
-npc: npc/024-2/tyer_trigger.txt
diff --git a/world/map/npc/024-2/_mobs.txt b/world/map/npc/024-2/_mobs.txt
deleted file mode 100644
index 14ac77bc..00000000
--- a/world/map/npc/024-2/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Magic School mobs
-
-
-
-024-2.gat,0,0,0|script|Mob024-2|-1
-{
-    end;
-}
diff --git a/world/map/npc/024-2/_warps.txt b/world/map/npc/024-2/_warps.txt
deleted file mode 100644
index b6e41de6..00000000
--- a/world/map/npc/024-2/_warps.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Magic School warps
-
-024-2.gat,26,27|warp|To Tulimshar Canyon|0,-1,024-1.gat,80,49
-024-2.gat,42,28|warp|To Outside|-1,-1,024-1.gat,86,49
diff --git a/world/map/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt
deleted file mode 100644
index 84405447..00000000
--- a/world/map/npc/024-2/barrier.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-// A barrier in the magic school to keep less experienced players out of the canyon
-
-024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|127,1,1
-{
-    callfunc "MorganState";
-    if (@morgan >= 4)
-        goto L_End;
-    goto L_PushBack;
-
-L_PushBack:
-    warp "024-2.gat", 34, 24;
-    goto L_End;
-
-L_End:
-    end;
-}
diff --git a/world/map/npc/024-2/mapflags.txt b/world/map/npc/024-2/mapflags.txt
deleted file mode 100644
index 03190692..00000000
--- a/world/map/npc/024-2/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-024-2.gat|mapflag|town
-024-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/024-2/tyer.txt b/world/map/npc/024-2/tyer.txt
deleted file mode 100644
index 21868e96..00000000
--- a/world/map/npc/024-2/tyer.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// A man in the magic school
-
-024-2.gat,36,21,0|script|Tyer|157
-{
-    mes "[Tyer]";
-    mes "\"Hello. Welcome to the Magic Insitute of Tulimshar.\"";
-    close;
-}
diff --git a/world/map/npc/024-2/tyer_trigger.txt b/world/map/npc/024-2/tyer_trigger.txt
deleted file mode 100644
index 6c532b62..00000000
--- a/world/map/npc/024-2/tyer_trigger.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// A man in the magic school
-
-024-2.gat,33,24,0|script|#Tyer_Trigger|127,0,1
-{
-    callfunc "MorganState";
-    if (@morgan >= 4)
-        goto L_Close;
-
-    mes "[Tyer]";
-    mes "\"You're not allowed to go in there.\"";
-    menu
-        "What do you mean I'm not allowed to go in there?", L_Explain,
-        "Ah, right.", L_Close;
-
-L_Explain:
-    mes "[Tyer]";
-    mes "\"Access to those areas are for students of magic only.\"";
-    next;
-    mes "\"That barrier was made to keep those that are not students out.\"";
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/024-3/_import.txt b/world/map/npc/024-3/_import.txt
deleted file mode 100644
index 306ec8ee..00000000
--- a/world/map/npc/024-3/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// Map 024-3: Entry Ancient Amulets
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 024-3.gat
-npc: npc/024-3/_mobs.txt
-npc: npc/024-3/_warps.txt
diff --git a/world/map/npc/024-3/_mobs.txt b/world/map/npc/024-3/_mobs.txt
deleted file mode 100644
index c9456ee3..00000000
--- a/world/map/npc/024-3/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Entry Ancient Amulets mobs
-
-
-
-024-3.gat,0,0,0|script|Mob024-3|-1
-{
-    end;
-}
diff --git a/world/map/npc/024-3/_warps.txt b/world/map/npc/024-3/_warps.txt
deleted file mode 100644
index eb326a51..00000000
--- a/world/map/npc/024-3/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Entry Ancient Amulets warps
-
diff --git a/world/map/npc/024-4/_import.txt b/world/map/npc/024-4/_import.txt
deleted file mode 100644
index e76b609b..00000000
--- a/world/map/npc/024-4/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// Map 024-4: Giant Maze
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 024-4.gat
-npc: npc/024-4/_mobs.txt
-npc: npc/024-4/_warps.txt
diff --git a/world/map/npc/024-4/_mobs.txt b/world/map/npc/024-4/_mobs.txt
deleted file mode 100644
index bcb4d487..00000000
--- a/world/map/npc/024-4/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Giant Maze mobs
-
-
-
-024-4.gat,0,0,0|script|Mob024-4|-1
-{
-    end;
-}
diff --git a/world/map/npc/024-4/_warps.txt b/world/map/npc/024-4/_warps.txt
deleted file mode 100644
index cd46789f..00000000
--- a/world/map/npc/024-4/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Giant Maze warps
-
diff --git a/world/map/npc/029-1/_import.txt b/world/map/npc/029-1/_import.txt
index 80303795..e8afa64e 100644
--- a/world/map/npc/029-1/_import.txt
+++ b/world/map/npc/029-1/_import.txt
@@ -3,7 +3,20 @@
 map: 029-1.gat
 npc: npc/029-1/_mobs.txt
 npc: npc/029-1/_warps.txt
+npc: npc/029-1/aahna.txt
 npc: npc/029-1/barrier.txt
 npc: npc/029-1/dock.txt
+npc: npc/029-1/ferry_master.txt
+npc: npc/029-1/hasan.txt
+npc: npc/029-1/hideandseek.txt
+npc: npc/029-1/kaan.txt
+npc: npc/029-1/liana.txt
 npc: npc/029-1/mapflags.txt
+npc: npc/029-1/monster_guide.txt
+npc: npc/029-1/rewards_master.txt
+npc: npc/029-1/soul-menhir.txt
 npc: npc/029-1/traveler.txt
+npc: npc/029-1/tutorial.txt
+npc: npc/029-1/valon.txt
+npc: npc/029-1/vincent.txt
+npc: npc/029-1/zegas.txt
diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt
index e7ebba61..ce8e7a64 100644
--- a/world/map/npc/029-1/_mobs.txt
+++ b/world/map/npc/029-1/_mobs.txt
@@ -1,45 +1,40 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Candor Island mobs
 
-029-1.gat,69,65,12,13|monster|EvilMushroom|1013,4,20000ms,60000ms,Mob029-1::On1013
-029-1.gat,32,33,12,13|monster|Squirrel|1038,3,30000ms,60000ms,Mob029-1::On1038
 029-1.gat,46,48,4,1|monster|CloverPatch|1037,1,10000ms,120000ms,Mob029-1::On1037
-029-1.gat,37,60,22,20|monster|SpikyMushroom|1019,5,10000ms,30000ms,Mob029-1::On1019
-029-1.gat,54,36,17,18|monster|Bat|1017,4,25000ms,30000ms,Mob029-1::On1017
-029-1.gat,59,51,13,9|monster|LogHead|1025,2,25000ms,30000ms,Mob029-1::On1025
+029-1.gat,73,93,14,13|monster|Maggot|1002,8,100000ms,30000ms,Mob029-1::On1002
+029-1.gat,90,35,15,11|monster|TameScorpion|1046,16,100000ms,30000ms,Mob029-1::On1046
+029-1.gat,93,100,21,18|monster|TameScorpion|1046,8,100000ms,30000ms,Mob029-1::On1046
+029-1.gat,43,43,31,23|monster|Scorpion|1003,2,100000ms,30000ms,Mob029-1::On1003
+029-1.gat,76,42,52,25|monster|ManaBug|1131,3,30ms,0ms,Mob029-1::On1131
 
 
 029-1.gat,0,0,0|script|Mob029-1|-1
 {
     end;
 
-On1013:
-    set @mobID, 1013;
+On1002:
+    set @mobID, 1002;
     callfunc "MobPoints";
     end;
 
-On1017:
-    set @mobID, 1017;
+On1003:
+    set @mobID, 1003;
     callfunc "MobPoints";
     end;
 
-On1019:
-    set @mobID, 1019;
-    callfunc "MobPoints";
-    end;
-
-On1025:
-    set @mobID, 1025;
+On1037:
+    set @mobID, 1037;
     callfunc "MobPoints";
     end;
 
-On1037:
-    set @mobID, 1037;
+On1046:
+    set @mobID, 1046;
     callfunc "MobPoints";
     end;
 
-On1038:
-    set @mobID, 1038;
+On1131:
+    set @mobID, 1131;
     callfunc "MobPoints";
     end;
 }
diff --git a/world/map/npc/029-1/_warps.txt b/world/map/npc/029-1/_warps.txt
index d7ee1fd0..6f0049be 100644
--- a/world/map/npc/029-1/_warps.txt
+++ b/world/map/npc/029-1/_warps.txt
@@ -1,3 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Candor Island warps
 
+029-1.gat,40,88|warp|To Valon's House|-1,-1,029-2.gat,29,61
+029-1.gat,44,83|warp|To Storeroom|-1,-1,029-2.gat,22,92
+029-1.gat,52,84|warp|To The Magic Shack|-1,-1,029-2.gat,103,61
+029-1.gat,58,79|warp|To Two Arms|-1,-1,029-2.gat,94,30
diff --git a/world/map/npc/029-1/aahna.txt b/world/map/npc/029-1/aahna.txt
new file mode 100644
index 00000000..1b1c4489
--- /dev/null
+++ b/world/map/npc/029-1/aahna.txt
@@ -0,0 +1,23 @@
+// Aahna
+// Author: Wushin
+// Npc
+029-1.gat,71,52,0|script|Aahna|404
+{
+    setarray @npc_loc, 71, 52, 3;
+    callfunc "PCtoNPCRange";
+    if (@npc_check)
+        goto L_Range;
+    goto L_Meet;
+
+L_Meet:
+    mes "[Aahna]";
+    mes "\"Hello, What a lovely day for a stroll.\"";
+    goto L_Close;
+
+L_Range:
+    message strcharinfo(0), "Whats that? Come closer I can't hear you.";
+    goto L_Close;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt
index b7d6b62c..1acb0d17 100644
--- a/world/map/npc/029-1/barrier.txt
+++ b/world/map/npc/029-1/barrier.txt
@@ -1,7 +1,8 @@
-029-1.gat,54,37,0|script|#CandorBarrier|45,0,0
+029-1.gat,69,61,0|script|#CandorBarrier|45,0,0
 {
     if ($@FIGHT_CAVE_STATUS == 1) goto L_Block;
-    warp "029-3.gat", 46, 23;
+    if (BaseLevel < 40) goto L_Block;
+    warp "029-3.gat", 49, 53;
     end;
 
 L_Block:
diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt
index 6f195f36..7430971c 100644
--- a/world/map/npc/029-1/dock.txt
+++ b/world/map/npc/029-1/dock.txt
@@ -1,19 +1,19 @@
 // The ferry dock
 
 // Ferry Sign
-029-1.gat,27,36,0|script|Ferry Schedule#8|397
+029-1.gat,43,104,0|script|Ferry Schedule#8|397
 {
     callfunc "FerryManifest";
     end;
 }
 
-029-1.gat,16,36,0|script|Candor Koga|395,6,2
+029-1.gat,51,118,0|script|Candor Koga|395,8,8
 {
     callfunc "BoardCandorFerry";
     close;
 }
 
-029-1.gat,22,37,0|script|#CandorDock|127
+029-1.gat,55,110,0|script|#CandorDock|127
 {
     end;
 OnCommandArrive:
diff --git a/world/map/npc/029-1/ferry_master.txt b/world/map/npc/029-1/ferry_master.txt
new file mode 100644
index 00000000..3163e6b2
--- /dev/null
+++ b/world/map/npc/029-1/ferry_master.txt
@@ -0,0 +1,21 @@
+//
+
+029-1.gat,45,107,0|script|Ferry Master#candor|138
+{
+    mes "[Ferry Master]";
+    mes "\"Hello! Do you need something?\"";
+    goto L_Main;
+
+L_Main:
+    menu
+        "How do I use the ferry?", L_Explain,
+        "Nothing I guess", L_Close;
+
+L_Explain:
+    mes "[Ferry Master]";
+    callfunc "FerryHelp";
+    goto L_Main;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index 734e0df0..7a6b906e 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -1,14 +1,14 @@
 // This file is part of the Tutorial
 // Authors: Jenalya, alastrim
 // Hasan should be threatening someone else you come to help
-// Going to throw someone off a cliff
+// Going to throw someone in the water
 // npctalk 2 NPCs Hasan talks about giving someone a short trip to Docks
 // They respond by asking play for help
 // Hasan tells them to but out of it.
 
-042-1.gat,104,49,0|script|Scared Man|160
+029-1.gat,35,33,0|script|Scared Man|160
 {
-    setarray @npc_loc, 104, 49, 4;
+    setarray @npc_loc, 35, 33, 4;
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_End;
@@ -18,15 +18,15 @@
     goto L_End;
 
 L_TutDone:
-    message strcharinfo(0), "Thanks. Kaan's been much nicer to me now";
+    message strcharinfo(0), "Thanks. Hasan has been much nicer to me now";
     goto L_End;
 
 L_End:
     end;
 }
-042-1.gat,102,49,0|script|Hasan|189,2,2
+029-1.gat,33,33,0|script|Hasan|189,3,3
 {
-    setarray @npc_loc, 102, 49, 4;
+    setarray @npc_loc, 33, 33, 4;
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_Close;
@@ -47,27 +47,19 @@ L_Main:
 
     mes "You over hear some people nearby.";
     mes "[Unfriendly Guy]";
-    mes "\"I told you if you didn't get the money, I'd give you flying lessons, Haha!\"";
-    next;
+    mes "\"I told you if you didn't get the money, I'd give you swimming lessons, Haha!\"";
     mes "[Scared Man]";
     mes "\"But the only person I need protection from is you.\"";
-    next;
     mes "[Unfriendly Guy]";
     mes "\"Thats why the price is so high.\"";
-    next;
-    mes "\"Because I'm the toughest person in all of Tulimshar\"";
-    next;
+    mes "\"Because I'm the toughest person in all of Candor\"";
     mes "[Scared Man]";
-    mes "\"No, your just a mean bully. Wait till I tell the gaurds about this!\"";
-    next;
+    mes "\"No, your just a mean bully. Wait till I tell the guards about this!\"";
     mes "[Unfriendly Guy]";
-    mes "\"You do that and the next flying lesson will be from the beach cliffs.\"";
-    next;
+    mes "\"You do that and the next swimming lesson will be sleeping with the fishes.\"";
     mes "[Scared Man]";
     mes "\"No, please don't. *sob*\"";
-    next;
     mes "Sounds like this person is in trouble.\"";
-    next;
     set @tutorial_tmp, 9;
     callfunc "SetTutorialMask";
     mes "[Unfriendly Guy]";
@@ -88,7 +80,6 @@ L_Fight:
     mes "\"Do you really think you can beat me?\"";
     mes "He pulls out a nasty looking dagger and stabs it in your direction.";
     set Hp, 1;
-    next;
     mes "That hurt! You begin to think searching for a different solution might be healthier.";
     mes "Maybe Kaan can help?";
     goto L_Close;
@@ -103,42 +94,35 @@ L_Trick:
 L_ScratchHead:
     if ($@ScorpionFighter)
         goto L_Wait;
-    set @tutorial_tmp, 14;
-    callfunc "SetTutorialMask";
     set $@ScorpionTimer, 0;
     set $@ScorpionFighter, getcharid(3);
     set $@ScorpDeath, PC_DIE_COUNTER;
     cmdothernpc "#ScorpionTrigger", "HasanSpawn";
-    mes "While you're scratching your head, you see Kaan approaching the fence.";
+    specialeffect 22;
+    mes "While you're scratching your head, a scorpion appears.";
     close;
 
 L_Thank:
     mes "[Hasan]";
     mes "\"You - you saved me!";
     mes "I was mean to people, but you still saved me!\"";
-    next;
     mes "\"Hey, you're a really cool person.";
     mes "I mean, the way you finished that ghastly scorpion!";
     mes "Amazing!\"";
-    next;
     mes "\"Let me tell you something, I will no longer bully people.";
     mes "And you can have my Sharp Knife.\"";
     getitem "SharpKnife", 1;
     set @tutorial_tmp, 14;
     callfunc "SetTutorialMask";
-    next;
-    mes "\"You want to go to the bazaar, right? Shall I tell you how to get there?\"";
+    mes "\"You want to go to Hurnscald, right? Shall I tell you how to get there?\"";
     menu
         "Sure, thanks.",L_HasanThanks,
         "I'll try to find the way myself.",L_Explore;
 
 L_HasanThanks:
     mes "[Hasan]";
-    mes "\"Ok, when you leave here follow the road past the docks until you reach the old city gates.\"";
-    next;
-    mes "\"Pass through them and at the crossway, just go west and then south until you reach some other gateway.\"";
-    next;
-    mes "\"Behind it there is the bazaar of Tulimshar.\"";
+    mes "\"Ok, when you leave here go back to the city. Wait on the south end of";
+    mes "the city for the ferry to arrive at the docks. It will take you to Hurnscald.\"";
     goto L_Close;
 
 L_Explore:
@@ -172,7 +156,7 @@ OnTouch:
         end;
     goto L_Main;
 }
-042-1.gat,0,0,0|script|#ScorpionTrigger|35
+029-1.gat,0,0,0|script|#ScorpionTrigger|35
 {
     end;
 
@@ -180,12 +164,12 @@ OnCommandHasanSpawn:
     goto L_Summon;
 
 L_Summon:
-    monster "042-1.gat",102,49,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath";
+    monster "029-1.gat",33,33,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath";
     initnpctimer;
     end;
 
 L_SummonAgain:
-    message strcharinfo(0), "Kaan is mad at you for your interference! He walks over to the edge of the fence and throws a rock on top of your head, then lets another scorpion run just near Hasan!";
+    message strcharinfo(0), "Kaan is mad at you for your interference! He summons a rock above your head, then summons another scorpion near Hasan!";
     percentheal -100, 0;
     goto L_Summon;
 
@@ -219,7 +203,7 @@ L_MessageDeath:
     goto L_Clean;
 
 L_Clean:
-    killmonster "042-1.gat", "#ScorpionTrigger::OnScorpionDeath";
+    killmonster "029-1.gat", "#ScorpionTrigger::OnScorpionDeath";
     set $@ScorpionFighter, 0;
     set $@ScorpionTimer, 0;
     set $@ScorpDeath, 0;
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/029-1/hideandseek.txt
index 621f8468..4a4476ff 100644
--- a/world/map/npc/021-1/hideandseek.txt
+++ b/world/map/npc/029-1/hideandseek.txt
@@ -21,7 +21,22 @@ OnInit:
     set $@hideandseekNT_ended, (1 << 6);
     end;
 }
-021-1.gat,89,66,0|script|AyashaDebug|258
+function|script|CountHideNSeek
+{
+    set @hidden_kid_cnt, 0;
+    if (QUEST_NorthTulimshar & $@hideandseekNT_found1)
+        set @hidden_kid_cnt, (@hidden_kid_cnt + 1);
+    if (QUEST_NorthTulimshar & $@hideandseekNT_found2)
+        set @hidden_kid_cnt, (@hidden_kid_cnt + 1);
+    if (QUEST_NorthTulimshar & $@hideandseekNT_found3)
+        set @hidden_kid_cnt, (@hidden_kid_cnt + 1);
+    if (QUEST_NorthTulimshar & $@hideandseekNT_found4)
+        set @hidden_kid_cnt, (@hidden_kid_cnt + 1);
+    if (QUEST_NorthTulimshar & $@hideandseekNT_found5)
+        set @hidden_kid_cnt, (@hidden_kid_cnt + 1);
+    return;
+}
+029-1.gat,64,90,0|script|AyashaDebug|258
 {
     mes "[Ayasha Debug]";
     menu
@@ -60,7 +75,7 @@ OnInit:
         disablenpc "AyashaDebug";
     end;
 }
-021-1.gat,87,66,0|script|Ayasha|258
+029-1.gat,62,90,0|script|Ayasha|258
 {
     set @child_number, 0;
     callfunc "XmasList";
@@ -92,15 +107,16 @@ L_Next:
 L_Next1:
     mes "[Ayasha]";
     mes "\"Great! You can take my turn with searching. You need to find all five of my friends.";
-    mes "They're hiding somewhere in the city, you will have to explore to find them. They could be hiding anywhere.\"";
+    mes "They're hiding somewhere on the island, you will have to explore to find them. They could be hiding anywhere.\"";
 
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_started;
     goto L_Close;
 
 L_Doing:
+    callfunc "CountHideNSeek";
     mes "[Ayasha]";
-    mes "\"You still need to find some of my friends. There are five of them.";
-    mes "Remember, they're hiding somewhere in the city, you will have to explore to find them. They could be hiding anywhere.\"";
+    mes "\"You still need to find some of my friends. You have found " + @hidden_kid_cnt + " out of 5 of my friends.\"";
+    mes "Remember, they're hiding somewhere on the island, you will have to explore to find them. They could be hiding anywhere.\"";
     goto L_Close;
 
 L_Reward:
@@ -114,13 +130,13 @@ L_Reward:
 L_Next2:
     mes "[Ayasha]";
     mes "\"Oh, ok.";
-    mes "Have you already seen the bazaar? It's a very exciting place! I love the entertainer. She can make so many funny faces.\"";
+    mes "Have you already seen Hurnscald? It's a very exciting place! I love the entertainer. She can make so many funny faces.\"";
     goto L_Close;
 
 L_Done:
     mes "[Ayasha]";
     mes "\"Hello! It was fun to play with you.";
-    mes "When you go to the bazaar, you can say hello to Mikhail. He's very nice! But very shy.\"";
+    mes "When you go to the Hurnscald, you can say hello to Mikhail. He's very nice! But very shy.\"";
     goto L_Close;
 
 L_Close:
@@ -129,7 +145,7 @@ L_Close:
     close;
 }
 
-022-1.gat,112,23,0|script|Latif|262
+029-1.gat,50,105,0|script|Latif|262
 {
     set @child_number, 1;
     callfunc "XmasList";
@@ -155,14 +171,14 @@ L_Next:
 
 L_Next1:
     mes "[Latif]";
-    mes "\"My friend Vincent thinks so too. He doesn't want to join us playing. Do you know what he does instead?";
-    mes "He builds action figures out of Bug Legs! That is lame.\"";
+    mes "\"My friend Vincent thinks so too. He doesn't join us playing.";
+    mes "Do you know what he does instead? He builds action figures out of Bug Legs! That is lame.\"";
     goto L_Close;
 
 L_Agree:
     mes "[Latif]";
-    mes "\"Yeah, right? My friend Vincent doesn't thinks so. He doesn't want to join us playing. Do you know what he does instead?";
-    mes "He builds action figures out of Bug Legs! That is lame.\"";
+    mes "\"Yeah, right? My friend Vincent doesn't thinks so. He doesn't join us playing.";
+    mes "Do you know what he does instead? He builds action figures out of Bug Legs! That is lame.\"";
     goto L_Close;
 
 L_Find:
@@ -170,19 +186,20 @@ L_Find:
     mes "\"Hey! Ah, you found me. Well done. But my hiding place wasn't that difficult this time.\"";
     getexp @EXP, 0;
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_found1;
-    next;
     mes "\"Here, do you want a candy?\"";
     getitem "Candy", 1;
     goto L_Close;
 
 L_Doing:
+    callfunc "CountHideNSeek";
     mes "[Latif]";
     mes "\"You didn't find all of us yet? Seems like the other ones found a better place to hide.\"";
+    mes "\"" + @hidden_kid_cnt + " out of 5 have been found.\"";
     goto L_Close;
 
 L_Done:
     mes "[Latif]";
-    mes "\"Inside the building in the Northeastern market, there is a workshop. My father works there and wants me to do that too when I'm grown up. But I don't want do that! I want to go on an adventure! Just like you.\"";
+    mes "\"The northeastern most building of town is a workshop. My father works there and wants me to do that too when I'm grown up. But I don't want do that! I want to go on an adventure! Just like you.\"";
     goto L_Close;
 
 L_Close:
@@ -191,7 +208,7 @@ L_Close:
     close;
 }
 
-001-1.gat,39,33,0|script|Charda|260
+029-1.gat,48,67,0|script|Charda|260
 {
     set @child_number, 2;
     callfunc "XmasList";
@@ -205,8 +222,7 @@ L_Close:
 
     mes "[Charda]";
     mes "\"Hello. Psht, be careful. I'm playing hide and seek with Ayasha. You'll draw attention to my hiding place.\"";
-    next;
-    mes "\"They will never find me in the bazaar. Ian is here, he helps all those adventurers that come here.\"";
+    mes "\"They will never find me here.\"";
     goto L_Close;
 
 L_Find:
@@ -214,25 +230,23 @@ L_Find:
     mes "\"Oh! Got me! You're good at this.\"";
     getexp @EXP, 0;
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_found2;
-    next;
     mes "She takes something out of her pocket.";
-    mes "[Charda]";
     mes "\"I'm hungry now. Do you want chocolate too?\"";
     getitem "ChocolateBar", 1;
-    next;
-    mes "\"My mom doesn't want me to eat so much chocolate, but I got it from the trader on the bazaar. He sells many different things.";
-    mes "I convinced him to teach me how to trade. It's fun.\"";
+    mes "\"My mom doesn't want me to eat so much chocolate, but I got it from the trader at the Hurnscald Market. He sells many different things";
+    mes "when we goto vacation in Hurnscald. I convinced him to teach me how to trade. It's fun.\"";
     goto L_Close;
 
 L_Doing:
+    callfunc "CountHideNSeek";
     mes "[Charda]";
     mes "\"Did you find the others yet?\"";
+    mes "\"Hrmm, no looks like only " + @hidden_kid_cnt + " out of 5 have been found.\"";
     goto L_Close;
 
 L_Done:
     mes "[Charda]";
     mes "\"Hey! We're still playing hide and seek. What are you going to do? Will you go to Hurnscald with the ferry? The mother of my friends Rossy and Julia come from there. They are on a vacation there at the moment.\"";
-    next;
     mes "\"Rossy told me that it's a very beautiful place. Lots of trees and flowers and grass, everything's green.\"";
     mes "She sighs.";
     mes "[Charda]";
@@ -245,7 +259,7 @@ L_Close:
     close;
 }
 
-021-1.gat,78,87,0|script|Faris|259
+029-1.gat,100,36,0|script|Faris|259
 {
     set @child_number, 3;
     callfunc "XmasList";
@@ -258,14 +272,14 @@ L_Close:
     if (@state > 0) goto L_Doing;
 
     mes "[Faris]";
-    mes "\"Oh, hi there. What are you doing here on the roof?\"";
+    mes "\"Oh, hi there. What are you doing here on the beach?\"";
     menu
         "I'm just having a look around.",L_Next,
         "It's nice place here, isn't it?",L_Next;
 
 L_Next:
     mes "[Faris]";
-    mes "\"He, you're cool. I'm hiding here from Ayasha, we're playing hide and seek. This is the best hiding place ever.\"";
+    mes "\"Hey, you're cool. I'm hiding here from Ayasha, we're playing hide and seek. This is the best hiding place ever.\"";
     goto L_Close;
 
 L_Find:
@@ -274,21 +288,21 @@ L_Find:
     getexp @EXP, 0;
     getitem "CactusDrink", 1;
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_found3;
-    next;
     mes "\"It's really cool you're playing with us. I'm sure you have a lot of other things to do.";
     mes "You're an adventurer, right? I want to become an adventurer too when I'm grown up. I'll talk to Aidan then.\"";
-    next;
-    mes "\"Aidan is on the bazaar and you can register there for monster points. That's something the Wizard's Council made up. They reward you for slaying monsters. It's so cool.\"";
+    mes "\"Aidan is outside Sorfina's place and you can register there for monster points. That's something the Wizard's Council made up. They reward you for slaying monsters. It's so cool.\"";
     goto L_Close;
 
 L_Doing:
+    callfunc "CountHideNSeek";
     mes "[Faris]";
-    mes "\"Are you still searching for the others? Nobody else is up here.\"";
+    mes "\"Are you still searching for the others? Nobody else is here.\"";
+    mes "\"It seems you found " + @hidden_kid_cnt + " out of 5 of my friends.\"";
     goto L_Close;
 
 L_Done:
     mes "[Faris]";
-    mes "\"I'll go to the bazaar and ask Bernard for some soup when we're done with playing. His soup is delicious!\"";
+    mes "\"I'll go to Hurnscald's Inn and ask Bernard for some soup when we're done with playing. His soup is delicious!\"";
     goto L_Close;
 
 L_Close:
@@ -297,7 +311,7 @@ L_Close:
     close;
 }
 
-022-1.gat,28,34,0|script|Rasin|263
+029-1.gat,28,52,0|script|Rasin|263
 {
     set @child_number, 4;
     callfunc "XmasList";
@@ -310,7 +324,7 @@ L_Close:
     if (@state > 0) goto L_Doing;
 
     mes "[Rasin]";
-    mes "\"The harbor is to the East from here. There you can take a ferry to other places.";
+    mes "\"The harbor is to the south from here. There you can take a ferry to other places.";
     mes "And now go away, I'm playing hide and seek and Ayasha shouldn't see me here. You'll draw her attention when you talk to me.\"";
     goto L_Close;
 
@@ -322,14 +336,16 @@ L_Find:
     goto L_Close;
 
 L_Doing:
+    callfunc "CountHideNSeek";
     mes "[Rasin]";
     mes "\"Hehe, I'm curious when you'll have found all of us.\"";
+    mes "\"There are " + @hidden_kid_cnt + " out of 5 found.\"";
     goto L_Close;
 
 L_Done:
     mes "[Rasin]";
     mes "\"Thanks for playing with us! It was fun!";
-    mes "Will you leave Tulimshar to go on an adventure in other places of the world?\"";
+    mes "Will you leave Candor to go on an adventure in other places of the world?\"";
     goto L_Close;
 
 L_Close:
@@ -338,7 +354,7 @@ L_Close:
     close;
 }
 
-068-1.gat,94,84,0|script|Ghada|265
+029-1.gat,79,99,0|script|Ghada|265
 {
     set @child_number, 5;
     callfunc "XmasList";
@@ -350,7 +366,7 @@ L_Close:
     if ((@state > 0) && !(QUEST_NorthTulimshar & $@hideandseekNT_found5)) goto L_Find;
     if (@state > 0) goto L_Doing;
 
-    mes "You see a girl standing behind the a tree. She has a look of intense concentration on her face.";
+    mes "You see a girl standing behind the wheat. She has a look of intense concentration on her face.";
     menu
         "Hi, what are you doing there?",L_Next,
         "(Leave)",L_Close;
@@ -369,8 +385,10 @@ L_Find:
     goto L_Close;
 
 L_Doing:
+    callfunc "CountHideNSeek";
     mes "[Ghada]";
     mes "\"Are you still searching for the others? I'm sure you'll find them soon.\"";
+    mes "\"You found " + @hidden_kid_cnt + " out of 5 us.\"";
     goto L_Close;
 
 L_Done:
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/029-1/kaan.txt
index 92067c41..0dabb802 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/029-1/kaan.txt
@@ -1,12 +1,12 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 
-042-1.gat,109,87,0|script|Kaan|160
+029-1.gat,46,95,0|script|Kaan|160
 {
-    setarray @npc_loc, 109, 87, 4;
+    setarray @npc_loc, 46, 97, 4;
     callfunc "PCtoNPCRange";
     if (@npc_check)
-        goto L_Close;
+        goto L_OutOfRange;
 
     callfunc "TutorialState";
     if (!(@kaan_talked)) goto L_Tanisha;
@@ -17,18 +17,19 @@
     if (@tutorial == 9) goto L_Hasan;
     goto L_Out;
 
+L_OutOfRange:
+    message strcharinfo(0), "Come closer!";
+    goto L_Close;
+
 L_Tanisha:
     set STARTAREA, STARTAREA | $@SpokeToKaan;
     mes "[Young Man]";
-    mes "\"You're the person Tanisha brought here, right?";
-    mes "My name is Kaan, I'm her brother.\"";
-    next;
-    mes "\"She was babbling at me about it all the morning until I sent her to take care of the maggots in the storehouse.\"";
-    next;
+    mes "\"You're the person I brought here, right?";
+    mes "My name is Kaan, I'm Tanisha's brother.\"";
+    mes "\"She was babbling at me about it all the morning until I sent her to take care of the maggots in the cafe.\"";
     mes "Kaan grins mischieviously.";
     mes "[Kaan]";
     mes "\"She hates maggots.\"";
-    next;
     mes "\"Did you already talk to Tanisha?\"";
     menu
         "Yes, I helped her with the maggots.",L_Tanisha1,
@@ -38,60 +39,44 @@ L_Tanisha1:
     mes "[Kaan]";
     mes "\"Ah, that is good news.";
     mes "You know, we have a lot of problems with bugs here.\"";
-    next;
+    mes "\"I've slain many bugs here to keep them out of our fields.\"";
     mes "\"If we don't watch out the maggots will eat all of our stocks.";
-    mes "And the desert is crawling with scorpions.";
-    mes "They also come here and you need to watch out not to step on them.\"";
-    next;
-    mes "\"But I took care of that problem.\"";
-    mes "He looks very proud.";
-    next;
-    mes "\"I've trapped or slain many scorpians south of here to keep them out of our fields.\"";
-    next;
-    menu
-        "Impressive! Just a bit... skewed.",L_Next,
-        "Wow, it looks very - ahm, unconventional.",L_Next;
-
-L_Next:
-    mes "[Kaan]";
-    mes "\"Well, I keep the scorpions out. That's all that matters.\"";
-    next;
-    mes "\"Are you going to visit Tulimshar?";
-    mes "The bazaar there is a wondeful place! Traders, entertainers, adventurers - it's very exciting.\"";
-    next;
+    mes "And the island is crawling with scorpions.\"";
+    mes "\"Are you going to visit Hurnscald?";
+    mes "Hurnscald is a wondeful place! Traders, entertainers, adventurers - it's very exciting.\"";
     mes "\"And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\"";
-    goto L_Out;
+    mes "\"The ferry to the south takes your there for free.\"";
+    goto L_Close;
 
 L_Out:
     mes "[Kaan]";
-    mes "\"Hello! How are you? Did you already visit Tulimshar?\"";
+    mes "\"Hello! How are you? Did you already visit Hurnscald?\"";
     menu
+        "Yes.", L_Close,
         "Not yet.",L_Close;
 
 L_Hasan:
     mes "[Kaan]";
-    mes "\"Hello! How are you? Did you already visit Tulimshar?\"";
+    mes "\"Hello! How are you? Did you already visit Hurnscald?\"";
     menu
         "A guy named Hasan is bullying someone.",L_Next1,
+        "Yes.", L_Close,
         "Not yet.",L_Close;
 
 L_Next1:
     mes "\"Hasan! That's crazy. He becomes more cheeky with every day.";
     mes "I'd like to help you, but - I won't risk an open confrontation with him.\"";
-    next;
     mes "\"Sometimes he just freaks out and then he's dangerous.";
-    mes "He might listen to one of the adult men, but they're all off to work in Tulimshar during the day.\"";
-    next;
+    mes "He might listen to one of the adult men, but they're all off to work in Hurnscald during the day.\"";
     mes "\"We should think about some kind of trick. Ah, if only I knew his weak point.\"";
     set @tutorial_tmp, 10;
     callfunc "SetTutorialMask";
-    next;
     goto L_Trick;
 
 L_Trick:
     mes "[Kaan]";
     mes "\"Do you have any idea what Hasan's weakness could be?";
-    mes "I wonder if Sorfina or Tanisha know something about him that could help us.\"";
+    mes "I wonder if Sorfina know something about him that could help us.\"";
     menu
         "No idea.",L_Close;
 
@@ -113,15 +98,11 @@ L_Next2:
 
 L_Explain:
     mes "\"Ok, then here's the plan:";
-    mes "I will catch one of the scorpions behind the fences.\"";
-    next;
     mes "\"You'll go to Hasan and give me a sign when you're ready.";
     mes "Lets say the sign is that you're scratching your head.";
     mes "I'll watch you from this point.\"";
-    next;
-    mes "\"When you give me the sign, I'll throw the scorpion on him.";
+    mes "\"When you give me the sign, I'll summon a scorpion on him.";
     mes "I bet that will show him for the coward he really is.\"";
-    next;
     mes "\"How's that? We can start as soon as you're ready.\"";
     goto L_Close;
 
@@ -135,7 +116,7 @@ L_Plan:
 
 L_TutDone:
     mes "[Kaan]";
-    mes "\"Hi there. I hope you enjoy your time in Tulimshar.";
+    mes "\"Hi there. I hope you enjoy your time in Hurnscald.";
     mes "Hasan can be a real troublemaker, but it seems like he has calmed down for now.\"";
     goto L_Close;
 
diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt
new file mode 100644
index 00000000..dd95cc0c
--- /dev/null
+++ b/world/map/npc/029-1/liana.txt
@@ -0,0 +1,47 @@
+// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
+
+029-1.gat,62,96,0|script|Liana|205
+{
+    setarray @npc_loc, 62, 96, 4;
+    callfunc "PCtoNPCRange";
+    if (@npc_check)
+        goto L_End;
+    goto L_Talk;
+
+L_Talk:
+    mes "[Liana]";
+    mes "\"Hurnscald is a large city. I'm sure glad I live in Candor because I know where everything's at.\"";
+    if (@tutorial == 10) goto L_Hasan;
+    goto L_Close;
+
+L_Hasan:
+    mes "[Liana]";
+    mes "\"Are you enjoying yourself in Candor? Do you have any questions?\"";
+        menu
+            "A guy named Hasan is bullying people.",L_Next,
+            "No, thanks.",L_Close;
+
+L_Next:
+    mes "\"Ah, Hasan. He's causing trouble again?\"";
+    mes "She shakes her head.";
+    mes "\This guy has been a plague ever since he could walk. He's always causing trouble.\"";
+    mes "\"And his father... Well, one day his father thought he should teach Hasan a lesson.\"";
+    mes "\"He took him into the desert and then left him there!";
+    mes "Hasan was only seven years old!\"";
+    mes "\"I never understood how someone could do something like that to a child, even if it's a rascal like Hasan.\"";
+    mes "\"Anyway, Hasan tried to find his way back home, but stumbled into a nest of scorpions!\"";
+    mes "She shakes her head.";
+    mes "\"If Lieutenant Dausen hadn't have come along that moment, Hasan would have died that day.\"";
+    mes "\"However, the scorpions poison caused a bad fever and once Hasan had recovered from that, he was even more malicious than before.\"";
+    mes "She sighs.";
+    set @tutorial_tmp, 11;
+    callfunc "SetTutorialMask";
+    goto L_Close;
+
+L_End:
+    mes "You'll have to move closer";
+    goto L_Close;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/029-1/mapflags.txt b/world/map/npc/029-1/mapflags.txt
index 03b117f8..2f352ae3 100644
--- a/world/map/npc/029-1/mapflags.txt
+++ b/world/map/npc/029-1/mapflags.txt
@@ -1 +1 @@
-029-1.gat|mapflag|resave|029-1,69,69
+029-1.gat|mapflag|resave|029-1,39,102
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/029-1/monster_guide.txt
index 6efa1bcb..705dce05 100644
--- a/world/map/npc/001-1/monster_guide.txt
+++ b/world/map/npc/029-1/monster_guide.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,49,51,0|script|Aidan|102
+029-1.gat,45,97,0|script|Aidan|102
 {
     if (MPQUEST == 0)
         goto L_Register;
diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/029-1/rewards_master.txt
index 995704b1..cf8a1c1d 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/029-1/rewards_master.txt
@@ -1,6 +1,6 @@
 //
 
-001-1.gat,50,51,0|script|Ishi|106
+029-1.gat,47,97,0|script|Ishi|106
 {
     if (MPQUEST == 0) goto L_Register;
     if (tvis == 0) set tvis, 1;
diff --git a/world/map/npc/029-1/soul-menhir.txt b/world/map/npc/029-1/soul-menhir.txt
new file mode 100644
index 00000000..adabfff1
--- /dev/null
+++ b/world/map/npc/029-1/soul-menhir.txt
@@ -0,0 +1,18 @@
+//
+
+029-1.gat,39,101,0|script|Soul Menhir#candor|344
+{
+    callfunc "ClearVariables";
+    set @map$, "029-1.gat";
+    setarray @Xs, 38, 39, 40, 38, 40, 38, 39, 40;
+    setarray @Ys, 100, 100, 100, 101, 101, 102, 102, 102;
+    set @x, 0;
+    set @y, 0;
+    callfunc "SoulMenhir";
+    set @map$, "";
+    cleararray @Xs[0], 0, getarraysize(@Xs);
+    cleararray @Ys[0], 0, getarraysize(@Ys);
+    set @x, 0;
+    set @y, 0;
+    close;
+}
diff --git a/world/map/npc/029-1/traveler.txt b/world/map/npc/029-1/traveler.txt
index 9de43b14..13377fbf 100644
--- a/world/map/npc/029-1/traveler.txt
+++ b/world/map/npc/029-1/traveler.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-029-1.gat,69,67,0|script|Knitra the Traveler|103
+029-1.gat,69,68,0|script|Knitra the Traveler|103
 {
     set @NpcName$, "Knitra";
     set @NpcTravelBit, $@candor_bit;
diff --git a/world/map/npc/042-1/tutorial.txt b/world/map/npc/029-1/tutorial.txt
index bed98436..6a3df4ff 100644
--- a/world/map/npc/042-1/tutorial.txt
+++ b/world/map/npc/029-1/tutorial.txt
@@ -25,13 +25,21 @@ function|script|SetTutorialMask
     set @tutorial_tmp, 0;
     return;
 }
-042-2.gat,21,26,0|script|TutDebug|154
+029-2.gat,21,26,0|script|TutDebug|154
 {
     mes "[TutDebug]";
     mes "Reset?";
     menu
+        "Reset Kaan/Hasan",L_Kaan,
         "Yes.",L_Reset,
-        "No.",L_End;
+        "No.",L_Close;
+
+L_Kaan:
+    set @tutorial_tmp, 8;
+    set STARTAREA, (STARTAREA & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
+    set STARTAREA, STARTAREA &~ $@SpokeToKaan;
+    mes "Reset!";
+    goto L_Close;
 
 L_Reset:
     set TUT_var, 0;
@@ -39,17 +47,17 @@ L_Reset:
     set STARTAREA, (STARTAREA & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
     set STARTAREA, STARTAREA &~ $@SpokeToKaan;
     mes "Reset!";
-    goto L_End;
+    goto L_Close;
 
-L_End:
-    end;
+L_Close:
+    close;
 
 OnInit:
     if(!debug)
         disablenpc "TutDebug";
     end;
 }
-042-1.gat,63,47,0|script|#tutorialoutside|45,0,0
+029-1.gat,32,99,0|script|#tutorialoutside|45,0,0
 {
     callfunc "TutorialState";
     if (@tutorial >= 8)
@@ -62,6 +70,6 @@ L_ResetTutorial:
     goto L_Warp;
 
 L_Warp:
-    warp "042-2.gat", 114, 92;
+    warp "029-2.gat", 114, 92;
     end;
 }
diff --git a/world/map/npc/042-1/valon.txt b/world/map/npc/029-1/valon.txt
index b50207a3..0ce62c79 100644
--- a/world/map/npc/042-1/valon.txt
+++ b/world/map/npc/029-1/valon.txt
@@ -47,31 +47,31 @@ function|script|ValonProgress
         message strcharinfo(0), $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob];
     return;
 }
-042-1.gat,51,111,0|script|ValonDebug|156
+029-1.gat,74,86,0|script|ValonDebug|156
 {
     mes "[Valon Debug]";
     mes "Reset?";
     menu
         "Yes.", L_Reset,
-        "No.", L_End;
+        "No.", L_Close;
 
 L_Reset:
     set STARTAREA, (STARTAREA & ~(NIBBLE_1_MASK) | (0 << NIBBLE_1_SHIFT));
     set STARTAREA, (STARTAREA & ~(NIBBLE_2_MASK) | (0 << NIBBLE_2_SHIFT));
     mes "Reset!";
-    goto L_End;
+    goto L_Close;
 
-L_End:
-    end;
+L_Close:
+    close;
 
 OnInit:
     if (!debug)
         disablenpc "ValonDebug";
     end;
 }
-042-1.gat,48,111,0|script|Valon|156
+029-1.gat,72,86,0|script|Valon|156
 {
-    setarray @npc_loc, 48, 111, 4;
+    setarray @npc_loc, 72, 86, 4;
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_Close;
@@ -90,22 +90,17 @@ L_QuestAskAgain:
     mes "[Valon]";
     mes "\"Hello, Adventurer! Have you come back to help?\"";
     menu
-        "Yes. I will help with the desert beasts.", L_Accept,
+        "Yes. I will help with the island beasts.", L_Accept,
         "Maybe some other time.", L_Close;
 
 L_QuestAsk:
     mes "[Valon]";
     mes "\"Hello!";
     mes "You're looking for adventures, right?\"";
-    next;
-    mes "\"But you shouldn't underestimate this desert, it is dangerous.\"";
-    next;
+    mes "\"But you shouldn't underestimate this island, it is dangerous.\"";
     mes "\"It's crawling with scorpions, and the heat has overcome adventurers tougher than you are.\"";
-    next;
-    mes "\"I should know I gaurd this gate from all manner of desert beasts.\"";
-    next;
+    mes "\"I should know I guard this gate from all manner of island beasts.\"";
     mes "\"Maybe you would like help and earn your stripes?\"";
-    next;
     mes "\"The Council of Wizard's does offer a reward for helping...\"";
     set @valon_tmp, 1;
     callfunc "setValonMask";
@@ -123,36 +118,31 @@ L_Accept:
 L_NextMob:
     getexp 40, 0;
     mes "\"I see you killed all the " + $@ValonMobName$[@valon_mob] + " needed.\"";
-    next;
     mes "\"The Wizard's thank thee as well.\"";
     set Zeny, Zeny + 25;
     set @valon_tmp, (@valon_state + 1);
     callfunc "setValonMask";
     callfunc "ResetValonCntMask";
     callfunc "ValonState";
-    next;
     if (@valon_mob == getarraysize($@ValonMob))
         goto L_QuestOver;
     goto L_NewMob;
 
 L_NewMob:
     mes "\"Let's see whats on the list. Ah ok, I need you to kill me " + $@ValonMobCnt[@valon_mob] + " " + $@ValonMobName$[@valon_mob] + "\"";
-    next;
     mes "\"I'll be waiting here, come back and see after you've killed those mobs.\"";
     goto L_Close;
 
 L_QuestStarted:
     mes "[Valon]";
-    mes "Hail adventurer! You are well on your way to mastering the beasts of the desert.\"";
-    next;
+    mes "Hail adventurer! You are well on your way to mastering the beasts of the island.\"";
     mes "\"You need to kill " + $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob] + "\"";
-    next;
     mes "\"Come back and see me when the job is done.\"";
     goto L_Close;
 
 L_QuestOver:
     mes "[Valon]";
-    mes "\"Thanks once again for helping with the monsters in the desert.\"";
+    mes "\"Thanks once again for helping with the monsters in the island.\"";
     getexp 50, 0;
     set @valon_tmp, (@valon_state + 1);
     callfunc "setValonMask";
@@ -160,7 +150,7 @@ L_QuestOver:
 
 L_QuestComplete:
     mes "[Valon]";
-    mes "\"Thanks once again for helping with the monsters in the desert.\"";
+    mes "\"Thanks once again for helping with the monsters in the island.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/001-1/vincent.txt b/world/map/npc/029-1/vincent.txt
index 9f342d94..36ce4c2d 100644
--- a/world/map/npc/001-1/vincent.txt
+++ b/world/map/npc/029-1/vincent.txt
@@ -1,6 +1,27 @@
 // Variables used: nibble 2 of QUEST_SouthTulimshar
 
-001-1.gat,135,42,0|script|Vincent|113
+029-1.gat,108,108,0|script|Vincent Debug|113
+{
+    mes "[Vincent Debug]";
+    mes "Reset?";
+    menu
+        "Yes.", L_Reset,
+        "No.", L_Close;
+
+L_Reset:
+    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_2_MASK) | (0 << NIBBLE_2_SHIFT));
+    mes "Reset!";
+    goto L_Close;
+
+L_Close:
+    close;
+
+OnInit:
+    if (!debug)
+        disablenpc "Vincent Debug";
+    end;
+}
+029-1.gat,107,110,0|script|Vincent|113
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
@@ -25,12 +46,12 @@ L_Convince_Vincent_First:
     goto L_Opening1;
 
 L_Opening1:
-    mes "\"I just need 10 more Bug Legs to finish my action figure!\"";
+    mes "\"I just need 5 more Bug Legs to finish my action figure!\"";
     next;
     goto L_Ask;
 
 L_Opening2:
-    mes "\"This maggot action figure is awesome! I just need to attach 10 Bug Legs.\"";
+    mes "\"This maggot action figure is awesome! I just need to attach 5 Bug Legs.\"";
     next;
     goto L_Ask;
 
@@ -40,12 +61,12 @@ L_Opening3:
     goto L_Ask;
 
 L_Opening4:
-    mes "\"Can you get me 10 Bug Legs? I need them to replace the action figure parts.\"";
+    mes "\"Can you get me 5 Bug Legs? I need them to replace the action figure parts.\"";
     next;
     goto L_Ask;
 
 L_Ask:
-    mes "\"Will you help me find 10 Bug Legs?\"";
+    mes "\"Will you help me find 5 Bug Legs?\"";
     next;
     menu
         "Yes.", L_Sure,
@@ -85,23 +106,24 @@ L_Req4:
     goto L_Wait;
 
 L_Wait:
-    mes "\"Now please go get me 10 Bug Legs.\"";
+    mes "\"Now please go get me 5 Bug Legs.\"";
     goto L_Close;
 
 L_Progress:
-    if(countitem("BugLeg") >= 10)
+    if(countitem("BugLeg") >= 5)
         goto L_Have;
     mes "[Vincent]";
-    mes "\"Please help me collect 10 Bug Legs! I need them to complete my action figure.\"";
+    mes "\"Please help me collect 5 Bug Legs! I need them to complete my action figure.\"";
     goto L_Close;
 
 L_Have:
     mes "[Vincent]";
     mes "\"Excellent! Finally I can complete the model!!\"";
     next;
-    if(countitem("BugLeg") < 10)
+    if(countitem("BugLeg") < 5)
         goto L_Progress;
-    delitem "BugLeg", 10;
+    delitem "BugLeg", 5;
+    getexp 50, 0;
     set Zeny, Zeny + 1000;
     set @state, 2;
     callsub S_Update_Var;
diff --git a/world/map/npc/042-1/zegas.txt b/world/map/npc/029-1/zegas.txt
index 4a153ebe..8ecc55e4 100644
--- a/world/map/npc/042-1/zegas.txt
+++ b/world/map/npc/029-1/zegas.txt
@@ -1,9 +1,9 @@
 // Barrels
 // Author: Wushin
 // Npc
-042-1.gat,97,75,0|script|Zegas|165
+029-1.gat,45,85,0|script|Zegas|165
 {
-    setarray @npc_loc, 97, 75, 2;
+    setarray @npc_loc, 45, 85, 2;
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_Range;
@@ -67,7 +67,6 @@ L_QuestEnd:
     set Zeny, (Zeny + 50);
     set @barrel_tmp, 4;
     callfunc "SetBarrelMask";
-    next;
     goto L_Close;
 
 L_Thanks:
@@ -78,13 +77,13 @@ L_Thanks:
 L_Close:
     close;
 }
-042-1.gat,100,75,0|script|ZegasDebug|165
+029-1.gat,47,86,0|script|ZegasDebug|165
 {
     mes "[Zegas Debug]";
     mes "Reset ?";
     menu
         "Yes.", L_Reset,
-        "No.", L_End;
+        "No.", L_Close;
 
 L_Reset:
     set STARTAREA, (STARTAREA & ~(NIBBLE_4_MASK) | (0 << NIBBLE_4_SHIFT));
@@ -97,10 +96,10 @@ L_Reset:
     set STARTAREA, STARTAREA &~ (1 << 26);
     set STARTAREA, STARTAREA &~ (1 << 27);
     mes "Reset!";
-    goto L_End;
+    goto L_Close;
 
-L_End:
-    end;
+L_Close:
+    close;
 
 OnInit:
     if (!debug)
diff --git a/world/map/npc/029-2/_import.txt b/world/map/npc/029-2/_import.txt
new file mode 100644
index 00000000..bbf2ecdd
--- /dev/null
+++ b/world/map/npc/029-2/_import.txt
@@ -0,0 +1,13 @@
+// Map 029-2: Candor Island Indoor
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 029-2.gat
+npc: npc/029-2/_mobs.txt
+npc: npc/029-2/_warps.txt
+npc: npc/029-2/barrels.txt
+npc: npc/029-2/barrels_config.txt
+npc: npc/029-2/mapflags.txt
+npc: npc/029-2/morgan.txt
+npc: npc/029-2/sorfina.txt
+npc: npc/029-2/stat_reset.txt
+npc: npc/029-2/tanisha.txt
+npc: npc/029-2/two_arms.txt
diff --git a/world/map/npc/042-2/_mobs.txt b/world/map/npc/029-2/_mobs.txt
index 31c54238..faddfb5b 100644
--- a/world/map/npc/042-2/_mobs.txt
+++ b/world/map/npc/029-2/_mobs.txt
@@ -1,10 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Suburbs Indoor mobs
+// Candor Island Indoor mobs
 
-042-2.gat,33,57,24,7|monster|HouseMaggot|1050,7,100000ms,30000ms,Mob042-2::On1050
+029-2.gat,33,57,24,7|monster|HouseMaggot|1050,7,100000ms,30000ms,Mob029-2::On1050
 
 
-042-2.gat,0,0,0|script|Mob042-2|-1
+029-2.gat,0,0,0|script|Mob029-2|-1
 {
     end;
 
diff --git a/world/map/npc/029-2/_warps.txt b/world/map/npc/029-2/_warps.txt
new file mode 100644
index 00000000..258f224b
--- /dev/null
+++ b/world/map/npc/029-2/_warps.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Candor Island Indoor warps
+
+029-2.gat,29,62|warp|To Outside|-1,-1,029-1.gat,40,89
+029-2.gat,22,93|warp|To Outside|-1,-1,029-1.gat,44,84
+029-2.gat,112,84|warp|To Bedroom|-1,-1,029-2.gat,44,30
+029-2.gat,103,62|warp|To Outside|-1,-1,029-1.gat,52,85
+029-2.gat,94,31|warp|To Outside|-1,-1,029-1.gat,58,80
diff --git a/world/map/npc/042-2/barrels.txt b/world/map/npc/029-2/barrels.txt
index 60a0e163..aba6ed58 100644
--- a/world/map/npc/042-2/barrels.txt
+++ b/world/map/npc/029-2/barrels.txt
@@ -1,6 +1,6 @@
 // Barrels
 // Author: Wushin
-042-2.gat,23,86,0|script|Barrel#0|400
+029-2.gat,23,86,0|script|Barrel#0|400
 {
     setarray @npc_loc, 23, 86, 2;
     set @barrel, 0;
@@ -12,49 +12,49 @@ OnMaggotDeath:
     callfunc "MobPoints";
     end;
 }
-042-2.gat,28,86,0|script|Barrel#1|400
+029-2.gat,28,86,0|script|Barrel#1|400
 {
     setarray @npc_loc, 28, 86, 2;
     set @barrel, 1;
     callfunc "CheckBarrel";
     end;
 }
-042-2.gat,31,91,0|script|Barrel#2|400
+029-2.gat,31,91,0|script|Barrel#2|400
 {
     setarray @npc_loc, 31, 91, 2;
     set @barrel, 2;
     callfunc "CheckBarrel";
     end;
 }
-042-2.gat,36,85,0|script|Barrel#3|400
+029-2.gat,36,85,0|script|Barrel#3|400
 {
     setarray @npc_loc, 36, 85, 2;
     set @barrel, 3;
     callfunc "CheckBarrel";
     end;
 }
-042-2.gat,40,89,0|script|Barrel#4|400
+029-2.gat,40,89,0|script|Barrel#4|400
 {
     setarray @npc_loc, 40, 89, 2;
     set @barrel, 4;
     callfunc "CheckBarrel";
     end;
 }
-042-2.gat,38,91,0|script|Barrel#5|400
+029-2.gat,38,91,0|script|Barrel#5|400
 {
     setarray @npc_loc, 38, 91, 2;
     set @barrel, 5;
     callfunc "CheckBarrel";
     end;
 }
-042-2.gat,29,92,0|script|Barrel#6|400
+029-2.gat,29,92,0|script|Barrel#6|400
 {
     setarray @npc_loc, 29, 92, 2;
     set @barrel, 6;
     callfunc "CheckBarrel";
     end;
 }
-042-2.gat,24,91,0|script|Barrel#7|400
+029-2.gat,24,91,0|script|Barrel#7|400
 {
     setarray @npc_loc, 24, 91, 2;
     set @barrel, 7;
diff --git a/world/map/npc/042-2/barrels_config.txt b/world/map/npc/029-2/barrels_config.txt
index d125d9e1..5407a944 100644
--- a/world/map/npc/042-2/barrels_config.txt
+++ b/world/map/npc/029-2/barrels_config.txt
@@ -1,6 +1,6 @@
 // Barrels
 // Author: Wushin
-042-2.gat,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath
+029-2.gat,33,88,24,7|monster|HouseMaggot|1050,2,100000ms,30000ms,Barrel#0::OnMaggotDeath
 -|script|#BarrelConfig|-1
 {
     end;
@@ -33,7 +33,7 @@ function|script|CountBarrels
     goto L_Loop;
 
 L_Loop:    
-    if (STARTAREA & $@BarrelBits[@barrel_tmp])
+    if (STARTAREA & $@BarrelBits[@barrel_count])
         goto L_AddOne;
     goto L_LoopAgain;
 
@@ -92,6 +92,7 @@ L_QuestReward:
     goto L_Return;
 
 L_Spawn:
+    message strcharinfo(0), "Uck, More Maggots!";
     areamonster getmap() + ".gat", @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), $@BarrelSpawnName$, $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath";
     goto L_Return;
 
diff --git a/world/map/npc/029-2/mapflags.txt b/world/map/npc/029-2/mapflags.txt
new file mode 100644
index 00000000..ef75b6c6
--- /dev/null
+++ b/world/map/npc/029-2/mapflags.txt
@@ -0,0 +1,2 @@
+029-2.gat|mapflag|nosave|029-2,22,24
+029-2.gat|mapflag|resave|029-2,22,24
diff --git a/world/map/npc/042-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index ed6367ff..f6679f67 100644
--- a/world/map/npc/042-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -15,7 +15,7 @@ function|script|SetMorganMask
     set @morgan_tmp, 0;
     return;
 }
-042-2,105,57,0|script|MorganDebug|355
+029-2,105,57,0|script|MorganDebug|355
 {
     mes "[Morgan Debug]";
     mes "Reset?";
@@ -35,7 +35,7 @@ OnInit:
         disablenpc "MorganDebug";
     end;
 }
-042-2,101,57,0|script|Morgan|355
+029-2,101,57,0|script|Morgan#_M|355
 {
     setarray @npc_loc, 101, 57, 4;
     callfunc "PCtoNPCRange";
@@ -63,16 +63,11 @@ L_NotSeen:
     set @morgan_tmp, 1;
     callfunc "SetMorganMask";
     mes "[Morgan]";
-    mes "\"Welcome to the Magic Insitute of Tulimshar!\"";
-    next;
-    mes "\"My name is Morgan, I'm the Dean of Wizardry.\"";
-    next;
+    mes "\"Welcome to the magic school of Candor\"";
+    mes "\"My name is Morgan, I'm Head of Wizardry.\"";
     mes "\"You appear to have the markings to use magic.\"";
-    next;
     mes "\"Granted you are still to young to cast spells.\"";
-    next;
     mes "\"But we can teach you to use simple magic devices.\"";
-    next;
     mes "\"Would you like to learn some apprentice skills?\"";
     menu
         "Yes.", L_Start,
@@ -94,51 +89,42 @@ L_Start:
     set @morgan_tmp, 2;
     callfunc "SetMorganMask";
     mes "\"Great, lets begin your first lesson.\"";
-    next;
     getitem 1171, 1;
     mes "\"This is a wand, there are many like it but this one is now yours.\"";
-    next;
     mes "\"Various wands and staffs are found throughout the land with many different strengths and weaknesses.\"";
-    next;
     mes "\"To use the wand you need to have it equipped and speak the incantation to let it tap into your mana.\"";
-    next;
     mes "\"As the power of your magic grows so will the spells you can cast.\"";
-    next;
     mes "\"Lets start with a basic wand attack. " + getspellinvocation("wand") + "\"";
-    next;
     mes "\"Equip the wand and lets try out that spell.\"";
-    next;
+    mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
     mes "\"Speak to me again once you've cast the spell.\"";
     goto L_Close;
 
 L_Started:
     mes "[Morgan]";
     mes "\"Lets start with a basic wand attack. " + getspellinvocation("wand") + "\"";
-    next;
     mes "\"Equip the wand and lets try out that spell.\"";
-    next;
+    mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
     mes "\"Speak to me again once you've cast the spell.\"";
     goto L_Close;
 
 L_CastOnce:
     mes "[Morgan]";
     mes "\"Ok, good job! Looks like you have good mana flow.\"";
-    next;
     mes "\"Onto the next lesson. Now that you have " + getspellinvocation("wand") + " cast,\"";
-    next;
     mes "\"Each time you attack the wand will convert a bit of you mana into a magic bolt.\"";
-    next;
     mes "\"After so many attacks, you will need to recast the invocation to stay attuned to the wand.\"";
-    next;
     mes "\"(Logging out will also cancel any spell effects currently active in-game.).\"";
-    next;
     set @morgan_tmp, 4;
     callfunc "SetMorganMask";
     goto L_Close;
 
 L_LearningDone:
     mes "[Morgan]";
-    mes "\"I've taught you all I can for now. Come back later.\"";
+    mes "\"" + getspellinvocation("wand") + " is a basic wand attack.\"";
+    mes "\"A Wand must be equipped to use the spell.\"";
+    mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
+    mes "\"I've taught you all I can for now. You should visit the Mana Seed north west of Hurnscald.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 839a5f65..671835f1 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -1,57 +1,46 @@
 // This file is part of the Tutorial
 // Author: Jenalya
-042-2.gat,28,26,0|script|Sorfina|154,1,4
+029-2.gat,27,27,0|script|Sorfina|154,0,1
 {
-    setarray @npc_loc, 28, 26, 4;
+    setarray @npc_loc, 27, 27, 2;
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_Close;
-
-    callfunc "TutorialState";
-
-    if ((Hp != MaxHp) && (@tutorial >= 4))
-        goto L_Heal;
-    goto L_Main;
-
-L_Heal:
-    mes "[Sorfina]";
-    mes "\"Hello Dear! You look tired, you should rest a moment.\"";
-    mes "You take a short nap and feel refreshed.";
-    heal MaxHp, 0;
     goto L_Main;
 
 L_Main:
+    callfunc "TutorialState";
     if (@tutorial == 10) goto L_Hasan;
     if (@tutorial >= 4) goto L_Again;
     if (@tutorial == 3) goto L_Clothes;
-    if (@tutorial == 2) goto L_Chest;
+    if (@tutorial == 2) goto L_Dresser;
     if (@tutorial == 1) goto L_Carpet;
-
-    callfunc "GameRules";
     goto L_Start;
 
 L_Start:
     mes "You open your eyes.";
     mes "";
     mes "[Old Woman]";
-    mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar.";
-    mes "A group of ragtags immediately took advantage of that and stole all your stuff!\"";
-    next;
-    mes "\"My little granddaughter Tanisha saw that, but couldn't do anything to stop them.";
-    mes "She hurried to get someone to help. It was too late to catch the thieves, but at least the helpers brought you here to recover.\"";
-    next;
-    mes "\"We're in the suburbs of Tulimshar here and this area of the town is full of shady people, so I don't think there's a chance to get your stuff back.\"";
-    mes "She has a sad look on her face, but then she shakes her head and smiles.";
-    next;
+    mes "\"Ah, you woke up. You washed ashore on the beach 3 days ago. You've been asleep since.";
+    mes "You must have been thrown off one of the ships sailing during that last tremor.\"";
+    mes "\"My little granddaughter Tanisha found you. Kaan was able to carry you to bed.";
+    mes "We've been taking care of you ever since. Waiting for you to wake up.\"";
+    mes "\"You didn't have any possessions on you when we found you and no one knows who you are.\"";
+    mes "Do you have a name?";
+    menu
+        strcharinfo(0), L_Name;
+
+L_Name:
     mes "[Old Woman]";
-    mes "\"Did you come here to look for a job? Many young people come to Tulimshar for this reason.\"";
-    next;
-    mes "\"I can tell you some useful things, if you want to hear.";
+    mes "\"Well " + strcharinfo(0) + " what else can you tell me about yourself?.\"";
+    menu
+        "Umm... I... I don't remember anything...", L_KnowNothing;
+
+L_KnowNothing:
+    mes "[Old Woman]";
+    mes "\"Well I can tell you some useful things, if you want to hear.";
+    mes "Some of it might jog your memory or at least help you catch your bearings.";
     mes "Oh, and by the way my name is Sorfina.\"";
-    next;
-    mes "[Server]";
-    mes "The explanations in this tutorial are based on the official client, Manaplus.";
-    mes "If you're using another client, settings and controls may be different.";
     menu
         "That would be great!",L_Tut,
         "No, thanks. I already know how things are going.",L_SkipTut;
@@ -59,11 +48,10 @@ L_Start:
 L_Tut:
     mes "She smiles at you.";
     mes "[Sorfina]";
-    mes "\"A wise decision.\"";
-    next;
-    mes "\"You still look rather shaky.";
-    mes "You're not used to the hot weather, right?\"";
-    next;
+    mes "\"You have arrived at a very strange time. The Council is visiting Candor today.\"";
+    mes "\"All the recent rumbling from the cave has all of Candor worried.\"";
+    mes "\"Our guess is something with the last big shaker was the reason you ended up here.\"";
+    mes "\"Ok, lets start by getting you dressed.\"";
     goto L_Carpet;
 
 L_Carpet:
@@ -76,21 +64,17 @@ L_Carpet:
     callfunc "SetTutorialMask";
     goto L_Close;
 
-L_Chest:
+L_Dresser:
     mes "[Sorfina]";
-    mes "\"In that chest there are some clothes you can take.\"";
-    next;
+    mes "\"In that dresser there are some clothes you can wear.\"";
     mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press ###keyTargetNPC; to focus and ###keyTalk; to talk/activate.\"";
-    next;
-    mes "\"Now get the clothes out of the chest.\"";
+    mes "\"Now get the clothes out of the dresser.\"";
     goto L_Close;
 
 L_Naked:
     mes "[Sorfina]";
     mes "\"Press ###keyWindowInventory; or click on the Inventory button in the bar at the upper right corner to open your bag.\"";
-    next;
     mes "\"Once we stop talking, double-click on the clothes to equip.\"";
-    next;
     mes "\"Talk to me again after you get dressed. You can either click on me, or press ###keyTargetNPC; to focus on me and ###keyTalk; to talk.\"";
     goto L_Close;
 
@@ -99,24 +83,20 @@ L_Clothes:
         goto L_Naked;
     mes "[Sorfina]";
     mes "\"That's much better, don't you think?\"";
-    next;
     mes "\"Here take this.\"";
     getitem "HitchhikersTowel", 1;
     mes "\"Your HitchHikers Towel will return you to your last set soul menhir or here if not set.\"";
     mes "\"It can't be used constantly as the magic needs time to power the jump.\"";
-    next;
     mes "\"I think this will help you a bit. To get more information, press the button Setup and look at the controls on the Keyboard tab. You can also change them as you like.";
     mes "Talk to me again if you want me to explain more things.\"";
+
+    mes "\"Oh, and if you're looking for extra work, you should talk to Aidan and Valon when you go outside. They're giving rewards for monster hunting.";
+    mes "You can find Aidan near the camp fire outside and Valon out by the fields in the east.\"";
     next;
-    mes "\"Now you should go to see my granddaughter, she is very worried. She's downstairs.\"";
-    next;
-    mes "\"Oh, and if you're looking for work, you should talk to Aidan when you go to Tulimshar. They're giving rewards for monster hunting.";
-    mes "You can find him near the south gate.\"";
-    next;
-    mes "She hesitates a moment.";
-    mes "\"[Sorfina]\"";
-    mes "\"And here is some money for you. At least you can buy yourself something to eat.";
-    mes "Good luck!\"";
+
+    mes "She digs in her pocket for a moment.";
+    mes "\"And here is some money for you. Don't spend it all in one place.";
+    mes "Now go help Tanisha downstairs.\"";
     set Zeny, Zeny + 30;
     set @tutorial_tmp, 4;
     callfunc "SetTutorialMask";
@@ -127,15 +107,30 @@ L_Again:
     mes "\"Make yourself at home! Do you have any questions?\"";
     menu
         "Yes, could you explain about...",L_Explain,
+        "Could I get Healed?",L_Heal,
         "No, thanks.",L_Close;
 
+L_Heal:
+    if (BaseLevel > 20)
+        goto L_NoHeal;
+    mes "[Sorfina]";
+    mes "\"Hello Dear! You look tired, you should rest a moment.\"";
+    mes "You take a short nap and feel refreshed.";
+    heal MaxHp, 0;
+    goto L_Main;
+
+L_NoHeal:
+    mes "[Sorfina]";
+    mes "\"I'm sorry but your wounds are far to advanced for my skills.\"";
+    goto L_Main;
+
 L_Explain:
     menu
         "... walking?",L_Walk,
         "... talking?",L_Talk,
         "... the inventory and items?",L_Items,
         "... shortcuts?",L_Shortcut,
-        "... what to do in Tulimshar?",L_Aidan,
+        "... what to do in Candor?",L_Aidan,
         "... nevermind.",L_Close;
 
 L_Walk:
@@ -187,7 +182,7 @@ L_Items:
 
 L_Shortcut:
     mes "[Sorfina]";
-    mes "\"Press ###keyOutfitShortcut1; or click the Shortcut button in the bar at the upper right to open your shortcut window.\"";
+    mes "\"Press ###keyWindowShortcut; or click the Shortcut button in the bar at the upper right to open your shortcut window.\"";
     next;
     mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\"";
     next;
@@ -196,17 +191,15 @@ L_Shortcut:
 
 L_Aidan:
     mes "[Sorfina]";
-    mes "\"I suggest to go to the bazaar near the south gate.";
-    mes "We're in the north of Tulimshar here, so you have to walk across the town.\"";
+    mes "\"I heard Aidan and Valon are looking for brave adventurers, you might want to talk to them. ";
+    mes "You can find Aidan near the camp fire outside. The fields are just south of the town exit. ";
+    mes "You'll see Valon of the city gaurd standing there. They both are offering rewards for monster hunting.\"";
     next;
-    mes "\"When you leave this area to the Southeast, you'll come to the docks.";
-    mes "Follow the street to the south to pass the old town gates.\"";
+    mes "\"When you leave this area to the South, you'll come to the docks.";
+    mes "They will take you to Hurnscald, a major trading port.\"";
     next;
-    mes "\"Turn west at the next intersection. You'll pass by the gates of Tulimshar's famous magic school there.";
-    mes "Just follow the street to the south and you'll reach the bazaar.\"";
+    mes "\"Go east out of Candor and north. You will find the cave everyone is talking about to the north.";
     next;
-    mes "\"I heard Aidan is looking for brave adventurers, you might want to talk to him.";
-    mes "Usually the bazaar is bustling with activity, there are many people who can help.";
     mes "Talk to everybody. You can never tell when they might know something useful.\"";
     goto L_Close;
 
@@ -221,22 +214,15 @@ L_Hasan:
 L_Next:
     mes "\"Ah, Hasan. He's causing trouble again?\"";
     mes "She shakes her head.";
-    next;
     mes "[Sorfina]";
     mes "\This guy has been a plague ever since he could walk. He's always causing trouble.\"";
-    next;
     mes "\"And his father... Well, one day his father thought he should teach Hasan a lesson.\"";
-    next;
     mes "\"He took him into the desert and then left him there!";
     mes "Hasan was only seven years old!\"";
-    next;
     mes "\"I never understood how someone could do something like that to a child, even if it's a rascal like Hasan.\"";
-    next;
     mes "\"Anyway, Hasan tried to find his way back home, but stumbled into a nest of scorpions!\"";
     mes "She shakes her head.";
-    next;
     mes "\"If Valon hadn't have come along that moment, Hasan would have died that day.\"";
-    next;
     mes "\"However, the scorpions poison caused a bad fever and once Hasan had recovered from that, he was even more malicious than before.\"";
     mes "She sighs.";
     set @tutorial_tmp, 11;
@@ -252,30 +238,29 @@ L_SkipTut:
 
 L_Bye:
     mes "[Sorfina]";
-    mes "\"Alright, if you say so. But take at least this.";
+    mes "\"Alright, if you say so. But take at least this. See you later.\"";
     getitem "Knife", 1;
     getitem "SlingShot", 1;
-    getitem "SlingBullet", 100;
+    getitem "SlingBullet", 500;
     getitem "HitchhikersTowel", 1;
     getitem "CottonShirt", 1;
     getitem "RaggedShorts", 1;
     set Zeny, Zeny + 50;
     set @tutorial_tmp, 8;
     callfunc "SetTutorialMask";
-    mes "Good luck.\"";
     goto L_Close;
 
 L_Close:
     close;
 
 OnTouch:
-    if (TUT_var != 0)
+    callfunc "TutorialState";
+    if (@tutorial > 0)
         end;
-    callfunc "GameRules";
     goto L_Start;
 }
 
-042-2.gat,33,27,0|script|#Carpet|32767,1,1
+029-2.gat,33,27,0|script|#Carpet|32767,1,1
 {
     end;
 
@@ -284,39 +269,38 @@ OnTouch:
     if (@tutorial != 1)
         end;
     mes "[Sorfina]";
-    mes "\"Very good! I'm glad you're recovering.";
-    mes "Now you should get dressed again.\"";
-    next;
-    mes "Sorfina unlocks the chest behind her.";
-    next;
-    mes "[Sorfina]";
-    mes "\"In that chest there are some clothes you can take.\"";
-    next;
+    mes "\"You should get dressed now.\"";
+    mes "\"In that dresser there are some clothes you can wear.\"";
     mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.\"";
     next;
-    mes "\"Now get the clothes out of the chest.\"";
+    mes "\"Now get the clothes out of the dresser.\"";
     set @tutorial_tmp, 2;
     callfunc "SetTutorialMask";
     close;
 }
 
-042-2.gat,29,23,0|script|Chest#tutorial|111
+029-2.gat,29,23,0|script|Dresser#tutorial|400
 {
+    setarray @npc_loc, 29, 23, 2;
+    callfunc "PCtoNPCRange";
+    if (@npc_check)
+        goto L_CloseDis;
     callfunc "TutorialState";
     if (@tutorial > 2) goto L_Empty;
     if (@tutorial == 2) goto L_Shirt;
+    goto L_Walk;
 
-    mes "The chest is locked.";
+L_Walk:
+    mes "[Sorfina]";
+    mes "\"Thats not what I said to do. Please don't skip ahead.\"";
     close;
 
 L_Shirt:
-    mes "You take a simple Cotton Shirt and some very worn-out Ragged Shorts out of the chest.";
+    mes "You take a simple Cotton Shirt and some very worn-out Ragged Shorts out of the dresser.";
     getitem "CottonShirt", 1;
     getitem "RaggedShorts", 1;
-    next;
     mes "[Sorfina]";
     mes "\"Great! Now you can equip it.\"";
-    next;
     mes "\"You can open your inventory by pressing F3 or clicking on the 'Inventory' button in the bar at the upper right corner.\"";
     next;
     mes "\"After we finish talking, click on the clothes and press the equip button.\"";
@@ -325,22 +309,80 @@ L_Shirt:
     close;
 
 L_Empty:
-    mes "The chest is empty.";
+    mes "The dresser is empty.";
+    close;
+
+L_CloseDis:
+    mes "You cannot reach that far.";
     close;
 }
 
-042-2.gat,44,31,0|script|#DoorOutTut1|45,0,0
+029-2.gat,44,31,0|script|#DoorOutTut1|45,0,0
 {
     end;
 
 OnTouch:
     callfunc "TutorialState";
     if (@tutorial < 4)
-            goto L_Block;
-    warp "042-1.gat", 51, 44;
+        goto L_Block;
+    warp "029-2.gat", 112, 85;
     end;
 
 L_Block:
     message strcharinfo(0), "Sorfina: Wait a moment! You're not ready to leave.";
     end;
 }
+029-2.gat,23,24,0|script|#GameRules1|32767,0,1
+{
+    end;
+
+OnTouch:
+    if (TUT_var > 0)
+        end;
+    mes "[Server/Client Notice]";
+    mes "The explanations in this tutorial are based on the official client, Manaplus.";
+    mes "If you're using another client, settings and controls may be different.";
+    callfunc "GameRules";
+    close;
+}
+029-2.gat,21,24,0|script|#GameRules2|32767,0,1
+{
+    end;
+
+OnTouch:
+    if (TUT_var > 0)
+        end;
+    callfunc "GameRules";
+    mes "[Server/Client Notice]";
+    mes "The explanations in this tutorial are based on the official client, Manaplus.";
+    mes "If you're using another client, settings and controls may be different.";
+    close;
+}
+029-2.gat,22,26,0|script|#GameRules3|32767,1,0
+{
+    if (TUT_var == 0)
+        goto L_KnockBack;
+    goto L_Close;
+
+L_KnockBack:
+    message strcharinfo(0), "Please Accept the Game rules";
+    warp "029-2.gat", 22, 24;
+    goto L_Close;
+
+L_Close:
+    close;
+}
+029-2.gat,24,24,0|script|#GameRules4|32767,0,1
+{
+    if (TUT_var == 0)
+        goto L_KnockBack;
+    goto L_Close;
+
+L_KnockBack:
+    message strcharinfo(0), "Please Accept the Game rules";
+    warp "029-2.gat", 22, 24;
+    goto L_Close;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/042-2/stat_reset.txt b/world/map/npc/029-2/stat_reset.txt
index 43a13f5d..f3af6df6 100644
--- a/world/map/npc/042-2/stat_reset.txt
+++ b/world/map/npc/029-2/stat_reset.txt
@@ -1,6 +1,6 @@
 //
 
-042-2.gat,98,91,0|script|Jessie|159
+029-2.gat,98,92,0|script|Jessie|159
 {
     setarray @npc_loc, 98, 91, 4;
     callfunc "PCtoNPCRange";
@@ -35,10 +35,8 @@ L_Sorry:
     mes "[Jessie]";
     mes "\"My spell only works on the very young, sorry.\"";
     next;
-    mes "\"You can always try Mailvox in the Noble Quarter.\"";
+    mes "\"You can try Mailvox in the Tulimshar Bazaar or Wyara in the Potion Shop in Hurnscald.\"";
     next;
-    mes "\"Head east through the docks, then south into North Tulimshar,";
-    mes "Then go north east into the Noble Quarter, sitting behind a stall in the east.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index 2bfdf9ee..b45b5d06 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -2,18 +2,17 @@
 // Authors: Jenalya, alastrim
 // Cleanup: o11c
 
-042-2.gat,110,88,0|script|Tanisha|114
+029-2.gat,110,88,0|script|Tanisha|114
 {
     setarray @npc_loc, 110, 88, 4;
     callfunc "PCtoNPCRange";
     if (@npc_check)
         goto L_Close;
 
-    if (isin("042-2.gat", 98, 84, 106, 89))
+    if (isin("029-2.gat", 98, 84, 106, 89))
         goto L_Fighting;
 
     callfunc "TutorialState";
-    if (@tutorial == 10) goto L_Hasan;
     if (@tutorial >= 8) goto L_Tut_Done;
     if (@tutorial == 7) goto L_Stats;
     if (@tutorial == 6) goto L_Fail;
@@ -22,17 +21,15 @@
     mes "[Tanisha]";
     mes "\"Hey! You're up again!\"";
     emotion EMOTE_HAPPY;
-    next;
     mes "\"Are you feeling better?\"";
     menu
         "Yes, thank you.",L_Next,
-        "Yeah, but all my stuff is gone.",L_Next;
+        "Yeah, but everything is gone. My stuff and memories..",L_Next;
 
 L_Next:
     mes "[Tanisha]";
     mes "\"I'm glad you're feeling better. It was really bad luck what happened to you.";
     mes "Hey, I have an idea.\"";
-    next;
     set @tutorial_tmp, 5;
     callfunc "SetTutorialMask";
     goto L_Maggots;
@@ -41,7 +38,6 @@ L_Maggots:
     mes "[Tanisha]";
     mes "\"There are some maggots eating the goods and I'm supposed to get rid of them.";
     mes "But they're so yucky!\"";
-    next;
     mes "\"If you kill them, I'll give you my knife.";
     mes "What do you say?\"";
     menu
@@ -49,19 +45,19 @@ L_Maggots:
 
 L_Next1:
     mes "[Tanisha]";
-    mes "\"Wonderful!\"";
+    mes "\"Wonderful.";
     // since the check happens here, it is actually possible to have
     // more than $@Maggot_MaxHunters in the area at one time
     // but that's not a BIG problem
-    if (getareausers("042-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters)
+    if (getareausers("029-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters)
         goto L_Crowded;
     next;
     goto L_Fight_Again;
 
 L_Fight_Again:
+    mes "[Tanisha]";
     mes "\"Ok, listen what to do.";
     mes "Equip a weapon and kill the maggots.\"";
-    next;
     mes "\"Press ###keyTargetMonster; to focus on a monster. With ###keyTargetAttack; you can focus and start attacking the same time.";
     mes "But it also works to click on the monster with your mouse.\"";
     next;
@@ -83,7 +79,7 @@ L_GetFightItems:
     callfunc "SetTutorialMask";
     getitem "Knife", 1;
     getitem "SlingShot", 1;
-    getitem "SlingBullet", 100;
+    getitem "SlingBullet", 500;
     goto L_ContinueFight;
 
 L_ContinueFight:
@@ -91,58 +87,37 @@ L_ContinueFight:
     callfunc "SetTutorialMask";
     set @Maggot_Kills, 0;
     set @time, 0;
-    if (getareausers("042-2.gat", 98, 84, 106, 89) == 0)
+    if (getareausers("029-2.gat", 98, 84, 106, 89) == 0)
         initnpctimer;
-    warp "042-2.gat", 101, 87;
+    warp "029-2.gat", 101, 87;
     goto L_Summon;
 
 L_Summon:
-    areamonster "042-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
+    areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
     end;
 
 L_Stats:
     mes "[Tanisha]";
     mes "\"That was great! Like a professional exterminator!\"";
-    next;
     mes "\"And it seems you became stronger and more experienced.";
     mes "That means you got some status points which you can use to increase your abilities.\"";
-    next;
     mes "\"Press ###keyWindowStatus; or click the Status button in the bar at the upper right to see your status window. There you can distribute your points on six different properties.\"";
     next;
-    mes "\"My Uncle sitting at the counter knows a spell to help the younglings reset their stats.\"";
-    next;
-    mes "\"He also knows of mages with even more powerful reset spells.\"";
-    next;
-    mes "\"Some strange wizard lurking around in the Tulimshar Noble Quarter.\"";
-    next;
     goto L_StatsRe;
 
 L_StatsRe:
     mes "\"Strength makes you hit harder and you can carry more weight.\"";
-    next;
     mes "\"Agility increases your attack speed and your ability to dodge attacks.\"";
-    next;
     mes "\"Vitality gives you more hit points and more defense against physical attacks.\"";
-    next;
     mes "\"Intelligence is useful for magic attack and defense.";
     mes "But as long as you don't know any magic, you shouldn't use your points on this.\"";
-    next;
     mes "\"Dexterity is needed to hit monsters. It's also very important for the damage if you use a ranged weapon.\"";
-    next;
     mes "\"Luck gives you the chance to do critical hits and lowers the chance to receive a critical hit from your opponent.\"";
     next;
     mes "\"Think about how you want to play before assigning the points.\"";
-    next;
     mes "\"My Uncle sitting at the counter knows a spell to help the younglings reset their stats.\"";
-    next;
     mes "\"He also knows of mages with even more powerful reset spells.\"";
     next;
-    mes "\"Some strange wizard lurking around in the Tulimshar Noble Quarter.\"";
-    next;
-    mes "Tanisha looks at you with wide opened eyes.";
-    next;
-    mes "[Tanisha]";
-    mes "\"But I doubt he'd do that without a service in return.\"";
     callfunc "TutorialState";
     if (@tutorial == 7)
         goto L_Money;
@@ -160,7 +135,7 @@ L_Money:
     goto L_Advice;
 
 L_Advice:
-    mes "\"When you go to Tulimshar, you should see Bernard. He can make a delicious soup!";
+    mes "\"When you go to Hurnscald, you should see Bernard. He can make a delicious soup!";
     mes "Good luck!\"";
     emotion EMOTE_HAPPY;
     goto L_Close;
@@ -170,7 +145,7 @@ L_Explain:
         "... how to fight?",L_Fight,
         "... monsters?",L_Mob,
         "... status points?",L_StatsRe,
-        "... what to do in Tulimshar?",L_Advice,
+        "... what to do in Hurnscald?",L_Advice,
         "... nevermind.",L_Close;
 
 L_Fight:
@@ -197,31 +172,11 @@ L_Mob:
     mes "\"Assistants are monsters who help each other.\"";
     goto L_Close;
 
-L_Hasan:
-    mes "[Tanisha]";
-    mes "\"Hi there! Is everything alright? Do you have questions?\"";
-    menu
-        "A guy named Hasan is being mean.",L_Next3,
-        "Yes, could you explain again about...",L_Explain,
-        "No, thanks.",L_Close;
-
-L_Next3:
-    mes "[Tanisha]";
-    mes "\"Bah, Hasan. He's a jerk. But he's very strong.\"";
-    next;
-    mes "\"The only thing he's afraid of are scorpions.";
-    mes "I'm not sure why, some bad experience when he was a child.";
-    mes "That was before I was born.\"";
-    set @tutorial_tmp, 11;
-    callfunc "SetTutorialMask";
-    goto L_Close;
-
 L_Tut_Done:
     mes "[Tanisha]";
     mes "\"These yucky maggots! They're eating our goods!";
     mes "No matter how many of them you kill, they always come back.\"";
     mes "She sighs.";
-    next;
     mes "[Tanisha]";
     mes "\"Do you have any questions?\"";
     menu
@@ -232,12 +187,11 @@ L_Crowded:
     mes "[Tanisha]";
     mes "\"That's great! But...";
     mes "it seems a little crowded in there.\"";
-    next;
     mes "\"Let's wait a short while.\"";
     goto L_Close;
 
 L_Sleep:
-    warp "042-2.gat", 101, 87;
+    warp "029-2.gat", 101, 87;
     mes "[Tanisha]";
     mes "\"What are you doing in there?";
     mes "Sleeping?";
@@ -245,7 +199,7 @@ L_Sleep:
     set @Maggot_Kills, 0;
     set @time, 0;
     close2;
-    if (getareausers("042-2.gat", 98, 84, 106, 89) == 0)
+    if (getareausers("029-2.gat", 98, 84, 106, 89) == 0)
         goto L_CleanUp;
     end;
 
@@ -253,9 +207,7 @@ L_Fail:
     mes "Tanisha seems to be trying hard to supress laughter.";
     mes "[Tanisha]";
     mes "\"The maggots defeated you.\"";
-    next;
     mes "She bursts out with laughter.";
-    mes "[Tanisha]";
     mes "\"Oops, I'm sorry. It's just too funny.";
     mes "Do you want to try it again?\"";
     menu
@@ -263,7 +215,7 @@ L_Fail:
         "No, I need a rest.", L_Close;
 
 L_Next2:
-    if (getareausers("042-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters)
+    if (getareausers("029-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters)
         goto L_Crowded;
     goto L_Fight_Again;
 
@@ -273,17 +225,17 @@ L_Fighting:
 
 OnTimer1000:
     setnpctimer 0;
-    if (getareausers("042-2.gat", 98, 84, 106, 89) == 0)
+    if (getareausers("029-2.gat", 98, 84, 106, 89) == 0)
         goto L_CleanUp;
     // This is needed because multiple players can be in the area at once
-    areatimer "042-2.gat", 98, 84, 106, 89, 0, "Tanisha::OnTick";
+    areatimer "029-2.gat", 98, 84, 106, 89, 0, "Tanisha::OnTick";
     end;
 
 L_CleanUp:
-    killmonster "042-2.gat", "Tanisha::OnMaggotDeath";
+    killmonster "029-2.gat", "Tanisha::OnMaggotDeath";
     set $@Maggot_Hunters, 0;
     stopnpctimer;
-    areamonster "042-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
+    areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
     end;
 
 OnTick:
@@ -305,17 +257,17 @@ OnMaggotDeath:
         message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!";
     if (@Maggot_Kills == 3)
         message strcharinfo(0), "Tanisha: Yuck... I think I am getting sick.";
-    if (isin("042-2.gat", 98, 84, 106, 89))
+    if (isin("029-2.gat", 98, 84, 106, 89))
         set @Maggot_Kills, @Maggot_Kills + 1;
     if (@Maggot_Kills < 5)
         goto L_Summon;
     // else, complete
-    warp "042-2.gat", 110, 88;
+    warp "029-2.gat", 110, 88;
     set @tutorial_tmp, 7;
     callfunc "SetTutorialMask";
     set @Maggot_Kills, 0;
     set @time, 0;
-    if (getareausers("042-2.gat", 98, 84, 106, 89) == 0)
+    if (getareausers("029-2.gat", 98, 84, 106, 89) == 0)
         goto L_CleanUp;
     end;
 
@@ -324,10 +276,10 @@ L_Close:
 
 OnInit:
     set $@Maggot_MaxHunters, 4;
-    areamonster "042-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
+    areamonster "029-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath";
     end;
 }
-042-2.gat,114,93,0|script|#DoorOutTut2|45,0,0
+029-2.gat,114,93,0|script|#DoorOutTut2|45,0,0
 {
     end;
 
@@ -338,7 +290,7 @@ OnTouch:
     goto L_Block;
 
 L_Warp:
-    warp "042-1.gat", 63, 48;
+    warp "029-1.gat", 32, 100;
     end;
 
 L_Block:
diff --git a/world/map/npc/029-2/two_arms.txt b/world/map/npc/029-2/two_arms.txt
new file mode 100644
index 00000000..33b4b843
--- /dev/null
+++ b/world/map/npc/029-2/two_arms.txt
@@ -0,0 +1,4 @@
+// Forge Shops
+
+029-2.gat,99,25,0|shop|Rosen|311,SlingShot:*500,SlingBullet:*1,ShortBow:*8000,Arrow:*1,IronArrow:*4
+029-2.gat,112,24,0|shop|Toichi|377,Knife:*50,SharpKnife:*100,Dagger:*1000,LeatherShirt:*2000,LeatherShield:*2000
diff --git a/world/map/npc/029-3/barrier.txt b/world/map/npc/029-3/barrier.txt
index 27b472cf..e1d2c399 100644
--- a/world/map/npc/029-3/barrier.txt
+++ b/world/map/npc/029-3/barrier.txt
@@ -1,7 +1,7 @@
-029-3.gat,46,21,0|script|#FightCaveBarrier|45,0,0
+029-3.gat,49,54,0|script|#FightCaveBarrier|45,0,0
 {
     if ($@FIGHT_CAVE_STATUS == 1) goto L_Block;
-    warp "029-1.gat", 54, 39;
+    warp "029-1.gat", 69, 62;
     end;
 
 L_Block:
diff --git a/world/map/npc/029-3/mapflags.txt b/world/map/npc/029-3/mapflags.txt
index 549377f1..f7cfbcaf 100644
--- a/world/map/npc/029-3/mapflags.txt
+++ b/world/map/npc/029-3/mapflags.txt
@@ -1,2 +1,2 @@
-029-3.gat|mapflag|nosave|029-1,69,69
-029-3.gat|mapflag|resave|029-1,69,69
+029-3.gat|mapflag|nosave|029-1,39,102
+029-3.gat|mapflag|resave|029-1,39,102
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index e05b3d67..ba656244 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -16,16 +16,7 @@ L_Explain:
     mes "[Frozenbeard]";
     mes "\"Arrr mate! I pioneered the trade routes between Nivalis and the rest of the World, so now merchants and adventurers can travel to and fro without any hassle other than the harsh weather up here, yarr.\"";
     next;
-    mes "\"You wait on the dock for the ship to come in. You'll be given a chance to board the boat when it comes into port.\"";
-    mes "\"It lingers in port to allow you some time to board in case you are running behind.\"";
-    mes "\"Once on the ship, it will sail to different ports and annouce where it is docking.\"";
-    next;
-    mes "\"There are 2 Ferrys, both ferrys are free to ride.\"";
-    mes "\"The Main ferry travels from Argeas, Kaizei and Tonori. It docks in the major ports Hurnscald, Nivalis and the Tulimshar South Dock.\"";
-    mes "\"The Candor Ferry only travels betwen Candor and the Tulimshar North Dock.\"";
-    next;
-    mes "\"Refreshments and supplies are offered aboard both ships during the voyage.\"";
-    mes "\"We also have some slot machines in case you get bored.\"";
+    callfunc "FerryHelp";
     goto L_Main;
 
 L_Close:
diff --git a/world/map/npc/032-1/_import.txt b/world/map/npc/032-1/_import.txt
deleted file mode 100644
index 00df1589..00000000
--- a/world/map/npc/032-1/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// Map 032-1: Outback
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 032-1.gat
-npc: npc/032-1/_mobs.txt
-npc: npc/032-1/_warps.txt
-npc: npc/032-1/mapflags.txt
-npc: npc/032-1/miriam.txt
diff --git a/world/map/npc/032-1/_mobs.txt b/world/map/npc/032-1/_mobs.txt
deleted file mode 100644
index 5c41b90a..00000000
--- a/world/map/npc/032-1/_mobs.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Outback mobs
-
-032-1.gat,47,64,27,15|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-1::On1009
-032-1.gat,24,72,27,24|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-1::On1009
-032-1.gat,24,48,25,21|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-1::On1009
-032-1.gat,57,44,23,18|monster|Snake|1010,13,30000ms,100000ms,Mob032-1::On1010
-032-1.gat,77,76,34,27|monster|Snake|1010,13,30000ms,100000ms,Mob032-1::On1010
-
-
-032-1.gat,0,0,0|script|Mob032-1|-1
-{
-    end;
-
-On1009:
-    set @mobID, 1009;
-    callfunc "MobPoints";
-    end;
-
-On1010:
-    set @mobID, 1010;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/032-1/_warps.txt b/world/map/npc/032-1/_warps.txt
deleted file mode 100644
index bdef5c3f..00000000
--- a/world/map/npc/032-1/_warps.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Outback warps
-
-032-1.gat,64,52|warp|To Outback Cave|-1,-1,032-3.gat,56,60
diff --git a/world/map/npc/032-1/mapflags.txt b/world/map/npc/032-1/mapflags.txt
deleted file mode 100644
index 534224b6..00000000
--- a/world/map/npc/032-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-032-1.gat|mapflag|resave|032-1,77,23
diff --git a/world/map/npc/032-3/_warps.txt b/world/map/npc/032-3/_warps.txt
index b84c4e2c..f4569169 100644
--- a/world/map/npc/032-3/_warps.txt
+++ b/world/map/npc/032-3/_warps.txt
@@ -2,4 +2,4 @@
 // Outback Cave warps
 
 032-3.gat,128,34|warp|To Desert Mountains|-1,-1,006-1.gat,30,124
-032-3.gat,56,61|warp|To Outback|-1,-1,032-1.gat,64,53
+032-3.gat,56,61|warp|To Desert Mountains|-1,-1,006-1.gat,111,111
diff --git a/world/map/npc/032-3/mapflags.txt b/world/map/npc/032-3/mapflags.txt
index 3c28a3a0..d619bf99 100644
--- a/world/map/npc/032-3/mapflags.txt
+++ b/world/map/npc/032-3/mapflags.txt
@@ -1 +1 @@
-032-3.gat|mapflag|resave|032-1,77,23
+032-3.gat|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/035-2/koga.txt b/world/map/npc/035-2/koga.txt
index c38221a4..616de0f3 100644
--- a/world/map/npc/035-2/koga.txt
+++ b/world/map/npc/035-2/koga.txt
@@ -17,7 +17,7 @@ L_Leave:
     goto L_Close;
 
 L_Tulimshar:
-    warp "022-1.gat", 76, 72;
+    warp "001-1.gat", 63, 73;
     goto L_Close;
 
 L_Hurnscald:
diff --git a/world/map/npc/036-2/emblems.txt b/world/map/npc/036-2/emblems.txt
index ed73729b..1c8bad11 100644
--- a/world/map/npc/036-2/emblems.txt
+++ b/world/map/npc/036-2/emblems.txt
@@ -1,11 +1,11 @@
-036-2.gat,29,27,0|script|#k2city1e|410
+036-2.gat,29,27,0|script|#k2city1e|412
 {
   end;
   OnInit:
     disablenpc "#k2city1e";
   end;
 }
-036-2.gat,29,27,0|script|#k2city1d|411
+036-2.gat,29,27,0|script|#k2city1d|413
 {
   end;
 }
diff --git a/world/map/npc/036-2/koga-candor.txt b/world/map/npc/036-2/koga-candor.txt
index 555fbec5..3b9fd932 100644
--- a/world/map/npc/036-2/koga-candor.txt
+++ b/world/map/npc/036-2/koga-candor.txt
@@ -11,15 +11,15 @@ L_Leave:
     if ($@CandorCurrentDock == 0)
         goto L_Candor;
     if ($@CandorCurrentDock == 1)
-        goto L_Tulimshar;
+        goto L_Hurnscald;
     goto L_Close;
 
-L_Tulimshar:
-    warp "022-1.gat", 60, 33;
+L_Hurnscald:
+    warp "008-1.gat", 137, 75;
     goto L_Close;
 
 L_Candor:
-    warp "029-1.gat", 25, 37;
+    warp "029-1.gat", 46, 109;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/041-1/_import.txt b/world/map/npc/041-1/_import.txt
deleted file mode 100644
index f7ba8d9e..00000000
--- a/world/map/npc/041-1/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 041-1: Beach
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 041-1.gat
-npc: npc/041-1/_mobs.txt
-npc: npc/041-1/_warps.txt
-npc: npc/041-1/mapflags.txt
diff --git a/world/map/npc/041-1/_mobs.txt b/world/map/npc/041-1/_mobs.txt
deleted file mode 100644
index 85362452..00000000
--- a/world/map/npc/041-1/_mobs.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach mobs
-
-041-1.gat,81,55,18,9|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003
-041-1.gat,101,67,18,9|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003
-041-1.gat,100,84,18,9|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003
-041-1.gat,61,34,13,20|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003
-041-1.gat,55,30,10,48|monster|SeaSlime|1033,3,100000ms,30000ms,Mob041-1::On1033
-041-1.gat,59,13,10,9|monster|Scorpion|1003,3,100000ms,30000ms,Mob041-1::On1003
-041-1.gat,60,7,3,2|monster|TameScorpion|1046,1,100000ms,30000ms,Mob041-1::On1046
-041-1.gat,66,49,3,2|monster|TameScorpion|1046,1,100000ms,30000ms,Mob041-1::On1046
-041-1.gat,95,75,21,9|monster|TameScorpion|1046,1,100000ms,30000ms,Mob041-1::On1046
-041-1.gat,100,57,18,9|monster|RedScorpion|1004,3,100000ms,30000ms,Mob041-1::On1004
-041-1.gat,83,64,18,9|monster|RedScorpion|1004,3,100000ms,30000ms,Mob041-1::On1004
-
-
-041-1.gat,0,0,0|script|Mob041-1|-1
-{
-    end;
-
-On1003:
-    set @mobID, 1003;
-    callfunc "MobPoints";
-    end;
-
-On1004:
-    set @mobID, 1004;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-
-On1046:
-    set @mobID, 1046;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/041-1/_warps.txt b/world/map/npc/041-1/_warps.txt
deleted file mode 100644
index 736486dc..00000000
--- a/world/map/npc/041-1/_warps.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach warps
-
-041-1.gat,101,95|warp|To Beach|1,-1,004-1.gat,68,20
-041-1.gat,58,4|warp|To Tulimshar Suburbs|1,-1,042-1.gat,44,113
diff --git a/world/map/npc/041-1/mapflags.txt b/world/map/npc/041-1/mapflags.txt
deleted file mode 100644
index 59863e5d..00000000
--- a/world/map/npc/041-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-041-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt
deleted file mode 100644
index 0c712a7c..00000000
--- a/world/map/npc/042-1/_import.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Map 042-1: Tulimshar Suburbs
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 042-1.gat
-npc: npc/042-1/_mobs.txt
-npc: npc/042-1/_warps.txt
-npc: npc/042-1/hasan.txt
-npc: npc/042-1/kaan.txt
-npc: npc/042-1/liana.txt
-npc: npc/042-1/mapflags.txt
-npc: npc/042-1/tutorial.txt
-npc: npc/042-1/valon.txt
-npc: npc/042-1/zegas.txt
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
deleted file mode 100644
index 1482fefa..00000000
--- a/world/map/npc/042-1/_mobs.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Suburbs mobs
-
-042-1.gat,101,69,31,15|monster|Maggot|1002,5,100000ms,30000ms,Mob042-1::On1002
-042-1.gat,65,59,27,15|monster|Maggot|1002,7,100000ms,30000ms,Mob042-1::On1002
-042-1.gat,68,102,7,8|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
-042-1.gat,98,88,5,8|monster|Scorpion|1003,4,100000ms,30000ms,Mob042-1::On1003
-042-1.gat,63,63,37,30|monster|TameScorpion|1046,6,100000ms,30000ms,Mob042-1::On1046
-042-1.gat,85,102,5,8|monster|Scorpion|1003,5,100000ms,30000ms,Mob042-1::On1003
-042-1.gat,98,99,5,5|monster|Scorpion|1003,3,100000ms,30000ms,Mob042-1::On1003
-042-1.gat,82,87,6,3|monster|Scorpion|1003,2,100000ms,30000ms,Mob042-1::On1003
-042-1.gat,70,88,5,8|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
-042-1.gat,80,35,11,5|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
-
-
-042-1.gat,0,0,0|script|Mob042-1|-1
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1003:
-    set @mobID, 1003;
-    callfunc "MobPoints";
-    end;
-
-On1009:
-    set @mobID, 1009;
-    callfunc "MobPoints";
-    end;
-
-On1046:
-    set @mobID, 1046;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
deleted file mode 100644
index bf32dc06..00000000
--- a/world/map/npc/042-1/_warps.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Suburbs warps
-
-042-1.gat,97,41|warp|To Tulismhar Docks|-1,2,022-1.gat,21,37
-042-1.gat,65,20|warp|To Lighthouse Beach|0,-1,023-1.gat,64,143
-042-1.gat,91,72|warp|To Store House|-1,-1,042-2.gat,22,92
-042-1.gat,104,72|warp|To Store House|-1,-1,042-2.gat,44,92
-042-1.gat,65,74|warp|To Tulimshar Suburbs Ho|-1,-1,042-2.gat,29,61
-042-1.gat,62,42|warp|To Sorfina's Dinner|-1,-1,042-2.gat,112,85
-042-1.gat,51,43|warp|To Sorfina's House|-1,-1,042-2.gat,44,30
-042-1.gat,117,101|warp|To Magic School Researc|-1,-1,042-2.gat,103,62
-042-1.gat,112,95|warp|To Magic School Researc|-1,-1,042-2.gat,94,54
-042-1.gat,120,95|warp|To Magic School Researc|-1,-1,042-2.gat,112,54
-042-1.gat,117,85|warp|To Tulismhar Docks|-1,-1,022-1.gat,41,82
-042-1.gat,44,115|warp|To Tulismhar Outskirts|1,-1,041-1.gat,58,6
diff --git a/world/map/npc/042-1/liana.txt b/world/map/npc/042-1/liana.txt
deleted file mode 100644
index c6df63a9..00000000
--- a/world/map/npc/042-1/liana.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-
-042-1.gat,82,96,0|script|Liana|205
-{
-    setarray @npc_loc, 82, 96, 4;
-    callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_End;
-    goto L_Talk;
-
-L_Talk:
-    mes "[Liana]";
-    mes "\"Tulimshar is a large city. I'm sure glad I live in the suburbs because I know where everything's at.\"";
-    next;
-    mes "\"I think Tanisha is in the building to the right. That girl is growing up fast.\"";
-    goto L_Close;
-
-L_End:
-    mes "You'll have to move closer";
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/042-1/mapflags.txt b/world/map/npc/042-1/mapflags.txt
deleted file mode 100644
index 3c0e8f71..00000000
--- a/world/map/npc/042-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-042-1.gat|mapflag|resave|042-2,26,26
diff --git a/world/map/npc/042-2/_import.txt b/world/map/npc/042-2/_import.txt
deleted file mode 100644
index 7522e5e2..00000000
--- a/world/map/npc/042-2/_import.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Map 042-2: Tulimshar Suburbs Indoor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 042-2.gat
-npc: npc/042-2/_mobs.txt
-npc: npc/042-2/_warps.txt
-npc: npc/042-2/barrels.txt
-npc: npc/042-2/barrels_config.txt
-npc: npc/042-2/magic_basement.txt
-npc: npc/042-2/mapflags.txt
-npc: npc/042-2/morgan.txt
-npc: npc/042-2/sorfina.txt
-npc: npc/042-2/stat_reset.txt
-npc: npc/042-2/tanisha.txt
diff --git a/world/map/npc/042-2/_warps.txt b/world/map/npc/042-2/_warps.txt
deleted file mode 100644
index 3fa81e27..00000000
--- a/world/map/npc/042-2/_warps.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Suburbs Indoor warps
-
-042-2.gat,29,62|warp|To Outside|-1,-1,042-1.gat,65,76
-042-2.gat,22,93|warp|To Outside|-1,-1,042-1.gat,91,74
-042-2.gat,44,93|warp|To Outside|-1,-1,042-1.gat,104,74
-042-2.gat,112,84|warp|To Outside|-1,-1,042-1.gat,62,41
-042-2.gat,94,53|warp|To Outside|-1,-1,042-1.gat,112,94
-042-2.gat,112,53|warp|To Outside|-1,-1,042-1.gat,120,94
-042-2.gat,103,62|warp|To Outside|-1,-1,042-1.gat,117,103
diff --git a/world/map/npc/042-2/magic_basement.txt b/world/map/npc/042-2/magic_basement.txt
deleted file mode 100644
index 0817375d..00000000
--- a/world/map/npc/042-2/magic_basement.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// 
-// Author: Wushin
-
-042-2.gat,103,56,0|script|#MagicBasement|400,0,0
-{
-    callfunc "MorganState";
-    if (@morgan < 4)
-        goto L_Close;
-    mes "Descend into the basement?";
-    next;
-    menu
-        "Yes.", L_MagicBase,
-        "Nevermind.", L_Close;
-
-L_MagicBase:
-    warp "042-3",24,21;
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/042-2/mapflags.txt b/world/map/npc/042-2/mapflags.txt
deleted file mode 100644
index 80f1928e..00000000
--- a/world/map/npc/042-2/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-042-2.gat|mapflag|nosave|042-2,26,26
-042-2.gat|mapflag|resave|042-2,26,26
diff --git a/world/map/npc/042-3/_import.txt b/world/map/npc/042-3/_import.txt
deleted file mode 100644
index 2bc1c9d9..00000000
--- a/world/map/npc/042-3/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// Map 042-3: Mages Passage
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 042-3.gat
-npc: npc/042-3/_mobs.txt
-npc: npc/042-3/_warps.txt
diff --git a/world/map/npc/042-3/_mobs.txt b/world/map/npc/042-3/_mobs.txt
deleted file mode 100644
index 5c2d6d9e..00000000
--- a/world/map/npc/042-3/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Mages Passage mobs
-
-
-
-042-3.gat,0,0,0|script|Mob042-3|-1
-{
-    end;
-}
diff --git a/world/map/npc/042-3/_warps.txt b/world/map/npc/042-3/_warps.txt
deleted file mode 100644
index dffcb6da..00000000
--- a/world/map/npc/042-3/_warps.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Mages Passage warps
-
-042-3.gat,57,46|warp|To Tulimshar Canyon|2,-1,024-1.gat,80,31
-042-3.gat,24,20|warp|To Magic Insitute of Tu|-1,-1,042-2.gat,103,55
diff --git a/world/map/npc/043-1/_import.txt b/world/map/npc/043-1/_import.txt
deleted file mode 100644
index 4e21bda1..00000000
--- a/world/map/npc/043-1/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// Map 043-1: Beach
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 043-1.gat
-npc: npc/043-1/_mobs.txt
-npc: npc/043-1/_warps.txt
-npc: npc/043-1/mapflags.txt
-npc: npc/043-1/ryger.txt
diff --git a/world/map/npc/043-1/_mobs.txt b/world/map/npc/043-1/_mobs.txt
deleted file mode 100644
index 3f601fce..00000000
--- a/world/map/npc/043-1/_mobs.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach mobs
-
-043-1.gat,0,0,0,0|monster|SeaSlime|1033,17,40000ms,30000ms,Mob043-1::On1033
-043-1.gat,0,0,0,0|monster|YellowSlime|1007,15,60000ms,60000ms,Mob043-1::On1007
-043-1.gat,0,0,0,0|monster|GreenSlime|1005,20,60000ms,60000ms,Mob043-1::On1005
-
-
-043-1.gat,0,0,0|script|Mob043-1|-1
-{
-    end;
-
-On1005:
-    set @mobID, 1005;
-    callfunc "MobPoints";
-    end;
-
-On1007:
-    set @mobID, 1007;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/043-1/_warps.txt b/world/map/npc/043-1/_warps.txt
deleted file mode 100644
index 2f2c590f..00000000
--- a/world/map/npc/043-1/_warps.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach warps
-
-043-1.gat,43,19|warp|To Beach|4,-1,003-1.gat,114,116
-043-1.gat,85,54|warp|To Mining Camp|-1,-1,002-3.gat,22,85
-043-1.gat,52,38|warp|To Sandy Dungeon|-1,-1,043-3.gat,31,35
diff --git a/world/map/npc/043-1/mapflags.txt b/world/map/npc/043-1/mapflags.txt
deleted file mode 100644
index da09b939..00000000
--- a/world/map/npc/043-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-043-1.gat|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/043-1/ryger.txt b/world/map/npc/043-1/ryger.txt
deleted file mode 100644
index d814d0b5..00000000
--- a/world/map/npc/043-1/ryger.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Sandstorm mine guard
-
-043-1.gat,88,60,0|script|Ryger|123
-{
-    mes "[Ryger]";
-    mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/043-3/_warps.txt b/world/map/npc/043-3/_warps.txt
index 11506fb8..5decf57c 100644
--- a/world/map/npc/043-3/_warps.txt
+++ b/world/map/npc/043-3/_warps.txt
@@ -1,5 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Sandy Dungeon Level 1 warps
 
-043-3.gat,32,36|warp|To Beach|0,-1,043-1.gat,52,39
+043-3.gat,31,26|warp|Mine Camp|-1,-1,002-3.gat,22,86
 043-3.gat,77,30|warp|To Lower Level|-1,-1,043-4.gat,47,67
+043-3.gat,116,36|warp|To Snake Cave|-1,-1,005-3.gat,78,87
+043-3.gat,32,37|warp|To Snake Cave|0,-1,005-3.gat,33,83
diff --git a/world/map/npc/068-1/_import.txt b/world/map/npc/068-1/_import.txt
deleted file mode 100644
index da872493..00000000
--- a/world/map/npc/068-1/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// Map 068-1: Tulimshar Noble
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 068-1.gat
-npc: npc/068-1/_mobs.txt
-npc: npc/068-1/_warps.txt
-npc: npc/068-1/mapflags.txt
-npc: npc/068-1/stat_reset.txt
-npc: npc/068-1/tombstones.txt
diff --git a/world/map/npc/068-1/_mobs.txt b/world/map/npc/068-1/_mobs.txt
deleted file mode 100644
index 14eeb839..00000000
--- a/world/map/npc/068-1/_mobs.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Noble mobs
-
-068-1.gat,60,67,52,1|monster|SeaSlime|1033,3,100000ms,30000ms,Mob068-1::On1033
-068-1.gat,93,49,4,3|monster|Maggot|1002,5,100000ms,30000ms,Mob068-1::On1002
-068-1.gat,89,71,5,8|monster|Maggot|1002,5,100000ms,30000ms,Mob068-1::On1002
-068-1.gat,78,38,7,6|monster|Maggot|1002,5,100000ms,30000ms,Mob068-1::On1002
-068-1.gat,59,83,52,1|monster|SeaSlime|1033,3,100000ms,30000ms,Mob068-1::On1033
-
-
-068-1.gat,0,0,0|script|Mob068-1|-1
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/068-1/_warps.txt b/world/map/npc/068-1/_warps.txt
deleted file mode 100644
index 7e11bce2..00000000
--- a/world/map/npc/068-1/_warps.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Noble warps
-
-068-1.gat,34,108|warp|To North Tulimshar|3,-1,021-1.gat,144,23
-068-1.gat,84,108|warp|To Tulimshar Castle|3,-1,069-1.gat,55,23
-068-1.gat,42,96|warp|To Silk Shop|-1,-1,068-2.gat,94,60
-068-1.gat,40,79|warp|To Coconut Farm|-1,-1,068-2.gat,76,29
-068-1.gat,52,48|warp|To Barracks|-1,-1,068-2.gat,36,29
-068-1.gat,47,38|warp|To Watch Tower|-1,-1,068-2.gat,62,60
-068-1.gat,50,96|warp|To Weavers Shop|-1,-1,068-2.gat,61,91
-068-1.gat,56,96|warp|To Weavers Shop|-1,-1,068-2.gat,89,91
-068-1.gat,38,90|warp|To Silk Shop|-1,-1,068-2.gat,84,51
-068-1.gat,30,96|warp|To Bank|-1,-1,068-2.gat,31,91
-068-1.gat,29,84|warp|To Jeweler|-1,-1,068-2.gat,31,60
-068-1.gat,48,29|warp|To Watch Tower|-1,-1,068-2.gat,59,52
diff --git a/world/map/npc/068-1/mapflags.txt b/world/map/npc/068-1/mapflags.txt
deleted file mode 100644
index 15694f25..00000000
--- a/world/map/npc/068-1/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-068-1.gat|mapflag|town
-068-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/068-1/tombstones.txt b/world/map/npc/068-1/tombstones.txt
deleted file mode 100644
index 132be7ff..00000000
--- a/world/map/npc/068-1/tombstones.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-// Tombstones in Noble memorial
-
-068-1.gat,91,48,0|script|Tombstone#1|400
-{
-
-    mes "~ wushin ~";
-    mes "Tonori swallowed him whole.";
-    close;
-}
-
-068-1.gat,92,48,0|script|Tombstone#2|400
-{
-
-    mes "~ Nard ~";
-    mes "Crushed by a loom.";
-    close;
-}
-
-068-1.gat,93,48,0|script|Tombstone#3|400
-{
-
-    mes "~ tux9th ~";
-    mes "Eaten by bugs.";
-    close;
-}
-
-068-1.gat,94,48,0|script|Tombstone#4|400
-{
-
-    mes "~ o11c ~";
-    mes "He asked for it. So they gave it to him.";
-    close;
-}
-
-068-1.gat,95,48,0|script|Tombstone#5|400
-{
-
-    mes "~ " + strcharinfo(0) + " ~";
-    mes "The tombstone is blank and the grave freshly dug.";
-    close;
-}
diff --git a/world/map/npc/068-2/_import.txt b/world/map/npc/068-2/_import.txt
deleted file mode 100644
index 38ad884b..00000000
--- a/world/map/npc/068-2/_import.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Map 068-2: Tulimshar Noble Indoors
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 068-2.gat
-npc: npc/068-2/_mobs.txt
-npc: npc/068-2/_warps.txt
-npc: npc/068-2/bank.txt
-npc: npc/068-2/hetchel.txt
-npc: npc/068-2/inya.txt
-npc: npc/068-2/latoy.txt
-npc: npc/068-2/mapflags.txt
diff --git a/world/map/npc/068-2/_mobs.txt b/world/map/npc/068-2/_mobs.txt
deleted file mode 100644
index c0b6cd10..00000000
--- a/world/map/npc/068-2/_mobs.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Noble Indoors mobs
-
-068-2.gat,94,54,5,6|monster|Silkworm|1035,4,10000ms,85000ms,Mob068-2::On1035
-
-
-068-2.gat,0,0,0|script|Mob068-2|-1
-{
-    end;
-
-On1035:
-    set @mobID, 1035;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/068-2/_warps.txt b/world/map/npc/068-2/_warps.txt
deleted file mode 100644
index 3776ed28..00000000
--- a/world/map/npc/068-2/_warps.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Noble Indoors warps
-
-068-2.gat,89,92|warp|To Noble Quarter|-1,-1,068-1.gat,56,97
-068-2.gat,61,92|warp|To Noble Quarter|-1,-1,068-1.gat,50,97
-068-2.gat,94,61|warp|To Noble Quarter|-1,-1,068-1.gat,42,97
-068-2.gat,62,61|warp|To Noble Quarter|-1,-1,068-1.gat,47,39
-068-2.gat,31,92|warp|To Noble Quarter|-1,-1,068-1.gat,30,97
-068-2.gat,31,61|warp|To Noble Quarter|-1,-1,068-1.gat,29,85
-068-2.gat,76,30|warp|To Noble Quarter|-1,-1,068-1.gat,40,80
-068-2.gat,36,30|warp|To Noble Quarter|-1,-1,068-1.gat,52,49
-068-2.gat,84,50|warp|To Garden|-1,-1,068-1.gat,38,89
-068-2.gat,58,51|warp|To Noble Quarter|-1,-1,068-1.gat,47,30
diff --git a/world/map/npc/068-2/mapflags.txt b/world/map/npc/068-2/mapflags.txt
deleted file mode 100644
index 4968bf61..00000000
--- a/world/map/npc/068-2/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-068-2.gat|mapflag|town
-068-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/069-1/_import.txt b/world/map/npc/069-1/_import.txt
deleted file mode 100644
index a5cb1023..00000000
--- a/world/map/npc/069-1/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 069-1: Tulimshar Castle
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 069-1.gat
-npc: npc/069-1/_mobs.txt
-npc: npc/069-1/_warps.txt
-npc: npc/069-1/mapflags.txt
diff --git a/world/map/npc/069-1/_mobs.txt b/world/map/npc/069-1/_mobs.txt
deleted file mode 100644
index b7985756..00000000
--- a/world/map/npc/069-1/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Castle mobs
-
-
-
-069-1.gat,0,0,0|script|Mob069-1|-1
-{
-    end;
-}
diff --git a/world/map/npc/069-1/_warps.txt b/world/map/npc/069-1/_warps.txt
deleted file mode 100644
index 0a166c2c..00000000
--- a/world/map/npc/069-1/_warps.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Castle warps
-
-069-1.gat,55,21|warp|To Tulmishar Noble|3,-1,068-1.gat,84,107
-069-1.gat,19,44|warp|To Tulmishar|-1,0,021-1.gat,155,44
-069-1.gat,19,97|warp|To Tulmishar|-1,0,021-1.gat,155,97
-069-1.gat,67,56|warp|To Tulmishar Castle Ind|0,-1,069-2.gat,44,126
-069-1.gat,90,100|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,24,30
-069-1.gat,98,79|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,55,30
-069-1.gat,98,57|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,86,30
-069-1.gat,90,40|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,117,30
-069-1.gat,44,40|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,24,61
-069-1.gat,35,57|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,55,61
-069-1.gat,35,79|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,86,61
-069-1.gat,43,99|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,117,61
-069-1.gat,64,41|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,97,126
-069-1.gat,69,41|warp|To Tulmishar Castle Ind|-1,-1,069-2.gat,116,126
-069-1.gat,65,129|warp|To Prison|-1,-1,069-2.gat,4960,3104
-069-1.gat,71,122|warp|To Prison|0,-1,069-2.gat,4960,3104
-069-1.gat,99,122|warp|To Prison Mine|-1,-1,069-3.gat,4960,3104
diff --git a/world/map/npc/069-1/mapflags.txt b/world/map/npc/069-1/mapflags.txt
deleted file mode 100644
index 4fcb8b81..00000000
--- a/world/map/npc/069-1/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-069-1.gat|mapflag|town
-069-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/069-2/_import.txt b/world/map/npc/069-2/_import.txt
deleted file mode 100644
index 250938b3..00000000
--- a/world/map/npc/069-2/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// Map 069-2: Tulimshar Castle Indoors
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 069-2.gat
-npc: npc/069-2/_mobs.txt
-npc: npc/069-2/_warps.txt
-npc: npc/069-2/mapflags.txt
-npc: npc/069-2/wizards.txt
diff --git a/world/map/npc/069-2/_mobs.txt b/world/map/npc/069-2/_mobs.txt
deleted file mode 100644
index 561eec94..00000000
--- a/world/map/npc/069-2/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Castle Indoors mobs
-
-
-
-069-2.gat,0,0,0|script|Mob069-2|-1
-{
-    end;
-}
diff --git a/world/map/npc/069-2/_warps.txt b/world/map/npc/069-2/_warps.txt
deleted file mode 100644
index c556dd8e..00000000
--- a/world/map/npc/069-2/_warps.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Castle Indoors warps
-
-069-2.gat,24,31|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,90,101
-069-2.gat,55,31|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,98,80
-069-2.gat,86,31|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,98,58
-069-2.gat,117,31|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,90,41
-069-2.gat,24,62|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,44,41
-069-2.gat,55,62|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,35,58
-069-2.gat,86,62|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,35,80
-069-2.gat,117,62|warp|to Tulmishar Castle Out|-1,-1,069-1.gat,43,100
-069-2.gat,45,127|warp|to Tulmishar Castle Out|2,-1,069-1.gat,66,57
-069-2.gat,45,83|warp|to Tulmishar Castle Thr|2,-1,069-2.gat,106,116
-069-2.gat,107,117|warp|to Tulmishar Castle Mai|2,-1,069-2.gat,44,84
-069-2.gat,107,117|warp|to Tulmishar Castle Mai|2,-1,069-2.gat,44,84
-069-2.gat,116,127|warp|to Tulmishar Castle Par|1,-1,069-1.gat,69,42
-069-2.gat,97,127|warp|to Tulmishar Castle Par|1,-1,069-1.gat,64,42
diff --git a/world/map/npc/069-2/mapflags.txt b/world/map/npc/069-2/mapflags.txt
deleted file mode 100644
index 7c8e2695..00000000
--- a/world/map/npc/069-2/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-069-2.gat|mapflag|town
-069-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/069-2/wizards.txt b/world/map/npc/069-2/wizards.txt
deleted file mode 100644
index 1d827d18..00000000
--- a/world/map/npc/069-2/wizards.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-// Council of Ruling Wizards Room
-
-// manaseed
-069-2.gat,106,82,0|script|Desert Mana Seed#_M|166
-{
-    end;
-}
-
-// 
-069-2.gat,101,85,0|script|Wizard#1|355
-{
-    end;
-}
-
-//
-069-2.gat,94,87,0|script|Wizard#2|356
-{
-    end;
-}
-
-//
-069-2.gat,94,93,0|script|Wizard#3|357
-{
-    end;
-}
-
-//
-069-2.gat,101,95,0|script|Wizard#4|358
-{
-    end;
-}
-
-//
-069-2.gat,112,85,0|script|Wizard#5|359
-{
-    end;
-}
-
-//
-069-2.gat,119,87,0|script|Wizard#6|360
-{
-    end;
-}
-
-//
-069-2.gat,119,93,0|script|Wizard#7|361
-{
-    end;
-}
-
-//
-069-2.gat,112,95,0|script|Wizard#8|362
-{
-    end;
-}
-//
-069-2.gat,106,90,0|script|Arch-Wizard#9|354
-{
-    end;
-}
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 71a3e3c5..2c9758ca 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -8,16 +8,10 @@ import: npc/002-2/_import.txt
 import: npc/002-3/_import.txt
 import: npc/002-4/_import.txt
 import: npc/002-5/_import.txt
-import: npc/003-1/_import.txt
-import: npc/003-2/_import.txt
-import: npc/004-1/_import.txt
-import: npc/004-2/_import.txt
 import: npc/004-3/_import.txt
 import: npc/004-4/_import.txt
 import: npc/004-5/_import.txt
-import: npc/005-1/_import.txt
 import: npc/005-3/_import.txt
-import: npc/005-4/_import.txt
 import: npc/006-1/_import.txt
 import: npc/006-2/_import.txt
 import: npc/006-3/_import.txt
@@ -61,17 +55,7 @@ import: npc/019-4/_import.txt
 import: npc/020-1/_import.txt
 import: npc/020-2/_import.txt
 import: npc/020-3/_import.txt
-import: npc/021-1/_import.txt
-import: npc/021-2/_import.txt
 import: npc/021-3/_import.txt
-import: npc/022-1/_import.txt
-import: npc/023-1/_import.txt
-import: npc/023-2/_import.txt
-import: npc/023-3/_import.txt
-import: npc/024-1/_import.txt
-import: npc/024-2/_import.txt
-import: npc/024-3/_import.txt
-import: npc/024-4/_import.txt
 import: npc/025-1/_import.txt
 import: npc/025-3/_import.txt
 import: npc/025-4/_import.txt
@@ -87,6 +71,7 @@ import: npc/027-8/_import.txt
 import: npc/028-1/_import.txt
 import: npc/028-3/_import.txt
 import: npc/029-1/_import.txt
+import: npc/029-2/_import.txt
 import: npc/029-3/_import.txt
 import: npc/030-1/_import.txt
 import: npc/030-2/_import.txt
@@ -96,18 +81,12 @@ import: npc/031-1/_import.txt
 import: npc/031-2/_import.txt
 import: npc/031-3/_import.txt
 import: npc/031-4/_import.txt
-import: npc/032-1/_import.txt
 import: npc/032-3/_import.txt
 import: npc/033-1/_import.txt
 import: npc/034-1/_import.txt
 import: npc/034-2/_import.txt
 import: npc/035-2/_import.txt
 import: npc/036-2/_import.txt
-import: npc/041-1/_import.txt
-import: npc/042-1/_import.txt
-import: npc/042-2/_import.txt
-import: npc/042-3/_import.txt
-import: npc/043-1/_import.txt
 import: npc/043-3/_import.txt
 import: npc/043-4/_import.txt
 import: npc/044-1/_import.txt
@@ -127,8 +106,4 @@ import: npc/055-3/_import.txt
 import: npc/056-1/_import.txt
 import: npc/056-2/_import.txt
 import: npc/057-1/_import.txt
-import: npc/068-1/_import.txt
-import: npc/068-2/_import.txt
-import: npc/069-1/_import.txt
-import: npc/069-2/_import.txt
 import: npc/botcheck/_import.txt
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index 20fba752..8e9169e8 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -244,7 +244,7 @@ L_Main:
 
     set $@n, $@n + 1;
 
-    set $@halloween_npc_tathin,            $@n;
+    set $@halloween_npc_yanis,            $@n;
     set $@halloween_npc_names$[$@n],       "[Tathin]";
     set $@halloween_greetings$[$@n],       "\"I am employed by the Tonori Government, make sure you abide the regulations we wrote down for Trick-or-Treaters this year...\"";
     set $@halloween_trick_notscary$[$@n],  "Of course I will... not!";
diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt
index 64da1d38..38bed87f 100644
--- a/world/map/npc/annuals/halloween/debug.txt
+++ b/world/map/npc/annuals/halloween/debug.txt
@@ -139,42 +139,3 @@ L_Close:
     set @halloween_npc_id, 0;
     close;
 }
-009-1.gat,51,38,0|script|HalloweenDebug#1|409
-{
-    callfunc "HalloweenDebug";
-    goto L_End;
-
-OnInit:
-    if(!debug)
-        disablenpc "HalloweenDebug#1";
-    goto L_End;
-
-L_End:
-    end;
-}
-001-1.gat,38,26,0|script|HalloweenDebug#2|409
-{
-    callfunc "HalloweenDebug";
-    goto L_End;
-
-OnInit:
-    if(!debug)
-        disablenpc "HalloweenDebug#2";
-    goto L_End;
-
-L_End:
-    end;
-}
-026-1.gat,23,37,0|script|HalloweenDebug#3|409
-{
-    callfunc "HalloweenDebug";
-    goto L_End;
-
-OnInit:
-    if(!debug)
-        disablenpc "HalloweenDebug#3";
-    goto L_End;
-
-L_End:
-    end;
-}
diff --git a/world/map/npc/annuals/tree_beard.txt b/world/map/npc/annuals/tree_beard.txt
index 27cf930e..dc49e865 100644
--- a/world/map/npc/annuals/tree_beard.txt
+++ b/world/map/npc/annuals/tree_beard.txt
@@ -45,25 +45,25 @@
     close;
 }
 
-001-1.gat,41,45,0|script|#GhostTreeThree|133
+001-1.gat,58,75,0|script|#GhostTreeThree|133
 {
     callfunc "HalloweenTree";
     close;
 }
 
-001-1.gat,41,45,0|script|#PalmTree|384
+001-1.gat,58,75,0|script|#PalmTree|384
 {
     end;
 }
 
-001-1.gat,41,46,0|script|Present#3|386
+001-1.gat,58,76,0|script|Present#3|386
 {
     callfunc "XmasStates";
     callfunc "XmasMainItemReward";
     close;
 }
 
-001-1.gat,41,45,0|script|#XmasPalmTree|383
+001-1.gat,58,75,0|script|#XmasPalmTree|383
 {
     end;
 }
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index af7fcee0..384805b1 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -916,7 +916,7 @@ L_Close:
 
 }
 
-042-2.gat,30,26,0|script|Debug#0|154
+029-2.gat,30,26,0|script|Debug#0|154
 {
     callfunc "Debug";
     end;
@@ -926,7 +926,7 @@ OnInit:
     end;
 }
 
-001-1.gat,41,29,0|script|Debug#1|154
+001-1.gat,53,47,0|script|Debug#1|154
 {
     callfunc "Debug";
     end;
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index cc5bfa14..cca5d3a0 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -5,17 +5,17 @@
     end;
 
 OnInit:
-    disablenpc "Hurnscald Koga";
+    disablenpc "Hurnscald South Koga";
     disablenpc "Candor Koga";
     disablenpc "Nivalis Koga";
-    disablenpc "Tulimshar North Koga";
-    disablenpc "Tulimshar South Koga";
+    disablenpc "Hurnscald North Koga";
+    disablenpc "Tulimshar Koga";
     set $@MainCurrentDock, 0;
     set $@CandorCurrentDock, 0;
     set $@DockTickCount, 0;
     set $@DockLeaveCount, 1;
-    setarray $@MainDocks$, "Hurnscald", "Nivalis", "Tulimshar South";
-    setarray $@CandorDocks$, "Candor", "Tulimshar North";
+    setarray $@MainDocks$, "Hurnscald North", "Nivalis", "Tulimshar";
+    setarray $@CandorDocks$, "Candor", "Hurnscald South";
     cmdothernpc "#"+$@MainDocks$[$@MainCurrentDock]+"Dock", "Arrive";
     cmdothernpc "#"+$@CandorDocks$[$@CandorCurrentDock]+"Dock", "Arrive";
     if (debug >= 2) end;
@@ -49,7 +49,7 @@ L_NextDock:
     if($@MainCurrentDock == 1) goto L_k1city3;
     end;
 
-OnTimer10000:
+OnTimer8000:
     if ($@DockTickCount > $@DockLeaveCount)
         goto L_NextDock;
     //mapannounce "035-2.tmx", "Koga - Main:* Now docked in "+$@MainDocks$[$@MainCurrentDock]+", Departing soon", 0;
@@ -91,6 +91,18 @@ L_k2city2:
 end;    
 }
 
+function|script|FerryHelp
+{
+    mes "\"You wait on the dock for the ship to come in. You'll be given a chance to board the boat when it comes into port.\"";
+    mes "\"It lingers in port to allow you some time to board in case you are running behind.\"";
+    mes "\"Once on the ship, it will sail to different ports and annouce where it is docking.\"";
+    mes "\"There are 2 Ferrys, both ferrys are free to ride.\"";
+    mes "\"The Main ferry travels from Argeas, Kaizei and Tonori. It docks in the major ports Hurnscald North, Nivalis and the Tulimshar Dock.\"";
+    mes "\"The Candor Ferry only travels betwen Candor and the Hurnscald South Dock.\"";
+    mes "\"Refreshments and supplies are offered aboard both ships during the voyage.\"";
+    mes "\"We also have some slot machines in case you get bored.\"";
+    return;
+}
 function|script|FerryManifest
 {
     mes "Which Ferry do you want to check the schedule for?";
@@ -100,7 +112,6 @@ function|script|FerryManifest
 
 L_CandorFerry:
     mes "The ferry is currently at "+$@CandorDocks$[$@CandorCurrentDock];
-    next;
     set @NextDock, ($@CandorCurrentDock + 1);
     if(@NextDock == getarraysize($@CandorDocks$))
         set @NextDock, 0;
@@ -109,7 +120,6 @@ L_CandorFerry:
 
 L_WorldFerry:
     mes "The ferry is currently at "+$@MainDocks$[$@MainCurrentDock];
-    next;
     set @NextDock, ($@MainCurrentDock + 1);
     if(@NextDock == getarraysize($@MainDocks$))
         set @NextDock, 0;
@@ -143,14 +153,9 @@ function|script|BoardCandorFerry
         "No.", L_Return;
 
 L_Board:
-    if (BaseLevel < 40) goto L_TooYoung;
     warp "036-2.tmx",39,29;
     goto L_Return;
 
-L_TooYoung:
-    mes "This area is too dangerous for your low level.";
-    goto L_Return;
-
 L_Return:
     return;
 }
diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt
index 9799b11d..cbd4b8fb 100644
--- a/world/map/npc/functions/game_rules.txt
+++ b/world/map/npc/functions/game_rules.txt
@@ -2,7 +2,9 @@
 
 function|script|GameRules
 {
-    set @read, 0;
+
+    mes "[Server Game Rules]";
+    mes "Please Select Language.";
     menu
         "English", L_English,
         "Deutsch (German)", L_German,
@@ -23,10 +25,8 @@ L_English:
     mes "4. No begging";
     mes "5. Speak English on public chat";
     mes "6. Treat others the same way you would like to be treated";
-    next;
     mes "AFK botting will be determined by talking to players who are moving and/or attacking.";
     mes "Automated following will be determined by observation.";
-    next;
     goto L_End;
 
 L_German:
@@ -38,9 +38,7 @@ L_German:
     mes "5. Englisch ist die einzig zulässige Sprache im öffentlichen Raum.";
     mes "6. Behandele andere so, wie du selbst behandelt werden willst.";
     mes "Jegliche Regelverstöße können bestraft werden, entweder durch ein Zurücksetzen der Charaktereigenschaften und -besitztümer auf den Ausgangszustand, oder durch einen temporären oder permanenten Ausschluss aus dem Spiel.";
-    next;
     mes "Automatisiertes Spielverhalten liegt vor, wenn ein sich bewegender/kämpfender Spieler nicht intelligent auf Gesprächsaufforderungen reagiert.";
-    next;
     goto L_End;
 
 L_Dutch:
@@ -52,9 +50,7 @@ L_Dutch:
     mes "4. Verboden te bedelen";
     mes "5. Spreek Engels op de publieke chat";
     mes "6. Behandel andere zoals ook jij behandeld wilt worden";
-    next;
     mes "Botten word bepaald door te praten tegen spelers die aan het bewegen en/of aanvallen zijn.";
-    next;
     goto L_End;
 
 L_Danish:
@@ -66,9 +62,7 @@ L_Danish:
     mes "4. Det er forbudt at tigge (for eksempel: Maa jeg ikke nok faa dit svaerd, kom nu, vaer nu soed... og saa videre)";
     mes "5. Det er forbudt at snakke andre sprog end Engelsk, i den aabne chat. (Dog er det lovligt ved at bruge foelgende kommandoen /whisper)";
     mes "6. Husk at goere mod andre, som du vil have de skal goere imod dig (opfoer dig ordenligt!)";
-    next;
     mes "Botting bliver fastlagt paa grundlag af, at man snakker til andre spillere, der gaar rundt og/eller der angriber og de ikke svare igen.";
-    next;
     goto L_End;
 
 L_French:
@@ -80,9 +74,7 @@ L_French:
     mes "4. Ne demandez pas d'items ou d'argent (les echanges doivent se faire de preference sur forums.themanaworld.org)";
     mes "5. Parlez anglais dans les salons de discussions publics (principalement en ville)";
     mes "6. Traitez les autres de la meme maniere que vous voudriez etre traite(e)";
-    next;
     mes "L'utilisation de \"bot\" sera determinee en parlant aux joueurs(ses) en train de bouger et/ou d'attaquer.";
-    next;
     goto L_End;
 
 L_Spanish:
@@ -93,10 +85,8 @@ L_Spanish:
     mes "4. No mendigar.";
     mes "5. Escriba únicamente en Inglés en el chat público";
     mes "6. Trate a los demás de la misma forma que le gustaría ser tratado";
-    next;
     mes "El uso de programas automáticos para jugar sin estar frente al teclado se determinará hablando con los jugadores que estén moviéndose y/o atacando.";
     mes "El seguimiento automático será determinado por observación.";
-    next;
     goto L_End;
 
 L_Swedish:
@@ -107,9 +97,7 @@ L_Swedish:
     mes "4. Tigg inte";
     mes "5. Prata bara engelska i den offentliga chatten";
     mes "6. Behandla andra som du vill bli behandlad";
-    next;
     mes "Vid misstankar om bottande kontrolleras detta genom att prata med spelaren under dess kringvandrande eller attackerande.";
-    next;
     goto L_End;
 
 L_Portuguese:
@@ -121,9 +109,7 @@ L_Portuguese:
     mes "4. Pedintes serao ignorados, ou banidos.";
     mes "5. Fale ingles em lugares publicos.";
     mes "6. Trate os outros da mesma maneira que quer ser tratado(a).";
-    next;
     mes "O \"botting\" sera determinado, falando com os jogadores que se movem e/ou atacam.";
-    next;
     goto L_End;
 
 L_Polish:
@@ -135,9 +121,7 @@ L_Polish:
     mes "4. Zabrania sie zebrania";
     mes "5. Na publicznym kanale rozmawiamy po angielsku";
     mes "6. Traktuj innych tak jak sam chcesz byc traktowany";
-    next;
     mes "Uzywanie botow zostanie okreslone na podstawie rozmow z innymi graczami podczas aktywnosci gracza.";
-    next;
     goto L_End;
 
 L_Italian:
@@ -149,13 +133,10 @@ L_Italian:
     mes "4. Vietato implorare";
     mes "5. Parlare solo inglese nella chat pubblica";
     mes "6. Tratta gli altri giocatori come vuoi che gli altri trattino te.";
-    next;
     mes "I bot saranno determinati in base alle risposte e ai movimenti dei giocatori esaminati.";
-    next;
     goto L_End;
 
 L_End:
-    set @read, 1;
     if (TUT_var == 0)
         set TUT_var, gettimetick(2);
     goto L_Return;
diff --git a/world/map/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt
index e047e928..6c2c1c17 100644
--- a/world/map/npc/functions/soul_menhir.txt
+++ b/world/map/npc/functions/soul_menhir.txt
@@ -2,7 +2,6 @@ function|script|SoulMenhir
 {
     mes "[Soul Menhir]";
     mes "(A mystical aura surrounds this stone. You feel mysteriously attracted to it. Something tells you to touch it. What do you do?)";
-    next;
 
     menu
         "Touch it.", L_Bind,
@@ -16,7 +15,6 @@ L_Towel:
     set TowelLastUsed, gettimetick(2);
     mes "[Soul Menhir]";
     mes "(You touch the mysterious stone. Somehow it feels hard and soft at the same time.)";
-    next;
     getitem "HitchhikersTowel", 1;
     goto L_Return;
 
@@ -26,23 +24,14 @@ L_Bind:
 
     mes "[Soul Menhir]";
     mes "(You touch the mysterious stone. Somehow it feels warm and cold at the same time.)";
-    next;
-
-    mes "[Soul Menhir]";
     mes "(Suddenly a strange sensation flows through you. It feels like your soul leaves your body and becomes one with the stone.)";
-    next;
-
-    mes "[Soul Menhir]";
     mes "(As suddenly as the feeling started it stops. The strange attraction is away from one moment to the next and the menhir feels like just an ordinary stone.)";
-    next;
-
     set Menhir_Activated, 1;
     goto L_Save;
 
 L_Shortversion:
     mes "[Soul Menhir]";
     mes "(A strange sensation flows through you. It feels like your soul leaves your body and becomes one with the stone. As suddenly as the feeling started it stops.)";
-    next;
     goto L_Save;
 
 L_Save:
diff --git a/world/map/npc/068-1/stat_reset.txt b/world/map/npc/functions/stat_reset.txt
index 73519a22..d8f484ff 100644
--- a/world/map/npc/068-1/stat_reset.txt
+++ b/world/map/npc/functions/stat_reset.txt
@@ -1,6 +1,6 @@
 //
 
-068-1.gat,79,94,0|script|Malivox|103
+function|script|StatReset
 {
 // if (ResetA_charstate == 1) goto L_Multiple;
 
@@ -8,7 +8,7 @@
 
     set @cost, BaseLevel * 100;
 
-    mes "[Rogue Mage]";
+    mes "[" + @NpcName$ + "]";
     mes "\"I have come across a spell that will";
     mes "reset your status points.";
     mes "Normally this spell is expensive, but";
@@ -31,25 +31,25 @@ L_Reset:
     set Zeny, Zeny-@cost;
     resetstatus;
 
-    mes "[Rogue Mage]";
+    mes "[" + @NpcName$ + "]";
     mes "\"There you are.";
     mes "";
     mes "Good as new!\"";
-    goto L_Close;
+    goto L_Return;
 
 L_Pass:
-    mes "[Rogue Mage]";
+    mes "[" + @NpcName$ + "]";
     mes "\"Very well then, see you.\"";
-    goto L_Close;
+    goto L_Return;
 
 L_NoMoney:
-    mes "[Rogue Mage]";
+    mes "[" + @NpcName$ + "]";
     mes "\"Oh dear, the price cannot be bargained.";
     mes "";
     mes "Perhaps you can borrow from a friend?\"";
-    goto L_Close;
+    goto L_Return;
 
-L_Close:
+L_Return:
     set @cost, 0;
-    close;
+    return;
 }
diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt
index 6827aece..cfbbb9a3 100644
--- a/world/map/npc/functions/travelers.txt
+++ b/world/map/npc/functions/travelers.txt
@@ -13,7 +13,7 @@
 OnInit:
     // TravelFound
     set $@tut_bit, (1 << 2);
-    set $@druid_tree_bit, (1 << 3);
+    //set $@druid_tree_bit, (1 << 3);
     set $@graveyard_bit, (1 << 4);
     set $@magic_house_bit, (1 << 5);
     set $@terranite_cave_bit, (1 << 6);
@@ -21,7 +21,7 @@ OnInit:
     set $@blue_sage_bit, (1 << 8);
     set $@hurnscald_bit, (1 << 9);
     set $@nivalis_bit, (1 << 10);
-    set $@tul_mine_bit, (1 << 11);
+    //set $@tul_mine_bit, (1 << 11);
     set $@pachua_bit, (1 << 12);
     set $@nivalis_snow_hills_bit, (1 << 13);
     set $@barbarians_bit, (1 << 14);
@@ -31,8 +31,8 @@ OnInit:
     set $@tulimshar_cost, 100;
     set $@hurnscald_cost, 100;
     set $@nivalis_cost, 100;
-    set $@druid_tree_cost, 150;
-    set $@tul_mine_cost, 150;
+    //set $@druid_tree_cost, 150;
+    //set $@tul_mine_cost, 150;
     set $@pachua_cost, 200;
     set $@graveyard_cost, 200;
     set $@magic_house_cost, 150;
@@ -101,8 +101,6 @@ L_Start:
         "Tonori - Tulimshar (" + (@Cost * $@tulimshar_cost) + " GP)", L_TravelTulimshar,
         "Argeas - Hurnscald (" + (@Cost * $@hurnscald_cost) + " GP)", L_TravelHurnscald,
         "Kaizei - Nivalis (" + (@Cost * $@nivalis_cost) + " GP)", L_TravelNivalis,
-        "Tonori - Druid Tree (" + (@Cost * $@druid_tree_cost) + " GP)", L_TravelDruidTree,
-        "Tonori - Tulimshar Mines (" + (@Cost * $@tul_mine_cost) + " GP)", L_TravelTulMine,
         "Tonori - Pachua's Village (" + (@Cost * $@pachua_cost) + " GP)", L_TravelPachua,
         "Argeas - Candor (" + (@Cost * $@candor_cost) + " GP)", L_TravelCandor,
         "Argeas - Magic House (" + (@Cost * $@magic_house_cost) + " GP)", L_TravelMagicHouse,
@@ -132,14 +130,6 @@ L_TravelPlayer:
     warp @NextLocationMap$,@NextLocationX,@NextLocationY;
     goto L_Clearvars;
 
-L_TravelDruidTree:
-    set @NextLocationBit, $@druid_tree_bit;
-    set @NextLocationCost, (@Cost * $@druid_tree_cost);
-    set @NextLocationMap$, "005-1.gat";
-    set @NextLocationX, 76;
-    set @NextLocationY, 36;
-    goto L_TravelChecks;
-
 L_TravelGraveyard:
     set @NextLocationBit, $@graveyard_bit;
     set @NextLocationCost, (@Cost * $@graveyard_cost);
@@ -167,9 +157,9 @@ L_TravelTerranite:
 L_TravelTulimshar:
     set @NextLocationBit, $@tulimshar_bit;
     set @NextLocationCost, (@Cost * $@tulimshar_cost);
-    set @NextLocationMap$, "001-1.gat";
-    set @NextLocationX, 44;
-    set @NextLocationY, 70;
+    set @NextLocationMap$, "002-1.gat";
+    set @NextLocationX, 60;
+    set @NextLocationY, 42;
     goto L_TravelChecks;
 
 L_TravelBlueSage:
@@ -196,14 +186,6 @@ L_TravelNivalis:
     set @NextLocationY, 122;
     goto L_TravelChecks;
 
-L_TravelTulMine:
-    set @NextLocationBit, $@tul_mine_bit;
-    set @NextLocationCost, (@Cost * $@tul_mine_cost);
-    set @NextLocationMap$, "002-2.gat";
-    set @NextLocationX, 27;
-    set @NextLocationY, 28;
-    goto L_TravelChecks;
-
 L_TravelPachua:
     set @NextLocationBit, $@pachua_bit;
     set @NextLocationCost, (@Cost * $@pachua_cost);
diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt
index 8c81f94e..8e0107b1 100644
--- a/world/map/npc/items/check_wand.txt
+++ b/world/map/npc/items/check_wand.txt
@@ -5,7 +5,7 @@ function|script|WandMana
     if(isin("009-7.gat", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) && ((@Duel_Fighter != 1) || ($@Duel_NoMagic == 1)))
         goto L_Return;
     callfunc "CheckWand";
-    set @WandCost, (@Wand * ((MaxSp / 10) + 2));
+    set @WandCost, (@Wand * (BaseLevel / 15) + 2);
     set @WandAttack, 0;
     if (!(@Wand))
         goto L_NoWand;
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
index af6ea91f..77e9c8a8 100644
--- a/world/map/npc/scripts.conf
+++ b/world/map/npc/scripts.conf
@@ -24,6 +24,7 @@ npc: npc/functions/default_npc_checks.txt
 npc: npc/functions/undead_debug.txt
 npc: npc/functions/headstyles.txt
 npc: npc/functions/global_event_handler.txt
+npc: npc/functions/stat_reset.txt
 
 // Item Functions
 npc: npc/items/magic_gm_top_hat.txt
author	Wushin <pasekei@gmail.com>	2015-01-07 21:25:14 -0600
committer	Wushin <pasekei@gmail.com>	2015-01-07 21:25:14 -0600
commit	b734af239e8ff1e7ea746ea327fb84c62be09b7e (patch)
tree	cbc5f399ccf8dd226056887a70b9a313f88bee6e /world/map/npc
parent	2c09797ebd2c03b2cbe9a458f8ea8d1fbd04ccff (diff)
parent	61c88ec162713b980f30e6e5111c1cfbd9f23d3a (diff)
download	serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.gz serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.bz2 serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.tar.xz serverdata-b734af239e8ff1e7ea746ea327fb84c62be09b7e.zip