Fixed MONK JOB quest!

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

2 files changed, 189 insertions, 187 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0159b971b..b724eb918 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,9 @@ Other Ppl
 
 Date		Added
 ======
+02/27
+	* Fixed some bugs in Monk Job Quest. Now it's fully passable. [Lupus]
+	  Going to brush it up a bit later. First have to re-check Crusader+Assassin+Rogue quests ^_-
 02/26
 	* Now players can reach Guilds Dungeons only trough their own captured castles. [Lupus]
 		Before they coulkd enter the dungeons vie unoccupied castles. Thanks 2Ishizu-chan for fix
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 9d90732ac..9c7410e07 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Dino9021, Edited / Translated by Celest
 //===== Current Version: ===================================== 
-//= 1.1+
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //===== Additional Comments: ================================= 
 // 1.1 Fixed missing '";'. Now it's loading fine [Lupus]
 // 1.1+ Edited/Translated 5% [Celest]
+// 1.2 Made Poetry Quiz passable, and Fixed Marathon Part 8))) [Lupus]
 //============================================================ 
 
 prt_monk.gat,55,249,4	script	Tohobu the Guarding Monk	139,0,5,{
@@ -23,8 +24,8 @@ prt_monk.gat,55,249,4	script	Tohobu the Guarding Monk	139,0,5,{
 	close;
 }
 prt_monk.gat,59,247,4	script	Master	120,{
-	if(JOB_MONK_Q == 1 ) goto Part1;
-	if(JOB_MONK_Q == 2 ) goto Part2;
+	if(MONK_Q == 1 ) goto Part1;
+	if(MONK_Q == 2 ) goto Part2;
 	if(Class == 15 || Class == 4016) goto IsMonk;
 	goto L_START;
 
@@ -66,7 +67,7 @@ L_MENU_1:
 		mes "Oh! I see.";
 		mes "Okay, I hope you'll learn something from our training,";
 		mes "Perhaps it might aid you in becoming a worthy Monk.";
-		set JOB_MONK_Q, 1;
+		set MONK_Q, 1;
 		close;
 
 	L_MENU_1_1:
@@ -100,7 +101,7 @@ L_MENU_1:
 			mes "Wow! You are a High Acolyte, aren't you?";
 			mes "I am sorry, but I can't let you become a Monk!";
 			mes "Please seek out the Champion, that is what you should be!";
-			set JOB_MONK_Q, 0;
+			set MONK_Q, 0;
 			close;
 
 		L_GO:
@@ -108,7 +109,9 @@ L_MENU_1:
 			mes "[Tohobu]";
 			mes "Well... Seems you have the ability to be a Monk.";
 			mes "Very well then... Go to Wuhai the Elder, He will guide you.";
-			set JOB_MONK_Q, 2;
+			set JBLVL, 40;				// used to determine what item to get at the end
+			if(JobLevel == 50) set JBLVL, 50;	// used to determine what item to get at the end
+			set MONK_Q, 2;
 			close;
 
 	L_MENU_1_2:
@@ -137,12 +140,12 @@ Part2:
 }
 
 monk_in.gat,99,58,4	script	Elder Wuhai	60,{
-	if(JOB_MONK_Q == 2 ) goto L_START;
-	if(JOB_MONK_Q == 3 ) goto Part1;
-	if(JOB_MONK_Q == 4 ) goto Part2;
-	if(JOB_MONK_Q >= 5 && JOB_MONK < 10) goto Part3;
-	if(JOB_MONK_Q >= 10 && countitem(506) > 0) goto Part4;
-	if(JOB_MONK_Q == 11 && countitem(506) == 0) goto Part5;
+	if(MONK_Q == 2 ) goto L_START;
+	if(MONK_Q == 3 ) goto Part1;
+	if(MONK_Q == 4 ) goto Part2;
+	if(MONK_Q >= 5 && JOB_MONK < 10) goto Part3;
+	if(MONK_Q >= 10 && countitem(506) > 0) goto Part4;//Items: Green_Potion,
+	if(MONK_Q == 11 && countitem(506) == 0) goto Part5;//Items: Green_Potion,
 	if(Class == 15 || Class == 4016) goto Part6;
 	if(Class == 4 || Class == 4005) goto Part7;
 		goto IsOther;
@@ -169,16 +172,13 @@ L_MENU_1:
 	next;
 	mes "[Elder Wuhai]";
 	mes "So you want to be a Monk! I'm glad to hear that!";
-	mes "But first, before you can become one,";
-	mes "There are a few things you need to know.";
+	mes "But first, before you can become one, there are a few things you need to know.";
 	next;
 	mes "[Elder Wuhai]";
-	mes "As Monks, we undergo strict training";
-	mes "While protecting world peace.";
+	mes "As Monks, we undergo strict training while protecting world peace.";
 	next;
 	mes "[Elder Wuhai]";	
-	mes "The strength is for giving aid to the weak in need,";
-	mes "And to protect them from harm.";
+	mes "The strength is for giving aid to the weak in need, and to protect them from harm.";
 	next;
 	mes "[Elder Wuhai]";
 	mes "Last but not least, control our emotions,";
@@ -192,16 +192,14 @@ L_MENU_1:
 	mes "You cannot become a Monk if you can't even bear this.";
 	next;
 	mes "[Elder Wuhai]";
-	mes "OKay, let's start the test to see";
-	mes "If you really have the ability to become a Monk.";
+	mes "OKay, let's start the test to see if you really have the ability to become a Monk.";
 	next;
 	mes "[Elder Wuhai]";
-	mes "Firstly, here's a small exam";
-	mes "To test your will to become one of us.";
+	mes "Firstly, here's a small exam to test your will to become one of us.";
 	next;
-//~	if(joblevel == 50) goto IsJOB50;
+	if(JBLVL == 50) goto IsJOB50;
 
-	set JOB_MONK_Q, 3;
+	set MONK_Q, 3;
 	set JOB_MONK_C,rand(1,6);
 L_Collect:
 	if(JOB_MONK_C == 1 ) goto L_Collect1;
@@ -265,6 +263,7 @@ L_Collect:
 		if(@collect_tmp != 1) goto L_CollectS;
 		close;
 L_CollectS:
+	next;
 	mes "[Elder Wuhai]";
 	mes "To test your will, you will have to collect these items by yourself";
 	next;
@@ -273,29 +272,29 @@ L_CollectS:
 	mes "Now go, May God's blessings be with you.";
 	close;
 
-//~IsJOB50:
-//~	mes "[Elder Wuhai]";
-//~	mes "However, I see that your Job Level is " +joblevel +" .";
-//~	mes "That could prove your ability.";
-//~	next;
-//~	mes "[Elder Wuhai]";
-//~	mes "Well done!";
-//~	mes "I think God will agree with me.";
-//~	next;
-//~	mes "[Elder Wuhai]";
-//~	mes "The next step, there is a Monk named Wutao want to see you.";
-//~	mes "He is in the Monk Grave North from here.";
-//~	set JOB_MONK_Q, 4;
-//~	close;
+IsJOB50:
+	mes "[Elder Wuhai]";
+	mes "However, I see that your Job Level is " +joblevel +" .";
+	mes "That could prove your ability.";
+	next;
+	mes "[Elder Wuhai]";
+	mes "Well done!";
+	mes "I think God will agree with me.";
+	next;
+	mes "[Elder Wuhai]";
+	mes "The next step, there is a Monk named Wutao want to see you.";
+	mes "He is in the Monk Grave North from here.";
+	set MONK_Q, 4;
+	close;
 
 Part1:
 //~	if(joblevel == 50) goto IsJOB50;
-	if(JOB_MONK_C == 1 && countitem(913) >= 10 && countitem(948) >= 5 && countitem(7033) >= 20) goto L_CollectS2_1;
-	if(JOB_MONK_C == 2 && countitem(1027) >= 5 && countitem(1025) >= 20 && countitem(940) >= 10) goto L_CollectS2_2;
-	if(JOB_MONK_C == 3 && countitem(905) >= 30 && countitem(909) >= 5 && countitem(955) >= 10) goto L_CollectS2_3;
-	if(JOB_MONK_C == 4 && countitem(938) >= 5 && countitem(1055) >= 10 && countitem(511) >= 20) goto L_CollectS2_4;
-	if(JOB_MONK_C == 5 && countitem(942) >= 20 && countitem(1002) >= 5 && countitem(510) >= 3) goto L_CollectS2_5;
-	if(JOB_MONK_C == 6 && countitem(943) >= 5 && countitem(935) >= 20 && countitem(912) >= 5) goto L_CollectS2_6;
+	if(JOB_MONK_C == 1 && countitem(913) >= 10 && countitem(948) >= 5 && countitem(7033) >= 20) goto L_CollectS2_1;//Items: Tooth_of_Bat, Bear's_Footskin, Poison_Spore,
+	if(JOB_MONK_C == 2 && countitem(1027) >= 5 && countitem(1025) >= 20 && countitem(940) >= 10) goto L_CollectS2_2;//Items: Porcupine_Quill, Cobweb, Grasshopper's_Leg,
+	if(JOB_MONK_C == 3 && countitem(905) >= 30 && countitem(909) >= 5 && countitem(955) >= 10) goto L_CollectS2_3;//Items: Stem, Jellopy, Worm_Peeling,
+	if(JOB_MONK_C == 4 && countitem(938) >= 5 && countitem(1055) >= 10 && countitem(511) >= 20) goto L_CollectS2_4;//Items: Sticky_Mucus, Earthworm_Peeling, Green_Herb,
+	if(JOB_MONK_C == 5 && countitem(942) >= 20 && countitem(1002) >= 5 && countitem(510) >= 3) goto L_CollectS2_5;//Items: Yoyo_Tail, Iron_Ore, Blue_Herb,
+	if(JOB_MONK_C == 6 && countitem(943) >= 5 && countitem(935) >= 20 && countitem(912) >= 5) goto L_CollectS2_6;//Items: Solid_Shell, Shell, Zargon,
 
 		mes "[Elder Wuhai]";
 		mes "Hmm... Still not ready yet?";
@@ -306,34 +305,34 @@ Part1:
 		goto L_Collect;
 
 		L_CollectS2_1:
-			delitem 913, 10;
-			delitem 948, 5;
-			delitem 7033, 20;
+			delitem 913, 10;//Items: Tooth_of_Bat,
+			delitem 948, 5;//Items: Bear's_Footskin,
+			delitem 7033, 20;//Items: Poison_Spore,
 			goto L_CollectS2_E;
 		L_CollectS2_2:
-			delitem 1027, 5;
-			delitem 1025, 20;
-			delitem 940, 10;
+			delitem 1027, 5;//Items: Porcupine_Quill,
+			delitem 1025, 20;//Items: Cobweb,
+			delitem 940, 10;//Items: Grasshopper's_Leg,
 			goto L_CollectS2_E;
 		L_CollectS2_3:
-			delitem 7012, 30;
-			delitem 909, 5;
-			delitem 955, 10;
+			delitem 7012, 30;//Items: Tough_Scalelike_Stem,
+			delitem 909, 5;//Items: Jellopy,
+			delitem 955, 10;//Items: Worm_Peeling,
 			goto L_CollectS2_E;
 		L_CollectS2_4:
-			delitem 938, 5;
-			delitem 1055, 10;
-			delitem 511, 20;
+			delitem 938, 5;//Items: Sticky_Mucus,
+			delitem 1055, 10;//Items: Earthworm_Peeling,
+			delitem 511, 20;//Items: Green_Herb,
 			goto L_CollectS2_E;
 		L_CollectS2_5:
-			delitem 942, 20;
-			delitem 1002, 5;
-			delitem 510, 3;
+			delitem 942, 20;//Items: Yoyo_Tail,
+			delitem 1002, 5;//Items: Iron_Ore,
+			delitem 510, 3;//Items: Blue_Herb,
 			goto L_CollectS2_E;
 		L_CollectS2_6:
-			delitem 943, 5;
-			delitem 935, 20;
-			delitem 912, 5;
+			delitem 943, 5;//Items: Solid_Shell,
+			delitem 935, 20;//Items: Shell,
+			delitem 912, 5;//Items: Zargon,
 			goto L_CollectS2_E;
 	
 	L_CollectS2_E:
@@ -346,7 +345,7 @@ Part1:
 		mes "Let's see... there is a Monk named";
 		mes "Ah... Wutao who wants to see you.";
 		mes "He will be in the Ancestral Graveyard North from here.";
-		set JOB_MONK_Q, 4;
+		set MONK_Q, 4;
 		set JOB_MONK_C, 0;
 		close;
 
@@ -367,7 +366,7 @@ Part4:
 	mes "Then... Hurry up and finish the Green-ish potion!";
 	mes "Otherwise, you will never be able to achieve";
 	mes "The spiritual energy level of Monks!";
-	set JOB_MONK_Q, 11;
+	set MONK_Q, 11;
 	close;
 Part5:
 	mes "[Elder Wuhai]";
@@ -510,6 +509,7 @@ L_MONK_Q_7:
 		close;
 
 L_MONK_Q_8:
+	mes "[Elder Wuhai]";
 	mes "Lastly, make an oath to swear you will keep to what you have answered.";
 	next;
 	menu "I swear.",L_MONK_Q_9,"I refuse.",-;
@@ -548,7 +548,7 @@ L_MONK_Q_9:
 	mes "Ahhhhhhhhh......";
 	next;
 	mes "[Elder Wuhai]";
-	mes "Wuuu... Huuuuuu¡K";
+	mes "Wuuu... Huuuuuu";
 	next;
 	mes "[" + strcharinfo(0) + "]";
 	mes "- He take a deeply breath -";
@@ -569,13 +569,12 @@ L_MONK_Q_9:
 	mes "WaLaChuOhhhhhhh!!!";
 	next;
 	mes "[Elder Wuhai]";
-	mes "Wuuu... Huuuuuu¡K";
+	mes "Wuuu... Huuuuuu";
 	next;
 	mes "[Elder Wuhai]";
 	mes "WowHoooo... Okay, you are now a Monk!";
 	setoption 0;
-	jobchange 15;
-	callfunc "F_ClearJobVar";
+	jobchange 15;// Job: Job_Monk
 	next;
 	mes "[Elder Wuhai]";
 	mes "(Caught!) (Caught!)";
@@ -597,8 +596,9 @@ L_MONK_Q_9:
 	mes "[Elder Wuhai]";
 	mes "Now go...";
 	mes "Here is a gift from us to congratulate you.";
-	if(joblevel <= 49) getitem 1801, 1;
-	if(joblevel == 50) getitem 1804, 1;
+	if(JBLVL < 50) getitem 1801, 1;//Items: Waghnakh,
+	if(JBLVL == 50) getitem 1804, 1;//Items: Knuckle_Duster_,
+	callfunc "F_ClearJobVar";
 	close;
 Part6:
 	mes "[Elder Wuhai]";
@@ -632,10 +632,10 @@ Part7:
 }
 
 prt_monk.gat,251,255,4	script	Wutao	79,{
-	if(JOB_MONK_Q == 4 ) goto L_START;
-	if(JOB_MONK_Q == 5 ) goto Part1;
-	if(JOB_MONK_Q == 6 ) goto Part2;
-	if(JOB_MONK_Q > 6 ) goto Part3;
+	if(MONK_Q == 4 ) goto L_START;
+	if(MONK_Q == 5 ) goto Part1;
+	if(MONK_Q == 6 ) goto Part2;
+	if(MONK_Q > 6 ) goto Part3;
 	goto IsOther;
 
 IsOther:
@@ -691,9 +691,9 @@ L_MENU_1:
 	mes "[Wutao]";
 	mes "All right, let's begin.";
 	next;
-	set @JOB_MONK_C2, rand(1,4);
+	set @JOB_MONK_C2, rand(1,3);
 L_Again:
-	if(@JOB_MONK_C2 == 1) goto L_ROOT_1;
+	if(@JOB_MONK_C2==0) set @JOB_MONK_C2, rand(1,3);
 	if(@JOB_MONK_C2 == 2) goto L_ROOT_2;
 	if(@JOB_MONK_C2 == 3) goto L_ROOT_3;
 
@@ -727,7 +727,7 @@ L_Again:
 		set @monk_str6$,"They are resplendent as the great lights of the firmament;";
 		set @monk_str7$,"Temples to our Lord Guan Yu abound, no village lacks one,";
 		set @monk_str8$,"Their venerable trees at sundown are the resting places for birds.";
-		goto L_MES;
+
 L_MES:
 	mes "[Wutao]";
 	mes "Listen carefully!";
@@ -766,7 +766,6 @@ L_MES_1:
 	mes "Now, " + strcharinfo(0) + ", it's your turn.";
 	next;
 	set @monk_q, 0;
-	if(@JOB_MONK_C2 == 1) goto L_MONK_Q1_1;
 	if(@JOB_MONK_C2 == 2) goto L_MONK_Q2_1;
 	if(@JOB_MONK_C2 == 3) goto L_MONK_Q3_1;
 
@@ -847,14 +846,13 @@ L_MONK_Q1_7:
 	menu "So flies he westward.",L_MONK_Q1_8,
 		"Supported by dragon and phoenix,",L_MONK_Q1_8,
 		"Lest ye descend to the Nine Golden Springs.",L_MONK_Q1_8,
-		"See that ye act when occasion offers,",L_MONK_Q1_8,
 		"There shall be successes and failures,",L_MONK_Q1_8,
 		"For such is the eternal law.",L_MONK_Q1_8,
 		"But the phoenix shall fall to the earth.",L_MONK_Q1_8,
 		"And the dragon shall soar to the sky;",L_MONK_Q1_8,
 		"See that ye act when occasion offers,",-;
 
-		set @monk_q, @monk_q + 1;
+		set @monk_q, @monk_q + 2;
 L_MONK_Q1_8:
 
 	menu "Supported by dragon and phoenix,",L_MONK_QUEST_END,
@@ -862,7 +860,6 @@ L_MONK_Q1_8:
 		"But the phoenix shall fall to the earth.",L_MONK_QUEST_END,
 		"Lest ye descend to the Nine Golden Springs.",L_MONK_QUEST_1_2,
 		"And the dragon shall soar to the sky;",L_MONK_QUEST_END,
-		"Lest ye descend to the Nine Golden Springs.",L_MONK_QUEST_END,
 		"So flies he westward.",L_MONK_QUEST_END,
 		"There shall be successes and failures,",L_MONK_QUEST_END,
 		"For such is the eternal law.",L_MONK_QUEST_END;
@@ -950,7 +947,7 @@ L_MONK_Q2_7:
 		"Shu's glories could he well rehearse,",L_MONK_Q2_8,
 		"His lore embraced the universe.",L_MONK_Q2_8;
 
-		set @monk_q, @monk_q + 1;
+		set @monk_q, @monk_q + 2;
 L_MONK_Q2_8:
 
 	menu "He boasted not a handsome face,",L_MONK_QUEST_END,
@@ -1082,7 +1079,7 @@ L_MONK_QUEST_1_2:
 		set @monk_q, @monk_q + 1;
 L_MONK_QUEST_END:
 
-	if(@monk_q != 10) goto L_C2_FAIL;
+	if(@monk_q < 9) goto L_C2_FAIL;
 
 L_C2_DONE:
 	set @monk_q, 0;
@@ -1113,7 +1110,7 @@ L_C2_DONE:
 	next;
 	mes "[Wutao]";
 	mes "Now go, seek ^000080Fuhai^000000 for further guidance.";
-	set JOB_MONK_Q, 6;
+	set MONK_Q, 6;
 	close;
 
 L_C2_FAIL:
@@ -1121,7 +1118,7 @@ L_C2_FAIL:
 	mes "Well...? How was that? ";
 	next;
 	mes "[Wutao]";
-	mes "Hmmm...";
+	mes "Hmmm... ";
 	next;
 	mes "[Wutao]";
 	mes "HeNmmm...";	
@@ -1138,7 +1135,7 @@ L_C2_FAIL:
 	next;
 	mes "[Wutao]";	
 	mes "Of course! Since you did not pass this test, you can't take the next test.";
-	set JOB_MONK_Q, 5;
+	set MONK_Q, 5;
 	close;
 
 Part1:
@@ -1171,7 +1168,7 @@ prt_monk.gat,57,179,4	script	Fuhai	110,{
 
 	if(@Choice_mission == 1 ) goto Part1;
 	if(@Choice_mission == 2 ) goto Part2;
-	if(JOB_MONK_Q == 6 ) goto L_START;
+	if(MONK_Q == 6 ) goto L_START;
 	goto IsOther;
 IsOther:
 	mes "[Fuhai]";
@@ -1255,7 +1252,7 @@ L_START:
 		close;
 
 	L_MENU_1_1_2:
-		set JOB_MONK_Q, 7;
+		set MONK_Q, 7;
 		mes "[Fuhai]";
 		mes "Very well, at least you know what had been change in your body";
 		mes "Now, let's begin the next test.";
@@ -1316,8 +1313,8 @@ Part2:
 }
 
 prt_monk.gat,199,169,4	script	Guard	746,{
-	if(JOB_MONK_Q == 7) goto L_START;
-	if(JOB_MONK_Q > 6) goto Part1;
+	if(MONK_Q == 7) goto L_START;
+	if(MONK_Q > 6) goto Part1;
 	goto IsOther;
 IsOther:
 	mes "[Guard ChaoLi]";
@@ -1348,8 +1345,8 @@ Part1:
 }
 
 monk_test.gat,329,61,4	script	Bashu	753,{
-	if(JOB_MONK_Q == 7) goto L_START;
-	if(JOB_MONK_Q == 8) goto IsOther;
+	if(MONK_Q == 7) goto L_START;
+	if(MONK_Q == 8) goto IsOther;
 	goto IsOther;
 IsOther:
 	mes "[Bashu]";
@@ -1418,7 +1415,7 @@ monk_test.gat,387,347,4	script	Musha	110,{
 	next;
 	menu "I want to giveup!",-,"I want to run!!",L_MENU_1;
 
-		announce "Musha: " + strcharinfo(0) + " has give...giveup the test...! Giveup the Marathon test... No...No patient.....HaHaHaHa!!!...",8;
+		mapannounce "monk_test.gat","Musha: " + strcharinfo(0) + " has give...giveup the test...! Giveup the Marathon test... No...No patient.....HaHaHaHa!!!...",8;
 		mes "[Musha]";
 		mes strcharinfo(0) + "...give...giveup the test...";
 		mes "Giveup the Marathon test...";
@@ -1431,7 +1428,9 @@ L_MENU_1:
 	mes "[Musha]";
 	mes "Before we give you an order to stop....";
 	mes "Run...Run! " + strcharinfo(0) + "! Run!";
-	if(@runtimes == 0) set @runtimes, rand(8,10);
+	//if(@runtimes == 0) 
+	set @runtimes, rand(8,10);
+	set @run, 0;
 	close;
 }
 
@@ -1443,94 +1442,94 @@ monk_test.gat,390,387,0	script	monk_warp	45,1,1,{
 	end;
 L_DONE:
 	mapannounce "monk_test.gat","Musha: Con....Congratulations!!" + strcharinfo(0)+ " Pass!! Please go to [Daowen], he is in the deep of the building.",8;
-	set JOB_MONK_Q, 8;
+	set MONK_Q, 8;
 	warp "prt_monk.gat",196,168;
 	end;
-
 }
-monk_test.gat,0,0,0	script	monk_traps	-1,{
+
+function	script	MnkTraps	{
 	mapannounce "monk_test.gat","trap: " + strcharinfo(0)+ " , you fall into a trap! Now we warp you to the start place.",8;
 	warp "monk_test.gat",388,348;
-	end;
 }
 //---------------------
-monk_test.gat,386,164,0	script	monk1-1	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,386,165,0	script	monk1-2	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,387,164,0	script	monk1-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,387,165,0	script	monk1-4	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,388,164,0	script	monk1-5	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,388,165,0	script	monk1-6	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,389,164,0	script	monk1-7	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,389,165,0	script	monk1-8	139,0,0,{doevent "monk_traps";end;}
+monk_test.gat,386,164,0	script	monk1-1	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,386,165,0	script	monk1-2	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,387,164,0	script	monk1-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,387,165,0	script	monk1-4	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,388,164,0	script	monk1-5	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,388,165,0	script	monk1-6	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,389,164,0	script	monk1-7	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,389,165,0	script	monk1-8	139,0,0,{callfunc "MnkTraps";}
 //---------------------
-monk_test.gat,386,42,0	script	monk2-1	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,386,43,0	script	monk2-2	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,387,42,0	script	monk2-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,387,43,0	script	monk2-4	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,388,42,0	script	monk2-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,388,43,0	script	monk2-4	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,389,42,0	script	monk2-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,389,43,0	script	monk2-4	139,0,0,{doevent "monk_traps";end;}
+monk_test.gat,386,42,0	script	monk2-1	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,386,43,0	script	monk2-2	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,387,42,0	script	monk2-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,387,43,0	script	monk2-4	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,388,42,0	script	monk2-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,388,43,0	script	monk2-4	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,389,42,0	script	monk2-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,389,43,0	script	monk2-4	139,0,0,{callfunc "MnkTraps";}
 //---------------------
-monk_test.gat,184,11,0	script	monk3-1	139,0,3,{doevent "monk_traps";end;}
-monk_test.gat,185,11,0	script	monk3-2	139,0,3,{doevent "monk_traps";end;}
-monk_test.gat,186,11,0	script	monk3-3	139,0,3,{doevent "monk_traps";end;}
-monk_test.gat,187,11,0	script	monk3-4	139,0,3,{doevent "monk_traps";end;}
+monk_test.gat,184,11,0	script	monk3-1	139,0,3,{callfunc "MnkTraps";}
+monk_test.gat,185,11,0	script	monk3-2	139,0,3,{callfunc "MnkTraps";}
+monk_test.gat,186,11,0	script	monk3-3	139,0,3,{callfunc "MnkTraps";}
+monk_test.gat,187,11,0	script	monk3-4	139,0,3,{callfunc "MnkTraps";}
 //---------------------
-monk_test.gat,70,10,0	script	monk4-1	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,70,11,0	script	monk4-2	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,70,12,0	script	monk4-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,70,13,0	script	monk4-4	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,71,10,0	script	monk4-5	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,71,11,0	script	monk4-6	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,71,12,0	script	monk4-7	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,71,13,0	script	monk4-8	139,0,0,{doevent "monk_traps";end;}
+monk_test.gat,70,10,0	script	monk4-1	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,70,11,0	script	monk4-2	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,70,12,0	script	monk4-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,70,13,0	script	monk4-4	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,71,10,0	script	monk4-5	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,71,11,0	script	monk4-6	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,71,12,0	script	monk4-7	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,71,13,0	script	monk4-8	139,0,0,{callfunc "MnkTraps";}
 //---------------------
-monk_test.gat,8,30,0	script	monk5-1	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,8,31,0	script	monk5-2	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,9,30,0	script	monk5-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,9,31,0	script	monk5-4	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,10,30,0	script	monk5-5	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,10,31,0	script	monk5-6	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,11,30,0	script	monk5-7	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,11,31,0	script	monk5-8	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,12,30,0	script	monk5-9	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,12,31,0	script	monk5-10	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,13,30,0	script	monk5-11	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,13,31,0	script	monk5-12	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,14,30,0	script	monk5-13	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,14,31,0	script	monk5-14	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,15,30,0	script	monk5-15	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,15,31,0	script	monk5-16	139,0,0,{doevent "monk_traps";end;}
+monk_test.gat,8,30,0	script	monk5-1	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,8,31,0	script	monk5-2	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,9,30,0	script	monk5-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,9,31,0	script	monk5-4	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,10,30,0	script	monk5-5	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,10,31,0	script	monk5-6	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,11,30,0	script	monk5-7	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,11,31,0	script	monk5-8	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,12,30,0	script	monk5-9	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,12,31,0	script	monk5-10	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,13,30,0	script	monk5-11	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,13,31,0	script	monk5-12	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,14,30,0	script	monk5-13	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,14,31,0	script	monk5-14	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,15,30,0	script	monk5-15	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,15,31,0	script	monk5-16	139,0,0,{callfunc "MnkTraps";}
 //---------------------
-monk_test.gat,10,158,0	script	monk6-1	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,10,159,0	script	monk6-2	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,11,158,0	script	monk6-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,11,159,0	script	monk6-4	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,12,158,0	script	monk6-5	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,12,159,0	script	monk6-6	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,13,158,0	script	monk6-7	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,13,159,0	script	monk6-8	139,0,0,{doevent "monk_traps";end;}
+monk_test.gat,10,158,0	script	monk6-1	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,10,159,0	script	monk6-2	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,11,158,0	script	monk6-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,11,159,0	script	monk6-4	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,12,158,0	script	monk6-5	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,12,159,0	script	monk6-6	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,13,158,0	script	monk6-7	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,13,159,0	script	monk6-8	139,0,0,{callfunc "MnkTraps";}
 //---------------------
-monk_test.gat,38,386,0	script	monk7-1	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,38,387,0	script	monk7-2	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,38,388,0	script	monk7-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,38,389,0	script	monk7-4	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,39,386,0	script	monk7-5	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,39,387,0	script	monk7-6	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,39,388,0	script	monk7-7	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,39,389,0	script	monk7-8	139,0,0,{doevent "monk_traps";end;}
+monk_test.gat,38,386,0	script	monk7-1	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,38,387,0	script	monk7-2	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,38,388,0	script	monk7-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,38,389,0	script	monk7-4	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,39,386,0	script	monk7-5	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,39,387,0	script	monk7-6	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,39,388,0	script	monk7-7	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,39,389,0	script	monk7-8	139,0,0,{callfunc "MnkTraps";}
 //---------------------
-monk_test.gat,82,390,0	script	monk8-1	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,82,391,0	script	monk8-2	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,83,390,0	script	monk8-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,83,391,0	script	monk8-4	139,0,0,{doevent "monk_traps";end;}
+monk_test.gat,82,390,0	script	monk8-1	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,82,391,0	script	monk8-2	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,83,390,0	script	monk8-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,83,391,0	script	monk8-4	139,0,0,{callfunc "MnkTraps";}
 //---------------------
-monk_test.gat,82,384,0	script	monk8-1	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,82,385,0	script	monk8-2	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,83,384,0	script	monk8-3	139,0,0,{doevent "monk_traps";end;}
-monk_test.gat,83,385,0	script	monk8-4	139,0,0,{doevent "monk_traps";end;}
+monk_test.gat,82,384,0	script	monk8-1	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,82,385,0	script	monk8-2	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,83,384,0	script	monk8-3	139,0,0,{callfunc "MnkTraps";}
+monk_test.gat,83,385,0	script	monk8-4	139,0,0,{callfunc "MnkTraps";}
 //---------------------
+
 prt_monk.gat,225,179,4	script	XuanWu 	89,{
 	mes "[XuanWu]";
 	mes "To see the growing of crop, I deeply appreciate from the grace of God.";
@@ -1555,7 +1554,7 @@ prt_monk.gat,225,179,4	script	XuanWu 	89,{
 }
 job_monk.gat,225,179,4	script	XuanWu	89,{
 
-	if(JOB_MONK_Q == 8 ) goto Part2;
+	if(MONK_Q == 8 ) goto Part2;
 	if(@mission_start == 1 ) goto Part1;
 
 	mes "[XuanWu]";
@@ -1593,8 +1592,8 @@ L_MENU_2:
 		mes "[XuanWu]";
 		mes "Another one without willpower...";
 		set @mission_start, 0;
-		getitem 1069, 1;
-		delitem 1069, 1;
+		getitem 1069, 1;//Items: Orange_Net_Mushroom,
+		delitem 1069, 1;//Items: Orange_Net_Mushroom,
 		next;
 		warp "prt_monk.gat",196,168;
 		end;		
@@ -1605,8 +1604,8 @@ L_MENU_1:
 	close;
 
 Part1:
-	if(countitem(1069) >= 30 && countitem(1070) >0 ) goto L_DONE;
-	if(countitem(1070) >= 30 && countitem(1069) >0 ) goto L_DONE;
+	if(countitem(1069) >= 30 && countitem(1070) >0 ) goto L_DONE;//Items: Orange_Net_Mushroom, Orange_Gooey_Mushroom_,
+	if(countitem(1070) >= 30 && countitem(1069) >0 ) goto L_DONE;//Items: Orange_Gooey_Mushroom_, Orange_Net_Mushroom,
 	mes "[XuanWu]";
 	mes "Hmmm... Is that all you can do? I don't think it's enough.";
 	next;
@@ -1614,15 +1613,15 @@ Part1:
 	mes "Or...You want to giveup?";
 	next;
 	menu "Continue Mushroom Collecting",-,"I'll giveup",L_MENU_2;
-		close;
+	close;
 L_DONE:
-	set JOB_MONK_Q, 8;
+	set MONK_Q, 8;
 	mes "[XuanWu]";
 	mes "Well... I think you can do it better...";
 	mes "However, I should say you pass the test.";
 	set @mission_start, 0;
-	delitem 1069, countitem(1069);
-	delitem 1070, countitem(1070);
+	delitem 1069, countitem(1069);//Items: Orange_Net_Mushroom,
+	delitem 1070, countitem(1070);//Items: Orange_Gooey_Mushroom_,
 	next;
 	mes "[XuanWu]";
 	mes "Now go to [Daowen], he is in the deep of the building.";
@@ -1645,10 +1644,10 @@ job_monk.gat,199,169,4	script	Guard ChaoLi 	746,{
 }
 
 monk_test.gat,319,139,4	script	Daowen	52,{
-	if(JOB_MONK_Q == 8) goto L_START;
-	if(JOB_MONK_Q == 9) goto Part1;
-	if(JOB_MONK_Q == 10) goto Part2;
-		goto IsOther;
+	if(MONK_Q == 8) goto L_START;
+	if(MONK_Q == 9) goto Part1;
+	if(MONK_Q == 10) goto Part2;
+	goto IsOther;
 IsOther:
 	mes "[Daowen]";
 	mes "Go throught it quietly...";
@@ -1697,11 +1696,11 @@ Part1:
 	mes "I knew you can do it!";
 	mes "I'll give you a special potion that can increase your power";
 	next;
-	getitem 506, 1;
+	getitem 506, 1;//Items: Green_Potion,
 	mes "[Daowen]";
 	mes "Drink it, and your internal organs will increase enough to be a Monk.";
 	mes "Okay...Then, Go to Wuhai - the first one you meet here.";
-	set JOB_MONK_Q, 10;
+	set MONK_Q, 10;
 	close;
 Part2:
 	mes "[Daowen]";
@@ -1758,7 +1757,7 @@ monk_test.gat,155,180,4	script	monk_mob1_4	139,0,19,{
 	end;
 }
 monk_test.gat,165,179,4	script	monk_mob3_warp	45,1,1,{
-	set JOB_MONK_Q, 9;
+	set MONK_Q, 9;
 	mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Pass!! Please go to [Daowen], he is in the deep of the building.",8;
 	killmonster "monk_test.gat","monk_mob1";
 	warp "monk_test.gat",317,142;
@@ -1820,7 +1819,7 @@ monk_test.gat,153,281,4	script	monk_mob2_4	139,0,19,{
 	end;
 }
 monk_test.gat,165,278,4	script	monk_mob2_warp	45,1,1,{
-	set JOB_MONK_Q, 9;
+	set MONK_Q, 9;
 	mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Pass!! Please go to [Daowen], he is in the deep of the building.",8;
 	killmonster "monk_test.gat","monk_mob2";
 	warp "monk_test.gat",317,142;
@@ -1882,16 +1881,16 @@ monk_test.gat,260,281,4	script	monk_mob3_4	139,0,19,{
 	end;
 }
 monk_test.gat,269,279,4	script	monk_mob3_warp	45,1,1,{
-	set JOB_MONK_Q, 9;
+	set MONK_Q, 9;
 	mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Pass!! Please go to [Daowen], he is in the deep of the building.",8;
 	killmonster "monk_test.gat","monk_mob3";
 	warp "monk_test.gat",317,142;
 	end;
 }
 
-monk_test.gat,1,1,1	script	monk_mob3	-1,{
-		end;
-}
+//monk_test.gat,1,1,1	script	monk_mob3	-1,{
+//		end;
+//}