Moving Tutorial from Tulimshar to Candor

10 files changed, 0 insertions, 807 deletions

diff --git a/world/map/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt
deleted file mode 100644
index 0c712a7c..00000000
--- a/world/map/npc/042-1/_import.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Map 042-1: Tulimshar Suburbs
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 042-1.gat
-npc: npc/042-1/_mobs.txt
-npc: npc/042-1/_warps.txt
-npc: npc/042-1/hasan.txt
-npc: npc/042-1/kaan.txt
-npc: npc/042-1/liana.txt
-npc: npc/042-1/mapflags.txt
-npc: npc/042-1/tutorial.txt
-npc: npc/042-1/valon.txt
-npc: npc/042-1/zegas.txt
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
deleted file mode 100644
index 1482fefa..00000000
--- a/world/map/npc/042-1/_mobs.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Suburbs mobs
-
-042-1.gat,101,69,31,15|monster|Maggot|1002,5,100000ms,30000ms,Mob042-1::On1002
-042-1.gat,65,59,27,15|monster|Maggot|1002,7,100000ms,30000ms,Mob042-1::On1002
-042-1.gat,68,102,7,8|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
-042-1.gat,98,88,5,8|monster|Scorpion|1003,4,100000ms,30000ms,Mob042-1::On1003
-042-1.gat,63,63,37,30|monster|TameScorpion|1046,6,100000ms,30000ms,Mob042-1::On1046
-042-1.gat,85,102,5,8|monster|Scorpion|1003,5,100000ms,30000ms,Mob042-1::On1003
-042-1.gat,98,99,5,5|monster|Scorpion|1003,3,100000ms,30000ms,Mob042-1::On1003
-042-1.gat,82,87,6,3|monster|Scorpion|1003,2,100000ms,30000ms,Mob042-1::On1003
-042-1.gat,70,88,5,8|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
-042-1.gat,80,35,11,5|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
-
-
-042-1.gat,0,0,0|script|Mob042-1|-1
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1003:
-    set @mobID, 1003;
-    callfunc "MobPoints";
-    end;
-
-On1009:
-    set @mobID, 1009;
-    callfunc "MobPoints";
-    end;
-
-On1046:
-    set @mobID, 1046;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
deleted file mode 100644
index bf32dc06..00000000
--- a/world/map/npc/042-1/_warps.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Suburbs warps
-
-042-1.gat,97,41|warp|To Tulismhar Docks|-1,2,022-1.gat,21,37
-042-1.gat,65,20|warp|To Lighthouse Beach|0,-1,023-1.gat,64,143
-042-1.gat,91,72|warp|To Store House|-1,-1,042-2.gat,22,92
-042-1.gat,104,72|warp|To Store House|-1,-1,042-2.gat,44,92
-042-1.gat,65,74|warp|To Tulimshar Suburbs Ho|-1,-1,042-2.gat,29,61
-042-1.gat,62,42|warp|To Sorfina's Dinner|-1,-1,042-2.gat,112,85
-042-1.gat,51,43|warp|To Sorfina's House|-1,-1,042-2.gat,44,30
-042-1.gat,117,101|warp|To Magic School Researc|-1,-1,042-2.gat,103,62
-042-1.gat,112,95|warp|To Magic School Researc|-1,-1,042-2.gat,94,54
-042-1.gat,120,95|warp|To Magic School Researc|-1,-1,042-2.gat,112,54
-042-1.gat,117,85|warp|To Tulismhar Docks|-1,-1,022-1.gat,41,82
-042-1.gat,44,115|warp|To Tulismhar Outskirts|1,-1,041-1.gat,58,6
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
deleted file mode 100644
index 734e0df0..00000000
--- a/world/map/npc/042-1/hasan.txt
+++ /dev/null
@@ -1,228 +0,0 @@
-// This file is part of the Tutorial
-// Authors: Jenalya, alastrim
-// Hasan should be threatening someone else you come to help
-// Going to throw someone off a cliff
-// npctalk 2 NPCs Hasan talks about giving someone a short trip to Docks
-// They respond by asking play for help
-// Hasan tells them to but out of it.
-
-042-1.gat,104,49,0|script|Scared Man|160
-{
-    setarray @npc_loc, 104, 49, 4;
-    callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_End;
-    if (@tutorial >= 13)
-        goto L_TutDone;
-    message strcharinfo(0), "He looks too afraid to say anything.";
-    goto L_End;
-
-L_TutDone:
-    message strcharinfo(0), "Thanks. Kaan's been much nicer to me now";
-    goto L_End;
-
-L_End:
-    end;
-}
-042-1.gat,102,49,0|script|Hasan|189,2,2
-{
-    setarray @npc_loc, 102, 49, 4;
-    callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Close;
-    goto L_Main;
-
-L_Main:
-    callfunc "TutorialState";
-    if ((getcharid(3) == $@ScorpionFighter) || ($@ScorpionFighter && $@ScorpionFighter != getcharid(3)))
-        goto L_Afraid;
-    if (@tutorial == 14)
-        goto L_TutDone;
-    if (@tutorial == 13)
-        goto L_Thank;
-    if (@tutorial == 12)
-        goto L_Trick;
-    if ((@tutorial == 9) || (@tutorial == 10) || (@tutorial == 11))
-        goto L_FightAgain;
-
-    mes "You over hear some people nearby.";
-    mes "[Unfriendly Guy]";
-    mes "\"I told you if you didn't get the money, I'd give you flying lessons, Haha!\"";
-    next;
-    mes "[Scared Man]";
-    mes "\"But the only person I need protection from is you.\"";
-    next;
-    mes "[Unfriendly Guy]";
-    mes "\"Thats why the price is so high.\"";
-    next;
-    mes "\"Because I'm the toughest person in all of Tulimshar\"";
-    next;
-    mes "[Scared Man]";
-    mes "\"No, your just a mean bully. Wait till I tell the gaurds about this!\"";
-    next;
-    mes "[Unfriendly Guy]";
-    mes "\"You do that and the next flying lesson will be from the beach cliffs.\"";
-    next;
-    mes "[Scared Man]";
-    mes "\"No, please don't. *sob*\"";
-    next;
-    mes "Sounds like this person is in trouble.\"";
-    next;
-    set @tutorial_tmp, 9;
-    callfunc "SetTutorialMask";
-    mes "[Unfriendly Guy]";
-    mes "\"What are you looking at?\"";
-    menu
-        "What ever you call maggot slime scrapped off a boat after a walk through the sewers.\"", L_Fight,
-        "Who me? I saw nothing, just passing by.", L_Close;
-
-L_FightAgain:
-    mes "[Hasan]";
-    mes "\"Have you come back for a thrashing?\"";
-    menu
-        "No.", L_Close,
-        "Yes.", L_Fight;
-
-L_Fight:
-    mes "[Hasan]";
-    mes "\"Do you really think you can beat me?\"";
-    mes "He pulls out a nasty looking dagger and stabs it in your direction.";
-    set Hp, 1;
-    next;
-    mes "That hurt! You begin to think searching for a different solution might be healthier.";
-    mes "Maybe Kaan can help?";
-    goto L_Close;
-
-L_Trick:
-    mes "[Hasan]";
-    mes "\"Have you come back for another thrashing?\"";
-    menu
-        "No.",L_Close,
-        "Yes, yours! (Scratch your head.)",L_ScratchHead;
-
-L_ScratchHead:
-    if ($@ScorpionFighter)
-        goto L_Wait;
-    set @tutorial_tmp, 14;
-    callfunc "SetTutorialMask";
-    set $@ScorpionTimer, 0;
-    set $@ScorpionFighter, getcharid(3);
-    set $@ScorpDeath, PC_DIE_COUNTER;
-    cmdothernpc "#ScorpionTrigger", "HasanSpawn";
-    mes "While you're scratching your head, you see Kaan approaching the fence.";
-    close;
-
-L_Thank:
-    mes "[Hasan]";
-    mes "\"You - you saved me!";
-    mes "I was mean to people, but you still saved me!\"";
-    next;
-    mes "\"Hey, you're a really cool person.";
-    mes "I mean, the way you finished that ghastly scorpion!";
-    mes "Amazing!\"";
-    next;
-    mes "\"Let me tell you something, I will no longer bully people.";
-    mes "And you can have my Sharp Knife.\"";
-    getitem "SharpKnife", 1;
-    set @tutorial_tmp, 14;
-    callfunc "SetTutorialMask";
-    next;
-    mes "\"You want to go to the bazaar, right? Shall I tell you how to get there?\"";
-    menu
-        "Sure, thanks.",L_HasanThanks,
-        "I'll try to find the way myself.",L_Explore;
-
-L_HasanThanks:
-    mes "[Hasan]";
-    mes "\"Ok, when you leave here follow the road past the docks until you reach the old city gates.\"";
-    next;
-    mes "\"Pass through them and at the crossway, just go west and then south until you reach some other gateway.\"";
-    next;
-    mes "\"Behind it there is the bazaar of Tulimshar.\"";
-    goto L_Close;
-
-L_Explore:
-    mes "[Hasan]";
-    mes "\"Alright. Take care!\"";
-    goto L_Close;
-
-L_TutDone:
-    mes "[Hasan]";
-    mes "\"You didn't see anything. I tell you what I'll be nicer if you don't tell anyone?\"";
-    menu
-        "As long as you learned your lesson.", L_TutCont;
-
-L_TutCont:
-    mes "\"I have, I promise not to bully people anymore. It's not fun being scared.\"";
-    goto L_Close;
-
-L_Wait:
-    mes "There is a scorpion near Hasan already. I think Kaan is helping someone else... Maybe I should try the plan later.";
-    goto L_Close;
-
-L_Afraid:
-    message strcharinfo(0), "Hasan: \"" + strcharinfo(0) + "! Please help me!\"";
-    end;
-
-L_Close:
-    close;
-
-OnTouch:
-    if (@tutorial >= 13)
-        end;
-    goto L_Main;
-}
-042-1.gat,0,0,0|script|#ScorpionTrigger|35
-{
-    end;
-
-OnCommandHasanSpawn:
-    goto L_Summon;
-
-L_Summon:
-    monster "042-1.gat",102,49,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath";
-    initnpctimer;
-    end;
-
-L_SummonAgain:
-    message strcharinfo(0), "Kaan is mad at you for your interference! He walks over to the edge of the fence and throws a rock on top of your head, then lets another scorpion run just near Hasan!";
-    percentheal -100, 0;
-    goto L_Summon;
-
-OnTimer5000:
-    if (attachrid($@ScorpionFighter) == 0)
-        goto L_Clean;
-    set $@ScorpionTimer, $@ScorpionTimer + 5;
-    if ($@ScorpionTimer >= 300)
-        goto L_TimeOut;
-    if (PC_DIE_COUNTER > $@ScorpDeath)
-        goto L_MessageDeath;
-    setnpctimer 0;
-    end;
-
-OnScorpionDeath:
-    if (getcharid(3) != $@ScorpionFighter)
-        goto L_SummonAgain;
-    if (@tutorial != 12)
-        goto L_Clean;
-    set @tutorial_tmp, 13;
-    callfunc "SetTutorialMask";
-    message strcharinfo(0), "You saved Hasan.";
-    goto L_Clean;
-
-L_TimeOut:
-    message strcharinfo(0), "Hasan, with his eyes almost closed, trembling with fear, runs toward the scorpion and stabs it with all his strength!";
-    goto L_Clean;
-
-L_MessageDeath:
-    message strcharinfo(0), "Ouch... I should be more careful when fighting these monsters.";
-    goto L_Clean;
-
-L_Clean:
-    killmonster "042-1.gat", "#ScorpionTrigger::OnScorpionDeath";
-    set $@ScorpionFighter, 0;
-    set $@ScorpionTimer, 0;
-    set $@ScorpDeath, 0;
-    stopnpctimer;
-    end;
-}
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
deleted file mode 100644
index 92067c41..00000000
--- a/world/map/npc/042-1/kaan.txt
+++ /dev/null
@@ -1,144 +0,0 @@
-// This file is part of the Tutorial
-// Author: Jenalya
-
-042-1.gat,109,87,0|script|Kaan|160
-{
-    setarray @npc_loc, 109, 87, 4;
-    callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Close;
-
-    callfunc "TutorialState";
-    if (!(@kaan_talked)) goto L_Tanisha;
-    if (@tutorial >= 13) goto L_TutDone;
-    if (@tutorial == 12) goto L_Plan;
-    if (@tutorial == 11) goto L_TrickKnown;
-    if (@tutorial == 10) goto L_Trick;
-    if (@tutorial == 9) goto L_Hasan;
-    goto L_Out;
-
-L_Tanisha:
-    set STARTAREA, STARTAREA | $@SpokeToKaan;
-    mes "[Young Man]";
-    mes "\"You're the person Tanisha brought here, right?";
-    mes "My name is Kaan, I'm her brother.\"";
-    next;
-    mes "\"She was babbling at me about it all the morning until I sent her to take care of the maggots in the storehouse.\"";
-    next;
-    mes "Kaan grins mischieviously.";
-    mes "[Kaan]";
-    mes "\"She hates maggots.\"";
-    next;
-    mes "\"Did you already talk to Tanisha?\"";
-    menu
-        "Yes, I helped her with the maggots.",L_Tanisha1,
-        "Yeah, and she's done with the maggots.",L_Tanisha1;
-
-L_Tanisha1:
-    mes "[Kaan]";
-    mes "\"Ah, that is good news.";
-    mes "You know, we have a lot of problems with bugs here.\"";
-    next;
-    mes "\"If we don't watch out the maggots will eat all of our stocks.";
-    mes "And the desert is crawling with scorpions.";
-    mes "They also come here and you need to watch out not to step on them.\"";
-    next;
-    mes "\"But I took care of that problem.\"";
-    mes "He looks very proud.";
-    next;
-    mes "\"I've trapped or slain many scorpians south of here to keep them out of our fields.\"";
-    next;
-    menu
-        "Impressive! Just a bit... skewed.",L_Next,
-        "Wow, it looks very - ahm, unconventional.",L_Next;
-
-L_Next:
-    mes "[Kaan]";
-    mes "\"Well, I keep the scorpions out. That's all that matters.\"";
-    next;
-    mes "\"Are you going to visit Tulimshar?";
-    mes "The bazaar there is a wondeful place! Traders, entertainers, adventurers - it's very exciting.\"";
-    next;
-    mes "\"And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\"";
-    goto L_Out;
-
-L_Out:
-    mes "[Kaan]";
-    mes "\"Hello! How are you? Did you already visit Tulimshar?\"";
-    menu
-        "Not yet.",L_Close;
-
-L_Hasan:
-    mes "[Kaan]";
-    mes "\"Hello! How are you? Did you already visit Tulimshar?\"";
-    menu
-        "A guy named Hasan is bullying someone.",L_Next1,
-        "Not yet.",L_Close;
-
-L_Next1:
-    mes "\"Hasan! That's crazy. He becomes more cheeky with every day.";
-    mes "I'd like to help you, but - I won't risk an open confrontation with him.\"";
-    next;
-    mes "\"Sometimes he just freaks out and then he's dangerous.";
-    mes "He might listen to one of the adult men, but they're all off to work in Tulimshar during the day.\"";
-    next;
-    mes "\"We should think about some kind of trick. Ah, if only I knew his weak point.\"";
-    set @tutorial_tmp, 10;
-    callfunc "SetTutorialMask";
-    next;
-    goto L_Trick;
-
-L_Trick:
-    mes "[Kaan]";
-    mes "\"Do you have any idea what Hasan's weakness could be?";
-    mes "I wonder if Sorfina or Tanisha know something about him that could help us.\"";
-    menu
-        "No idea.",L_Close;
-
-L_TrickKnown:
-    mes "[Kaan]";
-    mes "\"Do you have any idea what Hasan's weakness could be?";
-    menu
-        "He's afraid of scorpions.",L_Next2,
-        "No idea.",L_Close;
-
-L_Next2:
-    mes "[Kaan]";
-    mes "\"Scorpions?! Right! How could I forget?";
-    mes "When he was a child, he nearly died because he fell into a scorpion nest.\"";
-    set @tutorial_tmp, 12;
-    callfunc "SetTutorialMask";
-    next;
-    goto L_Explain;
-
-L_Explain:
-    mes "\"Ok, then here's the plan:";
-    mes "I will catch one of the scorpions behind the fences.\"";
-    next;
-    mes "\"You'll go to Hasan and give me a sign when you're ready.";
-    mes "Lets say the sign is that you're scratching your head.";
-    mes "I'll watch you from this point.\"";
-    next;
-    mes "\"When you give me the sign, I'll throw the scorpion on him.";
-    mes "I bet that will show him for the coward he really is.\"";
-    next;
-    mes "\"How's that? We can start as soon as you're ready.\"";
-    goto L_Close;
-
-L_Plan:
-    mes "[Kaan]";
-    mes "\"I'm ready. Just give me the sign when you're down there.";
-    mes "Or do you want me to explain the plan again?\"";
-    menu
-        "Yes please.",L_Explain,
-        "No, everything's alright.",L_Close;
-
-L_TutDone:
-    mes "[Kaan]";
-    mes "\"Hi there. I hope you enjoy your time in Tulimshar.";
-    mes "Hasan can be a real troublemaker, but it seems like he has calmed down for now.\"";
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/042-1/liana.txt b/world/map/npc/042-1/liana.txt
deleted file mode 100644
index c6df63a9..00000000
--- a/world/map/npc/042-1/liana.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-
-042-1.gat,82,96,0|script|Liana|205
-{
-    setarray @npc_loc, 82, 96, 4;
-    callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_End;
-    goto L_Talk;
-
-L_Talk:
-    mes "[Liana]";
-    mes "\"Tulimshar is a large city. I'm sure glad I live in the suburbs because I know where everything's at.\"";
-    next;
-    mes "\"I think Tanisha is in the building to the right. That girl is growing up fast.\"";
-    goto L_Close;
-
-L_End:
-    mes "You'll have to move closer";
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/042-1/mapflags.txt b/world/map/npc/042-1/mapflags.txt
deleted file mode 100644
index 3c0e8f71..00000000
--- a/world/map/npc/042-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-042-1.gat|mapflag|resave|042-2,26,26
diff --git a/world/map/npc/042-1/tutorial.txt b/world/map/npc/042-1/tutorial.txt
deleted file mode 100644
index bed98436..00000000
--- a/world/map/npc/042-1/tutorial.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-// This file is part of the Tutorial
-// Author: Jenalya
-// if you enter the tutorial area from outside, it is set to be already done
--|script|#TutorialConfig|-1
-{
-    end;
-
-OnInit:
-    set $@ScorpionFighter, 0;
-    set $@ScorpionTimer, 0;
-    set $@ScorpDeath, 0; 
-    set $@SpokeToKaan, (1 << 31);
-    end;
-}
-function|script|TutorialState
-{
-    callfunc "ClearVariables";
-    set @tutorial, ((STARTAREA & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
-    set @kaan_talked, (STARTAREA & $@SpokeToKaan);
-    return;
-}
-function|script|SetTutorialMask
-{
-    set STARTAREA, (STARTAREA & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
-    set @tutorial_tmp, 0;
-    return;
-}
-042-2.gat,21,26,0|script|TutDebug|154
-{
-    mes "[TutDebug]";
-    mes "Reset?";
-    menu
-        "Yes.",L_Reset,
-        "No.",L_End;
-
-L_Reset:
-    set TUT_var, 0;
-    set @tutorial_tmp, 0;
-    set STARTAREA, (STARTAREA & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
-    set STARTAREA, STARTAREA &~ $@SpokeToKaan;
-    mes "Reset!";
-    goto L_End;
-
-L_End:
-    end;
-
-OnInit:
-    if(!debug)
-        disablenpc "TutDebug";
-    end;
-}
-042-1.gat,63,47,0|script|#tutorialoutside|45,0,0
-{
-    callfunc "TutorialState";
-    if (@tutorial >= 8)
-        goto L_Warp;
-    goto L_ResetTutorial;
-
-L_ResetTutorial:
-    set @tutorial_tmp, 8;
-    callfunc "SetTutorialMask";
-    goto L_Warp;
-
-L_Warp:
-    warp "042-2.gat", 114, 92;
-    end;
-}
diff --git a/world/map/npc/042-1/valon.txt b/world/map/npc/042-1/valon.txt
deleted file mode 100644
index b50207a3..00000000
--- a/world/map/npc/042-1/valon.txt
+++ /dev/null
@@ -1,168 +0,0 @@
-// This file is part of the Tutorial
-// Author: Jenalya, Wushin
--|script|#ValonConfig|-1
-{
-    end;
-
-OnInit:
-    setarray $@ValonMob, 1002,1050,1046,1003;
-    setarray $@ValonMobName$, "Maggots","House Maggots","Tame Scorpions","Scorpion";
-    setarray $@ValonMobCnt, 10,5,3,1;
-    end;
-}
-function|script|ValonState
-{
-    set @valon_state, ((STARTAREA & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
-    set @valon_mob, 0;
-    if (@valon_state >= 2)
-        set @valon_mob, (@valon_state - 2);
-    set @valon_count, ((STARTAREA & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
-    return;
-}
-function|script|setValonMask
-{
-    set STARTAREA, (STARTAREA & ~(NIBBLE_1_MASK) | (@valon_tmp << NIBBLE_1_SHIFT));
-    set @valon_tmp, 0;
-    return;
-}
-function|script|ResetValonCntMask
-{
-    set STARTAREA, (STARTAREA & ~(NIBBLE_2_MASK) | (0 << NIBBLE_2_SHIFT));
-    return;
-}
-function|script|AddValonCntMask
-{
-    set @valon_tmp, (@valon_count + 1);
-    if (@valon_tmp > $@ValonMobCnt[@valon_mob])
-        set @valon_tmp, $@ValonMobCnt[@valon_mob];
-    set STARTAREA, (STARTAREA & ~(NIBBLE_2_MASK) | (@valon_tmp << NIBBLE_2_SHIFT));
-    set @valon_tmp, 0;
-    callfunc "ValonProgress";
-    return;
-}
-function|script|ValonProgress
-{
-    callfunc "ValonState";
-    if ((@valon_state > 1) && (@valon_state < 6))
-        message strcharinfo(0), $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob];
-    return;
-}
-042-1.gat,51,111,0|script|ValonDebug|156
-{
-    mes "[Valon Debug]";
-    mes "Reset?";
-    menu
-        "Yes.", L_Reset,
-        "No.", L_End;
-
-L_Reset:
-    set STARTAREA, (STARTAREA & ~(NIBBLE_1_MASK) | (0 << NIBBLE_1_SHIFT));
-    set STARTAREA, (STARTAREA & ~(NIBBLE_2_MASK) | (0 << NIBBLE_2_SHIFT));
-    mes "Reset!";
-    goto L_End;
-
-L_End:
-    end;
-
-OnInit:
-    if (!debug)
-        disablenpc "ValonDebug";
-    end;
-}
-042-1.gat,48,111,0|script|Valon|156
-{
-    setarray @npc_loc, 48, 111, 4;
-    callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Close;
-    callfunc "ValonState";
-    if (@valon_state >= 6)
-        goto L_QuestComplete;
-    if (@valon_start == 1)
-        goto L_QuestAskAgain;
-    if (@valon_count >= $@ValonMobCnt[@valon_mob])
-        goto L_NextMob;
-    if ((@valon_state >= 2) && (@valon_state < 6))
-        goto L_QuestStarted;
-    goto L_QuestAsk;
-
-L_QuestAskAgain:
-    mes "[Valon]";
-    mes "\"Hello, Adventurer! Have you come back to help?\"";
-    menu
-        "Yes. I will help with the desert beasts.", L_Accept,
-        "Maybe some other time.", L_Close;
-
-L_QuestAsk:
-    mes "[Valon]";
-    mes "\"Hello!";
-    mes "You're looking for adventures, right?\"";
-    next;
-    mes "\"But you shouldn't underestimate this desert, it is dangerous.\"";
-    next;
-    mes "\"It's crawling with scorpions, and the heat has overcome adventurers tougher than you are.\"";
-    next;
-    mes "\"I should know I gaurd this gate from all manner of desert beasts.\"";
-    next;
-    mes "\"Maybe you would like help and earn your stripes?\"";
-    next;
-    mes "\"The Council of Wizard's does offer a reward for helping...\"";
-    set @valon_tmp, 1;
-    callfunc "setValonMask";
-    callfunc "ResetValonCntMask";
-    menu
-        "YES!!! let me at them!", L_Accept,
-        "Maybe some other time.", L_Close;
-
-L_Accept:
-    set @valon_tmp, 2;
-    callfunc "setValonMask";
-    callfunc "ValonState";
-    goto L_NewMob;
-
-L_NextMob:
-    getexp 40, 0;
-    mes "\"I see you killed all the " + $@ValonMobName$[@valon_mob] + " needed.\"";
-    next;
-    mes "\"The Wizard's thank thee as well.\"";
-    set Zeny, Zeny + 25;
-    set @valon_tmp, (@valon_state + 1);
-    callfunc "setValonMask";
-    callfunc "ResetValonCntMask";
-    callfunc "ValonState";
-    next;
-    if (@valon_mob == getarraysize($@ValonMob))
-        goto L_QuestOver;
-    goto L_NewMob;
-
-L_NewMob:
-    mes "\"Let's see whats on the list. Ah ok, I need you to kill me " + $@ValonMobCnt[@valon_mob] + " " + $@ValonMobName$[@valon_mob] + "\"";
-    next;
-    mes "\"I'll be waiting here, come back and see after you've killed those mobs.\"";
-    goto L_Close;
-
-L_QuestStarted:
-    mes "[Valon]";
-    mes "Hail adventurer! You are well on your way to mastering the beasts of the desert.\"";
-    next;
-    mes "\"You need to kill " + $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob] + "\"";
-    next;
-    mes "\"Come back and see me when the job is done.\"";
-    goto L_Close;
-
-L_QuestOver:
-    mes "[Valon]";
-    mes "\"Thanks once again for helping with the monsters in the desert.\"";
-    getexp 50, 0;
-    set @valon_tmp, (@valon_state + 1);
-    callfunc "setValonMask";
-    goto L_Close;
-
-L_QuestComplete:
-    mes "[Valon]";
-    mes "\"Thanks once again for helping with the monsters in the desert.\"";
-    goto L_Close;
-
-L_Close:
-    close;
-}
diff --git a/world/map/npc/042-1/zegas.txt b/world/map/npc/042-1/zegas.txt
deleted file mode 100644
index 4a153ebe..00000000
--- a/world/map/npc/042-1/zegas.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-// Barrels
-// Author: Wushin
-// Npc
-042-1.gat,97,75,0|script|Zegas|165
-{
-    setarray @npc_loc, 97, 75, 2;
-    callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Range;
-
-    callfunc "CheckBarrelQuest";
-    if (@barrel_quest == 1)
-        goto L_Find;
-    if (@barrel_quest == 2)
-        goto L_Looking;
-    if (@barrel_quest == 3)
-        goto L_QuestEnd;
-    if (@barrel_quest == 4)
-        goto L_Thanks;
-    goto L_Meet;
-
-L_Range:
-    message strcharinfo(0), "Whats that? Come closer I can't hear you.";
-    goto L_Close;
-
-L_Meet:
-    mes "[Zegas]";
-    mes "\"Hey do you have a second?\"";
-    next;
-    mes "\"The storehouse here is over run with house maggots.\"";
-    next;
-    mes "\"Wouldn't you know it, the bug bomb Eomie gave us is in one of the store room barrels.\"";
-    next;
-    mes "\"Can you search the barrels for the bug bomb and set it off when you find it?\"";
-    set @barrel_tmp, 1;
-    callfunc "SetBarrelMask";
-    menu
-        "Sure.",L_Start,
-        "Maybe some other time.",L_Close;
-
-L_Find:
-    mes "[Zegas]";
-    mes "\"The storehouse is still over run with house maggots.\"";
-    next;
-    mes "\"Please help me find the bug bomb Eomie gave us is in one of the store room barrels?\"";
-    menu
-        "Sure.",L_Start,
-        "Maybe some other time.",L_Close;
-
-L_Start:
-    mes "[Zegas]";
-    set @barrel_tmp, 2;
-    callfunc "SetBarrelMask";
-    mes "\"Thanks, come back and see me once you found the bug bomb and set it off.\"";
-    goto L_Close;
-
-L_Looking:
-    mes "[Zegas]";
-    mes "\"Still haven't found it? Well keep looking I know it's in there some where.\"";
-    goto L_Close;
-
-L_QuestEnd:
-    mes "[Zegas]";
-    mes "\"From the smell I can see you found the bug bomb!\"";
-    mes "\"Thanks once again, I know it's not much but here is 50 GP for your troubles.\""; 
-    getexp 50, 0;
-    set Zeny, (Zeny + 50);
-    set @barrel_tmp, 4;
-    callfunc "SetBarrelMask";
-    next;
-    goto L_Close;
-
-L_Thanks:
-    mes "[Zegas]";
-    mes "\"Thanks for Helping with clear out the store room!\"";
-    goto L_Close;
-
-L_Close:
-    close;
-}
-042-1.gat,100,75,0|script|ZegasDebug|165
-{
-    mes "[Zegas Debug]";
-    mes "Reset ?";
-    menu
-        "Yes.", L_Reset,
-        "No.", L_End;
-
-L_Reset:
-    set STARTAREA, (STARTAREA & ~(NIBBLE_4_MASK) | (0 << NIBBLE_4_SHIFT));
-    set STARTAREA, STARTAREA &~ (1 << 20);
-    set STARTAREA, STARTAREA &~ (1 << 21);
-    set STARTAREA, STARTAREA &~ (1 << 22);
-    set STARTAREA, STARTAREA &~ (1 << 23);
-    set STARTAREA, STARTAREA &~ (1 << 24);
-    set STARTAREA, STARTAREA &~ (1 << 25);
-    set STARTAREA, STARTAREA &~ (1 << 26);
-    set STARTAREA, STARTAREA &~ (1 << 27);
-    mes "Reset!";
-    goto L_End;
-
-L_End:
-    end;
-
-OnInit:
-    if (!debug)
-        disablenpc "ZegasDebug";
-    end;
-}