Moving Tutorial from Tulimshar to Candor

18 files changed, 0 insertions, 1265 deletions

diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
deleted file mode 100644
index 9a1b1507..00000000
--- a/world/map/npc/021-1/_import.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map 021-1: North Tulimshar
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 021-1.gat
-npc: npc/021-1/_mobs.txt
-npc: npc/021-1/_warps.txt
-npc: npc/021-1/bakery.txt
-npc: npc/021-1/banu.txt
-npc: npc/021-1/eurni.txt
-npc: npc/021-1/gate_guards.txt
-npc: npc/021-1/hideandseek.txt
-npc: npc/021-1/imec.txt
-npc: npc/021-1/inac.txt
-npc: npc/021-1/mapflags.txt
-npc: npc/021-1/north_shops.txt
-npc: npc/021-1/npcs.txt
-npc: npc/021-1/pauline.txt
-npc: npc/021-1/sewer_east.txt
-npc: npc/021-1/sewer_north.txt
-npc: npc/021-1/sewer_west.txt
-npc: npc/021-1/weellos.txt
diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt
deleted file mode 100644
index 285a62e1..00000000
--- a/world/map/npc/021-1/_mobs.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// North Tulimshar mobs
-
-021-1.gat,126,86,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
-021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
-021-1.gat,95,124,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
-021-1.gat,103,53,6,2|monster|Maggot|1002,5,100000ms,30000ms,Mob021-1::On1002
-021-1.gat,98,24,2,2|monster|SeaSlime|1033,1,150000ms,100000ms,Mob021-1::On1033
-
-
-021-1.gat,0,0,0|script|Mob021-1|-1
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
deleted file mode 100644
index daa1a89d..00000000
--- a/world/map/npc/021-1/_warps.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// North Tulimshar warps
-
-021-1.gat,128,119|warp|To Tulimshar Musuem|0,-1,021-2.gat,71,177
-021-1.gat,144,22|warp|To Tulimshar Noble|3,-1,068-1.gat,34,105
-021-1.gat,157,44|warp|To Tulimshar Castle|-1,0,069-1.gat,21,44
-021-1.gat,157,97|warp|To Tulimshar Castle|-1,0,069-1.gat,21,97
-021-1.gat,135,119|warp|To Tulimshar Musuem|-1,-1,021-2.gat,90,177
-021-1.gat,55,146|warp|To South Tulimshar|3,-1,001-1.gat,44,21
-021-1.gat,136,147|warp|To South Tulimshar|0,-1,001-1.gat,125,22
-021-1.gat,53,133|warp|To Government Building|-1,-1,021-2.gat,27,29
-021-1.gat,55,133|warp|To Government Building|-1,-1,021-2.gat,33,29
-021-1.gat,57,133|warp|To Government Building|-1,-1,021-2.gat,39,29
-021-1.gat,103,99|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27
-021-1.gat,103,96|warp|To Bakery|-1,-1,021-2.gat,122,23
-021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73
-021-1.gat,53,98|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66
-021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,70,63
-021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109
-021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109
-021-1.gat,132,30|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138
-021-1.gat,133,24|warp|To Tulimshar Forge|-1,-1,021-2.gat,75,92
-021-1.gat,125,27|warp|To Tulimshar Forge|-1,-1,021-2.gat,124,68
-021-1.gat,125,30|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138
-021-1.gat,43,109|warp|To Store|-1,-1,021-2.gat,28,129
diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
deleted file mode 100644
index 20dc49d5..00000000
--- a/world/map/npc/021-1/bakery.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Outside the bakery
-
-021-1.gat,103,103,0|shop|Ara|163,WhiteCake:*500,ChocolateCake:*550,OrangeCake:*600,AppleCake:*600,CherryCake:*100
-
-021-1.gat,108,102,0|script|Itka|114
-{
-    mes "[Itka]";
-    mes "\"This bakery is the best!\"";
-    close;
-
-OnTimer300000:
-    npctalk "Come to the bakery!";
-    setnpctimer 0;
-    end;
-
-OnInit:
-    if (debug >= 2) end;
-    initnpctimer;
-    end;
-}
diff --git a/world/map/npc/021-1/banu.txt b/world/map/npc/021-1/banu.txt
deleted file mode 100644
index db3830dc..00000000
--- a/world/map/npc/021-1/banu.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-// Old woman working on a field, asks the player to get her some water
-// after that she asks for a knife
-// Using bit 10 and 11 of QUEST_NorthTulimshar (second half of nibble 2)
-// author: Jenalya
-
-021-1.gat,102,54,0|script|Banu|154
-{
-    set @state, ((QUEST_NorthTulimshar & TWOBIT_5_MASK) >> TWOBIT_5_SHIFT);
-    set @EXP, 30;
-    set @money_water, 200;
-    set @money_knife, 60;
-
-    if (@state >= 3) goto L_Done;
-    if (@state == 2) goto L_Knife;
-    if (@state == 1) goto L_Water;
-
-    mes "[Banu]";
-    mes "\"Ah, hello. You've come at just the right moment. The field work is hard and the sun is burning.";
-    mes "Would you mind refilling an old woman's Empty Bottle with water?\"";
-    menu
-        "Sure!",L_Next,
-        "Sorry, I'm busy.",L_Close;
-
-L_Next:
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_FullInv;
-
-    mes "She smiles.";
-    mes "[Banu]";
-    mes "\"Here is my Empty Bottle. There is a well right over there at the market.\"";
-    getitem "EmptyBottle", 1;
-    set @state, 1;
-    callsub S_Update_Mask;
-    goto L_Close;
-
-L_Water:
-    mes "[Banu]";
-    mes "\"Ah, you're back. I'm so thirsty.\"";
-    next;
-    if (countitem("BottleOfWater") < 1)
-        goto L_NoWater;
-    delitem "BottleOfWater", 1;
-    mes "She grabs the Bottle of Water and drinks.";
-    getexp @EXP, 0;
-    set Zeny, Zeny + @money_water;
-    set @state, 2;
-    callsub S_Update_Mask;
-    mes "[Banu]";
-    mes "\"Ah, that's refreshing. Thank you. You're a good kid. Have this for your expenses.";
-    mes "Maybe you can do me another favor?\"";
-    next;
-    mes "\"I need a new Knife. Mjolnir in the Tulimshar forge to the north east of here is selling some. But it's such a long way for my old legs.";
-    mes "Would you go to get me a Knife?\"";
-    goto L_Close;
-
-L_Knife:
-    mes "[Banu]";
-    mes "\"Hello dear. Did you get the knife for me?\"";
-    menu
-        "Yeah, here is it.",L_Next1,
-        "Not yet.",L_Close;
-
-L_Next1:
-    if (countitem("Knife") < 1)
-        goto L_NoKnife;
-    delitem "Knife", 1;
-    getexp @EXP, 0;
-    set Zeny, Zeny + @money_knife;
-    set @state, 3;
-    callsub S_Update_Mask;
-    mes "[Banu]";
-    mes "\"Thank you! You're a darling. Please take this for your effort.\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Banu]";
-    set @rand, rand(3);
-    if (@rand == 0)
-        mes "\"I spent all my life here in Tulimshar. It's a good place to live.\"";
-    if (@rand == 1)
-        mes "\"Did you see the kids playing hide and seek? Ah, when I was young I used to play with my good friend Sorfina. She lives in the suburbs now, north of Tulimshar.\"";
-    if (@rand == 2)
-        mes "\"Tulimshar is ruled by a council of wise wizards.\"";
-    goto L_Close;
-
-L_NoWater:
-    mes "[Banu]";
-    mes "\"You didn't get it yet? Shame on you, an old woman is depending on you.\"";
-    goto L_Close;
-
-L_NoKnife:
-    mes "[Banu]";
-    mes "\"Where is it? Don't play tricks on an old woman! That's not nice.\"";
-    goto L_Close;
-
-L_FullInv:
-    mes "[Banu]";
-    mes "\"Oh my dear! You're carrying so many things that you can't take my Empty Bottle.\"";
-    goto L_Close;
-
-L_Close:
-    set @inventorylist_count, 0;
-    set @EXP, 0;
-    set @state, 0;
-    set @rand, 0;
-    close;
-
-S_Update_Mask:
-    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_5_MASK)) | (@state << TWOBIT_5_SHIFT);
-    return;
-}
diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
deleted file mode 100644
index e24d774c..00000000
--- a/world/map/npc/021-1/eurni.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-
-021-1.gat,141,113,0|script|Eurni|136
-{
-    set @halloween_npc_id, $@halloween_npc_eurni;
-    callfunc "TrickOrTreat";
-
-    if (BaseLevel < 10) goto L_TooYoung;
-    if (Zeny < 10000) goto L_NoMoney;
-
-    mes "[Eurni the Surgeon]";
-    mes "\"Are you tired of being what you are?\"";
-    next;
-
-    mes "[Eurni the Surgeon]";
-    mes "\"Would you maybe be interested in a sex change?\"";
-    next;
-
-    mes "[Server]";
-    mes "Warning: All characters under this login will be changed. Once it's done, you will be kicked from the server. Don't panic, as everything is fine.";
-    next;
-    menu
-        "Please do, my dear...", L_Change,
-        "Leave alone my family treasure!", L_Close;
-
-L_Change:
-    if (Zeny < 10000)
-        goto L_NoMoney;
-    set Zeny, Zeny - 10000;
-    changesex;
-    close;
-
-L_TooYoung:
-    mes "[Eurni the Surgeon]";
-    mes "\"Move along, kid.\"";
-    close;
-
-L_NoMoney:
-    mes "[Eurni the Surgeon]";
-    mes "\"You don't have enough to pay for my services.\"";
-    close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
deleted file mode 100644
index 752718e8..00000000
--- a/world/map/npc/021-1/gate_guards.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-// Various guards at gates
-
-// Guards by the gates to the port
-021-1.gat,70,23,0|script|Guard#port1|104
-{
-    mes "[Guard]";
-    mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
-    close;
-}
-
-021-1.gat,110,23,0|script|Guard#port2|104
-{
-    mes "[Guard]";
-    mes "\"You wouldn't believe the refuse that comes in from the docks.\"";
-    close;
-}
-
-// Guard near the magic school
-021-1.gat,46,65,0|script|Guard#school|104
-{
-    mes "[Guard]";
-    mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
-    close;
-}
-
-// Guards by the gates to East Tulimshar
-021-1.gat,146,23,0|script|Guard#east1|104
-{
-    mes "[Guard]";
-    mes "\"I make sure less desirables don't enter the Noble District.\"";
-    close;
-}
-021-1.gat,156,42,0|script|Guard#east2|104
-{
-    mes "[Guard]";
-    mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
-    close;
-}
-
-021-1.gat,156,95,0|script|Guard#east3|104
-{
-    mes "[Guard]";
-    mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\"";
-    close;
-}
-
-// Near the bazaar, outside the government building
-021-1.gat,55,136,0|script|Guard#govt_out|123
-{
-    mes "[Guard]";
-    mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
-    close;
-}
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt
deleted file mode 100644
index 621f8468..00000000
--- a/world/map/npc/021-1/hideandseek.txt
+++ /dev/null
@@ -1,385 +0,0 @@
-// Children playing Hide and Seek
-// QUEST_NorthTulimshar
-// BYTE 0
-// Bit 0: started quest at Ayasha
-// Bit 1 - 5: found one of the kids each
-// Bit 6: talked to Ayasha after finding all kids
-// Bit 7: unused
-// Author: Jenalya
-
--|script|#hideandseekNTconfig|-1
-{
-    end;
-
-OnInit:
-    set $@hideandseekNT_started, (1 << 0);
-    set $@hideandseekNT_found1, (1 << 1);
-    set $@hideandseekNT_found2, (1 << 2);
-    set $@hideandseekNT_found3, (1 << 3);
-    set $@hideandseekNT_found4, (1 << 4);
-    set $@hideandseekNT_found5, (1 << 5);
-    set $@hideandseekNT_ended, (1 << 6);
-    end;
-}
-021-1.gat,89,66,0|script|AyashaDebug|258
-{
-    mes "[Ayasha Debug]";
-    menu
-        "Show", L_Show,
-        "Reset", L_Reset,
-        "Close.", L_Close;
-
-L_Show:
-    set @state, ((QUEST_NorthTulimshar & BYTE_0_MASK) >> BYTE_0_SHIFT);
-    mes "State: " + @state;
-    if (QUEST_NorthTulimshar & $@hideandseekNT_started)
-        mes "Start set";
-    if (QUEST_NorthTulimshar & $@hideandseekNT_found1)
-        mes "Found 1 set";
-    if (QUEST_NorthTulimshar & $@hideandseekNT_found2)
-        mes "Found 2 set";
-    if (QUEST_NorthTulimshar & $@hideandseekNT_found3)
-        mes "Found 3 set";
-    if (QUEST_NorthTulimshar & $@hideandseekNT_found4)
-        mes "Found 4 set";
-    if (QUEST_NorthTulimshar & $@hideandseekNT_found5)
-        mes "Found 5 set";
-    if (QUEST_NorthTulimshar & $@hideandseekNT_ended)
-        mes "Complete set";
-    goto L_Close;
-
-L_Reset:
-    set QUEST_NorthTulimshar, 0;
-    goto L_Close;
-
-L_Close:
-    close;
-
-OnInit:
-    if (!debug)
-        disablenpc "AyashaDebug";
-    end;
-}
-021-1.gat,87,66,0|script|Ayasha|258
-{
-    set @child_number, 0;
-    callfunc "XmasList";
-
-    set @state, ((QUEST_NorthTulimshar & BYTE_0_MASK) >> BYTE_0_SHIFT);
-
-    set @EXP, 75;
-
-    if (@state > 63) goto L_Done;
-    if (@state == 63) goto L_Reward;
-    if (@state > 0) goto L_Doing;
-
-    mes "You see a girl who is holding her hands in front of her face.";
-    mes "[Ayasha]";
-    mes "\"98... 99... 100!\"";
-    mes "She takes away her hands and looks up.";
-    menu
-        "Hello, what are you doing?",L_Next,
-        "(Leave)",L_Close;
-
-L_Next:
-    mes "[Ayasha]";
-    mes "\"I'm playing hide and seek with my friends!";
-    mes "Do you want to play with us?\"";
-    menu
-        "Sure, sounds like fun.",L_Next1,
-        "I'm busy with more important things!",L_Close;
-
-L_Next1:
-    mes "[Ayasha]";
-    mes "\"Great! You can take my turn with searching. You need to find all five of my friends.";
-    mes "They're hiding somewhere in the city, you will have to explore to find them. They could be hiding anywhere.\"";
-
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_started;
-    goto L_Close;
-
-L_Doing:
-    mes "[Ayasha]";
-    mes "\"You still need to find some of my friends. There are five of them.";
-    mes "Remember, they're hiding somewhere in the city, you will have to explore to find them. They could be hiding anywhere.\"";
-    goto L_Close;
-
-L_Reward:
-    mes "[Ayasha]";
-    mes "\"Oh, you found them all! Good job! Now it's my turn with searching again. Go and hide!\"";
-    getexp @EXP, 0;
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_ended;
-    menu
-        "I think I need to do other things now.",L_Next2;
-
-L_Next2:
-    mes "[Ayasha]";
-    mes "\"Oh, ok.";
-    mes "Have you already seen the bazaar? It's a very exciting place! I love the entertainer. She can make so many funny faces.\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Ayasha]";
-    mes "\"Hello! It was fun to play with you.";
-    mes "When you go to the bazaar, you can say hello to Mikhail. He's very nice! But very shy.\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    set @EXP, 0;
-    close;
-}
-
-022-1.gat,112,23,0|script|Latif|262
-{
-    set @child_number, 1;
-    callfunc "XmasList";
-    set @state, ((QUEST_NorthTulimshar & BYTE_0_MASK) >> BYTE_0_SHIFT);
-
-    set @EXP, 15;
-
-    if (@state > 63) goto L_Done;
-    if ((@state > 0) && !(QUEST_NorthTulimshar & $@hideandseekNT_found1)) goto L_Find;
-    if (@state > 0) goto L_Doing;
-
-    mes "You see a kid hiding behind a box.";
-    menu
-        "What are you doing there?",L_Next,
-        "(Leave)",L_Close;
-
-L_Next:
-    mes "[Latif]";
-    mes "\"Hiding. We're playing hide and seek. Don't say that is boring. It's fun.\"";
-    menu
-        "I agree, it's fun.",L_Agree,
-        "Hide and seek? Lame.",L_Next1;
-
-L_Next1:
-    mes "[Latif]";
-    mes "\"My friend Vincent thinks so too. He doesn't want to join us playing. Do you know what he does instead?";
-    mes "He builds action figures out of Bug Legs! That is lame.\"";
-    goto L_Close;
-
-L_Agree:
-    mes "[Latif]";
-    mes "\"Yeah, right? My friend Vincent doesn't thinks so. He doesn't want to join us playing. Do you know what he does instead?";
-    mes "He builds action figures out of Bug Legs! That is lame.\"";
-    goto L_Close;
-
-L_Find:
-    mes "[Latif]";
-    mes "\"Hey! Ah, you found me. Well done. But my hiding place wasn't that difficult this time.\"";
-    getexp @EXP, 0;
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_found1;
-    next;
-    mes "\"Here, do you want a candy?\"";
-    getitem "Candy", 1;
-    goto L_Close;
-
-L_Doing:
-    mes "[Latif]";
-    mes "\"You didn't find all of us yet? Seems like the other ones found a better place to hide.\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Latif]";
-    mes "\"Inside the building in the Northeastern market, there is a workshop. My father works there and wants me to do that too when I'm grown up. But I don't want do that! I want to go on an adventure! Just like you.\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    set @EXP, 0;
-    close;
-}
-
-001-1.gat,39,33,0|script|Charda|260
-{
-    set @child_number, 2;
-    callfunc "XmasList";
-    set @state, ((QUEST_NorthTulimshar & BYTE_0_MASK) >> BYTE_0_SHIFT);
-
-    set @EXP, 15;
-
-    if (@state > 63) goto L_Done;
-    if ((@state > 0) && !(QUEST_NorthTulimshar & $@hideandseekNT_found2)) goto L_Find;
-    if (@state > 0) goto L_Doing;
-
-    mes "[Charda]";
-    mes "\"Hello. Psht, be careful. I'm playing hide and seek with Ayasha. You'll draw attention to my hiding place.\"";
-    next;
-    mes "\"They will never find me in the bazaar. Ian is here, he helps all those adventurers that come here.\"";
-    goto L_Close;
-
-L_Find:
-    mes "[Charda]";
-    mes "\"Oh! Got me! You're good at this.\"";
-    getexp @EXP, 0;
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_found2;
-    next;
-    mes "She takes something out of her pocket.";
-    mes "[Charda]";
-    mes "\"I'm hungry now. Do you want chocolate too?\"";
-    getitem "ChocolateBar", 1;
-    next;
-    mes "\"My mom doesn't want me to eat so much chocolate, but I got it from the trader on the bazaar. He sells many different things.";
-    mes "I convinced him to teach me how to trade. It's fun.\"";
-    goto L_Close;
-
-L_Doing:
-    mes "[Charda]";
-    mes "\"Did you find the others yet?\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Charda]";
-    mes "\"Hey! We're still playing hide and seek. What are you going to do? Will you go to Hurnscald with the ferry? The mother of my friends Rossy and Julia come from there. They are on a vacation there at the moment.\"";
-    next;
-    mes "\"Rossy told me that it's a very beautiful place. Lots of trees and flowers and grass, everything's green.\"";
-    mes "She sighs.";
-    mes "[Charda]";
-    mes "\"Sounds wonderful.\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    set @EXP, 0;
-    close;
-}
-
-021-1.gat,78,87,0|script|Faris|259
-{
-    set @child_number, 3;
-    callfunc "XmasList";
-    set @state, ((QUEST_NorthTulimshar & BYTE_0_MASK) >> BYTE_0_SHIFT);
-
-    set @EXP, 25;
-
-    if (@state > 63) goto L_Done;
-    if ((@state > 0) && !(QUEST_NorthTulimshar & $@hideandseekNT_found3)) goto L_Find;
-    if (@state > 0) goto L_Doing;
-
-    mes "[Faris]";
-    mes "\"Oh, hi there. What are you doing here on the roof?\"";
-    menu
-        "I'm just having a look around.",L_Next,
-        "It's nice place here, isn't it?",L_Next;
-
-L_Next:
-    mes "[Faris]";
-    mes "\"He, you're cool. I'm hiding here from Ayasha, we're playing hide and seek. This is the best hiding place ever.\"";
-    goto L_Close;
-
-L_Find:
-    mes "[Faris]";
-    mes "\"You found me! Well done. You look a bit thirsty, here.\"";
-    getexp @EXP, 0;
-    getitem "CactusDrink", 1;
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_found3;
-    next;
-    mes "\"It's really cool you're playing with us. I'm sure you have a lot of other things to do.";
-    mes "You're an adventurer, right? I want to become an adventurer too when I'm grown up. I'll talk to Aidan then.\"";
-    next;
-    mes "\"Aidan is on the bazaar and you can register there for monster points. That's something the Wizard's Council made up. They reward you for slaying monsters. It's so cool.\"";
-    goto L_Close;
-
-L_Doing:
-    mes "[Faris]";
-    mes "\"Are you still searching for the others? Nobody else is up here.\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Faris]";
-    mes "\"I'll go to the bazaar and ask Bernard for some soup when we're done with playing. His soup is delicious!\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    set @EXP, 0;
-    close;
-}
-
-022-1.gat,28,34,0|script|Rasin|263
-{
-    set @child_number, 4;
-    callfunc "XmasList";
-    set @state, ((QUEST_NorthTulimshar & BYTE_0_MASK) >> BYTE_0_SHIFT);
-
-    set @EXP, 15;
-
-    if (@state > 63) goto L_Done;
-    if ((@state > 0) && !(QUEST_NorthTulimshar & $@hideandseekNT_found4)) goto L_Find;
-    if (@state > 0) goto L_Doing;
-
-    mes "[Rasin]";
-    mes "\"The harbor is to the East from here. There you can take a ferry to other places.";
-    mes "And now go away, I'm playing hide and seek and Ayasha shouldn't see me here. You'll draw her attention when you talk to me.\"";
-    goto L_Close;
-
-L_Find:
-    mes "[Rasin]";
-    mes "\"Ah, you found me. I need to find a better place to hide next time.\"";
-    getexp @EXP, 0;
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_found4;
-    goto L_Close;
-
-L_Doing:
-    mes "[Rasin]";
-    mes "\"Hehe, I'm curious when you'll have found all of us.\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Rasin]";
-    mes "\"Thanks for playing with us! It was fun!";
-    mes "Will you leave Tulimshar to go on an adventure in other places of the world?\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    set @EXP, 0;
-    close;
-}
-
-068-1.gat,94,84,0|script|Ghada|265
-{
-    set @child_number, 5;
-    callfunc "XmasList";
-    set @state, ((QUEST_NorthTulimshar & BYTE_0_MASK) >> BYTE_0_SHIFT);
-
-    set @EXP, 15;
-
-    if (@state > 63) goto L_Done;
-    if ((@state > 0) && !(QUEST_NorthTulimshar & $@hideandseekNT_found5)) goto L_Find;
-    if (@state > 0) goto L_Doing;
-
-    mes "You see a girl standing behind the a tree. She has a look of intense concentration on her face.";
-    menu
-        "Hi, what are you doing there?",L_Next,
-        "(Leave)",L_Close;
-
-L_Next:
-    mes "[Ghada]";
-    mes "\"Oh, hello. I'm hiding. We're playing hide and seek.\"";
-    goto L_Close;
-
-L_Find:
-    mes "[Ghada]";
-    mes "\"Oh no! You found me! You must be very clever.";
-    mes "My friend Sandra is clever too, but she said it's a waste of time to play hide and seek.\"";
-    getexp @EXP, 0;
-    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@hideandseekNT_found5;
-    goto L_Close;
-
-L_Doing:
-    mes "[Ghada]";
-    mes "\"Are you still searching for the others? I'm sure you'll find them soon.\"";
-    goto L_Close;
-
-L_Done:
-    mes "[Ghada]";
-    mes "\"It's so nice that you played with us! You're about the same age as my older sister, but she never plays with us. Her name is Sarah.\"";
-    goto L_Close;
-
-L_Close:
-    set @state, 0;
-    set @EXP, 0;
-    close;
-}
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
deleted file mode 100644
index 1c280253..00000000
--- a/world/map/npc/021-1/imec.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-// Merchant got his shop shot down due to selling poison and asks the player for some errand
-// after finishing this, daily quest with scorpion stingers
-// Using bit 8 and 9 of QUEST_NorthTulimshar (first half of nibble 2)
-// author: Jenalya
-021-1.gat,120,31,0|script|Imec|162
-{
-    set @state, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
-    set @money, 500;
-
-    if (@state >= 3) goto L_Stingers;
-    if (@state == 2) goto L_Return;
-    if (@state == 1) goto L_Bring;
-
-    mes "[Imec]";
-    mes "\"The Wizard's Council shut down my shop!";
-    mes "They said I was selling illegal things, but what's so illegal about poison?\"";
-    next;
-    mes "\"Anyway, I hope to get a merchant's permit again... One of these days...\"";
-    mes "He looks at you.";
-    next;
-    mes "[Imec]";
-    mes "\"You can do an errand for me. I just finished writing a petition to the Council about my shop.";
-    mes "If you bring it to the government building near the bazaar, I'll give you a small reward.\"";
-    goto L_Offer;
-
-L_Offer:
-    menu
-        "What is in that government building and where is it?",L_Explain,
-        "Ok, sounds good.",L_Next,
-        "No!",L_Close;
-
-L_Next:
-    mes "[Imec]";
-    mes "\"Very good. Here is the paper.\"";
-    mes "Imec gives you a sealed letter. You put it away in a pocket separated from your inventory, so it won't get lost.";
-    set @state, 1;
-    callsub S_Update_Mask;
-    goto L_Close;
-
-L_Explain:
-    mes "[Imec]";
-    mes "\"Follow the road to the south past the bakery, then go west when you reach the town walls. It's right before the gate to the bazaar.\"";
-    next;
-    mes "\"In the building there are several offices. If you want to join or form a party, you have to pay your taxes there first.\"";
-    next;
-    mes "\"So, will you bring my petition to the office in that building?\"";
-    if (@state == 0)
-        goto L_Offer;
-    goto L_Close;
-
-L_Bring:
-    mes "[Imec]";
-    mes "\"What are you waiting for? Bring my petition to the government building.\"";
-    menu
-        "Where is it again?",L_Explain,
-        "I'm on my way.",L_Close;
-
-L_Return:
-    mes "[Imec]";
-    mes "\"Ah, you're back.\"";
-    mes "You hand the letter of acknowledgement over to Imec.";
-    next;
-    mes "[Imec]";
-    mes "\"Very well. I'm sure I'll be able to open my shop again soon.\"";
-    next;
-    mes "It seems Imec doesn't notice you anymore.";
-    menu
-        "You mentioned a reward.",L_Next1;
-
-L_Next1:
-    mes "[Imec]";
-    mes "\"What? Ah, right. Here, have this.\"";
-    set Zeny, Zeny + @money;
-    set @state, 3;
-    callsub S_Update_Mask;
-    next;
-    mes "\"Actually, you could be of further help to me.\"";
-    next;
-    goto L_Stingers;
-
-L_Stingers:
-    mes "[Imec]";
-    set @dq_level, 10;
-    set @dq_cost, 3;
-    set @dq_count, 3;
-    set @dq_name$, "ScorpionStinger";
-    set @dq_friendly_name$, "Scorpion Stingers";
-    set @dq_money, 200;
-    set @dq_exp, 40;
-
-    callfunc "DailyQuest";
-    goto L_Close;
-
-L_Close:
-    set @money, 0;
-    set @state, 0;
-
-    set @dq_level, 0;
-    set @dq_cost, 0;
-    set @dq_count, 0;
-    set @dq_name$, "";
-    set @dq_friendly_name$, "";
-    set @dq_money, 0;
-    set @dq_exp, 0;
-    set @dq_return, 0;
-    close;
-
-S_Update_Mask:
-    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_4_MASK)) | (@state << TWOBIT_4_SHIFT);
-    return;
-}
diff --git a/world/map/npc/021-1/inac.txt b/world/map/npc/021-1/inac.txt
deleted file mode 100644
index b2ed01bd..00000000
--- a/world/map/npc/021-1/inac.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-
-021-1.gat,53,103,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/021-1/mapflags.txt b/world/map/npc/021-1/mapflags.txt
deleted file mode 100644
index ffa56dfe..00000000
--- a/world/map/npc/021-1/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-021-1.gat|mapflag|town
-021-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
deleted file mode 100644
index 3211b2b8..00000000
--- a/world/map/npc/021-1/north_shops.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Northern shopping plaza
-
-// More high-end stuff to satisfy the richer people in Royal Tulimshar
-
-// Some clothing
-021-1.gat,135,36,0|shop|Inar|108,CottonShirt:*300,CottonShorts:*1000,CottonBoots:*2000,CottonHeadband:*3000
-
-021-1.gat,129,40,0|script|Well|400
-{
-    callfunc "WaterBottle";
-    end;
-}
-
-// An officer (for security)
-021-1.gat,128,37,0|script|Officer|150
-{
-    mes "[Officer]";
-    mes "I'm here for extra security for this market.";
-    close;
-}
diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt
deleted file mode 100644
index 50d18a6a..00000000
--- a/world/map/npc/021-1/npcs.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-
-021-1.gat,77,42,0|script|Jeric|214
-{
-    set @npcname$, "Jeric";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"My father is an adventurer.\"";
-    next;
-    mes "\"After he proved himself around town, the guards let him fight monsters in the Sandstorm mine.\"";
-    set @npcname$, "";
-    close;
-}
-
-021-1.gat,76,67,0|script|Silvia|207
-{
-    set @npcname$, "Silvia";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"If you follow the road west, then south, you will arrive at the Bazaar in Southern Tulimshar.\"";
-    next;
-    mes "\"If you go west, then north, you'll see the Wizard Academy my parents just sent me to.\"";
-    next;
-    mes "\"The Academy is good, but I wish I had more free time. It takes a lot of intelligence to get what the teachers are talking about.\"";
-    set @npcname$, "";
-    close;
-}
-
-021-1.gat,51,123,0|script|Michel|215
-{
-    set @npcname$, "Michel";
-
-    mes "[" + @npcname$ + "]";
-    mes "\"Elanore is a magician in Southern Tulimshar that helps young adventurers by healing their battle wounds. When they are experienced enough, she stops healing them.\"";
-    next;
-    mes "\"You can find her by going through the Bazaar and to the East.\"";
-    set @npcname$, "";
-    close;
-}
diff --git a/world/map/npc/021-1/pauline.txt b/world/map/npc/021-1/pauline.txt
deleted file mode 100644
index c2884c19..00000000
--- a/world/map/npc/021-1/pauline.txt
+++ /dev/null
@@ -1,307 +0,0 @@
-//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.
-
-021-1.gat,55,66,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 "021-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 "021-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;
-}
-
-021-1.gat,53,66,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/021-1/sewer_east.txt b/world/map/npc/021-1/sewer_east.txt
deleted file mode 100644
index 4a0b22d8..00000000
--- a/world/map/npc/021-1/sewer_east.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// The Sewer Grate
-
-021-1.gat,145,136,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/021-1/sewer_north.txt b/world/map/npc/021-1/sewer_north.txt
deleted file mode 100644
index 9c4ed277..00000000
--- a/world/map/npc/021-1/sewer_north.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// The Sewer Grate
-
-021-1.gat,124,41,0|script|#tulimsharsewer1|45,0,0
-{
-    mes "Descend into the sewers?";
-    next;
-    menu
-        "Yes.", L_Sewer,
-        "Nevermind.", L_Close;
-
-L_Sewer:
-    warp "021-3",125,35;
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/021-1/sewer_west.txt b/world/map/npc/021-1/sewer_west.txt
deleted file mode 100644
index b629c342..00000000
--- a/world/map/npc/021-1/sewer_west.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// The Sewer Grate
-
-021-1.gat,52,104,0|script|#tulimsharsewer3|45,0,0
-{
-    mes "Descend into the sewers?";
-    next;
-    menu
-        "Yes.", L_Sewer,
-        "Nevermind.", L_Close;
-
-L_Sewer:
-    warp "021-3",57,101;
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/021-1/weellos.txt b/world/map/npc/021-1/weellos.txt
deleted file mode 100644
index 9f34e6a5..00000000
--- a/world/map/npc/021-1/weellos.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-// A historian
-// takes part in quest given by 021-2/kylian.txt
-
-021-1.gat,130,125,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("021-1.gat", 130, 120, 140, 125) goto L_In;
-
-    mes "[Weellos]";
-    mes "\"This is a very historic building. One of the oldest in the area. It's been turned into a museum.\"";
-    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;
-}