浏览代码

* Script updates.
- Added questlog support for Amatsu, Ayothaya, Hugel, Louyang, Lighthalzen, Niflheim, and Rachel quests.
- Updated Turbo Track with Renewal mounts; file split due to an NPC rename.
- Added missing cutins to Rekenber Job Quest.
- Added new "Stone Change" script (RE).
- Added Renewal coordinates to Juno's Airship Representative.
- Added Renewal sprites for Juno Soldiers (8W_SOLDIER -> 4_M_EIN_SOLDIER).
- Added Renewal Izlude Bulletin Board, but disabled unless valid coordinates are found.
- Minor updates to Malangdo Enchants dialogue.

Signed-off-by: Euphy <euphy@rathena.org>

Euphy 11 年之前
父节点
当前提交
0202126185

+ 25 - 23
npc/cities/yuno.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= KitsuneStarwind, kobra_k88, L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4a
+//= 1.5
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -16,10 +16,12 @@
 //= Fixed & Spellchecked [massdriller]
 //= 1.3 Started updating Juno NPCs based on iRO. 10% complete.
 //= 1.3.2 Started updating Juno NPCs based on iRO. 30% complete.
-//= 1.3.3 Removed Noyee	NPC (it's implemented in sleipnir_seal.txt)
+//= 1.3.3 Removed Noyee NPC (it's implemented in sleipnir_seal.txt)
 //= 1.4 Updated to Aegis 10.3 standards. [L0ne_W0lf]
 //=	Added Juno Airship Representative.
 //= 1.4a Corrected a Typo error (bugreport:716) [Samuray22]
+//= 1.5 Added Renewal coordinates for Payon and Izlude. [Euphy]
+//=     Split Soldier NPCs into Pre-RE/RE (sprite change).
 //============================================================ 
 
 // Juno
@@ -239,7 +241,7 @@ yuno,157,205,4	script	Juno Artisan#juno	54,{
 	}
 }
 
-yuno,150,283,4	script	Juno Soldier#juno	105,{
+-	script	::JunoSoldier1	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -253,8 +255,8 @@ yuno,150,283,4	script	Juno Soldier#juno	105,{
 	mes "You'd better be careful when you encounter this monster. It will damage armor and weapons in the twinkling of an eye.";
 	close;
 }
-	
-yuno,165,283,4	script	Juno Soldier#2juno	105,{
+
+-	script	::JunoSoldier2	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -269,8 +271,8 @@ yuno,165,283,4	script	Juno Soldier#2juno	105,{
 	mes "The name of this monster originated from a story about a poor geographer who, unfortunately, was eaten by this monster while he was immersed in his studies.";
 	close;
 }
-	
-yuno,227,292,4	script	Juno Soldier#3juno	105,{
+
+-	script	::JunoSoldier3	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -281,8 +283,8 @@ yuno,227,292,4	script	Juno Soldier#3juno	105,{
 	mes "Don't be fooled by its appearance, or you'll find yourself in trouble.";
 	close;
 }
-	
-yuno,165,228,4	script	Juno Soldier#4juno	105,{
+
+-	script	::JunoSoldier4	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -296,8 +298,8 @@ yuno,165,228,4	script	Juno Soldier#4juno	105,{
 	mes "Goat's legs are so strong because it's always climbing cliffs when it's not busy slaughtering the innocent.";
 	close;
 }
-	
-yuno,150,228,4	script	Juno Soldier#5juno	105,{
+
+-	script	::JunoSoldier5	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -312,8 +314,8 @@ yuno,150,228,4	script	Juno Soldier#5juno	105,{
 	mes "shining jellopy even exists!";
 	close;
 }
-	
-yuno,334,182,4	script	Juno Soldier#6juno	105,{
+
+-	script	::JunoSoldier6	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -324,8 +326,8 @@ yuno,334,182,4	script	Juno Soldier#6juno	105,{
 	mes "Its use is limited to the Sage class, and it increases the chance of inflicting critical attacks. So, for Sages, that dagger can be very useful, as well as make them look stylish in battle.";
 	close;
 }
-	
-yuno,263,320,4	script	Juno Soldier#7juno	105,{
+
+-	script	::JunoSoldier7	-1,{
 	mes "[Juno Soldier]";
 	mes "Welcome to Juno, the city of noble-mindedness.";
 	next;
@@ -366,14 +368,14 @@ yuno,142,183,5	script	Airship Representative	100,{
 	mes "The teleport fee is 1,800 zeny, regardless of where you want to go. Please let me know your desired destination.";
 	next;
 	switch(select("Prontera:Izlude:Geffen:Morroc:Payon:Alberta:Comodo:Cancel")) {
-	case 1: callsub S_Warp,"prontera",116,72;
-	case 2: callsub S_Warp,"izlude",94,103;
-	case 3: callsub S_Warp,"geffen",120,39;
-	case 4: callsub S_Warp,"morocc",156,46;
-	case 5: callsub S_Warp,"payon",69,100;
-	case 6: callsub S_Warp,"alberta",117,56;
-	case 7: callsub S_Warp,"comodo",209,143;
-	case 8: close;
+		case 1: callsub S_Warp,"prontera",116,72;
+		case 2: if (checkre(0)) callsub S_Warp,"izlude",128,98; else callsub S_Warp,"izlude",94,103;
+		case 3: callsub S_Warp,"geffen",120,39;
+		case 4: callsub S_Warp,"morocc",156,46;
+		case 5: if (checkre(0)) callsub S_Warp,"payon",162,59; else callsub S_Warp,"payon",69,100;
+		case 6: callsub S_Warp,"alberta",117,56;
+		case 7: callsub S_Warp,"comodo",209,143;
+		case 8: close;
 	}
 
 S_Warp:

+ 4 - 10
npc/other/bulletin_boards.txt

@@ -1,11 +1,13 @@
 //===== rAthena Script =======================================
-//= Official scripts for beginners from iRO
+//= Bulletin Boards
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
 //= 1.9
 //===== Compatible With: =====================================
 //= Any Athena Version
+//===== Description: ========================================= 
+//= Bulletin Boards for beginners.
 //===== Additional Comments: =================================
 //= 1.0 Added Alberta, Prontera, Izlude, Payon, Byalan Island,
 //=     Archer Village, Payon Cave and Coal Mine
@@ -167,7 +169,7 @@ prontera,148,49,5	script	Bulletin Board#09	837,{
 	mes "[Prontera: Capital of the]";
 	mes "[Rune-Midgards Kingdom]";
 	mes "From Prontera, ^5E5C69Izlude^000000 is located to the Southeast, ^1F3A11Payon^000000 to the far South, ^683C1FGeffen^000000 to the far West and ^2D3832Al De Baran^000000 to the far North.";
-	mes "Enjoy Your time in Prontera.";
+	mes "Enjoy your time in Prontera.";
 	close;
 }
 
@@ -450,7 +452,6 @@ moc_fild19,107,101,5	script	Bulletin Board#20	837,{
 }
 
 gef_tower,55,142,5	script	Bulletin Board#21	837,{
-
 	mes "[Geffen Dungeon]";
 	mes "^6B1312Caution!^000000"; 
 	mes "Geffen dungeon is consisted of 3 levels";
@@ -468,7 +469,6 @@ gef_tower,55,142,5	script	Bulletin Board#21	837,{
 }
 
 xmas_fild01,75,80,5	script	Bulletin Board#22	837,{
-
 	mes "[Winter Town, Lutie]";
 	mes "Welcome to Lutie, the town of snowfall.";
 	mes "Manufacturing toys in the toy factory is the main";
@@ -484,7 +484,6 @@ xmas_fild01,75,80,5	script	Bulletin Board#22	837,{
 }
 
 xmas,147,311,5	script	Bulletin Board#23	837,{
-
 	mes "[Toy Factory]";
 	mes "^6B1312Caution!^000000";
 	mes "Toy Factory is consisting of 2 levels.";
@@ -500,7 +499,6 @@ xmas,147,311,5	script	Bulletin Board#23	837,{
 }
 
 yuno_fild03,37,143,5	script	Bulletin Board#24	837,{
-
 	mes "[The Magma Dungeon, Nogg Road]";
 	mes "^6B1312Caution!^000000";
 	mes "Nogg Road is filled with very dangerous creatures.";
@@ -514,7 +512,6 @@ yuno_fild03,37,143,5	script	Bulletin Board#24	837,{
 }
 
 niflheim,200,191,5	script	Bulletin Board#25	837,{
-
 	mes "[City of the Dead, Nifflheim]";
 	mes "Welcome to Nifflheim, the City of the Dead.";
 	mes "Nifflheim was known as the other world where";
@@ -540,7 +537,6 @@ niflheim,200,191,5	script	Bulletin Board#25	837,{
 
 /*
 moc_fild15,267,264,5	script	Bulletin Board#26	837,{
-
 	mes "[Ant Hell]";
 	mes "^6B1312Caution!^000000";
 	mes "Ant Hell is consisting of 2 levels.";
@@ -557,7 +553,6 @@ moc_fild15,267,264,5	script	Bulletin Board#26	837,{
 */
 
 moc_ruins,61,164,5	script	Bulletin Board#27	837,{
-
 	mes "[Pyramids]";
 	mes "^6B1312Caution!^000000";
 	mes "Pyramids is consisting of total 7 levels as 4 levels on the earth and the rest under the ground.";
@@ -571,7 +566,6 @@ moc_ruins,61,164,5	script	Bulletin Board#27	837,{
 }
 
 glast_01,369,308,5	script	Bulletin Board#28	837,{
-
 	mes "[Glast Heim]";
 	mes "Glast Heim is an enormous dungeon with countless levels.";
 	mes "This dungeon is definately not for new or experienced adventurers";

+ 181 - 85
npc/other/turbo_track.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Joseph
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 0.x Previous authors: L0ne_W0lf, Kisuka, Elias
 //= 1.0 Merged Turbo Track. [Joseph]
 //= 1.1 Updated RE/Pre-RE EXP. [Euphy]
+//= 1.2 Added Renewal features. [Euphy]
 //============================================================
 
 function	script	F_tt	{
@@ -1924,8 +1925,10 @@ OnTouch:
 	set .@w$,callfunc("F_tt");
 	if (.@w$ == "n1") set $@end_time,gettimetick(0);
 	mapannounce strnpcinfo(4),strcharinfo(0) +" has just arrived at the Finish Line! Congratulations!",bc_map,"0xFFFF00";
-	if (.@w$ != "n1") setd "$ttnames$["+GetNumber(.@w$)+"]",strcharinfo(0);
-	donpcevent "TBT_Guide#Broadcast::Onwin_"+.@w$;
+	if (.@w$ != "n1") {
+		setd "$ttnames$["+GetNumber(.@w$)+"]",strcharinfo(0);
+		donpcevent "Turbo Track Guide::OnWin_"+.@w$;
+	}
 	warp strnpcinfo(4),384,161;
 	if (.@w$ == "e4" || .@w$ == "n4" || .@w$ == "n1") {
 		if (.@w$ == "e4") {
@@ -2098,7 +2101,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You are ranked as";
 			mes "the top player for";
 			mes "winning the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top1";
+			donpcevent "Turbo Track Guide::OnNew_Top1";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2122,7 +2125,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You've ranked Second";
 			mes "among the Top Five Players";
 			mes "who've won the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top2";
+			donpcevent "Turbo Track Guide::OnNew_Top2";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2146,7 +2149,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You've ranked Third";
 			mes "among the Top Five Players";
 			mes "who've won the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top3";
+			donpcevent "Turbo Track Guide::OnNew_Top3";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2170,7 +2173,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You've ranked Fourth";
 			mes "among the Top Five Players";
 			mes "who've won the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top4";
+			donpcevent "Turbo Track Guide::OnNew_Top4";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2194,7 +2197,7 @@ turbo_n_1,114,190,0	duplicate(Flasher#tt_main)	Flasher_Exit_2#n1	45,1,1
 			mes "You've ranked Fifth";
 			mes "among the Top Five Players";
 			mes "who've won the most games!";
-			donpcevent "TBT_Guide#Broadcast::Onnew_top5";
+			donpcevent "Turbo Track Guide::OnNew_Top5";
 			if (tt_rank == 29999) {
 				if ($ttnames$[7] == "Breezy Havana") {
 					set $ttnames$[7],strcharinfo(0);
@@ -2761,7 +2764,7 @@ OnInit:
 OnTouch:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is now entering the Small Cave! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00";
-	donpcevent "TBT_Guide#Broadcast::OnEnd_"+.@w$;
+	donpcevent "Turbo Track Guide::OnEnd_"+.@w$;
 	disablenpc "Notice_Maker1#TBT_"+.@w$;
 	end;
 	
@@ -3655,7 +3658,8 @@ turbo_room,130,92,3	script	Kafra Staff#tt	115,{
 
 turbo_room,124,86,0	shop	Turbo Track Merchant	90,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,1065:-1,1750:-1
 
-turbo_room,99,120,4	script	TBT_Guide#Broadcast	124,{
+// Official name: "TBT_Guide#Broadcast"
+turbo_room,99,120,4	script	Turbo Track Guide	124,{
 	mes "[Turbo Track Guide]";
 	mes "Good day~";
 	mes "Is there anything that";
@@ -3715,7 +3719,7 @@ turbo_room,99,120,4	script	TBT_Guide#Broadcast	124,{
 			mes "class or level requirements";
 			mes "to participate in the Turbo";
 			mes "Track. However, there is a";
-			mes "participation fee of 1,000 zeny. ^FFFFFFcobo^000000";
+			mes "participation fee of 1,000 zeny.";
 			next;
 			break;
 		case 2:
@@ -3730,7 +3734,7 @@ turbo_room,99,120,4	script	TBT_Guide#Broadcast	124,{
 			mes "The availability of specific";
 			mes "courses is determined by the";
 			mes "game mode. Would you like to";
-			mes "learn more about a certain course? ^FFFFFFcobo^000000";
+			mes "learn more about a certain course?";
 			next;
 			set .@exitloop,1;
 			while (.@exitloop) {
@@ -3925,47 +3929,47 @@ OnEnd_e16:
 	mapannounce "turbo_room","A [Expert Mode - 16 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onnew_top1:
+OnNew_Top1:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[9] + " has ranked Number One in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onnew_top2:
+OnNew_Top2:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[10] + " has ranked Second in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onnew_top3:
+OnNew_Top3:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[11] + " has ranked Third in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onnew_top4:
+OnNew_Top4:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[12] + " has ranked Fourth in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onnew_top5:
+OnNew_Top5:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[13] + " has ranked Fifth in the Turbo Track Hall of Honor!",bc_map,"0x00ff00";
 	end;
 
-Onwin_n4:
+OnWin_n4:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[1] + " just won a [Normal Mode - 4 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_n8:
+OnWin_n8:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[2] + " just won a [Normal Mode - 8 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_n16:
+OnWin_n16:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[3] + " just won a [Normal Mode - 16 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_e4:
+OnWin_e4:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[4] + " just won an [Expert Mode - 4 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_e8:
+OnWin_e8:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[5] + " just won an [Expert Mode - 8 Person] game!",bc_map,"0x70DBDB";
 	end;
 
-Onwin_e16:
+OnWin_e16:
 	mapannounce "turbo_room","Congratulations! " + $ttnames$[6] + " just won an [Expert Mode - 16 Person] game!",bc_map,"0x70DBDB";
 	end;
 }
@@ -4204,7 +4208,7 @@ turbo_room,93,117,5	script	Point Exchange Helper	125,{
 					mes "I'm sorry, but your";
 					mes "request has exceeded the";
 					mes "maximum limit. You can only";
-					mes "request up to 50 scrolls at once. ^FFFFFFcobo^000000";
+					mes "request up to 50 scrolls at once.";
 					close;
 				}
 				else {
@@ -4597,27 +4601,70 @@ OnTouch:
 		mes "things using the Kafra Service.^000000";
 		close;
 	}
-	set .@now_weight,MaxWeight-Weight;
 	if ((BaseJob == Job_Knight || BaseJob == Job_Crusader) && checkriding()) {
-		if (.@now_weight < 20000) {
+		if (MaxWeight-Weight < 20000) {
+			if (!(eaclass()&EAJL_THIRD)) {
+				set .@mount$,(BaseJob == Job_Knight)?"Peco Peco":"Grand Peco";
+				mes "[Helper]";
+				mes .@mount$+"s are prohibited";
+				mes "in the Turbo Track Arena.";
+				mes "Please dismount from your";
+				mes .@mount$+" and you will receive";
+				mes "a Free Ticket for Peco Ride";
+				mes "for retrieving your "+.@mount$+".";
+			} else {
+				set .@mount$,(BaseJob == Job_Knight)?"Dragon":"Gryphon";
+				mes "[Helper]";
+				mes .@mount$+"s are prohibited";
+				mes "in the Turbo Track Arena.";
+				mes "Please dismount from your";
+				mes .@mount$+". You can retrieve";
+				mes "it for free outside.";
+			}
+			close2;
+			warp "alde_gld",183,199;
+			end;
+		} else {
+			if (!(eaclass()&EAJL_THIRD)) {
+				setriding 0;
+				getitem 7310,1; //Free_Peco_Ticket
+			} else {
+				if (BaseJob == Job_Knight)
+					setdragon 0;
+				else
+					setriding 0;
+			}
+			warp "turbo_room",100,65;
+		}
+	} else if ((Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) && checkoption(Option_Wugrider)) {
+		if (MaxWeight-Weight < 20000) {
 			mes "[Helper]";
-			mes "Peco Pecos are prohibited";
+			mes "Wargs are prohibited";
 			mes "in the Turbo Track Arena.";
-			mes "Please dismount from your";
-			mes "Peco Peco and you will receive";
-			mes "a Free Ticket for Peco Ride";
-			mes "for retrieving your Peco Peco.";
+			mes "Please dismount from your Warg.";
 			close2;
 			warp "alde_gld",183,199;
 			end;
+		} else {
+			setoption Option_Wugrider,0;
+			warp "turbo_room",100,65;
 		}
-		else {
-			setriding 0;
-			getitem 7310,1; //Free_Peco_Ticket
+	} else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmadogear()) {
+		if (MaxWeight-Weight < 20000) {
+			mes "[Helper]";
+			mes "Magic Gears are prohibited";
+			mes "in the Turbo Track Arena.";
+			mes "Please dismount from your";
+			mes "Magic Gear. You can retrieve";
+			mes "it for free outside.";
+			close2;
+			warp "alde_gld",183,199;
+			end;
+		} else {
+			setmadogear 0;
 			warp "turbo_room",100,65;
 		}
-	}
-	else
+	} else
 		warp "turbo_room",100,65;
 	end;
 }
@@ -4629,7 +4676,11 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	845,{
 	mes "Turbo Track~";
 	next;
 	mes "[Guide]";
-	mes "Peco Pecos are prohibited inside the Turbo Track Arena. But anyone riding on a Peco Peco will receive a Free Peco Peco Mount Ticket at the Turbo Track Entrance and automatically dismount.";
+	if (checkre(0))
+		mes "Peco Pecos, Grand Pecos, Dragons, Gryphons, Wargs and Magic Gears are prohibited inside the Turbo Track Arena.";
+	else
+		mes "Peco Pecos are prohibited inside the Turbo Track Arena.";
+	mes "But anyone riding on a Peco Peco will receive a Free Peco Peco Mount Ticket at the Turbo Track Entrance and automatically dismount.";
 	next;
 	mes "[Guide]";
 	mes "Well then,";
@@ -4638,70 +4689,115 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	845,{
 	close;
 }
 
-alde_gld,181,199,5	script	Peco Peco Manager	845,{
-	mes "[Peco Peco Manager]";
+-	script	::MountManager_turbo	-1,{
+	set .@n$, "["+strnpcinfo(1)+"]";
+	mes .@n$;
+	if (ismounting()) {
+		mes "Please get off of that creature you're riding on.";
+		mes "Then talk to me again.";
+		close;
+	}
 	if (BaseJob == Job_Knight || BaseJob == Job_Crusader) {
-		mes "Welcome, would you like";
-		mes "to retrieve your Peco Peco?";
+		if (!(eaclass()&EAJL_THIRD)) {
+			if (BaseJob == Job_Knight) {
+				set .@zeny,2500;
+				set .@zeny$,"2,500";
+				set .@mount$,"Peco Peco";
+			} else {
+				set .@zeny,3500;
+				set .@zeny$,"3,500";
+				set .@mount$,"Grand Peco";
+			}
+			set .@skill,63;
+			set .@skill$,"Peco Peco Ride";
+			set .@riding, checkriding();
+			set .@i,1;
+		} else {
+			if (BaseJob == Job_Knight) {
+				set .@mount$,"Dragon";
+				set .@skill,63;
+				set .@skill$,"Dragon Training";
+				set .@riding, checkdragon();
+				set .@i,2;
+			} else {
+				set .@mount$,"Gryphon";
+				set .@skill,63;
+				set .@skill$,"Peco Peco Ride";
+				set .@riding, checkriding();
+				set .@i,1;
+			}
+		}
+	} else if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) {
+		set .@mount$,"Magic Gear";
+		set .@skill,2255;
+		set .@skill$,"Magic Gear License";
+		set .@riding, checkmadogear();
+		set .@i,3;
+	} else {
+		mes "Thank you for";
+		mes "visiting Al De Baran's";
+		mes "Turbo Track~";
+		close;
+	}
+	mes "Welcome, would you like";
+	mes "to retrieve your "+.@mount$+"?";
+	if (.@zeny) {
 		mes "Please show me your Free";
 		mes "Ticket for Peco Ride. You";
 		mes "may also pay a rental fee";
-		mes "of 2,500 zeny.";
-		next;
-		switch(select("Use:Cancel")) {
-		case 1:
-			if (getskilllv(63) == 0) {
-				mes "[Peco Peco Manager]";
-				mes "I'm sorry, but you're";
-				mes "not eligible for this";
-				mes "service. Please go learn";
-				mes "the Peco Peco Ride skill first.";
+		mes "of "+.@zeny$+" zeny.";
+	}
+	next;
+	switch(select("Yes:Cancel")) {
+	case 1:
+		if (getskilllv(.@skill) == 0) {
+			mes .@n$;
+			mes "I'm sorry, but you're";
+			mes "not eligible for this";
+			mes "service. Please go learn";
+			mes "the "+.@skill$+" skill first.";
+			close;
+		} else {
+			if (.@riding) {
+				mes .@n$;
+				mes "You're already";
+				mes "mounted on a";
+				mes .@mount$+".";
+				mes "Thank you~";
 				close;
-			}
-			else {
-				if (checkriding()) {
-					mes "[Peco Peco Manager]";
-					mes "You're already";
-					mes "mounted on a";
-					mes "Peco Peco.";
-					mes "Thank you~";
-					close;
-				}
-				else {
-					if (countitem(7310) < 1 && Zeny < 2500) {
-						mes "[Peco Peco Manager]";
+			} else {
+				if (.@zeny) {
+					if (countitem(7310) < 1 && Zeny < .@zeny) {
+						mes .@n$;
 						mes "I'm sorry, but you";
 						mes "don't have a Free Ticket";
-						mes "for Peco Ride or 2,500 zeny.";
+						mes "for Peco Ride or "+.@zeny$+" zeny.";
 						mes "to use the Peco rental service.";
 						close;
-					}
-					else {
+					} else {
 						if (countitem(7310) > 0)
 							delitem 7310,1; //Free_Peco_Ticket
 						else
-							set zeny,zeny-2500;
-						setriding;
-						mes "[Peco Peco Manager]";
-						mes "Thank you for";
-						mes "your patronage~";
-						close;
+							set zeny,zeny-.@zeny;
 					}
 				}
+				switch(.@i) {
+					case 1: setriding; break;
+					case 2: setdragon; break;
+					case 3: setmadogear; break;
+				}
+				mes .@n$;
+				mes "Thank you for";
+				mes "your patronage~";
+				close;
 			}
-		case 2:
-			mes "[Peco Peco Manager]";
-			mes "Are you going";
-			mes "back to race in";
-			mes "the Turbo Track?";
-			mes "Good luck!";
-			close;
 		}
-	}
-	else {
-		mes "Thank you for";
-		mes "visiting Al De Baran's";
-		mes "Turbo Track~";
+	case 2:
+		mes .@n$;
+		mes "Are you going";
+		mes "back to race in";
+		mes "the Turbo Track?";
+		mes "Good luck!";
 		close;
 	}
 }

+ 22 - 0
npc/pre-re/cities/yuno.txt

@@ -0,0 +1,22 @@
+//===== rAthena Script ======================================= 
+//= Juno City
+//===== By: ================================================== 
+//= Euphy
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= [Official Conversion]
+//= NPCs for the City of Juno
+//===== Additional Comments: ================================= 
+//= 1.0 First version.
+//============================================================ 
+
+yuno,150,283,4	duplicate(JunoSoldier1)	Juno Soldier#juno	105
+yuno,165,283,4	duplicate(JunoSoldier2)	Juno Soldier#2juno	105
+yuno,227,292,4	duplicate(JunoSoldier3)	Juno Soldier#3juno	105
+yuno,165,228,4	duplicate(JunoSoldier4)	Juno Soldier#4juno	105
+yuno,150,228,4	duplicate(JunoSoldier5)	Juno Soldier#5juno	105
+yuno,334,182,4	duplicate(JunoSoldier6)	Juno Soldier#6juno	105
+yuno,263,320,4	duplicate(JunoSoldier7)	Juno Soldier#7juno	105

+ 5 - 3
npc/pre-re/other/bulletin_boards.txt

@@ -1,18 +1,20 @@
 //===== rAthena Script =======================================
-//= Official scripts for beginners from iRO
+//= Bulletin Boards
 //===== By: ==================================================
 //= Euphy
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
 //= Any Athena Version
+//===== Description: ========================================= 
+//= Bulletin Boards for beginners.
 //===== Additional Comments: =================================
-//= 1.0 Moved Izlude NPCs to Pre-RE path.
+//= 1.0 Moved Izlude NPCs to Pre-RE/RE paths.
 //============================================================
 
 izlude,131,116,4	script	Bulletin Board#5	837,{
 	mes "[Izlude: The Satellite City]";
-	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population";
+	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population.";
 	next;
 	mes "[Izlude: The Satellite City]";
 	mes "Points of interest include the Swordsman Association building which allows adventurers to change their job to Swordsman, and the Battle Area that is North of Izlude.";

+ 15 - 0
npc/pre-re/other/turbo_track.txt

@@ -0,0 +1,15 @@
+//===== rAthena Script =======================================
+//= Turbo Track
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Pre-Renewal duplicates.
+//===== Additional Comments: =================================
+//= 1.0 Split Peco Peco Manager NPC.
+//============================================================
+
+alde_gld,181,199,5	duplicate(MountManager_turbo)	Peco Peco Manager	845

+ 2 - 0
npc/pre-re/scripts_athena.conf

@@ -9,6 +9,7 @@ npc: npc/pre-re/airports/izlude.txt
 npc: npc/pre-re/cities/alberta.txt
 npc: npc/pre-re/cities/izlude.txt
 npc: npc/pre-re/cities/jawaii.txt
+npc: npc/pre-re/cities/yuno.txt
 
 // --------------------------- Guides ---------------------------
 npc: npc/pre-re/guides/guides_alberta.txt
@@ -46,6 +47,7 @@ npc: npc/pre-re/other/bulletin_boards.txt
 npc: npc/pre-re/other/mercenary_rent.txt
 npc: npc/pre-re/other/msg_boards.txt
 npc: npc/pre-re/other/resetskill.txt
+npc: npc/pre-re/other/turbo_track.txt
 
 // --------------------------- Quests ---------------------------
 // - Repeatable EXP Quests (iRO) --------------------------------

+ 45 - 15
npc/quests/quests_amatsu.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena team & others? & MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.4a
+//= 1.5
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
 //= 1.4 Added missing checkweight. [L0ne_W0lf]
 //= 1.4a Fixed typo in condition check [Gepard]
+//= 1.5 Added questlog support. [Euphy]
 //============================================================ 
 
 // Momotaro Event
@@ -136,8 +137,12 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 		mes "This is your reward for you.";
 		mes "Please continue to enjoy stories~";
 		mes " ";
-		if (event_momo == 3) {
-			set event_momo,4;
+		set .@event_momo, event_momo;
+		set event_momo,4;
+		completequest 8128;
+		completequest 8129;
+		completequest 8130;
+		if (.@event_momo == 3) {
 			set .@gift_1,rand(1,10);
 			if (.@gift_1 == 1) {
 				getitem 659,1; //Heart_Of_Her
@@ -171,7 +176,6 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 			}
 		}
 		else {
-			set event_momo,4;
 			set .@gift_2,rand(1,10);
 			if (.@gift_2 == 1) {
 				getitem 622,1; //Rainbow_Carrot
@@ -207,7 +211,7 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 		close;
 	}
 }
-	
+
 ama_test,52,44,3	script	Assistant#ama	109,{
 	if (event_momo == 0) {
 		mes "[Satoshi]";
@@ -398,7 +402,7 @@ OnTouch:
 	mes ".....or bl-ue toilet paper.... ";
 	close;
 }
-	
+
 ama_test,49,93,4	script	Grandpa#ama	766,{
 	end;
 
@@ -406,7 +410,7 @@ OnInit:
 	disablenpc "Grandpa#ama";
 	end;
 }
-	
+
 ama_test,50,93,4	script	Grandma#ama1	761,10,10,{
 	end;
 
@@ -424,6 +428,7 @@ OnTouch:
 	mes "[Grandpa]";
 	mes "Hmm. The Chief said Dokebi earned 20 million zeny by hacking others' accounts...";
 	next;
+	setquest 8127;
 	mes "[Grandma]";
 	mes "Dohhhhhhh!!!! ";
 	next;
@@ -462,7 +467,7 @@ OnTouch:
 	}
 	end;
 }
-	
+
 ama_test,34,15,0	script	Dokebi#ez	-1,{
 OnInit:
 	disablenpc "Dokebi#ez";
@@ -510,7 +515,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,34,16,0	script	Dokebi#hd	-1,{
 OnInit:
 	disablenpc "Dokebi#hd";
@@ -558,7 +563,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,50,100,3	script	Coach#ama	762,15,15,{
 	mes "[Coach]";
 	mes "Hoho~ Good.";
@@ -584,6 +589,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "...Don't give me that look.";
 		mes "I was just joking. Hmmhmm.";
 		next;
+		changequest 8127,8128;
 		mes "[Coach]";
 		mes "Now, the Momotaro story is over.";
 		mes "You can get your reward when you talk to the Publisher lady you saw first.";
@@ -605,6 +611,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "Alright, hot stuff.";
 		mes "Do you want to listen to my proposal?";
 		next;
+		changequest 8127,8129;
 		mes "[Coach]";
 		mes "At this point I'm supposed to send you back...BUT!";
 		mes "I really want to know";
@@ -618,6 +625,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		mes "Also, this mission will be pretty hard.";
 		next;
 		if (select("Nah.. I'm good.:Bring it on, foo'!") == 1) {
+			erasequest 8129;
 			mes "[Coach]";
 			mes "Hoho~I understand...";
 			mes "You must be exhausted from the previous battle. It would have been a grand battle, though...";
@@ -632,6 +640,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 			mes "Don't lose your high self-esteem";
 			mes "in the future. Farewell.";
 			next;
+			setquest 8128;
 			warp "amatsu",223,230;
 			disablenpc "Coach#ama";
 			donpcevent "Timer#ama::OnDisable";
@@ -659,7 +668,7 @@ OnTouch:
 	mes "Tada~~~ !";
 	close;
 }
-	
+
 ama_test,34,17,0	script	Am Mut#ama	-1,{
 OnInit:
 	disablenpc "Am Mut#ama";
@@ -696,7 +705,7 @@ OnMyMobDead:
 	}
 	end;
 }
-	
+
 ama_test,50,100,3	script	Coach#after	762,5,5,{
 	end;
 
@@ -720,13 +729,14 @@ OnTouch:
 	mes "Don't forget to get your reward~";
 	close2;
 	set event_momo,3;
+	changequest 8129,8130;
 	warp "amatsu",223,230;
 	disablenpc "Coach#after";
 	donpcevent "Timer#ama::OnDisable";
 	donpcevent "Assistant#ama::OnReset";
 	end;
 }
-	
+
 ama_test,34,18,0	script	Timer#ama	-1,{
 OnInit:
 	disablenpc "Timer#ama";
@@ -768,7 +778,7 @@ OnTimer362500:
 	donpcevent "Timer#ama::OnDisable";
 	end;
 }
-	
+
 ama_test,50,100,0	script	backwarp#ama	-1,25,25,{
 OnInit:
 	disablenpc "backwarp#ama";
@@ -816,6 +826,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you my shop's special cuisine, Fish Slice, in return.";
 			next;
 			set fish_r,0;
+			erasequest 10036;
 			delitem 529,10; //Candy
 			getitem 544,15; //Fish_Slice
 			mes "[Magumagu]";
@@ -847,6 +858,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you two sets of Sushi in return.";
 			next;
 			set fish_r,0;
+			erasequest 10037;
 			delitem 964,10; //Crap_Shell
 			getitem 551,20; //Shusi
 			mes "[Magumagu]";
@@ -878,6 +890,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "I will give you several sets of Sushi in return.";
 			next;
 			set fish_r,0;
+			erasequest 10038;
 			delitem 961,10; //Conch
 			getitem 551,30; //Shusi
 			mes "[Magumagu]";
@@ -908,8 +921,9 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			mes "Thanks. It is nothing but";
 			mes "I will give you a large amount of food in return.";
 			next;
-			delitem 1023,10; //Fish_Tail
 			set fish_r,0;
+			erasequest 10039;
+			delitem 1023,10; //Fish_Tail
 			getitem 544,20; //Fish_Slice
 			getitem 551,30; //Shusi
 			mes "[Magumagu]";
@@ -942,6 +956,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			next;
 			delitem 736,1; //White_Platter
 			set fish_r,0;
+			erasequest 10040;
 			getitem 551,20; //Shusi
 			mes "[Magumagu]";
 			mes "Share it with your friends";
@@ -1000,6 +1015,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				next;
 				delitem 950,100; //Heart_Of_Mermaid
 				set ama_sushi,4;
+				completequest 10041;
 				getitem 1144,1; //Sasimi
 				mes "[Magumagu]";
 				mes "Here, take my knife.";
@@ -1063,6 +1079,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				next;
 				set ama_sushi,ama_sushi+1;
 				set fish_r,0;
+				erasequest 10041;
 				mes "[Magumagu]";
 				mes "Thanks a lot for today! Haha!";
 				mes "Come back again when you feel like helping. Take care...!!!";
@@ -1200,6 +1217,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			set .@fish_m1,rand(1,10);
 			if (.@fish_m1 == 1 || .@fish_m1 == 2) {
 				set fish_r,1;
+				setquest 10036;
 				mes "[Magumagu]";
 				mes "I need some candies to make";
 				mes "a dessert for the customers.";
@@ -1209,6 +1227,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 3 || .@fish_m1 == 4) {
 				set fish_r,2;
+				setquest 10037;
 				mes "[Magumagu]";
 				mes "I need some crab shells to make";
 				mes "a sauce for my cuisine...";
@@ -1218,6 +1237,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 5 || .@fish_m1 == 6) {
 				set fish_r,3;
+				setquest 10038;
 				mes "[Magumagu]";
 				mes "I have used all of my conches.";
 				mes "I need it to make an appetizer...";
@@ -1227,6 +1247,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 7 || .@fish_m1 == 8) {
 				set fish_r,4;
+				setquest 10039;
 				mes "[Magumagu]";
 				mes "Decorative fish tails are out of";
 				mes "stock. This is urgent...";
@@ -1236,6 +1257,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			}
 			else if (.@fish_m1 == 9) {
 				set fish_r,5;
+				setquest 10040;
 				mes "[Magumagu]";
 				mes "We are missing a platter to serve";
 				mes "fish slices to customers.";
@@ -1246,6 +1268,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 			else {
 				if (rand(1,10) == 1) {
 					set fish_r,6;
+					setquest 10041;
 					mes "[Magumagu]";
 					mes "Don't ask me why...";
 					mes "But, I need something special...";
@@ -1259,6 +1282,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 				}
 				else {
 					set fish_r,5;
+					setquest 10040;
 					mes "[Magumagu]";
 					mes "We are missing a platter to serve";
 					mes "fish slices to customers.";
@@ -1349,6 +1373,7 @@ amatsu,164,174,4	script	Gate Soldier#ama5	767,{
 		mes "The mother of our lord is resting in here. She needs her rest.";
 		next;
 		set event_amatsu,1;
+		setquest 8131;
 		mes "[Gate Soldier]";
 		mes "She has been sick for months.";
 		mes "That is why she is staying in here.";
@@ -1781,6 +1806,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 			mes "may be able to cure my mother's disease. I will reward you well if you succeed...";
 			next;
 			set event_amatsu,2;
+			changequest 8131,8132;
 			mes "[Ishida Yoshinaga]";
 			mes "I beg you...Please.";
 			mes "My mother is living in a house outside of the palace.";
@@ -1838,6 +1864,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 			mes "with this ticket.";
 			next;
 			set event_amatsu,6;
+			completequest 8135;
 			delitem 1022,1; //Fox_Tail
 			getitem 7160,1; //Lord's_Passable_Ticket
 			mes "[Ishida Yoshinaga]";
@@ -1923,6 +1950,7 @@ ama_in01,22,111,0	script	Grandma#ama2	761,{
 			monster "ama_in01",22,111,"Nine Tails",1180,1;
 			killmonsterall "ama_in01";
 			set event_amatsu,5;
+			changequest 8134,8135;
 			getitem 1022,1; //Fox_Tail
 			mes "[....]";
 			mes "^FF6060Everything that";
@@ -2051,6 +2079,7 @@ amatsu,189,166,5	script	Kouji#ama	764,{
 		mes "A fox is following me!";
 		mes "If he doesn't leave when I scream and shout!";
 		mes "The North Shrine Priest should help me out~";
+		changequest 8132,8133;
 	}
 	else if (event_amatsu == 4) {
 		mes "Priest, priest~";
@@ -2146,6 +2175,7 @@ ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
 		mes "Good. Show that spiritual";
 		mes "energy to the fox several times.";
 		mes "Sooner or later, you'll be successful.";
+		changequest 8133,8134;
 		close;
 	}
 	else if (event_amatsu == 4) {

+ 50 - 27
npc/quests/quests_ayothaya.txt

@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 2.4
+//= 2.5
 //===== Compatible With ======================================
 //= rAthena SVN
 //===== Description ==========================================
@@ -30,6 +30,7 @@
 //= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.3 Replaced effect numerics with constants. [Samuray22]
 //= 2.4 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.5 Added questlog support. [Euphy]
 //============================================================
 
 // Ayothaya Ring Quest
@@ -78,7 +79,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 	}
 	else if(thai_find == 2)
 	{
-		if(countitem(7288)) //Engagement Ring
+		if(countitem(7288))
 		{
 			mes "[Shuda]";
 			mes "Ah... Is it...?!!";
@@ -135,9 +136,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "(Why am I always";
 				mes "doing things for other";
 				mes "people anyway?!)";
-				delitem 7288,1; //Engagement Ring
-				set thai_find,3;
-				close;
+				break;
 			case 2:
 				mes "[Shuda]";
 				mes "Yes, I knew I could count on you! So find Annon! It's my destiny to make him ^660000mine^000000. Hoo ho ho ho ho!";
@@ -148,10 +147,12 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "[Shuda]";
 				mes "Will you please tell Annon that";
 				mes "I got my ring back so he can come back to me now? I hope you'll remember that for me, adventurer.";
-				delitem 7288,1; //Engagement Ring
-				set thai_find,3;
-				close;
+				break;
 			}
+			delitem 7288,1; //Thai_Ring
+			changequest 12030,12031;
+			set thai_find,3;
+			close;
 		}
 		else
 		{
@@ -171,6 +172,8 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 			mes "my ring. I'll be waiting";
 			mes "here for the good news.";
 			mes "Oho ho ho ho ho~!";
+			if (checkquest(12029) == -1)
+				setquest 12029;
 			close;
 		}
 	}
@@ -404,6 +407,8 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					next;
 					mes "[Shuda]";
 					mes "So go and look under the water! There's no water current, so I'm sure it's still there! What are you waiting for, it's should be an easy swim for you! Oho ho ho ho ho!";
+					if (checkquest(12029) == -1)
+						setquest 12029;
 					set thai_find,1;
 					close;
 				}
@@ -452,7 +457,7 @@ OnTouch:
 	
 ayo_dun02,91,263,0	script	#Annonblood	111,2,3,{
 
-if(!$annonactive)
+if(!$@annonactive)
 {
 	if(thai_find == 13)
 	{
@@ -498,7 +503,7 @@ if(!$annonactive)
 				mes "^3355FFshrubbery, you find";
 				mes "a small burrow.^000000";
 				next;
-				set $annonactive,1;
+				set $@annonactive,1;
 				enablenpc "Haggard Man";
 				mes "[Haggard Man]";
 				mes "^666666*Cough cough!*^000000";
@@ -514,7 +519,7 @@ if(!$annonactive)
 					mes "Hey...";
 					mes "What are you doi--";
 					next;
-					set $annonactive,0;
+					set $@annonactive,0;
 					disablenpc "Haggard Man";
 					mes "^3355FFHe vanished!^000000";
 					close;
@@ -546,7 +551,7 @@ if(!$annonactive)
 			next;
 			if(!rand(0,2))
 			{
-				set $annonactive,1;
+				set $@annonactive,1;
 				enablenpc "Haggard Man";
 				mes "[?]";
 				mes "^666666*Cough cough*^000000";
@@ -576,11 +581,9 @@ if(!$annonactive)
 		close;
 	}
 
-	OnTouch:
-	if(thai_find == 12)
-	{
-		if(!rand(0,2))
-		{
+OnTouch:
+	if(thai_find == 12) {
+		if(!rand(0,2)) {
 			emotion e_gasp,1;
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Huh...?";
@@ -599,16 +602,18 @@ if(!$annonactive)
 			mes "a blood stain in";
 			mes "this kind of place...";
 			set thai_find,13;
+			changequest 12033,12034;
 			close;
 		}
 	}
 
 }
-	
+
 }
-	
+
 ayo_dun02,91,264,3	script	Haggard Man	841,{
 
+	//completequest 12034;
 	if(thai_find == 13)
 	{
 		mes "[Haggard Man]";
@@ -752,6 +757,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "^3355FFYou feel as though Annon";
 				mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
 				set thai_find,14;
+				completequest 12034;
 				if (checkre(3)) {
 					if(BaseLevel < 56) getexp 900,0;
 					else if(BaseLevel > 55 && BaseLevel < 61) getexp 1050,0;
@@ -791,7 +797,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "before others find me.";
 				mes "Good day~!";
 				close2;
-				set $annonactive,0;
+				set $@annonactive,0;
 				disablenpc "Haggard Man";
 				end;
 			}
@@ -819,7 +825,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "me back inside!";
 				mes "Wahhhhhh~!";
 				next;
-				set $annonactive,0;
+				set $@annonactive,0;
 				disablenpc "Haggard Man";
 				mes "[" +strcharinfo(0)+ "]";
 				mes "Okay, it's time";
@@ -854,7 +860,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 			mes "hide from Shuda.";
 			mes "^666666*Cries*^000000";
 			close2;
-			set $annonactive,0;
+			set $@annonactive,0;
 			disablenpc "Haggard Man";
 			end;
 		}
@@ -865,13 +871,13 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 		mes "Huh? Who are you?";
 		mes "This isn't a safe place for a tourists! You should leave right away!";
 		close2;
-		set $annonactive,0;
+		set $@annonactive,0;
 		disablenpc "Haggard Man";
 		end;
 	}
 	
 OnInit:
-	set $annonactive,0;
+	set $@annonactive,0;
 	disablenpc "Haggard Man";
 	end;
 	
@@ -973,7 +979,8 @@ ayothaya,253,99,3	script	Fisherman	843,{
 					mes "engagement ring.^000000";
 					close2;
 					set thai_find,2;
-					getitem 7288,1; //Engagement ring
+					changequest 12029,12030;
+					getitem 7288,1; //Thai_Ring
 					end;
 				}
 			}
@@ -1030,7 +1037,7 @@ ayothaya,253,99,3	script	Fisherman	843,{
 	}
 	
 }
-	
+
 ayo_dun01,255,62,0	script	AyoFootprint1	139,2,0,{
 OnTouch:
 	if(thai_find == 4)
@@ -1040,12 +1047,13 @@ OnTouch:
 			emotion e_gasp,1;
 			mes "^3355FFYou find footprints heading to the ^5C3317North^3355FF. It looks like somebody was in quite a hurry, just like the villager said!^000000";
 			set thai_find,5;
+			changequest 12032,12033;
 			close;
 		}
 	}
 	
 }
-	
+
 ayo_dun01,74,142,0	script	AyoFootprint2	139,2,0,{
 OnTouch:
 	if(thai_find == 5)
@@ -1223,6 +1231,7 @@ OnTouch:
 		{
 			emotion e_gasp,1;
 			mes "^3355FFYou find traces of blood. Whoever was running in this direction may have been wounded. The trail of blood leads to the ^5C3317North^3355FF.^000000";
+			changequest 12032,12033;
 			set thai_find,12;
 			close;
 		}
@@ -1262,6 +1271,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 		mes "[Tham]";
 		mes "Oh well, don't worry. All of our villagers aren't like that. Anyway, I hope you enjoy your travels in Ayotaya.";
 		set thai_find,4;
+		changequest 12031,12032;
 		close;
 	}
 	else
@@ -1401,6 +1411,7 @@ ayothaya,83,132,0	script	Dusit#thai	843,{
 			mes "[Dusit]";
 			mes "Ah well, you'll see what I'm talking about. I hope he'll help you learn more about that evil creature.";
 			set ayodunquest,1;
+			setquest 12035;
 			close;
 		}
 		mes "[Dusit]";
@@ -1551,6 +1562,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "when you prepare all";
 			mes "the materials.";
 			set ayodunquest,2;
+			changequest 12035,12036;
 			close;
 		}
 		mes "[Boonthom]";
@@ -1590,6 +1602,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			delitem 7190,1; //Solid_Peeling
 			delitem 523,1; //Holy_Water
 			set ayodunquest,3;
+			changequest 12036,12037;
 			getitem 7285,1; //Thread_Skein
 			next;
 			mes "[Boonthom]";
@@ -1703,6 +1716,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "^3366992 Needle Packet^000000 and";
 		mes "^3366992 Spool^000000.";
 		set ayodunquest,10;
+		changequest 12037,12038;
 		next;
 		mes "[Boonthom]";
 		mes "Return to me";
@@ -1739,6 +1753,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			delitem 523,2; //Holy_Water
 			set ayodunquest,11;
 			getitem 7287,1; //Thread_Skein_
+			changequest 12038,12039;
 			next;
 			mes "[Boonthom]";
 			mes "Even if you lose this, don't worry. Just bring me the materials, and";
@@ -1840,6 +1855,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 		mes "[Boonthom]";
 		mes "If you wish to explore the building again, but you don't have any holy thread, feel free to ask me at anytime.";
 		set ayodunquest,13;
+		completequest 12039;
 		close;
 	}
 	else if (ayodunquest > 12) {
@@ -2136,6 +2152,7 @@ ayo_dun01,99,118,0	script	 #hun_thai_5	111,{
 ayo_dun01,16,188,0	script	 #hun_thai_6	111,{
 	if (ayodunquest == 8) {
 		set ayodunquest,9;
+		setquest 12036;
 		mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the last part of the slate.^000000";
 		next;
 		mes "^3355FFIt reads '^0000FFOtherwise, it's impossible...^3355FF' You are unable to read the rest of the message.^000000";
@@ -2185,6 +2202,7 @@ ayo_dun02,268,108,0	script	 #reward_tiger	111,{
 		mes "^3355FFYou pick";
 		mes "up the box.^000000";
 		set ayodunquest,12;
+		completequest 12039;
 		getitem 603,1; //Old_Blue_Box
 		close;
 	}
@@ -2231,6 +2249,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 			next;
 			emotion e_no1;
 			set tomyumgoong,1;
+			setquest 8123;
 			mes "[Einon]";
 			mes "She is the best cook when it";
 			mes "comes to Tom Yum Goong!";
@@ -2323,6 +2342,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes "my name, that guy";
 				mes "might give you a discount.";
 				set tomyumgoong,2;
+				changequest 8123,8124;
 				next;
 				mes "[Mali the Spicy]";
 				mes "His name is ^3131FFThongpool^000000.";
@@ -2382,6 +2402,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				next;
 				if (select("Where can I find Lemons?:I hate sour food. I'd better quit!") == 1) {
 					set tomyumgoong,4;
+					changequest 8124,8125;
 					mes "[Mali the Spicy]";
 					mes "A few days ago, I saw a good";
 					mes "Lemon tree while taking a walk.";
@@ -2464,6 +2485,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				if (select("Okay, I'll be right back.:Ah, I'm tired now. Let me take a rest first...") == 1) {
 					delitem 568,10; //Lemon
 					set tomyumgoong,6;
+					changequest 8125,8126;
 					mes "[Mali the Spicy]";
 					mes "See you in a bit~";
 					close;
@@ -2564,6 +2586,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes " .........";
 				next;
 				set tomyumgoong,8;
+				completequest 8126;
 				getitem 566,10; //Tomyumkung
 				emotion e_no1;
 				mes "[Mali the Spicy]";

+ 15 - 0
npc/quests/quests_ein.txt

@@ -5969,6 +5969,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "I'll always pray for";
 		mes "your safety on your";
 		mes "your adventures~";
+		completequest 8088;
 		close;
 	}
 	if ((EIN_LOVERQ == 5) && (countitem(712) > 0)) {
@@ -6008,6 +6009,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 			mes "^333333*Sob Sob...*^000000";
 			delitem 712,1; //Flower
 			set EIN_LOVERQ,6;
+			changequest 8079,808;
 			close;
 		}
 		else {
@@ -6041,6 +6043,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "this time? Thank you";
 		mes "for your help~";
 		set EIN_LOVERQ,3;
+		changequest 8078,8077;
 		getitem 1901,1; //Violin
 		close;
 	}
@@ -6083,6 +6086,7 @@ ein_in01,31,138,3	script	Calla#ein	90,{
 		mes "all the time...";
 		next;
 		set EIN_LOVERQ,3;
+		changequest 8076,8077;
 		getitem 1901,1; //Violin
 		mes "[Calla]";
 		mes "I'm sorry to trouble you,";
@@ -6173,6 +6177,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 			mes "even be useful to you later~";
 			delitem 7170,1; //Tuxedo
 			set EIN_LOVERQ,16;
+			changequest 8087,8088;
 			switch(rand(1,7)) {
 			case 1:
 				getitem 7289,1; //Olivine
@@ -6270,6 +6275,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		mes "W-what should I do?";
 		next;
 		set EIN_LOVERQ,14;
+		changequest 8085,8086;
 		mes "[Klitzer]";
 		mes "This monkey suit";
 		mes "that I've got on just";
@@ -6318,6 +6324,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 			mes "my regards if you help me.";
 			next;
 			set EIN_LOVERQ,7;
+			changequest 8080,8081;
 			mes "[Klitzer]";
 			mes "I feel so much";
 			mes "better now. Oh!";
@@ -6410,6 +6417,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		percentheal 100,0;
 		delitem 1901,1; //Violin
 		set EIN_LOVERQ,5;
+		changequest 8077,8079;
 		if (checkre(3)) {
 			if (BaseLevel < 41) getexp 61,0;
 			else if (BaseLevel < 61) getexp 600,0;
@@ -6472,6 +6480,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 		mes "give anything to see her...";
 		next;
 		set EIN_LOVERQ,2;
+		setquest 8076;
 		mes "[Klitzer]";
 		mes "Just...";
 		mes "Just don't listen";
@@ -6550,6 +6559,7 @@ OnTouch:
 		mes "wakes up, it won't be today!";
 		delitem 1901,1; //Violin
 		set EIN_LOVERQ,4;
+		changequest 8077,8078;
 		percentheal -90,0;
 		close2;
 		warp "einbroch",112,245;
@@ -6664,6 +6674,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 			next;
 			delitem 1003,10; //Coal
 			set EIN_LOVERQ,13;
+			changequest 8084,8085;
 			mes "[Satra]";
 			mes "Anyway, when you next";
 			mes "meet Klitzer, please tell";
@@ -6889,6 +6900,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 		next;
 		delitem 1003,10; //Coal
 		set EIN_LOVERQ,10;
+		changequest 8083,8084;
 		mes "[Satra]";
 		mes "Well, I shall try to";
 		mes "find some use for these.";
@@ -7039,6 +7051,7 @@ ein_in01,31,151,3	script	Satra#ein	850,{
 		mes "this kind of task will require";
 		mes "some effort on your part.";
 		set EIN_LOVERQ,9;
+		changequest 8082,8083;
 		next;
 		mes "[Satra]";
 		mes "Tah tah,";
@@ -7113,6 +7126,7 @@ ein_in01,191,102,5	script	Kaijeta#ein	846,{
 		mes "He gets so nervous about it!";
 		next;
 		set EIN_LOVERQ,15;
+		changequest 8086,8087;
 		mes "[Kaijeta]";
 		mes "A man should wear nice";
 		mes "clothes, like a Formal Suit";
@@ -7127,6 +7141,7 @@ ein_in01,191,102,5	script	Kaijeta#ein	846,{
 		mes "petty hatred between our";
 		mes "two towns stop my son from";
 		mes "seeing the woman he loves...";
+		changequest 8081,8082;
 		close;
 	}
 	if (EIN_LOVERQ == 7) {

+ 151 - 81
npc/quests/quests_hugel.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= MasterOfMuppets & SinSloth
 //===== Current Version: =====================================
-//= 2.2
+//= 2.3
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -26,6 +26,7 @@
 //= 2.1 Added quest log entries for:
 //=     - Juno Remedy Quest
 //= 2.2 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.3 Added questlog support. [Euphy]
 //============================================================
 
 // Medicine Quest
@@ -77,6 +78,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 				mes "find Postell. Tell him that";
 				mes "I need my ''Kolbun A'' now!";
 				set hg_herb,1;
+				setquest 8053;
 				next;
 				mes "[Allen]";
 				mes "And let him know that";
@@ -184,6 +186,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 					mes "my son arrives? P-please?";
 					next;
 					set hg_herb,3;
+					changequest 8054,8055;
 					mes "[" +strcharinfo(0)+ "]";
 					mes "......";
 					mes ".........";
@@ -217,6 +220,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;
 			close;
 		}
 		else if(hg_herb == 4)
@@ -371,6 +375,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "the medicine drawer, and help";
 			mes "yourself to whatever you like~";
 			set hg_herb,12;
+			changequest 8055,8056;
 			close;
 		}
 		else if(hg_herb == 12)
@@ -523,6 +528,7 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 			mes "more trouble? I'd really";
 			mes "appreciate it if you do.";
 			set hg_herb,2;
+			changequest 8053,8054;
 			close;
 		case 2:
 			mes "[Postell]";
@@ -560,7 +566,7 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 hu_in01,370,255,3	script	Upper Drawer#First	139,2,2,{
 
 OnTouch:
-	set @randvar,rand(1,7);
+	set .@rand,rand(1,7);
 	if(hg_herb < 5)
 	{
 		mes "^3355FFThere are several";
@@ -579,7 +585,8 @@ OnTouch:
 		mes "Withstander later...";
 		set hg_herb,4;
 		next;
-		if(@randvar == 4)
+		set .@rand,rand(1,7);
+		if(.@rand == 4)
 		{
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
@@ -598,7 +605,7 @@ OnTouch:
 			mes "keep this old PR brochure...^000000)";
 			close;
 		}
-		else if(@randvar == 5)
+		else if(.@rand == 5)
 		{
 			mes "^3355FFYou find Allen's";
 			mes "journal inside the";
@@ -637,7 +644,7 @@ OnTouch:
 		mes "Withstander later...";
 		set hg_herb,7;
 		next;
-		if(@randvar == 4)
+		if(.@rand == 4)
 		{
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
@@ -656,7 +663,7 @@ OnTouch:
 			mes "keep this old PR brochure...^000000)";
 			close;
 		}
-		else if(@randvar == 5)
+		else if(.@rand == 5)
 		{
 			mes "^3355FFYou find Allen's";
 			mes "journal inside the";
@@ -695,10 +702,11 @@ OnTouch:
 		set hg_herb,13;
 		getitem 603,1; //Old Blue Box
 		getexp (checkre(3))?5000:50000,0;
+		completequest 8056;
 	}
 	else
 	{
-		if(@randvar > 3)
+		if(.@rand > 3)
 		{
 			mes "^3355FFYou find an old book";
 			mes "inside the drawer.^000000";
@@ -921,6 +929,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 				mes "^333333*Cough Cough*";
 				mes "*Cough Cough*^000000";
 				set hg_bio,1;
+				setquest 11009;
 				close;
 			}
 		}
@@ -1026,6 +1035,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "I can back to Hugel to";
 		mes "give Siria this medicine.";
 		set hg_bio,7;
+		changequest 11014,11015;
 		close;
 	}
 	else if(hg_bio == 7)
@@ -1308,6 +1318,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "about you. Take care~";
 		set hg_bio,9;
 		getexp (checkre(3))?70000:700000,0;
+		completequest 11016;
 		close;
 	}
 	else if(hg_bio == 9)
@@ -1438,6 +1449,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "trust you too. ^333333*Cough*^000000";
 		mes "Thank you so much...";
 		set hg_bio,2;
+		changequest 11009,11010;
 		close;
 	}
 	else if(hg_bio == 2)
@@ -1520,6 +1532,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "Thank you for everything...";
 		set hg_bio,8;
 		getexp (checkre(3))?30000:500000,0;
+		changequest 11015,11016;
 		close;
 	}
 	else if(hg_bio == 8)
@@ -1639,6 +1652,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "If you don't hurry, then";
 		mes "those two will die, simple^FFFFFF ^000000 as that. I'll wait for you here.";
 		set hg_bio,3;
+		changequest 11010,11011;
 		close;
 	}
 	else if(hg_bio == 1)
@@ -1654,18 +1668,19 @@ lighthalzen,88,79,7	script	Dono	85,{
 	{
 		if (countitem(971) > 2 && countitem(1003) > 4 && countitem(619) && countitem(507) && countitem(508) && countitem(511) && countitem(509) && countitem(510) && countitem(7053) > 4 && countitem(7054) > 4 && countitem(935) > 19)
 		{
-			delitem 971,3;
-			delitem 1003,5;
-			delitem 619,1;
-			delitem 507,1;
-			delitem 508,1;
-			delitem 511,1;
-			delitem 509,1;
-			delitem 510,1;
-			delitem 7053,5;
-			delitem 7054,5;
-			delitem 935,20;
+			delitem 971,3; //Detrimindexta
+			delitem 1003,5; //Coal
+			delitem 619,1; //Unripe_Apple
+			delitem 507,1; //Red_Herb
+			delitem 508,1; //Yellow_Herb
+			delitem 511,1; //White_Herb
+			delitem 509,1; //Green_Herb
+			delitem 510,1; //Blue_Herb
+			delitem 7053,5; //Brigan
+			delitem 7054,5; //Cyfar
+			delitem 935,20; //Shell
 			set hg_bio,4;
+			changequest 11011,11012;
 			mes "[Dono]";
 			mes "Good, good, you've brought";
 			mes "everything I've asked. Give";
@@ -1810,6 +1825,7 @@ lighthalzen,88,79,7	script	Dono	85,{
 		mes "stresses himself to death,";
 		mes "my work will be for nothing.";
 		set hg_bio,6;
+		changequest 11013,11014;
 		close;
 	}
 	else if(hg_bio == 6)
@@ -1950,6 +1966,7 @@ lhz_in03,193,28,3	script	Makkie	83,{
 		mes "^3355FFYou receive a small bag";
 		mes "of Red Plant Stem Powder.^000000";
 		set hg_bio,5;
+		changequest 11012,11013;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh! Thanks so much";
@@ -4545,6 +4562,7 @@ hugel,198,169,0	script	#HugelTree	139,2,2,{
 		if(!hg_memory)
 		{
 			set hg_memory,1;
+			setquest 8057;
 			mes "^3355FFFor some reason, you";
 			mes "feel very warm, safe,";
 			mes "and secure near this";
@@ -4617,6 +4635,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "Right now he's surveying";
 		mes "the land for construction...";
 		set hg_memory,2;
+		changequest 8057,8058;
 		close;
 	}
 	else if(hg_memory == 2)
@@ -4662,6 +4681,7 @@ hugel,191,172,3	script	Manainne	892,1,{
 		mes "My sister would be rolling";
 		mes "in her grave, seeing him now...";
 		set hg_memory,6;
+		changequest 8061,8062;
 		close;
 	}
 	else if(hg_memory == 6)
@@ -4940,6 +4960,7 @@ niflheim,90,106,3	script	A Spirit#HQuest	802,{
 		mes "the living... to Hugel...";
 		mes "Let me send you there...";
 		set hg_memory,7;
+		changequest 8062,8063;
 		close2;
 		warp "hugel",78,148;
 	}
@@ -4997,6 +5018,7 @@ hugel,100,103,3	script	Perfitz	866,{
 		mes "he's too excited about cutting";
 		mes "that tree down. Maybe this old";
 		mes "man is just too suspcious~";
+		changequest 8059,8060;
 		close;
 	}
 	else if(hg_memory == 4)
@@ -5073,6 +5095,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "town, but how much money do";
 		mes "you think these people enjoy?";
 		mes "I need to look to the future...";
+		changequest 8058,8059;
 		close;
 	}
 	else if(hg_memory == 3)
@@ -5109,6 +5132,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		mes "I'd protect that old tree";
 		mes "with my life, I won't deny";
 		mes "it. But that's an old story that^FFFFFF ^000000 should be buried in the past...";
+		changequest 8060,8061;
 		close;
 	}
 	else if(hg_memory == 5)
@@ -5274,6 +5298,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		specialeffect2 EF_CONE;
 		set hg_memory,12;
 		getexp (checkre(3))?8000:50000,0;
+		completequest 8063;
 		getitem 603,1; //Old Blue Box
 		mes "[El Schatt]";
 		mes "Oh... Oh dear";
@@ -5361,6 +5386,7 @@ hugel,107,67,3	script	Torpy	706,{
 					mes "least one of them just";
 					mes "outside of town.";
 					set hg_ubu01,1;
+					setquest 12044;
 					close;
 				case 2:
 					mes "["+strcharinfo(0)+"]";
@@ -5390,6 +5416,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "*Sob* Okay, I hope my";
 			mes "Daddy comes back soon...";
 			set hg_ubu01,3;
+			changequest 12045,12046;
 			close;
 		}
 		else if(hg_ubu01 == 6)
@@ -5566,6 +5593,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "my husband inside town, tell";
 		mes "him that he better come home!";
 		set hg_ubu01,2;
+		changequest 12044,12045;
 		close;
 	}
 	else if(hg_ubu01 == 2)
@@ -5597,6 +5625,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "Goodbye for now, adventurer~";
 		specialeffect2 (hg_ubu01 == 6)?EF_CONE:EF_MVP;
 		set hg_ubu01,8;
+		completequest 12048;
 		getitem 12065,3; //Green Salad
 		getexp (checkre(3))?5000:50000,0;
 		close;
@@ -5676,6 +5705,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "o-only... possible...";
 			mes "Way... P-please help...";
 			set hg_ubu01,4;
+			changequest 12046,12047;
 			close;
 		case 2:
 			mes "[Strange Man]";
@@ -5889,6 +5919,7 @@ hugel,100,174,3	script	Strange Man#Hugel	898,{
 		mes "this game of Hide-and-Seek...";
 		mes "Well, I just can't lose! Bye!";
 		set hg_ubu01,6;
+		changequest 12047,12048;
 		next;
 		mes "^3355FFTorpy's father has";
 		mes "hidden himself again,";
@@ -5984,9 +6015,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 			mes "You can't imagine how busy";
 			mes "I've been, and how much I need^FFFFFF ^000000 the help! Now, let's get started~";
 			next;
-			set @randvar, rand(1,4);
-			if(@randvar == 1)
-			{
+			switch(rand(1,4)) {
+			case 1:
 				mes "[Cellette]";
 				mes "Alright, please take this";
 				mes "order of Fish Cake Soup to";
@@ -5994,11 +6024,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "that she's a regular customer--";
 				mes "she's a good friend, but I'm sure^FFFFFF ^000000 that she loves the soup as well.";
 				set hg_odeng,1;
-				getitem 584,1; //Skewer soup
+				setquest 8064;
+				getitem 584,1; //Fish_Ball_Soup
 				close;
-			}
-			else if(@randvar == 2)
-			{
+			case 2:
 				mes "[Cellette]";
 				mes "Right, take this next order";
 				mes "of Fish Cake Soup to Maewan,";
@@ -6006,11 +6035,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "He's been buying my soup ever";
 				mes "since I helped him start his^FFFFFF ^000000 business. Nice of him, isn't it?";
 				set hg_odeng,2;
-				getitem 584,1; //Skewer soup
+				setquest 8065;
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
-			}
-			else if(@randvar == 3)
-			{
+			case 3:
 				mes "[Cellette]";
 				mes "Okay, this order of Fish";
 				mes "Cake Soup is ready! Please";
@@ -6019,11 +6047,10 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "a thing about punctuality.";
 				mes "Just try not to be late...";
 				set hg_odeng,3;
-				getitem 584,1; //Skewer soup
+				setquest 8066;
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
-			}
-			else if(@randvar == 4)
-			{
+			case 4:
 				mes "[Cellette]";
 				mes "Quick, take this Fish";
 				mes "Paste Soup to Erjan. Um,";
@@ -6032,7 +6059,8 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "have everything in such";
 				mes "and such and order...";
 				set hg_odeng,4;
-				getitem 584,1; //Skewer soup
+				setquest 8067;
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
 			}
 		case 2:
@@ -6054,7 +6082,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 					mes "I hope you come and ";
 					mes "visit me again, okay?";
 					set Zeny,Zeny-100;
-					getitem 584,1; //Skewer soup
+					getitem 584,1; //Fish_Ball_Soup 
 					close;
 				}
 				else
@@ -6089,7 +6117,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 	}
 	else if(hg_odeng == 1)
 	{
-		if(countitem(584)) //Skewer soup
+		if(countitem(584))
 		{
 			mes "[Cellette]";
 			mes "Haven't you left already?";
@@ -6120,7 +6148,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
 				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
 			}
 			else
@@ -6139,7 +6167,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 	}
 	else if(hg_odeng == 2)
 	{
-		if(countitem(584)) //Skewer soup
+		if(countitem(584))
 		{
 			mes "[Cellette]";
 			mes "Whoa, whoa, whoa!";
@@ -6169,7 +6197,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
 				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
 			}
 			else
@@ -6188,7 +6216,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 	}
 	else if(hg_odeng == 3)
 	{
-		if(countitem(584)) //Skewer soup
+		if(countitem(584))
 		{
 			mes "[Cellette]";
 			mes "I thought you left to";
@@ -6219,7 +6247,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
 				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				getitem 584,1; //Fish_Ball_Soup 
 				close;
 			}
 			else
@@ -6268,7 +6296,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 				mes "from you. That's fair, so";
 				mes "please don't lose it this time.";
 				set Zeny,Zeny-100;
-				getitem 584,1; //Skewer soup
+				getitem 584,1; //Fish_Ball_Soup
 				close;
 			}
 			else
@@ -6305,7 +6333,11 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "is your Fish Cake Soup. Thank";
 		mes "you so much for your help~";
 		set hg_odeng,0;
-		getitem 584,3; //Skewer Soup
+		for(set .@i,8072; .@i<= 8075; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1)
+				erasequest .@i;
+		}
+		getitem 584,3; //Fish_Ball_Soup
 		getexp (checkre(3))?100:1000,0;
 		next;
 		mes "[Cellette]";
@@ -6350,8 +6382,6 @@ hugel,76,134,3	script	Neha	101,{
 				mes "^FF00001 Whip^000000 with which to spank ";
 				mes "you. You better hurry, boy, or";
 				mes "I won't let you off that easy.";
-				set hg_odeng,6;
-				close;
 			}
 			else
 			{
@@ -6362,9 +6392,14 @@ hugel,76,134,3	script	Neha	101,{
 				mes "your delivery, then bring me";
 				mes "^FF00001 Whip^000000 so that I can spank you";
 				mes "for your impertinence, girl!";
-				set hg_odeng,6;
-				close;
 			}
+			for(set .@i,8064; .@i<= 8067; set .@i,.@i+1) {
+				if (checkquest(.@i) > -1 && checkquest(.@i) < 2)
+					completequest .@i;
+			}
+			setquest 8068;
+			set hg_odeng,6;
+			close;
 		}
 		else
 		{
@@ -6408,8 +6443,9 @@ hugel,76,134,3	script	Neha	101,{
 			mes "you did a good job... I hope";
 			mes "you come deliver my soup again~";
 			delitem 1960,1; //Whip
-			delitem 584,1; //Skewer soup
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8068,8072;
 			close;
 		}
 		else
@@ -6464,6 +6500,7 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "eat my soup before";
 			mes "you deliver it to me!";
 			set hg_odeng,7;
+			changequest 8065,8069;
 			close;
 		}
 		else
@@ -6480,7 +6517,7 @@ hugel,87,139,3	script	Maewan	86,{
 	}
 	else if(hg_odeng == 7 )
 	{
-		if(countitem(584) && countitem(7015)) //Skewer soup and Bookclip in memory
+		if(countitem(584) && countitem(7015))
 		{
 			mes "[Maewan]";
 			mes "Great, you really brought";
@@ -6489,9 +6526,10 @@ hugel,87,139,3	script	Maewan	86,{
 			mes "addition to my collection~";
 			mes "Oh, and give me my soup.";
 			mes "Thanks again for delivering~";
-			delitem 584,1; //Skewer soup
+			delitem 584,1; //Fish_Ball_Soup
 			delitem 7015,1; //Bookclip in memory
 			set hg_odeng,10;
+			changequest 8069,8073;
 			close;
 		}
 		else
@@ -6548,6 +6586,7 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "me ^FF00001 Mushroom Spore^000000, and";
 			mes "I'll forget this whole thing.";
 			set hg_odeng,8;
+			changequest 8066,8070;
 			close;
 		}
 		else
@@ -6562,7 +6601,7 @@ hugel,84,125,3	script	Layoma	700,{
 	}
 	else if(hg_odeng == 8)
 	{
-		if(countitem(584) && countitem(921)) //Skewer soup and Mushroom spore
+		if(countitem(584) && countitem(921))
 		{
 			mes "[Layoma]";
 			mes "Great! You brought me";
@@ -6576,9 +6615,10 @@ hugel,84,125,3	script	Layoma	700,{
 			mes "for my roommate Cellette";
 			mes "a little while longer. Oh, and";
 			mes "please tell her to not to come^FFFFFF ^000000 home so late all the time, okay?";
-			delitem 921,1; //Mushroom spore
-			delitem 584,1; //Skewer soup
+			delitem 921,1; //Mushroom_Spore
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8070,8074;
 			close;
 		}
 		else
@@ -6627,6 +6667,7 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "the commoner's ^FF0000China^000000!";
 			next;
 			set hg_odeng,9;
+			changequest 8067,8071;
 			mes "[Erjan]";
 			mes "Realize that I'm compromising";
 			mes "with you by asking you to bring";
@@ -6650,7 +6691,7 @@ hugel,102,161,3	script	Erjan	100,{
 	}
 	else if(hg_odeng == 9)
 	{
-		if(countitem(584) && countitem(736)) //Skewer soup and China
+		if(countitem(584) && countitem(736))
 		{
 			mes "[Erjan]";
 			mes "Ah, so you've delivered";
@@ -6672,9 +6713,10 @@ hugel,102,161,3	script	Erjan	100,{
 			mes "Please take your leave,";
 			mes "and return to Cellette";
 			mes "with my noble thanks.";
-			delitem 736,1; //China
-			delitem 584,1; //Skewer soup
+			delitem 736,1; //White_Platter
+			delitem 584,1; //Fish_Ball_Soup
 			set hg_odeng,10;
+			changequest 8071,8075;
 			close;
 		}
 		else
@@ -6853,8 +6895,8 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "know as soon as you can,";
 			mes "okay? Thanks for cheering";
 			mes "me up, "+strcharinfo(0)+".";
-			setquest 8044;
 			set hg_ma1,3;
+			setquest 8044;
 			close;
 		}
 	}
@@ -6925,8 +6967,8 @@ yuno,111,156,3	script	Euslan	90,{
 			mes "know as soon as you can,";
 			mes "okay? Thanks for cheering";
 			mes "me up, "+strcharinfo(0)+".";
-			setquest 8044;
 			set hg_ma1,3;
+			setquest 8044;
 			close;
 		}
 	}
@@ -6988,8 +7030,8 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "of your way. Still, I'd really";
 		mes "appreciate your help if you";
 		mes "happen to pass through Hugel.";
-		changequest 8046,8047;
 		set hg_ma1,6;
+		changequest 8046,8047;
 		close;
 	}
 	else if(hg_ma1 == 6 || hg_ma1 == 7)
@@ -7048,8 +7090,8 @@ yuno,111,156,3	script	Euslan	90,{
 		mes "your safety in your adventures.";
 		mes "Take care of yourself...";
 		close2;
-		completequest 8052;
 		set hg_ma1,13;
+		completequest 8052;
 		specialeffect EF_ABSORBSPIRITS;
 		if (checkre(3))
 			getexp 90000,60000;
@@ -7131,8 +7173,8 @@ que_bingo,53,190,7	script	Eukran	778,{
 		mes "would Thierry go to such a";
 		mes "dangerous place? No one goes^FFFFFF ^000000 to the Odin Shrine for no reason.";
 		close2;
-		changequest 8047,8048;
 		set hg_ma1,8;
+		changequest 8047,8048;
 		warp "que_bingo",37,24;
 		end;
 	}
@@ -7245,8 +7287,8 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "Euslan's disease. It's not";
 		mes "curable by modern medicine...";
 		close2;
-		changequest 8048,8049;
 		set hg_ma1,9;
+		changequest 8048,8049;
 		end;
 	}
 	else if(hg_ma1 == 9)
@@ -7378,8 +7420,8 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "If they get me, I'll never be";
 		mes "able to make the medicine!";
 		close2;
-		changequest 8050,8051;
 		set hg_ma1,11;
+		changequest 8050,8051;
 		end;
 	}
 	else if(hg_ma1 == 11)
@@ -7433,9 +7475,9 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "medicine that Thierry";
 		mes "has made to give to Euslan.^000000";
 		close2;
-		delitem 7511,5; //Darkness rune
-		changequest 8051,8052;
+		delitem 7511,5; //Rune_Of_Darkness
 		set hg_ma1,12;
+		changequest 8051,8052;
 		end;
 	}
 	else if(hg_ma1 == 12)
@@ -7491,8 +7533,8 @@ OnTouch:
 		mes "you better go tell him";
 		mes "about this right now!^000000";
 		close2;
-		changequest 8049,8050;
 		set hg_ma1,10;
+		changequest 8049,8050;
 		end;
 	}
 }
@@ -7530,6 +7572,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				mes "You should be able to find him";
 				mes "somewhere just outside of town.";
 				set hg_milk,2;
+				setquest 12040;
 				close;
 			
 			case 2:
@@ -7612,6 +7655,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		specialeffect2 EF_CONE;
 		getexp (checkre(3))?10000:100000,0;
 		getitem 12063,3;
+		erasequest 12043;
 		mes "[Kurupe]";
 		mes "I always need";
 		mes "someone to help me";
@@ -7728,7 +7772,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 519,5;
+			erasequest 12043;
+			getitem 519,5; //Milk
 			close;
 		}
 		else if(.@milkreward > 4 && .@milkreward < 8)
@@ -7751,7 +7796,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 502,5;
+			erasequest 12043;
+			getitem 502,5; //Orange_Potion
 			close;
 		}
 		else if(.@milkreward > 7 && .@milkreward < 10)
@@ -7775,7 +7821,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 503,5;
+			erasequest 12043;
+			getitem 503,5; //Yellow_Potion
 			close;
 		}
 		else
@@ -7802,7 +7849,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 					close;
 				}
 				set hg_milk,9;
-				getitem 518,3;
+				erasequest 12043;
+				getitem 518,3; //Honey
 				close;
 			}
 			mes "[Kurupe]";
@@ -7824,7 +7872,8 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 				close;
 			}
 			set hg_milk,9;
-			getitem 12111,1;
+			erasequest 12043;
+			getitem 12111,1; //Food_Package
 			close;
 		}
 	}
@@ -7917,6 +7966,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 				mes "as soon as you can! I can't";
 				mes "wait to start training with it!";
 				set hg_milk,5;
+				changequest 12040,12041;
 				close;
 
 			case 2:
@@ -7948,8 +7998,9 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "2 Slots and everything!";
 		mes "I'm gonna start training";
 		mes "with it right now!";
-		delitem 1110,1;
+		delitem 1110,1; //Lapier
 		set hg_milk,6;
+		changequest 12041,12042;
 		next;
 		mes "[Burupu]";
 		mes "You know what?";
@@ -8066,7 +8117,7 @@ hugel,72,101,0	script	Burupu's Instructions	111,{
 			mes "strokes that correspond to";
 			mes "her song. I'll explain more";
 			mes "about that in Chapter 2.";
-			close;
+			break;
 	
 		case 2:
 			mes "[Chapter 2 Contents]";
@@ -8127,7 +8178,7 @@ hugel,72,101,0	script	Burupu's Instructions	111,{
 					mes "neutral contentment,";
 					mes "then just brush her";
 					mes "5 times. That's all~";
-					close;
+					break;
 				
 				case 2:
 					mes "[Chapter 2, Part 2]";
@@ -8149,9 +8200,10 @@ hugel,72,101,0	script	Burupu's Instructions	111,{
 					mes "song with a slight difference.";
 					mes "Look for the difference in";
 					mes "Booboo's song, and then";
-					mes "hum the correvt word to her.";
-					close;
+					mes "hum the correct word to her.";
+					break;
 			}
+			break;
 		
 		case 3:
 			mes "[Chapter 3]";
@@ -8161,8 +8213,11 @@ hugel,72,101,0	script	Burupu's Instructions	111,{
 			mes "from Kurupe. You will also";
 			mes "need 3 Concentration Potions";
 			mes "to insert into Booboo's comb.";
-			close;
+			break;
 	}
+	close2;
+	if (checkquest(12042) > -1) erasequest 12042;
+	end;
 }
 
 hugel,68,99,3	script	Booboo the Cow	889,{
@@ -8337,6 +8392,7 @@ function	script	Func_MilkCow	{
 		mes "report to Kurupe.^000000";
 		if(hg_milk == 12) set hg_milk,13;
 		else set hg_milk,8;
+		setquest 12043;
 		close;
 	}
 	soundeffect "taming_fail.wav",0;
@@ -8456,6 +8512,7 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "Please talk to the Boatman";
 		mes "to travel to the shrine, okay?";
 		set hg_odin,2;
+		setquest 11000;
 		close2;
 		cutin "",255;
 		end;
@@ -8534,6 +8591,7 @@ hu_in01,19,161,0	script	Alex	803,{
 				mes "I'll make sure that you're";
 				mes "rewarded for your efforts.";
 				set hg_odin,4;
+				changequest 11000,11001;
 				next;
 				mes "[Alex]";
 				mes "This is your chance";
@@ -8650,8 +8708,9 @@ hu_in01,19,161,0	script	Alex	803,{
 			case 2:
 				if(countitem(7511) > 4)
 				{
-					delitem 7511,5;
-					set hg_odin,6;
+					delitem 7511,5; //Rune_Of_Darkness
+					set hg_odin,6; //Old_Blue_Box
+					changequest 11000,11002;
 					getitem 603,1;
 					mes "[Alex]";
 					mes "Oh! Thank you";
@@ -8928,6 +8987,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "own benefit. Talk to the Boatman,^FFFFFF ^000000 and he'll take you there, okay?";
 				mes "Hurry up and come back soon!";
 				set hg_odin,12;
+				setquest 11003;
 				close2;
 				cutin "hu_laura04.bmp",255;
 				end;
@@ -9171,6 +9231,7 @@ hu_in01,14,11,4	script	Laura	70,{
 
 			case 3:
 				set hg_odin,14;
+				changequest 11003,11004;
 				mes "[Laura]";
 				mes "That's what I've been";
 				mes "waiting to hear! Alright,";
@@ -9239,9 +9300,10 @@ hu_in01,14,11,4	script	Laura	70,{
 			case 2:
 				if (countitem(7511) > 4)
 				{
-					delitem 7511,5;
+					delitem 7511,5; //Rune_Of_Darkness
 					set hg_odin,16;
-					getitem 603,1;
+					changequest 11004,11005;
+					getitem 603,1; //Old_Blue_Box
 					mes "[Laura]";
 					mes "Oooh, nice job. It's good";
 					mes "that we have more of these";
@@ -9455,6 +9517,11 @@ 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;
+		for(set .@i,11002; .@i<=11005; set .@i,.@i+1) {
+			if (checkquest(.@i) > -1 && checkquest(.@i) < 2)
+				completequest .@i;
+		}
+		setquest 11006;
 		cutin "hu_laura04.bmp",2;
 		mes "[Laura]";
 		mes "Good.";
@@ -9588,6 +9655,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "Research Team. I'm sorry, but";
 				mes "you're the only one I can ask.";
 				set hg_odin,20;
+				changequest 11006,11007;
 				close2;
 				cutin "hu_laura04.bmp",255;
 				end;
@@ -10095,6 +10163,7 @@ hu_in01,162,85,4	script	Ashe#2	95,{
 		mes "you for all your help, friend.";
 		next;
 		set hg_odin,59;
+		changequest 11007,11008;
 		mes "[Ashe]";
 		mes "Don't worry, my comrade";
 		mes "at Morroc's South Gate will";
@@ -10263,6 +10332,7 @@ OnTouch:
 		next;
 		getexp (checkre(3))?100000:700000,0;
 		set hg_odin,60;
+		completequest 11008;
 		mes "[???]";
 		mes "...Thanks for";
 		mes "the file. Take care.";

文件差异内容过多而无法显示
+ 220 - 44
npc/quests/quests_lighthalzen.txt


+ 45 - 8
npc/quests/quests_louyang.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.3
+//= 2.4
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
@@ -34,6 +34,7 @@
 //= 2.1 Fixed guard tower warper ALWAYS warping. (bugreport:2377) [L0ne_W0lf]
 //= 2.2 Removed unused "name" variable. [L0ne_W0lf]
 //= 2.3 Updated RE/Pre-RE EXP. [Euphy]
+//= 2.4 Added questlog support. [Euphy]
 //============================================================ 
 
 // Soup Quest
@@ -1090,13 +1091,6 @@ louyang,174,150,5	script	Jiu Chi Ling#lou	815,{
 // Doctor Quest
 //============================================================
 lou_in02,265,69,5	script	Doctor#lyang	814,{
-	//Remove outdated variables and attempt to preserve prior quest progress.
-	if(QL_DOC1STTIME == 1 || QL_DOCQUEST == 1) set ch_par,2;
-	if (QL_DOCQUEST == 2) set ch_par,10;
-	if (QL_DOCQUEST == 3) set ch_par,17;
-	if (QL_GOTHERB) set ch_par,16;
-	set QL_DOC1STTIME,0; set QL_DOCQUEST,0; set QL_GOTHERB,0; set QL_BEENTOSTORAGE,0; set QL_GOTCOMPROP,0; set QL_TOOLMASTER,0;
-
 	if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "^3355FFWait a minute! Right now, you're over weight, so you cannot receive more items. Please store some of your things in Kafra Storage and try again.^000000";
 		close;
@@ -1202,6 +1196,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "so much trouble, but if you'll excuse me, I have other patients waiting. Please hurry back with";
 			mes "the medicine!";
 			set ch_par,2;
+			setquest 11044;
 			close;
 		}
 		mes "[Hua Tuo]";
@@ -1291,6 +1286,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "great, but it's an old family secret. I hope it will be useful to you if you find yourself in great danger.";
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,10;
+			completequest 11056;
 			getitem 679,2; //Gold_Pill
 			getexp (checkre(3))?1000:10000,0;
 			next;
@@ -1330,6 +1326,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 		mes "^3355FF10 Sprout^000000 and";
 		mes "^3355FF5 Honey Pot^000000.";
 		set ch_par,17;
+		changequest 11056,11057;
 		close;
 	}
 	else if (ch_par == 10) {
@@ -1408,6 +1405,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			mes "is an old family secret. I hope that it will be of use to you in dangerous situations.";
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,10;
+			completequest 11056;
 			getitem 679,2; //Gold_Pill
 			getexp (checkre(3))?1000:10000,0;
 			next;
@@ -1462,6 +1460,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 			delitem 7121,5; //Honey_Jar
 			delitem 7252,1; //Herb_Medicine
 			set ch_par,18;
+			completequest 11057;
 			getitem 679,5; //Gold_Pill
 			getexp (checkre(3))?10000:30000,0;
 			next;
@@ -1559,6 +1558,7 @@ lou_in02,248,166,2	script	Tool Shop Master#lou	824,{
 			mes "You can find the storage on";
 			mes "the opposite side of this building. There, you'll see a guy named Jiang Xiayou. Go ahead and ask him for the stuff you need.";
 			set ch_par,3;
+			changequest 11044,11045;
 			close;
 		}
 		mes "[Wang Chuiyi]";
@@ -1667,18 +1667,22 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 				if (.@paper_j == 10) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Residence Transfer Application^000000.' Just like that.";
 					set ch_par,5;
+					changequest 11045,11046;
 				}
 				else if (.@paper_j == 11) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Summer SAT Class Application^000000.' Got it?";
 					set ch_par,6;
+					changequest 11045,11047;
 				}
 				else if (.@paper_j == 12) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Sandy Dust Phenomenon Report^000000.' Easy, right?";
 					set ch_par,7;
+					changequest 11045,11048;
 				}
 				else if (.@paper_j == 13) {
 					mes "When the guy asks what you need, you tell him: '^ff0000Communication Proposal^000000.' Just like that?";
 					set ch_par,8;
+					changequest 11045,11049;
 				}
 				next;
 				mes "[Jiang Xiayou]";
@@ -1694,6 +1698,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 			mes "The medicines you're looking for might be around here, so look around. If it weren't for the doctor, I wouldn't even let you hang around, you know that?";
 			emotion e_pif;
 			set ch_par,4;
+			changequest 11045,11050;
 			close;
 		}
 	}
@@ -1809,6 +1814,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 		mes "Ah! Here you go. Even if it was kind of annoying to do, I guess";
 		mes "we gotta help each other, right? Alright then, I'll see ya around.";
 		set ch_par,16;
+		changequest 11055,11056;
 		getitem 7252,1; //Herb_Medicine
 		close;
 	}
@@ -1884,15 +1890,19 @@ lou_in02,210,47,0	script	City Hall Officer#lou	825,{
 					set zeny,zeny-.@input;
 					if (ch_par == 5) {
 						set ch_par,11;
+						changequest 11046,11051;
 					}
 					else if (ch_par == 6) {
 						set ch_par,12;
+						changequest 11047,11052;
 					}
 					else if (ch_par == 7) {
 						set ch_par,13;
+						changequest 11048,11053;
 					}
 					else if (ch_par == 8) {
 						set ch_par,14;
+						changequest 11049,11054;
 					}
 					close;
 				}
@@ -2118,6 +2128,11 @@ lou_in02,156,38,0	script	Studying Officer#lou	822,{
 			mes "Here it is. A few days ago, someone asked me for the same document,";
 			mes "so I was able to find it again pretty easily. I hope it's useful to you.";
 			set ch_par,15;
+			for(set .@i,11051; .@i<=11054; set .@i,.@i+1) {
+				if (checkquest(.@i) > -1 && checkquest(.@i < 2))
+					completequest .@i;
+			}
+			setquest 11055;
 			close;
 		}
 		mes "[Huang Zhishu]";
@@ -2158,6 +2173,7 @@ lou_in02,204,169,0	script	Supply Stack#1lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2208,6 +2224,7 @@ lou_in02,207,168,0	script	Supply Stack#5lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2260,6 +2277,7 @@ lou_in02,206,163,0	script	Supply Stack#4lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2312,6 +2330,7 @@ lou_in02,198,170,0	script	Supply Stack#3lou	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2364,6 +2383,7 @@ lou_in02,192,170,0	script	Supply Stack#2	111,{
 				mes "*Rummage rummage*";
 				mes "You found a medicine.^000000";
 				set ch_par,9;
+				changequest 11050,11056;
 				getitem 7252,1; //Herb_Medicine
 				next;
 				mes "[Jiang Xiayou]";
@@ -2902,6 +2922,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 					mes "Go find my last disciple,";
 					mes "^0000FFSong Zhi Du^000000, as he may tell you something useful. He's working at the doctor's office. If it weren't for him, I'd be starving now.";
 					set ch_poison,5;
+					setquest 11070;
 					close;
 				}
 				else {
@@ -3185,6 +3206,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 					mes "Will you excuse";
 					mes "me for a second...?";
 					set ch_poison,15;
+					changequest 11077,11078;
 					close;
 				}
 				mes "["+strcharinfo(0)+"]";
@@ -3270,6 +3292,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "as that of my disciple,";
 		mes "Louyang's leader must live...";
 		set ch_poison,16;
+		changequest 11078,11079;
 		close;
 	}
 	else if (ch_poison == 17) {
@@ -3300,6 +3323,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "^0000FFPoison King,";
 		mes "Nagash Arses' Jounal^000000.";
 		set ch_poison,18;
+		changequest 11080,11081;
 		close;
 	}
 	else if (ch_poison == 18) {
@@ -3341,6 +3365,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "^3355FFYou grow dizzy, but you also feel like you're becoming more powerful and gaining experience.^000000";
 		next;
 		set ch_poison,20;
+		changequest 11082,11083;
 		if (checkre(3)) {
 			if (BaseLevel < 56) getexp 1050,0;
 			else if (BaseLevel > 55 && BaseLevel < 61) getexp 1230,0;
@@ -3576,6 +3601,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "you were going to do.";
 			mes "I'm just disappointed...";
 			set ch_poison,6;
+			changequest 11070,11071;
 			close;
 		}
 		mes "[Song Zhi Du]";
@@ -3592,6 +3618,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "[Song Zhi Du]";
 		mes "Since my body is so frail, I can't bear the tension and rage of seeing my lifelong enemy face to face.";
 		set ch_poison,8;
+		changequest 11070,11073;
 		close;
 	}
 	else if (ch_par > 9 && ch_poison == 6) {
@@ -3620,6 +3647,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "10 Empty Potion,";
 			mes "30 Green Potion^000000.";
 			set ch_poison,7;
+			changequest 11071,11072;
 			next;
 			mes "[Song Zhi Du]";
 			mes "An apology is fine, but you must also show me that you are sorry and help me carry out my plan. Do you have any problem with this?";
@@ -3632,6 +3660,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		specialeffect EF_ENDURE;
 		close2;
 		set ch_poison,6;
+		changequest 11070,11071;
 		end;
 	}
 	else if (ch_par > 9 && ch_poison == 7) {
@@ -3647,6 +3676,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 				delitem 1093,10; //Empty_Potion
 				delitem 506,30; //Green_Potion
 				set ch_poison,8;
+				changequest 11072,11073;
 				mes "[Song Zhi Du]";
 				mes "Ah...";
 				mes "With these, I accept your apology. Thank you for all the trouble you went through to get this stuff.";
@@ -3733,6 +3763,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "[Song Zhi Du]";
 			mes "No!! I failed again! ^666666*Sigh...*^000000 And I spent a long time preparing all of those materials...";
 			set ch_poison,10;
+			changequest 11074,11075;
 			close;
 		}
 		emotion e_gasp;
@@ -3918,6 +3949,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "Master, I did it!";
 		mes "Your disciple Song Zhi Du made the world's deadliest poison for you!";
 		set ch_poison,12;
+		changequest 11075,11076;
 		close;
 	}
 	else if (ch_par > 9 && ch_poison == 12) {
@@ -4050,6 +4082,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		mes "take these, since I don't";
 		mes "need them any longer.";
 		set ch_poison,21;
+		completequest 11083;
 		getitem 678,5; //Poison_Bottle
 		next;
 		mes "[Song Zhi Du]";
@@ -4159,6 +4192,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 					mes "Song Zhi Du.";
 					mes "Take care!";
 					set ch_poison,9;
+					changequest 11073,11074;
 					close;
 				}
 				mes "[Lady]";
@@ -4321,6 +4355,7 @@ lou_in01,107,163,0	script	 #lou_drink1	111,{
 		mes "^3355FFYou put the deadly poison into the bottle.^000000";
 		delitem 678,1; //Poison_Bottle
 		set ch_poison,13;
+		changequest 11076,11077;
 		close;
 	}
 	else if (ch_poison == 13) {
@@ -4333,6 +4368,7 @@ lou_in01,107,163,0	script	 #lou_drink1	111,{
 			delitem 938,1; //Sticky_Mucus
 			delitem 713,1; //Empty_Bottle
 			set ch_poison,17;
+			changequest 11079,11080;
 			close;
 		}
 		mes "^3355FFIt seems that you need switch Bai Long's drinking bottle with something else. Just taking the drink bottle would arouse suspicion.^000000";
@@ -4435,6 +4471,7 @@ lou_in01,99,158,4	script	Lord#bailong	821,{
 			mes "[Lord Bai Long]";
 			mes "Please, take this as a token of gratitute. And please deliver this letter to Nagash and Song Zhi Du for me.";
 			set ch_poison,19;
+			changequest 11081,11802;
 			getitem 603,1; //Old_Blue_Box
 			next;
 			mes "^3355FFYou obtained ^0000FFBai Long's letter^000000.";

+ 10 - 1
npc/quests/quests_niflheim.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= The rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
 //= rAthena 7.15 +
 //===== Description: ========================================= 
@@ -26,6 +26,7 @@
 //= 1.4 Fixed NPCs using ID 111 when it shoudl have been 139. [L0ne_W0lf]
 //= 1.5 Swapped NPC IDs back from last change (139 back to 111). [L0ne_W0lf]
 //=     Clicking will do nothing, you have to still "touch" the npc. 
+//= 1.6 Added questlog support. [Euphy]
 //============================================================ 
 
 // Piano Quest
@@ -355,6 +356,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 				mes "Thank you for your help,";
 				mes "and please take care.";
 				set nif_revive,1;
+				setquest 11038;
 				close;
 			}
 			mes "[Erious]";
@@ -434,6 +436,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 				if (checkweight(610,26)) {
 					set MISC_QUEST,MISC_QUEST | 16384;
 					set nif_revive,0;
+					completequest 11043;
 					getitem 607,2; //Yggdrasilberry
 					getitem 608,2; //Seed_Of_Yggdrasil
 					getitem 610,10; //Leaf_Of_Yggdrasil
@@ -478,6 +481,7 @@ prt_in,161,20,3	script	Erious#nif	92,{
 			if (checkweight(610,10)) {
 				set MISC_QUEST,MISC_QUEST | 16384;
 				set nif_revive,0;
+				completequest 11042;
 				getitem 610,10; //Leaf_Of_Yggdrasil
 				mes "[Erious]";
 				mes "Thank you for everything.";
@@ -541,6 +545,7 @@ umbala,215,181,3	script	Billik	733,{
 			mes "for him. That way, he'll know for";
 			mes "sure that I've sent you.";
 			set nif_revive,2;
+			changequest 11038,11039;
 			next;
 			mes "[Billik]";
 			mes "The town of the dead is located";
@@ -600,6 +605,7 @@ niflheim,153,215,3	script	Feylin	794,{
 		mes "you go back to where you came";
 		mes "from before it's too late.";
 		set nif_revive,3;
+		changequest 11039,11040;
 		close;
 	}
 	else if (nif_revive == 3) {
@@ -623,6 +629,7 @@ niflheim,153,215,3	script	Feylin	794,{
 			mes "you. Besides, speaking about";
 			mes "such things is taboo.";
 			set nif_revive,4;
+			changequest 11040,11041;
 			close;
 		}
 		mes "[Feylin]";
@@ -677,6 +684,7 @@ niflheim,153,215,3	script	Feylin	794,{
 								delitem 748,1; //Witherless_Rose
 								delitem 610,10; //Leaf_Of_Yggdrasil
 								set nif_revive,5;
+								changequest 11041,11042;
 								percentheal -99,0;
 								next;
 								mes "[Feylin]";
@@ -720,6 +728,7 @@ niflheim,153,215,3	script	Feylin	794,{
 								mes "with someone else. Oh, also let";
 								mes "him know that I forgive him.";
 								set nif_revive,6;
+								changequest 11040,11043;
 								getitem 934,1; //Mementos
 								next;
 								mes "[Elly]";

+ 85 - 94
npc/quests/quests_rachel.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 3.5
+//= 3.6
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -37,6 +37,7 @@
 //=     - Ice Necklace Quest
 //=     - Thor Volcano Base Quest addition.
 //= 3.5 Updated RE/Pre-RE EXP. [Euphy]
+//= 3.6 Added questlog support. [Euphy]
 //============================================================ 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -51,7 +52,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "work, brave adventurer.";
 		close;
 	}
-
 	if (lost_boy < 1) {
 		mes "[Vincent]";
 		mes "I am Vincert, steward of";
@@ -68,9 +68,7 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "ask you for your help with";
 		mes "a problem on his behalf.";
 		next;
-
 		switch(select("I'm too busy.:Sure, why not?")) {
-
 		case 1:
 			mes "[Vincent]";
 			mes "I understand.";
@@ -80,7 +78,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 			mes "later, then I'd like to ask for";
 			mes "your assistance once again.";
 			close;
-
 		case 2:
 			mes "[Vincent]";
 			mes "Thank you. You see,";
@@ -112,12 +109,10 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 			mes "You might want to question the";
 			mes "other servants of his whereabouts. Thanks again for your help.";
 			set lost_boy,1;
+			setquest 8089;
 			close;
-
 		}
-
 	}
-
 	else if ((lost_boy >= 1) && (lost_boy < 4)) {
 		mes "[Vincent]";
 		mes "I suggest looking around";
@@ -126,7 +121,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Phobe's current location.";
 		close;
 	}
-
 	else if ((lost_boy >= 4) && (lost_boy < 7)) {
 		mes "[Vincent]";
 		mes "We're running out";
@@ -135,7 +129,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "as soon as you can.";
 		close;
 	}
-
 	else if (lost_boy == 7) {
 		mes "[Vincent]";
 		mes "Ah...!";
@@ -271,9 +264,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "just a kid, so he's probably";
 		mes "hiding somewhere in town.";
 		set lost_boy,8;
+		changequest 8094,8095;
 		close;
 	}
-
 	else if (lost_boy == 8) {
 		mes "[Vincent]";
 		mes "The gem is very special...";
@@ -312,7 +305,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "hiding somewhere in town...";
 		close;
 	}
-
 	else if (lost_boy == 9) {
 		mes "[Vincent]";
 		mes "You came back!";
@@ -358,9 +350,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Jenny about Phobe?";
 		mes "Sure, sure, I'll do that.";
 		set lost_boy,10;
+		changequest 8097,8097;
 		close;
 	}
-
 	else if (lost_boy == 10) {
 		mes "[Vincent]";
 		mes "Oh! While I return this";
@@ -375,7 +367,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "Sure, sure, I'll do that.";
 		close;
 	}
-
 	else if (lost_boy == 11) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I told Jenny that";
@@ -419,8 +410,9 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "I don't know what's inside,";
 		mes "but I know these items are";
 		mes "quite valuable nowadays...";
-		getitem 617,1; //Old_Violet_Box
 		set lost_boy,12;
+		changequest 8098,8099;
+		getitem 617,1; //Old_Violet_Box
 		next;
 		mes "[Vincent]";
 		mes "Ah, and this note is a";
@@ -435,7 +427,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "from Vincent.^000000";
 		close;
 	}
-
 	else {
 		mes "[Vincent]";
 		mes "Thank you for everything";
@@ -445,7 +436,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		mes "hesitate to ask me, alright?";
 		close;
 	}
-
 }
 
 rachel,114,232,3	script	Logan#ra_in01	869,{
@@ -459,7 +449,6 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "don't distract me, please.";
 		close;
 	}
-
 	else if (lost_boy == 1) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do";
@@ -505,9 +494,9 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "inside the mansion. He's";
 		mes "been working here for a while.";
 		set lost_boy,2;
+		changequest 8089,8090;
 		close;
 	}
-
 	else if (lost_boy == 2) {
 		mes "[Logan]";
 		mes "If you want to learn";
@@ -518,7 +507,6 @@ rachel,114,232,3	script	Logan#ra_in01	869,{
 		mes "the mansion is a good bet.";
 		close;
 	}
-
 }
 
 ra_in01,372,200,3	script	Manson#ra_in01	929,{
@@ -532,7 +520,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "cleaning up after visitors.";
 		close;
 	}
-
 	else if (lost_boy == 1) {
 		mes "[Manson]";
 		mes "You know, considering";
@@ -543,7 +530,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "Sir Zhed here in the mansion.";
 		close;
 	}
-
 	else if (lost_boy == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do you";
@@ -606,9 +592,9 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "now, and she'd appreciate";
 		mes "your help in finding Phobe.";
 		set lost_boy,3;
+		changequest 8090,8091;
 		close;
 	}
-
 	else if (lost_boy == 3) {
 		mes "[Manson]";
 		mes "You know, if you want to";
@@ -619,7 +605,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "your help in finding Phobe.";
 		close;
 	}
-
 	else {
 		mes "[Manson]";
 		mes "Nuts, there's so much";
@@ -629,7 +614,6 @@ ra_in01,372,200,3	script	Manson#ra_in01	929,{
 		mes "Ah well, it's a living.";
 		close;
 	}
-
 }
 
 rachel,48,237,3	script	Jenny#ra_in01	894,{
@@ -642,7 +626,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "haven't been invited!";
 		close;
 	}
-
 	else if (lost_boy == 3) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but are";
@@ -692,9 +675,9 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "Alright, I guess I can go";
 		mes "to the market and ask around.";
 		set lost_boy,4;
+		changequest 8091,8092;
 		close;
 	}
-
 	else if ((lost_boy >= 3) && (lost_boy < 6)) {
 		mes "[Jenny]";
 		mes "Please find Phobe,";
@@ -710,7 +693,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "Phobe was last seen.";
 		close;
 	}
-
 	else if (lost_boy == 6) {
 		mes "[Jenny]";
 		mes "Please find Phobe,";
@@ -720,7 +702,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "about that boy, you know?";
 		close;
 	}
-
 	else if ((lost_boy > 6) && (lost_boy < 11)) {
 		mes "[Jenny]";
 		mes "Oh! You're back!";
@@ -733,7 +714,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "important to discuss";
 			mes "with Vincent first.";
 		}
-
 		else if (lost_boy == 8) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Actually... Uh...";
@@ -742,7 +722,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "lead! Don't worry, I'll";
 			mes "find him soon, I promise.";
 		}
-
 		else if (lost_boy == 9) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Actually... Uh...";
@@ -752,7 +731,6 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "some good news soon,";
 			mes "I promise. Se eyou later~";
 		}
-
 		else if (lost_boy == 10) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Yes, he's fine, just";
@@ -793,11 +771,10 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 			mes "happier. Thank you for";
 			mes "all of your help, adventurer~";
 			set lost_boy,11;
+			changequest 8097,8098;
 		}
-
 		close;
 	}
-
 	else if ((lost_boy > 10) && (lost_boy < 13)) {
 		mes "[Jenny]";
 		mes "Thank you so much for";
@@ -808,9 +785,7 @@ rachel,48,237,3	script	Jenny#ra_in01	894,{
 		mes "I am to you as a mother...";
 		close;
 	}
-
 	end;
-	
 }
 
 rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
@@ -824,7 +799,6 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		mes "pack it up and go home.";
 		close;
 	}
-
 	else if (lost_boy == 4) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me?";
@@ -904,7 +878,6 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		set lost_boy,5;
 		close;
 	}
-
 	else if (lost_boy >= 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "(^333333I better ask the other";
@@ -915,7 +888,6 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 		mes "ridiculous mock vegetables.^000000)";
 		close;
 	}
-
 }
 
 rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
@@ -928,7 +900,6 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "make a living like this.";
 		close;
 	}
-
 	else if (lost_boy == 5) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me,";
@@ -976,9 +947,9 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "in that ice cave. That place";
 		mes "can be plenty dangerous.";
 		set lost_boy,6;
+		changequest 8092,8093;
 		close;
 	}
-
 	else if (lost_boy == 6) {
 		mes "[Idle Merchant]";
 		mes "So yeah, last night,";
@@ -1011,8 +982,6 @@ rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 		mes "can be plenty dangerous.";
 		close;
 	}
-
-
 }
 
 ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
@@ -1025,7 +994,6 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "precious oxygen!";
 		close;
 	}
-
 	if (lost_boy == 6) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Excuse me, but do you";
@@ -1106,9 +1074,9 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "to Vincent and make";
 		mes "him explain everything.";
 		set lost_boy,7;
+		changequest 8093,8094;
 		close;
 	}
-
 	else if (lost_boy == 7) {
 		mes "[Mogan]";
 		mes "It looks like he set";
@@ -1125,7 +1093,6 @@ ra_fild01,245,325,3	script	Suspicious Man#ra_in01	934,{
 		mes "him explain everything.";
 		close;
 	}
-
 }
 
 rachel,263,32,3	script	Kid#ra_in01	931,{
@@ -1134,7 +1101,6 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "Leave me alone!";
 		close;
 	}
-
 	else if (lost_boy == 8) {
 		mes "^3355FFYou catch a shining";
 		mes "glint from this boy's";
@@ -1219,9 +1185,9 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "you should bring this red";
 		mes "jewel back to Vincent.^000000";
 		set lost_boy,9;
+		changequest 8095,8096;
 		close;
 	}
-
 	else if (lost_boy == 9) {
 		mes "[Phobe]";
 		mes "I... I'm not ready";
@@ -1237,7 +1203,6 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "jewel back to Vincent.^000000";
 		close;
 	}
-
 	else {
 		mes "["+strcharinfo(0)+"]";
 		mes "You know, you should";
@@ -1261,7 +1226,6 @@ rachel,263,32,3	script	Kid#ra_in01	931,{
 		mes "Gosh... Fine.";
 		close;
 	}
-
 }
 
 // Bruspetti Quest (Perequisite: Lighthalzen "Friendship" quest)
@@ -1287,6 +1251,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "turn me in, go ahead...";
 		delitem 1201,1; //Knife
 		set rach_vice,22;
+		changequest 8121,8122;
 		close;
 	}
 
@@ -1477,6 +1442,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "I... I don't have";
 		mes "to tell you anything!";
 		set rach_vice,20;
+		changequest 8120,8121;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "(^333333He's still resisting";
@@ -1835,8 +1801,9 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		next;
 		mes "[Katinshuell]";
 		mes "......!";
+		delitem 7571,1; //Diary_Of_Blue
 		set rach_vice,16;
-		delitem 7571,1; //Blue_Diary
+		changequest 8119,8120;
 		close;
 	}
 
@@ -1885,6 +1852,7 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 			close;
 		}
 		set rach_vice,11;
+		changequest 8114,8115;
 		mes "[Katinshuell]";
 		mes "You happy, now?";
 		mes "Quit trying to pry into";
@@ -1906,7 +1874,6 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 	}
 
 	else if (rach_vice == 3) {
-		set rach_vice,4;
 		mes "[Katinshuell]";
 		mes "Eh? Oh, it's one of you";
 		mes "guys, those do-gooder";
@@ -1921,6 +1888,8 @@ ra_in01,235,194,5	script	Katinshuell	931,{
 		mes "can't handle. Me and my";
 		mes "girlfriend are history now.";
 		mes "It's over between us.";
+		set rach_vice,4;
+		changequest 8107,8108;
 		close;
 	}
 
@@ -2087,7 +2056,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "around here? I'd better go";
 		mes "and ask him about this...";
 		next;
-		set rach_vice,14;
 		mes "[Mr. Shendar]";
 		mes "Wait, where are";
 		mes "you going? I... I'm";
@@ -2116,6 +2084,8 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "father. Besides, adventurers";
 		mes "like you can offer her the";
 		mes "best protection...";
+		set rach_vice,14;
+		changequest 8117,8118;
 		close;
 	}
 
@@ -2130,7 +2100,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 	}
 
 	else if (rach_vice == 8) {
-		set rach_vice,9;
 		mes "[Mr. Shendar]";
 		mes "What? My daughter went";
 		mes "to Lighthalzen? She doesn't";
@@ -2167,11 +2136,12 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "Oh, but how a father";
 		mes "worries. Will my sweet,";
 		mes "darling Bruspetti be alright?";
+		set rach_vice,9;
+		changequest 8112,8113;
 		close;
 	}
 
 	else if ((rach_vice == 4) || (rach_vice == 5)) {
-		set rach_vice,5;
 		mes "[Mr. Shendar]";
 		mes "I miss my daughter. Yes,";
 		mes "the house smells different";
@@ -2186,6 +2156,8 @@ 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;
 		close;
 	}
 
@@ -2209,7 +2181,6 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 	}
 
 	else if (rach_vice == 1) {
-		set rach_vice,2;
 		mes "[Mr. Shendar]";
 		mes "I just found out that";
 		mes "my precious daughter has";
@@ -2233,6 +2204,8 @@ ra_in01,250,19,3	script	Mr. Shendar	929,{
 		mes "awful long time, but she's";
 		mes "also an adult now. I... I guess";
 		mes "she should be just fine.";
+		set rach_vice,2;
+		setquest 8106;
 		close;
 	}
 
@@ -2287,7 +2260,6 @@ rachel,73,244,3	script	Lachellen	919,{
 			next;
 		}
 		else if (.@input$ == "Freya's Spring") {
-			set rach_vice,12;
 			mes "[Lachellen]";
 			mes "Freya's Spring?";
 			mes "Oh, I like that place!";
@@ -2310,6 +2282,8 @@ rachel,73,244,3	script	Lachellen	919,{
 			mes "so you look like a real loser";
 			mes "if you go there alone. That's";
 			mes "why I want a boyfriend now...";
+			set rach_vice,12;
+			changequest 8115,8116;
 			next;
 		}
 		else {
@@ -2349,7 +2323,6 @@ rachel,73,244,3	script	Lachellen	919,{
 	}
 
 	else if (rach_vice == 6) {
-		set rach_vice,7;
 		mes "[Lachellen]";
 		mes "Oh, Bruspetti's dad";
 		mes "was talking about how";
@@ -2381,11 +2354,12 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "and her boyfriend usually";
 		mes "went on dates, you might";
 		mes "be able to find something.";
+		set rach_vice,7;
+		changequest 8110,8111;
 		close;
 	}
 
 	else if ((rach_vice == 2) || (rach_vice == 3)) {
-		set rach_vice,3;
 		mes "[Lachellen]";
 		mes "Ooh, I'm so jealous";
 		mes "of Bruspetti! She's been";
@@ -2400,6 +2374,8 @@ rachel,73,244,3	script	Lachellen	919,{
 		mes "she's also admitted that";
 		mes "she doesn't know much about";
 		mes "him. Let's see... He grew up in Lighthalzen? That's all she knows.";
+		set rach_vice,3;
+		changequest 8106,8107;
 		close;
 	}
 
@@ -2492,7 +2468,6 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 	}
 
 	else if (rach_vice == 12) {
-		set rach_vice,13;
 		mes "[Grandma]";
 		mes "Oh, back again, eh?";
 		mes "I guess you must really";
@@ -2519,6 +2494,8 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 		mes "to let go of whatever's";
 		mes "bothering you, and just";
 		mes "enjoy life as it is now.";
+		set rach_vice,13;
+		changequest 8116,8117;
 		close;
 	}
 	mes "[Grandma]";
@@ -2538,7 +2515,6 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 lhz_in02,213,207,0	script	#ratrace1	111,4,4,{
 OnTouch:
 	if (rach_vice == 5) {
-		set rach_vice,6;
 		mes "[" + strcharinfo(0) + "]";
 		mes "This...";
 		mes "This smell...";
@@ -2550,6 +2526,8 @@ OnTouch:
 		mes "Wait, could this be";
 		mes "the scent that Bruspetti's";
 		mes "father mentioned earlier?";
+		set rach_vice,6;
+		changequest 8109,8110;
 		close;
 	}
 	end;
@@ -2591,6 +2569,7 @@ OnTouch:
 		mes "Who would be to blame?";
 		next;
 		set rach_vice,24;
+		completequest 8122;
 		if (checkre(3)) {
 			if (BaseLevel > 90) getexp 130000,0;
 			else if (BaseLevel > 75) getexp 85000,0;
@@ -2652,7 +2631,6 @@ OnTouch:
 	}
 
 	else if (rach_vice == 7) {
-		set rach_vice,8;
 		mes "[???]";
 		mes "Oh, be very careful!";
 		mes "You don't want to get";
@@ -2670,6 +2648,8 @@ OnTouch:
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Ah, I see.";
+		set rach_vice,8;
+		changequest 8111,8112;
 		close;
 	}
 	end;
@@ -2687,7 +2667,8 @@ ra_in01,255,25,0	script	Book#ra_in	111,{
 
 	else if (rach_vice == 14) {
 		set rach_vice,15;
-		getitem 7571,1; //Blue_Diary
+		changequest 8118,8119;
+		getitem 7571,1; //Diary_Of_Blue
 		mes "^3355FFThis must be";
 		mes "Bruspetti's diary!";
 		mes "You now have permission";
@@ -2698,13 +2679,14 @@ ra_in01,255,25,0	script	Book#ra_in	111,{
 	}
 
 	else if ((rach_vice == 9) || (rach_vice == 10)) {
-		set rach_vice,10;
 		mes "^3355FFThis must be";
 		mes "Bruspetti's diary!";
 		mes "But... reading it";
 		mes "would make you feel";
 		mes "like a real creep.";
 		mes "So don't touch it.^000000";
+		set rach_vice,10;
+		changequest 8113,8114;
 		close;
 	}
 
@@ -2899,8 +2881,8 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 			mes " what you have done for me.";
 			delitem 7573,1; //Magic_Necklace_
 			getexp (checkre(3))?90000:700000,0;
-			completequest 2113;
 			set ice_necklace_q,6;
+			completequest 2113;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "Oh, let's just say it was";
@@ -3127,8 +3109,8 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "this prison of ice. He can";
 		mes "be found near Freya's Spring:";
 		mes "beseech him on my behalf!";
-		changequest 2109,2110;
 		set ice_necklace_q,2;
+		changequest 2109,2110;
 		close2;
 		cutin "",255;
 		end;
@@ -3250,12 +3232,12 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "And please don't mention";
 		mes "the fact that I trapped myself";
 		mes "in ice to anyone else, okay?";
+		set ice_necklace_q,5;
+		changequest 2112,2113;
+		delitem 7569,1; //Hammer_Of_Wind
 		delitem 7572,1; //Magic_Necklace
-		delitem 7569,1; //Wind Of_Hammer
-		getitem 7574,4; //Freezing Snow Powder
 		getitem 7573,1; //Magic_Necklace_
-		changequest 2112,2113;
-		set ice_necklace_q,5;
+		getitem 7574,4; //Ice_Particle
 		close2;
 		cutin "",255;
 		setnpcdisplay "Man Stuck in Ice#cave",924;
@@ -3360,8 +3342,8 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		mes "not one of those smithing tools.";
 		mes "I'd help you if I could, but...";
 		mes "I'm just smart, not strong.";
-		changequest 2110,2111;
 		set ice_necklace_q,3;
+		changequest 2110,2111;
 		close;
 	}
 	else if (ice_necklace_q == 3) {
@@ -3427,12 +3409,12 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		mes "This hammer will only work";
 		mes "once, so make sure that you";
 		mes "smash that ice properly!";
+		delitem 1354,1; //Hammer
 		delitem 996,5; //Rough_Wind
-		delitem 1354,1; //Empty_Scroll
-		delitem 7433,1; //Hammer
-		getitem 7569,1; //Hammer_of_Wind
-		changequest 2111,2112;
+		delitem 7433,1; //Scroll
 		set ice_necklace_q,4;
+		changequest 2111,2112;
+		getitem 7569,1; //Hammer_of_Wind
 		close;
 	}
 	else if (ice_necklace_q >= 4) {
@@ -5021,8 +5003,9 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "you in your travels. Peace";
 		mes "be with you, "+strcharinfo(0)+".";
 		close2;
-		cutin "ra_gman",255;
+		cutin "",255;
 		set lost_boy,13;
+		completequest 8099;
 		specialeffect2 EF_ABSORBSPIRITS;
 		getexp (checkre(3))?90000:900000,0;
 		end;
@@ -5064,7 +5047,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 			mes "someone that I can really";
 			mes "rely on to do this for me...";
 			close2;
-			cutin "ra_gman",255;
+			cutin "",255;
 			end;
 		}
 		cutin "ra_gman",2;
@@ -5186,8 +5169,12 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		next;
 		mes "^3355FFYou received a High";
 		mes "Priest's recommendation.^000000";
+		close2;
+		cutin "",255;
 		set ra_tem_q,15;
 		set lost_boy,14;
+		setquest 8100;
+		end;
 	}
 	else if ((ra_tem_q == 15) || (ra_tem_q == 16)) {
 		mes "[High Priest Zhed]";
@@ -5280,6 +5267,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "discussion. Why don't you";
 		mes "wait and relax in the next room";
 		mes "over there in the meantime?";
+		changequest 8101,8102;
 		close2;
 		cutin "",255;
 		warp "ra_temin",297,156;
@@ -5337,7 +5325,11 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "the Holy Ground? Regardless...";
 		mes "If you want to go there, then";
 		mes "just go there. Who'll stop you?^000000";
+		close2;
+		cutin "",255;
 		set ra_tem_q,20;
+		changequest 8103,8104;
+		end;
 	}
 	else if ((ra_tem_q >= 20) && (ra_tem_q < 22)) {
 		cutin "ra_gman2",2;
@@ -5438,6 +5430,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		set MISC_QUEST,MISC_QUEST | 8192;
 		set ra_tem_q,0;
 		cutin "",255;
+		completequest 8105;
 		specialeffect2 EF_ABSORBSPIRITS;
 		if (checkre(3))
 			getexp 90000,60000;
@@ -5510,6 +5503,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "I'm sure that she can tell you";
 					mes "more about what happened.";
 					set aru_monas,12;
+					changequest 17007,17008;
 					next;
 					mes "[High Priest Zhed]";
 					mes "If you do decide to";
@@ -5748,10 +5742,10 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "of a really good way";
 				mes "for you to infiltrate";
 				mes "that place. Hmmmm...";
-				setquest 2114;
 				set aru_vol,1;
+				setquest 2114;
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if ((aru_vol > 0) && (aru_vol < 5)) {
@@ -5840,7 +5834,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					break;
 				}
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol == 5) {
@@ -5921,8 +5915,8 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 					mes "best chance of entering the Thor";
 					mes "Volcano camp without suspicion.";
 					delitem 7342,1; //File01
-					changequest 2115,2116;
 					set aru_vol,6;
+					changequest 2115,2116;
 				}
 				else {
 					mes "["+strcharinfo(0)+"]";
@@ -5941,7 +5935,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "best chance of entering the Thor";
 				mes "Volcano camp without suspicion.";
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if ((aru_vol > 6) && (aru_vol < 26)) {
@@ -5954,7 +5948,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "best chance of entering the Thor";
 				mes "Volcano camp without suspicion.";
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol == 26) {
@@ -5996,11 +5990,11 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				mes "I will be contacting you again.";
 				mes "Together, we can protect";
 				mes "peace between our nations.";
-				completequest 60213;
 				set aru_vol,27;
+				completequest 60213;
 				getexp (checkre(3))?20000:200000,0;
 				close2;
-				cutin "ra_gman",255;
+				cutin "",255;
 				end;
 			}
 			else if (aru_vol > 26) {
@@ -7125,9 +7119,10 @@ ra_temsky,99,99,5	script	Pope#rachel	936,{
 		mes "learning. Now I have to";
 		mes "go officiate services, so...";
 		mes "This is goodbye for now...";
-		set ra_tem_q,17;
 		close2;
 		cutin "",255;
+		set ra_tem_q,17;
+		changequest 8100,8101;
 		end;
 	}
 	else {
@@ -7229,7 +7224,6 @@ OnTimer120000:
 	stopnpctimer;
 	hideonnpc "High Priestess Niren#ra";
 	end;
-
 }
 
 ra_temin,293,144,0	script	out1#rachel	-1,3,3,{
@@ -7251,7 +7245,6 @@ OnTouch:
 		end;
 	}
 	end;
-
 }
 
 ra_temin,288,151,0	script	hidden1#rachel	-1,1,6,{
@@ -7410,11 +7403,10 @@ OnTouch:
 		mes "For now, you may as well";
 		mes "talk to High Priest Zhed.^000000";
 		set ra_tem_q,19;
+		changequest 8102,8103;
 		close;
 	}
-
 	end;
-
 }
 
 ra_temin,272,143,0	script	key1#rachel	-1,3,3,{
@@ -7439,7 +7431,6 @@ OnTouch:
 		set ra_tem_q,21;
 		close;
 	}
-
 	end;
 }
 
@@ -7465,10 +7456,8 @@ OnTouch:
 		}
 		close;
 	}
-
 	mes "^3355FFThe door is locked.^000000";
 	close;
-	
 }
 
 que_san04,119,115,0	script	imir1#rachel	-1,2,2,{
@@ -7560,9 +7549,11 @@ OnTouch:
 		mes "in a low voice, and your";
 		mes "eyelids grow heavier as you";
 		mes "grow drowsier and sleepier...^000000";
-		set ra_tem_q,22;
 		close2;
+		cutin "",255;
 		hideonnpc "High Priestess Niren#r2";
+		set ra_tem_q,22;
+		changequest 8104,8105;
 		warp "rachel",163,152;
 		end;
 	}

+ 22 - 0
npc/re/cities/yuno.txt

@@ -0,0 +1,22 @@
+//===== rAthena Script ======================================= 
+//= Juno City
+//===== By: ================================================== 
+//= Euphy
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= [Official Conversion]
+//= NPCs for the City of Juno
+//===== Additional Comments: ================================= 
+//= 1.0 First version.
+//============================================================ 
+
+yuno,150,283,4	duplicate(JunoSoldier1)	Juno Soldier#juno	852
+yuno,165,283,4	duplicate(JunoSoldier2)	Juno Soldier#2juno	852
+yuno,227,292,4	duplicate(JunoSoldier3)	Juno Soldier#3juno	852
+yuno,165,228,4	duplicate(JunoSoldier4)	Juno Soldier#4juno	852
+yuno,150,228,4	duplicate(JunoSoldier5)	Juno Soldier#5juno	852
+yuno,334,182,4	duplicate(JunoSoldier6)	Juno Soldier#6juno	852
+yuno,263,320,4	duplicate(JunoSoldier7)	Juno Soldier#7juno	852

+ 4 - 4
npc/re/merchants/enchan_mal.txt

@@ -28,10 +28,10 @@ malangdo,213,167,4	script	Mayomayo#mal	555,{
 	mes "[Mayomayo]";
 	mes "Wow welcome. It is new Mayomayo refinement store~ I enchant some luxury weapons including level 4 weapons.";
 	next;
-	switch(select("Any store policy is changes?:Enhance high ranked weapons:Reset reinforcement capability")) {
+	switch(select("Any store policy changes?:Enchant High Ranked Weapon:Initialize Enchant (Need Silvervine Fruit)")) {
 	case 1:
 		mes "[Mayomayo]";
-		mes "When I enchanted weapons, the slotted cards or refined level sometimes dissipated. I hated it. However, one day I found how to do it without any extinction.";
+		mes "When I enchant weapons, the slotted cards or refined level are dissipated sometimes. I hated it. However, one day I found how to do it without any extinction.";
 		next;
 		mes "[Mayomayo]";
 		mes "Have you ever seen a building of person of reinforcement capacity association?";
@@ -42,7 +42,7 @@ malangdo,213,167,4	script	Mayomayo#mal	555,{
 			close;
 		}
 		mes "[Mayomayo]";
-		mes "If you go the place, there is someone who enchants the Archangel Wing. At that time that was amazing, because that was impossible ability by my own skill.";
+		mes "If you go to the place, there is someone who enchants the Archangel Wing. At that time that was amazing, because that was impossible ability by my own skill.";
 		next;
 		mes "[Mayomayo]";
 		mes "Every night I became his butler and did odd jobs. That is how I learned to enchant.";
@@ -305,7 +305,7 @@ malangdo,213,167,4	script	Mayomayo#mal	555,{
 	}
 	mes "[Mayomayo]";
 	if (@mal_enchant_select == 1)
-		mes "This is not suitable equipment for the enchant. Don't forget we only take care of high class weapons, including level 4 weapons~";
+		mes "This is not a suitable equipment for the enchant. Don't forget we only take care of high class weapons, including level 4 weapons~";
 	else
 		mes "This equipment can not be initialized. Don't forget we only handle some luxury weapons, including level 4 weapons~";
 	set @mal_equip_id,0;

+ 60 - 0
npc/re/merchants/stone_change.txt

@@ -0,0 +1,60 @@
+//===== rAthena Script ======================================= 
+//= Stone Changer
+//===== By: ================================================== 
+//= Euphy
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Organizes ores in a player's inventory.
+//===== Additional Comments: ================================= 
+//= 1.0 First version.
+//============================================================ 
+
+geffen_in,99,174,5	script	Ore Tester#sorty	700,{
+	mes "[Ore Tester Sorty]";
+	mes "Do you have ^3131FFany same type of ores in your inventories^000000 which take many spaces?";
+	mes "I can distinguish your ores and organize them right away~!";
+	next;
+	switch(select("Refine my Ore.:Cancel.")) {
+	case 1:
+		mes "[Ore Tester Sorty]";
+		mes "At the moment I can only distinguish ^FF0000Steel^000000, ^FF0000Iron^000000, ^FF0000Iron Ore^000000, and ^FF0000Rough Oridecon^000000 and organize them.";
+		mes "Please note that ^3131FFother items are unable^000000!";
+		next;
+		mes "[Ore Tester Sorty]";
+		mes "So, would you like me to organize your ores?";
+		next;
+		set .@i, select("Steel, please.:Iron, please.:Iron Ore, please.:Rough Oridecon, please.:No, thanks.");
+		if (.@i == 5) {
+			mes "[Ore Tester Sorty]";
+			mes "Huh, I really hate messy people!";
+			close;
+		}
+		setarray .@ores[0],999,998,1002,756;
+		set .@item, .@ores[.@i-1];
+		if (countitem(.@item) == 0) {
+			mes "[Ore Tester Sorty]";
+			mes "You don't have any "+getitemname(.@item)+"...";
+			close;
+		}
+		while(1) {
+			if (countitem(.@item)) {
+				set .@count, countitem(.@item);
+				set .@total, .@total + .@count;
+				delitem .@item, .@count;
+			} else {
+				getitem .@item, .@total;
+				break;
+			}
+		}
+		mes "[Ore Tester Sorty]";
+		mes "It's done. Looks great! Don't you think so?";
+		close;
+	case 2:
+		mes "[Ore Tester Sorty]";
+		mes "It seems that your bag is clean? Huhu! You might be the master of cleaning!";
+		close;
+	}
+}

+ 39 - 0
npc/re/other/bulletin_boards.txt

@@ -0,0 +1,39 @@
+//===== rAthena Script =======================================
+//= Bulletin Boards
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: ========================================= 
+//= Bulletin Boards for beginners.
+//===== Additional Comments: =================================
+//= 1.0 Moved Izlude NPCs to Pre-RE/RE paths.
+//=     Disabled until proper coordinates are found.
+//============================================================
+
+/*
+-	script	::BulletinBoard_iz	-1,{
+	mes "[Izlude: The Satellite City]";
+	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accomodate its burgeoning population.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "The main buildings here are to accomodate the growth of the Cryptura Academy.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "Points of interest include the Swordman Association building which allows adventurers to change their job to Swordman, and the Battle Area that is East of Izlude.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "At the docks, you may take a ship and travel to ^003399Alberta^000000 or ^660000Byalan Island^000000.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "From Izlude, ^3355FFProntera^000000 is located to the Northwest, and ^006600Payon^000000 is located to the South. Enjoy your travels in the Rune-Midgarts Kingdom.";
+	close;
+}
+izlude,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5	837
+izlude_a,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_a	837
+izlude_b,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_b	837
+izlude_c,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_c	837
+izlude_d,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_d	837
+*/

+ 15 - 0
npc/re/other/turbo_track.txt

@@ -0,0 +1,15 @@
+//===== rAthena Script =======================================
+//= Turbo Track
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Renewal duplicates.
+//===== Additional Comments: =================================
+//= 1.0 Split Mount Manager NPC.
+//============================================================
+
+alde_gld,181,199,5	duplicate(MountManager_turbo)	Mount Manager	845

+ 4 - 0
npc/re/scripts_athena.conf

@@ -16,6 +16,7 @@ npc: npc/re/cities/jawaii.txt
 npc: npc/re/cities/malangdo.txt
 npc: npc/re/cities/malaya.txt
 npc: npc/re/cities/mora.txt
+npc: npc/re/cities/yuno.txt
 
 // --------------------------- Guides ---------------------------
 npc: npc/re/guides/navigation.txt
@@ -80,12 +81,15 @@ npc: npc/re/merchants/quivers.txt
 npc: npc/re/merchants/refine.txt
 npc: npc/re/merchants/renters.txt
 npc: npc/re/merchants/shops.txt
+npc: npc/re/merchants/stone_change.txt
 //npc: npc/re/merchants/ticket_refiner.txt
 
 // --------------------------- Others ---------------------------
+npc: npc/re/other/bulletin_boards.txt
 npc: npc/re/other/mail.txt
 npc: npc/re/other/mercenary_rent.txt
 npc: npc/re/other/resetskill.txt
+npc: npc/re/other/turbo_track.txt
 
 // --------------------------- Quests ---------------------------
 // - Eden Group -------------------------------------------------

部分文件因为文件数量过多而无法显示