- Corrected issues with the Keil Hyre quest. (bugreport:2511)

- Corrected minor typo in alchemsit quest. (bugreport:2530)
- High Aco is now given skills on change. (bugreport:2552)
- Added item checks to Ice Necklace quest.
- Uncommented a warp in morroc_fild.


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

2 files changed, 125 insertions, 118 deletions

diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index f1e3618a6..470a980b6 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -1181,14 +1181,14 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 			mes "give me a moment while I bake";
 			mes "these cookies?  It shouldn't take";
 			mes "long, so hold on just a bit.";
-			set KielHyreQuest,8;
-			//KHPubMasterEnd no longer needed-- deleting.
-			set KHPubMasterEnd,0;
 			delitem 519,7; //Milk
 			delitem 548,2; //Cheese
 			delitem 7182,5; //Cacao
 			delitem 7487,1; //Tavern_Wine
 			delitem 7488,1; //Delivery_Package
+			set KielHyreQuest,8;
+			//KHPubMasterEnd no longer needed-- deleting.
+			set KHPubMasterEnd,0;
 			emotion e_ho;
 		}
 	}
@@ -1216,8 +1216,8 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 		mes "[Elly]";
 		mes ""+strcharinfo(0)+"?";
 		mes "...that name! It's wonderful!";
-		set KielHyreQuest,10;
 		getitem 538,5; //Well_Baked_Cookie
+		set KielHyreQuest,10;
 	}
 	else if (KielHyreQuest == 10) {
 		mes "[Elly]";
@@ -3642,8 +3642,8 @@ kh_school,122,186,4	script	Beautiful Lady#kh6	894,{
 		mes "Alright, I've recieved";
 		mes "Kiel Hyre's orders, and";
 		mes "must carry them out...";
-		set KielHyreQuest,44;
 		delitem 7497,1; //Steel_Piece
+		set KielHyreQuest,44;
 		close2;
 		cutin "",255;
 		end;
@@ -4119,9 +4119,9 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "Please, take this as";
 		mes "a little reward for";
 		mes "saving my life.";
-		set KielHyreQuest,50;
 		getitem 12105,1; //Taming_Gift_Set
 		getexp 700000,0;
+		set KielHyreQuest,50;
 	}
 	else if ((KielHyreQuest >= 50) && (KielHyreQuest < 64)) {
 		mes "[Kiel Hyre]";
@@ -4459,13 +4459,13 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "wrong... and she just... just...";
 		mes "The river swallowed her...";
 		mes "I felt empty. She was gone. ";
-		set KielHyreQuest,70;
 		delitem 7498,1; //Rosimier_Key
 		delitem 7499,1; //Family_Portrait
 		delitem 7500,1; //Elysia_Portrait
 		delitem 7501,1; //Kyll_Hyre_Letter2
 		delitem 7502,1; //Piece_Memo_Of_James
 		delitem 7503,1; //Man_Portrait
+		set KielHyreQuest,70;
 		close2;
 		cutin "",255;
 		end;
@@ -4730,8 +4730,8 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "enter and investigate the";
 		mes "deepest levels of the factory.";
 		mes "I'll investigate Kiehl's room.";
-		set KielHyreQuest,108;
 		getitem 7509,1; //Fancy_Key_Card
+		set KielHyreQuest,108;
 		next;
 		if (sex == 0) {
 			if (getpartnerid() == 0) set .@KHTitle$,"Miss";
@@ -4754,28 +4754,6 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		mes "......";
 		mes ".........";
 		mes "............";
-		delitem 7487,countitem(7487); //Tavern_Wine
-		delitem 7488,countitem(7488); //Delivery_Package
-		delitem 7489,countitem(7489); //Villa_Spare_Key
-		delitem 7490,countitem(7490); //Kyll_Hire_Letter
-		delitem 7491,countitem(7491); //Iron_Box
-		delitem 7492,countitem(7492); //Yellow_Key_Card
-		delitem 7493,countitem(7493); //Golden_Key
-		delitem 7494,countitem(7494); //Kiel_Button
-		delitem 7495,countitem(7495); //Blue_Key_Card
-		delitem 7496,countitem(7496); //Red_Key_Card
-		delitem 7497,countitem(7497); //Steel_Piece
-		delitem 7498,countitem(7498); //Rosimier_Key
-		delitem 7499,countitem(7499); //Family_Portrait
-		delitem 7500,countitem(7500); //Elysia_Portrait
-		delitem 7501,countitem(7501); //Kyll_Hyre_Letter2
-		delitem 7502,countitem(7502); //Piece_Memo_Of_James
-		delitem 7503,countitem(7503); //Man_Portrait
-		delitem 7504,countitem(7504); //Toy_Motor
-		delitem 7505,countitem(7505); //Toy_Key
-		delitem 7506,countitem(7506); //Black_Key_Card
-		delitem 7508,countitem(7508); //Elysia_Ring
-		delitem 7516,countitem(7516); //Green_Key_Card
 	}
 	close2;
 	cutin "",255;
@@ -5468,8 +5446,8 @@ yuno,250,132,0	script	Old Lady#kh	711,{
 			mes "from City Hall ask me for it.";
 			mes "Alright then, I hope you find";
 			mes "what you're looking for.";
-			set KielHyreQuest,58;
 			getitem 7498,1; //Rosimier_Key
+			set KielHyreQuest,58;
 			close;
 		}
 	}
@@ -5530,8 +5508,8 @@ yuno,250,132,0	script	Old Lady#kh	711,{
 		mes "Allysia's body in the river,";
 		mes "so he might have a better";
 		mes "idea of what had happened.";
-		set KielHyreQuest,60;
 		delitem 7498,1; //Rosimier_Key 
+		set KielHyreQuest,60;
 		close;
 	}
 	else if (KielHyreQuest >= 60) {
@@ -5966,8 +5944,8 @@ yuno_fild09,158,217,0	script	Wooden Board#kh	111,{
 		mes "of Kiel Hyre, in a broken";
 		mes "picture frame underneath";
 		mes "the old wooden board.^000000";
-		set KielHyreQuest,64;
 		getitem 7503,1;	//Man_Portrait
+		set KielHyreQuest,64;
 		next;
 		cutin "",255;
 		mes "^3355FFYou have enough";
@@ -6478,8 +6456,8 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 						mes "The gap widens a little bit,";
 						mes "but you break one of your";
 						mes "Solid Iron Pieces.^000000";
-						set KielHyreQuest,KielHyreQuest+2;
 						delitem 7507,1; //Hard_Piece_of_Steel
+						set KielHyreQuest,KielHyreQuest+2;
 						close;
 					}
 					else if (KielHyreQuest == 92) {
@@ -6490,8 +6468,8 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 						mes "Unable the withstand the";
 						mes "awesome force, this Solid";
 						mes "Iron Piece shatters into dust.^000000";
-						set KielHyreQuest,94;
 						delitem 7507,1; //Hard_Piece_of_Steel
+						set KielHyreQuest,94;
 						close;
 					}
 				}
@@ -7059,8 +7037,8 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "^3355FFYou retrieve the";
 		mes "ring from the heart of";
 		mes "Kiehl's old robotic body.^000000";
-		set KielHyreQuest,106;
 		getitem 7508,1; //Elysia_Ring
+		set KielHyreQuest,106;
 		close2;
 		cutin "",255;
 		end;
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index fec2827d4..16ed29cba 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -55,6 +55,7 @@
 //= 2.9 Replaced effect numerics with constants. [Samuray22]
 //= 3.0 Large reordering of Zhed, and Peace to the Arunafeltz addition. [L0ne_W0lf]
 //=     Some more numeric conversion, and some other cleanup.
+//= 3.1 Updated Ice Necklace quest, added missing checks. [L0ne_W0lf]
 //============================================================ 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -2740,6 +2741,14 @@ ra_in01,255,25,0	script	Book#ra_in	111,{
 //rachel,157,183,3	script	Sincere Follower Urstia	917,{
 rachel,157,183,3	script	Sincere Follower Urstia	916,{
 	cutin "ra_usti1",2;
+	if (checkweight(908,200) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
+	}
 	if (ice_necklace_q < 1) {
 		mes "[Urstialla]";
 		mes "Oh, are you an adventurer";
@@ -2860,7 +2869,9 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 				mes "maybe my prayers haven't";
 				mes "been answered yet. Perhaps";
 				mes "I need to pray more fervently?.";
-				goto L_End;
+				close2;
+				cutin "",255;
+				end;
 			}
 			mes "[Urstialla]";
 			mes "Thank you so much!";
@@ -2869,9 +2880,11 @@ 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.";
-			getitem 7572,1; //Ashy_Necklace
+			getitem 7572,1; //Magic_Necklace
 			set ice_necklace_q,1;
-			goto L_End;
+			close2;
+			cutin "",255;
+			end;
 		}
 		cutin "ra_usti2",2;
 		mes "[Urstialla]";
@@ -2880,67 +2893,73 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 		mes "that you don't believe?";
 		mes "Repent, and may your";
 		mes "heart be opened to Freya!";
-		goto L_End;
 	}
-
 	else if ((ice_necklace_q >= 1) && (ice_necklace_q < 5)) {
 		mes "[Urstialla]";
 		mes "Please find Maheo the";
 		mes "Mage and ask him to restore";
 		mes "the beauty of the necklace";
-
 		mes "I gave you. He should be";
 		mes "fighting monsters in the";
 		mes "ice cave to the north.";
-		goto L_End;
 	}
-
 	else if (ice_necklace_q == 5) {
+		if (countitem(7573) > 0) {
+			mes "[Urstialla]";
+			mes "Oh! My necklace! Thank you!";
+			mes "It's so beautiful! It will";
+			mes "make a wonderful tribute to";
+			mes "Freya! I am certain with this,";
+			mes "my son will get better!";
+			next;
+			mes "[Urstialla]";
+			mes "Here, I know it's not much,";
+			mes "but please accept this as a";
+			mes "token of my appreication for";
+			mes " what you have done for me.";
+			delitem 7573,1; //Magic_Necklace_
+			getexp 700000,0;
+			set ice_necklace_q,6;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Oh, let's just say it was";
+			mes "a worthwhile experience";
+			mes "for me.";
+			next;
+			mes "[Urstialla]";
+			mes ".........";
+			mes "............";
+			mes "May Freya always protect and";
+			mes "guide you and forgive you for";
+			mes "that horrible joke.";
+		}
+		else {
+			mes "["+strcharinfo(0)+"]";
+			mes "Oh, no! The necklace has disappeared!";
+		}
+	}
+	else {
 		mes "[Urstialla]";
-		mes "Oh! My necklace! Thank you!";
-		mes "It's so beautiful! It will";
-		mes "make a wonderful tribute to";
-		mes "Freya! I am certain with this,";
-		mes "my son will get better!";
-		next;
-		mes "[Urstialla]";
-		mes "Here, I know it's not much,";
-		mes "but please accept this as a";
-		mes "token of my appreication for";
-		mes " what you have done for me.";
-		delitem 7573,1; //Sparkling Necklace
-		getexp 700000,0;
-		set ice_necklace_q,6;
-		next;
-		mes "["+strcharinfo(0)+"]";
-		mes "Oh, let's just say it was";
-		mes "a worthwhile experience";
-		mes "for me.";
-		next;
-		mes "[Urstialla]";
-		mes ".........";
-		mes "............";
-		mes "May Freya always protect and";
-		mes "guide you and forgive you for";
-		mes "that horrible joke.";
-		goto L_End;
+		mes "May Freya always";
+		mes "protect and guide you";
+		mes "with her everflowing";
+		mes "grace and wisdom..";
 	}
-
-	mes "[Urstialla]";
-	mes "May Freya always";
-	mes "protect and guide you";
-	mes "with her everflowing";
-	mes "grace and wisdom..";
-	goto L_End;
-
-L_End:
 	close2;
 	cutin "",255;
 	end;
-
 }
 
 ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
+	if (checkweight(908,200) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
+		close;
+	}
 	if (ice_necklace_q == 1) {
 		cutin "ra_magic3",2;
 		emotion e_omg;
@@ -3132,7 +3151,6 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		cutin "",255;
 		end;
 	}
-
 	else if ((ice_necklace_q == 2) || (ice_necklace_q == 3)) {
 		mes "[Maheo]";
 		mes "My master may not have";
@@ -3143,15 +3161,36 @@ ice_dun02,120,105,3	script	Man Stuck in Ice#cave	924,5,5,{
 		mes "be reading near Freya's Spring.";
 		close;
 	}
-
 	else if (ice_necklace_q == 4) {
-		mes "[Maheo]";
-		mes "Oh, you're back!";
-		mes "So did my master have";
-		mes "any ideas on breaking";
-		mes "this cold prison of ice?";
-		next;
-		//Need proper check for Hammer_of_Wind and Gray_Necklace
+		if (countitem(7569) > 0) {
+			if (countitem(7572) > 0) {
+				mes "[Maheo]";
+				mes "Oh, you're back!";
+				mes "So did my master have";
+				mes "any ideas on breaking";
+				mes "this cold prison of ice?";
+				next;
+			}
+			else {
+				mes "["+strcharinfo(0)+"]";
+				mes "Oh, shoot! I left the necklace in the city! I will be right back!";
+				next;
+				mes "[Maheo]";
+				mes "Hey, hey! Can't you just release me first?";
+				emotion e_sob;
+				close;
+			}
+		}
+		else {
+			mes "[Maheo]";
+			mes "My master may not have";
+			mes "my sheer talent, but he";
+			mes "is very knowledgable in";
+			mes "the ways of magic. Please...";
+			mes "Ask him for help. He should";
+			mes "be reading near Freya's Spring.";
+			close;
+		}
 		mes "["+strcharinfo(0)+"]";
 		mes "Well, he made this";
 		mes "magic hammer which is";
@@ -3229,10 +3268,10 @@ 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?";
+		delitem 7572,1; //Magic_Necklace
+		delitem 7569,1; //Wind Of_Hammer
 		getitem 7574,4; //Freezing Snow Powder
-		getitem 7573,1; //Sparkling Necklace
-		delitem 7572,1; //Ashy_Necklace
-		delitem 7569,1; //Wind Hammer
+		getitem 7573,1; //Magic_Necklace_
 		set ice_necklace_q,5;
 		close2;
 		cutin "",255;
@@ -3250,7 +3289,6 @@ OnTouchNPC:
 
 OnMyMobDead:
 	end;
-
 }
 
 ice_dun02,120,3,0	script	#cave_vos	-1,{
@@ -3274,6 +3312,15 @@ OnTimer10800000:
 }
 
 rachel,265,98,3	script	Hamion#aru	930,{
+	if (checkweight(908,200) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
+		close;
+	}
 	if (ice_necklace_q < 2) {
 		mes "[Hamion]";
 		mes "Hm? Did you need";
@@ -3282,7 +3329,6 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		mes "get back to reading my book.";
 		close;
 	}
-
 	else if (ice_necklace_q == 2) {
 		mes "[Hamion]";
 		mes "Hm? Did you need";
@@ -3334,7 +3380,6 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		set ice_necklace_q,3;
 		close;
 	}
-
 	else if (ice_necklace_q == 3) {
 		if ((countitem(996) < 5) || (countitem(1354) < 1) || (countitem(7433) < 1)) { 
 			mes "[Hamion]";
@@ -3360,7 +3405,6 @@ rachel,265,98,3	script	Hamion#aru	930,{
 			mes "I'm just smart, not strong.";
 			close;
 		}
-
 		mes "[Hamion]";
 		mes "Great, you have everything";
 		mes "I need! But first, would you";
@@ -3406,7 +3450,6 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		set ice_necklace_q,4;
 		close;
 	}
-
 	else if (ice_necklace_q >= 4) {
 		mes "[Hamion]";
 		mes "There are always";
@@ -3417,7 +3460,6 @@ rachel,265,98,3	script	Hamion#aru	930,{
 		mes "such a great place to read.";
 		close;
 	}
-
 }
 
 rachel,113,96,5	script	Mohadian	929,10,10,{
@@ -3482,7 +3524,6 @@ rachel,113,96,5	script	Mohadian	929,10,10,{
 		set ice_necklace_q,7;
 		close;
 	}
-
 	else if (ice_necklace_q == 7) {
 		if (countitem(7561) < 1) {
 			mes "[Mohadian]";
@@ -3552,7 +3593,6 @@ ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
 				set $ktullanux_summon,$ktullanux_summon+1;
 				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
-
 			else if (countitem(7562) > 0) {
 				next;
 				select("Use Ice Scale.");
@@ -3565,9 +3605,7 @@ ice_dun03,126,126,3	script	Blazing Fire#ice1	802,{
 				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
-
 		}
-
 	}
 	close;
 
@@ -3597,7 +3635,6 @@ ice_dun03,172,126,0	script	Blazing Fire#ice2	802,{
 				set $ktullanux_summon,$ktullanux_summon+1;
 				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
-
 			else if (countitem(7562) > 0) {
 				next;
 				select("Use Ice Scale.");
@@ -3610,9 +3647,7 @@ ice_dun03,172,126,0	script	Blazing Fire#ice2	802,{
 				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
-
 		}
-
 	}
 	close;
 
@@ -3641,7 +3676,6 @@ ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
 				set $ktullanux_summon,$ktullanux_summon+1;
 				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
-
 			else if (countitem(7562) > 0) {
 				next;
 				select("Use Ice Scale.");
@@ -3654,9 +3688,7 @@ ice_dun03,172,172,0	script	Blazing Fire#ice3	802,{
 				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
-
 		}
-
 	}
 	close;
 
@@ -3685,7 +3717,6 @@ ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
 				set $ktullanux_summon,$ktullanux_summon+1;
 				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 			}
-
 			else if (countitem(7562) > 0) {
 				next;
 				select("Use Ice Scale.");
@@ -3698,9 +3729,7 @@ ice_dun03,127,172,0	script	Blazing Fire#ice4	802,{
 				if ($ktullanux_summon == 4) donpcevent "ice_boss#broad::OnStart";
 				close;
 			}
-
 		}
-
 	}
 	close;
 
@@ -3720,27 +3749,27 @@ OnStart:
 	end;
 
 OnTimer2000:
-	mapannounce "ice_dun03","Thor's Flame is the blaze of observation and oath, but someone has put it out!",bc_map,0xFF6633;
+	mapannounce "ice_dun03","Someone has put out Thor's flames... Infidel!",bc_map,0xFF6633;
 	end;
 
 OnTimer8000:
-	mapannounce "ice_dun03","I, Ktullanux shall keep everything from Thor's fierce flame,",bc_map,0xFF6633;
+	mapannounce "ice_dun03","I, Ktullanux, must protect and preserve Thor's fierce flames...",bc_map,0xFF6633;
 	end;
 
 OnTimer10000:
-	mapannounce "ice_dun03","as the master of this cave!",bc_map,0xFF6633;
+	mapannounce "ice_dun03","As the master of this cave, I vow vengeance!",bc_map,0xFF6633;
 	end;
 
 OnTimer13000:
-	mapannounce "ice_dun03","You must be a foolish human who does not appreciate your life.",bc_map,0xFF6633;
+	mapannounce "ice_dun03","Only a human would be so foolhardy....",bc_map,0xFF6633;
 	end;
 
 OnTimer16000:
-	mapannounce "ice_dun03","Because of your dangerous curiosity,",bc_map,0xFF6633;
+	mapannounce "ice_dun03","Your curiosity will cost you, human.",bc_map,0xFF6633;
 	end;
 
 OnTimer19000:
-	mapannounce "ice_dun03","you will taste inconceivable pain which can even freeze the mother nature's breath!",bc_map,0xFF6633;
+	mapannounce "ice_dun03","Prepare yourself for a freezing realm of pain which you cannot possibly imagine!",bc_map,0xFF6633;
 	end;
 
 OnTimer21000: