Merge pull request #1 from HerculesWS/master

Update from original

1 files changed, 21 insertions, 25 deletions

diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 4a5cfcd67..b3f381451 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -4,10 +4,8 @@
 //= Reddozen; L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.8a
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Official Cooking Quest (10.3)
 //===== Additional Comments: =================================
 //= 1.1 Fixed wrong item ID, added missing ";, optimized [Lupus]
@@ -15,13 +13,13 @@
 //= 1.2 Fixed exploit, some typos [Lupus]
 //= 1.3 Fixed wrong label [Lupus] 1.3a updated to Reddozen's changes
 //= 1.3b Fixed wrong id, fixed Puch quest, added more Pouch Quest
-//= dialogues [Lupus]
+//=     dialogues [Lupus]
 //= 1.4 Fixed spelling, added some dialoguesm optimized
-//= fixed bugs. Tested, fully working [Lupus]
+//=     fixed bugs. Tested, fully working [Lupus]
 //= 1.5 More fixes [Lupus]
 //= 1.6 Quest is now up to iRO 10.3 standards. [L0ne_W0lf]
-//= - Not sure what the EnableItemMove is for, as there is no 
-//= command to disable being able to move items.
+//= - Not sure what the EnableItemMove is for, as there is no
+//=   command to disable being able to move items.
 //= 1.6a Corrected a bad cutin, a Typo error ";;" and a bad delitem (bugreport:911) [Samuray22]
 //= 1.6b Corrected a "donpcevent" missing a ":". (bugreport:962) [Samuray22]
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
@@ -29,9 +27,8 @@
 //= 1.8a Minor cleaning. [Euphy]
 //============================================================
 
-prt_castle,43,30,3	script	Charles Orleans#cook	878,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+prt_castle,43,30,3	script	Charles Orleans#cook	4_M_OILMAN,{
+	if (MaxWeight - Weight < 2000) {
 		mes "[Charles Orleans]";
 		mes "Just one second.";
 		mes "You're carrying too";
@@ -44,7 +41,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		end;
 	}
 	if (BaseJob == Job_Novice) {
-		if (sex) {
+		if (Sex) {
 			cutin "orleans_5",0;
 			mes "[Charles Orleans]";
 			mes "Excuse me, monsieur?";
@@ -81,7 +78,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		goto L_End;
 	}
 	else if (getequipid(1) != 5026) {
-		if (sex) {
+		if (Sex) {
 			cutin "orleans_5",0;
 			emotion e_an;
 			mes "[Charles Orleans]";
@@ -1481,9 +1478,8 @@ L_End:
 	end;
 }
 
-prt_castle,45,35,5	script	Madeleine Chu#cook	886,{
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+prt_castle,45,35,5	script	Madeleine Chu#cook	4_COOK,{
+	if (MaxWeight - Weight < 2000) {
 		mes "[Madeleine Chu]";
 		mes "I'm sorry, but right now";
 		mes "you're carrying too many";
@@ -1720,7 +1716,7 @@ prt_castle,45,35,5	script	Madeleine Chu#cook	886,{
 			mes "of Cooking Kits";
 			mes "did you need?";
 			next;
-			switch(Select("Outdoor Cooking Kit - 500z:Home Cooking Kit - 1,000z:Quit")) {
+			switch(select("Outdoor Cooking Kit - 500z:Home Cooking Kit - 1,000z:Quit")) {
 			case 1:
 				callsub S_SellSets,12125;
 				close;
@@ -2095,7 +2091,7 @@ S_SellSets:
 	}
 	set .@total_cost,.@sell * .@item_cost;
 	set .@total_weight,.@sell * .@item_weight;
-	if (zeny < .@total_cost) {
+	if (Zeny < .@total_cost) {
 		mes "[Madeleine Chu]";
 		mes "Oh, I'm sorry, but you";
 		mes "can't afford this many";
@@ -2112,7 +2108,7 @@ S_SellSets:
 		mes getitemname(getarg(0))+"...";
 		close;
 	}
-	set zeny,zeny-.@total_cost;
+	Zeny -= .@total_cost;
 	getitem getarg(0),.@sell;
 	mes "[Madeleine Chu]";
 	mes "Here you are~";
@@ -2121,7 +2117,7 @@ S_SellSets:
 	return;
 }
 
-prt_castle,45,28,3	script	Child with Cat#cook	877,{
+prt_castle,45,28,3	script	Child with Cat#cook	4_F_YUNYANG,{
 	set .@nyu,rand(1,2);
 	if (.@nyu == 1) {
 		cutin "nyuang_1",2;
@@ -2144,7 +2140,7 @@ prt_castle,45,28,3	script	Child with Cat#cook	877,{
 	end;
 }
 
-prt_castle,44,30,5	script	Wickebine#cook	725,{
+prt_castle,44,30,5	script	Wickebine#cook	4_F_JOB_ASSASSIN,{
 	disablenpc "Wickebine#cook";
 	end;
 
@@ -2161,7 +2157,7 @@ OnDisable:
 	end;
 }
 
-payon,209,127,3	script	Servant	88,{
+payon,209,127,3	script	Servant	4_M_ORIENT01,{
 	if (!checkweight(555,1)) {
 		mes "[Chulsoo]";
 		mes "Hold on, you're carrying";
@@ -2191,7 +2187,7 @@ payon,209,127,3	script	Servant	88,{
 		next;
 		switch(select("Sure, I'll buy one!:No, thanks.:Actually, Madeleine sent me...")) {
 		case 1:
-			if (zeny < 200) {
+			if (Zeny < 200) {
 				mes "[Chulsoo]";
 				mes "Oh, I'm sorry, but";
 				mes "you don't have enough";
@@ -2200,7 +2196,7 @@ payon,209,127,3	script	Servant	88,{
 				mes "raise 200 zeny, right?";
 				close;
 			}
-			set zeny,zeny-200;
+			Zeny -= 200;
 			getitem 555,1; //Rice_Cake
 			mes "[Chulsoo]";
 			mes "Thank you very";
@@ -2362,7 +2358,7 @@ payon,209,127,3	script	Servant	88,{
 		mes "it's oh-so-delicious~";
 		next;
 		if (select("Sure, I'll buy one!:No, thanks.") == 1) {
-			if (zeny < 200) {
+			if (Zeny < 200) {
 				mes "[Chulsoo]";
 				mes "Oh, I'm sorry, but";
 				mes "you don't have enough";
@@ -2371,7 +2367,7 @@ payon,209,127,3	script	Servant	88,{
 				mes "raise 200 zeny, right?";
 				close;
 			}
-			set zeny,zeny-200;
+			Zeny -= 200;
 			getitem 555,1; //Rice_Cake
 			mes "[Chulsoo]";
 			mes "Thank you very";