* Optimized Eden Quests lv. 86-90 and 91-99 (re\quests\eden\)

* Fixed incorrect warp coordinates in Eden Quests, bugreport:6420 (re\quests\eden\eden_common.txt)
* Fixed warp portal in ve_fild03, bugreport:6421 (quests\quests_13_2.txt)

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

1 files changed, 62 insertions, 499 deletions

diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt
index 9aac942ba..dc2b07188 100644
--- a/npc/re/quests/eden/86-90.txt
+++ b/npc/re/quests/eden/86-90.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First Version. [Chilly]
 //= 1.1 Some little improvements here and there. [Masao]
+//= 1.2 Optimized. [Euphy]
 //============================================================
 
 moc_para01,48,175,3	script	Mission [86 - 90]	857,{
@@ -30,521 +31,83 @@ moc_para01,48,175,3	script	Mission [86 - 90]	857,{
 		close;
 	}
 	if (BaseLevel > 90) {
-		if (checkquest(4167,HUNTING) == 2) {
-			mes "You hunted all 30 Dragon Tail.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4167;
-			getexp 76000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4168,HUNTING) == 2) {
-			mes "You hunted all 30 Spring Rabbit.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4168;
-			getexp 82000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4169,HUNTING) == 2) {
-			mes "You hunted all 30 Pest.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4169;
-			getexp 82000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4170,HUNTING) == 2) {
-			mes "You hunted all 30 Bathory.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4170;
-			getexp 72000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4171,HUNTING) == 2) {
-			mes "You hunted all 30 Alarm.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4171;
-			getexp 76000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4172,HUNTING) == 2) {
-			mes "You hunted all 30 Baba Yaga.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4172;
-			getexp 72000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4173,HUNTING) == 2) {
-			mes "You hunted all 30 Hyegun.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4173;
-			getexp 117000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4174,HUNTING) == 2) {
-			mes "You hunted all 30 Firelock Soldier.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4174;
-			getexp 82000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4175,HUNTING) == 2) {
-			mes "You hunted all 30 Zipper Bear.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4175;
-			getexp 120000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4176,HUNTING) == 2) {
-			mes "You hunted all 30 Earth Petite.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4176;
-			getexp 72000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4177,HUNTING) == 2) {
-			mes "You hunted all 30 Rafflesia.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4177;
-			getexp 72000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4178,HUNTING) == 2) {
-			mes "You hunted all 30 Venomous.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4178;
-			getexp 72000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4179,HUNTING) == 2) {
-			mes "You hunted all 30 Pitman.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4179;
-			getexp 86000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else if (checkquest(4180,HUNTING) == 2) {
-			mes "You hunted all 30 Yellow Novus.";
-			mes "Thank you very much.";
-			next;
-			mes "I know it isn't much but here's a small gift.";
-			mes "I hope that it helps you at least a little bit.";
-			next;
-			erasequest 4180;
-			getexp 80000,0;
-			mes "Wooohoo!";
-			mes "Good luck.";
-			close;
-		} else {
-			mes "- This missions can only be -";
-			mes "- read by those who are -";
-			mes "- of the correct level. -";
-			mes "- There might be another -";
-			mes "- board somewhere for -";
-			mes "- my level. -";
-			close;
-		}
-	}
-	mes "- Many hunting missions -";
-	mes "- are on the bulletin board. -";
-	next;
-	switch(select("Turtle Dungeon Area:Clock Tower Area:Local Area:Other Area")) {
-	case 1:
-		switch(select("Dragon Tail:Spring Rabbit:Pest")) {
-		case 1:
-			if (checkquest(4167,HUNTING) == 2) {
-				mes "You hunted all 30 Dragon Tail.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4167;
-				getexp 76000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4167) == -1) {
-				setquest 4167;
-				mes "Please hunt 30 Dragon Tail and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Dragon Tail yet...";
-			mes "Will you check again?";
-			close;
-		case 2:
-			if (checkquest(4168,HUNTING) == 2) {
-				mes "You hunted all 30 Spring Rabbit.";
+		setarray .@Exp[0],76000,82000,82000,72000,76000,72000,117000,82000,120000,72000,72000,72000,86000,80000;
+		setarray .@Mob$[0],"Dragon Tail","Spring Rabbit","Pest","Bathory","Alarm","Baba Yaga","Hyegun","Antique Firelock","Zipper Bear","Earth Petite","Rafflesia","Venomous","Pitman","Yellow Novus";
+		for(set .@i,0; .@i<16; set .@i,.@i+1)
+			if (checkquest(4167+.@i,HUNTING) == 2) {
+				mes "You hunted all 30 "+.@Mob$[.@i]+".";
 				mes "Thank you very much.";
 				next;
 				mes "I know it isn't much but here's a small gift.";
 				mes "I hope that it helps you at least a little bit.";
 				next;
-				erasequest 4168;
-				getexp 82000,0;
+				erasequest 4167+.@i;
+				getexp .@Exp[.@i],0;
 				mes "Wooohoo!";
 				mes "Good luck.";
 				close;
 			}
-			if (checkquest(4168) == -1) {
-				setquest 4168;
-				mes "Please hunt 30 Spring Rabbit and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Spring Rabbit yet...";
-			mes "Will you check again?";
-			close;
-		case 3:
-			if (checkquest(4169,HUNTING) == 2) {
-				mes "You hunted all 30 Pest.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4169;
-				getexp 82000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4169) == -1) {
-				setquest 4169;
-				mes "Please hunt 30 Pest and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Pest yet...";
-			mes "Will you check again?";
-			close;
+		mes "- This missions can only be -";
+		mes "- read by those who are -";
+		mes "- of the correct level. -";
+		mes "- There might be another -";
+		mes "- board somewhere for -";
+		mes "- my level. -";
+		close;
+	}
+	mes "- Many hunting missions -";
+	mes "- are on the bulletin board. -";
+	next;
+	switch(select("Turtle Dungeon Area:Clock Tower Area:Local Area:Other Area")) {
+	case 1:
+		switch(select("Dragon Tail:Spring Rabbit:Pest")) {
+			case 1: callsub L_Quest,4167,"Dragon Tail",76000;
+			case 2: callsub L_Quest,4168,"Spring Rabbit",82000;
+			case 3: callsub L_Quest,4169,"Pest",82000;
 		}
 	case 2:
 		switch(select("Bathory:Alarm")) {
-		case 1:
-			if (checkquest(4170,HUNTING) == 2) {
-				mes "You hunted all 30 Bathory.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4170;
-				getexp 72000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4170) == -1) {
-				setquest 4170;
-				mes "Please hunt 30 Bathory and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Bathory yet...";
-			mes "Will you check again?";
-			close;
-		case 2:
-			if (checkquest(4171,HUNTING) == 2) {
-				mes "You hunted all 30 Alarm.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4171;
-				getexp 76000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4171) == -1) {
-				setquest 4171;
-				mes "Please hunt 30 Alarm and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Alarm yet...";
-			mes "Will you check again?";
-			close;
+			case 1: callsub L_Quest,4170,"Bathory",72000;
+			case 2: callsub L_Quest,4171,"Alarm",76000;
 		}
 	case 3:
-		switch(select("Babayaga:Hyegun:Antique Firelock:Zipper Bear")) {
-		case 1:
-			if (checkquest(4172,HUNTING) == 2) {
-				mes "You hunted all 30 Babayaga.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4172;
-				getexp 72000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4172) == -1) {
-				setquest 4172;
-				mes "Please hunt 30 Babayaga and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Babayaga yet...";
-			mes "Will you check again?";
-			close;
-		case 2:
-			if (checkquest(4173,HUNTING) == 2) {
-				mes "You hunted all 30 Hyegun.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4173;
-				getexp 117000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4173) == -1) {
-				setquest 4173;
-				mes "Please hunt 30 Hyegun and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Hyegun yet...";
-			mes "Will you check again?";
-			close;
-		case 3:
-			if (checkquest(4174,HUNTING) == 2) {
-				mes "You hunted all 30 Antique Firelock.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4174;
-				getexp 82000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4174) == -1) {
-				setquest 4174;
-				mes "Please hunt 30 Antique Firelock and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Antique Firelock yet...";
-			mes "Will you check again?";
-			close;
-		case 4:
-			if (checkquest(4175,HUNTING) == 2) {
-				mes "You hunted all 30 Zipper Bear.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4175;
-				getexp 120000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4175) == -1) {
-				setquest 4175;
-				mes "Please hunt 30 Zipper Bear and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Zipper Bear yet...";
-			mes "Will you check again?";
-			close;
+		switch(select("Baba Yaga:Hyegun:Antique Firelock:Zipper Bear")) {
+			case 1: callsub L_Quest,4172,"Baba Yaga",72000;
+			case 2: callsub L_Quest,4173,"Hyegun",117000;
+			case 3: callsub L_Quest,4174,"Antique Firelock",82000;
+			case 4: callsub L_Quest,4175,"Zipper Bear",120000;
 		}
 	case 4:
 		switch(select("Earth Petite:Rafflesia:Venomous:Pitman:Yellow Novus")) {
-		case 1:
-			if (checkquest(4176,HUNTING) == 2) {
-				mes "You hunted all 30 Earth Petite.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4176;
-				getexp 72000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4176) == -1) {
-				setquest 4176;
-				mes "Please hunt 30 Earth Petite and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Earth Petite yet...";
-			mes "Will you check again?";
-			close;
-		case 2:
-			if (checkquest(4177,HUNTING) == 2) {
-				mes "You hunted all 30 Rafflesia.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4177;
-				getexp 72000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4177) == -1) {
-				setquest 4177;
-				mes "Please hunt 30 Rafflesia and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Rafflesia yet...";
-			mes "Will you check again?";
-			close;
-		case 3:
-			if (checkquest(4178,HUNTING) == 2) {
-				mes "You hunted all 30 Venomous.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4178;
-				getexp 72000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4178) == -1) {
-				setquest 4178;
-				mes "Please hunt 30 Venomous and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Venomous yet...";
-			mes "Will you check again?";
-			close;
-		case 4:
-			if (checkquest(4179,HUNTING) == 2) {
-				mes "You hunted all 30 Pitman.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4179;
-				getexp 86000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4179) == -1) {
-				setquest 4179;
-				mes "Please hunt 30 Pitman and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Pitman yet...";
-			mes "Will you check again?";
-			close;
-		case 5:
-			if (checkquest(4180,HUNTING) == 2) {
-				mes "You hunted all 30 Yellow Novus.";
-				mes "Thank you very much.";
-				next;
-				mes "I know it isn't much but here's a small gift.";
-				mes "I hope that it helps you at least a little bit.";
-				next;
-				erasequest 4180;
-				getexp 80000,0;
-				mes "Wooohoo!";
-				mes "Good luck.";
-				close;
-			}
-			if (checkquest(4180) == -1) {
-				setquest 4180;
-				mes "Please hunt 30 Yellow Novus and return here.";
-				close;
-			}
-			mes "Umm? You didn't hunt";
-			mes "all 30 Yellow Novus yet...";
-			mes "Will you check again?";
-			close;
+			case 1: callsub L_Quest,4176,"Earth Petite",72000;
+			case 2: callsub L_Quest,4177,"Rafflesia",72000;
+			case 3: callsub L_Quest,4178,"Venomous",72000;
+			case 4: callsub L_Quest,4179,"Pitman",86000;
+			case 5: callsub L_Quest,4180,"Yellow Novus",80000;
 		}
 	}
+	end;
+L_Quest:
+	if (checkquest(getarg(0),HUNTING) == 2) {
+		mes "You hunted all 30 "+getarg(1)+".";
+		mes "Thank you very much.";
+		next;
+		mes "I know it isn't much but here's a small gift.";
+		mes "I hope that it helps you at least a little bit.";
+		next;
+		erasequest getarg(0);
+		getexp getarg(2),0;
+		mes "Wooohoo!";
+		mes "Good luck.";
+		close;
+	}
+	if (checkquest(getarg(0)) == -1) {
+		setquest getarg(0);
+		mes "Please hunt 30 "+getarg(1)+" and return here.";
+		close;
+	}
+	mes "Umm? You didn't hunt";
+	mes "all 30 "+getarg(1)+" yet...";
+	mes "Will you check again?";
+	close;
 }