Moving Tutorial from Tulimshar to Candor

42 files changed, 809 insertions, 2800 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/001-1/adrian.txt b/world/map/npc/001-1/adrian.txt
new file mode 100644
index 00000000..4f9722d0
--- /dev/null
+++ b/world/map/npc/001-1/adrian.txt
@@ -0,0 +1,52 @@
+// part of quest given by 021-2/kylian.txt
+// Author: Jenalya
+
+// state 1: player has the task to get the luggage from the harbor
+// 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
+
+001-1.gat,113,64,0|script|Adrian|213
+{
+    set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
+
+    mes "[Adrian]";
+    mes "\"Hello. Are you here to get the luggage for some of our passengers?\"";
+    if (@state == 1)
+        menu
+            "Yes, Kylian sent me to get his luggage.",L_Get,
+            "No.",L_No;
+    menu
+        "No.",L_No;
+L_No:
+    mes "[Adrian]";
+    mes "\"Too bad. I want to go and drink a beer, but I have to wait here until all the luggage is picked up.\"";
+    mes "He sighs.";
+    goto L_Close;
+
+L_Get:
+    mes "[Adrian]";
+    mes "\"Wonderful! Show me the ticket.\"";
+    mes "He checks the paper Kylian gave you and then takes a critical look at you.";
+    next;
+    getinventorylist;
+    if ((checkweight("LeatherSuitcase", 1) == 0) || (@inventorylist_count == 100))
+        goto L_Inventory;
+    mes "[Adrian]";
+    mes "\"Alright, here it is.\"";
+    mes "Adrain hands you a very heavy suitcase.";
+    getitem "LeatherSuitcase", 1;
+    set @state, 2;
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_5_MASK)) | (@state << NIBBLE_5_SHIFT);
+    goto L_Close;
+
+L_Inventory:
+    mes "[Adrian]";
+    mes "\"The suitcase is rather heavy. You doesn't look as if you can handle that.";
+    mes "Maybe if you get rid of some of the other stuff you're carrying.\"";
+    goto L_Close;
+
+L_Close:
+    set @state, 0;
+    set @inventorylist_count, 0;
+    close;
+}
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/001-1/bard.txt b/world/map/npc/001-1/bard.txt
deleted file mode 100644
index 6b0d7d77..00000000
--- a/world/map/npc/001-1/bard.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-
-001-1.gat,40,73,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.\"",
-        "\"As the Sun sets down in the forest's brown, she whom the fragrance holds counts her gold.\"";
-    set @name$, "Bill Ballshaker the Bard";
-    mes "[" + @name$ + "]";
-    if (Sex)
-        mes "\"Greetings, traveler!  Have you come to listen to my stories?\"";
-    if (!Sex)
-        mes "\"Greetings, fair lady!  Well met, on such a lovely day!  Might I entertain you with a tale or two?\"";
-    next;
-    goto L_Main;
-
-L_Main:
-    menu
-        "Sing me a song, lute man!", L_Song,
-        "Have you heard any news?", L_News,
-        "What do you know about...", L_Question,
-        "Farewell!", L_Close;
-
-L_News:
-//     mes "[" + @name$ + "]";
-//     mes "\"Quite, quite!  Rumour has it that Luca the Hunter, from this very town of Tulimshar, has returned from a long journey.\"";
-//     next;
-//     mes "[" + @name$ + "]";
-//     mes "\"Many perilous battles he fought, or so his tales go... I am still working on a sonnet that I wish to dedicate to his exploits.\"";
-//     next;
-//     mes "[" + @name$ + "]";
-//    mes "\"He says that he learned some new skills along the way and wishes to pass them on to others like him, who do not fear the fire of battle!\"";
-//     next;
-//     mes "[" + @name$ + "]";
-//     mes "\"If you are experienced enough, perhaps he will teach you?\"";
-//     next;
-//     goto L_Main;
-
-    mes "[" + @name$ + "]";
-    mes "\"News I have for you indeed, lest you have already overheard (for then it would no longer be news to you!)\"";
-    next;
-    mes "[" + @name$ + "]";
-    mes "\"Rumor has it that an ancient source of magic, a Mana Seed, has been sighted in the west, beyond the fair town of Hurnscald.\"";
-    next;
-    set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_MANASEED_RUMOUR;
-    mes "[" + @name$ + "]";
-    mes "\"Whence it came, nobody knows... but they say that sometimes such Mana Seeds may choose a powerful individual to impart some of its mystic power to!\"";
-    next;
-    mes "[" + @name$ + "]";
-    mes "\"I wonder who might be qualified?\"";
-    next;
-    goto L_Main;
-
-L_Question:
-    callfunc "MagicTalkOptionsSetup";
-    set @ignore, @QQ_ASTRALSOUL;
-    callfunc "MagicTalkMenu";
-
-    if (@c == 0) goto L_Main;
-    if (@c == @QQ_ELANORE) goto L_Q_elanore;
-    if (@c == @QQ_MANASEED) goto L_Q_manaseed;
-    if (@c == @QQ_WYARA) goto L_Q_wyara;
-    if (@c == @QQ_SAGATHA) goto L_Q_sagatha;
-    if (@c == @QQ_AULDSBEL) goto L_Q_auldsbel;
-    if (@c == @QQ_OLDWIZ) goto L_Q_oldwiz;
-
-    mes "[" + @name$ + "]";
-    mes "\"Alas, I know very little about this matter.\"";
-    next;
-    goto L_Main;
-
-L_Q_oldwiz:
-    mes "[" + @name$ + "]";
-    mes "\"The old wizard has been an old man for as long as I remember, living near the mountains in his magic hut – a hut that is bigger on the inside, just like in the old tales of Gyer Filla the Wise....\"";
-    next;
-    mes "[" + @name$ + "]";
-    mes "\"I doubt that they are the same person, though. For one, I have never seen his hut fly. For another, Gyer never took apprentices.\"";
-    next;
-    goto L_Main;
-
-L_Q_elanore:
-    mes "[" + @name$ + "]";
-    mes "\"Elanore is this town's healer. Rumor has it that she traveled far and wide when she was younger, to learn the deepest secrets of healing magic, after her brother caught a mysterious illness.\"";
-    next;
-    goto L_Main;
-
-L_Q_manaseed:
-    mes "[" + @name$ + "]";
-    mes "\"The Mana Seed is said to be a source of great magic. Perhaps some witch or wizard might know more about it?\"";
-    next;
-    goto L_Main;
-
-L_Q_wyara:
-    mes "[" + @name$ + "]";
-    mes "\"Wyara is not actually from Hurnscald. As a young witch, she decided to settle down there to help the people of Hurnscald. She is kind and gentle, except towards the Doctor, who seems to have little respect for her potions.\"";
-    next;
-    goto L_Main;
-
-L_Q_sagatha:
-    mes "[" + @name$ + "]";
-    mes "\"Sagatha!  Ah, such a wonderful and mysterious being; the center of many a tale...\"";
-    next;
-    mes "[" + @name$ + "]";
-    mes "\"Some say that she is the most powerful witch in all of Argaes. I don't know whether that is true or not, but I am quite certain that she is the most beautiful witch of all!  Alas, she will let no man touch her...\"";
-    mes "He sighs.";
-    next;
-    mes "[" + @name$ + "]";
-    mes "\"I met her only twice, back in my traveling days, but there are two pieces of advice I can give you:\"";
-    next;
-    mes "[" + @name$ + "]";
-    mes "\"First, she will suffer no fool easily, particularly no man.\"";
-    next;
-    mes "[" + @name$ + "]";
-    mes "\"Second, the creatures of the forest mean everything to her. Harm them, and you may find her an enemy – and a powerful one at that...\"";
-    next;
-    goto L_Main;
-
-L_Q_auldsbel:
-    mes "[" + @name$ + "]";
-    mes "\"Auldsbel is a wizard further north. From what I have gathered he bought a hut near Hurnscald some years back and often comes here to experiment on things. This is probably because he is not allowed to do these experiments where he comes from.\"";
-    next;
-    goto L_Main;
-
-L_Song:
-    mes "[" + @name$ + "]";
-    set @id, rand(3);
-    mes @songs$[@id];
-    goto L_Close;
-
-L_Close:
-    set @name$, "";
-    set @id, 0;
-    cleararray @songs$[0], "", 2;
-    close;
-}
diff --git a/world/map/npc/001-1/bernard.txt b/world/map/npc/001-1/bernard.txt
deleted file mode 100644
index 9084f020..00000000
--- a/world/map/npc/001-1/bernard.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-// Variables used: nibble 0 of QUEST_SouthTulimshar
-
-001-1.gat,35,43,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;
-
-    set @TEMP, rand(2);
-    if(@TEMP == 1) goto L_Opening1;
-    goto L_Opening0;
-
-L_Opening0:
-    mes "[Bernard]";
-    mes "\"Tulimshar is crawling with maggots. Hey, I need a favor, could you help me a bit?\"";
-    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?\"";
-    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 "[Bernard]";
-    mes "\"Great!  I need a Roasted Maggot for my soup.\"";
-    next;
-    goto L_Set;
-
-L_Req1:
-    mes "[Bernard]";
-    mes "\"Bring me a Roasted Maggot. I'll give you something if you do.\"";
-    next;
-    goto L_Set;
-
-L_Set:
-    set @state, 1;
-    callsub S_Update_Var;
-    mes "[Bernard]";
-    mes "\"Please bring it to me!\"";
-    goto L_Close;
-
-L_Progress:
-    if (countitem("RoastedMaggot") < 1) goto L_NotEnough;
-    mes "[Bernard]";
-    mes "\"Oooh, perfect! It's perfect!";
-    mes "You brought me my Roasted Maggot!  Here, have some cake for your troubles.\"";
-    getinventorylist;
-    if (@inventorylist_count - (countitem("RoastedMaggot") == 1) > 99 - (countitem("CherryCake") == 0) ) goto L_TooMany;
-    delitem "RoastedMaggot", 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 "[Bernard]";
-    mes "\"Nice!  They're perfect, just perfect!";
-    mes "You brought me the 3 Maggot Slimes!  Here, have some beer as reward.\"";
-    getinventorylist;
-    if ((@inventorylist_count - (countitem("MaggotSlime") == 3) > 99  - (countitem("Beer") == 0) )) goto L_TooMany;
-    delitem "MaggotSlime", 3;
-    getexp 100, 0;
-    getitem "Beer", 3;
-    set @state, 4;
-    callsub S_Update_Var;
-    goto L_Close;
-
-L_NotEnough:
-    mes "[Bernard]";
-    mes "\"Oh, please hurry and bring me a Roasted Maggot. I'm yearning for maggot soup!\"";
-    goto L_Close;
-
-L_NotEnough1:
-    mes "[Bernard]";
-    mes "\"Please do hurry and bring me 3 Maggot Slimes, so I can finish my soup!\"";
-    goto L_Close;
-
-L_Done1:
-    mes "[Bernard]";
-    mes "\"Thank you so much!\"";
-    mes "\"But... something is missing to make the soup creamy.\"";
-    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 "[Bernard]";
-    mes "\"I didn't mention it before, but I also put beer in my soup. I hope you like beer as much as I do, because, you see...\"";
-    next;
-    mes "\"Beer is life!\"";
-    goto L_Close;
-
-L_Close:
-    set @TEMP, 0;
-    set @state, 0;
-    close;
-
-L_TooMany:
-    next;
-    mes "[Bernard]";
-    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_0_MASK) | (@state << NIBBLE_0_SHIFT));
-    return;
-}
diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
deleted file mode 100644
index f6fd399c..00000000
--- a/world/map/npc/001-1/bleacher.txt
+++ /dev/null
@@ -1,293 +0,0 @@
-//
-
-001-1.gat,29,50,0|script|Candide|156
-{
-    mes "[Candide]";
-    mes "\"I've figured out how that volcanic ash bleaches cloth.";
-    mes "I could do it for you, but I'll need three piles of ash and 5,000 GP for supplies per item.\"";
-    next;
-
-    if (countitem("PileOfAsh") < 3) goto L_no_ash;
-
-    if (Zeny < 5000) goto L_no_money;
-
-    menu
-        "I'd like to bleach something.", L_bleach_menu,
-        "No thanks.", L_Close;
-
-L_bleach_menu:
-    mes "[Candide]";
-    mes "\"What would you like to bleach?\"";
-    next;
-
-    menu
-        "Cotton shirt.", L_cottonshirt,
-        "Contributor shirt.", L_contributor,
-        "V-Neck sweater.", L_vneck,
-        "Turtleneck sweater.", L_tneck,
-        "Cotton shorts.", L_shorts,
-        "Cotton trousers.", L_trousers,
-        "Cotton skirt.", L_skirt,
-        "Miniskirt.", L_miniskirt,
-        "Tank top .", L_tanktop,
-        "Short tank top.", L_tanktop_short,
-        "Silk robe.", L_robe,
-        "Cotton headband.", L_cotton_headband,
-        "Desert hat.", L_desert_hat,
-        "Cotton boots.", L_cotton_boots,
-        "Cotton gloves.", L_cotton_gloves,
-        "Rabbit ears.", L_rabbit_ears,
-        "Wizard hat.", L_wizard_hat,
-        "Bowler hat.", L_bowler_hat,
-        "Sorcerer robe.", L_sorcerer_robe,
-        "Bowler hat (brown).", L_bowler_hat_brown,
-        "Fine dress.", L_fine_dress,
-        "Cotton cloth.", L_cotton_cloth,
-        "Nevermind.", L_Close;
-
-L_contributor:
-    set @normal, 1178;
-    set @dyeBase, 5131;
-    goto L_choose_color;
-
-L_cottonshirt:
-    set @normal, 1202;
-    set @dyeBase, 2050;
-    goto L_choose_color;
-
-L_vneck:
-    set @normal, 624;
-    set @dyeBase, 2060;
-    goto L_choose_color;
-
-L_tneck:
-    set @normal, 564;
-    set @dyeBase, 2070;
-    goto L_choose_color;
-
-L_shorts:
-    set @normal, 586;
-    set @dyeBase, 2110;
-    goto L_choose_color;
-
-L_trousers:
-    set @normal, 648;
-    set @dyeBase, 2180;
-    goto L_choose_color;
-
-L_skirt:
-    set @normal, 632;
-    set @dyeBase, 2100;
-    goto L_choose_color;
-
-L_miniskirt:
-    set @normal, 771;
-    set @dyeBase, 2170;
-    goto L_choose_color;
-
-L_tanktop:
-    set @normal, 688;
-    set @dyeBase, 2090;
-    goto L_choose_color;
-
-L_tanktop_short:
-    set @normal, 689;
-    set @dyeBase, 2120;
-    goto L_choose_color;
-
-L_robe:
-    set @normal, 720;
-    set @dyeBase, 2080;
-    goto L_choose_color;
-
-L_cotton_headband:
-    set @normal, 724;
-    set @dyeBase, 2140;
-    goto L_choose_color;
-
-L_desert_hat:
-    set @normal, 723;
-    set @dyeBase, 2130;
-    goto L_choose_color;
-
-L_cotton_boots:
-    set @normal, 735;
-    set @dyeBase, 2150;
-    goto L_choose_color;
-
-L_cotton_gloves:
-    set @normal, 741;
-    set @dyeBase, 2160;
-    goto L_choose_color;
-
-L_rabbit_ears:
-    set @normal, 1255;
-    set @dyeBase, 2190;
-    goto L_choose_color;
-
-L_wizard_hat:
-    set @normal, 4028;
-    set @dyeBase, 2200;
-    goto L_choose_color;
-
-L_bowler_hat:
-    set @normal, 4030;
-    set @dyeBase, 2210;
-    goto L_choose_color;
-
-L_sorcerer_robe:
-    mes "[Candide]";
-    mes "\"Which one?\"";
-    next;
-    menu
-        "A red lined one.", L_red_lined_sorcerer_robe,
-        "A green lined one.", L_green_lined_sorcerer_robe,
-        "A dark blue lined one.", L_dark_blue_lined_sorcerer_robe,
-        "A yellow lined one.", L_yellow_lined_sorcerer_robe,
-        "A light blue lined one.", L_light_blue_lined_sorcerer_robe,
-        "A pink lined one.", L_pink_lined_sorcerer_robe,
-        "A black lined one.", L_black_lined_sorcerer_robe,
-        "An orange lined one.", L_orange_lined_sorcerer_robe,
-        "A purple lined one.", L_purple_lined_sorcerer_robe,
-        "A dark green lined one.", L_dark_green_lined_sorcerer_robe,
-        "A white lined one.", L_white_lined_sorcerer_robe,
-        "Nevermind.", L_Close;
-
-L_red_lined_sorcerer_robe:
-    set @normal, 798;
-    set @dyeBase, 2220;
-    goto L_choose_color;
-
-L_green_lined_sorcerer_robe:
-    set @normal, 5010;
-    set @dyeBase, 5000;
-    goto L_choose_color;
-
-L_dark_blue_lined_sorcerer_robe:
-    set @normal, 5021;
-    set @dyeBase, 5011;
-    goto L_choose_color;
-
-L_yellow_lined_sorcerer_robe:
-    set @normal, 5032;
-    set @dyeBase, 5022;
-    goto L_choose_color;
-
-L_light_blue_lined_sorcerer_robe:
-    set @normal, 5043;
-    set @dyeBase, 5033;
-    goto L_choose_color;
-
-L_pink_lined_sorcerer_robe:
-    set @normal, 5054;
-    set @dyeBase, 5044;
-    goto L_choose_color;
-
-L_black_lined_sorcerer_robe:
-    set @normal, 5065;
-    set @dyeBase, 5055;
-    goto L_choose_color;
-
-L_orange_lined_sorcerer_robe:
-    set @normal, 5076;
-    set @dyeBase, 5066;
-    goto L_choose_color;
-
-L_purple_lined_sorcerer_robe:
-    set @normal, 5087;
-    set @dyeBase, 5077;
-    goto L_choose_color;
-
-L_dark_green_lined_sorcerer_robe:
-    set @normal, 5098;
-    set @dyeBase, 5088;
-    goto L_choose_color;
-
-L_white_lined_sorcerer_robe:
-    set @normal, 5109;
-    set @dyeBase, 5099;
-    goto L_choose_color;
-
-L_bowler_hat_brown:
-    set @normal, 800;
-    set @dyeBase, 2230;
-    goto L_choose_color;
-
-L_fine_dress:
-    set @normal, 870;
-    set @dyeBase, 2240;
-    goto L_choose_color;
-
-L_cotton_cloth:
-    set @normal, 660;
-    set @dyeBase, 2250;
-    goto L_choose_color;
-
-L_choose_color:
-    mes "[Candide]";
-    mes "\"And the color?\"";
-    next;
-
-    menu
-        "Red.", L_MenuItems,
-        "Green.", L_MenuItems,
-        "Dark Blue.", L_MenuItems,
-        "Yellow.", L_MenuItems,
-        "Light Blue.", L_MenuItems,
-        "Pink.", L_MenuItems,
-        "Black.", L_MenuItems,
-        "Orange.", L_MenuItems,
-        "Purple.", L_MenuItems,
-        "Dark Green.", L_MenuItems;
-
-L_MenuItems:
-    set @del, @dyeBase + @menu - 1;
-
-    if (countitem(@del) == 0) goto L_no_item;
-
-    if (countitem("PileOfAsh") < 3) goto L_no_ash;
-
-    if (Zeny < 5000) goto L_no_money;
-
-    delitem @del, 1;
-    getitem @normal, 1;
-    delitem "PileOfAsh", 3;
-    set Zeny, Zeny - 5000;
-    goto L_again;
-
-L_again:
-    mes "[Candide]";
-    mes "\"Would you like to bleach something else?\"";
-    next;
-
-    menu
-        "Yes.", L_bleach_menu,
-        "No.", L_Close;
-
-L_no_item:
-    mes "[Candide]";
-    mes "\"You don't have one of those.\"";
-    next;
-
-    goto L_again;
-
-L_no_ash:
-    mes "[Candide]";
-    mes "\"You don't have enough ash for me to bleach anything.";
-    mes "I need three piles.\"";
-    goto L_Close;
-
-L_no_money:
-    mes "[Candide]";
-    mes "\"You don't have enough gold for me to bleach anything.";
-    mes "I need 5,000 GP for supplies.\"";
-    goto L_Close;
-
-L_Close:
-    mes "[Candide]";
-    mes "\"Come again.\"";
-    set @normal, 0;
-    set @dyeBase, 0;
-    set @del, 0;
-    close;
-}
diff --git a/world/map/npc/001-1/ched.txt b/world/map/npc/001-1/ched.txt
new file mode 100644
index 00000000..7dfc4ed7
--- /dev/null
+++ b/world/map/npc/001-1/ched.txt
@@ -0,0 +1,25 @@
+// Student at Tulimshar's magic academy
+
+001-1.gat,43,48,0|script|Ched|113
+{
+    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;
+    menu
+        "Well, good luck with that!", L_Done,
+        "What spell is that?", L_Next;
+
+L_Next:
+    mes "[Ched]";
+    mes "\"Well, I don't know what it's called... I took it out of `Timbleweed's Advanced Transmutations.'  It seems awfully hard to cast, somehow.\"";
+    next;
+    mes "[Ched]";
+    mes "\"Well, the invocation is `" + getspellinvocation("merge-concentration-potions") + "'. You're supposed to just hold up the potions and cast it, and then they're supposed to merge.\"";
+    next;
+    mes "[Ched]";
+    mes "\"Maybe I should go back to `detect magic' until I can cast that one properly.\"";
+    goto L_Done;
+
+L_Done:
+    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/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
deleted file mode 100644
index ce330f8a..00000000
--- a/world/map/npc/001-1/elanore.txt
+++ /dev/null
@@ -1,619 +0,0 @@
-//
-
-function|script|ElanoreFix
-{
-    set @Q_MASK, NIBBLE_1_MASK;
-    set @Q_SHIFT, NIBBLE_1_SHIFT;
-
-    set @Q_STATUS_MAX, 3; // FIXME once level 3 magic was released
-
-    set @Q_status, (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT;
-    if (@Q_status > @Q_STATUS_MAX)
-    set @Q_status, @STATUS_INITIAL;
-    if (@Q_status > 1 && (getskilllv(SKILL_MAGIC_LIFE) < 2))
-    set @Q_status, @STATUS_INITIAL;
-
-    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
-    return;
-}
-
-001-1.gat,58,68,0|script|Elanore#_M|108
-{
-    set @has_magic, getskilllv(SKILL_MAGIC);
-
-    set @Q_MASK, NIBBLE_1_MASK;
-    set @Q_SHIFT, NIBBLE_1_SHIFT;
-
-    set @Q_status, (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT;
-    set @Q_heal_exp, MAGIC_EXPERIENCE >> 24;
-
-    // Set up SkillUp function
-    set @SUP_id, SKILL_MAGIC_LIFE;
-    set @SUP_name$, "Life Magic";
-
-    set @STATUS_INITIAL, 0;
-    set @STATUS_LEARNED_LIGHT_HEAL, 1;
-    set @STATUS_MASTERED_LIGHT_HEAL, 2;
-    set @STATUS_LEARNED_LAY_ON_HANDS, 3;
-    set @STATUS_WAITING_FOR_KADIYA, 4;
-    set @STATUS_READY_TO_LEARN_CURE_POISON, 5;
-    set @STATUS_LEARNED_CURE_POISON, 6;
-
-    callfunc "ElanoreFix";
-
-    // This operation works around an earlier possible corruption of this state
-    if (@Q_status > @Q_STATUS_MAX)
-    set @Q_status, @STATUS_INITIAL;
-    callsub S_update_var;
-    if (sc_check(sc_poison)) goto L_CurePoison;
-    if (BaseLevel > 10) goto L_NoHeal;
-    set @TEMP,rand(4);
-    if(@TEMP == 1) goto L_Heal2;
-    if(@TEMP == 2) goto L_Heal3;
-    if(@TEMP == 3) goto L_Heal4;
-    goto L_Heal1;
-
-L_Heal1:
-
-    mes "[Elanore the Healer]";
-    mes "\"You don't look too well; let me treat your wounds.\"";
-    next;
-    goto L_Heal_L;
-
-L_Heal2:
-
-    mes "[Elanore the Healer]";
-    mes "\"I will make quick work of your wounds.\"";
-    next;
-    goto L_Heal_L;
-
-L_Heal3:
-
-    mes "[Elanore the Healer]";
-    mes "\"Need a healing?\"";
-    next;
-    goto L_Heal_L;
-
-L_Heal4:
-
-    mes "[Elanore the Healer]";
-    mes "\"Sometimes you just need to run from battle.\"";
-    next;
-    goto L_Heal_L;
-
-L_Heal_L:
-    set @TEMP,rand(3);
-    if(@TEMP == 1) goto L_Heal_2;
-    if(@TEMP == 2) goto L_Heal_3;
-    if(@TEMP == 3) goto L_Heal_4;
-    goto L_Heal_1;
-
-L_Heal_1:
-
-    mes "[Elanore the Healer]";
-    mes "\"Here you go!\"";
-    heal 10000,10000;
-    goto L_Close;
-
-L_Heal_2:
-
-    mes "[Elanore the Healer]";
-    mes "\"Painless, wasn't it?";
-    heal 10000,10000;
-    goto L_Close;
-
-L_Heal_3:
-
-    mes "[Elanore the Healer]";
-    mes "\"You should be more careful.\"";
-    heal 10000,10000;
-    goto L_Close;
-
-L_Heal_4:
-
-    mes "[Elanore the Healer]";
-    mes "\"Much better, right?!\"";
-    heal 10000,10000;
-    goto L_Close;
-
-L_NoHeal:
-    if (MAGIC_FLAGS)
-        goto L_Chat;
-    goto L_NoHealMessage;
-
-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 "You can get some rest in the inn near here.\"";
-    goto L_Close;
-
-L_Chat:
-    mes "[Elanore the Healer]";
-    mes "\"Hello!  Can I help you?\"";
-    next;
-    goto L_Main;
-
-L_Main:
-    if (@has_magic && (@Q_status == @STATUS_INITIAL))
-        menu
-            "Can you heal me?", L_NoHealMessage,
-            "Can you teach me magic?", L_Teach,
-            "What do you know about...", L_Question,
-            "Goodbye!", L_bye;
-    if (@has_magic && (@Q_status > @STATUS_INITIAL))
-        menu
-            "Can you heal me?", L_NoHealMessage,
-            "Can you teach me more?", L_Teach,
-            "Where can I get more lifestones?", L_Lifestones,
-            "What do you know about...", L_Question,
-            "Goodbye!", L_bye;
-    if (!@has_magic)
-        menu
-            "Can you heal me?", L_NoHealMessage,
-            "What do you know about...", L_Question,
-            "Goodbye!", L_bye;
-    goto L_Close;
-
-OnPCKillEvent:
-    if (attachrid(@killerrid) == 0)
-        end;
-    set @Q_heal_exp, MAGIC_EXPERIENCE >> 24;
-    if (@Q_heal_exp < 8) goto L_OnPcKillWipe;
-    set @Q_heal_exp, @Q_heal_exp - 8;
-    goto L_OnPcKillFinish;
-
-L_OnPcKillWipe:
-    set @Q_heal_exp, 0;
-    goto L_OnPcKillFinish;
-
-L_OnPcKillFinish:
-    set MAGIC_EXPERIENCE, (MAGIC_EXPERIENCE & ~(255 << 24)) | (@Q_heal_exp << 24);
-    goto L_Close;
-
-L_Lifestones:
-    mes "[Elanore the Healer]";
-    mes "\"I always need components for my own healing spells. If you bring me ten gamboge leaves, ten alizarin leaves, ten mauve leaves and ten cobalt leaves, I can make ten lifestones; I will give you half of them.\"";
-    next;
-    menu
-        "OK, I will get them.", L_Close,
-        "No way!", L_Close,
-        "Here you are!", L_Lifestones_Trade,
-        "Can I make them myself?", L_Lifestones_MakeSelf;
-
-L_Lifestones_Trade:
-    if (countitem("MauveHerb") < 10) goto L_Lifestones_Trade_Missing;
-    if (countitem("GambogeHerb") < 10) goto L_Lifestones_Trade_Missing;
-    if (countitem("AlizarinHerb") < 10) goto L_Lifestones_Trade_Missing;
-    if (countitem("CobaltHerb") < 10) goto L_Lifestones_Trade_Missing;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("Lifestone") == 0
-        && countitem("MauveHerb") > 10
-        && countitem("GambogeHerb") > 10
-        && countitem("AlizarinHerb") > 10
-        && countitem("CobaltHerb") > 10) goto L_Lifestones_NoRoom;
-
-    delitem "MauveHerb", 10;
-    delitem "GambogeHerb", 10;
-    delitem "AlizarinHerb", 10;
-    delitem "CobaltHerb", 10;
-    getitem "Lifestone", 5;
-    getexp 200, 1;
-    mes "[Elanore the Healer]";
-    mes "Elanore carefully goes over your leaves, then smiles.";
-    mes "\"These will do just fine.\"";
-    mes "She picks up all fourty and presses them together in her hands, then whispers something.";
-    next;
-    mes "[Elanore the Healer]";
-    mes "As she opens her hands again, the leaves have turned into ten golden crystals.";
-    mes "\"Five for you and five for me.\"";
-    mes "She smiles.";
-    mes "[200 experience points]";
-    goto L_Close;
-
-L_Lifestones_NoRoom:
-    mes "[Elanore the Healer]";
-    mes "\"Oh... it seems that you have no room for the lifestones. But please do come back later when you have made a little space.\"";
-    goto L_Close;
-
-L_Lifestones_Trade_Missing:
-    mes "[Elanore the Healer]";
-    mes "Elanore counts the leaves you show her.";
-    mes "\"No, I am sorry. Please bring me ten leaves each of gamboge, alizarin, mauve, and cobalt.\"";
-    goto L_Close;
-
-L_Lifestones_MakeSelf:
-    mes "[Elanore the Healer]";
-    if (@has_magic < 2) goto L_Lifestones_MakeSelf_no;
-    goto L_Lifestones_MakeSelf_yes;
-
-L_Lifestones_MakeSelf_yes:
-    mes "\"Oh, but of course!  You are powerful enough to make your own lifestones, using the enchantment '" + getspellinvocation("enchant-lifestone") + "'. This will consume a bug leg or a maggot slime or one of each of the four healing herbs, though.\"";
-    goto L_Close;
-
-L_Lifestones_MakeSelf_no:
-    mes "\"No, you are not powerful enough yet. Please come back and ask me again when you have learned to control more powerful magic, though!\"";
-    goto L_Close;
-
-L_Teach:
-    if (@Q_status == @STATUS_INITIAL) goto L_Teach_Initial;
-    if (@Q_status == @STATUS_LEARNED_LIGHT_HEAL) goto L_Teach_CheckAdvanceTo2;
-    if (@Q_status == @STATUS_MASTERED_LIGHT_HEAL) goto L_Teach_CheckAdvanceToLOH;
-    if (@Q_status == @STATUS_LEARNED_LAY_ON_HANDS) goto L_Teach_Explain3;
-    if (@Q_status == @STATUS_WAITING_FOR_KADIYA) goto L_Teach_CheckAdvanceTo3;
-    if (@Q_status == @STATUS_READY_TO_LEARN_CURE_POISON) goto L_Teach_CurePosion;
-    if (@Q_status == @STATUS_LEARNED_CURE_POISON) goto L_Teach_dunno;
-
-    mes "[Elanore the Healer]";
-    mes "\"You have made good progress, but you lack the magical power to advance further. Also, I would like to observe you some more to be certain that you will make a good healer.\"";
-    goto L_Close;
-
-L_Teach_Initial:
-    mes "[Elanore the Healer]";
-    mes "\"I will only teach you magic of the school of Life, and that only if you prove yourself to be a good healer – that is, if you use your powers to help others.\"";
-    mes "She hesistates.";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"I don't know you very well, but I don't think that there is any harm in teaching you a simple spell.\"";
-    mes "She reaches inside her satchel and pulls out a piece of crystal, glittering in the sun.";
-    mes "\"This here is a lifestone, life energy encased in a crystal shell. You will need it for most healing magic.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"To heal someone, first locate the injury. As a beginner, you have to touch the wound; with practice, it will be enough to think about it. Hold the lifestone in one hand, touching the wound with the other.\"";
-    mes "\"Then say, '" + getspellinvocation("lesser-heal") + "', followed by the name of the one you wish to heal.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"You might want to write that down, actually. In fact, you might want to make sure to keep notes of all spells you hear, for you never know if you will hear them again!\"";
-    mes "\"The invocation was '" + getspellinvocation("lesser-heal") + "'.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"This will only cure cuts and bruises, though, and it will take some time to take effect. It will be useless to mend broken bones or more severe injuries!\"";
-    mes "\"To heal yourself, it's enough to just say '" + getspellinvocation("lesser-heal") + "' by itself.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"Let me give you a lifestone to get started with.\"";
-    next;
-    getinventorylist;
-    if ((@inventorylist_count == 100) && (countitem("Lifestone") == 0)) goto L_Teach_Initial_Noroom;
-    getitem "Lifestone", 1;
-    set @Q_status, @STATUS_LEARNED_LIGHT_HEAL;
-    callsub S_update_var;
-
-    mes "[Elanore the Healer]";
-    mes "Elanore hands you the crystal.";
-    mes "\"Here you are. I hope that it will allow you to do good!\"";
-    goto L_Close;
-
-L_Teach_Initial_Noroom:
-    mes "[Elanore the Healer]";
-    mes "\"Oh... you managed to put things into every little nook and pocket, haven't you?  Well, come back later, I will give it to you then.\"";
-    goto L_Close;
-
-L_Teach_CheckAdvanceTo2:
-    mes "[Elanore the Healer]";
-    if (@Q_heal_exp < 20) goto L_Teach_CheckAdvanceTo2_fail;
-    mes "Elanore smiles at you.";
-    mes "\"From what I have been hearing, you seem to be doing well on your way to becoming a healer. I have decided to accept you as a student of the School of Life Magic.\"";
-    next;
-    if (getskilllv(SKILL_MAGIC) < 2) goto L_Teach_AdvanceTo2_warn;
-    goto L_Teach_AdvanceTo2_skip;
-
-L_Teach_AdvanceTo2_warn:
-    mes "[Elanore the Healer]";
-    mes "\"But be warned:  you won't be able to use advanced healing magic until you are more capable in your regular magic usage.\"";
-    next;
-    goto L_Teach_AdvanceTo2_skip;
-
-L_Teach_AdvanceTo2_skip:
-    mes "[Elanore the Healer]";
-    mes "\"Please stand still.\"";
-    mes "She walks up to you, holds your shoulders, and smiles at you.";
-    next;
-    mes "[Elanore the Healer]";
-    mes "Then, she rises up on her tiptoes and kisses you on your forehead.";
-    next;
-    mes "[Elanore the Healer]";
-    mes "You feel a strange, tingling kind of warmth spread through your body.";
-    set @Q_status, @STATUS_MASTERED_LIGHT_HEAL;
-    callsub S_update_var;
-    set @SUP_xp, 5000;
-    set @SUP_lvl, 2;
-    callfunc "SkillUp";
-    goto L_Close;
-
-L_Teach_CheckAdvanceTo2_fail:
-    mes "\"I think I would like to observe you for a little longer to see if you would make a good healer.\"";
-    if (@Q_heal_exp < 5)
-        mes "\"You are still at the beginning of your path, but do keep practicing.\"";
-    if ((@Q_heal_exp >= 5) && (@Q_heal_exp < 15))
-        mes "\"You are making progress, but you still need more practice.\"";
-    if (@Q_heal_exp >= 15)
-        mes "\"You have made good progress, but please do continue in your efforts.\"";
-    goto L_Close;
-
-L_Teach_CheckAdvanceToLOH:
-    if (getskilllv(SKILL_MAGIC) < 2) goto L_Teach_LOH_advance_abort0;
-    if (@Q_heal_exp < 30) goto L_Teach_LOH_advance_abort1;
-
-    mes "[Elanore the Healer]";
-    mes "\"I will now teach you how to heal by laying on your hands. The technique is similar to the spell I taught you at the beginning, but this time you transfer your own health instead of drawing health from a lifestone.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"First, lay your hand on the person you wish to heal. You needn't touch the injury itself, though you have to touch the skin until you are a little more experienced. Then, medidate on the word '" + getspellinvocation("lay-on-hands") + "'\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"This will let your own life force flow into the person you are healing. If you are badly injured yourself, you will not be able to do this.\"";
-    mes "[1000 experience points]";
-    getexp 1000, 0;
-    set @Q_status, @STATUS_LEARNED_LAY_ON_HANDS;
-    callsub S_update_var;
-    goto L_Close;
-
-L_Teach_LOH_advance_abort0:
-    mes "[Elanore the Healer]";
-    mes "\"You don't have enough magical power to learn the next healing spell yet.\"";
-    goto L_Close;
-
-L_Teach_LOH_advance_abort1:
-    mes "[Elanore the Healer]";
-    mes "\"I'm sorry, but I am not yet convinced that you are a good enough healer. Please continue in your endeavours.\"";
-    goto L_Close;
-
-L_Teach_Explain3:
-    if (getskilllv(SKILL_MAGIC) < 3) goto L_Teach_Explain3_abort;
-    if (@Q_heal_exp < 50) goto L_Teach_Explain3_fail;
-
-    mes "[Elanore the Healer]";
-    mes "Elanore smiles.";
-    mes "\"You seem to be ready to advance as a healer. There is one favour I must ask of you first, though.\"";
-    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(NIBBLE_3_MASK)); // Initialise Kadiya quest
-    set @Q_status, @STATUS_WAITING_FOR_KADIYA;
-    callsub S_update_var;
-    next;
-
-    mes "[Elanore the Healer]";
-    mes "\"There is a man here in Tulimshar with a beautiful young daughter; his name is Omar, and his daughter's name is Kadiya.\"";
-    mes "\"Once, when I was a young apprentice, I made a mistake treating Omar. Ever since, he no longer trusts me.\"";
-    next;
-
-    mes "[Elanore the Healer]";
-    mes "\"But his daugher has contracted Mopox, so she needs help. He doesn't trust me, but perhaps he will trust you; you have been helping quite a few people, after all.\"";
-    next;
-    goto L_3_menu;
-
-L_3_menu:
-    menu
-        "What should I do?", L_3_what_to_do,
-        "Where can I find the sick girl?", L_3_where,
-        "How did you mess up?", L_3_messup,
-        "I will get started right away.", L_Main,
-        "Maybe later.", L_Main;
-
-L_3_what_to_do:
-    mes "[Elanore the Healer]";
-    mes "\"You will have to brew a Mopox cure potion and give it to her. You should ask Caul to help you, he knows the recipe.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"First, you will need a concentration potion and an iron potion – together, they will give her her strength back. You also need a lifestone, and a gamboge leaf against the toxins in her body.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"You then have to add in roots, water, mauve leaves and sulphur powder until the brew is gooey and neither light nor dark. Caul will explain the details to you.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"There is a transmutation spell to make sulphur powder. If you don't know the magic, perhaps you can ask a transmutation mage to help you with this part.\"";
-    next;
-    goto L_3_menu;
-
-L_3_messup:
-    mes "[Elanore the Healer]";
-    mes "\"Ah... well, Omar is a trader, and a frequent traveler. One day he came back from a journey with fleas in his beard and asked me to get rid of them.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"Unfortunately I used the wrong lotion on the fleas, so instead of being scared away, they grew to enormous proportions and ate up all of his beard.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "Elanore blushes.";
-    mes "\"Ever since then he hasn't been very trusting towards my skills, and I suppose that I can't blame him. But I don't want poor Kadiya to suffer because of that.\"";
-    next;
-    goto L_3_menu;
-
-L_3_where:
-    mes "[Elanore the Healer]";
-    mes "\"Kadiya and Omar live relatively close by. See this corner in the inner city wall east of here?  Turn past it, then go north. It's the second house.\"";
-    next;
-    goto L_3_menu;
-
-L_Teach_Explain3_abort:
-    mes "[Elanore the Healer]";
-    mes "\"I'm sorry, but you lack the magical power to advance.\"";
-    goto L_Close;
-
-L_Teach_Explain3_fail:
-    mes "[Elanore the Healer]";
-    if (@Q_heal_exp < 30)
-        mes "\"You seem to have regressed as a healer. This is worrisome; please mend your ways or I will not teach you any further.\"";
-    if ((@Q_heal_exp >= 30) && (@Q_heal_exp < 40))
-        mes "\"You still need more practice in the art of healing.\"";
-    if ((@Q_heal_exp >= 40))
-        mes "\"You are doing well, but you need some more practice as a healer first.\"";
-    goto L_Close;
-
-L_Teach_CheckAdvanceTo3:
-    callfunc "KadiyaSubquestConsts";
-
-    if (@Q_kadiya_status >= @Q_STATUS_COMPLETED) goto L_Teach_AdvanceTo3Ready;
-
-    mes "[Elanore the Healer]";
-    mes "\"Please help Kadiya.\"";
-    next;
-    goto L_3_menu;
-
-L_Teach_AdvanceTo3Ready:
-    mes "[Elanore the Healer]";
-    mes "\"I have heard of what you did. Hiding the potion in her favorite food – that was clever.\"";
-    mes "She smiles at you.";
-    mes "\"Omar let me have a look at her earlier, and she seems to be recovering. You did very well.";
-    next;
-    mes "[Elanore the Healer]";
-    mes "Elanor turns towards you, rises up on her toes and kisses you on the forehead.";
-    next;
-    set @xp, 30000;
-    if (@Q_kadiya_status == @Q_STATUS_COMPLETED_ELANORE)
-        set @xp, 50000;
-    mes "[Elanore the Healer]";
-    mes "You feel a strange, tingling kind of warmth spread through your body.";
-    mes "[" + @xp + " experience points]";
-    mes "[Level 3 in Life Magic]";
-
-    set @Q_status, @STATUS_READY_TO_LEARN_CURE_POISON;
-    callsub S_update_var;
-    getexp @xp, 0;
-    if (getskilllv(SKILL_MAGIC_LIFE) < 3)
-        setskill SKILL_MAGIC_LIFE, 3;
-    next;
-
-    if (@Q_kadiya_status != @Q_STATUS_COMPLETED_ELANORE) goto L_Main;
-
-    mes "[Elanore the Healer]";
-    mes "\"Overall I am impressed by your progress. If you continue as you are doing now, you might become a great healer.\"";
-    mes "She hands you a handful of lifestones.";
-    mes "\"Please come back soon; there is more that I would like to teach you.\"";
-    next;
-    set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_ELANORE_OMAR;
-    getitem "Lifestone", 20;
-
-    goto L_Main;
-
-L_Teach_CurePosion:
-    mes "[Elanore the Healer]";
-    mes "\"Thank you again for your help with Kadiya!\"";
-    mes "\"Curing sicknesses is often quite difficult; most of them require complicated potions to be brewed.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"Fortunately, things are much easier with most poisons. For those we have a simple spell that only requires a Gamboge leaf.\"";
-    mes "\"This is the next spell that I would like to teach you.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"If you would like to cure someone who is poisoned, first rub a Gamboge leaf between your hands. Your hands must be covered in Gamboge liquid for this to work.\"";
-    mes "\"Speak the invocation, `" + getspellinvocation("cure-poison") + "'.\"";
-    mes "\"Next, you either touch the poisoned person with your hands, or speak their name. You have to be close for this to work, though.\"";
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"Once again, the invocation is `" + getspellinvocation("cure-poison") + "'.\"";
-    mes "\"Come back again soon; there is another spell I would like to teach you.\"";
-    next;
-    set @Q_status, @STATUS_LEARNED_CURE_POISON;
-    callsub S_update_var;
-    goto L_Main;
-
-L_Teach_dunno:
-    mes "[Elanore the Healer]";
-    mes "\"Hmm. I wanted to teach you something, but I've forgotten what it was... please come back later.\"";
-    next;
-    goto L_Main;
-
-L_Question:
-    callfunc "MagicTalkOptionsSetup";
-    set @ignore, @QQ_ELANORE;
-    callfunc "MagicTalkMenu";
-
-    if (@c == 0) goto L_Main;
-    if (@c == @QQ_MANASEED) goto L_Q_manaseed;
-    if (@c == @QQ_MANAPOTION) goto L_Q_manapotion;
-    if (@c == @QQ_WYARA) goto L_Q_wyara;
-    if (@c == @QQ_SAGATHA) goto L_Q_sagatha;
-    if (@c == @QQ_AULDSBEL) goto L_Q_auldsbel;
-    if (@c == @QQ_OLDWIZ) goto L_Q_oldwiz;
-    if (@c == @QQ_ASTRALSOUL) goto L_Q_astralsoul;
-
-    mes "[Elanore the Healer]";
-    mes "Elanore shakes her head.";
-    mes "\"I am sorry, but I don't think that I know anything that would help you.\"";
-    next;
-    goto L_Main;
-
-L_Q_astralsoul:
-    mes "[Elanore the Healer]";
-    mes "\"The astral soul skill is one of the most important skills for mages. I learned this focus long time ago. Without that skill your magic is quite useless, isn't it? If the rumors are really true, there is an experienced mage in the Woodlands around Hurnscald.\"";
-    next;
-    goto L_Main;
-
-L_Q_oldwiz:
-    mes "[Elanore the Healer]";
-    mes "\"He is a kind old man. He stays mostly with his books and his apprentice, though we have chatted a few times.\"";
-    next;
-    goto L_Main;
-
-L_Q_manaseed:
-    mes "[Elanore the Healer]";
-    mes "She smiles.";
-    mes "\"If the rumors are true and there really is a Mana Seed, then that would be wonderful news – perhaps we will have a few more healers soon!\"";
-    next;
-    goto L_Main;
-
-L_Q_manapotion:
-    mes "[Elanore the Healer]";
-    mes "\"I'm sorry, but I can't help you with that.\"";
-    next;
-    goto L_Main;
-
-L_Q_wyara:
-    mes "[Elanore the Healer]";
-    mes "\"Wyara is the Hurnscald town witch. She was also the town healer before the Doctor moved there.\"";
-    next;
-    goto L_Main;
-
-L_Q_sagatha:
-    mes "[Elanore the Healer]";
-    mes "\"Oh, I have only met Sagatha once or twice, while collecting herbs. She is a warm and gentle person, but she tries to hide it.\"";
-    next;
-    goto L_Main;
-
-L_Q_auldsbel:
-    mes "[Elanore the Healer]";
-    mes "\"Oh, sorry – I don't really know him very well.\"";
-    next;
-    goto L_Main;
-
-L_CurePoison:
-    mes "[Elanore the Healer]";
-    mes "\"Oh dear!  That looks like poison; hang on...\"";
-    mes "She performs a complicated gesture.";
-        sc_end(sc_poison);
-        sc_end(sc_slowpoison);
-    misceffect sfx_magic_life, strcharinfo(0);
-    misceffect sfx_magic_life;
-    next;
-    mes "[Elanore the Healer]";
-    mes "\"There you are, right as rain!  Now you take care, all right?\"";
-    goto L_Close;
-
-L_bye:
-    mes "[Elanore the Healer]";
-    mes "\"Goodbye!\"";
-    goto L_Close;
-
-L_Close:
-    set @Q_MASK, 0;
-    set @Q_SHIFT, 0;
-    set @has_magic, 0;
-    set @Q_STATUS_MAX, 0;
-    set @Q_heal_exp, 0;
-    set @Q_status, 0;
-    set @SUP_id, 0;
-    set @SUP_name$, "";
-    set @ignore, 0;
-    set @STATUS_LEARNED_LIGHT_HEAL, 0;
-    set @STATUS_MASTERED_LIGHT_HEAL, 0;
-    set @STATUS_LEARNED_LAY_ON_HANDS, 0;
-    set @STATUS_WAITING_FOR_KADIYA, 0;
-    set @STATUS_READY_TO_LEARN_CURE_POISON, 0;
-    set @STATUS_LEARNED_CURE_POISON, 0;
-    set @TEMP,0;
-    set @xp, 0;
-    close;
-
-S_update_var:
-    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
-    return;
-}
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
deleted file mode 100644
index 3bc2e141..00000000
--- a/world/map/npc/001-1/entertainer.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-// Emote NPC allows for players to learn the emote skill
-
-001-1.gat,30,43,0|script|Entertainer|165
-{
-    mes "[Entertainer]";
-    mes "\"Yes how can I help you?\"";
-    menu
-        "How are you showing emotions above your head?", L_Learn,
-        "Never mind", L_Close;
-
-L_Learn:
-    mes "[Entertainer]";
-    mes "\"They are called emotes, I use them to express how I am feeling.";
-    mes "I can teach you if you'd like?\"";
-    menu
-        "Yes please.", L_Learn2,
-        "I don't see the point right now.", L_Close;
-
-L_Learn2:
-    mes "[Entertainer]";
-    mes "\"All you have to do is press alt and a number.";
-    mes "The number determines what emotion will be shown.";
-    mes "Some clients will also show an emote shortcut-bar with the F12 button\"";
-    goto L_Close;
-
-L_Close:
-    close;
-
-OnTimer3000:
-    emotion rand(EMOTE_DISGUST, EMOTE_TEARS);
-    setnpctimer 0;
-    end;
-
-OnInit:
-    if (debug >= 2) end;
-    initnpctimer;
-    end;
-}
diff --git a/world/map/npc/001-1/eomie.txt b/world/map/npc/001-1/eomie.txt
new file mode 100644
index 00000000..ab6a72bc
--- /dev/null
+++ b/world/map/npc/001-1/eomie.txt
@@ -0,0 +1,143 @@
+// A professor at Tulimshar's magic academy, involved in quest:
+// Anwar needs a magic fertilizer for his field
+// Quest uses Nibble 3 of QUEST_NorthTulimshar
+// Author: Jenalya
+// state 1: Anwar sent to Tinris for help to get a magic fertilizer
+// state 2: Tinris asked for chocolate cake as present for his girlfriend
+// state 3: Tinris asked for ingredients for the fertilizer
+// state 4: Tinris gave you the fertilizer
+// state 5: Anwar tried it out and it doesn't work well, sent you back to Tinris
+// state 6: Tinris asked for more ingredients for a new try
+// state 7: Tinris says it's really hard, gives you the fertilizer and tells you to ask Eomie to cast a spell on it
+// state 8: Eomie sends you to get some stuff so she can interrupt her spell on the spot of grass
+// state 9: Eomie casted a spell on the fertilizer
+// state 10: Anwar used it and it worked. he asks you to help him preparing a thank-you-gift for each Tinris and Eomis
+// state 11: Anwar asked to bring present to Tinris
+// state 12: gave present to Tinris
+// state 13: Anwar asked to bring present to Eomie
+// state 14: gave present to Eomie
+// state 15: reported back to Anwar and done
+
+001-1.gat,71,23,0|script|Eomie|164
+{
+    set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
+
+    set @grass_amount, 5;
+    set @water_amount, 2;
+    set @ice_amount, 2;
+
+    set @silk_exp, 600;
+
+    if (@state >= 14) goto L_Done;
+    if (@state >= 9) goto L_CastedSpell;
+    if (@state == 8) goto L_GetStuff;
+
+    mes "[Eomie]";
+    mes "\"I maintain this little spot of grass in the desert.\"";
+    if (@state != 7)
+        goto L_Close;
+    menu
+        "I have this magic fertilizer from Tinris and need a spell cast on it.",L_Next;
+
+L_Next:
+    mes "[Eomie]";
+    mes "\"Oh? I see, that's a difficult task.";
+    mes "I'd be glad to help you, but unfortunately I can't interrupt the magic I use to keep this spot of grass alive.\"";
+    next;
+    mes "\"It's unusually hot at the moment, even for this desert area. It might have something to do with the aftereffects of the earthquake.\"";
+    menu
+        "Isn't there any possibility?",L_Continue;
+
+L_Continue:
+    mes "She hesitates.";
+    set @state, 8;
+    callsub S_Update_Mask;
+    goto L_GetStuff;
+
+L_GetStuff:
+    // @state == 8
+    mes "[Eomie]";
+    mes "\"I could try to interrupt my spells to be able to cast the spell on the fertilizer, but then I need to prepare the grass for this.";
+    mes "Bring me " + @grass_amount + " Grass Seeds, " + @water_amount + " Bottles of Water and " + @ice_amount + " Ice Cubes.\"";
+    menu
+        "I have it.",L_More,
+        "Where can I get Grass Seeds?",L_Hurnscald,
+        "How can I get Ice Cubes? We're in the desert!",L_Mine,
+        "Ok, I'll go and get it.",L_Close;
+L_More:
+    if ((countitem("GrassSeed") < @grass_amount) || (countitem("BottleOfWater") < @water_amount) || (countitem("IceCube") < @ice_amount))
+        goto L_NoItem;
+
+    delitem "GrassSeed", @grass_amount;
+    delitem "BottleOfWater", @water_amount;
+    delitem "IceCube", @ice_amount;
+    set @state, 9;
+    callsub S_Update_Mask;
+    mes "[Eomie]";
+    mes "\"Very good.\"";
+    mes "She takes the things you brought her and uses them to create a bubble of coolness around the spot of grass.";
+    misceffect sfx_magic_nature;
+    next;
+    mes "[Eomie]";
+    mes "\"This should last long enough to keep the spot of grass alive until I cast the spell on the fertilizer. And if some of it shrivels I still have the seeds you brought me which I can use to recover it.\"";
+    next;
+    mes "She takes the fertilizer and casts some invocations. After a while she's done and gives it back to you with a smile.";
+    misceffect sfx_magic_nature;
+    mes "[Eomie]";
+    mes "\"This should help you. I'm glad you're taking care of the plants. Not enough people do that nowadays.\"";
+    goto L_Close;
+
+L_Hurnscald: // player asked how to get Grass Seeds
+    mes "[Eomie]";
+    mes "\"Squirrels tend to pick up Grass Seeds as they gather food. You can find them around Hurnscald. To get there you will have to take the ferry in the harbor district.\"";
+    goto L_Close;
+
+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 around Nivalis. Maybe you can find Ice Cubes in there.\"";
+    goto L_Close;
+
+L_CastedSpell: // @state >= 9 but below 14
+    mes "[Eomie]";
+    mes "\"The grass wasn't damaged due to the interruption. I hope the magic fertilizer is useful for Anwar.\"";
+    if (@state != 13)
+        goto L_Close;
+    menu
+        "It was and he created this Silk Headband as a present for you.",L_Present,
+        "(Mumble something and leave)",L_Close;
+
+L_Present:
+    if (countitem("SilkHeadband") < 1)
+        goto L_NoItem;
+    delitem "SilkHeadband", 1;
+    getexp @silk_exp, 0;
+    set @state, 14;
+    callsub S_Update_Mask;
+    mes "[Eomie]";
+    mes "\"Oh, this is very friendly! Please tell him I'm very happy about it.\"";
+    mes "She smiles.";
+    goto L_Close;
+
+L_Done: // @state >= 14
+    mes "[Eomie]";
+    mes "\"Hello. I'm happy to see someone like you being dedicated to the needs of plants and people.\"";
+    goto L_Close;
+
+L_NoItem:
+    mes "[Eomie]";
+    mes "\"Where is it?\"";
+    goto L_Close;
+
+L_Close:
+    set @state, 0;
+    set @grass_amount, 0;
+    set @water_amount, 0;
+    set @ice_amount, 0;
+    close;
+
+S_Update_Mask:
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_3_MASK)) | (@state << NIBBLE_3_SHIFT);
+    return;
+}
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/001-1/guide.txt b/world/map/npc/001-1/guide.txt
deleted file mode 100644
index 69a0231d..00000000
--- a/world/map/npc/001-1/guide.txt
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-
-001-1.gat,32,27,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.
-    // It is a bugfix
-    if ((TUT_var < 4) && (TUT_var & 2))
-        set FLAGS, FLAGS|FLAG_GOT_GRADUATIONCAP;
-
-    if ((TUT_var != 0) && !(FLAGS & FLAG_GOT_GRADUATIONCAP) && BaseLevel >= 10)
-        goto L_Grad;
-    goto L_DoneGrad;
-
-L_DoneGrad:
-    mes "[Ian the Guide]";
-    mes "\"Would you like to know about something?\"";
-    next;
-    goto L_Menu_A;
-
-L_Menu_A:
-    menu
-        "Fighting", L_Fight,
-        "Items", L_Items,
-        "Monsters", L_Monster,
-        "Stylist", L_Style,
-        "Quests", L_Quests,
-        "NPCs", L_NPC,
-        "Commands", L_Comm,
-        "Attributes", L_Stats,
-        "Magic", L_Magic,
-        "Quick Keys", L_Key,
-        "Laws", L_Laws,
-        "I know everything!", L_Know;
-
-L_Fight:
-    mes "[Ian the Guide]";
-    mes "\"People live in this world by living off of monsters.";
-    mes "You can fight monsters and even players by hitting the [CTRL] key, or left mouse click.\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"If you get tired of pressing the key too much, you can also type [SHIFT]+[CTRL].";
-    mes "This will make your character attack continuously for the time you are inactive.\"";
-    next;
-    goto L_Menu_A;
-
-L_Items:
-    mes "[Ian the Guide]";
-    mes "\"There are three types of items.";
-    mes "They can be Consumables, Equipment or Miscellaneous\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"Consumable items such as Potions, can be used only once.";
-    mes "After use, they will disappear from your inventory.\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"Equipment items like Armors, Weapons, Accessories";
-    mes "can be equipped for fashionable purposes or to raise your status.\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"Miscellaneous items such as maggot slime, are used";
-    mes "in creating other items, or just to trade and sell.\"";
-    next;
-    goto L_Menu_A;
-
-L_Monster:
-    mes "[Ian the Guide]";
-    mes "\"In every world, there are beasts. Monsters can be found almost anywhere!~";
-    mes "To fight them, please read [Fighting] if you do not know how.\"";
-    next;
-    mes "\"There a several types of monsters, Aggressive, Neutral, and Assistants.\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"Aggressive monsters know that they are always in danger";
-    mes "so therefore they always keep their guard up,";
-    mes "making them attack anybody in sight.\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"Neutral monsters tend to just lounge around until attacked.";
-    mes "They will leave everything alone unless they are threatened.\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"Assistants are monsters who help each other.";
-    mes "You should always check how many are around you before attacking a single one!\"";
-    next;
-    goto L_Menu_A;
-
-L_Style:
-    mes "[Ian the Guide]";
-    mes "\"The stylist NPCs will cut and perm your hair!";
-    mes "They are known for their hair growth formula\"";
-    next;
-    goto L_Menu_A;
-
-L_Quests:
-    mes "[Ian the Guide]";
-    mes "\"There are people in the world in need of help!";
-    mes "Most of these people aren't afraid to give rewards to those who help them.";
-    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.\"";
-    next;
-    goto L_Menu_A;
-
-L_NPC:
-    mes "[Ian the Guide]";
-    mes "\"NPCs [Non Playable Characters] are people who are always in the game,";
-    mes "tending to many varieties of services from just chatting to helping others.\"";
-    next;
-    goto L_Menu_A;
-
-L_Comm:
-    mes "[Ian the Guide]";
-    mes "\"/clear clears the text box.\"";
-    mes "\"/help displays the client commands (ones starting with a /) in the chat box.\"";
-    mes "\"/whisper [name] allows you to message someone privately.\"";
-    mes "\"/who displays the current number of online users.\"";
-    mes "\"/where displays the current map's name.\"";
-    next;
-    goto L_Menu_A;
-
-L_Stats:
-    mes "[Ian the Guide]";
-    mes "\"People vary greatly by how much strength, agility, dexterity, intelligence, vitality, and luck they have.\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"Strength helps you carry items, and it also allows you to hit harder – but it is not too helpful if you focus on missile weapons.";
-    mes "More agility allows you to attack faster, and to dodge attacks more easily.";
-    mes "Your dexterity determines how likely you are to hit a monster, and how effective you are with missile weapons.\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"Vitality determines how resistant to injuries you are, and how much damage you can take before you die.";
-    mes "Intelligence is useful for alchemy and magic, but there are few opportunities for either at the moment.";
-    mes "Luck determines many small things, including the likelihood of both recieving and dealing critical hits\"";
-    next;
-    mes "[Ian the Guide]";
-    mes "\"I recommend that you practice your dexterity, since some of the more dangerous monsters are very hard to hit otherwise.";
-    mes "Don't bother trying to work on your luck, and your intelligence is probably not something anyone cares about either.\"";
-    next;
-    goto L_Menu_A;
-
-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 "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;
-
-L_Key:
-    mes "[Ian the Guide]";
-    mes "\"There are many key combinations, press F1 for a short list of them!\"";
-    next;
-    goto L_Menu_A;
-
-L_Laws:
-    mes "[Ian the Guide]";
-    mes "\"The constable can help you with them.\"";
-    next;
-    goto L_Menu_A;
-
-L_Know:
-    mes "[Ian the Guide]";
-    mes "\"Lost? Confused? Want to know why you can't get past a quest, overcome an NPC or find an item?  Check http://wiki.themanaworld.org for player hints, walkthroughs, item lists and more!\"";
-    next;
-    mes "\"But remember, the game isn't fun when you already know what to do. Use it well or you will lose interest in playing The Mana World! Please help by reporting anything that is unclear, outdated or that needs to be seen on our forums at http://forums.themanaworld.org.\"";
-    close;
-
-L_Grad:
-    getinventorylist;
-    if (@inventorylist_count == 100) goto L_TooMany;
-    mes "[Ian the Guide]";
-    mes "\"Hey, you've been doing good, let me give you this.\"";
-    getitem "GraduationCap", 1;
-    set FLAGS, FLAGS | FLAG_GOT_GRADUATIONCAP;
-    next;
-    goto L_DoneGrad;
-
-L_TooMany:
-    mes "[Ian the Guide]";
-    mes "\"I wanted to give you something, but you don't have room for it.\"";
-    next;
-    goto L_DoneGrad;
-}
diff --git a/world/map/npc/001-1/inac.txt b/world/map/npc/001-1/inac.txt
new file mode 100644
index 00000000..7d5f6e4d
--- /dev/null
+++ b/world/map/npc/001-1/inac.txt
@@ -0,0 +1,17 @@
+//
+
+001-1.gat,58,81,0|script|Inac|156
+{
+    set @halloween_npc_id, $@halloween_npc_inac;
+    callfunc "TrickOrTreat";
+
+    mes "[Inac]";
+    mes "\"This cities water system is amazing. It was built centuries ago after the cataclysm that turned Tonori into this desert.\"";
+    next;
+    mes "[Inac]";
+    mes "\"They say that not much maintenance is needed, even though it's so old.\"";
+    next;
+    mes "[Inac]";
+    mes "\"They also say monsters have moved into the underground tunnels that bring and distribute water.\"";
+    close;
+}
diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
deleted file mode 100644
index af1b1487..00000000
--- a/world/map/npc/001-1/luca.txt
+++ /dev/null
@@ -1,451 +0,0 @@
-//
-
-001-1.gat,108,55,0|script|Luca|102
-{
-    set @EXP_BRAWLING, 2000;
-
-    if (BaseLevel >= 35) goto L_teach;
-
-    if (BaseLevel >= 25) goto L_teach_soon;
-
-    mes "[Luca the Hunter]";
-    mes "\"Ouch! It hurts, this wound I got from battle.\"";
-    next;
-    menu "Tell me about it",L_Exp,"Nevermind",L_Nev;
-
-L_Exp:
-    mes "[Luca the Hunter]";
-    mes "\"I was just coming back from a long journey. I ran into a group of scorpions and started fighting them for experience.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"Then, out of a cave came a BLACK one! I had NEVER seen it before!\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"Luckily I had a camera with me! Here's a picture of it... Let me find it, I put it in my pocket somewhere...\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"Oh man! My pockets have been ripped clean off!\"";
-    goto L_Close;
-
-L_Nev:
-    mes "[Luca the Hunter]";
-    mes "\"Hmpf!\"";
-    goto L_Close;
-
-L_teach_soon:
-    mes "[Luca the Hunter]";
-    mes "\"You've grown quite a bit stronger since I first saw you, strolling around town like that! You know, if you train a little more, maybe we can help each other out a little?\"";
-    goto L_Close;
-
-L_teach:
-    if (getskilllv(SKILL_POOL)) goto L_teachmore;
-
-    mes "[Luca the Hunter]";
-    mes "\"Hey there! You've become quite the adventurer, haven't you? I think it's time that someone taught you some basic skills.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"If you want, I can help with that!\"";
-    next;
-    menu
-        "Sure, that sounds fun!", L_Next,
-        "I'm not interested.", L_Nev;
-
-L_Next:
-    mes "[Luca the Hunter]";
-    mes "\"All right! It's not all that easy, though. First you have to learn how to focus. That's because you can learn many skills, but you can't focus on all of them all the time.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"When you can do that, you can learn some real skills, and when you know them, you can come back to me to tell me which ones you want to focus on. Deal?\"";
-    next;
-    menu
-        "Yeah!", L_teach0_follow,
-        "Certainly!", L_teach0_follow,
-        "Wait... what do you mean?", L_Explain,
-        "Please explain some more.", L_Explain,
-        "No.", L_Nev;
-
-L_teach0_follow:
-    if (getskilllv(SKILL_POOL)) goto L_teachmore;
-
-    mes "[Luca the Hunter]";
-    mes "\"Great! Now, before I can give you that skill, I have to make sure that those stories about you are all true and that you really are experienced enough.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"So I'm going to ask you some easy questions.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"First, who is the man who guards the entrance to the old Tulimshar underground arena?\"";
-    next;
-    input @answer$;
-    if (@answer$ != "Phaet" && @answer$ != "phaet") goto L_wronganswer;
-    mes "[Luca the Hunter]";
-    mes "\"Good. Next, what's the name of the pipe-smoker who lives on top of Lore Mountain and makes leathery goods there?\"";
-    next;
-    input @answer$;
-    if (@answer$ != "Pachua" && @answer$ != "pachua") goto L_wronganswer;
-    mes "[Luca the Hunter]";
-    mes "\"Great! One more: Who was the adventurer who built Dimond's Cove for Dimond?\"";
-    next;
-    input @answer$;
-    if (@answer$ != "Merlin" && @answer$ != "merlin") goto L_wronganswer;
-    mes "[Luca the Hunter]";
-    mes "Luca laughs in excitement.";
-    mes "\"All right! You're the real thing, my friend!\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"Now stand over there. This should only take a second...\"";
-    mes "He takes off a pendant he is wearing and holds it up.";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"See that fang at the end of the chain? Keep staring at it.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "He starts swinging the pendant back and forth.";
-    mes "\"And whatever you do, don't blink. Don't look away, and don't blink.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "The world slows down around you as you focus on the pendant going back...";
-    next;
-    mes "and forth...";
-    next;
-    mes "and back...";
-    next;
-    mes "and forth...";
-    next;
-    mes "and back...";
-    next;
-    mes "and...";
-    next;
-    mes "You feel relaxed.";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"... still there?\"";
-    mes "You hear the sound of fingers snapping. Why would someone do that on such a calm day?";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"Oh, good... I think it worked. Nice job!\"";
-    mes "He grins.";
-    mes "[You gain 10,000 experience points]";
-    mes "[You learned Skill Focus]";
-    setskill SKILL_POOL, 1;
-    getexp 10000, 0;
-    next;
-    goto L_teachmore2;
-
-L_wronganswer:
-    mes "[Luca the Hunter]";
-    mes "\"No, that was wrong. I suppose you're not as experienced as I thought you'd be.\"";
-    goto L_Close;
-
-L_Explain:
-    mes "[Luca the Hunter]";
-    mes "\"Alright, what do you want to know?\"";
-    next;
-    goto L_Explain_loop;
-
-L_Explain_loop:
-    menu
-        "What's skill focus?", L_explain_focus,
-        "What skills are there?", L_explain_skills,
-        "How do skills work?", L_explain_work,
-        "Thanks, I think I got it!", L_Next;
-
-L_explain_focus:
-    mes "[Luca the Hunter]";
-    mes "\"Well, you can learn many, many skills. But you can't really use all of them at once, not even old Auldsbels' head is big enough for that! So you have to focus.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"But you can change that focus whenever you want. It works like this: You come to me, you tell me what you want to focus on, and we do exercises until it's stuck in your head.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"If there's not enough space in your head, you'll first have to stop thinking about some other thing. There's an exercise I learned to do that, so when you talk to me you can just let me know what you want to forget.\"";
-    next;
-    mes "[Luca the Hunter]";
-    if (getskilllv(SKILL_POOL) == 0)
-        mes "\"Right now you can't focus on anything yet, so I'll first have to teach you a simple skill to keep your focus.\"";
-    if (getskilllv(SKILL_POOL) == 1)
-        mes "\"Right now you can only focus on one thing at a time. So if you want to change what your focus is, you have to forget whatever else you've focused on.\"";
-    if (getskilllv(SKILL_POOL) > 1)
-        mes "\"You can focus on " + getskilllv(SKILL_POOL) + " skills right now.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"You can come back to me to focus or unfocus a skill whenever you want, I'm here all day.\"";
-    next;
-    mes "\"For unfocusing you need to bring a potion; a special potion. That potion is not the easiest to get, but I am sure you are able to.\"";
-    next;
-    goto L_Explain_loop;
-
-L_explain_skills:
-    mes "[Luca the Hunter]";
-    mes "\"Well, I don't really know... lots, I think. I can teach you brawling, which is good when you've run out of arrows or don't have a weapon around.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"But there's other skills around. Some mages need special skills to concentrate, so ask around in that crowd, if that's your thing.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"I've also heard that there is someone in Hurnscald who can help you make your body more resistant against some things. But body and mind belong together, so you probably have to focus for that, too.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"Other than that, just ask around! There have to be some people who can teach you something...\"";
-    next;
-    goto L_Explain_loop;
-
-L_explain_work:
-    mes "[Luca the Hunter]";
-    mes "\"Well, skills allow you to be better in some things, or allow to do what you couldn't do without them. When you've learned a skill and are focusing on it, then it affects what you do.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"Now, when you start out with a skill, you won't be very good at it yet. But if you keep practicing you'll learn how to get better.\"";
-    next;
-    mes "[Luca the Hunter]";
-    mes "\"My old teacher always called that getting `skill points' and that you can see them with [F5], whoever that is.\"";
-    next;
-    //TODO:
-    //mes "[Luca the Hunter]";
-    //mes "\"She also said that with this [F5] thing you can get better at those skills, and that it costs you as many skill points as the level you want to go to.\"";
-    //next;
-    mes "[Luca the Hunter]";
-    mes "\"She always would have one cactus potion too many... but she was an amazing teacher.\"";
-    mes "He nods emphatically.";
-    next;
-    goto L_Explain_loop;
-
-L_teachmore:
-    mes "[Luca the Hunter]";
-    mes "\"Good to see you again!\"";
-    next;
-    goto L_teachmore2;
-
-L_teachmore2:
-    setarray @choices, 0,0,0,0,0;
-    setarray @choice$, "", "", "", "", "";
-    set @choice_nr, 0;
-
-    set @C_focus, 1;
-    set @C_unfocus, 2;
-    set @C_teachbrawling, 3;
-    set @C_teachnothing, 4;
-    set @C_explainagain, 5;
-    set @C_nvm, 6;
-    set @C_focusoverview, 7;
-
-    getactivatedpoolskilllist;
-    if (!((getskilllv(SKILL_POOL) - @skilllist_count) > 0)) goto L_teachmore2_nof;
-    getunactivatedpoolskilllist;
-    if (@skilllist_count == 0) goto L_teachmore2_nof;
-    set @choices[@choice_nr], @C_focus;
-    set @choice$[@choice_nr], "I would like to focus.";
-    set @choice_nr, @choice_nr + 1;
-    goto L_teachmore2_nof;
-
-L_teachmore2_nof:
-    getactivatedpoolskilllist;
-    if (@skilllist_count == 0) goto L_teachmore2_nounf;
-    set @choices[@choice_nr], @C_unfocus;
-    set @choice$[@choice_nr], "I would like to unfocus.";
-    set @choice_nr, @choice_nr + 1;
-    goto L_teachmore2_nounf;
-
-L_teachmore2_nounf:
-    if (!(getskilllv(SKILL_BRAWLING)))
-        set @choices[@choice_nr], @C_teachbrawling;
-    if (getskilllv(SKILL_BRAWLING))
-        set @choices[@choice_nr], @C_teachnothing;
-    set @choice$[@choice_nr], "Can you teach me a skill?";
-    set @choice_nr, @choice_nr + 1;
-
-    set @choices[@choice_nr], @C_explainagain;
-    set @choice$[@choice_nr], "Can you explain skills again?";
-    set @choice_nr, @choice_nr + 1;
-
-    if (!(getskilllv(SKILL_POOL))) goto L_teachmore2_noovv;
-    set @choices[@choice_nr], @C_focusoverview;
-    set @choice$[@choice_nr], "Can you tell me what skills I'm currently focused on?";
-    set @choice_nr, @choice_nr + 1;
-    goto L_teachmore2_noovv;
-
-L_teachmore2_noovv:
-    set @choices[@choice_nr], @C_nvm;
-    set @choice$[@choice_nr], "I'm done for now, thanks!";
-    set @choice_nr, @choice_nr + 1;
-
-    menu
-        @choice$[0],L_MenuItems,
-        @choice$[1],L_MenuItems,
-        @choice$[2],L_MenuItems,
-        @choice$[3],L_MenuItems,
-        @choice$[4],L_MenuItems;
-
-L_MenuItems:
-    set @menu, @menu - 1;
-    if (@choices[@menu] == 0) goto L_Close;
-    if (@choices[@menu] == @C_focus) goto L_focus;
-    if (@choices[@menu] == @C_unfocus) goto L_unfocus;
-    if (@choices[@menu] == @C_teachbrawling) goto L_teach_brawling;
-    if (@choices[@menu] == @C_teachnothing) goto L_teach_nothing;
-    if (@choices[@menu] == @C_explainagain) goto L_teachmore_explain;
-    if (@choices[@menu] == @C_focusoverview) goto L_focus_overview;
-    if (@choices[@menu] == @C_nvm) goto L_Close;
-    goto L_Close;
-
-L_teachmore_explain:
-    goto L_Explain;
-
-L_focus:
-    getunactivatedpoolskilllist;
-    set @skilllist_id[@skilllist_count], 0;
-    set @skilllist_name$[@skilllist_count], "Nevermind";
-    set @skilllist_name$[@skilllist_count + 1], "";
-    menu
-        @skilllist_name$[0], L_MenuItems1,
-        @skilllist_name$[1], L_MenuItems1,
-        @skilllist_name$[2], L_MenuItems1,
-        @skilllist_name$[3], L_MenuItems1,
-        @skilllist_name$[4], L_MenuItems1,
-        @skilllist_name$[5], L_MenuItems1,
-        @skilllist_name$[6], L_MenuItems1,
-        @skilllist_name$[7], L_MenuItems1;
-
-L_MenuItems1:
-    set @menu, @menu - 1;
-    if (@skilllist_id[@menu] == 0) goto L_teachmore2;
-
-    poolskill @skilllist_id[@menu];
-    goto L_teachmore2;
-
-L_unfocus:
-    if (countitem("GrimaceOfDementia") > 0) goto L_unfocus_menu;
-
-    if (MAGIG_FLAGS & MFLAG_KNOWS_UNFOCUS_RECIPE) goto L_nopotion;
-
-    mes "[Luca the Hunter]";
-    mes "\"Unfocusing is one of the harder parts though, because it is sunk in. You see?\"";
-    next;
-    mes "\"So to remove that mental focus we will need a special potion.\"";
-    next;
-    mes "\"Maybe you should consult some very skilled alchemists.\"";
-    next;
-    mes "\"Ah yes, of course you will need a recipe. Although the alchemist usually knows it.\"";
-    next;
-    mes "\"The potion is called Grimace of Dementia. So the alchemist will know for sure.\"";
-    set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_UNFOCUS_RECIPE;
-    menu
-        "Ok, I will get a Grimace of Dementia potion", L_Close,
-        "Alright, be right back!", L_Close;
-
-L_nopotion:
-    mes "[Luca the Hunter]";
-    mes "\"Hey, you really need that dementia potion for unfocusing.\"";
-    next;
-    mes "\"Come back when you've found a suitable alchemist who can mix such a potion.\"";
-    next;
-    goto L_teachmore2;
-
-L_unfocus_menu:
-    mes "[Luca the Hunter]";
-    mes "\"Ahh, I see you have a dementia potion.\"";
-    next;
-    mes "\"What skill would you like to unfocus?\"";
-
-    getactivatedpoolskilllist;
-
-    set @skilllist_id[@skilllist_count], 0;
-    set @skilllist_name$[@skilllist_count], "Nevermind";
-    set @skilllist_name$[@skilllist_count + 1], "";
-    menu
-        @skilllist_name$[0], L_MenuItems2,
-        @skilllist_name$[1], L_MenuItems2,
-        @skilllist_name$[2], L_MenuItems2,
-        @skilllist_name$[3], L_MenuItems2,
-        @skilllist_name$[4], L_MenuItems2,
-        @skilllist_name$[5], L_MenuItems2,
-        @skilllist_name$[6], L_MenuItems2,
-        @skilllist_name$[7], L_MenuItems2;
-
-L_MenuItems2:
-    set @menu, @menu - 1;
-    if (@skilllist_id[@menu] == 0) goto L_teachmore2;
-
-    if (countitem("GrimaceOfDementia") == 0) goto L_nopotion;
-    delitem "GrimaceOfDementia", 1;
-
-    unpoolskill @skilllist_id[@menu];
-    goto L_Close;
-
-L_focus_overview:
-    getactivatedpoolskilllist;
-
-    if (@skilllist_count != 0) goto L_focus_overview1;
-    mes "[Luca the Hunter]";
-    mes "\"You aren't focused on a skill at the moment.\"";
-    next;
-    goto L_teachmore2;
-
-L_focus_overview1:
-    mes "[Luca the Hunter]";
-    set @message$, "\"At the moment you are focused on ";
-    goto L_focus_overview2;
-
-L_focus_overview2:
-    set @skilllist_count, @skilllist_count-1;
-    set @message$, @message$ + @skilllist_name$[@skilllist_count];
-    if (@skilllist_count == 0) goto L_focus_overview3;
-    set @message$, @message$ + ", ";
-    goto L_focus_overview2;
-
-L_focus_overview3:
-    set @message$, @message$ + ".\"";
-    mes @message$;
-    next;
-    goto L_teachmore2;
-
-L_teach_brawling:
-    mes "[Luca the Hunter]";
-    mes "\"Well, yes, I can teach you brawling. It's a nice thing, if you have nothing left but your hands to defend yourself.\"";
-    next;
-    mes "He is laughing.";
-    mes "\"And is handy, if some sapling starts getting naughty.\"";
-    next;
-    mes "He raises his hands in front of his face and clenches his fists.";
-    mes "\"Ok, let's go! Hold your hands like this.\"";
-    next;
-    mes ".......";
-    next;
-    mes "Some bruises later.";
-    mes "\"Great! I think, you got it.\"";
-    next;
-    set @SUP_id, SKILL_BRAWLING;
-    set @SUP_lvl, 1;
-    set @SUP_name$, "Brawling";
-    set @SUP_xp, @EXP_BRAWLING;
-    callfunc "SkillUp";
-    goto L_Close;
-
-L_teach_nothing:
-    mes "[Luca the Hunter]";
-    mes "\"I was able to teach you brawling. For other professions you should visit someone else.\"";
-    next;
-    mes "\"You see, I am an adventurer. Everybody has his tricks. But you really should visit someone who is a teacher, not an adventurer, now.\"";
-    next;
-    goto L_teachmore2;
-
-L_Close:
-    set @SUP_id, 0;
-    set @SUP_lvl, 0;
-    set @SUP_name$, "";
-    set @SUP_xp, 0;
-    set @EXP_BRAWLING, 0;
-    set @answer$, "";
-    set @message$, "";
-    cleararray @choices[0], 0, 4;
-    cleararray @choice$[0], "", 4;
-    set @choice_nr, 0;
-    set @C_focus, 0;
-    set @C_unfocus, 0;
-    set @C_teachbrawling, 0;
-    set @C_teachnothing, 0;
-    set @C_explainagain, 0;
-    set @C_nvm, 0;
-    set @C_focusoverview, 0;
-    close;
-}
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/mikhail.txt b/world/map/npc/001-1/mikhail.txt
deleted file mode 100644
index bc8406fc..00000000
--- a/world/map/npc/001-1/mikhail.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-// Variables used: nibble 0 of QUEST_SouthTulimshar
-
-001-1.gat,54,43,0|script|Mikhail|120
-{
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
-
-    set @state, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
-
-    if (@state >= 6) goto L_Done;
-    if (@state == 5) goto L_Progress;
-    if (@state == 4) goto L_Start;
-    goto L_Convince_Mikhail_First;
-
-L_Convince_Mikhail_First:
-    mes "[Mikhail]";
-    mes "\"Hello...\"";
-    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.";
-    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!\"";
-    next;
-    mes "\"You look like a nice person. Would you go get them for me?\"";
-    menu
-        "Of course, I'll go get them for you.", L_accept,
-        "I've got other things to do right now.", L_Close;
-
-L_accept:
-    mes "[Mikhail]";
-    mes "\"Thank you so much!  I'll wait for you here.\"";
-    set @state, 5;
-    callsub S_Update_Var;
-    close;
-
-L_Progress:
-    mes "[Mikhail]";
-    mes "\"Did you bring me the five Maggot Slimes I need?\"";
-    next;
-    menu
-        "Yes, here they are, kiddo!", L_try,
-        "Not yet, but I'll be back soon.", L_Close;
-
-L_try:
-    if (countitem("MaggotSlime") >= 5)
-        goto L_get;
-    mes "[Mikhail]";
-    mes "\"It doesn't look like you have them all...\"";
-    goto L_Close;
-
-L_get:
-    delitem "MaggotSlime", 5;
-    getexp 100, 0;
-    set @state, 6;
-    callsub S_Update_Var;
-    mes "[Mikhail]";
-    mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Mikhail]";
-    mes "\"Thanks again for helping me get those Maggot Slimes!\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    close;
-
-S_Update_Var:
-    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_0_MASK) | (@state << NIBBLE_0_SHIFT));
-    return;
-}
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
deleted file mode 100644
index 6efa1bcb..00000000
--- a/world/map/npc/001-1/monster_guide.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-
-001-1.gat,49,51,0|script|Aidan|102
-{
-    if (MPQUEST == 0)
-        goto L_Register;
-    mes "[Aidan the Monster Guide]";
-    mes "You currently have " +Mobpt+ " Monster Points. These points are acquired while killing monsters";
-    close;
-
-L_Register:
-    mes "[Aidan the Monster Guide]";
-    mes "Oh my, you don't seem to be registered as a Quest Participant. Would you like to register?";
-    next;
-    goto L_Choice;
-
-L_Choice:
-    menu
-        "Register",L_R,
-        "Not at the moment",
-        L_N,"Information",L_I;
-
-L_R:
-    mes "[Aidan the Monster Guide]";
-    mes "Give me a second to look over your paperwork.";
-    next;
-    mes "[Monster Guide]";
-    mes "Well, looks like you qualify!";
-    mes "Welcome to the questing world!";
-    set MPQUEST,1;
-    close;
-
-L_N:
-    mes "[Aidan the Monster Guide]";
-    mes "Very well, you don't know what you're missing.";
-    close;
-
-L_I:
-    mes "[Aidan the Monster Guide]";
-    mes "Here in The Mana World, there are certain rewards for your vanquishing of foes.";
-    mes "For example, there are Monster Points; every monster you kill has a certain amount of points that get added to your account.";
-    mes "The more points you have, the more expensive things you can buy using them.";
-    next;
-    mes "[Monster Guide]";
-    mes "So whaddaya say, sign up won't you?";
-    next;
-    goto L_Choice;
-}
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/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
deleted file mode 100644
index 995704b1..00000000
--- a/world/map/npc/001-1/rewards_master.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-
-001-1.gat,50,51,0|script|Ishi|106
-{
-    if (MPQUEST == 0) goto L_Register;
-    if (tvis == 0) set tvis, 1;
-    if (Mobpt < tvis) goto L_NotEnough;
-
-    setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye", "Coal";
-
-    mes "[Ishi the Rewards Master]";
-    mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\"";
-    next;
-
-    set @i, 0;
-    setarray @Menu$, "", "", "", "", "", "", "", "", "", "", "", "";
-    callsub S_prep_menu;
-
-    menu
-        @Menu$[0], L_MenuItems,
-        @Menu$[1], L_MenuItems,
-        @Menu$[2], L_MenuItems,
-        @Menu$[3], L_MenuItems,
-        @Menu$[4], L_MenuItems,
-        @Menu$[5], L_MenuItems,
-        @Menu$[6], L_MenuItems,
-        @Menu$[7], L_MenuItems,
-        @Menu$[8], L_MenuItems,
-        @Menu$[9], L_MenuItems,
-        @Menu$[10], L_MenuItems,
-        @Menu$[11], L_MenuItems;
-
-L_MenuItems:
-    // this is for the last entry "No thanks":
-    if (@menu > @i) goto L_Close;
-    // this is for the "Give all" entry:
-    if (@menu == 11) goto L_Give_all;
-
-    set @req, @menu;
-    set @rec, 0;
-    goto L_Item_Loop;
-
-L_Item_Loop:
-    if (@rec == @req || Mobpt < tvis) goto L_Item_Done;
-
-    callsub S_give_item;
-    set @rec, @rec + 1;
-    goto L_Item_Loop;
-
-L_Item_Done:
-    if (@rec < @req) mes "It looks like your Monster Points were over estimated.";
-    goto L_Close;
-
-L_Register:
-    mes "[Ishi the Rewards Master]";
-    mes "\"Hey, it seems like you didn't register as a quest participant yet! You can sign up with Aidan.\"";
-    goto L_Close;
-
-L_NotEnough:
-    mes "[Ishi the Rewards Master]";
-    mes "\"You don't have enough Monster Points for a reward. You'll need to kill some more monsters first.\"";
-    goto L_Close;
-
-L_Give_all:
-    // we need to count how many loop iterations are done there,
-    // since the server complains about more than 250 (70 according to Jaxad0127)
-    // gotos without interrupting next statement.
-    set @gotocounter, 50;
-    goto L_Give_all_loop;
-
-L_Give_all_loop:
-    set @gotocounter, @gotocounter - 1;
-    if (@gotocounter < 1) goto L_Give_all_next;
-    set @itemgiveerror, 0;
-    callsub S_give_item;
-    if (@itemgiveerror != 0) goto L_Close;
-    goto L_Give_all_loop;
-
-L_Give_all_next:
-    next;
-    mes "[Ishi the Rewards Master]";
-    mes "\"You have received a lot of items. You still have " + Mobpt + " monster points. Shall we continue?\"";
-    menu
-        "Yes", L_Give_all,
-        "No", L_Close;
-
-L_Close:
-    set @gotocounter, 0;
-    set @itemgiveerror, 0;
-    set @pts, 0;
-    set @dif, 0;
-    set @i, 0;
-    cleararray @Menu$[0], "", 10;
-    cleararray @Items$[0], "", 10;
-    close;
-
-//////////////////////////////////////////////////
-// Subroutines
-//////////////////////////////////////////////////
-
-S_prep_menu:
-    set @pts, Mobpt;
-    set @dif, tvis;
-    goto L_Menu_Loop;
-
-L_Menu_Loop:
-    if (@pts < @dif || @i == 10) goto L_Menu_Check;
-
-    set @Menu$[@i], @i + 1;
-
-    set @i, @i + 1;
-    set @pts, @pts - @dif;
-    set @dif, @dif + 1;
-
-    goto L_Menu_Loop;
-
-L_Menu_Check:
-    // if we are able to give 10, we can enable the option to give all we can have
-    if (@i != 10) goto L_Menu_Done;
-        set @Menu$[@i], "Please give me as many as I deserve!";
-        set @i, @i + 1;
-    goto L_Menu_Done;
-
-L_Menu_Done:
-    set @Menu$[@i], "No thanks";
-    return;
-
-S_give_item:
-    set @itemgiveerror, 0;
-    getinventorylist;
-    if (@inventorylist_count == 100) goto S_give_noinv;
-    if (Mobpt < tvis) goto S_give_nomobpts;
-    set Mobpt, Mobpt - tvis;
-    set tvis, tvis + 1;
-    set @item$, @Items$[rand(getarraysize(@Items$))];
-
-    getitem @item$, 1;
-
-    mes "You received one " + getitemname(@item$) + "!";
-    return;
-
-S_give_noinv:
-    mes "Your inventory is full!";
-    set @itemgiveerror, 1;
-    return;
-
-S_give_nomobpts:
-    mes "It looks like your Monster Points were over estimated.";
-    set @itemgiveerror, 1;
-    return;
-}
diff --git a/world/map/npc/001-1/sandra.txt b/world/map/npc/001-1/sandra.txt
deleted file mode 100644
index 13ae156b..00000000
--- a/world/map/npc/001-1/sandra.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-// Variables used: nibble 3 of QUEST_SouthTulimshar
-
-001-1.gat,110,71,0|script|Sandra|114
-{
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
-
-    set @state, ((QUEST_SouthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
-
-    if (@state >= 2) goto L_Done;
-    if (@state == 1) goto L_Progress;
-
-    mes "[Sandra]";
-    mes "\"Hunting monsters for potion ingredients can sometimes be a difficult task.\"";
-    next;
-
-    set @TEMP, rand(4);
-    if(@TEMP == 1) goto L_Opening1;
-    if(@TEMP == 2) goto L_Opening2;
-    if(@TEMP == 3) goto L_Opening3;
-    goto L_Opening0;
-
-L_Opening0:
-    mes "\"In the outskirts of Tulimshar, there are some scorpions... I need  help!  Will you help?\"";
-    next;
-    goto L_Ask;
-
-L_Opening1:
-    mes "\"When you venture to the outskirts of Tulimshar, you can spot scorpions. Will you help me kill some?\"";
-    next;
-    goto L_Ask;
-
-L_Opening2:
-    mes "\"The Scorpion Stinger carries many properties used in potions. Would you get some for me?\"";
-    next;
-    goto L_Ask;
-
-L_Opening3:
-    mes "\"You look sturdy enough, will you help me get something?\"";
-    next;
-    goto L_Ask;
-
-L_Ask:
-    menu
-        "Yes.", L_Yes,
-        "No.", L_Close;
-
-L_Yes:
-    set @TEMP, rand(3);
-    if(@TEMP == 1) goto L_Req1;
-    if(@TEMP == 2) goto L_Req2;
-    goto L_Req0;
-
-L_Req0:
-    mes "[Sandra]";
-    mes "\"I need 5 Scorpion Stingers.\"";
-    next;
-    goto L_Set;
-
-L_Req1:
-    mes "[Sandra]";
-    mes "\"I heard a while ago that stingers from scorpions can be used for medical purposes. I need you to help me get 5 Scorpion Stingers.\"";
-    next;
-    goto L_Set;
-
-L_Req2:
-    mes "[Sandra]";
-    mes "\"Bring me 5 Scorpion Stingers. I'll give you something if you do!\"";
-    next;
-    goto L_Set;
-
-L_Set:
-    set @state, 1;
-    callsub S_Update_Var;
-    mes "\"Please get them for me!\"";
-    goto L_Close;
-
-L_Progress:
-    if (countitem("ScorpionStinger") < 5)
-        goto L_NotEnough;
-    mes "[Sandra]";
-    mes "\"Excellent! You brought me 5 Scorpion Stingers!";
-    mes "Here's something for you.\"";
-    getinventorylist;
-    if (@inventorylist_count + (countitem("ScorpionStinger") == 5) - (countitem("Arrow") == 0) > 99)
-        goto L_TooMany;
-    delitem "ScorpionStinger", 5;
-    getitem "Bow", 1;
-    getitem "Arrow", 100;
-    set @state, 2;
-    callsub S_Update_Var;
-    goto L_Close;
-
-L_NotEnough:
-    mes "[Sandra]";
-    mes "\"Please hurry and bring me 5 Scorpion Stingers.\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Sandra]";
-    mes "\"Thank you for all your help!\"";
-    goto L_Close;
-
-L_Close:
-    set @TEMP, 0;
-    set @state, 0;
-    close;
-
-L_TooMany:
-    next;
-    mes "[Sandra]";
-    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_3_MASK) | (@state << NIBBLE_3_SHIFT));
-    return;
-}
diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt
deleted file mode 100644
index a355684a..00000000
--- a/world/map/npc/001-1/sarah.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-// Variables used: nibble 1 of QUEST_SouthTulimshar
-
-001-1.gat,137,78,0|script|Sarah|106
-{
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
-
-    set @state, ((QUEST_SouthTulimshar & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
-
-    if (@state >= 2) goto L_Done;
-    if (@state == 1) goto L_Progress;
-
-    mes "[Sarah]";
-    mes "\"Boy, am I hungry or what!\"";
-    next;
-
-    set @TEMP, rand(2);
-    if(@TEMP == 1) goto L_Opening1;
-    goto L_Opening0;
-
-L_Opening0:
-    mes "\"Cherry Cake is the best!\"";
-    next;
-    goto L_Ask;
-
-L_Opening1:
-    mes "\"Mmm, Cherry Cake... I love it!\"";
-    next;
-    goto L_Ask;
-
-L_Ask:
-    mes "\"Can you bring me a piece of Cherry Cake?  Pretty please?\"";
-    menu
-        "Yes.", L_Req0,
-        "No.", L_Close;
-
-L_Req0:
-    mes "[Sarah]";
-    mes "\"Yippee!  Bring me a piece of Cherry Cake, and I'll give you a nice hat!\"";
-    next;
-    set @state, 1;
-    callsub S_Update_Var;
-    mes "[Sarah]";
-    mes "\"Please bring it to me!\"";
-    goto L_Close;
-
-L_Progress:
-    if (countitem("CherryCake") < 1)
-        goto L_NotEnough;
-    mes "[Sarah]";
-    mes "\"Whee!\"";
-    next;
-    mes "You brought me Cherry Cake!  Here is your new hat, as promised.\"";
-    emotion EMOTE_TONGUE;
-    getinventorylist;
-    if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany;
-    delitem "CherryCake", 1;
-    getitem "SerfHat", 1;
-    set @state, 2;
-    callsub S_Update_Var;
-    goto L_Close;
-
-L_NotEnough:
-    mes "[Sarah]";
-    mes "\"Oh, I'm starving!  Please bring me Cherry Cake!\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Sarah]";
-    mes "\"It was so tasty, I can't eat anything more... Thank you!\"";
-    emotion EMOTE_TONGUE;
-    goto L_Close;
-
-L_Close:
-    set @TEMP, 0;
-    set @state, 0;
-    close;
-
-L_TooMany:
-    next;
-    mes "[Sarah]";
-    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_1_MASK) | (@state << NIBBLE_1_SHIFT));
-    return;
-}
diff --git a/world/map/npc/001-1/sewer_east.txt b/world/map/npc/001-1/sewer_east.txt
new file mode 100644
index 00000000..2b1e7bc4
--- /dev/null
+++ b/world/map/npc/001-1/sewer_east.txt
@@ -0,0 +1,17 @@
+// The Sewer Grate
+
+001-1.gat,117,110,0|script|#tulimsharsewer2|45,0,0
+{
+    mes "Descend into the sewers?";
+    next;
+    menu
+        "Yes.", L_Sewer,
+        "Nevermind.", L_Close;
+
+L_Sewer:
+    warp "021-3",143,129;
+    goto L_Close;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/001-1/sewer_north.txt b/world/map/npc/001-1/sewer_north.txt
new file mode 100644
index 00000000..ce33cca3
--- /dev/null
+++ b/world/map/npc/001-1/sewer_north.txt
@@ -0,0 +1,17 @@
+// The Sewer Grate
+
+001-1.gat,58,83,0|script|#tulimsharsewer1|45,0,0
+{
+    mes "Descend into the sewers?";
+    next;
+    menu
+        "Yes.", L_Sewer,
+        "Nevermind.", L_Close;
+
+L_Sewer:
+    warp "021-3",57,100;
+    goto L_Close;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/001-1/soul-menhir.txt b/world/map/npc/001-1/soul-menhir.txt
deleted file mode 100644
index 792f256e..00000000
--- a/world/map/npc/001-1/soul-menhir.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-
-001-1.gat,38,69,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;
-    set @x, 0;
-    set @y, 0;
-    callfunc "SoulMenhir";
-    set @map$, "";
-    cleararray @Xs[0], 0, 7;
-    cleararray @Ys[0], 0, 7;
-    set @x, 0;
-    set @y, 0;
-    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/001-1/tinris.txt b/world/map/npc/001-1/tinris.txt
new file mode 100644
index 00000000..c2b52d85
--- /dev/null
+++ b/world/map/npc/001-1/tinris.txt
@@ -0,0 +1,219 @@
+// Anwar needs a magic fertilizer for his field
+// Quest uses Nibble 3 of QUEST_NorthTulimshar
+// Author: Jenalya
+// state 1: Anwar sent to Tinris for help to get a magic fertilizer
+// state 2: Tinris asked for chocolate cake as present for his girlfriend
+// state 3: Tinris asked for ingredients for the fertilizer
+// state 4: Tinris gave you the fertilizer
+// state 5: Anwar tried it out and it doesn't work well, sent you back to Tinris
+// state 6: Tinris asked for more ingredients for a new try
+// state 7: Tinris says it's really hard, gives you the fertilizer and tells you to ask Eomie to cast a spell on it
+// state 8: Eomie sends you to get some stuff so she can interrupt her spell on the spot of grass
+// state 9: Eomie casted a spell on the fertilizer
+// state 10: Anwar used it and it worked. he asks you to help him preparing a thank-you-gift for each Tinris and Eomis
+// state 11: Anwar asked to bring present to Tinris
+// state 12: gave present to Tinris
+// state 13: Anwar asked to bring present to Eomie
+// state 14: gave present to Eomie
+// state 15: reported back to Anwar and done
+
+001-1.gat,69,29,0|script|Tinris|160
+{
+    set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
+
+    set @cake_exp, 50;
+    set @sweater_exp, 400;
+
+    set @slime_amount1, 6;
+    set @slime_amount2, 4;
+    set @bugleg_amount1, 4;
+    set @bugleg_amount2, 5;
+    set @stinger_amount1, 3;
+    set @stinger_amount2, 2;
+    set @ash_amount1, 1;
+    set @ash_amount2, 2;
+    set @cactusp_amount, 1;
+
+    if (@state >= 12) goto L_Done;
+    if (@state == 11) goto L_GiveGift;
+    if (@state == 9) goto L_FertilizerDone;
+    if (@state >= 7) goto L_Eomie;
+    if (@state == 6) goto L_SecondTry;
+    if (@state >= 4) goto L_FirstTryDone;
+    if (@state == 3) goto L_FirstTry;
+    if (@state == 2) goto L_Annual;
+
+    mes "[Tinris]";
+    mes "\"This is a magic school. I'm a student here and focus on ways to magically enhance growth of plants.";
+    mes "That topic is very important in a desert area.\"";
+    if (@state != 1)
+        goto L_Close;
+    menu
+        "The farmer Anwar sent me to ask for exactly that! Can you give me something for his field?",L_Next;
+
+L_Next:
+    mes "[Tinris]";
+    mes "\"Well... in principle yes. I can try to prepare something for him. But...\"";
+    next;
+    mes "\"The thing is, my girlfriend and I have our anniversary today. And the teachers won't let me leave the campus to get something for her!";
+    mes "Please go to the bakery and buy a Chocolate Cake for me. She loves Chocolate Cakes.\"";
+    next;
+    mes "\"When I have a present for her I can focus on creating some magic fertilizer.\"";
+    set @state, 2;
+    callsub S_Update_Mask;
+    goto L_Close;
+
+L_Annual: // @state == 2
+    mes "[Tinris]";
+    mes "\"Hello, did you get the Chocolate Cake for my girlfriend? After that I can focus on creating some magic fertilizer for you.\"";
+    menu
+        "Fresh from the bakery!",L_FreshFrom,
+        "I didn't get it yet.",L_Close;
+
+L_FreshFrom:
+    if (countitem("ChocolateCake") < 1)
+        goto L_NoItem;
+    delitem "ChocolateCake", 1;
+    getexp @cake_exp, 0;
+    set @state, 3;
+    callsub S_Update_Mask;
+    mes "[Tinris]";
+    mes "\"Oh, thank you! You saved me!";
+    mes "All right, now we can start with the magic fertilizer.\"";
+    next;
+    goto L_FirstTry;
+
+L_FirstTry:
+    // @state == 3
+    mes "[Tinris]";
+    mes "\"You need to bring me some ingredients.";
+    mes "The ingredients are " + @slime_amount1 + " Maggot Slimes, " + @bugleg_amount1 + " Bug Legs, " + @stinger_amount1 + " Scorpion Stingers and " + @ash_amount1 + " Piles of Ash.\"";
+    menu
+        "I have it.",L_Continue,
+        "Ok, I'll go and get it.",L_Close;
+
+L_Continue:
+    if ((countitem("MaggotSlime") < @slime_amount1) || (countitem("BugLeg") < @bugleg_amount1) || (countitem("ScorpionStinger") < @stinger_amount1) || (countitem("PileOfAsh") < @ash_amount1))
+        goto L_NoItem;
+    delitem "MaggotSlime", @slime_amount1;
+    delitem "BugLeg", @bugleg_amount1;
+    delitem "ScorpionStinger", @stinger_amount1;
+    delitem "PileOfAsh", @ash_amount1;
+    set @state, 4;
+    callsub S_Update_Mask;
+    mes "Tinris takes the things and starts to mix them together while mumbling some invocations.";
+    misceffect sfx_magic_nature;
+    next;
+    mes "[Tinris]";
+    mes "\"Ok. This should do it. But I'm not sure. I'm still researching this topic.";
+    mes "Here, bring this to Anwar.\"";
+    mes "He gives you a bottle with the magic fertilizer. You put it away in a separate pocket, so it doesn't get mixed with your inventory.";
+    goto L_Close;
+
+L_FirstTryDone: // @state >= 4 but below 6
+    mes "[Tinris]";
+    mes "\"Bring the fertilizer to Anwar and let me know if it worked.\"";
+    if (@state != 5)
+        goto L_Close;
+    menu
+        "I did, the plants went brown and shriveled.",L_More;
+
+L_More:
+    set @state, 6;
+    callsub S_Update_Mask;
+    goto L_SecondTry;
+
+L_SecondTry:
+    // @state == 6
+    mes "[Tinris]";
+    mes "\"Oh no! All right, we need to do another try.";
+    mes "Bring me " + @slime_amount2 + " Maggot Slimes, " + @bugleg_amount2 + " Bug Legs, " + @stinger_amount2 + " Scorpion Stingers, " + @ash_amount2 + " Piles of Ash and " + @cactusp_amount + " Cactus Potion.\"";
+    menu
+        "Here it is.",L_HereItIs,
+        "Ok, I'll go and get it.",L_Close;
+
+L_HereItIs:
+    if ((countitem("MaggotSlime") < @slime_amount2) || (countitem("BugLeg") < @bugleg_amount2) || (countitem("ScorpionStinger") < @stinger_amount2) || (countitem("PileOfAsh") < @ash_amount2) || (countitem("CactusPotion") < @cactusp_amount))
+        goto L_NoItem;
+    delitem "MaggotSlime", @slime_amount2;
+    delitem "BugLeg", @bugleg_amount2;
+    delitem "ScorpionStinger", @stinger_amount2;
+    delitem "PileOfAsh", @ash_amount2;
+    delitem "CactusPotion", @cactusp_amount;
+    set @state, 7;
+    callsub S_Update_Mask;
+    mes "Tinris takes the things and starts to mix and mumble again.";
+    misceffect sfx_magic_nature;
+    next;
+    mes "It takes quite a while.";
+    next;
+    mes "He looks rather stressed while working on the mixture.";
+    next;
+    mes "He sighs.";
+    mes "[Tinris]";
+    mes "\"Mh, I think the mixture itself is good. But I can't get the spells right. Maybe you should ask Professor Eomie to cast it; she's a genius with nature magic.\"";
+    mes "He gives you the bottle with the magic fertilizer.";
+    goto L_Close;
+
+L_Eomie:
+    // @state >= 7 but below 9
+    mes "[Tinris]";
+    mes "\"I did the best I could, but it seems I'm not experienced enough to cast the spells correctly. Better ask Professor Eomie for help.\"";
+    goto L_Close;
+
+L_FertilizerDone:
+    // @state == 9
+    mes "[Tinris]";
+    mes "\"I heard Eomie cast the spell? I really hope it'll work this time. Bring the magic fertilizer to Anwar now.\"";
+    goto L_Close;
+
+L_GiveGift:
+    // @state == 11
+    mes "[Tinris]";
+    mes "\"Ah, did Anwar try the new fertilizer?\"";
+    menu
+        "Yes, it works great and he asked me to give you this Green V-Neck Sweater he made.",L_ItWorksGreat,
+        "Not yet.",L_Close;
+
+L_ItWorksGreat:
+    if (countitem("GreenVNeckSweater") < 1)
+        goto L_NoItem;
+    delitem "GreenVNeckSweater", 1;
+    getexp @sweater_exp, 0;
+    set @state, 12;
+    callsub S_Update_Mask;
+    mes "[Tinris]";
+    mes "\"Hey, that's really nice. Tell him my thanks.\"";
+    goto L_Close;
+
+L_Done:
+    // @state >= 12
+    mes "[Tinris]";
+    mes "\"My girlfriend was delighted with the Chocolate Cake and Professor Eomie was happy with my work on the magic fertilizer.\"";
+    mes "He twinkles.";
+    mes "[Tinris]";
+    mes "\"We're a good team.\"";
+    goto L_Close;
+
+L_NoItem:
+    mes "[Tinris]";
+    mes "\"You don't have it!\"";
+    goto L_Close;
+
+L_Close:
+    set @state, 0;
+    set @slime_amount1, 0;
+    set @slime_amount2, 0;
+    set @bugleg_amount1, 0;
+    set @bugleg_amount2, 0;
+    set @stinger_amount1, 0;
+    set @stinger_amount2, 0;
+    set @ash_amount1, 0;
+    set @ash_amount2, 0;
+    set @cactusp_amount, 0;
+    close;
+
+S_Update_Mask:
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_3_MASK)) | (@state << NIBBLE_3_SHIFT);
+    return;
+}
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/001-1/trader.txt b/world/map/npc/001-1/trader.txt
deleted file mode 100644
index c4c9fd12..00000000
--- a/world/map/npc/001-1/trader.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-// Teaches Trading skill
-// Offers item conversion for non-magic users
-// Updated by: TheKandiman
-// Reviewed by: Wombat
-
-001-1.gat,57,31,0|script|Trader|115
-{
-    set @Ironprice, 1000;
-    set @Sulphurprice, 1200;
-    set @Potionprice, 500;
-    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.\"";
-    next;
-    menu
-        "Oh. I'll go then.", L_Close,
-        "You don't have anything?", L_More;
-
-L_More:
-    mes "[Trader]";
-    mes "\"No. I have nothing for you. Except...\"";
-    next;
-    menu
-        "Yes?", L_Except,
-        "Ok then.",  L_Close;
-
-L_Except:
-    mes "[Trader]";
-    mes "\"I could teach you how to trade. It'll cost you 2GP.\"";
-    next;
-    menu
-        "Sure.", L_Teach,
-        "No thank you.", L_Close;
-
-L_Teach:
-    if (Zeny < 5) goto L_NotEnoughMoney;
-    set Zeny, Zeny - 2;
-    mes "[Trader]";
-    mes "\"You can initiate trade with someone by right-clicking on them and choosing trade.";
-    mes "You'll both add the items and set the GP you're putting up then press propose trade.";
-    mes "After both parties have proposed their side, you can both review the trade, and then accept or reject by closing the window.\"";
-    next;
-    mes "[Trader]";
-    mes "\"Items added to the trade cannot be removed, and so mistakes have to be dealt with by canceling the trade.";
-    mes "You need to press the change button to let the other person know about GP changes.\"";
-    next;
-    goto L_Later;
-
-L_Later:
-    mes "[Trader]";
-    mes "\"Please feel free to check back later. I'm expecting a large shipment of goods to trade.\"";
-    goto L_Close;
-
-L_Trade:
-    mes "[Trader]";
-    mes "\"Welcome back!  My shipment came in and I have a bunch of things that I can trade now. What would you like?\"";
-    goto L_Trademenu;
-
-L_Trademenu:
-    menu
-        "Do you have Iron Powder?", L_Iron,
-        "How about Sulphur Powder?", L_Sulphur,
-        "I need Medium Healing Potions.", L_Healpots,
-        "I think I have everything I need, thanks.", L_Close;
-
-L_Iron:
-    mes "[Trader]";
-    mes "\"I do have a few of those. I will give you 4 Iron Powders for 1 Iron Ore and " + @Ironprice + "gp.\"";
-    menu
-        "Sure.", L_Ipowder,
-        "What a ripoff!  No way!", L_Close;
-
-L_Sulphur:
-    mes "[Trader]";
-    mes "\"I can trade you 5 Sulphur Powders for 1 Pile of Ash and " + @Sulphurprice + "gp.\"";
-    menu
-        "Here you go.", L_Spowder,
-        "Are you nuts?! Forget it!", L_Close;
-
-L_Healpots:
-    mes "[Trader]";
-    mes "\"Healing potions are always useful, but I rarely need anything larger than the small ones. I will happily trade you 1 Medium Healing Potion for 3 Small Healing Potions and " + @Potionprice + "gp.\"";
-    menu
-        "Alright.", L_Pots,
-        "Whoa, that's way too much.", L_Close;
-
-L_Ipowder:
-    if (countitem("IronOre") < 1) goto L_Missing;
-    if (Zeny < @Ironprice) goto L_NotEnoughMoney;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("IronOre") > 1 && countitem("IronPowder") < 1) goto L_Full;
-    delitem "IronOre", 1;
-    set Zeny, Zeny - @Ironprice;
-    getitem "IronPowder", 4;
-    mes "[Trader]";
-    mes "\"There you go. Would you like to trade anything else?\"";
-    menu
-        "Yes.", L_Trademenu,
-        "No.", L_No;
-
-L_Spowder:
-    if (countitem("PileOfAsh") < 1) goto L_Missing;
-    if (Zeny < @Sulphurprice) goto L_NotEnoughMoney;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("PileOfAsh") > 1 && countitem("SulphurPowder") < 1) goto L_Full;
-    delitem "PileOfAsh", 1;
-    set Zeny, Zeny - @Sulphurprice;
-    getitem "SulphurPowder", 5;
-    mes "[Trader]";
-    mes "\"There you go. Would you like to trade anything else?\"";
-    menu
-        "Yes.", L_Trademenu,
-        "No.", L_No;
-
-L_Pots:
-    if (countitem("SmallHealingPotion") < 3) goto L_Missing;
-    if (Zeny < @Potionprice) goto L_NotEnoughMoney;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("SmallHealingPotion") > 3 && countitem("MediumHealingPotion") < 1) goto L_Full;
-    delitem "SmallHealingPotion", 3;
-    set Zeny, Zeny - @Potionprice;
-    getitem "MediumHealingPotion", 1;
-    mes "[Trader]";
-    mes "\"There you go. Would you like to trade anything else?\"";
-    menu
-        "Yes.", L_Trademenu,
-        "No.", L_No;
-
-L_Full:
-    mes "[Trader]";
-    mes "\"You must have been making a lot of trades...your bag is completely full!  Come back after you've made some room.\"";
-    goto L_Close;
-
-L_Missing:
-    mes "[Trader]";
-    mes "\"It looks like you're missing some items. Please come back when you have enough to trade.\"";
-    goto L_Close;
-
-L_NotEnoughMoney:
-    mes "[Trader]";
-    mes "\"You don't have enough money.\"";
-    goto L_Close;
-
-L_No:
-    mes "[Trader]";
-    mes "\"Have a great day!\"";
-    goto L_Close;
-
-L_Close:
-    set @Ironprice, 0;
-    set @Sulphurprice, 0;
-    set @Potionprice, 0;
-    close;
-}
diff --git a/world/map/npc/001-1/traveler.txt b/world/map/npc/001-1/traveler.txt
deleted file mode 100644
index e91da7c0..00000000
--- a/world/map/npc/001-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
-
-001-1.gat,39,67,0|script|Nina the Traveler|103
-{
-    set @NpcName$, "Nina";
-    set @NpcTravelBit, $@tulimshar_bit;
-    callfunc "Traveler";
-    end;
-}
diff --git a/world/map/npc/001-1/vincent.txt b/world/map/npc/001-1/vincent.txt
deleted file mode 100644
index 9f342d94..00000000
--- a/world/map/npc/001-1/vincent.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-// Variables used: nibble 2 of QUEST_SouthTulimshar
-
-001-1.gat,135,42,0|script|Vincent|113
-{
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
-    set @halloween_npc_id, $@halloween_npc_vincent;
-    callfunc "TrickOrTreat";
-
-    set @state, ((QUEST_SouthTulimshar & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
-
-    if (@state >= 2) goto L_Done;
-    if (@state == 1) goto L_Progress;
-    goto L_Convince_Vincent_First;
-
-L_Convince_Vincent_First:
-    mes "[Vincent]";
-    mes "\"I'm making an action figure. I'm almost done with it.\"";
-    next;
-
-    set @TEMP, rand(4);
-    if(@TEMP == 1) goto L_Opening2;
-    if(@TEMP == 2) goto L_Opening3;
-    if(@TEMP == 3) goto L_Opening4;
-    goto L_Opening1;
-
-L_Opening1:
-    mes "\"I just need 10 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.\"";
-    next;
-    goto L_Ask;
-
-L_Opening3:
-    mes "\"This is a great action figure! A must have! All I need is a few parts...\"";
-    next;
-    goto L_Ask;
-
-L_Opening4:
-    mes "\"Can you get me 10 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?\"";
-    next;
-    menu
-        "Yes.", L_Sure,
-        "No.", L_Close;
-
-L_Sure:
-    set @state, 1;
-    callsub S_Update_Var;
-    set @TEMP, rand(4);
-    if(@TEMP == 1) goto L_Req2;
-    if(@TEMP == 2) goto L_Req3;
-    if(@TEMP == 3) goto L_Req4;
-    goto L_Req1;
-
-L_Req1:
-    mes "[Vincent]";
-    mes "\"Thank you!\"";
-    next;
-    goto L_Wait;
-
-L_Req2:
-    mes "[Vincent]";
-    mes "\"I don't know how to thank you enough!\"";
-    next;
-    goto L_Wait;
-
-L_Req3:
-    mes "[Vincent]";
-    mes "\"I will thank you when I get them!\"";
-    next;
-    goto L_Wait;
-
-L_Req4:
-    mes "[Vincent]";
-    mes "\"I'm sure I will give a small reward.\"";
-    next;
-    goto L_Wait;
-
-L_Wait:
-    mes "\"Now please go get me 10 Bug Legs.\"";
-    goto L_Close;
-
-L_Progress:
-    if(countitem("BugLeg") >= 10)
-        goto L_Have;
-    mes "[Vincent]";
-    mes "\"Please help me collect 10 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)
-        goto L_Progress;
-    delitem "BugLeg", 10;
-    set Zeny, Zeny + 1000;
-    set @state, 2;
-    callsub S_Update_Var;
-
-    mes "[Vincent]";
-    mes "\"Here you go, a little of my appreciation!\"";
-    mes "";
-    mes "[1000 gold]";
-    goto L_Close;
-
-L_Done:
-    mes "[Vincent]";
-    mes "\"Thanks for your help!\"";
-    goto L_Close;
-
-L_Close:
-    set @TEMP, 0;
-    set @state, 0;
-    close;
-
-S_Update_Var:
-    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_2_MASK) | (@state << NIBBLE_2_SHIFT));
-    return;
-}
diff --git a/world/map/npc/001-1/weellos.txt b/world/map/npc/001-1/weellos.txt
new file mode 100644
index 00000000..7400402a
--- /dev/null
+++ b/world/map/npc/001-1/weellos.txt
@@ -0,0 +1,40 @@
+// A historian
+// takes part in quest given by 021-2/kylian.txt
+
+001-1.gat,55,25,0|script|Weellos|103
+{
+    set @halloween_npc_id, $@halloween_npc_weellos;
+    callfunc "TrickOrTreat";
+
+    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowWeellosNT;
+    set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
+
+    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.\"";
+    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
+L_In:
+    mes "[Weellos]";
+    mes "\"What did you think of the historic building?\"";
+    goto L_BeforeClose;
+
+L_BeforeClose:
+    if (@kylian != 4)
+        goto L_Close;
+    next;
+    mes "You wonder if Kylian would be interested to see this building.";
+    goto L_Close;
+
+L_Close:
+    set @kylian, 0;
+    close;
+}