- Fixed bugreport:6484 invalid Quest ID for Puppet Master's Agony. (eden/56-70.txt)

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

1 files changed, 10 insertions, 292 deletions

diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt
index 90b570990..4ca3b1ab6 100644
--- a/npc/re/quests/eden/56-70.txt
+++ b/npc/re/quests/eden/56-70.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -12,20 +12,12 @@
 //= 1.0 First Version.
 //= 1.1 Some little optimization here and there. [Masao]
 //= 1.2 Added checkquest confirmation for -1. [Euphy]
+//= 1.3 Fixed Puppet Master's Agony Quest (12217 -> 3259). [Joseph]
 //============================================================
 
 moc_para01,42,38,3	script	Mission [56 - 70]	857,{
-
-	if (countitem(6219) > 0) {
-		if (checkquest(3259) > -1) {
-			erasequest 3259;
-		}
-		if (checkquest(3253) > -1) {
-			erasequest 3253;
-		}
-		if (checkquest(3265) > -1) {
-			erasequest 3265;
-		}
+	if (checkquest(12217) > -1) erasequest 12217;
+	if (countitem(6219)) {
 		mes "Here is the list of various adventures for level 55~70 adventurers.";
 		next;
 		mes "Lots of missions such as a Monster Hunting, Delivery Goods, Finding People.";
@@ -101,39 +93,6 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if (checkquest(3250) == 2) {
-					mes "This mission is assigned by the Rekenber corporation from Lighthalzen. Below are the details.";
-					next;
-					mes "Rekenber corporation is about to launch a new project called 'Green Medical Center'. For the first product of the project, we are preparing well-being Bandages.";
-					next;
-					mes "Regarding the project, we need to research monster's reactions when they are wrapped with Rotten Bandages.";
-					next;
-					mes "If you are interested, please hunt 30 Mummies and bring 30 Rotten Bandages. You can find them in the Pyramid West of Morroc.";
-					next;
-					mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-					next;
-					mes "- Rekenber corporation chief director 'Julie E Delph' -";
-					next;
-					mes " ";
-					next;
-					mes "Would you like to accept this mission?";
-					next;
-					switch (select("Accept the mission.:Do not accept the mission.")) {
-					case 1:
-						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 3250;
-							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
-							next;
-							mes "This mission doesn't have time limits.";
-							close;
-						}
-						mes "These missions are not fit for my level. I should look for other missions.";
-						close;
-					case 2:
-						close;
-					}
-				}
-				close;
 			case 2:
 				if (checkquest(3251) <= 0) {
 					mes "This mission is assigned by the Comodo cooperative society. Below are the details.";
@@ -197,37 +156,6 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if (checkquest(3251) == 2) {
-					mes "This mission is assigned by the Comodo cooperative society. Below are the details.";
-					next;
-					mes "Alligators have gone wild these days, they attack women and drunken people who hang out near the beach.";
-					next;
-					mes "This is a very shameful situation for us, the most wonderful vacation spot in Rune-Midgard.";
-					next;
-					mes "So, it would be very helpful if you hunt 30 Alligators to clean out this situation.";
-					next;
-					mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-					next;
-					mes " ";
-					next;
-					mes "Would you like to accept this mission?";
-					next;
-					switch (select("Accept the mission.:Do not accept the mission.")) {
-					case 1:
-						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 3251;
-							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
-							next;
-							mes "This mission doesn't have time limits.";
-							close;
-						}
-						mes "These missions are not fit for my level. I should look for other missions.";
-						close;
-					case 2:
-						close;
-					}
-				}
-				close;
 			case 3:
 				if (checkquest(3252) <= 0) {
 					mes "This mission is assigned by an unknown client from Izlude.";
@@ -307,45 +235,6 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if (checkquest(3252) == 2) {
-					mes "This mission is assigned by an unknown client from Izlude.";
-					next;
-					mes "I have admired the beach of Izlude, ever since I was born.";
-					next;
-					mes "When I was young, I found a mysterious creature in the Izlude dungeon, I had never seen something like that before.";
-					next;
-					mes "I instantly thought it was a mermaid. I was so supprised, I have studied about mermaids in whole my life.";
-					next;
-					mes "But, as I studied harder, I found that the creature was not a mermaid... yes, It wasn't beautiful at all like other mermaids...";
-					next;
-					mes "I finally tracked down the fact that it was a Merman, not a Mermaid!";
-					next;
-					mes "Merman... I have wasted my life studying this monster! So please hunt 30 Mermans to make me feel better.";
-					next;
-					mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-					next;
-					mes "-- Izlude 'The Lost dream mermaid' --";
-					next;
-					mes " ";
-					next;
-					mes "Would you like to accept this mission?";
-					next;
-					switch (select("Accept the mission.:Do not accept the mission.")) {
-					case 1:
-						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 3252;
-							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
-							next;
-							mes "This mission doesn't have time limits.";
-							close;
-						}
-						mes "These missions are not fit for my level. I should look for other missions.";
-						close;
-					case 2:
-						close;
-					}
-				}
-				close;
 			case 4:
 				if (checkquest(3254) <= 0) {
 					mes "This mission is assigned by the government officer of the Rune-Midgarts Kingdom.";
@@ -491,11 +380,11 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 					case 1:
 						mes "This mission is assigned by the Payon town hall.";
 						next;
-						mes "Wild animals are always annoyances to farmers.";
+						mes "Wild animals are always an annoyance to farmers.";
 						next;
 						mes "They attack our farm and ruin whole crops!! We can't stand it anymore!";
 						next;
-						mes "???????????????ð??????????????j??????????????????";
+						mes "So, we would like to ask for the help from brave adventurers.";
 						next;
 						mes "Please, hunt 30 Savages to save our crops!";
 						next;
@@ -522,41 +411,6 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if (checkquest(3255) == 2) {
-					mes "This mission is assigned by the Payon town hall.";
-					next;
-					mes "Wild animals are always annoyances to farmers.";
-					next;
-					mes "They attack our farm and ruin whole crops!! We can't stand it anymore!";
-					next;
-					mes "???????????????ð??????????????j??????????????????";
-					next;
-					mes "Please, hunt 30 Savages to save our crops!";
-					next;
-					mes "You can easily find those monsters around our town and field.";
-					next;
-					mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-					next;
-					mes "-- Payon town hall members --";
-					next;
-					mes " ";
-					next;
-					switch (select("Accept the mission.:Do not accept the mission.")) {
-					case 1:
-						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 3255;
-							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
-							next;
-							mes "This mission doesn't have time limits.";
-							close;
-						}
-						mes "These missions are not fit for my level. I should look for other missions.";
-						close;
-					case 2:
-						close;
-					}
-				}
-				close;
 			case 2:
 				if (checkquest(3256) <= 0) {
 					mes "This mission is assigned by the Morroc blacksmith Aragham.";
@@ -759,45 +613,6 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if (checkquest(3257) == 2) {
-					mes "This mission is assigned by an inventor Dorian from Izlude.";
-					next;
-					mes "Have you heard the story that if women have a grudge on their mind, it will bring natural disasters.";
-					next;
-					mes "Wow, so guys must watch out for those sensitive women! Make sure they don't have any grudges on you.";
-					next;
-					mes "Women can bring strange phenomenons with them!";
-					next;
-					mes "I am so intrigued with that story that I'm trying to prove that it can be true.";
-					next;
-					mes "So I need to make women upset! Haha, I know what a mean idea, right?";
-					next;
-					mes "But this is seriously just for studying... So please hunt 30 Sohee's who seems to be revived from victimized souls.";
-					next;
-					mes "So I can keep observing the case.";
-					next;
-					mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-					next;
-					mes "-- Elegance inventor Dorian --";
-					next;
-					mes " ";
-					next;
-					switch (select("Accept the mission.:Do not accept the mission.")) {
-					case 1:
-						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 3257;
-							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
-							next;
-							mes "This mission doesn't have time limits.";
-							close;
-						}
-						mes "These missions are not fit for my level. I should look for other missions.";
-						close;
-					case 2:
-						close;
-					}
-				}
-				close;
 			case 4:
 				if (checkquest(3258) <= 0) {
 					mes "This mission is assigned by Wallah from Payon.";
@@ -908,7 +723,7 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 				}
 				close;
 			case 5:
-				if (checkquest(12217) <= 0) {
+				if (checkquest(3259) <= 0) {
 					mes "This mission is assigned by puppet master Woonute from Geffen.";
 					next;
 					mes "You know being a puppet master is kind of a hard job to satisfy people.";
@@ -930,7 +745,7 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 					switch (select("Accept the mission.:Do not accept the mission.")) {
 					case 1:
 						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 12217;
+							setquest 3259;
 							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
 							next;
 							mes "This mission doesn't have time limits.";
@@ -942,7 +757,7 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if ((checkquest(12217,HUNTING) == 1) && (countitem(1060) < 30)) {
+				if ((checkquest(3259,HUNTING) == 1) && (countitem(1060) < 30)) {
 					mes "You have an on-going mission. Would you like to check the details?";
 					next;
 					switch (select("Check the details.:Cancel.")) {
@@ -967,7 +782,7 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if ((checkquest(12217,HUNTING) == 2) && (countitem(1060) > 29)) {
+				if ((checkquest(3259,HUNTING) == 2) && (countitem(1060) > 29)) {
 					mes "I have done pretty well for the mission. Should I report it now?";
 					next;
 					switch (select("Report the mission.:Do not report it yet.")) {
@@ -981,41 +796,6 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if (checkquest(12217) == 2) {
-					mes "This mission is assigned by puppet master Woonute from Geffen.";
-					next;
-					mes "You know being a puppet master is kind of a hard job to satisfy people.";
-					next;
-					mes "People can search and see so many different things on their own thesedays.";
-					next;
-					mes "Their expectations are getting high, I can't satisfy them anymore.";
-					next;
-					mes "But if I can make new toy concepts, like living toys, it will be ground breaking.";
-					next;
-					mes "I heard that there are live dolls called Marionettes. Can you hunt 30 Marionettes for me? And also bring 30 Golden Hair, those will be great materials for the new toys.";
-					next;
-					mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-					next;
-					mes "-- Puppet Master Woonute --";
-					next;
-					mes " ";
-					next;
-					switch (select("Accept the mission.:Do not accept the mission.")) {
-					case 1:
-						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 12217;
-							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
-							next;
-							mes "This mission doesn't have time limits.";
-							close;
-						}
-							mes "These missions are not fit for my level. I should look for other missions.";
-							close;
-					case 2:
-						close;
-					}
-				}
-				close;
 			}
 		case 3:
 			switch (select("Tiresome Flies:Dangerous Munak:Make the World green:Magic Wand")) {
@@ -1082,35 +862,6 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if (checkquest(3260) == 2) {
-					mes "This mission is assigned by an exterminator from Prontera.";
-					next;
-					mes "As the weather gets warmer, insects multiply more and more. It is already out of control.";
-					next;
-					mes "People in Prontera cannot sleep because of all the bugs in their house.";
-					next;
-					mes "So, please help us, hunt 30 Hunter Flies. Then the flies can be reduced slowly.";
-					next;
-					mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-					next;
-					mes "-- The Prontera exterminator --";
-					next;
-					switch (select("Accept the mission.:Do not accept the mission.")) {
-					case 1:
-						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 3260;
-							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
-							next;
-							mes "This mission doesn't have time limits.";
-							close;
-						}
-							mes "These missions are not fit for my level. I should look for other missions.";
-							close;
-					case 2:
-						close;
-					}
-				}
-				close;
 			case 2:
 				if (checkquest(3261) <= 0) {
 					mes "This mission is assigned by Cheese Dongja from Payon.";
@@ -1180,39 +931,6 @@ moc_para01,42,38,3	script	Mission [56 - 70]	857,{
 						close;
 					}
 				}
-				if (checkquest(3261) == 2) {
-					mes "This mission is assigned by Cheese Dongja from Payon.";
-					next;
-					mes "Have you heard about Munak?";
-					next;
-					mes "The ugly monster Munak is threatening people in Payon.";
-					next;
-					mes "So we need brave adventurers like you!";
-					next;
-					mes "Please hunt 30 Munaks then Payon will be in peace.";
-					next;
-					mes "Please confirm it to us after you complete the mission, then we will give you proper rewards.";
-					next;
-					mes "- Payon Cheese Dongja -";
-					next;
-					mes " ";
-					next;
-					switch (select("Accept the mission.:Do not accept the mission.")) {
-					case 1:
-						if ((BaseLevel > 54) && (BaseLevel < 71)) {
-							setquest 3261;
-							mes "I have successfully accepted the mission. I have to come back and confirm my work after I complete the mission.";
-							next;
-							mes "This mission doesn't have time limits.";
-							close;
-						}
-						mes "These missions are not fit for my level. I should look for other missions.";
-						close;
-					case 2:
-						close;
-					}
-				}
-				close;
 			case 3:
 				if (checkquest(3262) <= 0) {
 					mes "This mission is assigned by a gem dealer, Ibraham from Morroc.";