Branch data for eAthena

5 files changed, 0 insertions, 60 deletions

diff --git a/npc/western-desert/dark_mage.txt b/npc/western-desert/dark_mage.txt
deleted file mode 100644
index 06d9b35b..00000000
--- a/npc/western-desert/dark_mage.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-new_1-1.gat,24,24,0	script	SoulThief	103,{
-
-	if (class == 1) goto L_Soul;
-	mes "[Dark Mage]";
-	mes "Psss hey would you like to have more power?";
-	next;
-	
-	menu "You fool, that's not possible",-,"I'm listening...",L_Go;
-	close;
-
-L_Go:
-	mes "I can give you ancient powers that will let you become the greatest warrior in The Mana World, or the best merchant.";
-	mes "But everything has got his price...";
-	next;
-	
-	mes "Oh nothing important nor expensive.";
-	mes	"Just your soul!";
-	next;
-	
-	menu "My soul? Here it is",L_Soul,"I need a better explanation!",-;
-	
-	mes "Well there's a very small possibility that your player will be translated into the new server.";
-	mes "I said a very, very small possibility.";
-	mes "Players without a soul instead will be lost forever...";
-	mes "Come on, you won't loose that much!";
-	next;
-	
-	menu "Hmmm ok, I guess you can take it.",L_Soul,"Maybe I'll think about it a bit more",-;
-	mes "I know you'll come here again when you'll get killed by a maggot, begging me to help you";
-	close;	
-
-L_Soul:
-	mes "[Dark Mage]";
-	mes "Hrhrhr, your soul is finally mine!";
-	jobchange 1;
-	close;
-}
\ No newline at end of file
diff --git a/npc/western-desert/merchant.txt b/npc/western-desert/merchant.txt
deleted file mode 100644
index 6ed55ed4..00000000
--- a/npc/western-desert/merchant.txt
+++ /dev/null
@@ -1 +0,0 @@
-new_1-1.gat,19,99,0     shop    Ishyah        109,525:800,531:3000,530:8000,1199:3
diff --git a/npc/western-desert/monsters.txt b/npc/western-desert/monsters.txt
deleted file mode 100644
index adb609e5..00000000
--- a/npc/western-desert/monsters.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-new_1-1.gat,0,0,0,0     monster GreenSlime      1005,50,0,0,0
-new_1-1.gat,0,0,0,0     monster GiantMaggot     1006,30,0,0,0
-new_1-1.gat,0,0,0,0     monster RedScorpion     1004,20,0,0,0
diff --git a/npc/western-desert/nomads.txt b/npc/western-desert/nomads.txt
deleted file mode 100644
index fbcab292..00000000
--- a/npc/western-desert/nomads.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-new_1-1.gat,15,67,0	script	Samuel	132,{
-	mes "[Samuel the Nomad]";
-	mes "This is really a nice place.";
-	
-	mes "Don't you think so?";
-	close;
-}
-
-new_1-1.gat,18,68,0	script	Elijah	128,{
-	mes "[Elijah the Nomad]";
-	mes "If I only had a tent...";
-	
-	close;
-}
diff --git a/npc/western-desert/passages.txt b/npc/western-desert/passages.txt
deleted file mode 100644
index a4d7c3af..00000000
--- a/npc/western-desert/passages.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-new_2-1.gat,36,30	warp	caveexit	3,0,new_1-1.gat,25,95
-new_1-1.gat,19,94	warp	caveentrance	1,1,new_2-1.gat,37,31
-new_1-1.gat,111,79	warp	eastdesert	2,2,new_7-1.gat,23,40
-new_7-1.gat,18,39	warp	westdesert	3,4,new_1-1.gat,106,78
-new_1-1.gat,11,66	warp	woodland	1,2,new_15-1.gat,164,66