Branch data for eAthena

14 files changed, 0 insertions, 922 deletions

diff --git a/npc/tulimshar/banker.txt b/npc/tulimshar/banker.txt
deleted file mode 100644
index e17369d7..00000000
--- a/npc/tulimshar/banker.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_3-1.gat,27,73,0	script	Tybalt	107,{mes "[Tybalt the Banker]";mes "Welcome to the bank!";mes "How can I help you?";next;menu "Deposit",L_Dep,"Withdraw",L_With,"Nevermind that",L_Nev;L_Dep:	mes "Sorry, but we're still moving inventory!";	close;L_With:	mes "Sorry, but we're still moving inventory!";	close;L_Nev:	mes "Goodbye then";	close;}
diff --git a/npc/tulimshar/barber.txt b/npc/tulimshar/barber.txt
deleted file mode 100644
index eea7f175..00000000
--- a/npc/tulimshar/barber.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-new_3-1.gat,102,31,0	script	Nicolas	100,{
-	mes "[Nicolas the Barber]";
-	mes "I'm the greatest barber in the whole mana world! Would you like a change of style or color?";
-	next;
-
-	menu
-	"Change my style",style,
-	"Change my color",color,
-	"Nah I'm fine",fine;
-
-style:
-	if (Sex == 0) goto style_female;
-	
-style_male:
-	menu
-	"bald",style0,
-	"ponytail",style1,
-	"bowl cut",style2,
-	"combed back",style3,
-	"emo",style4,
-	"mohawk",style5,
-	"pompadour",style6,
-	"center parting",style7;
-
-style_female:
-	menu
-	"bald",style0,
-	"long and slick",style1,
-	"short and curly",style2,
-	"ponytail",style3,
-	"pigtails",style4,
-	"long and curly",style5,
-	"parted",style6,
-	"short and slick",style7;
-
-style0:
-	setlook 1,0;
-	close;
-style1:
-	setlook 1,1;
-	close;
-style2:
-	setlook 1,2;
-	close;
-style3:
-	setlook 1,3;
-	close;
-style4:
-	setlook 1,4;
-	close;
-style5:
-	setlook 1,5;
-	close;
-style6:
-        setlook 1,6;
-	close;
-style7:
-        setlook 1,7;
-	close;
-style8:
-        setlook 1,8;
-	close;
-
-color:
-	menu
-	"brunette",color0,
-	"green",color1,
-	"dark red",color2,
-	"light purple",color3,
-	"gray",color4,
-	"blonde",color5,
-	"teal",color6,
-	"light red",color7,
-	"blue",color8,
-	"dark purple",color9;
-
-fine:
-	close;
-
-color0:
-	setlook 6,0;
-	close;
-color1:
-	setlook 6,1;
-	close;
-color2:
-	setlook 6,2;
-	close;
-color3:
-	setlook 6,3;
-	close;
-color4:
-	setlook 6,4;
-	close;
-color5:
-	setlook 6,5;
-	close;
-color6:
-	setlook 6,6;
-	close;
-color7:
-	setlook 6,7;
-	close;
-color8:
-	setlook 6,8;
-	close;
-color9:
-	setlook 6,9;
-	close;
-color10:
-	setlook 6,10;
-	close;
-}
\ No newline at end of file
diff --git a/npc/tulimshar/children.txt b/npc/tulimshar/children.txt
deleted file mode 100644
index 3fc41f98..00000000
--- a/npc/tulimshar/children.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-new_3-1.gat,57,70,0	script	Aisha	108,{
-	set @TEMP,rand(7);
-	if(@TEMP == 1) goto L_1;
-	if(@TEMP == 2) goto L_2;
-	if(@TEMP == 3) goto L_3;
-	if(@TEMP == 4) goto L_4;
-	if(@TEMP == 5) goto L_5;
-	if(@TEMP == 6) goto L_6;
-	if(@TEMP == 7) goto L_7;
-	if(@TEMP == 0) goto L_1;
-
-L_1:
-	mes "[Aisha]";
-	mes "Maggots are soo slimey!";
-	close;
-
-L_2:
-	mes "[Aisha]";
-	mes "Want to play ball with me?";
-	close;
-
-L_3:
-	mes "[Aisha]";
-	mes "Monsters roam the land, i hate scorpions!";
-	close;
-
-L_4:
-	mes "[Aisha]";
-	mes "When i grow up, I want to be strong enough to kill a scorpion!";
-	close;
-
-L_5:
-	mes "[Aisha]";
-	mes "Items dropped by monsters can be sold.";
-	close;
-
-L_6:
-	mes "[Aisha]";
-	mes "Items such as foods, can be eaten to regain Health Points.";
-	close;
-
-L_7:
-	mes "[Aisha]";
-	mes "I want to be a Doctor when i grow up!";
-	close;
-}
-
-new_3-1.gat,120,33,0	script	Nina	103,{
-	set @TEMP,rand(7);
-	if(@TEMP == 1) goto L_1;
-	if(@TEMP == 2) goto L_2;
-	if(@TEMP == 3) goto L_3;
-	if(@TEMP == 4) goto L_4;
-	if(@TEMP == 5) goto L_5;
-	if(@TEMP == 6) goto L_6;
-	if(@TEMP == 7) goto L_7;
-	if(@TEMP == 0) goto L_1;
-
-L_1:
-	mes "[Nina]";
-	mes "If i learned anything from school, Grenxen founded Tulimshar.";
-	close;
-
-L_2:
-	mes "[Nina]";
-	mes "When i was picking rocks from the field, i saw a red scorpion.";
-	close;
-
-L_3:
-	mes "[Nina]";
-	mes "Its polite to state your name before talking to anyone.";
-	close;
-
-L_4:
-	mes "[Nina]";
-	mes "I have a Scorpion Doll!";
-	close;
-
-L_5:
-	mes "[Nina]";
-	mes "I carry spare Cactus Juices while on the field.";
-	close;
-
-L_6:
-	mes "[Nina]";
-	mes "Items such as foods, can be eaten to regain Health Points.";
-	close;
-
-L_7:
-	mes "[Nina]";
-	mes "Grenxen is the Demon that founded Tulimshar.";
-	close;
-}
diff --git a/npc/tulimshar/elanore.txt b/npc/tulimshar/elanore.txt
deleted file mode 100644
index 2158c315..00000000
--- a/npc/tulimshar/elanore.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-//Heal NPC costs 100 money
-
-new_3-1.gat,40,66,0	script	Elanore	108,{
-
-	if (baselevel > 10) goto L_NoHeal;
-
-	set @TEMP,rand(3);
-
-	if(@TEMP == 0) goto Heal1;
-
-	if(@TEMP == 1) goto Heal2;
-
-	if(@TEMP == 2) goto Heal3;
-
-	if(@TEMP == 3) goto Heal4;
-
-Heal1:
-
-	mes "[Elanore the Healer]";
-
-	mes "You don't look too well, let me treat your wounds.";
-
-	next;
-
-	goto Heal_L;
-
-
-
-Heal2:
-
-	mes "[Elanore the Healer]";
-
-	mes "I will make quick work of your wounds.";
-
-	next;
-
-	goto Heal_L;
-
-
-
-Heal3:
-
-	mes "[Elanore the Healer]";
-
-	mes "Need a healing?.";
-
-	next;
-
-	goto Heal_L;
-
-
-
-Heal4:
-
-	mes "[Elanore the Healer]";
-
-	mes "Sometimes you just need to run from battle.";
-
-	next;
-
-	goto Heal_L;
-
-
-
-Heal_L:
-
-	if(@TEMP == 0) goto Heal_1;
-
-	if(@TEMP == 1) goto Heal_2;
-
-	if(@TEMP == 2) goto Heal_3;
-
-	if(@TEMP == 3) goto Heal_4;
-
-Heal_1:
-
-	mes "[Elanore the Healer]";
-
-	mes "Here you go!";
-
-	heal 10000,10000;
-
-	close;
-
-
-
-Heal_2:
-
-	mes "[Elanore the Healer]";
-
-	mes "Painless wasnt it?";
-
-	mes "Here you go!";
-
-	heal 10000,10000;
-
-	close;
-
-Heal_3:
-
-	mes "[Elanore the Healer]";
-
-	mes "You should be more careful.";
-
-	heal 10000,10000;
-
-	close;
-
-Heal_4:
-
-	mes "[Elanore the Healer]";
-
-	mes "Much better right?!";
-
-	heal 10000,10000;
-
-	close;
-	
-L_NoHeal:
-
-	mes "[Elanore the Healer]";
-	
-	mes "I'm sorry but I'm here only to help young people.";
-	
-	mes "Your level is already higher than 10.";
-	
-	mes "You can get some rest in the inn near here.";
-	
-	close;
-
-}
-
diff --git a/npc/tulimshar/guards.txt b/npc/tulimshar/guards.txt
deleted file mode 100644
index e32ccd40..00000000
--- a/npc/tulimshar/guards.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-new_3-1.gat,48,79,0	script	Ekinu	104,{
-	mes "[Ekinu the Town Guard]";
-	mes "Protecting Tulimshar is my job.";
-	next;
-	menu
-	"Can you give me any tips?",L_Tip,
-	"Information",L_Info,;
-
-L_Tip:
-	set @TEMP,rand(5);
-	if(@TEMP == 0) goto L_0;
-	if(@TEMP == 1) goto L_1;
-	if(@TEMP == 2) goto L_2;
-	if(@TEMP == 3) goto L_3;
-	if(@TEMP == 4) goto L_4;
-	if(@TEMP == 5) goto L_5;
-L_1:
-	mes "[Ekinu the Town Guard]";
-	mes "Try to carry spare potion when on fields or in dungeons, they will come in handy.";
-	close;
-L_2:
-	mes "[Ekinu the Town Guard]";
-	mes "Always carry a map of where you are, ask the Guides in most towns to get one.";
-	close;
-L_3:
-	mes "[Ekinu the Town Guard]";
-	mes "When in a dungeon, monsters are more aggressive than if they were outside.";
-	close;
-L_4:
-	mes "[Ekinu the Town Guard]";
-	mes "When gambling for money in casino's, make sure you have enough emergency money.";
-	close;
-L_5:
-	mes "[Ekinu the Town Guard]";
-	mes "Never underestimate the enemy.";
-	close;
-L_0:
-	mes "[Ekinu the Town Guard]";
-	mes "Let me think of a few... Oh! Do NOT attack Red scorpions unless you can kill it for sure!";
-	close;
-	
-L_Info:
-	mes "[Ekinu the Town Guard]";
-	mes "Sorry I have no information for you, try asking for a tip.";
-	close;
-}
-
-new_3-1.gat,40,79,0	script	Ryan	104,{
-	mes "[Ryan the Town Guard]";
-	mes "ZzzZzzZ...";
-	next;
-	mes "[Ryan the Town Guard]";
-	mes "Heh, what?";
-	mes "I wasn't sleeping, I was just resting my eyes!";
-close;
-}
diff --git a/npc/tulimshar/guide.txt b/npc/tulimshar/guide.txt
deleted file mode 100644
index 17775433..00000000
--- a/npc/tulimshar/guide.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-new_3-1.gat,33,30,0	script	Ian	102,{
-	mes "[Ian the Guide]";
-	mes "Would you like to know about something?";
-	next;
-	menua:
-	menu "Fighting",L_Fight,"Items",L_Items,"Monsters",L_Monster,"Stylist",L_Style,"Quests",L_Quests,"NPCs",L_NPC,"Commands",L_Comm,"Quick Keys",L_Key,"I know everything!",L_Know;
-L_Fight:
-	mes "[Ian the Guide]";
-	mes "People live in this world by living off of monsters";
-	mes "You can fight monsters and even players by hitting the [CTRL] key, or left mouse click.";
-	next;
-	mes "[Ian the Guide]";
-	mes "If you get tired of pressing the key too much, you can also type shift+ctrl";
-	mes "This will make your character attack continuously for the time you are inactive.";
-	next;
-	goto menua;
-L_Items:
-	mes "[Ian the Guide]";
-	mes "There are three types of items.";
-	mes "They can be Consumables, Equipment, or Miscellaneous";
-	next;
-	mes "[Ian the Guide]";
-	mes "Consumable items such as Potions, can be used only once";
-	mes "after use, they will disappear from your inventory.";
-	next;
-	mes "[Ian the Guide]";
-	mes "Equipment items like Armors, Weapons, Accessories"; 
-	mes "can be equipped for fashionable purposes or to raise your status";
-	next;
-	mes "[Ian the Guide]";
-	mes "Miscellaneous items such as maggot slime, are used";
-	mes "in creating other items, or just to trade and sell.";
-	next;
-	goto menua;
-L_Monster:
-	mes "[Ian the Guide]";
-	mes "In every world, there are beasts. Monsters can be found almost anywhere!~";
-	mes "To fight them, please read [Fighting] if you do not know how";
-	next;
-	mes "There a several types of monsters, Aggressive, Neutral, Assistants";
-	next;
-	mes "[Ian the Guide]";
-	mes "Aggressive monsters know that they are always in danger";
-	mes "so therefore they always keep their guard up";
-	mes "Making them attack anybody in sight";
-	next;
-	mes "[Ian the Guide]";
-	mes "Neutral monsters tend to just lounge around until attacked";
-	mes "They will leave everything alone unless they are threatened";
-	next;
-	mes "[Ian the Guide]";
-	mes "Assistants are monsters who help each other, there haven't been any yet";
-	mes "But there soon will be, These monsters attack in groups if they are threatened";
-	next;
-	goto menua;
-L_Style:
-	mes "[Ian the Guide]";
-	mes "The stylist NPC will cut and perm your hair!";
-	mes "they are known for their hair growth formula";
-	next;
-	goto menua;
-L_Quests:
-	mes "[Ian the Guide]";
-	mes "There are people in the world in need of help!";
-	mes "Most of these people aren't afraid to give rewards to those who help them";
-	mes "So be nice and help people along the way!";
-	next;
-	goto menua;
-L_NPC:
-	mes "[Ian the Guide]";
-	mes "NPCs [Non Playable Characters] are people who are always in the game";
-	mes "Tending to many varieties of services from just chatting to helping others.";
-	next;
-	goto menua;
-L_Comm:
-	mes "[Ian the Guide]";
-	mes "There are no /Commands available currently";
-	next;
-	goto menua;
-L_Key:
-	mes "[Ian the Guide]";
-	mes "There are many key combinations, press F1 for a short list of them!";
-	next;
-	goto menua;
-L_Know:
-	close;
-}
diff --git a/npc/tulimshar/man.txt b/npc/tulimshar/man.txt
deleted file mode 100644
index 3d0f0d66..00000000
--- a/npc/tulimshar/man.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-new_3-1.gat,114,43,0	script	Luca	102,{
-	mes "[Luca the Hunter]";
-	mes "Ouch! It hurts, this wound I got from battle.";
-	next;
-	menu "Tell me about it",L_Exp,"Nevermind",L_Nev;
-
-L_Exp:
-	mes "I was fighting scorpions for experience and I bumped into a RED one. I had NEVER seen it before!";
-	next;
-	mes "Luckily i had a camera with me! Here's a picture of it... Let me find it, I put it in my pocket somewhere...";
-	next;
-	mes "Oh man! My pockets have been ripped clean off!";
-	close;
-
-L_Nev:
-	mes "Hmpf!";
-	close;
-}
diff --git a/npc/tulimshar/merchant.txt b/npc/tulimshar/merchant.txt
deleted file mode 100644
index 75070c7d..00000000
--- a/npc/tulimshar/merchant.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_3-1.gat,54,45,0	shop	Neko	101,501:50,502:60,1201:100,1202:1000,522:300,521:1000,523:8000
diff --git a/npc/tulimshar/monster_guide.txt b/npc/tulimshar/monster_guide.txt
deleted file mode 100644
index 0b9972fa..00000000
--- a/npc/tulimshar/monster_guide.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-new_3-1.gat,46,66,0	script	Aidan	102,{
-	if(MPQUEST == 0) goto Register;
-	mes "[Aidan the Monster Guide]";
-	mes "You currently have " +Mobpt+ " Monster Points. These points are acquired while killing monsters";
-	close;
-Register:
-	mes "[Aidan the Monster Guide]";
-	mes "Oh my, you dont seem to be registered as a Quest Participant, would you like to register?";
-	next;
-Choice:
-	menu "Register",L_R,"Not at the moment",L_N,"Information",L_I;
-L_R:
-	mes "[Aidan the Monster Guide]";
-	mes "Give me a second to look over your paperwork.";
-	next;
-	mes "[Monster Guide]";
-	mes "Well, looks like you qualify!";
-	mes "Welcome to the questing world!";
-	set MPQUEST,1;
-	close;
-L_N:
-	mes "[Aidan the Monster Guide]";
-	mes "Very well, you dont know what your missing.";
-	close;
-L_I:
-	mes "[Aidan the Monster Guide]";
-	mes "Here in The Mana World, there are certain rewards for your vanquishing of foes.";
-	mes "For example, there are Monster Points, every monster you kill has a certain amount of points that get added to your account.";
-	mes "The more points you have, the more expensive things you can buy using them.";
-	next;
-	mes "[Monster Guide]";
-	mes "So whaddya say, sign up won't you?";
-	next;
-	goto Choice;
-}
diff --git a/npc/tulimshar/monsters.txt b/npc/tulimshar/monsters.txt
deleted file mode 100644
index 645c5627..00000000
--- a/npc/tulimshar/monsters.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-// Map: new_3-1
-// This is Tulimshar the city - southern Part with market and casino/inn.
-// ALWAYS keep a backup file before edit (experience :)
-// The last param is the Event on Mobdeath
-//
-
-new_3-1.gat,0,0,0,0	monster	Maggot		1002,35,2000,0,ConquestMob3::OnMaggotDead
-new_3-1.gat,0,0,0,0	monster	Scorpion	1003,25,2500,0,ConquestMob3::OnScorpionDead
-new_3-1.gat,0,0,0,0	monster	Firegoblin	1011,20,2500,0,ConquestMob3::OnFireGoblinnDead
-
-new_3-1.gat,0,0,0	script	ConquestMob3	-1,{
-// id 1002 = Maggot
-OnMaggotDead:
-	if (MPQUEST == 1) set Mobpt,Mobpt+1;
-	break;
-
-// id 1003 = Scorpion
-OnScorpionDead:
-	if (MPQUEST == 1) set Mobpt,Mobpt+2;
-	break;
-end;
-}
-
-// id 1011 = FireGoblin
-OnFireGoblinDead:
-	if (MPQUEST == 1) set Mobpt,Mobpt+2;
-	break;
-end;
-}
-
-
-
diff --git a/npc/tulimshar/passages.txt b/npc/tulimshar/passages.txt
deleted file mode 100644
index afecf42e..00000000
--- a/npc/tulimshar/passages.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-new_1-1.gat,56,12	warp	totown	5,1,new_3-1.gat,44,80
-new_3-1.gat,42,88	warp	tofield	5,2,new_1-1.gat,58,17
diff --git a/npc/tulimshar/rewards_master.txt b/npc/tulimshar/rewards_master.txt
deleted file mode 100644
index bc9134ff..00000000
--- a/npc/tulimshar/rewards_master.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-new_3-1.gat,55,51,0	script	Ishi	106,{
-	if (MPQUEST == 0) goto Register;
-	if (tvis == 0) set tvis,1;
-	if (Mobpt < tvis) goto NotEnough;
-
-	mes "[Ishi the Rewards Master]";
-	mes "Welcome! I see you have " +Mobpt+ " Monster Points. Would you like to exchange some of those for an item?";
-	next;
-	menu "Yes",Y1,"No Thanks",LEAVE;
-	next;
-
-Register:
-	mes "[Ishi the Rewards Master]";
-	mes "Hey, it seems like you didn't register as a quest participant yet! You can sign up at the gate below.";
-	close;
-
-Y1:
-	set Mobpt,Mobpt-tvis;
-	set tvis,tvis+1;
-	set @TEMP,rand(1);
-	if(@TEMP ==0) goto R_1;
-	if(@TEMP ==1) goto R_2;
-R_1:
-	set @TEMP,rand(19);
-	if(@TEMP ==0) goto R1_1;
-	if(@TEMP ==1) goto R1_2;
-	if(@TEMP ==2) goto R1_3;
-	if(@TEMP ==3) goto R1_4;
-	if(@TEMP ==4) goto R1_5;
-	if(@TEMP ==5) goto R1_6;
-	if(@TEMP ==6) goto R1_7;
-	if(@TEMP ==7) goto R1_8;
-	if(@TEMP ==8) goto R1_9;
-	if(@TEMP ==9) goto R1_10;
-	if(@TEMP ==10) goto R1_11;
-	if(@TEMP ==11) goto R1_12;
-	if(@TEMP ==12) goto R1_13;
-	if(@TEMP ==13) goto R1_14;
-	if(@TEMP ==14) goto R1_15;
-	if(@TEMP ==15) goto R1_16;
-	if(@TEMP ==16) goto R1_17;
-	if(@TEMP ==17) goto R1_18;
-	if(@TEMP ==18) goto R1_19;
-	if(@TEMP ==19) goto R1_20;
-
-R1_1:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a cactus drink!";
-	getitem 501,1;
-	goto Q;
-R1_2:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a cactus potion!";
-	getitem 502,1;
-	goto Q;
-R1_3:
-	mes "[Ishi the Rewards Master]";
-	mes "You got casino coins!";
-	getitem 503,1;
-	goto Q;
-R1_4:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a decor candy cane!";
-	getitem 504,1;
-	goto Q;
-R1_5:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a maggot slime!";
-	getitem 505,1;
-	goto Q;
-R1_6:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a candy cane!";
-	getitem 506,1;
-	goto Q;
-R1_7:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a scorpion stinger!";
-	getitem 507,1;
-	goto Q;
-R1_8:
-	mes "[Ishi the Rewards Master]";
-	mes "You got an Xmas cake!";
-	getitem 508,1;
-	goto Q;
-R1_9:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a chocolate bar!";
-	getitem 509,1;
-	goto Q;
-R1_10:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a candy!";
-	getitem 510,1;
-	goto Q;
-R1_11:
-	mes "[Ishi the Rewards Master]";
-	mes "You got cotton shorts!";
-	getitem 586,1;
-	goto Q;
-R1_12:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a ginger bread man!";
-	getitem 512,1;
-	goto Q;
-R1_13:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a cake!";
-	getitem 513,1;
-	goto Q;
-R1_14:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a candy cane!";
-	getitem 514,1;
-	goto Q;
-R1_15:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a purple present!";
-	getitem 515,1;
-	goto Q;
-R1_16:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a blue present!";
-	getitem 516,1;
-	goto Q;
-R1_17:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a red scorpion stinger!";
-	getitem 517,1;
-	goto Q;
-R1_18:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a bug leg!";
-	getitem 518,1;
-	goto Q;
-R1_19:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a cherry cake!";
-	getitem 519,1;
-	goto Q;
-R1_20:
-	mes "[Ishi the Rewards Master]";
-	mes "You got an easter egg!";
-	getitem 520,1;
-	goto Q;
-
-R_2:
-	set @TEMP,rand(3);
-	if(@TEMP ==0) goto R2_1;
-	if(@TEMP ==1) goto R2_2;
-	if(@TEMP ==2) goto R2_3;
-	if(@TEMP ==3) goto R2_4;
-
-R2_1:
-	mes "[Ishi the Rewards Master]";
-	mes "You got an arrow!";
-	getitem 1199,1;
-	goto Q;
-R2_2:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a bow!";
-	getitem 1200,1;
-	goto Q;
-R2_3:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a knife!";
-	getitem 1201,1;
-	goto Q;
-R2_4:
-	mes "[Ishi the Rewards Master]";
-	mes "You got a cotton shirt!";
-	getitem 1202,1;
-	goto Q;
-
-NotEnough:
-	mes "[Ishi the Rewards Master]";
-	mes "You don't have enough Monster Points for a reward. Kill some more monsters first.";
-	close;
-LEAVE:
-	close;
-}
diff --git a/npc/tulimshar/sandra.txt b/npc/tulimshar/sandra.txt
deleted file mode 100644
index 6a19ffa7..00000000
--- a/npc/tulimshar/sandra.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-new_3-1.gat,72,61,0	script	Sandra	114,{
-	if(Scorp == 2) goto done;
-	if(Scorp == 1) goto reas;
-	set @TEMP,rand(3);
-	if(@TEMP == 1) goto L_1;
-	if(@TEMP == 2) goto L_2;
-	if(@TEMP == 3) goto L_3;
-	if(@TEMP == 0) goto L_4;
-L_1:
-	mes "[Sandra]";
-	mes "In the outskirts of Tulimshar, there wanders a red scorpion. I need a favor, please help me.";
-	next;
-	goto red;
-L_2:
-	mes "[Sandra]";
-	mes "When you venture in the outskirts of Tulimshar, you can spot a red scorpion. Will you help me kill one?";
-	next;
-	goto red;
-L_3:
-	mes "[Sandra]";
-	mes "The red scorpion stinger carries many properties used in potions.";
-	next;
-	goto red;
-L_4:
-	mes "[Sandra]";
-	mes "You look sturdy enough, will you help me get something?";
-	next;
-	goto red;
-red:
-	menu "Yes",L_kl,"No",L_N;
-L_kl:
-	if(@TEMP == 1) goto K_1;
-	if(@TEMP == 2) goto K_2;
-	if(@TEMP == 3) goto K_3;
-	if(@TEMP == 0) goto K_1;
-K_1:
-	mes "[Sandra]";
-	mes "I need you to slaughter the red scorpion found outside of Tulimshar and bring me 5 [Red Stingers]";
-	next;
-	goto set1;
-K_2:
-	mes "[Sandra]";
-	mes "I heard a while ago that the stinger of a red scorpion can be used for medical purposes. I need you to help me get 5 [Red Stingers]";
-	next;
-	goto set1;
-K_3:
-	mes "[Sandra]";
-	mes "Bring me 5 [Red Stingers] and i will reward you greatly";
-	next;
-	goto set1;
-set1:
-	set Scorp,1;
-	mes "[Sandra]";
-	mes "Please bring me them!";
-	close;
-reas:
-	if(countitem(517) >= 5) goto have;
-	mes "[Sandra]";
-	mes "Please hurry and bring me 5 [Red Stingers]";
-	close;
-have:
-	mes "[Sandra]";
-	mes "Excelent!";
-	mes "You brought me 5 [Red Stingers]!";
-	delitem 517,5;
-	next;
-	mes "[Sandra]";
-	mes "Here you go, your reward!";
-	mes "+Got Bow";
-	mes "+Got Arrows 100";
-	getitem 1200,1;
-	getitem 1199,100;
-	set Scorp,2;
-	close;
-done:
-	mes "[Sandra]";
-	mes "Thank you for all your help!";
-	close;
-L_N:
-	close;
-}
diff --git a/npc/tulimshar/vincent.txt b/npc/tulimshar/vincent.txt
deleted file mode 100644
index c485db32..00000000
--- a/npc/tulimshar/vincent.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-new_3-1.gat,137,34,0	script	Vincent	113,{
-	if(Bugleg == 1) goto reas;
-	if(Bugleg == 2) goto done;
-	set @TEMP,rand(3);
-	if(@TEMP == 1) goto L_1;
-	if(@TEMP == 2) goto L_2;
-	if(@TEMP == 3) goto L_3;
-	if(@TEMP == 0) goto L_4;
-
-L_1:
-	mes "[Vincent]";
-	mes "I just need 30 more [Bug Legs] to finish my action figure!";
-	next;
-	goto main1;
-L_2:
-	mes "[Vincent]";
-	mes "This maggot action figure is awesome! I just need to attach [30 Part A{Bug Leg}]";
-	next;
-	goto main1;
-L_3:
-	mes "[Vincent]";
-	mes "This is a great action figure! A must have! All i need is a few parts...";
-	goto main1;
-L_4:
-	mes "[Vincent]";
-	mes "Can you get me 30 [Bug Legs]? I need them to replace the action figure parts.";
-	next;
-	goto main1;
-
-main1:
-	mes "[Vincent]";
-	mes "Will you help me find 30 [Bug Legs]?";
-	next;
-	menu "Yes",B_1,"No",B_2;
-B_1:
-	set Bugleg,1;
-	set @TEMP,rand(3);
-	if(@TEMP == 1) goto J_1;
-	if(@TEMP == 2) goto J_2;
-	if(@TEMP == 3) goto J_3;
-	if(@TEMP == 0) goto J_4;
-J_1:
-	mes "[Vincent]";
-	mes "Thank you!";
-	next;
-	goto main2;
-J_2:
-	mes "[Vincent]";
-	mes "I don't know how to thank you enough!";
-	next;
-	goto main2;
-J_3:
-	mes "[Vincent]";
-	mes "I will thank you when I get them!";
-	next;
-	goto main2;
-J_4:
-	mes "[Vincent]";
-	mes "I'm sure I will give a small reward. :D";
-	next;
-	goto main2;
-main2:
-	mes "[Vincent]";
-	mes "Now please go get me 30 [Bug Legs]";
-	close;
-reas:
-	if(countitem(518) >= 30) goto have;
-	mes "[Vincent]";
-	mes "Please help me collect 30 [Bug Legs]!";
-	close;
-have:
-	mes "[Vincent]";
-	mes "Excellent! Finally I can complete the model!!";
-	delitem 518,30;
-	next;
-	mes "[Vincent]";
-	mes "Here you go, a little of my appreciation!";
-	next;
-	mes "Got 1000 GP";
-	set zeny,zeny+1000;
-	set Bugleg,2;
-	close;
-done:
-	mes "[Vincent]";
-	mes "Thanks for your help!";
-	close;
-B_2:
-	close;
-}
-