- Optimized warper.txt for the greater good.

Note: I may optimize all of 'custom', it all depends on how bored I am.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13211 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 186 insertions, 62 deletions

diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index 7a733487f..3da5a3fcc 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Darkchild
 //===== Current Version: =====================================
-//= 1.8
+//= 1.9
 //===== Compatible With: =====================================
 //= Any eAthena Version;
 //===== Description: =========================================
@@ -22,6 +22,7 @@
 //= TODO Add an option for selecting the level of the dungeon. [Poki#3]
 //= 1.7 Temporary? Added F_ClearGarbage to clear unused/outdated variables [Lupus]
 //= 1.8 Removed Duplicates [Silent]
+//= 1.9 Optimized for the greater good. [Kisuka]
 //============================================================
 //============================================================
 //= To allow selecting the Level of the Dungeon you want to
@@ -34,70 +35,193 @@
 	callfunc "F_ClearGarbage"; //Clear outdated, unused variables
 
 	mes "[Warp Agent]";
-	mes "Hello,";
+	mes "Hello " + strcharinfo(0) + ",";
 	mes "I can teleport you to any Town or Dungeon!";
-	mes "Were do you want to go?";
+	mes "Where do you want to go?";
 	next;
-	menu "To a Town",-,"To a Dungeon",L_dungeon;
-	next;
-	mes "[Warp Agent]";
-	mes "Please select your destination.";
-	next;
-	menu "Alberta",walberta,"Aldebaran",waldebaran,"Amatsu",wamatsu,"Ayothaya",wayothaya,"Comodo",wcomodo,"Einbroch",weinbroch,"Einbech",weinbech,"Geffen",wgeffen,"Gonryun",wgonryun,"Hugel",whugel,"Izlude",wizlude,"Lighthalzen",wlighthalzen,"Louyang",wlouyang,"Lutie",wxmas,"Morroc",wmorroc,"Payon",wpayon,"Prontera",wprontera,"Umbala",wumbala,"Yuno",wyuno;
-L_dungeon:
-	mes "[Warp Agent]";
-	mes "Please select your destination.";
-	next;
-	menu "Abyss Lake",dabbys,"Amatsu Dungeon",damatsu,"Anthell",dant,"Ayothaya Dungeon",dayothaya,"Bibilan Dungeon",dbibilan,"Coal Mine (Dead Pit)",dcoal,"Culvert",dculvert,"Einbech Dungeon",dein,"Glast Heim",dglast,"Gonryun Dungeon",dgonryun,"Juperos",djuperos,"Lighthalzen Bio Lab",dlighthalzen,"Magma Dungeon",dmagma,"Niflheim",dniflheim,"Odin Temple",dodin,"Orc Dungeon",dorc,"Payon Dungeon",dpayon,"Pyramids",dpyramids,"Sphinx",dsphinx,"Sunken Ship",dsunken,"Thanatos Tower",dthanatos,"Turtle Dungeon",dturtle;
-
-
-//----------------Towns----------------\\
-walberta:	warp "alberta",	27,	236;	end;
-waldebaran:	warp "aldebaran",	145,	120;	end;
-wamatsu:	warp "amatsu",	197,	86;	end;
-wayothaya:	warp "ayothaya",	149,	118;	end;
-wcomodo:   	warp "comodo",	188,	161;    end;
-weinbroch:   	warp "einbroch",	64, 	200;	end;
-weinbech:   	warp "einbech",	70, 	95;	end;
-wgeffen:	warp "geffen",	119,	66;	end;
-wgonryun:	warp "gonryun",	150,    130; 	end;
-whugel:   	warp "hugel",	96,	145;    end;
-wizlude:	warp "izlude",	128,	111;	end;
-wlighthalzen:	warp "lighthalzen",	158,	92;	end;
-wlouyang:	warp "louyang",	210,	108;	end;
-wmorroc:	warp "morocc",	159,	93;	end;
-wprontera:	warp "prontera",	156,	187;	end;
-wpayon:		warp "payon",	152,	75;	end;
-wumbala:	warp "umbala",	130,    130; 	end;
-wxmas:		warp "xmas",	148,	131;	end;
-wyuno:   	warp "yuno",	160,	168;    end;
-
-//----------------Dungeons----------------\\
-dabbys:		warp "hu_fild05",	189,	207;	end;
-damatsu:	warp "ama_dun01",	229,	12;	end;
-dant:		warp "moc_fild04",	210,	328;	end;
-dayothaya:	warp "ayo_fild02",	280,	149;	end;
-dbibilan:	warp "izlu2dun",	106,	88;	end;
-dculvert:	warp "prt_sewb1",	126,	248;	end;
-dcoal:		warp "mjolnir_02",	81,	359;	end;
-dein:		warp "einbech",	135,	249;	end;
-dglast:		warp "glast_01",	368,	303;	end;
-dgonryun:	warp "gonryun",	160,    195; 	end;
-djuperos:	warp "yuno_fild07",	218,	176;	end;
-dlighthalzen:	warp "lighthalzen",	158,	285;	end;
-dmagma:		warp "yuno_fild03",	39,	140;	end;
-dniflheim:	warp "niflheim",	35,	161;	end;
-dodin:		warp "odin_tem01",	98,	144;	end;
-dorc:		warp "gef_fild10",	70,	332;	end;
-dpayon:		warp "pay_arche",	43,	132;	end;
-dpyramids:	warp "moc_ruins",	62,	162;	end;
-dsphinx:	warp "moc_fild19",	107,	100;	end;
-dsunken:	warp "alb2trea",	75,	98;	end;
-dthanatos:	warp "tha_scene01",	131,	223;	end;
-dturtle:	warp "tur_dun01",	149,	238;	end;
+	switch(select("To a Town:To a Dungeon")) {
+		case 1:
+			mes "[Warp Agent]";
+			mes "Please select which town you would like to be teleported to.";
+			next;
+			switch(select("Alberta:Aldebaran:Amatsu:Ayothaya:Comodo:Einbroch:Einbech:Geffen:Gonryun:Hugel:Izlude:Lighthalzen:Louyang:Lutie:Morroc:Payon:Prontera:Umbala:Yuno")) {
+				case 1:
+					warp "alberta",27,236;
+					end;
+					break;
+				case 2:
+					warp "aldebaran",145,120;
+					end;
+					break;
+				case 3:
+					warp "amatsu",197,86;
+					end;
+					break;
+				case 4:
+					warp "ayothaya",149,118;
+					end;
+					break;
+				case 5:
+					warp "comodo",188,161;
+					end;
+					break;
+				case 6:
+					warp "einbroch",64,200;
+					end;
+					break;
+				case 7:
+					warp "einbech",70,95;
+					end;
+					break;
+				case 8:
+					warp "geffen",119,66;
+					end;
+					break;
+				case 9:
+					warp "gonryun",150,130;
+					end;
+					break;
+				case 10:
+					warp "hugel",96,145;
+					end;
+					break;
+				case 11:
+					warp "izlude",128,111;
+					end;
+					break;
+				case 12:
+					warp "lighthalzen",158,92;
+					end;
+					break;
+				case 13:
+					warp "louyang",210,108;
+					end;
+					break;
+				case 14:
+					warp "morocc",159,93;
+					end;
+					break;
+				case 15:
+					warp "prontera",156,187;
+					end;
+					break;
+				case 16:
+					warp "payon",152,75;
+					end;
+					break;
+				case 17:
+					warp "umbala",130,130;
+					end;
+					break;
+				case 18:
+					warp "xmas",148,131;
+					end;
+					break;
+				case 19:
+					warp "yuno",160,168;
+					end;
+			}
+			break;
+		case 2:		
+			mes "[Warp Agent]";
+			mes "Please select which dungeon you would like to be teleported to.";
+			next;
+			switch(select("Abyss Lake:Amatsu Dungeon:Anthell:Ayothaya Dungeon:Bibilan Dungeon:Coal Mine (Dead Pit):Culvert:Einbech Dungeon:Glast Heim:Gonryun Dungeon:Juperos:Lighthalzen Bio Lab:Magma Dungeon:Niflheim:Odin Temple:Orc Dungeon:Payon Dungeon:Pyramids:Sphinx:Sunken Ship:Thanatos Tower:Turtle Dungeon")) {
+				case 1:
+					warp "hu_fild05",189,207;
+					end;
+					break;
+				case 2:
+					warp "ama_dun01",229,12;
+					end;
+					break;
+				case 3:
+					warp "moc_fild04",210,328;
+					end;
+					break;
+				case 4:
+					warp "ayo_fild02",280,149;
+					end;
+					break;
+				case 5:
+					warp "izlu2dun",106,88;
+					end;
+					break;
+				case 6:
+					warp "prt_sewb1",126,248;
+					end;
+					break;
+				case 7:
+					warp "mjolnir_02",81,359;
+					end;
+					break;
+				case 8:
+					warp "einbech",135,249;
+					end;
+					break;
+				case 9:
+					warp "glast_01",368,303;
+					end;
+					break;
+				case 10:
+					warp "gonryun",160,195;
+					end;
+					break;
+				case 11:
+					warp "yuno_fild07",218,176;
+					end;
+					break;
+				case 12:
+					warp "lighthalzen",158,285;
+					end;
+					break;
+				case 13:
+					warp "yuno_fild03",39,140;
+					end;
+					break;
+				case 14:
+					warp "niflheim",35,161;
+					end;
+					break;
+				case 15:
+					warp "odin_tem01",98,144;
+					end;
+					break;
+				case 16:
+					warp "gef_fild10",70,332;
+					end;
+					break;
+				case 17:
+					warp "pay_arche",43,132;
+					end;
+					break;
+				case 18:
+					warp "moc_ruins",62,162;
+					end;
+					break;
+				case 19:
+					warp "moc_fild19",107,100;
+					end;
+					break;
+				case 20:
+					warp "alb2trea",75,98;
+					end;
+					break;
+				case 21:
+					warp "tha_scene01",131,223;
+					end;
+					break;
+				case 22:
+					warp "tur_dun01",149,238;
+					end;
+			}
+	}
 }
 
-//----------------Towns----------------\\
+// --------- NPC Clones ------------
+// ---------------------------------
+
+// ----------- Towns -------------
 alberta,31,240,4	duplicate(warpra)	Warp Agent#02	859
 aldebaran,145,118,4	duplicate(warpra)	Warp Agent#03	859
 amatsu,192,81,1	duplicate(warpra)	Warp Agent#04	859
@@ -119,7 +243,7 @@ umbala,132,130,4	duplicate(warpra)	Warp Agent#19	859
 xmas,150,136,4	duplicate(warpra)	Warp Agent#20	859
 yuno,137,162,4	duplicate(warpra)	Warp Agent#21	859
 
-//----------------Dungeons----------------\\
+// ------------ Dungeons ------------
 ama_dun01,233,9,1	duplicate(warpra)	Warp Agent#22	859
 moc_fild04,207,331,4	duplicate(warpra)	Warp Agent#23	859
 ayo_fild02,279,154,4	duplicate(warpra)	Warp Agent#24	859