Fixes the Eclage Quest Checking.

1 files changed, 38 insertions, 34 deletions

diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index 3d3f8a71d..4e75f8943 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -13158,6 +13158,7 @@ ecl_tdun03,68,80,3	script	New Oz#1	4_M_NEWOZ,1,1,{
 						getitem Splendide_Coin,1; //Splendide_Coin
 						close2;
 						cutin "",255;
+						end;
 					}
 					cutin "nines04",2;
 					mes "[New Oz]";
@@ -13169,6 +13170,7 @@ ecl_tdun03,68,80,3	script	New Oz#1	4_M_NEWOZ,1,1,{
 					mes "Seeing his eyes and hearing him coughing constantly, I can tell he needs something to eat, like meat.";
 					close2;
 					cutin "",255;
+					end;
 				}
 				else if (questprogress(13061) == 2) {
 					cutin "nines04",2;
@@ -13203,7 +13205,9 @@ ecl_tdun03,68,80,3	script	New Oz#1	4_M_NEWOZ,1,1,{
 						mes "[New Oz]";
 						mes "As long as I'm getting something to eat, I was just hoping for a good one. I'm sorry, but do me a favor please. I couldn't forget the taste of the meat.";
 						emotion e_slur;
-						erasequest 13062;
+						if (questprogress(13062,PLAYTIME) == 2){
+							erasequest 13062;
+						}
 						setquest 13061;
 						break;
 					case 2:
@@ -13269,7 +13273,10 @@ ecl_tdun03,68,80,3	script	New Oz#1	4_M_NEWOZ,1,1,{
 						next;
 						mes "[New Oz]";
 						mes "Fight off some Cherenes then. You don't have to eliminate that many because I'll start fighting soon, too! Haha.";
-						changequest 13064,13063;
+						if (questprogress(13064,PLAYTIME)){
+							erasequest 13064;
+						}
+						setquest 13063;
 						break;
 					case 2:
 						mes "[New Oz]";
@@ -13303,18 +13310,13 @@ ecl_tdun03,68,80,3	script	New Oz#1	4_M_NEWOZ,1,1,{
 						emotion e_thx;
 						delitem Leaf_Bookmark,20; //Leaf_Bookmark
 						changequest 13065,13066;
-						setquest 13066;
 						getexp 300000,300000;
 						getitem Splendide_Coin,1; //Splendide_Coin
-						close2;
 					} else{
 						cutin "nines01",2;
 						mes "[New Oz]";
 						mes "I don't need that many. Maybe one for each of them?";
-						close2;
 					}
-					cutin "",255;
-					end;
 				}
 				else if (questprogress(13065) == 2) {
 					cutin "nines01",2;
@@ -13325,28 +13327,30 @@ ecl_tdun03,68,80,3	script	New Oz#1	4_M_NEWOZ,1,1,{
 					mes "Would you mind helping me with that? What are friends for! Hahaha! Thanks!!";
 					emotion e_otl;
 					erasequest 13065;
-					close2;
-					cutin "",255;
-					end;
 				}
-				cutin "nines03",2;
-				mes "[New Oz]";
-				mes "When I came to myself, I realized that everything you brought me was gone! I thought I put it right here!";
-				next;
-				mes "[New Oz]";
-				mes "I'm really really sorry, but could you help me again? Just the thought of seeing my friends makes me cry like this. Please~?";
-				next;
-				switch (select("What a poor guy! I'll help him.:I can't take it anymore!")) {
-					case 1:
-						mes "[New Oz]";
-						mes "Bookmarks made of fallen leaves...Ah, they bring so many memories back and make my eyes teary. I'm sure my friends will love it!";
-						changequest 13066,13065;
-						break;
-					case 2:
-						cutin "nines04",2;
-						mes "[New Oz]";
-						mes "I see...It's my fault. I'll probably end my life here, collecting souvenirs...but it's none of your business...";
-						break;
+				else {
+					cutin "nines03",2;
+					mes "[New Oz]";
+					mes "When I came to myself, I realized that everything you brought me was gone! I thought I put it right here!";
+					next;
+					mes "[New Oz]";
+					mes "I'm really really sorry, but could you help me again? Just the thought of seeing my friends makes me cry like this. Please~?";
+					next;
+					switch (select("What a poor guy! I'll help him.:I can't take it anymore!")) {
+						case 1:
+							mes "[New Oz]";
+							mes "Bookmarks made of fallen leaves...Ah, they bring so many memories back and make my eyes teary. I'm sure my friends will love it!";
+							if (questprogress(13066,PLAYTIME)){
+								erasequest 13066;
+							}
+							setquest 13065;
+							break;
+						case 2:
+							cutin "nines04",2;
+							mes "[New Oz]";
+							mes "I see...It's my fault. I'll probably end my life here, collecting souvenirs...but it's none of your business...";
+							break;
+					}
 				}
 				close2;
 				cutin "",255;
@@ -14722,8 +14726,6 @@ ecl_in01,32,52,5	script	Traveler Fome#tl01	4_F_DOGTRAVELER,3,3,{
 		mes "The fact that you made it here actually seems just short of a miracle...";
 		close;
 	}
-	.@totaltemp =  questprogress(7423) + questprogress(7424) + questprogress(7425) + questprogress(7426);
-	.@total =  questprogress(7411) + questprogress(7412) + questprogress(7413);
 	if (ep14_2_mylord < 2 || (ep14_2_mylord == 2 && questprogress(7411) != 1)) {
 		mes "[Fome]";
 		mes "Come here and have a talk with us.";
@@ -14820,6 +14822,7 @@ ecl_in01,32,52,5	script	Traveler Fome#tl01	4_F_DOGTRAVELER,3,3,{
 	}
 	else if (ep14_2_mylord == 2) {
 		if (questprogress(7411) == 1) {
+			.@total = questprogress(7411) + questprogress(7412) + questprogress(7413);
 			if (.@total == 3) {
 				hideoffnpc "Eclage Guard#tl01";
 				cutin "minuel01",4;
@@ -14930,6 +14933,7 @@ ecl_in01,32,52,5	script	Traveler Fome#tl01	4_F_DOGTRAVELER,3,3,{
 			mes "I couldn't ask them straightforward questions related to that since I was afraid that it might hurt their pride.";
 			next;
 			setquest 7424;
+			.@totaltemp = questprogress(7423) + questprogress(7424) + questprogress(7425) + questprogress(7426);
 			if (.@totaltemp == 4) {
 				mes "As far as you know, the perception of Kardui among Laphines is somewhat favorable on the outside.";
 				mes "But in reality, the majority of Laphines feel uneasy, distrustful, and doubtful about him.";
@@ -14985,7 +14989,6 @@ ecl_in01,32,51,7	script	Traveler Litrip#tl02	4_M_DOGTRAVELER,{
 		mes "It's very impressive that you're able to come this far...";
 		close;
 	}
-	.@total =  questprogress(7411) + questprogress(7412) + questprogress(7413);
 	if (ep14_2_mylord < 2 || (ep14_2_mylord == 2 && questprogress(7412) != 1)) {
 		mes "[Litrip]";
 		mes "Oh, look at this strange traveler. ";
@@ -15045,6 +15048,7 @@ ecl_in01,32,51,7	script	Traveler Litrip#tl02	4_M_DOGTRAVELER,{
 	}
 	else if (ep14_2_mylord == 2) {
 		if (questprogress(7412) == 1) {
+			.@total = questprogress(7411) + questprogress(7412) + questprogress(7413);
 			if (.@total == 3) {
 				hideoffnpc "Eclage Guard#tl01";
 				cutin "minuel01",4;
@@ -15153,7 +15157,6 @@ ecl_in01,35,51,3	script	Traveler Chiba#tl03	4_M_DOGTRAVELER2,{
 		mes "But you...Hmm...I don't think you're skilled enough to travel around this area.";
 		close;
 	}
-	.@total =  questprogress(7411) + questprogress(7412) + questprogress(7413);
 	if (ep14_2_mylord < 2 || (ep14_2_mylord==2 && questprogress(7413)!=1)) {
 		mes "[Chiba]";
 		mes "You're a human from Midgard.";
@@ -15234,6 +15237,7 @@ ecl_in01,35,51,3	script	Traveler Chiba#tl03	4_M_DOGTRAVELER2,{
 	}
 	else if (ep14_2_mylord == 2) {
 		if (questprogress(7413) == 1) {
+			.@total = questprogress(7411) + questprogress(7412) + questprogress(7413);
 			if (.@total == 3) {
 				hideoffnpc "Eclage Guard#tl01";
 				cutin "minuel01",4;
@@ -15469,7 +15473,7 @@ ecl_in01,82,70,3	script	Eclage Guard#tl02	4_M_FAIRYSOLDIER,{
 		}
 	}
 	else if (ep14_2_mylord == 7) {
-		.@alltotal =  questprogress(7418) + questprogress(7419) + questprogress(7420);
+		.@alltotal = questprogress(7418) + questprogress(7419) + questprogress(7420);
 		if (questprogress(7418) == 0) {
 			mes "[Eclage Guard]";
 			mes "Eh, good to see you again.";
@@ -17566,7 +17570,7 @@ eclage,112,40,3	script	Eclage Guard Leo#tl	4_M_FAIRYSOLDIER2,{
 		mes "- You have too many items to proceed with the quest. -";
 		close;
 	}
-	.@alltotal =  questprogress(7420) + questprogress(7419) + questprogress(7418);
+	.@alltotal = questprogress(7420) + questprogress(7419) + questprogress(7418);
 	if (ep14_2_mylord < 7) {
 		mes "[Leo]";
 		mes "Welcome to Eclage, the capital of Laphines and a gateway to Alpheim.";