Adjust rest of world to Match new tutorial

23 files changed, 1456 insertions, 668 deletions

diff --git a/world/map/npc/001-2/_import.txt b/world/map/npc/001-2/_import.txt
index ae570981..6ad9ffe0 100644
--- a/world/map/npc/001-2/_import.txt
+++ b/world/map/npc/001-2/_import.txt
@@ -3,10 +3,18 @@
 map: 001-2.gat
 npc: npc/001-2/_mobs.txt
 npc: npc/001-2/_warps.txt
-npc: npc/001-2/casino.txt
-npc: npc/001-2/dedication.txt
+npc: npc/001-2/bank.txt
+npc: npc/001-2/david.txt
+npc: npc/001-2/fieri.txt
+npc: npc/001-2/forge_shops.txt
+npc: npc/001-2/government_building.txt
+npc: npc/001-2/heathin.txt
+npc: npc/001-2/jhedia.txt
+npc: npc/001-2/manakins.txt
 npc: npc/001-2/mapflags.txt
-npc: npc/001-2/omar.txt
-npc: npc/001-2/phaet.txt
-npc: npc/001-2/shops.txt
-npc: npc/001-2/troupe_leader.txt
+npc: npc/001-2/pauline.txt
+npc: npc/001-2/sandra.txt
+npc: npc/001-2/tathin.txt
+npc: npc/001-2/tondar.txt
+npc: npc/001-2/wizards.txt
+npc: npc/001-2/yanis.txt
diff --git a/world/map/npc/001-2/_warps.txt b/world/map/npc/001-2/_warps.txt
index 50745da6..6a310169 100644
--- a/world/map/npc/001-2/_warps.txt
+++ b/world/map/npc/001-2/_warps.txt
@@ -1,13 +1,18 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // South Tulimshar Indoor warps
 
-001-2.gat,25,35|warp|To Outside|-1,-1,001-1.gat,32,72
-001-2.gat,44,25|warp|To Second Floor|-1,0,001-2.gat,65,25
-001-2.gat,64,25|warp|To First Floor|-1,-1,001-2.gat,43,25
-001-2.gat,67,30|warp|To Bedroom|-1,-1,001-2.gat,103,23
-001-2.gat,76,30|warp|To Deposit|-1,-1,001-2.gat,131,23
-001-2.gat,69,22|warp|To Casino|0,-1,001-2.gat,32,72
-001-2.gat,103,22|warp|To Second Floor|0,-1,001-2.gat,67,29
-001-2.gat,131,22|warp|To Second Floor|0,-1,001-2.gat,76,29
-001-2.gat,32,73|warp|To Second Floor|-1,-1,001-2.gat,69,23
-001-2.gat,71,73|warp|To Outside|-1,-1,001-1.gat,75,42
+001-2.gat,25,65|warp|To Outside|-1,-1,001-1.gat,114,100
+001-2.gat,28,102|warp|To Outside|-1,-1,001-1.gat,27,33
+001-2.gat,28,86|warp|To Light|-1,-1,001-1.gat,28,22
+001-2.gat,105,102|warp|To Outside|0,-1,001-1.gat,54,35
+001-2.gat,25,28|warp|To Outside|-1,-1,001-1.gat,49,72
+001-2.gat,28,28|warp|To Outside|-1,-1,001-1.gat,52,72
+001-2.gat,31,28|warp|To Outside|-1,-1,001-1.gat,55,72
+001-2.gat,71,102|warp|To Outside|-1,-1,001-1.gat,37,33
+001-2.gat,105,73|warp|Council Chambers|2,-1,001-2.gat,104,42
+001-2.gat,105,43|warp|Main Floor|2,-1,001-2.gat,104,74
+001-2.gat,114,53|warp|Parapet|-1,-1,001-1.gat,57,23
+001-2.gat,95,53|warp|Parapet|-1,-1,001-1.gat,52,23
+001-2.gat,57,90|warp|Lighthouse|-1,-1,001-2.gat,35,94
+001-2.gat,36,95|warp|MainFloor|-1,0,001-2.gat,58,90
+001-2.gat,65,26|warp|Outside|-1,-1,001-1.gat,59,99
diff --git a/world/map/npc/001-2/bank.txt b/world/map/npc/001-2/bank.txt
new file mode 100644
index 00000000..b5bab670
--- /dev/null
+++ b/world/map/npc/001-2/bank.txt
@@ -0,0 +1,8 @@
+// A Banker
+001-2.gat,63,17,0|script|Hydusun|149
+{
+    set @npcname$, "Hydusun";
+    callfunc "Banker";
+    close;
+}
+
diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
deleted file mode 100644
index ad0b625b..00000000
--- a/world/map/npc/001-2/casino.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-// Casino
-
-// takes part in quest given by 021-2/kylian.txt
-001-2.gat,32,72,0|script|#CasinoEntrance|32767,1,1
-{
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowCasinoNT;
-    set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
-    if (@kylian != 6)
-        goto L_End;
-    message strcharinfo(0), "You wonder if Kylian would like to visit the casino in the evening.";
-    goto L_End;
-
-L_End:
-    set @kylian, 0;
-    end;
-}
-
-001-2.gat,39,32,0|script|Valdo|117
-{
-    mes "[Valdo the Worker]";
-    mes "\"Please let me work. I'm really in a hurry!\"";
-    close;
-}
-
-001-2.gat,37,65,0|script|Slots#1|400
-{
-    callfunc "SlotMachine";
-    close;
-}
-
-001-2.gat,39,65,0|script|Slots#2|400
-{
-    callfunc "SlotMachine";
-    close;
-}
-
-001-2.gat,41,65,0|script|Slots#3|400
-{
-    callfunc "SlotMachine";
-    close;
-}
-
-001-2.gat,102,27,0|shop|MoneyChanger|124,CasinoCoins:*10
-
-001-2.gat,28,63,0|script|BlackJack|107
-{
-    mes "[Croupier]";
-    mes "\"Would you like to play Black Jack?";
-    mes "You will need 15 casino coins.\"";
-    next;
-    menu
-        "Yes", L_Begin,
-        "No", L_Close;
-
-L_Begin:
-    if(countitem("CasinoCoins") < 15) goto L_NoCoin;
-    delitem "CasinoCoins", 15;
-    set @croupier, rand(0, 4);
-    set @croupier, @croupier + 17;
-    set @player, rand(4, 21);
-    mes "\"You got " + @player + " with your cards.";
-    if(@player == 21) goto L_End;
-    mes "Do you want another card?\"";
-    next;
-    menu
-        "Yes", L_Another,
-        "No", L_End;
-
-L_Another:
-    set @tempace, rand(2, 11);
-    if (@tempace == 11) goto L_Ace;
-    set @player, @player + @tempace;
-    if (@player > 21) goto L_Lost;
-    if (@player == 21) goto L_End;
-    mes "\"You got " + @player + " with your cards.";
-    mes "Do you want another card?\"";
-    next;
-    menu
-        "Yes", L_Another,
-        "No", L_End;
-
-L_End:
-    if (@player <= @croupier) goto L_Lost;
-    mes "\"Congratulations, you won!";
-    mes "I had " + @croupier + ".";
-    mes "You get 45 casino coins.\"";
-    getitem "CasinoCoins", 45;
-    goto L_Close;
-
-L_NoCoin:
-    mes "\"You need at least 15 coins.\"";
-    goto L_Close;
-
-L_Lost:
-    mes "\"I'm sorry but you lost.";
-    mes "You got " + @player + " with your cards.";
-    mes "I had " + @croupier + ".\"";
-    goto L_Close;
-
-L_Ace:
-    set @player, @player + 11;
-    if (@player > 21) set @player, @player - 10;
-    if (@player > 21) goto L_Lost;
-    if (@player == 21) goto L_End;
-    mes "You got " + @player + " with your cards.";
-    mes "Do you want another card?";
-    next;
-    menu
-        "Yes", L_Another,
-        "No", L_End;
-
-L_Close:
-    mes "\"As you wish.\"";
-    set @croupier, 0;
-    set @player, 0;
-    set @tempace, 0;
-    close;
-}
-
-001-2.gat,22,69,0|script|Roulette|107
-{
-    mes "[Croupier]";
-    mes "\"Good evening monsieur...";
-    mes "How much would you like to bet?\"";
-    next;
-    menu
-        "1 coin", L_b1,
-        "5 coins", L_b5,
-        "10 coins", L_b10,
-        "50 coins", L_b50,
-        "100 coins", L_b100,
-        "Maybe I'll play later", L_Close;
-
-L_b1:
-    set @bet, 1;
-    goto L_Check;
-
-L_b5:
-    set @bet, 5;
-    goto L_Check;
-
-L_b10:
-    set @bet, 10;
-    goto L_Check;
-
-L_b50:
-    set @bet, 50;
-    goto L_Check;
-
-L_b100:
-    set @bet, 100;
-    goto L_Check;
-
-L_Check:
-    if(countitem("CasinoCoins") < @bet) goto L_NoCoin;
-    delitem "CasinoCoins", @bet;
-    menu
-        "Choose a color", L_PickColor,
-        "Choose a number", L_Number;
-
-L_PickColor:
-    menu
-        "Black", L_Color,
-        "Red", L_Color;
-
-L_Color:
-    set @color,rand(2);
-    if(@color == 1) goto L_Lost;
-    mes "You won!";
-    getitem "CasinoCoins", @bet * 2;
-    goto L_Close;
-
-L_Number:
-    menu
-        "0", L_Menuitems, "00", L_Menuitems, "1", L_Menuitems, "2", L_Menuitems, "3", L_Menuitems, "4", L_Menuitems, "5", L_Menuitems, "6", L_Menuitems, "7", L_Menuitems, "8", L_Menuitems,
-        "9", L_Menuitems, "10", L_Menuitems, "11", L_Menuitems, "12", L_Menuitems, "13", L_Menuitems, "14", L_Menuitems, "15", L_Menuitems, "16", L_Menuitems, "17", L_Menuitems, "18", L_Menuitems,
-        "19", L_Menuitems, "20", L_Menuitems, "21", L_Menuitems, "22", L_Menuitems, "23", L_Menuitems, "24", L_Menuitems, "25", L_Menuitems, "26", L_Menuitems, "27", L_Menuitems, "28", L_Menuitems,
-        "29", L_Menuitems, "30", L_Menuitems, "31", L_Menuitems, "32", L_Menuitems, "33", L_Menuitems, "34", L_Menuitems, "35", L_Menuitems, "36", L_Menuitems;
-
-L_Menuitems:
-    if (@menu == 1) set @number, 0;
-    if (@menu == 2) set @number, 37;
-    if (@menu >= 3) set @number, @menu - 2;
-
-    set @roulette, rand(38);
-    if (@roulette == 37) mes "The ball stopped on 00";
-    if (@roulette < 37) mes "The ball stopped on " + @roulette;
-    if (@number != @roulette) goto L_Lost;
-    mes "\"You won!\"";
-    getitem "CasinoCoins", @bet * 10;
-    goto L_Close;
-
-L_NoCoin:
-    mes "\"You don't have enough coins.\"";
-    goto L_Close;
-
-L_Lost:
-    mes "\"I'm sorry, you lost.\"";
-    goto L_Close;
-
-L_Close:
-    mes "Come again.";
-    set @number, 0;
-    set @roulette, 0;
-    set @color, 0;
-    set @bet, 50;
-    close;
-}
diff --git a/world/map/npc/001-2/david.txt b/world/map/npc/001-2/david.txt
new file mode 100644
index 00000000..fc9e3fd7
--- /dev/null
+++ b/world/map/npc/001-2/david.txt
@@ -0,0 +1,53 @@
+001-2.gat,92,88,0|script|David|120
+{
+    set @Potion_EXP, 2000;
+
+    if (Rossy_Quest == 17) goto L_FinalEnd;
+    if (Rossy_Quest == 14) goto L_Julia;
+    if (Rossy_Quest >= 8) goto L_Done;
+
+    mes "[David]";
+    mes "\"Learning magic is hard...\"";
+    if (Rossy_Quest == 7) goto L_Help;
+    close;
+
+L_Help:
+    menu
+        "Do you know Rossy?", L_Set,
+        "I can tell, it is hard.", L_No;
+
+L_Set:
+    mes "[David]";
+    mes "\"Yes, I do. I am her teacher. Actually, that reminds me about her final exam... she didn't hand in her potion yet. Time is running out.\"";
+    menu
+        "A potion? Oh, uhm... Strange kind of exam. Bye.", L_No,
+        "Right, I have her potion in my pocket. She asked me to bring it to you. Here it is.", L_Next;
+
+L_Next:
+    mes "[David]";
+    mes "\"Let me see.\"";
+    set Rossy_Quest, 8;
+    mes "\"This potion is... perfect! Tell Rossy that she successfully made her potion; it is flawless!\"";
+    getexp @Potion_EXP, 0;
+    close;
+
+L_Done:
+    mes "[David]";
+    mes "\"I am really happy that my best student successfully passed her exam!\"";
+    close;
+
+L_No:
+    close;
+
+L_Julia:
+    mes "[David]";
+    mes "\"I heard Rossy's sister got kidnapped. We're counting on you to find her!\"";
+    next;
+    mes "\"If you do find her, talk to her sister and her mother.\"";
+    close;
+
+L_FinalEnd:
+    mes "[David]";
+    mes "Well done! Thanks for finding Julia!";
+    close;
+}
diff --git a/world/map/npc/001-2/dedication.txt b/world/map/npc/001-2/dedication.txt
deleted file mode 100644
index 03268df0..00000000
--- a/world/map/npc/001-2/dedication.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Dedication to Irene Christina
-
-001-2.gat,76,68,0|script|#IreneDedication|400
-{
-    mes "~ Irene Christina ~";
-    mes "The song in this house is dedicated to Irene.";
-    next;
-    mes "She had seen only twenty hours of this world when she died in her father's arms.";
-    close;
-}
diff --git a/world/map/npc/001-2/fieri.txt b/world/map/npc/001-2/fieri.txt
new file mode 100644
index 00000000..1264be4e
--- /dev/null
+++ b/world/map/npc/001-2/fieri.txt
@@ -0,0 +1,131 @@
+// Variables used: nibble 0 of QUEST_SouthTulimshar
+
+001-2.gat,114,89,0|script|Fieri|117
+{
+    set @state, ((QUEST_SouthTulimshar & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT);
+
+    if (@state >= 4) goto L_Done2;
+    if (@state == 3) goto L_Progress2;
+    if (@state == 2) goto L_Done1;
+    if (@state == 1) goto L_Progress;
+
+    set @TEMP, rand(2);
+    if(@TEMP == 1) goto L_Opening1;
+    goto L_Opening0;
+
+L_Opening0:
+    mes "[Fieri]";
+    mes "\"The Wizards are always hungry. All the magic all the time, sapping their energy.";
+    mes "Could I ask a favor of you?\"";
+    next;
+    goto L_Ask;
+
+L_Opening1:
+    mes "[Fieri]";
+    mes "\"These Wizards eat like a store house full of maggots.";
+    mes "At this rate I'll have nothing left to cook. Can you help me with a task?\"";
+    next;
+    goto L_Ask;
+
+L_Ask:
+    menu
+        "Yes.", L_Yes,
+        "No.", L_Close;
+
+L_Yes:
+    set @TEMP, rand(2);
+    if(@TEMP == 1) goto L_Req1;
+    goto L_Req0;
+
+L_Req0:
+    mes "[Fieri]";
+    mes "\"Great!  I need a Beer for my Tonori Delight.\"";
+    next;
+    goto L_Set;
+
+L_Req1:
+    mes "[Fieri]";
+    mes "\"Bring me a Beer. I'll give you something if you do.\"";
+    next;
+    goto L_Set;
+
+L_Set:
+    set @state, 1;
+    callsub S_Update_Var;
+    mes "[Fieri]";
+    mes "\"Please bring it to me!\"";
+    goto L_Close;
+
+L_Progress:
+    if (countitem("Beer") < 1) goto L_NotEnough;
+    mes "[Fieri]";
+    mes "\"Oooh, perfect! It's perfect!";
+    mes "You brought me my Beer!  Here, have some cake for your troubles.\"";
+    getinventorylist;
+    if (@inventorylist_count - (countitem("Beer") == 1) > 99 - (countitem("CherryCake") == 0) ) goto L_TooMany;
+    delitem "Beer", 1;
+    getexp 100, 0;
+    getitem "CherryCake", 5;
+    set @state, 2;
+    callsub S_Update_Var;
+    next;
+    mes "\"Now let's see...\"";
+    goto L_Close;
+
+L_Progress2:
+    if (countitem("MaggotSlime") < 3) goto L_NotEnough1;
+    mes "[Fieri]";
+    mes "\"Nice!  They're perfect, just perfect!";
+    mes "You brought me the 3 Maggot Slimes! Here, have some Tonori Delight as reward.\"";
+    getinventorylist;
+    if ((@inventorylist_count - (countitem("MaggotSlime") == 3) > 99  - (countitem("TonoriDelight") == 0) )) goto L_TooMany;
+    delitem "MaggotSlime", 3;
+    getexp 100, 0;
+    getitem "TonoriDelight", 3;
+    set @state, 4;
+    callsub S_Update_Var;
+    goto L_Close;
+
+L_NotEnough:
+    mes "[Fieri]";
+    mes "\"Oh, please hurry and bring me a Beer. The Wizards need their Tonori Delight!\"";
+    goto L_Close;
+
+L_NotEnough1:
+    mes "[Fieri]";
+    mes "\"Please do hurry and bring me 3 Maggot Slimes, so I can finish the Tonori Delight!\"";
+    goto L_Close;
+
+L_Done1:
+    mes "[Fieri]";
+    mes "\"Thank you so much!\"";
+    mes "\"But... I need some more ingredients.\"";
+    next;
+    mes "\"I need 3 Maggot Slimes for that.\"";
+    mes "\"Bring them to me, and I'll give you something nice.\"";
+    set @state, 3;
+    callsub S_Update_Var;
+    goto L_Close;
+
+L_Done2:
+    mes "[Fieri]";
+    mes "\"I hope you like Tonori Delight as much as I do, because, you see...\"";
+    next;
+    mes "\"Tonori Delight is life!\"";
+    goto L_Close;
+
+L_Close:
+    set @TEMP, 0;
+    set @state, 0;
+    close;
+
+L_TooMany:
+    next;
+    mes "[Fieri]";
+    mes "\"You don't have room for my reward. I'll wait until you do.\"";
+    goto L_Close;
+
+S_Update_Var:
+    set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_6_MASK) | (@state << NIBBLE_6_SHIFT));
+    return;
+}
diff --git a/world/map/npc/001-2/forge_shops.txt b/world/map/npc/001-2/forge_shops.txt
new file mode 100644
index 00000000..5f2ab3ba
--- /dev/null
+++ b/world/map/npc/001-2/forge_shops.txt
@@ -0,0 +1,4 @@
+// Forge Shops
+
+001-2.gat,30,60,0|shop|Gungnir|311,SlingShot:*500,SlingBullet:*1,ShortBow:*8000,Arrow:*1,IronArrow:*4
+001-2.gat,25,59,0|shop|Mjolnir|377,Knife:*50,SharpKnife:*100,Dagger:*1000,LeatherShirt:*2000,LeatherShield:*2000
diff --git a/world/map/npc/001-2/government_building.txt b/world/map/npc/001-2/government_building.txt
new file mode 100644
index 00000000..f201f192
--- /dev/null
+++ b/world/map/npc/001-2/government_building.txt
@@ -0,0 +1,144 @@
+// The government builing in the south west
+
+// A clerk
+001-2.gat,25,21,0|script|Estard|107
+{
+    mes "[Estard]";
+    mes "\"Hello what can I do for you?\"";
+    next;
+    if (getpartnerid2())
+        goto L_main_married;
+
+    menu
+        "I'm looking at getting married.", L_marry,
+        "Nothing, I guess.", L_Close;
+
+L_main_married:
+    menu
+        "I'd like a divorce.", L_divorce,
+        "Nothing, I guess.", L_Close;
+
+L_marry:
+    if (BaseLevel < WEDDING_MIN_LEVEL)
+        goto L_marry_too_young;
+    if (Zeny < WEDDING_FEE)
+        goto L_marry_too_poor;
+
+    mes "[Estard]";
+    mes "\"Are you sure you want to get married? It'll cost " + WEDDING_FEE + " GP.\"";
+    menu
+        "Yes", L_marry_do,
+        "No", L_Close;
+
+L_marry_do:
+    callsub S_give_rings;
+
+    mes "[Estard]";
+    mes "\"Here are your rings. You can get married by standing in one of the designated places (like that small rug over there) with your partner, give them their ring, and say 'marry (their name here)'. You both need to have your rings on.\"";
+    close;
+
+L_marry_too_young:
+    mes "[Estard]";
+    mes "\"I'm sorry, but you are too young to get married. You must be atleast " + WEDDING_MIN_LEVEL + " levels old.\"";
+    next;
+
+    menu
+        "Can I at least get wedding rings?", L_get_rings,
+        "Thanks anyways.", L_Close;
+
+L_marry_too_poor:
+    mes "[Estard]";
+    mes "\"You need " + WEDDING_FEE + " GP to get married. That covers all administrative fees for the marriage and provides two wedding rings.\"";
+    close;
+
+L_get_rings:
+    mes "[Estard]";
+    mes "\"Yes. They are " + WEDDING_FEE + " GP. That covers all administrative fees for the marriage.\"";
+
+    if (Zeny < WEDDING_FEE)
+        menu
+            "Thanks anyways. I don't have enough with me.", L_Close;
+    if (Zeny >= WEDDING_FEE)
+        menu
+            "I'll buy a pair.", L_get_rings_pay,
+            "Thanks anyways.", L_Close;
+    goto L_get_rings_pay;
+
+L_get_rings_pay:
+    callsub S_give_rings;
+
+    mes "[Estard]";
+    mes "\"There you go. Come again.\"";
+    close;
+
+L_divorce:
+    set @divorce_cost, DIVORCE_FEE_PER_LEVEL * BaseLevel;
+
+    if (Zeny < @divorce_cost)
+        goto L_divorce_not_enough;
+
+    mes "[Estard]";
+    mes "\"If you're sure you want a divorce, it'll cost you " + @divorce_cost + " GP.\"";
+    next;
+    menu
+        "I am sure I want it.", L_do_divorce,
+        "I don't want it.", L_Close;
+
+L_do_divorce:
+    if (Zeny < @divorce_cost)
+        goto L_not_enough_money;
+
+    if (divorce())
+        goto L_divorce_done;
+
+    mes "[Estard]";
+    mes "\"I'm having trouble finding the record. \"";
+    mes "[Server]";
+    mes "Try again when your partner is online too.";
+    close;
+
+L_divorce_done:
+    set Zeny, Zeny - @divorce_cost;
+
+    mes "[Estard]";
+    mes "\"You have been divorced. Come again.\"";
+    close;
+
+L_divorce_not_enough:
+    mes "[Estard]";
+    mes "\"I'm sorry , but you don't have enough money to get a divorce. You need " + @divorce_cost + " GP.\"";
+    close;
+
+L_not_enough_money:
+    mes "[Estard]";
+    mes "\"Seems you don't have enough money.\"";
+    close;
+
+L_no_room_for_rings:
+    mes "[Estard]";
+    mes "\"You don't have enough room to carry these rings.\"";
+    close;
+
+L_Close:
+    close;
+
+S_give_rings:
+    if (Zeny < WEDDING_FEE)
+        goto L_not_enough_money;
+    getinventorylist;
+    if (@inventorylist_count > 98)
+        goto L_no_room_for_rings;
+
+    set Zeny, Zeny - WEDDING_FEE;
+    getitem "WeddingRing", 1;
+    getitem "WeddingRing", 1;
+    return;
+}
+
+// Guard
+001-2.gat,22,21,0|script|Guard#govt_in|123
+{
+    mes "[Guard]";
+    mes "\"You can't come back here.\"";
+    close;
+}
diff --git a/world/map/npc/001-2/heathin.txt b/world/map/npc/001-2/heathin.txt
new file mode 100644
index 00000000..113b1b7e
--- /dev/null
+++ b/world/map/npc/001-2/heathin.txt
@@ -0,0 +1,360 @@
+//Items for NPC are incomplete. Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
+
+001-2.gat,23,55,0|script|Heathin|147
+{
+    set @TARROW_REQ_TERRA_ORE, 1;
+    set @TARROW_REQ_COAL, 5;
+    set @TARROW_REQ_GP, 3000;
+    set @heathin_xp_bonus, (100 * BaseLevel);
+
+    set @state, ((QUEST_NorthTulimshar & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT);
+
+    if (@state == 14) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Trade;
+    if (@state == 13) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Ready;
+    if (@state == 12) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Forge;
+    if (@state == 11) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows;
+    if (@state == 10) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Ready;
+    if (@state == 9) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Forge;
+    if (@state == 8) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor;
+    if (@state == 7) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs_Ready;
+    if (@state == 6) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs_Forge;
+    if (@state == 5) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs;
+    if (@state == 4) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood_Ready;
+    if (@state == 3) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood_Forge;
+    if (@state == 2) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood;
+    if (@state == 2) && (BaseLevel >= 60) goto L_Heathin_Forge_Thanks;
+    if (@state == 1) && (BaseLevel >= 60) goto L_Heathin_Forge_Award;
+    if (BaseLevel >= 60) goto L_Heathin_Start;
+
+    mes "[Heathin]";
+    mes "\"Hello, friend. I am Heathin, a smith of exotic metals. \"";
+    close;
+
+L_Heathin_Start:
+    mes "[Heathin]";
+    mes "\"Hello, friend. I am Heathin, a smith of exotic metals. \"";
+    next;
+    mes "\"By the order of the Wizard's Council, I've been commissioned to forge armor for the upcoming expediation. However, I am but a simple smith and cannot complete all this effort by myself. I need individuals that can gather Coal to heat my forge.\"";
+    next;
+    mes "\"Perhaps you would be interested in helping me out?  Would you be willing to help me gather Coal and help me fulfill my commission?  I am asking any and all willing souls to get me 50 coal, as that would put a significant dint in my goal.\"";
+    menu
+        "Sure, I'll help!", L_Heathin_Help,
+        "I'd rather keep my Coal for my own purposes, thank you very much.", L_Heathin_No,
+        "Wait, what kind of award are we talking about?", L_Heathin_Interested;
+
+L_Heathin_Help:
+    set @state, 1;
+    callsub S_Update_Mask;
+    mes "[Heathin]";
+    mes "\"Excellent!  I am always glad when someone can be of service not just to me, but to all of Tulimshar. Please get me 50 Coal and you will be compensated for your efforts.\"";
+    close;
+
+L_Heathin_No:
+    mes "[Heathin]";
+    mes "\"That is too bad. If you change your mind, I shall still be here, attempting to get my commission done.\"";
+    close;
+
+L_Heathin_Interested:
+    mes "[Heathin]";
+    mes "\"Well, I can compensate you from the commision I getting from the council.\"";
+    next;
+    mes "\"How does 20,000 GP and I'll offer my smithing services for a discount?\"";
+    next;
+    mes "\"Does this sound like something you might be interested in?\"";
+    menu
+        "Sure, I'll help!", L_Heathin_Help,
+        "I'd rather keep my Coal.", L_Heathin_No,
+        "Can you repeat that again?", L_Heathin_Interested;
+
+L_Heathin_Forge_Award:
+    if (countitem ("Coal") < 50) goto L_Heathin_Forge_Wait;
+    getinventorylist;
+    set @state, 2;
+    callsub S_Update_Mask;
+    delitem "Coal", 50;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny + 20000;
+    mes "[Heathin]";
+    mes "\"You have brought the Coal. This is most excellent!  As promised, I have a reward for you. Hopefully you will find it useful.\"";
+    next;
+    mes "\"Time to make some armor. The Council will be pleased. Thank you for your efforts!\"";
+    close;
+
+L_Heathin_Forge_Wait:
+    mes "[Heathin]";
+    mes "\"Hello again. Making armor keeps me pretty busy. I certainly hope I can fulfill my commission soon so that I can move on to bigger and better things.\"";
+    next;
+    mes "\"The pay is good, certainly, but I am a far better smith than this. If you can bring me 50 Coal, it would surely get me to my goal faster.\"";
+    next;
+    mes "\"I will be sure to provide an apt award once you are done.\"";
+    close;
+
+L_Heathin_Forge_Thanks:
+    mes "[Heathin]";
+    mes "\"Thank you again for helping me fulfil my commission. It has made a signficant dint in what the Council requires of me. Perhaps I may be of service to you again one day!\"";
+    close;
+
+L_Heathin_Terranite_Hood:
+    mes "[Heathin]";
+    mes "\"Hello again friend, I just found out about this great metal called terranite.\"";
+    next;
+    mes "\"This metal is almost as strong as steel, but is also very ductile.\"";
+    next;
+    mes "\"With some effort, I can make this metal form rings tighter than any chain mail. It isn't the prettiest in hue, but its uses can be many.\"";
+    next;
+    mes "\"Unfortunately, it seems to be difficult to gather. Most that have searched for Terranite Ore either cannot find it or have never returned...\"";
+    next;
+    mes "\"I may be an excellent smith, but I certainly am no combatant. However, I would enjoy turning this ore into something useful, perhaps some type of armor to help those that may be braver.\"";
+    next;
+    mes "\"So, what do you say?  Are you interested?\"";
+    menu
+        "No, thank you. Maybe later.", L_Heathin_Terranite_No,
+        "Armor, you say?  Definitely!", L_Heathin_Terranite_Yes;
+
+L_Heathin_Terranite_No:
+    mes "[Heathin]";
+    mes "\"Ah, that is too bad. Come by again anytime.\"";
+    close;
+
+L_Heathin_Terranite_Yes:
+    set @state, 3;
+    callsub S_Update_Mask;
+    mes "[Heathin]";
+    mes "\"Great, this is going to be fun!  As I have not had much practice with this armor, I'd like to get started soon.\"";
+    next;
+    mes "Heathin thinks for a moment.";
+    next;
+    mes "\"Ah, I know!  I will make a helm... Well, more like a hood, since it will be woven.\"";
+    next;
+    mes "\"It will require a great amount of heat, if the rumors are to be believed. For this, I will need 100 Coal to keep my forge burning hot. I will also need 10 Terranite Ore to make the armor. Of course, such work does not come cheap. While I may enjoy my work, my time and effort is very valuable. Since you have been a great help I will only need 20,000 gold pieces, well below my going rate. Please come back with the gold, Coal and ore and I'll make this hood for you.\"";
+    close;
+
+L_Heathin_Terranite_Hood_Forge:
+    if ( (Zeny < 20000)
+        || (countitem("Coal") < 100)
+        || (countitem("TerraniteOre") < 10) )
+            goto L_Heathin_Terranite_Hood_Wait;
+    set @state, 4;
+    callsub S_Update_Mask;
+    delitem "Coal", 100;
+    delitem "TerraniteOre", 10;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny - 20000;
+    mes "[Heathin]";
+    mes "\"Great, you brought everything!  Come back later and I'll have the helm ready for you.\"";
+    close;
+
+L_Heathin_Terranite_Hood_Wait:
+    mes "[Heathin]";
+    mes "\"I am very busy right now. If you could bring me 10 Terranite Ore, 100 Coal and 20,000 gold pieces, I will make that terranite hood for you.\"";
+    close;
+
+L_Heathin_Terranite_Hood_Ready:
+    getinventorylist;
+    if ((checkweight("TerraniteHelmet", 1) == 0) || (@inventorylist_count == 100))
+        goto L_InventoryNoSpace;
+    set @state, 5;
+    callsub S_Update_Mask;
+    getitem "TerraniteHelmet", 1;
+    mes "[Heathin]";
+    mes "\"I am all done with your terranite hood. I hope you enjoy it!  I have some work to wrap up for the Council, but come back later and I might be able to assist you again.\"";
+    close;
+
+L_Heathin_Terranite_Legs:
+    set @state, 6;
+    callsub S_Update_Mask;
+    mes "[Heathin]";
+    mes "\"I am glad you are back!  I've just finished up some more of my commission. Now I can get back to making terranite armor for you. This time I will make some pants, but they need more ore, more Coal to heat my forge and of course, more gold for my efforts.\"";
+    next;
+    mes "\"To make terranite pants, I need 200 Coal, 30 Terranite Ore and 40,000 gold pieces. The faster you bring this to me, the faster I can have your terranite pants ready.\"";
+    close;
+
+L_Heathin_Terranite_Legs_Forge:
+    if ( (Zeny < 40000)
+        || (countitem("Coal") < 200)
+        || (countitem("TerraniteOre") < 30) )
+            goto L_Heathin_Terranite_Legs_Wait;
+    set @state, 7;
+    callsub S_Update_Mask;
+    delitem "Coal", 200;
+    delitem "TerraniteOre", 30;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny - 40000;
+    mes "[Heathin]";
+    mes "\"Great, you have brought everything!  Come back later and I will have those terranite pants ready for you.\"";
+    close;
+
+L_Heathin_Terranite_Legs_Wait:
+    mes "[Heathin]";
+    mes "\"I am very busy right now. If you could bring me 30 Terranite Ore, 200 Coal and 40,000 gold pieces, I will make those terranite pants for you.\"";
+    close;
+
+L_Heathin_Terranite_Legs_Ready:
+    getinventorylist;
+    if ((checkweight("TerraniteLegs", 1) == 0) || (@inventorylist_count == 100))
+        goto L_InventoryNoSpace;
+    set @state, 8;
+    callsub S_Update_Mask;
+    getitem "TerraniteLegs", 1;
+    mes "[Heathin]";
+    mes "\"I am all done with your terranite pants. Hope you enjoy them!  I have some more work to complete for the Council. Come back later and I might be able to assist you again.\"";
+    close;
+
+L_Heathin_Terranite_Chest_Armor:
+    set @state, 9;
+    callsub S_Update_Mask;
+    mes "[Heathin]";
+    mes "\"Good to see you again. I have just finished up some more of my commission. Now I can get back to making terranite armor for you. This time, I will make some terranite chest armor, but it needs more ore, more Coal for my forge and of course, more gold to compensate for my efforts.\"";
+    next;
+    mes "\"To make terranite chest armor, I need 250 Coal, 40 Terranite Ore and 50,000 gold pieces. The faster you bring this to me, the faster I can have your terranite armor ready.\"";
+    close;
+
+L_Heathin_Terranite_Chest_Armor_Forge:
+    if ( (Zeny < 50000)
+        || (countitem("Coal") < 250)
+        || (countitem("TerraniteOre") < 40) )
+            goto L_Heathin_Terranite_Chest_Armor_Wait;
+    set @state, 10;
+    callsub S_Update_Mask;
+    delitem "Coal", 250;
+    delitem "TerraniteOre", 40;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny - 50000;
+    mes "[Heathin]";
+    mes "\"Splendid, you have brought everything!  Come back later and I will have the terranite chest armor ready for you.\"";
+    close;
+
+L_Heathin_Terranite_Chest_Armor_Wait:
+    mes "[Heathin]";
+    mes "\"I am very busy right now. If you could bring me 40 Terranite Ore, 250 Coal and 50,000 gold pieces, I will make that chest armor for you.\"";
+    close;
+
+L_Heathin_Terranite_Chest_Armor_Ready:
+    getinventorylist;
+    if ((checkweight("TerraniteChestArmor", 1) == 0) || (@inventorylist_count == 100))
+        goto L_InventoryNoSpace;
+    set @state, 11;
+    callsub S_Update_Mask;
+    getitem "TerraniteChestArmor", 1;
+    mes "[Heathin]";
+    mes "\"I have completed your terranite chest armor. I hope you enjoy it!  I have some work to wrap up for the Council again, but come back later and I might be able to assist you once more.\"";
+    close;
+
+L_Heathin_Terranite_Arrows:
+    mes "[Heathin]";
+    mes "\"How good to see you. I have experimented a little with Terranite Ore to see what else can be done with it. It seems to have some qualities suitable for weapons, but I have only tested it with arrows. If you would like, I can make Terranite Arrows, but as as with the armor, I need Coal, Terranite Ore and payment for my efforts.\"";
+    next;
+    mes "\"Also, it might be a while until I have time to see what else I can make with terranite other than arrows, as right now the Council is keeping me rather busy with my commission. So, would you like some Terranite Arrows?\"";
+    menu
+        "No, thank you.", L_Heathin_Terranite_Arrows_No,
+        "Sure, I could use some arrows.", L_Heathin_Terranite_Arrows_Yes;
+
+L_Heathin_Terranite_Arrows_No:
+    mes "[Heathin]";
+    mes "\"Well, if you change your mind, I'm not going anywhere.\"";
+    close;
+
+L_Heathin_Terranite_Arrows_Yes:
+    set @state, 12;
+    callsub S_Update_Mask;
+    mes "[Heathin]";
+    mes "\"Good, good. I shall begin crafting these arrows as soon as you come back. However, I cannot just make small handfuls as it would not be worth my time and effort to have my concentration interrupted for small tasks. I will make 1,000 Terranite Arrows per request, for which I will need "+@TARROW_REQ_TERRA_ORE+" Terranite Ore, "+@TARROW_REQ_COAL+" Coal and "+@TARROW_REQ_GP+" gold pieces.\"";
+    next;
+    mes "\"See you soon!\"";
+    close;
+
+L_Heathin_Terranite_Arrows_Forge:
+    if ( (Zeny < @TARROW_REQ_GP)
+        || (countitem("Coal") < @TARROW_REQ_COAL)
+        || (countitem("TerraniteOre") < @TARROW_REQ_TERRA_ORE) )
+            goto L_Heathin_Terranite_Arrows_Wait;
+    set @state, 13;
+    callsub S_Update_Mask;
+    delitem "Coal", @TARROW_REQ_COAL;
+    delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
+    getexp @heathin_xp_bonus, 0;
+    set Zeny, Zeny - @TARROW_REQ_GP;
+    mes "[Heathin]";
+    mes "\"Wonderful! You have everything I asked for. I will start working on the arrows right away.\"";
+    close;
+
+L_Heathin_Terranite_Arrows_Wait:
+    mes "[Heathin]";
+    mes "\"If you want Terranite Arrows, please get me "+@TARROW_REQ_TERRA_ORE+" Terranite Ore, "+@TARROW_REQ_COAL+" Coal and "+@TARROW_REQ_GP+" gold pieces.\"";
+    close;
+
+L_Heathin_Terranite_Arrows_Ready:
+    getinventorylist;
+    if ((checkweight("TerraniteArrow", 1000) == 0) || (@inventorylist_count == 100))
+        goto L_InventoryNoSpace;
+    set @state, 14;
+    callsub S_Update_Mask;
+    getitem "TerraniteArrow", 1000;
+    mes "[Heathin]";
+    mes "\"All done, here you go!  I hope you like them. I am still working on my commission, but if you ever need any more Terranite Arrows, just come on by with "+@TARROW_REQ_COAL+" Coal, "+@TARROW_REQ_TERRA_ORE+" Terranite Ore and "+@TARROW_REQ_GP+" gold pieces and I will make another 1,000 arrows for you. By now I have enough Terranite Ore in reserve that you can just trade me my requirements to keep my resources up. Thank you for all your efforts!\"";
+    close;
+
+L_Heathin_Terranite_Arrows_Trade:
+    mes "[Heathin]";
+    mes "\"Hello, there. If you have "+@TARROW_REQ_COAL+" Coal, "+@TARROW_REQ_TERRA_ORE+" Terranite Ore and "+@TARROW_REQ_GP+" gold pieces, I will trade you 1,000 Terranite Arrows. Would you like some Terranite Arrows?\"";
+    menu
+        "No.", L_Heathin_Terranite_Arrows_Trade_No,
+        "Yes.", L_Heathin_Terranite_Arrows_Trade_Yes;
+
+L_Heathin_Terranite_Arrows_Trade_No:
+    mes "[Heathin]";
+    mes "\"Come back again if you would like to get Terranite Arrows.\"";
+    close;
+
+L_Heathin_Terranite_Arrows_Trade_Yes:
+    if ( (Zeny < @TARROW_REQ_GP)
+        || (countitem("Coal") < @TARROW_REQ_COAL)
+        || (countitem("TerraniteOre") < @TARROW_REQ_TERRA_ORE) )
+            goto L_Heathin_Terranite_Arrows_Trade_Wait;
+    getinventorylist;
+    if ((checkweight("TerraniteArrow", 1500) == 0) || (@inventorylist_count == 100))
+        goto L_InventoryNoSpace;
+    delitem "Coal", @TARROW_REQ_COAL;
+    delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
+    set Zeny, Zeny - @TARROW_REQ_GP;
+    set @lucky, 5 * rand(readparam(bLuk));
+    getitem "TerraniteArrow", 1000 + @lucky;
+    mes "[Heathin]";
+    mes "\"Here you go! You are lucky, I could forge "+@lucky+" more arrows than expected. Come back again if you want more Terranite Arrows.\"";
+    close;
+
+L_Heathin_Terranite_Arrows_Trade_Wait:
+    mes "[Heathin]";
+    mes "\"It seems that you do not have the necessary resources for me to trade you. Please come back with "+@TARROW_REQ_COAL+" Coal, "+@TARROW_REQ_TERRA_ORE+" Terranite Ore and "+@TARROW_REQ_GP+" gold pieces if you want another 1,000 Terranite Arrows.\"";
+    close;
+
+L_InventoryNoSpace:
+    mes "[Heathin]";
+    mes "\"Hm no. You can't carry this right now. Make some room and come back.\"";
+    close;
+
+S_Update_Mask:
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_6_MASK)) | (@state << NIBBLE_6_SHIFT);
+    return;
+}
+001-2.gat,25,55,0|script|HeathinDebug|147
+{
+    mes "[Heathin Debug]";
+    mes "Debug Action";
+    menu
+        "Reset", L_Reset,
+        "Exit", L_End;
+
+L_Reset:
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_6_MASK) | (0 << NIBBLE_6_SHIFT));
+    mes "Reset!";
+    goto L_End;
+
+L_End:
+    end;
+
+OnInit:
+    if (!debug)
+        disablenpc "HeathinDebug";
+    end;
+}
diff --git a/world/map/npc/001-2/jhedia.txt b/world/map/npc/001-2/jhedia.txt
new file mode 100644
index 00000000..fdee36c9
--- /dev/null
+++ b/world/map/npc/001-2/jhedia.txt
@@ -0,0 +1,62 @@
+// Ingot maker takes iron ore, gives ingots for future crafting purposes.
+
+001-2.gat,23,50,0|script|Jhedia|160
+{
+    set @Cost_Per_Ingot, 1000;
+    set @Iron_Ore_Per, 5;
+    set @Coal_Per, 10;
+
+    mes "[Jhedia]";
+    mes "\"I forge Iron Ore into ingots. Ingots are more useful for skilled smiths, like armorers, because the ore is refined and made into useful units which can be worked with. To make ingots, I need " + @Iron_Ore_Per + " Iron Ore and " + @Cost_Per_Ingot + " gp per ingot. I also need " + @Coal_Per + " Coal for my forge.\"";
+    next;
+    mes "[Jhedia]";
+    mes "\"How many ingots would you like?\"";
+    input @ingot_count;
+
+    if (@ingot_count == 0)
+        goto L_Jhedia_Bye;
+    set @Zeny_cost, @ingot_count * @Cost_Per_Ingot;
+    if (countitem("IronOre") < @Iron_Ore_Per * @ingot_count)
+        goto L_Jhedia_NotEnough_Ore;
+    if (countitem("Coal") < @Coal_Per * @ingot_count)
+        goto L_Jhedia_NotEnough_Coal;
+    if (Zeny < @Zeny_cost)
+        goto L_Jhedia_NotEnough_Zeny;
+    getinventorylist;
+    if (@inventorylist_count == 100
+        && countitem("IronIngot") == 0
+        && countitem("IronOre") > @ingot_count * @Iron_Ore_Per
+        | countitem("Coal") > @ingot_count * @Coal_Per)
+            goto L_Jhedia_NotEnoughSlots;
+    set Zeny, Zeny - @Zeny_cost;
+    delitem "IronOre", @ingot_count * @Iron_Ore_Per;
+    delitem "Coal", @ingot_count * @Coal_Per;
+    getitem "IronIngot", @ingot_count;
+    close;
+
+L_Jhedia_Bye:
+    mes "[Jhedia]";
+    mes "\"Goodbye then.\"";
+    close;
+
+L_Jhedia_NotEnough_Ore:
+    mes "[Jhedia]";
+    mes "\"You do not seem to have enough Iron Ore.\"";
+    close;
+
+L_Jhedia_NotEnough_Coal:
+    mes "[Jhedia]";
+    mes "\"You do not seem to have enough Coal.\"";
+    close;
+
+L_Jhedia_NotEnough_Zeny:
+    mes "[Jhedia]";
+    mes "\"You do not seem to have enough gold pieces.\"";
+    close;
+
+L_Jhedia_NotEnoughSlots:
+    mes "[Jhedia]";
+    mes "\"You do not seem to have enough room to carry this many ingots.\"";
+    close;
+
+}
diff --git a/world/map/npc/001-2/manakins.txt b/world/map/npc/001-2/manakins.txt
new file mode 100644
index 00000000..23a59909
--- /dev/null
+++ b/world/map/npc/001-2/manakins.txt
@@ -0,0 +1,47 @@
+// Display Manakins. 
+
+// Forge
+001-2.gat,29,57,0|script|Terranite Armor#Female|401
+{
+    mes "Terranite Armor complete set, made to order, inquire with Heathin";
+    close;
+}
+
+001-2.gat,34,57,0|script|Terranite Armor#Male|402
+{
+    mes "Terranite Armor complete set, made to order, inquire with Heathin";
+    close;
+}
+
+001-2.gat,34,62,0|script|Terranite|403
+{
+    mes "Ahhh! A Terranite! Wait it appears to just be a display model.";
+    close;
+}
+
+// Museum
+
+001-2.gat,91,39,0|script|Talponian#Female|404
+{
+    mes "A Female Talponian.";
+    close;
+}
+
+001-2.gat,91,44,0|script|Talponian#Male|405
+{
+    mes "A Male Talponian.";
+    close;
+}
+
+001-2.gat,118,39,0|script|Gispaan#Female|406
+{
+    mes "A Female Gispaan.";
+    close;
+}
+
+001-2.gat,118,44,0|script|Gispaan#Male|407
+{
+    mes "A Male Gispaan.";
+    close;
+}
+
diff --git a/world/map/npc/001-2/mapflags.txt b/world/map/npc/001-2/mapflags.txt
index 41bab423..3a1f27a7 100644
--- a/world/map/npc/001-2/mapflags.txt
+++ b/world/map/npc/001-2/mapflags.txt
@@ -1,2 +1,2 @@
 001-2.gat|mapflag|town
-001-2.gat|mapflag|resave|001-1,57,71
+001-2.gat|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt
deleted file mode 100644
index c67bd44f..00000000
--- a/world/map/npc/001-2/omar.txt
+++ /dev/null
@@ -1,335 +0,0 @@
-//
-function|script|KadiyaSubquestConsts
-{
-    set @Q_kadiya_status, (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT;
-
-    set @Q_STATUS_NONE, 0;
-    set @Q_STATUS_KNOWS_MOPOX, 1;
-    set @Q_STATUS_MADE_MOPOX, 2;
-    set @Q_STATUS_DIDNT_DRINK, 3;
-    set @Q_STATUS_WANTS_CHOCOCAKE, 4;
-    set @Q_STATUS_WANTS_ORANGECUPCAKE, 5;
-    set @Q_STATUS_COMPLETED, 6;
-    set @Q_STATUS_COMPLETED_ELANORE, 7;
-    set @Q_STATUS_COMPLETED_NOELANORE, 8;
-    set @Q_STATUS_COMPLETED_POST_ELANORE, 9;
-
-    if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) < 4) set @Q_kadiya_status, @Q_STATUS_NONE;
-
-    if (((QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT) > 4) set @Q_kadiya_status, @Q_STATUS_COMPLETED_POST_ELANORE;
-
-    return;
-}
-
-001-2.gat,70,60,0|script|Omar|162
-{
-    callfunc "ElanoreFix";
-    callfunc "KadiyaSubquestConsts";
-
-    set @Q_status, @Q_kadiya_status;
-
-    if (@Q_status >= @Q_STATUS_COMPLETED) goto L_cured;
-
-    if (@Q_status == @Q_STATUS_DIDNT_DRINK) goto L_didnt_drink;
-
-    if (@Q_status > @Q_STATUS_DIDNT_DRINK) goto L_make_food;
-
-    mes "[Omar]";
-    mes "\"Welcome to my humble abode.\"";
-    next;
-    menu
-        "Well met!  May I ask who you are?", L_omar,
-        "What's wrong with your daughter?", L_kadiya_sick,
-        "Thank you!", L_Close;
-
-L_omar:
-    mes "[Omar]";
-    mes "\"My name is Omar;  I am a trader of oils and spices.\"";
-    goto L_Close;
-
-L_kadiya_sick:
-    mes "[Omar]";
-    mes "\"Kadiya has caught Ponderpox, I fear.\"";
-    mes "He sighs.";
-    mes "\"She's has been feverish for many days now. I wish there were something I could do.\"";
-    next;
-    menu
-        "Have you asked Elanore the healer?", L_sick_elanore,
-        "How about the Hurnscald hospital?", L_sick_hospital,
-        "Can I help?", L_sick_self,
-        "I'm sorry to hear that.", L_Next;
-
-L_Next:
-    mes "[Omar]";
-    mes "\"Well, she is a strong girl. I am sure that she will get over it eventually.\"";
-    mes "He smiles, but you see doubt in his eyes.";
-    goto L_Close;
-
-L_sick_elanore:
-    mes "[Omar]";
-    mes "\"Elanore?\"";
-    mes "He frowns.";
-    mes "\"She knows nothing. I see no point in talking to her.\"";
-    goto L_Close;
-
-L_sick_hospital:
-    mes "[Omar]";
-    mes "\"Hurnscald is too far away. I don't think that it would be good for her to go on such a long trip.\"";
-    goto L_Close;
-
-L_sick_self:
-    mes "[Omar]";
-    mes "\"You are very kind, but I don't think there is anything you can do.\"";
-    goto L_Close;
-
-L_didnt_drink:
-    mes "[Omar]";
-    mes "\"So she has Mopox, not Ponderpox, you say?  Hmm. That is much harder to cure, I think.\"";
-    mes "\"I am grateful for the effort you put into brewing a potion for her. But it does smell vile...\"";
-    next;
-    mes "[Omar]";
-    mes "\"I promised my dear wife that I would never make Kadiya eat or drink anything she doesn't like. So I won't force her to drink this.\"";
-    next;
-    mes "[Omar]";
-    set @Q_status, (@Q_STATUS_WANTS_CHOCOCAKE + rand(2));
-    callsub S_update_var;
-    if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE)
-        mes "\"If only we could make it smell and taste like orange cupcakes... she really loves those cupcakes.\"";
-    if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE)
-        mes "\"If only this were a chocolate cake and not a potion... she really loves chocolate cakes.\"";
-    goto L_Close;
-
-L_make_food:
-    mes "[Omar]";
-    mes "\"I should stay here to watch over her. I wish I could think of a way to convince her to drink the potion...\"";
-    if (@Q_status == @Q_STATUS_WANTS_ORANGECUPCAKE)
-        mes "\"Alas, it is not an orange cupcake.\"";
-    if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE)
-        mes "\"If only it were to smell and taste like her favourite chocolate cake...\"";
-    goto L_Close;
-
-L_cured:
-    if (@Q_status == @Q_STATUS_COMPLETED) goto L_cured_choice;
-    mes "[Omar]";
-    mes "\"She is sleeping now, but she seems to be much better. I am sure that she will be up and running around again soon.\"";
-    goto L_Close;
-
-L_cured_choice:
-    mes "[Omar]";
-    mes "\"I am very grateful for your help. I really was sure that it was Ponderpox, not Mopox, that she had.\"";
-    next;
-    menu
-        "Oh, it was nothing.", L_cured_nothing,
-        "I didn't do it alone; Elanore helped.", L_cured_elanore,
-        "That will be 5000 GP.", L_Next1;
-
-L_Next1:
-    mes "[Omar]";
-    mes "\"Ah, certainly.\"";
-    mes "He hands you a small bag of money.";
-    next;
-    set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
-    callsub S_update_var;
-    set Zeny, Zeny + 5000;
-    goto L_Close;
-
-L_cured_nothing:
-    mes "[Omar]";
-    mes "\"No, this wasn't nothing. She is everything to me. Here, you deserve a reward.\"";
-    mes "He hands you a bag of money containing 10,000 GP and two pearls.";
-    mes "\"And feel free to drop by again whenever you would like!\"";
-    set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
-    callsub S_update_var;
-    getitem "Pearl", 2;
-    set Zeny, Zeny + 10000;
-    goto L_Close;
-
-L_cured_elanore:
-    mes "[Omar]";
-    mes "Omar frowns.";
-    mes "\"That witch?  You worked with her without telling me?\"";
-    mes "He looks over to his daughter, concern suddenly in his eyes.";
-    mes "\"She is looking better, though...\"";
-    next;
-    mes "[Omar]";
-    mes "Omar shakes his head.";
-    mes "\"I will have to think about this. Please leave me alone.\"";
-    next;
-    set @Q_status, @Q_STATUS_COMPLETED_ELANORE;
-    callsub S_update_var;
-    goto L_Close;
-
-L_Close:
-    set @Q_STATUS_KNOWS_MOPOX, 0;
-    set @Q_STATUS_MADE_MOPOX, 0;
-    set @Q_STATUS_DIDNT_DRINK, 0;
-    set @Q_STATUS_WANTS_CHOCOCAKE, 0;
-    set @Q_STATUS_WANTS_ORANGECUPCAKE, 0;
-    set @Q_STATUS_COMPLETED, 0;
-    set @Q_STATUS_COMPLETED_ELANORE, 0;
-    set @Q_STATUS_COMPLETED_NOELANORE, 0;
-    set @Q_STATUS_COMPLETED_POST_ELANORE, 0;
-    set @Q_status, 0;
-    close;
-
-
-S_update_var:
-    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(NIBBLE_3_MASK) | (@Q_status << NIBBLE_3_SHIFT));
-    return;
-}
-
-001-2.gat,76,59,0|script|Kadiya|174
-{
-    set @child_number, 7;
-    callfunc "XmasList";
-
-    callfunc "ElanoreFix";
-    set @Q_MASK, NIBBLE_3_MASK;
-    set @Q_SHIFT, NIBBLE_3_SHIFT;
-    callfunc "KadiyaSubquestConsts";
-    set @Q_status, @Q_kadiya_status;
-    if (@Q_status >= @Q_STATUS_COMPLETED) goto L_cured;
-
-    mes "You see a young girl lying in bed. At first she doesn't seem to notice you approaching.";
-    mes "Finally, she turns her head towards you. Judging from the sweat on her forehead and look in her eyes, she is suffering from some kind of fever.";
-    next;
-    mes "[Kadiya]";
-    mes "\"Hello,\" she says in a tiny voice.";
-    next;
-    set @M_NAME, 1;
-    set @M_CANDY, 2;
-    set @M_POTION, 3;
-    set @M_CHOCOCAKE, 4;
-    set @M_CUPCAKE, 5;
-
-    setarray @choice$, "Hello!  What's your name?", "Would you like some candy?", "", "", "", "", "", "";
-    setarray @choice_idx, @M_NAME, @M_CANDY, 0, 0, 0, 0, 0, 0;
-    set @choices_nr, 2;
-
-    if (countitem("MopoxCurePotion") == 0) goto L_M_no_cure;
-
-    set @choice_idx[@choices_nr], @M_POTION;
-    set @choice$[@choices_nr], "This potion will cure your illness!";
-    set @choices_nr, @choices_nr + 1;
-    goto L_M_no_cure;
-
-L_M_no_cure:
-    if ((countitem("LacedChocolateCake") == 0) || (@Q_status != @Q_STATUS_WANTS_CHOCOCAKE))
-        goto L_M_no_chococake;
-    set @choice_idx[@choices_nr], @M_CHOCOCAKE;
-    set @choice$[@choices_nr], "Would you like special chocolate cake?";
-    set @choices_nr, @choices_nr + 1;
-    goto L_M_no_chococake;
-
-L_M_no_chococake:
-    if ((countitem("LacedOrangeCupcake") == 0) || (@Q_status != @Q_STATUS_WANTS_ORANGECUPCAKE))
-        goto L_M_no_cupcake;
-    set @choice_idx[@choices_nr], @M_CUPCAKE;
-    set @choice$[@choices_nr], "Would you like special orange cupcake?";
-    set @choices_nr, @choices_nr + 1;
-    goto L_M_no_cupcake;
-
-L_M_no_cupcake:
-    set @choice_idx[@choices_nr], 0;
-    set @choice$[@choices_nr], "Goodbye.";
-    set @choices_nr, @choices_nr + 1;
-
-    menu
-        @choice$[0], L_MenuItems,
-        @choice$[1], L_MenuItems,
-        @choice$[2], L_MenuItems,
-        @choice$[3], L_MenuItems,
-        @choice$[4], L_MenuItems,
-        @choice$[5], L_MenuItems;
-
-L_MenuItems:
-    set @choice, @choice_idx[@menu - 1];
-
-    if (@choice == @M_NAME) goto L_name;
-    if (@choice == @M_CANDY) goto L_no_candy;
-    if (@choice == @M_POTION) goto L_potion;
-    if (@choice == @M_CHOCOCAKE) goto L_chococake;
-    if (@choice == @M_CUPCAKE) goto L_cupcake;
-    goto L_Close;
-
-L_name:
-    mes "[Kadiya]";
-    mes "She smiles a faint smile.";
-    mes "\"My name is Kadiya.\"";
-    goto L_Close;
-
-L_no_candy:
-    mes "[Kadiya]";
-    mes "She hesitates for a moment.";
-    mes "\"No, thank you. I don't think I should.\"";
-    goto L_Close;
-
-L_potion:
-    mes "[Kadiya]";
-    if (@Q_status < @Q_STATUS_DIDNT_DRINK) set @Q_status, @Q_STATUS_DIDNT_DRINK;
-    callsub S_update_var;
-
-    mes "Kadiya grimaces and pushes the bottle away.";
-    mes "\"That smells terrible!\"";
-    next;
-    mes "[Kadiya]";
-    mes "She pulls the sheets over her head.";
-    mes "\"I won't drink that!\"";
-    goto L_Close;
-
-L_chococake:
-    delitem "LacedChocolateCake", 1;
-    goto L_do_cure;
-
-L_cupcake:
-    delitem "LacedOrangeCupcake", 1;
-    goto L_do_cure;
-
-L_do_cure:
-    if (@Q_status < @Q_STATUS_COMPLETED) set @Q_status, @Q_STATUS_COMPLETED;
-    callsub S_update_var;
-
-    mes "[Kadiya]";
-    mes "Kadiya's eyes widen.";
-    mes "\"Oh!  Daddy, is it okay if I eat this?\"";
-    mes "Omar nods and smiles. \"You should eat a bit to regain your strength, sweetheart.\"";
-    next;
-    mes "[Kadiya]";
-    mes "Kadiya devours your gift in just a handful of bites.";
-    next;
-    mes "[Kadiya]";
-    mes "She smiles. \"Thank you!  I feel better already!\".";
-    next;
-    mes "[Kadiya]";
-    mes "She looks much healthier, too. Omar walks over and touches her forehead.";
-    mes "\"Now that is funny – your fever has gone down quite a bit!\"";
-    mes "He smiles at you. \"Thank you for your help!\"";
-    next;
-    mes "[Kadiya]";
-    mes "\"You should get some sleep now, sweetheart. I'm sure that you will be better soon.\"";
-    goto L_Close;
-
-L_cured:
-    mes "[Kadiya]";
-    mes "Kadiya seems to be sleeping calmly. She looks much less sweaty than earlier; unless you are very much mistaken, her fever has disappeared.";
-    goto L_Close;
-
-L_Close:
-    set @Q_status, 0;
-    set @Q_MASK, 0;
-    set @Q_SHIFT, 0;
-    set @M_NAME, 0;
-    set @M_CANDY, 0;
-    set @M_POTION, 0;
-    set @M_CHOCOCAKE, 0;
-    set @M_CUPCAKE, 0;
-    set @choice, 0;
-    set @choices_nr, 0;
-    cleararray @choice_idx[0], 0, 7;
-    cleararray @choice$[0], "", 7;
-    close;
-
-S_update_var:
-    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
-    return;
-}
diff --git a/world/map/npc/001-2/pauline.txt b/world/map/npc/001-2/pauline.txt
new file mode 100644
index 00000000..b8833251
--- /dev/null
+++ b/world/map/npc/001-2/pauline.txt
@@ -0,0 +1,307 @@
+//Author: tux9th
+//This is the continuation of Astral Magic Level 2.
+//This uses the QUEST_MAGIC2 variable Nibble 4.
+//Quest States:
+//  @pauline_state 1: Got Magic, started to talk to her about Magic.
+//  @pauline_state 2: Finished Talking to her about new Astral Spells, learnt invocations.
+//  @pauline_state 3: Told her the correct ingredients to the Mouboo summon spell.
+//  @pauline_state 4: Told her the correct ingredients to the Pinkie summon spell.
+//
+//Variables:
+//  @pauline_ingredient1$   First ingredient input.
+//  @pauline_ingredient2$   Second ingredient input.
+//  @pauline_REWARD         amount of XP gained for telling her ingredients for each spell.
+
+001-2.gat,77,78,0|script|Pauline|208
+{
+
+//Bitmasking
+// QUEST_MAGIC2 - Nibble4
+    set @Pauline_MASK, NIBBLE_4_MASK;
+    set @Pauline_SHIFT, NIBBLE_4_SHIFT;
+
+    set @pauline_state, ((QUEST_MAGIC2 & @Pauline_MASK) >> @Pauline_SHIFT);
+
+//Bitmasks END
+
+    set @pauline_REWARD, 10000;
+
+    if (@pauline_state == 4)    goto L_MoreMagic;
+    if (@pauline_state == 3)    goto L_KnowIngredientsPinkie;
+    if (@pauline_state == 2)    goto L_Ingredients;
+    if (@pauline_state == 1)    goto L_Back;
+
+    if (getskilllv(SKILL_MAGIC_ASTRAL) > 0)
+        goto L_Magic;
+    mes "[Pauline]";
+    mes "\"I've mastered several schools of magic and fought the Yeti in Kaizei.\"";
+    next;
+    mes "\"The path of magic is a long and difficult one.\"";
+    goto L_Close;
+
+L_Magic:
+    mes "[Pauline]";
+    mes "\"Ah. I see you are skilled in the Art of Astral Magic.\"";
+    mes "\"Who taught you?\"";
+    menu
+        "I learnt it myself!", L_Next,
+        "Sagatha is my teacher.", L_Sagatha,
+        "You must be mistaken.", L_Close;
+
+L_Next:
+    mes "\"You did? Not bad. I guess then there is nothing I can teach you. Or are you interested in sharing knowledge?\"";
+    menu
+        "Yes, please.", L_Spells,
+        "No, thanks.", L_Close;
+
+L_Sagatha:
+    mes "[Pauline]";
+    mes "\"Ah, that Witch!\"";
+    mes "\"Very well.\"";
+    next;
+    mes "\"Do you want me to teach you things Sagatha doesn't know yet?\"";
+    next;
+    menu
+        "Yes.", L_Spells,
+        "No.", L_Close;
+
+L_Back:
+    mes "[Pauline]";
+    mes "\"So, you're back. Are you ready to share knowledge now?\"";
+    menu
+        "Yes.", L_Spells,
+        "No.", L_Close;
+
+L_Spells:
+    set @pauline_state, 1;
+    callsub S_Update_Mask;
+    mes "[Pauline]";
+    mes "\"Okay.\"";
+    mes "\"Not long ago I discovered some new caves near Tulimshar. In an abandond chamber I found some paintings on the wall.\"";
+    next;
+    mes "\"They weren't typical for this region, so I examined them closely. I found some invocations I have never heard before.\"";
+    mes "\"I thought that they would fit better into the Woodland area. I could only decipher two invocations so far. Those are two spells used to summon creatures.\"";
+    next;
+    mes "\"One was for summoning Mouboos and the other one was for summoning Pinkies.\"";
+    mes "\"Have you ever heared about those?\"";
+    next;
+    menu
+        "Yes. I thought you had something new to tell. [Walk Away]", L_Close,
+        "No, tell me more.", L_Next1;
+
+L_Next1:
+    mes "[Pauline]";
+    mes "\"Well I could only read the invocations. So I don't exactly know what kind of ingredients you are going to need.\"";
+    mes "\"The first one for the mouboo was " + getspellinvocation("summon-mouboo") + " and the one for the pinkie was " + getspellinvocation("summon-pinkie") +".\"";
+    next;
+    mes "\"For the pinkie spell my suggestion is to try similar ingredients to the other Astral spells. Try a root and some item typical for pinkies.\"";
+    mes "\"The mouboo spell might be more complicated. From what I could translate, one of the spell components is crafted by magic.\"";
+    next;
+    mes "\"When you find the right ingredients, come back and bring them to me to try those spells out.\"";
+    next;
+    mes "\"Goodbye.\"";
+    set @pauline_state, 2;
+    callsub S_Update_Mask;
+    goto L_Close;
+
+L_Ingredients:
+    mes "[Pauline]";
+    mes "\"Hello, have you found out what ingredients to use yet?\"";
+    menu
+        "Yes.", L_KnowIngredientsMouboo,
+        "No.", L_Next2;
+
+L_Next2:
+    mes "\"Okay. Come back as soon as you know.\"";
+    goto L_Close;
+
+L_KnowIngredientsMouboo:
+    mes "\"Did you bring them?\"";
+    menu
+        "Yes." , L_Next3,
+        "No.", L_ComeBackLater;
+
+L_Next3:
+    mes "\"Then tell me the ingredients for the mouboo summoning spell and give them to me. Start with the first ingredient and then tell me the second one separately.\"";
+    next;
+    mes "This is case sensitive. Also do not enter whitespaces.";
+    next;
+    input @pauline_ingredient1$;
+    mes "Next ingredient.";
+    input @pauline_ingredient2$;
+    if (@pauline_ingredient1$ == "")
+        goto L_Wrong;
+    if (@pauline_ingredient2$ == "")
+        goto L_Wrong;
+    if (countitem(@pauline_ingredient1$) < 1)
+        goto L_NotEnough;
+    if (countitem(@pauline_ingredient2$) < 1)
+        goto L_NotEnough;
+    mes "\"Do you want to give me these items?\"";
+    menu
+        "No.", L_ComeBackLater,
+        "Yes.", L_Next4;
+
+L_Next4:
+    delitem @pauline_ingredient1$, 1;
+    delitem @pauline_ingredient2$, 1;
+    mes "\"Okay let me try this.\"";
+    if (@pauline_ingredient1$ == "Root")
+        goto L_Pass1Mouboo;
+    if (@pauline_ingredient1$ == "MoubooFigurine")
+        goto L_Pass2Mouboo;
+    goto L_DidNotWorkMouboo;
+
+L_DidNotWorkMouboo:
+    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-mouboo") + ".";
+    mes "Nothing happens.";
+    mes "[Pauline]";
+    mes "\"It seems you did not tell me the correct ingredients. Come back when you find the correct ones.\"";
+    goto L_Close;
+
+L_Pass1Mouboo:
+    if (@pauline_ingredient2$ == "MoubooFigurine")
+        goto L_TrySpellMouboo;
+    goto L_DidNotWorkMouboo;
+
+L_Pass2Mouboo:
+    if (@pauline_ingredient2$ == "Root")
+        goto L_TrySpellMouboo;
+    goto L_DidNotWorkMouboo;
+
+L_TrySpellMouboo:
+    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-mouboo") + ".";
+    monster "001-1.gat", 55,68, "Good", 1028, 1;
+    mes "[Pauline]";
+    mes "\"It worked!\"";
+    set @pauline_state, 3;
+    callsub S_Update_Mask;
+    getexp @pauline_REWARD, 0;
+    goto L_Close;
+
+L_KnowIngredientsPinkie:
+    mes "[Pauline]";
+    mes "\"Now give me the ingredients for the pinkie spell.\"";
+    next;
+    mes "This is case sensitive. Also do not enter whitespaces.";
+    input @pauline_ingredient1$;
+    mes "Next ingredient.";
+    input @pauline_ingredient2$;
+    if (@pauline_ingredient1$ == "")
+        goto L_Wrong;
+    if (@pauline_ingredient2$ == "")
+        goto L_Wrong;
+    if (countitem(@pauline_ingredient1$) < 1)
+        goto L_NotEnough;
+    if (countitem(@pauline_ingredient2$) < 1)
+        goto L_NotEnough;
+    mes "\"Do you want to give me these items?\"";
+    menu
+        "No.", L_ComeBackLater,
+        "Yes.", L_Next5;
+
+L_Next5:
+    delitem @pauline_ingredient1$, 1;
+    delitem @pauline_ingredient2$, 1;
+    mes "\"Okay, let me try this.\"";
+    if (@pauline_ingredient1$ == "Root")
+        goto L_Pass1Pinkie;
+    if (@pauline_ingredient1$ == "PinkAntenna")
+        goto L_Pass2Pinkie;
+    goto L_DidNotWorkPinkie;
+
+L_DidNotWorkPinkie:
+    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-pinkie") + ".";
+    mes "Nothing happens.";
+    mes "[Pauline]";
+    mes "\"It seems you did not tell me the correct ingredients. Come back when you find the correct ones.\"";
+    goto L_Close;
+
+L_Pass1Pinkie:
+    if (@pauline_ingredient2$ == "PinkAntenna")
+        goto L_TrySpellPinkie;
+    goto L_DidNotWorkPinkie;
+
+L_Pass2Pinkie:
+    if (@pauline_ingredient2$ == "Root")
+        goto L_TrySpellPinkie;
+    goto L_DidNotWorkPinkie;
+
+L_TrySpellPinkie:
+    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-pinkie") + ".";
+    monster "001-1.gat", 54,68, "Good", 1018, 1;
+    mes "[Pauline]";
+    mes "\"It worked!\"";
+    set @pauline_state, 4;
+    callsub S_Update_Mask;
+    getexp @pauline_REWARD, 0;
+    goto L_Close;
+
+L_MoreMagic:
+    mes "[Pauline]";
+    mes "\"Thanks for telling me the ingredients. As soon as I find out more about those wall paintings I will let you know.\"";
+    goto L_Close;
+
+L_Wrong:
+    mes "The Witch looks at you and snorts.";
+    mes "[Pauline]";
+    mes "\"You told me the wrong ingredients. Come back as soon as you know the correct ones.\"";
+    goto L_Close;
+
+L_NotEnough:
+    mes "[Pauline]";
+    mes "\"Hey, you don't have this with you!\"";
+    mes "\"Come back when you have the right ingredients.\"";
+    goto L_Close;
+
+L_ComeBackLater:
+    mes "[Pauline]";
+    mes "\"Then come back later.\"";
+    goto L_Close;
+
+L_Close:
+    set @pauline_ingredient1$, "";
+    set @pauline_ingredient2$, "";
+    set @pauline_state, 0;
+    set @pauline_REWARD, 0;
+    close;
+
+//Bitmasks
+S_Update_Mask:
+    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Pauline_MASK)) | (@pauline_state << @Pauline_SHIFT);
+    return;
+}
+
+001-2.gat,79,74,0|script|PaulineDebug|208
+{
+//load Bitmasks;
+    set @Pauline_MASK, NIBBLE_4_MASK;
+    set @Pauline_SHIFT, NIBBLE_4_SHIFT;
+
+    set @pauline_state, ((QUEST_MAGIC2 & @Pauline_MASK) >> @Pauline_SHIFT);
+
+    mes "Reset Quest State";
+    mes @pauline_state;
+    menu
+        "Yes.", L_Next,
+        "No.", L_Close;
+
+L_Next:
+    set @pauline_state, 0;
+    callsub S_Update_Mask;
+    mes "Done";
+    close;
+
+L_Close:
+    set @pauline_state, 0;
+    close;
+
+S_Update_Mask:
+    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Pauline_MASK)) | (@pauline_state << @Pauline_SHIFT);
+    return;
+
+OnInit:
+    if (!debug)
+        disablenpc "PaulineDebug";
+    end;
+}
diff --git a/world/map/npc/001-2/phaet.txt b/world/map/npc/001-2/phaet.txt
deleted file mode 100644
index aa0c9848..00000000
--- a/world/map/npc/001-2/phaet.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-
-001-2.gat,132,25,0|script|Phaet|125,0,0
-{
-    mes "[Phaet the Royal Guard]";
-    mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
-    next;
-    menu
-        "Yes", L_Sure,
-        "No", L_Next;
-
-L_Next:
-    mes "[Phaet the Royal Guard]";
-    mes "\"Ha ha, coward.\"";
-    close;
-
-L_Sure:
-    if (Zeny < 50) goto L_NoMoney;
-    set Zeny, Zeny - 50;
-
-    mes "[Phaet the Royal Guard]";
-    mes "\"Get ready!\"";
-    next;
-    warp "001-3.gat", 0, 0;
-    close;
-
-L_NoMoney:
-    mes "\"Wait a second, you don't have enough money.\"";
-    close;
-}
diff --git a/world/map/npc/001-2/sandra.txt b/world/map/npc/001-2/sandra.txt
new file mode 100644
index 00000000..48632e58
--- /dev/null
+++ b/world/map/npc/001-2/sandra.txt
@@ -0,0 +1,118 @@
+// Variables used: nibble 3 of QUEST_SouthTulimshar
+
+001-2.gat,98,88,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-2/shops.txt b/world/map/npc/001-2/shops.txt
deleted file mode 100644
index 9d71508d..00000000
--- a/world/map/npc/001-2/shops.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// Bartender
-
-001-2.gat,21,27,0|shop|Bartender#Casino|112,Beer:*175,Cake:*30,CherryCake:*100
diff --git a/world/map/npc/001-2/tathin.txt b/world/map/npc/001-2/tathin.txt
new file mode 100644
index 00000000..491eb151
--- /dev/null
+++ b/world/map/npc/001-2/tathin.txt
@@ -0,0 +1,29 @@
+001-2.gat,28,21,0|script|Tathin|107
+{
+    mes "[Tathin]";
+    mes "\"Hello what Can I do for you?\"";
+    next;
+
+    menu
+        "I'd like to join a party.", L_Give_Party,
+        "I'd like to create my own party.", L_Give_Make_Party,
+        "Nothing, I guess.", L_Close;
+
+L_Give_Party:
+    mes "[Tathin]";
+    mes "\"You'll need to be invited by an existing member of a party to join it. You may also create your own party.\"";
+    next;
+    mes "[Tathin]";
+    mes "\"Remember, parties cannot share experience if any members are more than 10 levels apart.\"";
+    menu
+      "I'd like to create my own party.", L_Give_Make_Party,
+      "Goodbye.", L_Close;
+
+L_Give_Make_Party:
+    mes "[Tathin]";
+    mes "\"You can create parties with the 'new' or 'create' commands on the Party tab in the client. Parties need to have unique names.\"";
+    close;
+
+L_Close:
+    close;
+}
diff --git a/world/map/npc/001-2/tondar.txt b/world/map/npc/001-2/tondar.txt
new file mode 100644
index 00000000..5c15dddb
--- /dev/null
+++ b/world/map/npc/001-2/tondar.txt
@@ -0,0 +1,56 @@
+// A professor at Tulimshar's magic academy
+
+001-2.gat,95,79,0|script|Tondar|168
+{
+    mes "[Tondar]";
+    mes "\"We're not accepting any new students right now.\"";
+    if (getskilllv(SKILL_MAGIC) > 0)
+        goto L_may_ask;
+    goto L_end;
+
+L_may_ask:
+    next;
+    menu
+        "Can you teach me a spell?", L_askspell,
+        "Do you have a magic library?", L_library,
+        "Are you sure?  I can pay well...", L_nopay,
+        "That's unfortunate.", L_end,
+        "Goodbye, then.", L_end;
+
+L_library:
+    mes "[Tondar]";
+    mes "\"Of course we do. It is only for graduate students, alumni, and faculty.\"";
+    next;
+    menu
+        "Thank you, and goodbye.", L_end,
+        "Nobody else is allowed inside?", L_Next;
+
+L_Next:
+    mes "[Tondar]";
+    mes "\"Well, it is possible to get a special permit from the headmaster. But he is currently on sabbatical.\"";
+    close;
+
+L_askspell:
+    mes "[Tondar]";
+    mes "\"We only teach spells to students.\"";
+    next;
+    menu
+        "Oh, come on... just one little spell!", L_nopay,
+        "Pretty please?", L_spell,
+        "I can pay you, too...", L_nopay;
+
+L_spell:
+    mes "[Tondar]";
+    mes "\"Well, all right; this one can't do much harm. Press your hands together and say `" + getspellinvocation("ask-magic-exp") + "'.\"";
+    mes "\"This will release a steady flow of magic within you. Focus and try to control it; it is a good meditative practice.\"";
+    close;
+
+L_nopay:
+    mes "[Tondar]";
+    mes "The wizard frowns angrily.";
+    mes "\"Do not tempt me to teach you a different kind of lesson, young one!  Begone!\"";
+    goto L_end;
+
+L_end:
+    close;
+}
diff --git a/world/map/npc/001-2/troupe_leader.txt b/world/map/npc/001-2/troupe_leader.txt
deleted file mode 100644
index 64eef7b2..00000000
--- a/world/map/npc/001-2/troupe_leader.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-
-001-2.gat,34,23,0|script|Troupe Leader|165
-{
-    callfunc "ClearVariables";
-
-    set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
-
-    if (@inspector == 4) goto L_NohMask_Troupe;
-    if (@inspector == 13) goto L_NohMask_Found;
-
-    mes "[Troupe Leader]";
-    mes "\"Hello. I'm the leader of a traveling theater troupe. We'll be staying here in Tulimshar for a while.\"";
-    goto L_Close;
-
-L_NohMask_Troupe:
-    mes "[Troupe Leader]";
-    mes "\"Yes, a mask was stolen from us the last night we were in Hurnscald.\"";
-    next;
-    menu
-        "Any ideas on who might have taken it?", L_NohMask_Idea,
-        "Are you sure one of your troupe members didn't hide it and commit those robberies?", L_NohMask_Accuse,
-        "Hmm...", L_Close;
-
-L_NohMask_Idea:
-    set @inspector, 5;
-    callsub S_Update_Mask;
-    mes "[Troupe Leader]";
-    mes "\"Hm...I did see an old man hang out near the theater after our last show.\"";
-    goto L_Close;
-
-L_NohMask_Accuse:
-    mes "[Troupe Leader]";
-    mes "\"I am absolutely positive. None of my troupe have left the city since we got here. Good day!\"";
-    goto L_Close;
-
-L_NohMask_Found:
-    mes "[Troupe Leader]";
-    mes "\"Thank you for finding the mask. You did such a good job, you should keep it.\"";
-    getinventorylist;
-    if (@inventorylist_count == 100) goto L_NohMask_TooMany;
-    mes "[1500 experience points]";
-    getexp 1500, 0;
-    set @inspector, 14;
-    callsub S_Update_Mask;
-    getitem "NohMask", 1;
-    next;
-    mes "[Troupe Leader]";
-    mes "\"We don't need it anymore. We're doing different shows here.\"";
-    goto L_Close;
-
-L_NohMask_TooMany:
-    next;
-    mes "[Troupe Leader]";
-    mes "\"Except, you don't seem to have any room for it. I'll hold onto it for you until you do have room.\"";
-    goto L_Close;
-
-L_Close:
-    set @inspector, 0;
-    close;
-
-S_Update_Mask:
-    set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_3_MASK)) | (@inspector << NIBBLE_3_SHIFT);
-    return;
-}
diff --git a/world/map/npc/001-2/wizards.txt b/world/map/npc/001-2/wizards.txt
new file mode 100644
index 00000000..587c999c
--- /dev/null
+++ b/world/map/npc/001-2/wizards.txt
@@ -0,0 +1,60 @@
+// Council of Ruling Wizards Room
+
+// manaseed
+001-2.gat,104,19,0|script|Desert Mana Seed#_M|166
+{
+    end;
+}
+
+// 
+001-2.gat,99,22,0|script|Wizard#1|355
+{
+    end;
+}
+
+//
+001-2.gat,92,24,0|script|Wizard#2|356
+{
+    end;
+}
+
+//
+001-2.gat,92,30,0|script|Wizard#3|357
+{
+    end;
+}
+
+//
+001-2.gat,99,32,0|script|Wizard#4|358
+{
+    end;
+}
+
+//
+001-2.gat,110,22,0|script|Wizard#5|359
+{
+    end;
+}
+
+//
+001-2.gat,117,24,0|script|Wizard#6|360
+{
+    end;
+}
+
+//
+001-2.gat,117,30,0|script|Wizard#7|361
+{
+    end;
+}
+
+//
+001-2.gat,110,32,0|script|Wizard#8|362
+{
+    end;
+}
+//
+001-2.gat,104,27,0|script|Arch-Wizard#9|354
+{
+    end;
+}
diff --git a/world/map/npc/001-2/yanis.txt b/world/map/npc/001-2/yanis.txt
new file mode 100644
index 00000000..67175704
--- /dev/null
+++ b/world/map/npc/001-2/yanis.txt
@@ -0,0 +1,47 @@
+// Government official taking care about shop licenses
+// involved in quest given by 021-1/imec.txt and 021-2/kylian.txt
+
+001-2.gat,31,21,0|script|Yanis|107
+{
+    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowYanisNT;
+    set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
+    set @imec, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
+    set @halloween_npc_id, $@halloween_npc_yanis;
+    callfunc "TrickOrTreat";
+
+    goto L_Base_Menu;
+
+L_Base_Menu:
+
+    mes "[Yanis]";
+    mes "\"Welcome. I'm handling issues with trading licenses for the shop owners in Tulimshar. Can I help you?\"";
+    if (@imec != 1)
+        menu
+            "Nothing right now.",L_BeforeClose;
+    menu
+        "Imec asked me to bring this petition.",L_Next,
+        "Nothing right now.",L_BeforeClose;
+
+L_Next:
+    mes "[Yanis]";
+    mes "\"Imec? I see. Give it to me.\"";
+    mes "Yanis has a disapproving look on his face. He takes the letter and writes something on another paper.";
+    next;
+    mes "[Yanis]";
+    mes "\"Here you have a letter of acknowledgement. You can bring that back to Imec. We will have a look at his case.\"";
+    set @imec, 2;
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_4_MASK)) | (@imec << TWOBIT_4_SHIFT);
+    goto L_BeforeClose;
+
+L_BeforeClose:
+    if (@kylian != 3)
+        goto L_Close;
+    next;
+    mes "You think that this is the person Kylian needs to talk to. You should tell him.";
+    goto L_Close;
+
+L_Close:
+    set @imec, 0;
+    set @kylian, 0;
+    close;
+}