Selaa lähdekoodia

Fixed some quest log issues.
#871
#872
#873
Fixed #875

Atemo 9 vuotta sitten
vanhempi
commit
56a744014b

+ 5 - 5
npc/pre-re/mobs/dungeons/lhz_dun.txt

@@ -281,7 +281,7 @@ OnSummon:
 	case 6: set .@x,175;	set .@y,137;	break;
 	}
 	set .@mob,rand(1646,1651);
-	monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMvPDead";
+	monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnLhzMvPDead";
 
 	// Select Coordinates to summon a random 99 on
 	switch(rand(1,6)) {
@@ -293,15 +293,15 @@ OnSummon:
 	case 6: set .@x2,139;	set .@y2,259;	break;
 	}
 	set .@mob2,rand(1640,1645);
-	monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMVP";
+	monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMy99Dead";
 	end;
 
-OnMyMvPDead:
-	killmonster "lhz_dun03","summon_boss_lt::OnMVP";
+OnLhzMvPDead:
+	killmonster "lhz_dun03","summon_boss_lt::OnMy99Dead";
 	initnpctimer;
 	end;
 
 //Required to keep from erroring
-OnMVP:
+OnMy99Dead:
 	end;
 }

+ 12 - 6
npc/quests/first_class/tu_sword.txt

@@ -706,6 +706,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			set tu_swordman, 5;
 			next;
 		}
+		setquest 8215;
 		mes "[Shurank]";
 		mes "By now, I believe that you know enough about the Increase HP Recovery skill. Next time, I shall teach you what I know about the Provoke skill.";
 		close;
@@ -727,6 +728,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
+			changequest 8213,8214;
 			if (checkre(3))
 				getexp 97,0;
 			else
@@ -765,6 +767,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a little reward for all of your hard work. I hope you realize the importance of using Bash as";
 			mes "you grow stronger.";
 			set tu_swordman, 3;
+			changequest 8212,8213;
 			if (checkre(3))
 				getexp 83,0;
 			else
@@ -779,6 +782,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
+			changequest 8212,8214;
 			if (checkre(3))
 				getexp 97,0;
 			else
@@ -817,6 +821,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
+			changequest 8211,8212;
 			if (checkre(3))
 				getexp 58,0;
 			else
@@ -849,7 +854,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger...";
 			set tu_swordman, 3;
-			setquest 8211;
+			changequest 8211,8213;
 			if (checkre(3))
 				getexp 83,0;
 			else
@@ -867,6 +872,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
+			changequest 8211,8214;
 			if (checkre(3))
 				getexp 97,0;
 			else
@@ -930,7 +936,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
-			changequest 8211,8212;
+			setquest 8212;
 			if (checkre(3))
 				getexp 58,0;
 			else
@@ -956,7 +962,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 3;
-			changequest 8212,8213;
+			setquest 8213;
 			if (checkre(3))
 				getexp 83,0;
 			else
@@ -974,9 +980,9 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			set tu_swordman, 4;
-			completequest 8211;
-			completequest 8212;
-			completequest 8213;
+			// completequest 8211;
+			// completequest 8212;
+			// completequest 8213;
 			setquest 8214;
 			if (checkre(3))
 				getexp 97,0;

+ 5 - 2
npc/quests/quests_hugel.txt

@@ -27,6 +27,7 @@
 //=     - Juno Remedy Quest
 //= 2.2 Updated RE/Pre-RE EXP. [Euphy]
 //= 2.3 Added questlog support. [Euphy]
+//= 2.4 Fixed quest log for Odin Temple Excavation Quest. [Capuche]
 //============================================================
 
 // Medicine Quest :: hg_herv
@@ -208,7 +209,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "from... Drawer... H-heeelp me!";
 			mes "Adventurer! H-Heeeeelp~!";
 			set hg_herb,4;
-			changequest 8055,8056;
+			// changequest 8055,8056;
 			close;
 		} else if (hg_herb == 4) {
 			mes "[Allen]";
@@ -7954,7 +7955,7 @@ hu_in01,19,161,0	script	Alex	803,{
 			if (countitem(7511) > 4) {
 				delitem 7511,5; //Rune_Of_Darkness
 				set hg_odin,6; //Old_Blue_Box
-				changequest 11000,11002;
+				changequest 11001,11002;
 				getitem 603,1;
 				mes "[Alex]";
 				mes "Oh! Thank you";
@@ -8332,6 +8333,8 @@ hu_in01,14,11,4	script	Laura	70,{
 		next;
 		select("Yeah, yeah, whatever.:Sure thing.:I s-s-s-suppose...!:Yes, Ma'am!");
 		set hg_odin,17;
+		completequest 11002;
+		setquest 11006;
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Good.";

+ 12 - 10
npc/quests/quests_lighthalzen.txt

@@ -22,6 +22,7 @@
 //= 4.9 Fixed incorrect use of 'close'. [Joseph]
 //= 5.0 Updated RE/Pre-RE EXP. [Euphy]
 //= 5.1 Added GM management NPCs. [Euphy]
+//= 5.2 Fixed some quest log issues. [Capuche]
 //============================================================
 
 // Gangster Alert [Official Conversion]
@@ -5375,7 +5376,8 @@ lhz_in01,27,247,5	script	Representative#li_02	71,{
 		mes "please refer to the Rekenber";
 		mes "Guidebook located to my side.";
 		mes "Thank you and have a nice day.";
-		changequest 2088,2089;
+		if (isbegin_quest(2088))
+			changequest 2088,2089;
 		close;
 	}
 	else {
@@ -8386,7 +8388,7 @@ L_Mission:
 		mes "^3355FFGhalstein^000000 again. It's time";
 		mes "we let you loose, adventurer.";
 		set lhz_boss,43;
-		completequest 12028;
+		// completequest 12028;
 		close2;
 		cutin "",255;
 		end;
@@ -8396,8 +8398,8 @@ L_Mission:
 		mes "[Karl]";
 		mes ".........";
 		mes "............";
-		for(set .@i,12015; .@i<=12028; set .@i,.@i+1) {
-			if (checkquest(.@i) > 0 && checkquest(.@i) < 2)
+		for(set .@i,12015; .@i < 12028; set .@i,.@i+1) {
+			if (checkquest(.@i) >= 0 && checkquest(.@i) < 2)
 				completequest .@i;
 		}
 		close;
@@ -10406,7 +10408,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		next;
 		set lhz_rekenber,22;
 		getexp (checkre(3))?55000:550000,0;
-		completequest 12013;
+		completequest 12014;
 		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Look, I can't have";
@@ -10582,7 +10584,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "for the Rune-Midgarts Kingdom.";
 		next;
 		set lhz_rekenber,12;
-		changequest 5005,5006;
+		// changequest 5005,5006;
 		getexp (checkre(3))?40000:400000,0;
 		cutin "lhz_kaz03",2;
 		mes "[Kazien]";
@@ -10637,7 +10639,7 @@ lhz_in01,174,258,3	script	Young Man#reken	868,{
 		mes "to me for another job, okay?";
 		next;
 		set lhz_rekenber,8;
-		changequest 12008,12010;
+		changequest 12010,12011;
 		cutin "lhz_kaz01",2;
 		mes "[Kazien]";
 		mes "Don't forget...";
@@ -11068,7 +11070,7 @@ einbroch,55,52,3	script	Laboratory Guard#reken	 852,{
 						mes "I still can't allow you to";
 						mes "enter the laboratory.";
 						set lhz_rekenber,4;
-						changequest 12008,12010;
+						// changequest 12008,12010;
 						close;
 
 					case 2:
@@ -11427,7 +11429,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "know, embarassing orders...";
 		next;
 		set lhz_rekenber,11;
-		changequest 12011,12012;
+		changequest 12013,12014;
 		cutin "lhz_ryo01",2;
 		mes "[Lyozien]";
 		mes "No? Eh, just meet up with";
@@ -11510,7 +11512,7 @@ airplane_01,96,48,3	script	Man#Lyozien	868,{
 		mes "at the Airport, and tell him that his orders have safely arrived.";
 		next;
 		set lhz_rekenber,9;
-		changequest 12010,12011;
+		changequest 12011,12012;
 		cutin "lhz_ryo11",2;
 		mes "[Lyozien]";
 		mes "Once you tell Mr. Ahman";

+ 8 - 4
npc/quests/quests_rachel.txt

@@ -1831,8 +1831,10 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			mes "What? I don't understand you...";
 			close;
 		}
-		set rach_vice,11;
-		changequest 8114,8115;
+		if (rach_vice == 10) {
+			set rach_vice,11;
+			changequest 8114,8115;
+		}
 		mes "[Katinshuell]";
 		mes "You happy, now?";
 		mes "Quit trying to pry into";
@@ -2126,8 +2128,10 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "distinctively pleasant";
 		mes "scent about them. I guess";
 		mes "it must be pheremonal?";
-		set rach_vice,5;
-		changequest 8108,8109;
+		if (rach_vice == 4) {
+			set rach_vice,5;
+			changequest 8108,8109;
+		}
 		close;
 	}
 	else if (rach_vice == 2) {

+ 2 - 2
npc/re/mobs/dungeons/lhz_dun.txt

@@ -140,7 +140,7 @@ OnInit:
 		case 7:  set .@x,149;  set .@y,151;  break;
 	}
 	set .@mob,rand(2235,2241);
-	monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead";
+	monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnLhzMvPDead";
 
 	// Select Coordinates to summon a random 99 on
 	switch(rand(1,7)) {
@@ -156,7 +156,7 @@ OnInit:
 	monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead";
 	end;
 
-OnMyMVPDead:
+OnLhzMvPDead:
 	killmonster "lhz_dun04",strnpcinfo(3)+"::OnMy99Dead";
 	initnpctimer;
 OnMy99Dead: