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

5 files changed, 42 insertions, 84 deletions

diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 7986cd91e..659da0c3d 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1169,16 +1169,14 @@ OnFailed:
 }
 
 // Observer ===========================>\\
-in_moc_16.gat,62,153,1	script	Observer	55,
-{
+in_moc_16.gat,62,153,1	script	Observer	55,{
 	mes "[Observer]";
 	mes "Don't mind me, I'm just here to see how well you do on your test.....";
 	close;
 }
 
 // Warp ==============================>\\
-in_moc_16.gat,87,137,0	script	sinWarp1	45,2,1,
-{
+in_moc_16.gat,87,137,0	script	sinWarp1	45,2,1,{
 OnTimer30000:
 	killmonsterall "in_moc_16.gat";
 	enablenpc "Thomas";
@@ -1187,8 +1185,7 @@ OnTimer30000:
 }
 
 // Booby Traps ========================>\\
-in_moc_16.gat,68,158,0	script	01_1::SinTrap	139,0,0,
-{
+in_moc_16.gat,68,158,0	script	01_1::SinTrap	139,0,0,{
 	stopnpctimer "TimerSin";
 	warp "in_moc_16.gat", 19, 161;
 	killmonsterall "in_moc_16.gat";
@@ -1434,8 +1431,7 @@ OnTimer188000:
 //=============================================//
 // Warp
 //=============================================//
-in_moc_16.gat,182,169,1	script	sinWarp3	45,1,1,
-{
+in_moc_16.gat,182,169,1	script	sinWarp3	45,1,1,{
 	if(getareausers(("in_moc_16.gat"),148,74,187,117) > 0) goto L_Wait;
 	disablenpc "Huey#End";
 	disablenpc "Kai#End";
@@ -1457,8 +1453,7 @@ in_moc_16.gat,182,169,1	script	sinWarp3	45,1,1,
 //==============================================//
 
 // Start Trigger ------------------------------------------------------------------
-in_moc_16.gat,167,114,3	script	guildmaster_Trig#0	139,4,0,
-{
+in_moc_16.gat,167,114,3	script	guildmaster_Trig#0	139,4,0,{
 		mes "[Guild Master]";
 		mes "Welcome ^5533FF" + strcharinfo(0) + "^000000.  This is my private room.";
 		next;
@@ -1476,8 +1471,7 @@ in_moc_16.gat,167,114,3	script	guildmaster_Trig#0	139,4,0,
 }
 
 // Guild Master -----------------------------------------------------------------------------
-in_moc_16.gat,149,80,4	script	Guild Master	106,1,1,
-{
+in_moc_16.gat,149,80,4	script	Guild Master	106,1,1,{
 	end;
 
 OnTouch:
@@ -1834,20 +1828,17 @@ sF_Questions2:
 //=============================================//
 // Maze Triggers
 //=============================================//
-in_moc_16.gat,170,90,0	script	maze_trig#1	139,0,0,
-{
+in_moc_16.gat,170,90,0	script	maze_trig#1	139,0,0,{
 	mes "[Guild Master]";
 	mes "There's no way to walk there, try another way.";
 	close;
 }
-in_moc_16.gat,150,85,0	script	maze_trig#2	139,0,0,
-{
+in_moc_16.gat,150,85,0	script	maze_trig#2	139,0,0,{
 	mes "[Guild Master]";
 	mes ".... Getting warmer.... you're almost there.....";
 	close;
 }
-in_moc_16.gat,153,85,0	script	maze_trig#3	139,0,0,
-{
+in_moc_16.gat,153,85,0	script	maze_trig#3	139,0,0,{
 	mes "[Guild Master]";
 	mes "You can't walk there..";
 	mes "Good, your almost there, keep walking.";
@@ -1855,39 +1846,33 @@ in_moc_16.gat,153,85,0	script	maze_trig#3	139,0,0,
 	mes "you got to turn a round in order to get in.";
 	close;
 }
-in_moc_16.gat,160,85,0	script	maze_trig#4	139,0,0,
-{
+in_moc_16.gat,160,85,0	script	maze_trig#4	139,0,0,{
 	mes "[Guild Master]";
 	mes "There's no way to walk there, try another way.";
 	close;
 }
-in_moc_16.gat,175,89,0	script	maze_trig#5	139,0,0,
-{
+in_moc_16.gat,175,89,0	script	maze_trig#5	139,0,0,{
 	mes "[Guild Master]";
 	mes "That way leads to Botogun..";
 	mes "What are going to do there?";
 	close;
 }
-in_moc_16.gat,164,88,0	script	maze_trig#6	139,0,0,
-{
+in_moc_16.gat,164,88,0	script	maze_trig#6	139,0,0,{
 	mes "[Guild Master]";
 	mes "Good.... you're on the right track.";
 	close;
 }
-in_moc_16.gat,149,95,0	script	maze_trig#7	139,0,0,
-{
+in_moc_16.gat,149,95,0	script	maze_trig#7	139,0,0,{
 	mes "[Guild Master]";
 	mes "Good, you found the path.";
 	close;
 }
-in_moc_16.gat,180,101,0	script	maze_trig#8	139,0,0,
-{
+in_moc_16.gat,180,101,0	script	maze_trig#8	139,0,0,{
 	mes "[Guild Master]";
 	mes "... It looks like that's not that way...";
 	close;
 }
-in_moc_16.gat,186,107,0	script	maze_trig#9	139,0,0,
-{
+in_moc_16.gat,186,107,0	script	maze_trig#9	139,0,0,{
 	mes "[Guild Master]";
 	mes "...Not that way either...";
 	close;
@@ -1897,8 +1882,7 @@ in_moc_16.gat,186,107,0	script	maze_trig#9	139,0,0,
 //================================================//
 // Decoy Chief
 //================================================//
-in_moc_16.gat,186,81,0	script	Guild Master#2	55,
-{
+in_moc_16.gat,186,81,0	script	Guild Master#2	55,{
 	mes "[Guild Master Botogun]";
 	mes "I'm sorry but I am not the person in charge here.";
 	mes "The real Guild Chief is on the other side.";
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index b49b98d3f..b65b78720 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -35,8 +35,7 @@ pay_fild10.gat,148,251,4	script	Hunter Guildsman	98,{
 
 
 //<====================================== Job Changer ========================================>\\
-in_hunter.gat,99,99,4	script	Hunter Sharon	727,
-{
+in_hunter.gat,99,99,4	script	Hunter Sharon	727,{
 	if(Class==Job_Archer) goto L_Start;
 	if(Class==Job_Hunter) goto L_Hunt;
 	if(callfunc("Is_Bow_Class")) goto L_Other;
@@ -373,8 +372,7 @@ L_Change:
 
 
 //<=========================== Demon Hunter: Second Test ===============================>\\
-in_hunter.gat,55,99,7	script	Demon Hunter	732,
-{
+in_hunter.gat,55,99,7	script	Demon Hunter	732,{
 	if(Class == Job_Archer) goto L_Arc;
 	if(Class == Job_Hunter) goto L_Hnt;
 
@@ -538,8 +536,7 @@ L_Done:
 
 
 //<=============================== Guild Master: Last Test =================================>\\
-payon_in02.gat,21,31,1	script	Guild Master	59,
-{
+payon_in02.gat,21,31,1	script	Guild Master	59,{
 	if(Class == Job_Archer) goto L_Archer;
 	if(Class == Job_Hunter) goto L_Hnt;
 
@@ -835,8 +832,7 @@ OnTimer196000:
 }
 
 // SwitchHnt ------------------------------------------------------
-job_hunte.gat,93,101,1	script	SwitchHnt	723,
-{
+job_hunte.gat,93,101,1	script	SwitchHnt	723,{
 	areaannounce "job_hunte.gat", 50, 64, 123, 143, "[Test Guide]:  *** The exit has been activated! You have 30 sec. to find the exit!! *** ",8;
 	enablenpc "ExitHnt";
 	addtimer 30000, "TimerHnt::OnTimer196000";
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 70391767b..3171535b1 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -25,8 +25,7 @@
 
 
 //<------------------------------------------------------------------------------------ Chivalry Captain Herman------------------------------------------------------------------------------------------>\\
-prt_in.gat,88,101,3	script	Chivalry Captain Herman	56,
-{
+prt_in.gat,88,101,3	script	Chivalry Captain Herman	56,{
 	if (Class == Job_Swordman && KNIGHT_Q > 0) goto L_Check;
 
 	mes "[Chivalry Captain Herman]";
@@ -225,8 +224,7 @@ L_Check:
 
 
 //<--------------------------------------------------------------------------------- Sir Andrew Syloc (1st test) ------------------------------------------------------------------------------------------>\\
-prt_in.gat,75,107,4	script	SIr Andrew Syloc	65,
-{
+prt_in.gat,75,107,4	script	Sir Andrew Syloc	65,{
 	mes "[Sir Andrew Syloc]";
 	if (Class == Job_Knight) goto L_Knight;
 	if (Class == Job_Novice) goto L_Novice;
@@ -384,8 +382,7 @@ L_Check:
 
 
 //<------------------------------------------------------------------------------ Sir James Syracuse (2nd Test) ----------------------------------------------------------------------------------------->\\
-prt_in.gat,71,91,6	script	Sir James Syracuse	65,
-{
+prt_in.gat,71,91,6	script	Sir James Syracuse	65,{
 	mes "[Sir James Syracuse]";
 	if (class == Job_Knight) goto L_Knight;
 	if (class == Job_Novice) goto L_Novice;
@@ -724,8 +721,7 @@ L_Test:
 
 //<--------------------------------------------------------------------------------- Sir Windsor (3rd Test) -------------------------------------------------------------------------------------------------->\\
 // Sir Windsor ---------------------------------------------------------
-prt_in.gat,79,94,3	script	Sir Windsor#1	733,
-{
+prt_in.gat,79,94,3	script	Sir Windsor#1	733,{
 	mes "[Sir Windsor]";
 	if(Class == Job_Knight) goto L_Knight;
 	if(Class == Job_Novice) goto L_Novice;
@@ -793,8 +789,7 @@ L_Done:
 
 
 // Waiting Room ---------------------------------------------------------------------------
-job_knt.gat,89,110,4,	script	Sir Windsor#2::SW2	733,
-{
+job_knt.gat,89,110,4,	script	Sir Windsor#2::SW2	733,{
 	mes "[Sir Windsor]";
 	mes ".........."; 
 	next;
@@ -885,8 +880,7 @@ OnStart:
 }
 
 // First Level ---------------------------------------------------------
-job_knt.gat,1,1,1	script	KntLvl1	-1,
-{
+job_knt.gat,1,1,1	script	KntLvl1	-1,{
 	set $@KntRm, 1;
 	set $@KntMob,12;
 	monster "job_knt.gat",39,150,"Dustiness",1114,1,"KntLvl1::OnMyMobDead";
@@ -917,8 +911,7 @@ OnMyMobDead:
 
 
 // Second Level ---------------------------------------------------------
-job_knt.gat,1,1,1	script	KntLvl2	-1,
-{
+job_knt.gat,1,1,1	script	KntLvl2	-1,{
 	set $@KntRm, 2;
 	set $@KntMob,12;
 	monster "job_knt.gat",53,52,"Frilldora",1119,1,"KntLvl2::OnMyMobDead";
@@ -950,8 +943,7 @@ OnMyMobDead:
 }
 
 // Third Level ---------------------------------------------------------------
-job_knt.gat,1,1,1	script	KntLvl3	-1,
-{
+job_knt.gat,1,1,1	script	KntLvl3	-1,{
 	set $@KntRm, 3;
 	set $@KntMob,7;
 	monster "job_knt.gat",136,152,"Knife Goblin Bro",1122,1,"KntLvl3::OnMyMobDead";
@@ -979,8 +971,7 @@ OnMyMobDead:
 }
 
 // Timer --------------------------------------------------------------------------------
-job_knt.gat,1,1,1	script	TimerKnt	-1,
-{
+job_knt.gat,1,1,1	script	TimerKnt	-1,{
 
 OnTimer2000:
 	set $@KntTime$, "You have 3 minutes...";
@@ -1032,8 +1023,7 @@ AnnounceKnt:
 
 
 //<------------------------------------------------------------------------------------ Lady Amy Beatris (4th Test) ---------------------------------------------------------------------------------------------->\\
-prt_in.gat,69,107,5	script	Lady Amy Beatris	728,
-{
+prt_in.gat,69,107,5	script	Lady Amy Beatris	728,{
 	mes "[Lady Amy Beatris]";
 	if (class == Job_Knight) goto L_Knight;
 	if (class == Job_Novice) goto L_Novice;
@@ -1348,8 +1338,7 @@ M_Menu:
 
 
 //<------------------------------------------------------------------------------------------- Sir Edmund (5th Test) --------------------------------------------------------------------------------------------->\\
-prt_in.gat,70,99,5	script	Sir Edmund	734,
-{
+prt_in.gat,70,99,5	script	Sir Edmund	734,{
 	mes "[Sir Edmund]";
 	if (class == Job_Knight) goto L_Knight;
 	if (class == Job_Swordman) goto L_Sword;
@@ -1456,8 +1445,7 @@ L_Test:
 }
 
 // Test -----------------------------
-job_knt.gat,1,1,1	script	ev_Test	-1,
-{
+job_knt.gat,1,1,1	script	ev_Test	-1,{
 	killmonster "job_knt.gat","ev_Test::OnMyMobDead";
 	monster "job_knt.gat",141,57,"Poring",1002,1,"ev_Test::OnMyMobDead";
 	monster "job_knt.gat",145,57,"Poring",1002,1,"ev_Test::OnMyMobDead";
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index cb9bbe68b..6a852ffd8 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -23,8 +23,7 @@
 //*********************************************************************************************************************************************************************************\\
 //============================================ Father Thomas: Job changer, Test 1 =============================================\\
 //*********************************************************************************************************************************************************************************\\
-prt_church.gat,16,41,4	script	Father Thomas	60,
-{
+prt_church.gat,16,41,4	script	Father Thomas	60,{
 	mes "[Father Thomas]";
 	if (class == Job_Novice) goto L_Novice;
 	if (class == Job_Priest) goto L_Priest;
@@ -1134,8 +1133,7 @@ AnnouncePrst:
 //**********************************************************************************************************************************************************************************\\
 //================================================= Sister Cecile: Test 3 =====================================================\\
 //**********************************************************************************************************************************************************************************\\
-prt_church.gat,27,24,4	script	Sister Cecile	79,
-{
+prt_church.gat,27,24,4	script	Sister Cecile	79,{
 	mes "[Sister Cecile]";
 	if(Class == Job_Priest) goto L_Prst;
 	if(Class == Job_Acolyte) goto L_Aco;
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index d899a8ba4..f9f18d860 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -23,8 +23,7 @@
 
 
 //<=================== Some dog =========================>
-gef_tower.gat,107,35,5	script	Some Dog	81,
-{
+gef_tower.gat,107,35,5	script	Some Dog	81,{
 	if(Class == Job_Mage) goto L_JobMage;
 	if(callfunc("Is_Magic_Class")) goto L_Magic;
 	if(callfunc("Is_Holy_Class")) goto L_Holy;
@@ -153,8 +152,7 @@ L_JobMage:
 
 
 //<=========================================== Registrar and Examiner Catherine Medichi ==============================================>\\
-gef_tower.gat,111,37,4	script	Catherine Medichi	68,
-{
+gef_tower.gat,111,37,4	script	Catherine Medichi	68,{
 	mes "[Catherine Medichi]";
 	if(Class == Job_Wizard) goto L_Wizard;
 	if(Class == Job_Novice) goto L_Novice;
@@ -495,8 +493,7 @@ L_Mage:
 
 
 //<================================================ Examiner: Raul Expagarus ==================================================>\\
-gef_tower.gat,102,24,3	script	Raul Expagarus	735,
-{
+gef_tower.gat,102,24,3	script	Raul Expagarus	735,{
 	mes "[Raul Expagarus]";
 	if(Class == Job_Mage) goto L_Mage;
 	if(Class == Job_Wizard) goto L_Wizard;
@@ -1130,8 +1127,7 @@ L_Mage:
 
 <====================================================== Test Arena ========================================================>\\
 // Test Guide  ---------------------------------------------------------------------------------
-job_wiz.gat,50,165,4	script	Wizard Test Guide::WzTG	123,
-{
+job_wiz.gat,50,165,4	script	Wizard Test Guide::WzTG	123,{
 	mes "[Test Guide]";
 	mes "Welcome.  I will be your guide for the Wizard Test.";
 	next;
@@ -1186,8 +1182,7 @@ OnStart:
 }
 
 // Room of Water  -----------------------------------------------------------------------------
-job_wiz.gat,1,1,1	script	WaterRm	-1,
-{
+job_wiz.gat,1,1,1	script	WaterRm	-1,{
 	set $@WzRm, 1;		// used to determine which map area(room) to make time announcements in
 	set $@WzMOB, 8;		//used as a counter for the monsters that are summoned
 	monster "job_wiz.gat",109,174,"Phen",1158,1,"WaterRm::OnMyMobDead1";
@@ -1239,8 +1234,7 @@ OnMyMobDead2:
 }
 
 // Room of Earth -----------------------------------------------------------------------------------------------
-job_wiz.gat,1,1,1	script	EarthRm	-1,
-{
+job_wiz.gat,1,1,1	script	EarthRm	-1,{
 	set $@WzRm, 2;
 	set $@WzMOB, 10;
 	monster "job_wiz.gat",111,102,"Yoyo",1057,1,"EarthRm::OnMyMobDead1";
@@ -1296,8 +1290,7 @@ OnMyMobDead2:
 }
 
 // Room of Fire ------------------------------------------------------------------------------------------------------------
-job_wiz.gat,1,1,1	script	FireRm	-1,
-{
+job_wiz.gat,1,1,1	script	FireRm	-1,{
 	set $@WzRm, 3;
 	set $@WzMOB, 8;
 	monster "job_wiz.gat",58,110,"Zerom",1178,1,"FireRm::OnMyMobDead1";
@@ -1349,8 +1342,7 @@ OnMyMobDead2:
 
 
 // Timer -----------------------------------------------------------------------------------------------
-job_wiz.gat,1,1,1	script	TimerWz	-1,
-{
+job_wiz.gat,1,1,1	script	TimerWz	-1,{
 
 OnTimer1000:
 	if($@WzRm==1) areaannounce "job_wiz.gat", 98, 154, 129, 185, "[Test Guide]: Room of Water, testing will begin.",8;