* Added quest log support for the following quests.

- Factory Quest, Murder Quest, Cursed Spirit Quest, Juno Remedy Quest, Airship Ticket Quest, How the Airship Works, Ice Necklace Quest, Siblings Quest, Thor Volcano Base Quest, Muff's Loan, Broken Diamond, and the Z-Gang Quest


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

8 files changed, 434 insertions, 239 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index ae731e6b0..4c2936f74 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,11 @@
 Date		Added
 ======
+2010/11/22
+	* Rev. 14490 Added quest log support for the following quests. [L0ne_W0lf]
+	- Factory Quest, Murder Quest, Cursed Spirit Quest, Juno Remedy Quest,
+	Airship Ticket Quest, How the Airship Works, Ice Necklace Quest, 
+	Siblings Quest, Thor Volcano Base Quest, Muff's Loan, Broken Diamond,
+	and the Z-Gang Quest
 2010/11/04
 	* Rev. 14448 Just a couple Bug fixes. :P [L0ne_W0lf]
 	- Added a missing close in quests_13_2.txt. (bugreport:4520)
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 43e51d5d0..935695dab 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 // Samuray22
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,8 +11,8 @@
 //= Reward: -Free Ticket for Flyship.
 //=	    -Free System to Repair.
 //= Quest about how work the airship
-//= Reward: -Base Experience 200.000
-//=	    -Job Experience 10.000
+//= Reward: -Base Experience 200,000
+//=	    -Job Experience 10,000
 //===== Additional Comments: ================================= 
 //= 1.0 First Beta.
 //= 1.1 Added Heart Fragment quest. [SinSloth]
@@ -24,6 +24,9 @@
 //= 1.5 Replaced effect numerics with constants. [Samuray22]
 //= 1.6 Changed some variables to scope instead of permanent char. [brianluau]
 //= 1.7 some minor cleanup updates to the airship invasion. [L0ne_W0lf]
+//= 1.8 Added quest log entries for:
+//=     - Airship Ticket Quest
+//=     - How the Airship Works
 //============================================================ 
 
 //=======================================================================================================//
@@ -47,6 +50,7 @@ airplane,47,61,1	script	Crewman	833,{
 		mes "[Kain Himere]";
 		mes "It's a strange favor to ask, but I'll pay you back as soon as you return.";
 		next;
+		setquest 2079;
 		set kain_ticket, 5;
 		mes "^3355FFKain Himere has given you a small box.^000000";
 		close;
@@ -270,7 +274,7 @@ airplane,47,61,1	script	Crewman	833,{
 				mes "I needed sent to Einbroch. Anyway, I hope you have a good trip. Oh, and thanks for listening.";
 				close;
 			}
-		}			
+		}
 	} else if(kain_ticket==3) {
 		mes "[Kain Himere]";
 		mes "Oh, how are you?";
@@ -368,6 +372,7 @@ airplane,47,61,1	script	Crewman	833,{
 			next;
 			mes "[Kain Himere]";
 			mes "Would be so kind as to help me by finding that journal and seeing if Tarsha is my daughter?";
+			changequest 2081,2082;
 			set kain_ticket, 11;
 			close;
 		}
@@ -403,6 +408,7 @@ airplane,47,61,1	script	Crewman	833,{
 			mes "[Kain Himere]";
 			mes "I know this isn't much, but please understand that it's all I can give you. God bless you for your all your help!";
 			delitem 7276, 1;
+			completequest 2085;
 			set kain_ticket, 15;
 			getitem 7311, 4;
 			close;
@@ -473,6 +479,7 @@ OnTouch:
 			mes "out 'comrades!'";
 			close;
 		case 2:
+			changequest 2079,2080;
 			set kain_ticket, 7;
 			mes "[Elle Cherno]";
 			mes "This...?";
@@ -519,6 +526,7 @@ OnTouch:
 			mes "^3355FFElle put a big";
 			mes "doodled message";
 			mes "in your hand.^000000";
+			changequest 2084,2085;
 			set kain_ticket, 14;
 			getitem 7276, 1; //Picture Letter,
 			close;
@@ -641,6 +649,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "I've got to go check something now, but hopefully I'll be back soon with good news!";
+		changequest 2080,2081;
 		set kain_ticket, 10;
 		close;
 	} else if(kain_ticket == 10 || kain_ticket == 11) {
@@ -708,6 +717,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	850,{
 			mes "[Tarsha Cherno]";
 			mes "Ah, right.";
 			mes "Elle wants to see you again. Would you be so kind as to see her before you go?";
+			changequest 2083,2084;
 			set kain_ticket, 13;
 			close;
 		case 3:
@@ -920,6 +930,7 @@ einbech,45,113,5	script	Tree#t1-1::Tree	111,{
 			close;
 		} else {
 			callfunc "diary";
+			changequest 2082,2083;
 			set kain_ticket, 12;
 			close;
 		}
@@ -1500,6 +1511,7 @@ airplane_01,238,154,5	script	Airship Captain#01	873,{
 						cutin "",255;
 						end;
 					case 2:
+						setquest 8032;
 						set lght_air, 2;
 						mes "[Tarlock]";
 						mes "Ha-hah! I like you";
@@ -1633,6 +1645,7 @@ airplane_01,238,154,5	script	Airship Captain#01	873,{
 					mes "I'm tired for reading";
 					mes "and writing those long";
 					mes "letters.";
+					completequest 8035;
 					set lght_air, 7;
 					getexp 200000, 10000;
 					close2;
@@ -1755,6 +1768,7 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		next;
 		mes "[Ferlock]";
 		mes "And if you ever meet him, please send him my gratitude and regards.";
+		changequest 8045,8046;
 		set hg_ma1,5;
 		close2;
 		cutin "",255;
@@ -1976,6 +1990,7 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		mes "is goodbye for now, adventurer.";
 		close2;
 		specialeffect2 EF_ABSORBSPIRITS;
+		completequest 8043;
 		set lhz_heart,13;
 		getexp 700000,400000;
 		cutin "",255;
@@ -2024,71 +2039,73 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 		
 	case 2:
 		if (lght_air == 2) {
-		set lght_air, 3;
-		mes "^3131FFYou give Captain Ferlock";
-		mes "the letter that his brother";
-		mes "Tarlock has written for him.^000000";
-		next;
-		mes "[Ferlock]";
-		mes "Oh, this is from my";
-		mes "brother? Hey, thanks so";
-		mes "much for bringing this to";
-		mes "me for him. Ah, give me";
-		mes "a minute to read all of";
-		mes "this, would you now?";
-		next;
-		mes "[Ferlock]";
-		mes "...";
-		mes "So that's what he's been";
-		mes "up to. Huh. Hahaha! Oh, that's";
-		mes "funny. Ah, it's always good to";
-		mes "hear from Tarlock. Anyway,";
-		mes "I'm sorry to make you wait.";
-		next;
-		mes "[Ferlock]";
-		mes "Anyway, my brother wrote";
-		mes "about the usual stuff, but";
-		mes "he mentioned that he was";
-		mes "hoping to finally return a few";
-		mes "things he borrowed from me.";
-		mes "However, he lost them...";
-		next;
-		mes "[Ferlock]";
-		mes "It turns that those nasty";
-		mes "gremlins that sometimes";
-		mes "attack his ship stole my";
-		mes "things, so was he actually";
-		mes "hoping that you would";
-		mes "help me get them back.";
-		next;
-		mes "[Ferlock]";
-		mes "Yeah, yeah. He specifically";
-		mes "mentioned that I shouldn't";
-		mes "give you my reply until you";
-		mes "hunt those monsters and get";
-		mes "my stuff back. I'm sorry, but";
-		mes "I guess you owe big bro, huh?";
-		next;
-		mes "[Ferlock]";
-		mes "Well, if you're willing to";
-		mes "help me, would you get my";
-		mes "^ff00002 Will of the Darkness^000000 and";
-		mes "^ff00002 Prickly Fruit^000000 back for me?";
-		next;
-		mes "[Ferlock]";
-		mes "The monsters that attack";
-		mes "Tarlock's Airship should";
-		mes "have them. I'd appreciate";
-		mes "it if you'd help me out on";
-		mes "this, adventurer. Thanks";
-		mes "in advance and good luck~";
-		close2;
-		cutin "",255;
-		end;
+			changequest 8032,8033;
+			set lght_air, 3;
+			mes "^3131FFYou give Captain Ferlock";
+			mes "the letter that his brother";
+			mes "Tarlock has written for him.^000000";
+			next;
+			mes "[Ferlock]";
+			mes "Oh, this is from my";
+			mes "brother? Hey, thanks so";
+			mes "much for bringing this to";
+			mes "me for him. Ah, give me";
+			mes "a minute to read all of";
+			mes "this, would you now?";
+			next;
+			mes "[Ferlock]";
+			mes "...";
+			mes "So that's what he's been";
+			mes "up to. Huh. Hahaha! Oh, that's";
+			mes "funny. Ah, it's always good to";
+			mes "hear from Tarlock. Anyway,";
+			mes "I'm sorry to make you wait.";
+			next;
+			mes "[Ferlock]";
+			mes "Anyway, my brother wrote";
+			mes "about the usual stuff, but";
+			mes "he mentioned that he was";
+			mes "hoping to finally return a few";
+			mes "things he borrowed from me.";
+			mes "However, he lost them...";
+			next;
+			mes "[Ferlock]";
+			mes "It turns that those nasty";
+			mes "gremlins that sometimes";
+			mes "attack his ship stole my";
+			mes "things, so was he actually";
+			mes "hoping that you would";
+			mes "help me get them back.";
+			next;
+			mes "[Ferlock]";
+			mes "Yeah, yeah. He specifically";
+			mes "mentioned that I shouldn't";
+			mes "give you my reply until you";
+			mes "hunt those monsters and get";
+			mes "my stuff back. I'm sorry, but";
+			mes "I guess you owe big bro, huh?";
+			next;
+			mes "[Ferlock]";
+			mes "Well, if you're willing to";
+			mes "help me, would you get my";
+			mes "^ff00002 Will of the Darkness^000000 and";
+			mes "^ff00002 Prickly Fruit^000000 back for me?";
+			next;
+			mes "[Ferlock]";
+			mes "The monsters that attack";
+			mes "Tarlock's Airship should";
+			mes "have them. I'd appreciate";
+			mes "it if you'd help me out on";
+			mes "this, adventurer. Thanks";
+			mes "in advance and good luck~";
+			close2;
+			cutin "",255;
+			end;
 		} else if(lght_air == 3) {
 			if (countitem(7340) >= 2 && countitem(576) >= 2) {
 				delitem 7340, 2;
 				delitem 576, 2;
+				changequest 8033,8034;
 				set lght_air, 4;
 				mes "[Ferlock]";
 				mes "You brought the items!";
@@ -2107,16 +2124,16 @@ airplane,236,163,5	script	Airship Captain#03	873,{
 				cutin "",255;
 				end;
 			}
-				mes "[Ferlock]";
-				mes "Oh, I'm sorry, but it looks";
-				mes "like you're missing something.";
-				mes "Would you please go and find";
-				mes "^ff00002 Will of the Darkness^000000 and";
-				mes "^ff00002 Prickly Fruit^000000? Thanks,";
-				mes "brave adventurer~";
-				close2;
-				cutin "",255;
-				end;
+			mes "[Ferlock]";
+			mes "Oh, I'm sorry, but it looks";
+			mes "like you're missing something.";
+			mes "Would you please go and find";
+			mes "^ff00002 Will of the Darkness^000000 and";
+			mes "^ff00002 Prickly Fruit^000000? Thanks,";
+			mes "brave adventurer~";
+			close2;
+			cutin "",255;
+			end;
 		}
 		mes "[Ferlock]";
 		mes "Well, I hope that";
@@ -2293,6 +2310,7 @@ airplane,236,63,4	script	Hallen	706,{
 				mes "^3355FFHallen gave you";
 				mes "Mawong's letter to";
 				mes "be delivered to Kaci.^000000";
+				setquest 8036;
 				set lhz_heart,2;
 				next;
 				mes "[Hallen]";
@@ -2456,6 +2474,7 @@ airplane,236,63,4	script	Hallen	706,{
 		mes "is it even possible? Well, if";
 		mes "you could find out for me, ";
 		mes "it'd be a really big help.";
+		changequest 8038,8039;
 		set lhz_heart,6;
 		close;
 	}
@@ -2518,6 +2537,7 @@ airplane,236,63,4	script	Hallen	706,{
 			mes "Heart Piece. Now where";
 			mes "have I heard about that";
 			mes "before? Mm, let me think...";
+			changequest 8039,8040;
 			set lhz_heart,7;
 			close;
 		}
@@ -2594,6 +2614,7 @@ airplane,236,63,4	script	Hallen	706,{
 		}
 		if(Shinokas_Quest > 9) set lhz_heart,9;
 		else set lhz_heart,8;
+		changequest 8040,8041;
 		getitem 501,1;
 		mes "[Hallen]";
 		mes "Here you go~";
@@ -2688,6 +2709,7 @@ airplane,33,69,4	script	Kaci	73,{
 		mes "As for Euslan, please tell her about me and let her know that I hope she gets well soon.";
 		next;
 		mes "^3355FFSince she's begging, I guess I should send her message.";
+		changequest 8044,8045;
 		set hg_ma1,4;
 		close;
 	}
@@ -2718,6 +2740,7 @@ airplane,33,69,4	script	Kaci	73,{
 		mes "asking customers for favors!";
 		mes "But still, he's really busy...";
 		next;
+		changequest 8036,8037;
 		set lhz_heart,3;
 		mes "[Kaci]";
 		mes "Thank you for bringing";
@@ -2834,6 +2857,7 @@ L_Ask:
 		mes "back to work now.";
 		mes "Have a nice day,";
 		mes "and I'll see you later~";
+		changequest 8037,8038;
 		set lhz_heart,4;
 		close;
 	}
@@ -2885,6 +2909,7 @@ L_Ask:
 		mes "that laboratory in Einbroch";
 		mes "as soon as I can, even if it's";
 		mes "a heavily restricted area.^000000)";
+		changequest 8041,8042;
 		set lhz_heart,9;
 		close;
 	}
@@ -3097,6 +3122,7 @@ L_Input:
 			mes "Airship, alright? Now hurry!";
 			close2;
 			donpcevent "Ferlock#lab::OnInit";
+			changequest 8042,8043;
 			set lhz_heart,11;
 			end;
 		}
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 8d330f747..0ec73cfdc 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.4
+//= 2.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -46,6 +46,9 @@
 //= 2.2a Fixed typos in var names from EIN_LOVERQRQ to EIN_LOVERQ. (bugreport:2464) [Paradox924X]
 //= 2.3 Removed occurance of PcName. [L0ne_W0lf]
 //= 2.4 Added missing remove cutin. [Kisuka]
+//= 2.5 Added quest log entries for:
+//=     - Factory Quest
+//=     - Murder Quest
 //============================================================ 
 
 // Oridecon Stone OR Mineral Stone Quest
@@ -3368,6 +3371,7 @@ OnTimer600000:
 
 einbroch,132,84,3	script	Liotzburg#ein	853,2,2,{
 	if ((EinFactory == 13) || (EinFactory == 14)) {
+		changequest 8029,8030;
 		set EinFactory,14;
 		mes "[Liotzburg]";
 		mes "What...?";
@@ -3547,6 +3551,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 			delitem 7317,10; //Screw
 			delitem 7319,10; //Old_Steel_Plate
 			set $EinPolution,$EinPolution+1;
+			completequest 8031;
 			set EinFactory,16;
 			if (BaseLevel < 41) {
 				getexp 615,0;
@@ -3639,6 +3644,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 		mes "10 ^FF0000Used Iron Plate^000000,";
 		mes "we could make those repairs.";
 		next;
+		changequest 8030,8031;
 		set EinFactory,15;
 		mes "[Zelmeto]";
 		mes "But without funds, there's";
@@ -3684,6 +3690,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 		mes "the machines will be safely";
 		mes "functioning again.";
 		next;
+		changequest 8028,8029;
 		set EinFactory,13;
 		mes "[Zelmeto]";
 		mes "First, I better";
@@ -3737,6 +3744,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 		mes "use it. I really don't know";
 		mes "where it could be now.";
 		next;
+		changequest 8026,8027;
 		set EinFactory,11;
 		mes "[Zelmeto]";
 		mes "Still, I'm sure that";
@@ -3789,6 +3797,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 		mes "of molten metal. You should";
 		mes "be able to find it pretty easily.";
 		next;
+		changequest 8024,8025;
 		set EinFactory,9;
 		mes "[Zelmeto]";
 		mes "Thanks again";
@@ -3843,6 +3852,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 		mes "broken, we need to know";
 		mes "and fix it right away.";
 		next;
+		changequest 8022,8023;
 		set EinFactory,7;
 		mes "[Zelmeto]";
 		mes "Thanks again";
@@ -3890,6 +3900,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 		mes "condition, even though it's";
 		mes "operating fine for now...";
 		next;
+		changequest 8020,8021;
 		set EinFactory,5;
 		mes "[Zelmeto]";
 		mes "We need to ensure that";
@@ -3941,6 +3952,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 		mes "problem seems small, please";
 		mes "report it to me. I know it might seem fine now, but I want to prevent an accident if I can.";
 		next;
+		changequest 8018,8019;
 		set EinFactory,3;
 		mes "[Zelmeto]";
 		mes "Thank you";
@@ -4033,6 +4045,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 			mes "it wouldn't hurt to make sure.";
 			mes "You should find it easily.";
 			next;
+			setquest 8017;
 			set EinFactory,1;
 			mes "[Zelmeto]";
 			mes "When you finish your";
@@ -4064,6 +4077,7 @@ ein_in01,67,242,3	script	Zelmeto	851,{
 
 ein_in01,49,232,3	script	2nd Control Panel#ins	111,{
 	if ((EinFactory == 1) || (EinFactory == 2)) {
+		changequest 8017,8018;
 		set EinFactory,2;
 		mes "^3355FFIt's the 2nd control panel";
 		mes "Zelmeto asked you to inspect.";
@@ -4078,6 +4092,7 @@ ein_in01,49,232,3	script	2nd Control Panel#ins	111,{
 
 ein_in01,108,217,3	script	3rd Pressure Governor#1	111,{
 	if ((EinFactory == 3) || (EinFactory == 4)) {
+		changequest 8019,8020;
 		set EinFactory,4;
 		mes "^3355FFAt first glance, this";
 		mes "pressure governor looks";
@@ -4093,6 +4108,7 @@ ein_in01,108,217,3	script	3rd Pressure Governor#1	111,{
 
 ein_in01,62,258,3	script	Main Control Panel#ins	111,{
 	if ((EinFactory == 5) || (EinFactory == 6)) {
+		changequest 8021,8022;
 		set EinFactory,6;
 		mes "^3355FFThe main control panel";
 		mes "doesn't look like it has";
@@ -4108,6 +4124,7 @@ ein_in01,62,258,3	script	Main Control Panel#ins	111,{
 
 ein_in01,46,197,3	script	Conveyor#ins	111,{
 	if ((EinFactory == 7) || (EinFactory == 8)) {
+		changequest 8023,8024;
 		set EinFactory,8;
 		mes "^3355FFThe conveyor's movements";
 		mes "look jittery and clumsy. The";
@@ -4122,6 +4139,7 @@ ein_in01,46,197,3	script	Conveyor#ins	111,{
 
 ein_in01,100,266,3	script	Pipe#ins	111,{
 	if ((EinFactory == 9) || (EinFactory == 10)) {
+		changequest 8025,8026;
 		set EinFactory,10;
 		mes "^3355FFThe inspection of this";
 		mes "pipe didn't take very long.";
@@ -4137,6 +4155,7 @@ ein_in01,100,266,3	script	Pipe#ins	111,{
 
 ein_in01,95,239,3	script	Conveyor#ins2	111,{
 	if ((EinFactory == 11) || (EinFactory == 12)) {
+		changequest 8027,8028;
 		set EinFactory,12;
 		mes "^3355FFThis conveyor seems";
 		mes "to have similar problems";
@@ -4380,6 +4399,7 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 		mes "[Buender Hikeman]";
 		mes "Then I learned...";
 		mes "You planned it all along.";
+		setquest 2071;
 		set Shinokas_Quest,1;
 		close2;
 		cutin "ein_hicman",255;
@@ -4491,6 +4511,7 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 		mes "It wouldn't be a good idea to";
 		mes "provoke the old man anymore,";
 		mes "intentionally or not.^000000";
+		changequest 2071,2072;
 		set Shinokas_Quest,2;
 		close2;
 		cutin "ein_hicman",255;
@@ -4649,6 +4670,7 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 			mes "their intentions can't be good.";
 			close2;
 			cutin "ein_hicman",255;
+			completequest 2078;
 			set Shinokas_Quest,11;
 			if (BaseLevel < 70) {
 				getexp 100000,80000;
@@ -4885,6 +4907,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "Alright, I'll tell you what";
 		mes "happened. But it's a";
 		mes "long story...";
+		changequest 2072,2073;
 		set Shinokas_Quest,3;
 		close;
 	}
@@ -4963,6 +4986,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "[Shinokas]";
 		mes "I'm too old and weak to leave";
 		mes "this house, and there's the chance that those men will find me. If you can sympathize with my situation, please find out if the Kapellthaine family has any unique ores...";
+		changequest 2073,2074;
 		set Shinokas_Quest,4;
 		close;
 	}
@@ -5008,6 +5032,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "Please go and search the";
 		mes "Factory for that ore as";
 		mes "soon as you can.";
+		changequest 2074,2075;
 		set Shinokas_Quest,6;
 		close;
 	}
@@ -5088,6 +5113,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 				mes "can enter that kind";
 				mes "of place. But I'm sure";
 				mes "you'll figure something out.";
+				changequest 2075,2076;
 				set Shinokas_Quest,7;
 				close;
 			}
@@ -5216,6 +5242,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "Shinokas!";
 		mes "Why, God?";
 		mes "Why...";
+		changequest 2077,2078;
 		set Shinokas_Quest,10;
 		close;
 	}
@@ -5552,6 +5579,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 			mes "must have been a piece";
 			mes "of ^3131FFYmir's Heart^333333. I better";
 			mes "tell Shinokas about this.)^000000";
+			changequest 2076,2077;
 			set Shinokas_Quest,9;
 			close;
 		case 2:
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index aac15ec8a..617623db2 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= MasterOfMuppets & SinSloth
 //===== Current Version: =====================================
-//= 2.0
+//= 2.1
 //===== Compatible With: =====================================
 //= eAthena
 //===== Description: =========================================
@@ -23,6 +23,8 @@
 //= 1.8 Added missing checkweight. [L0ne_W0lf]
 //= 1.9 Replaced effect numerics with constants. [Samuray22]
 //= 2.0 Commented a break out to fix a script hang.
+//= 2.1 Added quest log entries for:
+//=     - Juno Remedy Quest
 //============================================================
 
 //-------------------------------------------------------------------------
@@ -6968,6 +6970,7 @@ 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;
 			close;
 		break;
@@ -7041,6 +7044,7 @@ 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;
 			close;
 		break;
@@ -7104,6 +7108,7 @@ 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;
 		close;
 	}
@@ -7163,6 +7168,7 @@ 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;
 		specialeffect EF_ABSORBSPIRITS;
 		getexp 900000,600000;
@@ -7242,6 +7248,7 @@ 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;
 		warp "que_bingo",37,24;
 		end;
@@ -7355,6 +7362,7 @@ 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;
 		end;
 	}
@@ -7487,6 +7495,7 @@ 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;
 		end;
 	}
@@ -7542,6 +7551,7 @@ odin_tem01,130,134,4	script	Young Man#Hu_Quest	774,{
 		mes "has made to give to Euslan.^000000";
 		close2;
 		delitem 7511,5; //Darkness rune
+		changequest 8051,8052;
 		set hg_ma1,12;
 		end;
 	}
@@ -7598,6 +7608,7 @@ OnTouch:
 		mes "you better go tell him";
 		mes "about this right now!^000000";
 		close2;
+		changequest 8049,8050;
 		set hg_ma1,10;
 		end;
 	}
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 6d7e4ddb2..27d9aa452 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -4,7 +4,7 @@
 //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
 //= Lupus, Lord Gywall
 //===== Current Version: ===================================== 
-//= 4.5
+//= 4.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -74,6 +74,8 @@
 //= 4.5 Corrected an Incorrect check of the Shinokas_Quest. (bugreport:2276) [Samuray22]
 //=	  Replaced effect numerics with constants.
 //= 4.5 Official Gangster Alert script. [Gepard]
+//= 4.6 Added quest log entries for:
+//=     - Cursed Spirit Quest
 //============================================================ 
 
 // Gangster Alert [Aegis Conversion]
@@ -3410,6 +3412,7 @@ OnTouch:
 		if(!lhz_curse)
 		{
 			soundeffect "loli_ruri_stand.wav",0;
+			setquest 2086;
 			set lhz_curse,1;
 			end;
 		}
@@ -3455,6 +3458,7 @@ OnTouch:
 		if(!lhz_curse)
 		{
 			soundeffect "tao_gunka_stand.wav",0;
+			setquest 2086;
 			set lhz_curse,1;
 			end;
 		}
@@ -3500,6 +3504,7 @@ OnTouch:
 		if(!lhz_curse)
 		{
 			soundeffect "tao_gunka_stand.wav",0;
+			setquest 2086;
 			set lhz_curse,1;
 			end;
 		}
@@ -4399,6 +4404,7 @@ lhz_que01,99,74,5	script	#pecomaster	48,{
 		mes "No matter how hard you try,";
 		mes "you can't open its clasp to see";
 		mes "what this pendant contains.^000000";
+		changequest 2090,2091;
 		set lhz_curse,17;
 		getitem 7341,1;
 		close2;
@@ -4638,6 +4644,7 @@ L_NoText:
 				mes "the wrath of these spirits...";
 				mes "But as long as you let them";
 				mes "guide you, you ought to be safe.";
+				changequest 2086,2087;
 				set lhz_curse,6;
 				close;
 		
@@ -4708,9 +4715,10 @@ L_NoText:
 				mes "It won't be long until";
 				mes "the spirits are consumed";
 				mes "by their supernatural rage...";
+				changequest 2091,2092;
 				set lhz_curse,18;
 				close;
-				case 2:
+			case 2:
 				mes "[Elder]";
 				mes "Oh... You look so pale, are";
 				mes "you alright? Heh heh~";
@@ -4768,9 +4776,10 @@ L_NoText:
 		mes "couple. Somehow, the girl in";
 		mes "the picture, sitting uncomfortably";
 		mes "in an old chair, looks familiar...^000000";
+		delitem 523,5; // Holy Water
+		delitem 744,1; // Bouquet
+		changequest 2092,2093;
 		set lhz_curse,19;
-		delitem 523,5;
-		delitem 744,1;
 		close;
 	}
 	else goto L_NoText;
@@ -4979,6 +4988,7 @@ lhz_in03,32,162,3	script	Crippled Girl	53,{
 							mes "Sheesh.";
 							mes "Don't kill the";
 							mes "messenger.";
+							changequest 2093,2094;
 							set lhz_curse,23;
 							close2;
 							warp "lighthalzen",322,323;
@@ -5074,6 +5084,7 @@ lhz_in03,32,162,3	script	Crippled Girl	53,{
 									mes "["+strcharinfo(0)+"]";
 									mes "Yes, I'm sure of that.";
 									delitem 7341,1;
+									changequest 2093,2094;
 									set lhz_curse,25;
 									close;
 						
@@ -5112,6 +5123,7 @@ lhz_in03,32,162,3	script	Crippled Girl	53,{
 									mes "[Setsu]";
 									mes "I'll try hard!";
 									delitem 7341,1;
+									changequest 2093,2094;
 									set lhz_curse,25;
 									close;
 							}
@@ -5206,6 +5218,7 @@ OnTouch:
 		mes "is tied to the ^FF0000Rekenber";
 		mes "Corporation^000000 and that";
 		mes "^FF0000Regenschirm Laboratory^000000.";
+		changequest 2094,2095;
 		set lhz_curse,26;
 		if(BaseLevel < 70) getexp 800000,300000;
 		else if(BaseLevel < 80) getexp 1000000,500000;
@@ -5225,68 +5238,69 @@ lhz_in01,114,181,3	script	Representative	71,{
 	if(lhz_curse == 7) menu "Building Information",L_Building,"Corporation History",L_History;
 	else menu "Building Information",L_Building;
 
-L_Building:
-	mes "[Representative]";
-	mes "Please tell me";
-	mes "which floor you'd like";
-	mes "to know more about.";
-	next;
-	switch( select( "1F","2F","B1","Cancel" ) )
-	{
-		case 1:
-			mes "[Representative]";
-			mes "The ^3131FFRekenber Library^000000 can";
-			mes "be found at the end of the";
-			mes "left hallway. Our library is";
-			mes "a great resource of innovative";
-			mes "ideas and information for our";
-			mes "system development employees.";
-			next;
-			mes "[Representative]";
-			mes "The ^3131FFBall Room^000000, where";
-			mes "various official events are";
-			mes "usually held, can be accessed";
-			mes "through the right hallway.";
-			next;
-			goto L_Building;
+	while(1) {
+		mes "[Representative]";
+		mes "Please tell me";
+		mes "which floor you'd like";
+		mes "to know more about.";
+		next;
+		switch( select( "1F","2F","B1","Cancel" ) )
+		{
+			case 1:
+				mes "[Representative]";
+				mes "The ^3131FFRekenber Library^000000 can";
+				mes "be found at the end of the";
+				mes "left hallway. Our library is";
+				mes "a great resource of innovative";
+				mes "ideas and information for our";
+				mes "system development employees.";
+				next;
+				mes "[Representative]";
+				mes "The ^3131FFBall Room^000000, where";
+				mes "various official events are";
+				mes "usually held, can be accessed";
+				mes "through the right hallway.";
+				next;
+				break;
 
-		case 2:
-			mes "[Representative]";
-			mes "Please use the stairs";
-			mes "located on both sides of";
-			mes "the Help Desk to go to the";
-			mes "Second Floor. The Second";
-			mes "Floor is mostly used for";
-			mes "administrative purposes.";
-			next;
-			mes "[Representative]";
-			mes "There, you can find";
-			mes "the ^3131FFConference Room^000000,";
-			mes "^3131FFSecretary Office^000000, the";
-			mes "^3131FFAuditorium^000000 and the";
-			mes "^3131FFChairman's Office^000000.";
-			next;
-			goto L_Building;
+			case 2:
+				mes "[Representative]";
+				mes "Please use the stairs";
+				mes "located on both sides of";
+				mes "the Help Desk to go to the";
+				mes "Second Floor. The Second";
+				mes "Floor is mostly used for";
+				mes "administrative purposes.";
+				next;
+				mes "[Representative]";
+				mes "There, you can find";
+				mes "the ^3131FFConference Room^000000,";
+				mes "^3131FFSecretary Office^000000, the";
+				mes "^3131FFAuditorium^000000 and the";
+				mes "^3131FFChairman's Office^000000.";
+				next;
+				break;
 
-		case 3:
-			mes "[Representative]";
-			mes "The first underground floor";
-			mes "is used by the ^3131FFRegenshirm^000000,";
-			mes "our laboratory affiliate. For";
-			mes "security reasons, this floor";
-			mes "is not accessible to visitors";
-			next;
-			goto L_Building;
+			case 3:
+				mes "[Representative]";
+				mes "The first underground floor";
+				mes "is used by the ^3131FFRegenshirm^000000,";
+				mes "our laboratory affiliate. For";
+				mes "security reasons, this floor";
+				mes "is not accessible to visitors";
+				next;
+				break;
 
-		case 4:
-			mes "[Representative]";
-			mes "We are always doing our";
-			mes "best to provide the best";
-			mes "services to our customers.";
-			mes "Remember that Rekenber";
-			mes "is the name you can trust.";
-			mes "Thank you and have a nice day.";
-			close;
+			case 4:
+				mes "[Representative]";
+				mes "We are always doing our";
+				mes "best to provide the best";
+				mes "services to our customers.";
+				mes "Remember that Rekenber";
+				mes "is the name you can trust.";
+				mes "Thank you and have a nice day.";
+				close;
+		}
 	}
 
 L_History:
@@ -5302,8 +5316,9 @@ L_History:
 	mes "the hallway to the left in";
 	mes "order to find our Library.";
 	mes "Thank you and have a nice day.";
+	changequest 2087,2088;
 	set lhz_curse,8;
-	close;	
+	close;
 }
 
 lhz_in01,27,247,5	script	Representative#lhz	71,{
@@ -5348,7 +5363,10 @@ lhz_in01,27,247,5	script	Representative#lhz	71,{
 				mes "Rekenber Corporation to grow";
 				mes "into the nation's biggest company.";
 				if(lhz_curse == 8) set lhz_curse,9;
-				else if(lhz_curse == 9) set lhz_curse,10;
+				else if(lhz_curse == 9) {
+					changequest 2088,2089;
+					set lhz_curse,10;
+				}
 				next;
 				break;
 
@@ -5368,7 +5386,10 @@ lhz_in01,27,247,5	script	Representative#lhz	71,{
 				mes "that Rekenber is the name";
 				mes "that you can trust.";
 				if (lhz_curse == 8) set lhz_curse,9;
-				else if(lhz_curse == 9) set lhz_curse,10;
+				else if(lhz_curse == 9) {
+					changequest 2088,2089;
+					set lhz_curse,10;
+				}
 				next;
 				break;
 		}
@@ -5388,68 +5409,69 @@ lhz_in01,27,247,5	script	Representative#lhz	71,{
 	switch( select( "Building Information" ) )
 	{
 		case 1:
-L_Building:
-			mes "[Representative]";
-			mes "Please tell me";
-			mes "which floor you'd like";
-			mes "to know more about.";
-			next;
-			switch( select( "1F","2F","B1","Cancel" ) )
-			{
-				case 1:
-					mes "[Representative]";
-					mes "The ^3131FFRekenber Library^000000 can";
-					mes "be found at the end of the";
-					mes "left hallway. Our library is";
-					mes "a great resource of innovative";
-					mes "ideas and information for our";
-					mes "system development employees.";
-					next;
-					mes "[Representative]";
-					mes "The ^3131FFBall Room^000000, where";
-					mes "various official events are";
-					mes "usually held, can be accessed";
-					mes "through the right hallway.";
-					next;
-					goto L_Building;
+			while (1) {
+				mes "[Representative]";
+				mes "Please tell me";
+				mes "which floor you'd like";
+				mes "to know more about.";
+				next;
+				switch( select( "1F","2F","B1","Cancel" ) )
+				{
+					case 1:
+						mes "[Representative]";
+						mes "The ^3131FFRekenber Library^000000 can";
+						mes "be found at the end of the";
+						mes "left hallway. Our library is";
+						mes "a great resource of innovative";
+						mes "ideas and information for our";
+						mes "system development employees.";
+						next;
+						mes "[Representative]";
+						mes "The ^3131FFBall Room^000000, where";
+						mes "various official events are";
+						mes "usually held, can be accessed";
+						mes "through the right hallway.";
+						next;
+						break;
 
-				case 2:
-					mes "[Representative]";
-					mes "Please use the stairs";
-					mes "located on both sides of";
-					mes "the Help Desk to go to the";
-					mes "Second Floor. The Second";
-					mes "Floor is mostly used for";
-					mes "administrative purposes.";
-					next;
-					mes "[Representative]";
-					mes "There, you can find";
-					mes "the ^3131FFConference Room^000000,";
-					mes "^3131FFSecretary Office^000000, the";
-					mes "^3131FFAuditorium^000000 and the";
-					mes "^3131FFChairman's Office^000000.";
-					next;
-					goto L_Building;
-
-				case 3:
-					mes "[Representative]";
-					mes "The first underground floor";
-					mes "is used by the ^3131FFRegenshirm^000000,";
-					mes "our laboratory affiliate. For";
-					mes "security reasons, this floor";
-					mes "is not accessible to visitors";
-					next;
-					goto L_Building;
-
-				case 4:
-					mes "[Representative]";
-					mes "We are always doing our";
-					mes "best to provide the best";
-					mes "services to our customers.";
-					mes "Remember that Rekenber";
-					mes "is the name you can trust.";
-					mes "Thank you and have a nice day.";
-					close;
+					case 2:
+						mes "[Representative]";
+						mes "Please use the stairs";
+						mes "located on both sides of";
+						mes "the Help Desk to go to the";
+						mes "Second Floor. The Second";
+						mes "Floor is mostly used for";
+						mes "administrative purposes.";
+						next;
+						mes "[Representative]";
+						mes "There, you can find";
+						mes "the ^3131FFConference Room^000000,";
+						mes "^3131FFSecretary Office^000000, the";
+						mes "^3131FFAuditorium^000000 and the";
+						mes "^3131FFChairman's Office^000000.";
+						next;
+						break;
+
+					case 3:
+						mes "[Representative]";
+						mes "The first underground floor";
+						mes "is used by the ^3131FFRegenshirm^000000,";
+						mes "our laboratory affiliate. For";
+						mes "security reasons, this floor";
+						mes "is not accessible to visitors";
+						next;
+						break;
+
+					case 4:
+						mes "[Representative]";
+						mes "We are always doing our";
+						mes "best to provide the best";
+						mes "services to our customers.";
+						mes "Remember that Rekenber";
+						mes "is the name you can trust.";
+						mes "Thank you and have a nice day.";
+						close;
+				}
 			}
 	}
 }
@@ -5551,6 +5573,7 @@ lhz_in01,273,121,1	script	Mad Scientist	865,{
 				mes "Here's a hint... It's round...";
 				mes "Shiny... Kids love playing games";
 				mes "with them! Oh, I said too much!";
+				changequest 2089,2090;
 				set lhz_curse,15;
 				close;
 
@@ -6062,6 +6085,7 @@ L_Evidence:
 		mes "on people! Anyway, please";
 		mes "accept this as a token of";
 		mes "our gratitude, adventurer.";
+		changequest 2094,2095;
 		set lhz_curse,31;
 		getitem 617,1;
 		getitem 12016,10;
@@ -6107,7 +6131,10 @@ OnTouch:
 		mes "that mad scientist. Only";
 		mes "his stacks of well organized";
 		mes "files remain here in the lab.^000000";
-		if(lhz_curse == 31) set lhz_curse,32;
+		if(lhz_curse == 31) {
+			completequest 2095;
+			set lhz_curse,32;
+		}
 		close;
 	}
 }
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 499c1a95a..03725e7aa 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -20,7 +20,7 @@
 //= - prerequisite Quest to "Broken Diamond"
 //= - Variable in use: diamond_edq (Max: 14)
 //= Broken Diamond:
-//- - Help Ibrahim rtrieve his stolen diamond.
+//- - Help Ibrahim retrieve his stolen diamond.
 //= - prerequisite Quest to "Unlucky Emerald"
 //= - Variable in use: diamond_edq (Max: 26)
 //= Z-Gang Quest:
@@ -55,6 +55,10 @@
 //= 1.9 Fixed mapwarp warping to disabled map. [L0ne_W0lf]
 //= 2.0 Removed duplicate dialog. [L0ne_W0lf]
 //= 2.1 Fixed a race condition blocking progress. [brianluau]
+//= 2.2 Added quest log entries for:
+//=     - Muff's Loan
+//=     - Broken Diamond
+//=     - Z-Gang Quest
 //============================================================ 
 
 // Nameless Island and Cursed Monestary Access Quest
@@ -664,7 +668,7 @@ ve_in,81,296,3	script	Soldier#Aru	946,{
 		mes "Maybe the magistrate would";
 		mes "know if he was able to finish";
 		mes "interrogating the smugglers.";
-		mes "I'm not sure if he did since the smugglers were taken away.";		
+		mes "I'm not sure if he did since the smugglers were taken away.";
 		set aru_monas,10;
 		close;
 	}
@@ -681,7 +685,7 @@ ve_in,81,296,3	script	Soldier#Aru	946,{
 	else {
 		mes "[Himus]";
 		mes "Nice day, isn't it?";
-		close;		
+		close;
 	}
 }
 
@@ -3159,6 +3163,7 @@ comodo,224,187,3	script	Muff	86,{
 					mes "wallet, I'll make sure";
 					mes "to repay you. Please";
 					mes "help me if you can!";
+					setquest 3100;
 					set diamond_edq,1;
 					close;
 				case 2:
@@ -3260,6 +3265,7 @@ comodo,224,187,3	script	Muff	86,{
 			mes "but I really need my bond";
 			mes "of debt to get my collateral";
 			mes "back from that Belder.";
+			setquest 3100;
 			set diamond_edq,1;
 			close;
 		case 2:
@@ -3341,6 +3347,7 @@ comodo,224,187,3	script	Muff	86,{
 			mes "him to restore my bond of";
 			mes "debt. I'll be waiting for";
 			mes "you right here, okay?";
+			changequest 3102,3103;
 			set diamond_edq,6;
 			close;
 		case 2:
@@ -3372,6 +3379,7 @@ comodo,224,187,3	script	Muff	86,{
 			mes "him to restore my bond of";
 			mes "debt. I'll be waiting for";
 			mes "you right here, okay?";
+			changequest 3102,3103;
 			set diamond_edq,6;
 			close;
 		case 2:
@@ -3409,6 +3417,7 @@ comodo,224,187,3	script	Muff	86,{
 		mes "You've done well, my friend.";
 		mes "Here, please take these as";
 		mes "a meager reward for your help.";
+		completequest 3109;
 		set diamond_edq,14;
 		getitem 603,1; //Old_Blue_Box
 		getitem 608,4; //Seed_Of_Yggdrasil
@@ -3588,6 +3597,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 			mes "little thing. Now what?";
 			mes "I dropped it! I have to";
 			mes "try to dig it up again...";
+			changequest 3100,3101;
 			set diamond_edq,2;
 			close;
 		case 2:
@@ -3612,6 +3622,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 		mes "Well, I've done all";
 		mes "I can for now. I should";
 		mes "bring this back to Muff.";
+		changequest 3101,3102;
 		set diamond_edq,4;
 		close;
 	}
@@ -3777,6 +3788,7 @@ izlude_in,110,64,3	script	Dorian	878,2,2,{
 						mes "explain how you can";
 						mes "repair the Mystic";
 						mes "Dryer de Elegance.";
+						changequest 3103,3104;
 						set diamond_edq,9;
 						close;
 					}
@@ -3931,6 +3943,7 @@ izlude_in,110,64,3	script	Dorian	878,2,2,{
 			delitem 999,5; //Steel
 			delitem 723,2; //Cardinal_Jewel
 			delitem 716,5; //Red_Gemstone
+			changequest 3104,3105;
 			set diamond_edq,10;
 			mes "[Dorian]";
 			mes "I expect you to fail";
@@ -4075,6 +4088,7 @@ izlude_in,110,64,3	script	Dorian	878,2,2,{
 		mes "Elegance? That's expected:";
 		mes "I didn't really design it for the^FFFFFF ^000000 common user in mind. Well,";
 		mes "why don't you try it again?";
+		erasequest 3106;
 		set diamond_edq,10;
 		close;
 	}
@@ -4092,6 +4106,8 @@ izlude_in,110,64,3	script	Dorian	878,2,2,{
 		mes "is insert the damaged";
 		mes "document and press the";
 		mes "switch. Simple, yes?";
+		erasequest 3106;
+		changequest 3105,3108;
 		set diamond_edq,13;
 		next;
 		mes "[Dorian]";
@@ -4207,6 +4223,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 					mes "The joint is broken...";
 					mes "You should go back";
 					mes "to Dorian for help.^000000";
+					setquest 3106;
 					set diamond_edq,11;
 					close;
 				}
@@ -4244,6 +4261,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 					mes "^3355FFYou should tell Dorian";
 					mes "first so that you can";
 					mes "use this machine.^000000";
+					setquest 3107;
 					set diamond_edq,12;
 					close;
 				}
@@ -4267,6 +4285,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 							mes "before coming to a sudden";
 							mes "stop. That was the wrong";
 							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
 							set diamond_edq,11;
 							close;
 						case 1:
@@ -4292,6 +4311,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 								mes "before coming to a sudden";
 								mes "stop. That was the wrong";
 								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
 								set diamond_edq,11;
 								close;
 							}
@@ -4317,6 +4337,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 							mes "before coming to a sudden";
 							mes "stop. That was the wrong";
 							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
 							set diamond_edq,11;
 							close;
 						case 2:
@@ -4342,6 +4363,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 								mes "before coming to a sudden";
 								mes "stop. That was the wrong";
 								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
 								set diamond_edq,11;
 								close;
 							}
@@ -4366,6 +4388,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 							mes "before coming to a sudden";
 							mes "stop. That was the wrong";
 							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
 							set diamond_edq,11;
 							close;
 						case 3:
@@ -4391,6 +4414,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 								mes "before coming to a sudden";
 								mes "stop. That was the wrong";
 								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
 								set diamond_edq,11;
 								close;
 							}
@@ -4416,6 +4440,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 							mes "before coming to a sudden";
 							mes "stop. That was the wrong";
 							mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+							setquest 3106;
 							set diamond_edq,11;
 							close;
 						case 4:
@@ -4441,6 +4466,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 								mes "before coming to a sudden";
 								mes "stop. That was the wrong";
 								mes "switch. You'd better ask Dorian... ^FFFFFF ^000000";
+								setquest 3106;
 								set diamond_edq,11;
 								close;
 							}
@@ -4479,6 +4505,7 @@ izlude_in,113,66,0	script	Strange Machine	111,{
 		mes "So this is the original";
 		mes "bond of debt that Muff";
 		mes "lost? It looks... Perfect!";
+		changequest 3108,3109;
 		getitem 7722,1; //Debt_Note
 		close;
 	}
@@ -4604,6 +4631,7 @@ moc_ruins,152,147,5	script	Ibrahim	732,3,3,{
 					mes "Well, I'll be right";
 					mes "here. I hope you come";
 					mes "back with some good news.";
+					setquest 3110;
 					set diamond_edq,15;
 					close;
 				case 2:
@@ -4802,6 +4830,7 @@ moc_ruins,152,147,5	script	Ibrahim	732,3,3,{
 		mes "Well, I don't know if";
 		mes "it's enough for what you";
 		mes "did, but I hope you like it.";
+		completequest 3118;
 		set diamond_edq,26;
 		getitem 732,2; //Crystal_Jewel__
 		getitem 603,1; //Old_Blue_Box
@@ -5359,6 +5388,7 @@ geffen,128,153,3	script	Leblo	883,{
 			mes "she'll give you my medicine...";
 			mes "I hope. Anyway, her name is";
 			mes "^0000FFWola^000000, and she's in Payon.";
+			changequest 3110,3111;
 			set diamond_edq,17;
 			close;
 		case 2:
@@ -5435,6 +5465,7 @@ geffen,128,153,3	script	Leblo	883,{
 		mes "learn more about the Z Gang.";
 		mes "Pretty useful info, huh?";
 		mes "Take care, my friend.";
+		changequest 3114,3115;
 		set diamond_edq,22;
 		close;
 	}
@@ -5630,6 +5661,7 @@ payon_in03,167,149,3	script	Wola	75,2,2,{
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "You... You got it.";
+		changequest 3111,3112;
 		set diamond_edq,19;
 		close;
 	}
@@ -5684,6 +5716,7 @@ payon_in03,167,149,3	script	Wola	75,2,2,{
 			mes "some medicine? I completely";
 			mes "forgot about that for a while.";
 			mes "What did you say exactly?";
+			changequest 3112,3113;
 			set diamond_edq,20;
 			next;
 			switch(select("Will you go out with me?:Leblo's back medicine?")) {
@@ -5749,6 +5782,7 @@ payon_in03,167,149,3	script	Wola	75,2,2,{
 				mes "be okay in my hands. I need";
 				mes "to get back to work: please";
 				mes "take care of yourself!";
+				changequest 3113,3114;
 				set diamond_edq,21;
 				close;
 			}
@@ -5836,6 +5870,7 @@ payon_in03,167,149,3	script	Wola	75,2,2,{
 			mes "be okay in my hands. I need";
 			mes "to get back to work: please";
 			mes "take care of yourself!";
+			changequest 3113,3114;
 			set diamond_edq,21;
 			close;
 		}
@@ -5854,7 +5889,6 @@ payon_in03,167,149,3	script	Wola	75,2,2,{
 	mes "Take care of yourself!";
 	close;
 
-//OnTouch2:
 OnTouch:
 	if (diamond_edq == 17) {
 		mes "[Wola]";
@@ -5961,6 +5995,7 @@ in_rogue,366,46,3	script	Rogue Investigator	828,{
 				mes "in Comodo. I doubt you'll";
 				mes "find anything there, but";
 				mes "you can go check it out. ";
+				changequest 3115,3116;
 				set diamond_edq,23;
 				close;
 			}
@@ -6032,6 +6067,7 @@ in_rogue,366,46,3	script	Rogue Investigator	828,{
 				mes "is a large warehouse in";
 				mes "Comodo where I doubt you'll";
 				mes "find anything. But who knows? ";
+				changequest 3115,3116;
 				set diamond_edq,23;
 				close;
 			}
@@ -6142,6 +6178,7 @@ cmd_in02,69,188,1	script	Small Safe	844,{
 		mes "sneak out of here, and";
 		mes "return this big diamond";
 		mes "to Ibrahim as soon as I can.";
+		changequest 3117,3118;
 		set diamond_edq,25;
 		close;
 	}
@@ -6201,6 +6238,7 @@ cmd_in02,80,189,0	script	Odd Switch#Switch2	844,{
 		next;
 		mes "^3355FF*Click Click*^000000";
 		next;
+		changequest 3116,3117;
 		set diamond_edq,24;
 		mes "[" + strcharinfo(0) + "]";
 		mes "That sound...!";
@@ -6246,6 +6284,7 @@ prontera,150,326,0	script	Wanted Notice#edq	111,{
 		mes "be rewarded with the Book";
 		mes "of Forbidden Mystery, one";
 		mes "of the kingdom's treasures.";
+		setquest 3119;
 		set zdan_edq,1;
 		close;
 	}
@@ -6277,7 +6316,7 @@ prontera,150,326,0	script	Wanted Notice#edq	111,{
 		mes "^0000ffCatfoii^000000 - Pet Cat";
 		next;
 		mes "====National Wanted Notice====";
-	mes "These infamous members";
+		mes "These infamous members";
 		mes "of the Z Gang are suspected";
 		mes "of stealing national treasure,";
 		mes "committing fraud, forgery,";
@@ -6339,6 +6378,7 @@ prontera,148,326,3	script	Chief Officer#edq	734,{
 		mes "Louis, Martha Hertizan a.k.a.";
 		mes "Martha, and Catfoii a.k.a.";
 		mes "Catfoii must be captured!";
+		changequest 3119,3120;
 		set zdan_edq,2;
 		close;
 	}
@@ -6512,6 +6552,7 @@ prontera,148,326,3	script	Chief Officer#edq	734,{
 		mes "be recorded in the annals";
 		mes "of Rune-Midgarts history.";
 		mes "Congratulations! ";
+		completequest 3134;
 		set zdan_edq,19;
 		getexp 1000000,0;
 		close;
@@ -6575,6 +6616,7 @@ prt_in,168,18,1	script	Valdes	65,2,2,{
 			mes "5 bottles! Then... Maybe...";
 			mes "I'll tell you want you really";
 			mes "wanna know. Heh heh~ ^666666*Hic!*^000000";
+			changequest 3120,3121;
 			set zdan_edq,3;
 			close;
 		case 2:
@@ -6664,6 +6706,7 @@ prt_in,168,18,1	script	Valdes	65,2,2,{
 			mes "those Z Gang bastards.";
 			mes "^666666*Sigh*^000000 I think I'll go rest";
 			mes "a bit now. Good luck!";
+			changequest 3121,3122;
 			set zdan_edq,4;
 			close;
 		}
@@ -6757,6 +6800,7 @@ in_rogue,359,116,3	script	Marybell	747,{
 					mes "or not, I'm gonna continue";
 					mes "investigating the Z Gang for";
 					mes "the Rogue Guild and Valdes.";
+					changequest 3122,3123;
 					set zdan_edq,5;
 					break;
 				case 2:
@@ -6924,6 +6968,7 @@ in_rogue,359,116,3	script	Marybell	747,{
 					mes "and check it out. Good";
 					mes "luck finding those Z Gang";
 					mes "guys. And take care!";
+					changequest 3125,3126;
 					set zdan_edq,9;
 					close;
 				}
@@ -6989,7 +7034,7 @@ in_rogue,359,116,3	script	Marybell	747,{
 		mes "decoders in this kingdom.";
 		next;
 		mes "[" + strcharinfo(0) + "]";
-		mes "Goohoo Ahn?";
+		mes "Gooho Ahn?";
 		mes "Why does it feel like";
 		mes "I should know that";
 		mes "name? It's so familiar...";
@@ -7003,15 +7048,16 @@ in_rogue,359,116,3	script	Marybell	747,{
 		mes "[Marybell]";
 		mes "Eh, that's not what's";
 		mes "important right now.";
-		mes "Would you talk to Goohoo";
+		mes "Would you talk to Gooho";
 		mes "Ahn and see what he found?";
+		changequest 3128,3129;
 		set zdan_edq,12;
 		close;
 	}
 	if ((zdan_edq > 11) && (zdan_edq < 14)) {
 		mes "[Marybell]";
 		mes "Hey, why don't you talk";
-		mes "to Goohoo Ahn in Payon,";
+		mes "to Gooho Ahn in Payon,";
 		mes "and ask if he finished";
 		mes "decoding that secret letter";
 		mes "from the Z Gang already?";
@@ -7019,7 +7065,7 @@ in_rogue,359,116,3	script	Marybell	747,{
 	}
 	if (zdan_edq == 14) {
 		mes "[Marybell]";
-		mes "Oh, Goohoo decoded everything?";
+		mes "Oh, Gooho decoded everything?";
 		mes "Let's see... Something about";
 		mes "the Book of Forbidden Mystery...^FFFFFF ^000000 Ah. There we go! The location";
 		mes "of the Z Gang's hideout!";
@@ -7048,6 +7094,7 @@ in_rogue,359,116,3	script	Marybell	747,{
 		mes "hunt them down separately, and";
 		mes "whoever finds 'em first gets";
 		mes "dibs on beating them up!";
+		changequest 3131,3132;
 		set zdan_edq,15;
 		close;
 	}
@@ -7197,6 +7244,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 			mes "some time to prep the";
 			mes "game? When you return,";
 			mes "we'll be ready to play~";
+			changequest 3123,3124;
 			set zdan_edq,6;
 			close;
 		}
@@ -7419,6 +7467,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 					mes "feels good to have";
 					mes "played with a worthy";
 					mes "opponent. Thank you~";
+					changequest 3124,3125;
 					set zdan_edq,7;
 					close;
 				}
@@ -7555,6 +7604,7 @@ payon,244,62,3	script	Moonho Ahn	897,{
 						mes "feels good to have";
 						mes "played with a worthy";
 						mes "opponent. Thank you~";
+						changequest 3124,3125;
 						set zdan_edq,7;
 						close;
 					}
@@ -7707,6 +7757,7 @@ payon,192,176,3	script	Gooho Ahn	903,{
 			mes "I need, I should be able";
 			mes "to decrypt the rest of";
 			mes "this secret Z Gang letter.";
+			changequest 3129,3130;
 			set zdan_edq,13;
 			close;
 		}
@@ -7809,6 +7860,7 @@ payon,192,176,3	script	Gooho Ahn	903,{
 			mes "^0000ffWeii arr prowd Z G gna^000000";
 			mes "^0000ffAynoen hwo sspotp uys^000000";
 			mes "^0000ffwlil eb kckide on htier ssa!^000000";
+			changequest 3130,3131;
 			set zdan_edq,14;
 			close;
 		}
@@ -7901,6 +7953,7 @@ moc_ruins,90,67,3	script	Suspicious Man#1	99,2,2,{
 		mes "an informer for the Z Gang.";
 		mes "He can't have gotten too far:";
 		mes "I have a chance to catch him!";
+		changequest 3126,3127;
 		set zdan_edq,10;
 		close;
 	}
@@ -8013,6 +8066,7 @@ moc_ruins,90,67,3	script	Suspicious Man#1	99,2,2,{
 		mes "I should head back to";
 		mes "Marybell, and see if she's";
 		mes "learned any new information.";
+		changequest 3127,3128;
 		set zdan_edq,11;
 		set $@zdan,0;
 		stopnpctimer;
@@ -8096,6 +8150,7 @@ OnTouch:
 		mes "an informer for the Z Gang.";
 		mes "He can't have gotten too far:";
 		mes "I have a chance to catch him!";
+		changequest 3126,3127;
 		set zdan_edq,10;
 		close;
 	}
@@ -8145,6 +8200,7 @@ moc_ruins,78,167,3	script	Suspicious Man#2	99,2,2,{
 		mes "an informer for the Z Gang.";
 		mes "He can't have gotten too far:";
 		mes "I have a chance to catch him!";
+		changequest 3126,3127;
 		set zdan_edq,10;
 		close;
 	}
@@ -8234,6 +8290,7 @@ moc_ruins,78,167,3	script	Suspicious Man#2	99,2,2,{
 		mes "I should head back to";
 		mes "Marybell, and see if she's";
 		mes "learned any new information.";
+		changequest 3127,3128;
 		set zdan_edq,11;
 		set $@zdan,0;
 		stopnpctimer;
@@ -8342,6 +8399,7 @@ OnTouch:
 		mes "an informer for the Z Gang.";
 		mes "He can't have gotten too far:";
 		mes "I have a chance to catch him!";
+		changequest 3126,3127;
 		set zdan_edq,10;
 		close;
 	}
@@ -8421,6 +8479,7 @@ moc_fild17,209,235,0	script	Odd Slab	111,4,4,{
 						mes "What th--?! What's";
 						mes "happening?! I'm being";
 						mes "sucked away somewhere!";
+						changequest 3132,3133;
 						set zdan_edq,16;
 						close2;
 						warp "z_agit",98,40;
@@ -8674,7 +8733,6 @@ OnInit:
 OnEnable:
 	enablenpc "#ZGuard";
 	initnpctimer;
-	set .MyMobCount,3;
 	monster "z_agit",97,78,"Catfoii's Guard",1479,1,"#ZGuard::OnMyMobDead";
 	monster "z_agit",98,79,"Catfoii's Guard",1479,1,"#ZGuard::OnMyMobDead";
 	monster "z_agit",96,81,"Catfoii's Guard",1523,1,"#ZGuard::OnMyMobDead";
@@ -8691,8 +8749,7 @@ Onreset:
 	end;
 
 OnMyMobDead:
-	set .MyMobCount,.MyMobCount-1;
-	if (.MyMobCount < 1) {
+	if (mobcount("z_agit","#ZGuard::OnMyMobDead") < 1) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "You cowardly Z Gang!";
 		mes "Come out and surrender!";
@@ -8830,6 +8887,7 @@ z_agit,97,101,3	script	Louis	931,{
 		mes "But how did we lose?!";
 		close2;
 		getitem 7724,1; //Forbidden_Secret_Art
+		changequest 3133,3134;
 		set zdan_edq,18;
 		mapwarp "z_agit","moc_fild17",209,235;
 		set $@monster_zgang,0;
@@ -8952,6 +9010,7 @@ z_agit,99,101,3	script	Martha	101,{
 		mes "But how did we lose?!";
 		close2;
 		getitem 7724,1; //Forbidden_Secret_Art
+		changequest 3133,3134;
 		set zdan_edq,18;
 		mapwarp "z_agit","moc_fild17",209,235;
 		set $@monster_zgang,0;
@@ -9071,6 +9130,7 @@ z_agit,95,101,3	script	Catfoii	876,{
 		mes "But how did we lose?!";
 		close2;
 		getitem 7724,1; //Forbidden_Secret_Art
+		changequest 3133,3134;
 		set zdan_edq,18;
 		mapwarp "z_agit","moc_fild17",209,235;
 		set $@monster_zgang,0;
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index a8094ffcf..8c598bd8b 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 3.3a
+//= 3.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -60,6 +60,9 @@
 //= 3.3 Fixed occurance of PcName. [L0ne_W0lf]
 //=     Fixed level 4 ID warps always being usable.
 //= 3.3a Fixed level 4 ID warps again. (Bugreport:4102) [L0ne_W0lf]
+//= 3.4 Added quest log entries for:
+//=     - Ice Necklace Quest
+//=     - Thor Volcano Base Quest addition.
 //============================================================ 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -2884,6 +2887,7 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 			mes "to restore its luster. Then,";
 			mes "it'll be a fitting tribute to";
 			mes "our loving goddess Freya.";
+			setquest 2109;
 			getitem 7572,1; //Magic_Necklace
 			set ice_necklace_q,1;
 			close2;
@@ -2923,6 +2927,7 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 			mes " what you have done for me.";
 			delitem 7573,1; //Magic_Necklace_
 			getexp 700000,0;
+			completequest 2113;
 			set ice_necklace_q,6;
 			next;
 			mes "["+strcharinfo(0)+"]";
@@ -3150,6 +3155,7 @@ 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;
 		close2;
 		cutin "",255;
@@ -3276,6 +3282,7 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		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;
 		close2;
 		cutin "",255;
@@ -3381,6 +3388,7 @@ 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;
 		close;
 	}
@@ -3451,6 +3459,7 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		delitem 1354,1; //Empty_Scroll
 		delitem 7433,1; //Hammer
 		getitem 7569,1; //Hammer_of_Wind
+		changequest 2111,2112;
 		set ice_necklace_q,4;
 		close;
 	}
@@ -5768,6 +5777,7 @@ 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;
 				close2;
 				cutin "ra_gman",255;
@@ -5940,6 +5950,7 @@ 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;
 				}
 				else {
@@ -6014,6 +6025,7 @@ 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;
 				getexp 200000,0;
 				close2;
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 855bdceae..8decb1264 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -40,6 +40,9 @@
 //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.7 Moved a couple NPCs related to the Spy quest. [L0ne_W0lf]
 //= 1.8 Fixed some typos and confusing condition checks. [L0ne_W0lf]
+//= 1.9 Added quest log entries for:
+//=     - Siblings Quest
+//=     - Thor Volcano Base Quest
 //============================================================ 
 
 // Stone Quest
@@ -1971,7 +1974,6 @@ ein_in01,279,221,0	script	Hotel Manager#sch	903,5,5,{
 	}
 	end;
 
-//OnTouch2:
 OnTouch:
 	if (que_sch == 14) {
 		mes "[Manager]";
@@ -2030,7 +2032,6 @@ ein_in01,166,282,4	script	Employee#sch	904,{
 }
 
 ein_in01,176,285,0	script	°ÍµÂ ÌØÀæ¸ê#sch	-1,1,1,{
-//OnTouch2:
 OnTouch:
 	if (que_sch == 15) {
 		disablenpc "Corporate Figure#sch";
@@ -2794,6 +2795,7 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 				mes "I'll go search Thor";
 				mes "Volcano to find your";
 				mes "little sister Curdie.";
+				setquest 3060;
 				set rachel_camel,1;
 				close;
 			}
@@ -2833,6 +2835,7 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 			mes "locksmith in the market";
 			mes "street! You can ask him";
 			mes "to help free Curdie!";
+			changequest 3061,3062;
 			set rachel_camel,3;
 			close;
 		}
@@ -3032,6 +3035,7 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 			mes "Good, good...";
 			mes "It's a promise, then.";
 			mes "I'll see you later~";
+			completequest 3083;
 			set rachel_camel,25;
 			specialeffect2 EF_ABSORBSPIRITS;
 			getexp 1000000,700000;
@@ -3217,6 +3221,7 @@ que_thor,36,66,5	script	Little Curdie	941,{
 		mes "in town will know of a way";
 		mes "to unlock your shackles.";
 		mes "I'll be back as soon as I can!";
+		changequest 3060,3061;
 		set rachel_camel,2;
 		close;
 	}
@@ -3409,6 +3414,7 @@ que_thor,36,66,5	script	Little Curdie	941,{
 		mes "Now you need to take";
 		mes "the mold back to town";
 		mes "to Mr. Lockenlock.^000000";
+		changequest 3079,3080;
 		set rachel_camel,21;
 		close;
 	}
@@ -3478,6 +3484,7 @@ que_thor,36,66,5	script	Little Curdie	941,{
 		mes "volcano? It must have been";
 		mes "dangerous... Something";
 		mes "related to the Rachel Army...";
+		changequest 3082,3083;
 		set rachel_camel,24;
 		close;
 	}
@@ -3620,6 +3627,7 @@ veins,181,166,3	script	Lockenlock	900,{
 			mes "["+strcharinfo(0)+"]";
 			mes "...........";
 			delitem 503,1; //Yellow_Potion
+			changequest 3063,3064;
 			set rachel_camel,5;
 			close;
 		}
@@ -3810,6 +3818,7 @@ veins,181,166,3	script	Lockenlock	900,{
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Alright.";
+		changequest 3078,3079;
 		set rachel_camel,20;
 		close;
 	}
@@ -3856,6 +3865,7 @@ veins,181,166,3	script	Lockenlock	900,{
 		mes "the key, so I can get it done";
 		mes "as soon as you can bring";
 		mes "me the Steel. I'll be waiting.";
+		changequest 3080,3081;
 		set rachel_camel,22;
 		close;
 	}
@@ -3949,6 +3959,7 @@ veins,181,166,3	script	Lockenlock	900,{
 			mes "Make sure that you";
 			mes "bring that child back";
 			mes "safe to her family!";
+			changequest 3081,3082;
 			set rachel_camel,23;
 			close;
 		}
@@ -4118,6 +4129,7 @@ veins,227,127,5	script	Ivory	940,{
 		mes "^4D4DFF5 Empty Bottles^000000.";
 		mes "Then we can move";
 		mes "on to the hard part.";
+		changequest 3064,3065;
 		set rachel_camel,6;
 		close;
 	}
@@ -4163,6 +4175,7 @@ veins,227,127,5	script	Ivory	940,{
 			mes "Okay, so I need to visit";
 			mes "him if I really need you";
 			mes "to make the soap...";
+			changequest 3065,3066;
 			set rachel_camel,7;
 			close;
 		}
@@ -4335,6 +4348,7 @@ veins,227,127,5	script	Ivory	940,{
 		mes "Silk Sand Camel Soap.";
 		mes "you should bring it";
 		mes "to Mr. Lockenlock.^000000";
+		changequest 3077,3078;
 		set rachel_camel,19;
 		close;
 	}
@@ -4480,6 +4494,7 @@ veins,115,59,5	script	Saraman	847,{
 		mes "^4D4DFF5 Monster's Feed^000000,";
 		mes "^4D4DFF1 Empty Bottle^000000, and";
 		mes "^4D4DFF1 Yellow Potion^000000.";
+		changequest 3066,3067;
 		set rachel_camel,8;
 		close;
 	}
@@ -4524,6 +4539,7 @@ veins,115,59,5	script	Saraman	847,{
 			delitem 503,1; //Yellow_Potion
 			delitem 619,1; //Unripe_Apple
 			delitem 713,1; //Empty_Bottle
+			changequest 3067,3068;
 			set rachel_camel,9;
 			close;
 		}
@@ -4606,6 +4622,7 @@ veins,115,59,5	script	Saraman	847,{
 		mes "so she shouldn't be far from";
 		mes "here. Please find my camel";
 		mes "Soony as soon as you can!";
+		changequest 3069,3070;
 		set rachel_camel,11;
 		close;
 	}
@@ -4675,6 +4692,7 @@ veins,115,59,5	script	Saraman	847,{
 		mes "what you've done for me.";
 		mes "Good luck with getting";
 		mes "that soap you want made.";
+		changequest 3076,3077;
 		getitem 617,1; //Old_Violet_Box
 		set rachel_camel,18;
 		close;
@@ -4713,6 +4731,7 @@ veins,78,226,5	script	Camel#camelcc1::VeinsCamel	938,{
 		mes "appetite stimulant, but";
 		mes "brusquely turned its";
 		mes "nose away from it.^000000";
+		changequest 3068,3069;
 		set rachel_camel,10;
 		close;
 	}
@@ -4723,7 +4742,6 @@ veins,78,226,5	script	Camel#camelcc1::VeinsCamel	938,{
 		mes "nose away from it.";
 		mes "This probably isn't the";
 		mes "camel you're looking for.^000000";
-		set rachel_camel,10;
 		close;
 	}
 	else {
@@ -4765,6 +4783,7 @@ ve_fild07,235,42,3	script	Silk Sand Camel	938,{
 		mes "I guess all I need to";
 		mes "do is collect some of";
 		mes "that precious camel dung.";
+		changequest 3070,3071;
 		set rachel_camel,12;
 		close;
 	}
@@ -4918,12 +4937,12 @@ ve_fild07,235,42,3	script	Silk Sand Camel	938,{
 					next;
 					mes "^3355FFIt's time for you to";
 					mes "return to Mr. Saraman.^000000";
-
 				}
 				delitem 519,2; //Milk
 				delitem 511,20; //Green_Herb
 				delitem 909,10; //Jellopy
 				delitem 713,1; //Empty_Bottle
+				changequest 3059+rachel_camel,3060+rachel_camel;
 				set rachel_camel,rachel_camel+1;
 				close;
 			case 6:
@@ -5056,6 +5075,7 @@ veins,221,120,5	script	Young Town Native	943,{
 		mes "^3355FFFind Mr. Lockenlock";
 		mes "in the market street, and";
 		mes "bring him a Yellow Potion.^000000";
+		changequest 3062,3063;
 		set rachel_camel,4;
 		close;
 	}
@@ -5234,7 +5254,6 @@ OnInit:
 	end;
 
 OnTouch:
-//OnTouch2:
 	warp "ra_temin",85,137;
 	close;
 }
@@ -5252,7 +5271,6 @@ OnInit:
 	end;
 
 OnTouch:
-//OnTouch2:
 	warp "ra_temin",85,137;
 	close;
 }
@@ -5301,7 +5319,6 @@ ra_temin,115,140,1	script	Flower Vase#vol	111,{
 
 ra_temin,85,131,0	script	path_vol1	-1,5,0,{
 OnTouch:
-//OnTouch2:
 	if ((aru_vol != 3) && (aru_vol != 4)) {
 		warp "ra_temin",85,137;
 	}
@@ -5310,7 +5327,6 @@ OnTouch:
 
 ra_temin,82,131,0	script	path_vol1#2	-1,5,0,{
 OnTouch:
-//OnTouch2:
 	if (aru_vol != 4) {
 		warp "ra_temin",85,137;
 	}
@@ -5319,7 +5335,6 @@ OnTouch:
 
 ra_temin,82,127,0	script	path_vol1#3	-1,5,1,{
 OnTouch:
-//OnTouch2:
 	if (aru_vol == 5) {
 		warp "ra_temin",84,124;
 	}
@@ -5503,6 +5518,7 @@ ra_temin,85,118,3	script	Drawer#vol3	111,{
 			mes "Research Institute'' on";
 			mes "the cover, and then you";
 			mes "close the drawer.^000000";
+			changequest 2114,2115;
 			set aru_vol,5;
 			getitem 7342,1; //File01
 			close;
@@ -5568,7 +5584,6 @@ ra_temin,73,126,1	script	Ladder#vol1	111,{
 
 ve_in,280,223,0	script	#volroom	-1,2,2,{
 OnTouch:
-//OnTouch2:
 	if (aru_vol == 6) {
 		mes "^3355FFThis house looks like";
 		mes "it's been abandoned for";
@@ -5863,6 +5878,7 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 		mes "the feeling that this will";
 		mes "all turn out in your favor.";
 		mes "You know that feeling, right?^000000";
+		changequest 2116,2117;
 		set aru_vol,8;
 		getitem 7705,1; //Note_Of_Geologist
 		close;
@@ -5985,6 +6001,7 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 		mes "well done. Good work!";
 		mes "I expected nothing less";
 		mes "from my star pupil!";
+		changequest 60211,60212;
 		set aru_vol,25;
 		delitem 7342,1; //File01
 		delitem 7704,1; //Broken_Thermometer
@@ -6112,6 +6129,7 @@ ve_in,281,214,3	script	Bookshelf#vol	111,{
 		mes "your eyes, and reach inside";
 		mes "Gio's purple box of goodies.^000000";
 		next;
+		changequest 60212,60213;
 		set aru_vol,26;
 		set .@box_box,rand(1,20);
 		if (.@box_box < 7) {
@@ -6155,6 +6173,7 @@ thor_v01,37,234,3	script	Hot Land Surface#1	111,{
 			mes "^3355FFYou record the";
 			mes "temperature in";
 			mes "your report.^000000";
+			changequest 2117,2118;
 			set aru_vol,9;
 			next;
 			mes "["+strcharinfo(0)+"]";
@@ -6192,6 +6211,7 @@ thor_v02,165,37,3	script	Hot Land Surface#2	111,{
 			mes "^3355FFYou record the";
 			mes "temperature in";
 			mes "your report.^000000";
+			changequest 2118,2119;
 			set aru_vol,10;
 			close;
 		}
@@ -6229,6 +6249,7 @@ thor_v02,170,100,3	script	Hot Land Surface#3	111,{
 			mes "measurements. I should";
 			mes "submit this report to the";
 			mes "geological camp now~";
+			changequest 2119,2120;
 			set aru_vol,11;
 			close;
 		}
@@ -6275,6 +6296,7 @@ que_thor,145,66,3	script	Guard#vol::VeinsGuard	939,{
 		mes "ask Sahedi to help you.";
 		mes "He's at the airship just";
 		mes "south of the train station.";
+		changequest 2120,2121;
 		set aru_vol,12;
 		close2;
 		warp "thor_camp",248,190;
@@ -6387,6 +6409,7 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 		mes "Please go ahead, and";
 		mes "see if this camp will be";
 		mes "safe from any disaster.";
+		changequest 2121,2122;
 		set aru_vol,13;
 		delitem 7342,1; //File01
 		close;
@@ -6501,6 +6524,7 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 		mes "Hopefully he'll have some";
 		mes "advice for what we can";
 		mes "do about this disaster...";
+		changequest 2128,60211;
 		set aru_vol,24;
 		getitem 7342,1; //File01
 		close;
@@ -6513,7 +6537,6 @@ thor_camp,250,104,3	script	Sahedi#vol	934,{
 
 thor_camp,194,220,0	script	#Colonel1	-1,5,5,{
 OnTouch:
-//OnTouch2:
 	if (aru_vol == 13) {
 		enablenpc "Colonel Vito#1";
 		mes "[????]";
@@ -6546,6 +6569,7 @@ OnTouch:
 		mes "great Colonel Vito. I'll mold";
 		mes "you into a true warrior for";
 		mes "Freya! Now follow me!";
+		changequest 2122,2123;
 		set aru_vol,14;
 		close2;
 		disablenpc "Colonel Vito#1";
@@ -6568,7 +6592,6 @@ OnTouch:
 
 thor_camp,162,182,0	script	#Colonel2	-1,7,7,{
 OnTouch:
-//OnTouch2:
 	if (aru_vol == 13) {
 		enablenpc "Colonel Vito#2";
 		mes "[????]";
@@ -6601,6 +6624,7 @@ OnTouch:
 		mes "great Colonel Vito. I'll mold";
 		mes "you into a true warrior for";
 		mes "Freya! Now follow me!";
+		changequest 2122,2123;
 		set aru_vol,14;
 		disablenpc "Colonel Vito#2";
 		close2;
@@ -6851,6 +6875,7 @@ thor_camp,159,74,3	script	Colonel Vito#3	946,{
 		mes "in Freya's service. That";
 		mes "is all for the first exercise,";
 		mes "but there's one more left.";
+		changequest 2123,2124;
 		set aru_vol,16;
 		close;
 	}
@@ -6892,6 +6917,7 @@ thor_camp,159,74,3	script	Colonel Vito#3	946,{
 		mes "body. See the dummy in";
 		mes "front of you? Practice by";
 		mes "chopping it 10 times. Go!";
+		changequest 2125,2126;
 		set aru_vol,19;
 		next;
 		if (select("Yes, sir!:What do you mean by chop?") == 1) {
@@ -6942,6 +6968,7 @@ thor_camp,159,74,3	script	Colonel Vito#3	946,{
 		mes "he'll think of me as";
 		mes "a geological researcher";
 		mes "instead of as a soldier.^000000)";
+		changequest 2126,2127;
 		set aru_vol,21;
 		close;
 	}
@@ -6955,7 +6982,6 @@ thor_camp,159,74,3	script	Colonel Vito#3	946,{
 
 thor_camp,141,62,0	script	#vol_study1::VeinsWarp	-1,3,3,{
 OnTouch:
-//OnTouch2:
 	if ((aru_vol >= 14 && aru_vol <= 16) || (aru_vol == 19)) {
 		warp "thor_camp",156,67;
 	}
@@ -6967,7 +6993,6 @@ thor_camp,172,38,0	duplicate(VeinsWarp)	#vol_study3	-1,3,3
 
 thor_camp,172,132,0	script	#sita_vol	-1,3,3,{
 OnTouch:
-//OnTouch2:
 	if (aru_vol == 21) {
 		mes "^3355FFThere's a stream of";
 		mes "magma running down";
@@ -6986,7 +7011,6 @@ OnTouch:
 
 thor_camp,148,310,0	script	#buki_vol	-1,5,5,{
 OnTouch:
-//OnTouch2:
 	if (aru_vol == 22) {
 		mes "^3355FFPeople are carrying";
 		mes "many heavy wooden boxes";
@@ -6998,6 +7022,7 @@ OnTouch:
 		mes "["+strcharinfo(0)+"]";
 		mes "I should go back";
 		mes "to Sahedi now.";
+		changequest 2127,2128;
 		set aru_vol,23;
 		close;
 	}
@@ -7053,6 +7078,7 @@ thor_camp,109,167,3	script	Control Panel#vol	111,{
 		mes "No problems here.";
 		mes "I guess I can go";
 		mes "back to that colonel.";
+		changequest 2124,2125;
 		set aru_vol,18;
 		close;
 	}
@@ -7272,7 +7298,7 @@ thor_camp,98,213,5	script	Thor Volcano Soldier#vo9	939,{
 }
 
 thor_v02,143,78,0	script	#totcamp	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (rachel_camel < 24) {
 		warp "que_thor",65,55;
 		end;
@@ -7282,20 +7308,19 @@ OnTouch:
 }
 
 que_thor,69,56,0	script	#tov_1	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "thor_v02",146,84;
 	end;
 }
 
 que_thor,187,56,0	script	#tov_2	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "thor_v02",146,84;
 	end;
 }
 
 thor_camp,62,98,0	script	#volbq	-1,5,5,{
 OnTouch:
-//OnTouch2:
 	mes "^3355FFThere is an old man";
 	mes "in high priest robes";
 	mes "in front of you.^000000";
@@ -7326,7 +7351,7 @@ thor_camp,246,191,3	script	Guard#goto	939,{
 }
 
 veins,302,166,0	script	#whoau	-1,2,2,{
-OnTouch:
+OnTouch_:
 	mes "[House Owner]";
 	mes "Wh-who the hell";
 	mes "are you? Honey!";