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

7 files changed, 37 insertions, 74 deletions

diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index bc1ac9be5..4d2be5730 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -202,8 +202,7 @@ alberta.gat,131,139,4	script	Drunken old man	709,{
 }
 
 // Soda Man ----------------------------------------------------
-alberta.gat,90,71,3	script	Soda Man	89,
-{
+alberta.gat,90,71,3	script	Soda Man	89,{
 	mes "[Soda Man]";
 	mes "Ummm.... delicious....";
 	emotion 33;
@@ -362,8 +361,7 @@ alb2trea.gat,39,50,5	script	Sailor	100,{
 
 //<====================================================== Turtle Island ========================================================>\\
 // Gotanblue --------------------------------------------------------------------------
-alberta.gat,247,123,5	script	Gotanblue	709,
-{
+alberta.gat,247,123,5	script	Gotanblue	709,{
 	if(TURTLE == 1) goto L_Turtle;
 	mes "[Gotanblue]";
 	mes "Ha ha! The sea seems endless!! We cannot begin to grasp it's size merely by gazing at it from land....";
@@ -533,8 +531,7 @@ M_Menu:
 }
 
 // Turtle Grandpa -------------------------------------------------------------------
-alberta_in.gat,23,104,2	script	Turtle Grandpa	120,
-{
+alberta_in.gat,23,104,2	script	Turtle Grandpa	120,{
 	mes "[Turtle Grandpa]";
 	mes "~Buuurrrpp!!!~ Oops...";
 	emotion 4;
@@ -646,8 +643,7 @@ alberta_in.gat,23,104,2	script	Turtle Grandpa	120,
 }
 
 // Letter of an explorer (on Turtle Grandpa's desk)------------------------------------------------------------------
-alberta_in.gat,17,101,1	script	Letter of an explorer	111,
-{
+alberta_in.gat,17,101,1	script	Letter of an explorer	111,{
 	mes "~ The letter reads... ~";
 	mes "- O/X/XOVX -";
 	mes "If you find this letter, it means that our expidition to Turtle Island has failed.  Please inform the others...";
@@ -670,8 +666,7 @@ alberta_in.gat,17,101,1	script	Letter of an explorer	111,
 }
 
 // Jornadan Niliria ------------------------------------------------------------------------
-alberta.gat,248,90,1	script	Jornadan Niliria	121,
-{
+alberta.gat,248,90,1	script	Jornadan Niliria	121,{
 	mes "[Jornadan Niliria]";
 	mes "Sometimes I think that the world around me is ever changing.";
 	mes "When I view the land it seems different, when I look up at the sky it too seems different....";
@@ -729,8 +724,7 @@ alberta.gat,248,90,1	script	Jornadan Niliria	121,
 }
 
 // Jornadan's Voyage Log -------------------------------------------------
-alberta.gat,247,93,1	script	A Voyage Log	111,
-{
+alberta.gat,247,93,1	script	A Voyage Log	111,{
 	if(JORNADAN == 1) goto L_Treasure;
 	mes "[A Voyage Log]";
 	mes "= 03:20 am =";
@@ -852,8 +846,7 @@ L_Treasure:
 }
 
 // Burried treasure --------------------------------------------------------------------
-turn_dun01,160,80,1	script	Skull Stone	111,
-{
+turn_dun01,160,80,1	script	Skull Stone	111,{
 	if(SKULLKEY == 1) goto L_OpenBox;
 	mes "^5555FF(It's a frightening stone tomb with horrible skull on it.)^000000";
 	close;
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index 450e99ed3..b5975e4f3 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -834,8 +834,7 @@ aldeba_in.gat,24,245,4	script	 Kafra Jasmine	115,{
 }
 
 // Special Reserve ----------------------------------------------
-aldeba_in.gat,79,161,6	script	Kafra	115,
-{
+aldeba_in.gat,79,161,6	script	Kafra	115,{
 	cutin "kafra_03",2;
 	mes "[Kafra]";
 	mes "Welcome, ^6666FF" + strcharinfo(0) + "^000000.  This is where you can trade in your special reserve points for usefull items and cool prizes.";
@@ -1022,8 +1021,7 @@ M_Menu:
 }
 
 // Special Reserve 2 ----------------------------------------------
-aldeba_in.gat,88,161,3	script	Kafra	115,
-{
+aldeba_in.gat,88,161,3	script	Kafra	115,{
 	cutin "kafra_03",2;
 	mes "[Kafra]";
 	mes "Hello and welcome to the Kafra Corp. Main office.";
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index ed7dd3700..2c14e3e48 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -255,8 +255,7 @@ cmd_in02.gat,48,55,4	script	Scoursege	51,{
 //			Chief Quest (Doomed Swords Part 1)
 //============================================================================//
 //=======================================================
-comodo.gat,206,310,4	script	Rochito	48,
-{
+comodo.gat,206,310,4	script	Rochito	48,{
 	if(dmdswrd_Q == 1) goto L_1;
 	if(dmdswrd_Q == 2) goto L_2;
 	if(dmdswrd_Q == 3) goto sL_2;
@@ -385,8 +384,7 @@ L_3:
 }
 
 //=======================================================
-comodo.gat,204,310,4	script	Rockha	98,
-{
+comodo.gat,204,310,4	script	Rockha	98,{
 	if(dmdswrd_Q == 3) goto L_1;
 	if(dmdswrd_Q == 4 || dmdswrd_Q==5) goto L_2;
 L_0:
@@ -439,8 +437,7 @@ L_2:
 }
 
 //=======================================================
-comodo.gat,209,314,4	script	Rotute	82,
-{
+comodo.gat,209,314,4	script	Rotute	82,{
 	if(dmdswrd_Q==2 || dmdswrd_Q==3) goto L_1;
 	if(dmdswrd_Q == 4 || dmdswrd_Q==5) goto L_2;
 
@@ -556,8 +553,7 @@ comodo.gat,209,305,4	script	Emralhandas	70,{
 
 
 // Chief's House =========================================================//
-cmd_in02.gat,32,140,4	script	Chief Tausupa	49,
-{
+cmd_in02.gat,32,140,4	script	Chief Tausupa	49,{
 	if(dmdswrd_Q == 1) goto L_1;
 	if(dmdswrd_Q == 2) goto sL_1;
 	if(dmdswrd_Q == 3) goto L_2;
@@ -671,8 +667,7 @@ L_2:
 //============================================================================//
 
 //=======================================================
-comodo.gat,88,97,4	script	Cheese Expert TORUNA	109,
-{
+comodo.gat,88,97,4	script	Cheese Expert TORUNA	109,{
 	if(dmdswrd_Q == 7) goto sL_2;
 	mes "[TORUNA]";
 	mes "I hear that the cheese here is delicious.  Everytime I come here to visit, I ask for some of that popular cheese.";
@@ -761,8 +756,7 @@ M_Menu:
 }
 
 //=======================================================
-comodo.gat,164,291,2	script	Rakusa	73,
-{
+comodo.gat,164,291,2	script	Rakusa	73,{
 	if(dmdswrd_Q == 7) goto L_1;
 	if(dmdswrd_Q == 8) goto L_2;
 
@@ -794,8 +788,7 @@ L_2:
 }
 
 //=======================================================
-comodo.gat,169,284,4	script	Kichiri	99,
-{
+comodo.gat,169,284,4	script	Kichiri	99,{
 	mes "[Kichiri]";
 	if(dmdswrd_Q == 8) goto L_1;
 	if(dmdswrd_Q == 9) goto L_2;
@@ -823,8 +816,7 @@ L_2:
 }
 
 //=======================================================
-comodo.gat,163,280,4	script	Magatu	55,
-{
+comodo.gat,163,280,4	script	Magatu	55,{
 	mes "[Magatu]";
 	if(dmdswrd_Q == 9) goto L_1;
 	if(dmdswrd_Q == 10) goto L_2;
@@ -918,8 +910,7 @@ L_2:
 }
 
 //=======================================================
-comodo.gat,187,153,4	script	Hullaris	701,
-{
+comodo.gat,187,153,4	script	Hullaris	701,{
 	mes "[Hullaris]";
 	if(dmdswrd_Q == 11) goto L_1;
 	if(dmdswrd_Q == 12) goto L_2;
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index 4f8c32f3b..615f6a806 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -109,8 +109,7 @@ geffen_in.gat,34,170,0	script	"Young man"	47,{
 
 //<============================================ Inn =====================================================>\\
 // Waitress ---------------------------------------------------------------------------
-geffen_in.gat,70,67,5	script	Waitress	80,
-{
+geffen_in.gat,70,67,5	script	Waitress	80,{
 	mes "[Waitress]";
 	mes "Ugh!! SO annoying! Why would you drink here when you could drink at the pub!? This is an Inn, not a pub!!";
 	mes "That man!... everytime he drinks... he gets like that! Ugh!!";
@@ -160,8 +159,7 @@ M_Menu:
 }
 
 // Merhcant Daven -------------------------------------------------------------------
-geffen_in.gat,79,75,2	script	Merchant Daven	61,
-{
+geffen_in.gat,79,75,2	script	Merchant Daven	61,{
 	mes "[Merchant Daven]";
 	mes "Back in the day when I frist came to Geffen, the town was a very boring place to live in.";
 	next;
@@ -223,8 +221,7 @@ M_Menu:
 }
 
 // Drunkard -------------------------------------------------------------------
-geffen_in.gat,59,62,2	script	Drunkard	120,
-{
+geffen_in.gat,59,62,2	script	Drunkard	120,{
 	mes "[Drunkard]";
 	mes "Hmm... You're Joshua's friend too??";
 	next;
@@ -258,8 +255,7 @@ geffen_in.gat,59,62,2	script	Drunkard	120,
 }
 
 // Schubaltzwald Merchant ----------------------------------------------------------------------
-geffen_in.gat,113,73,4	script	Schubaltzwald Merchant	709,
-{
+geffen_in.gat,113,73,4	script	Schubaltzwald Merchant	709,{
 	mes "[Schubaltzwald Merchant]";
 	mes "How are you, Rune-Midgard young'un? I am Schubaltzwald's one and only Hans Hadenhiem.";
 	next;
@@ -286,8 +282,7 @@ geffen_in.gat,113,73,4	script	Schubaltzwald Merchant	709,
 
 //<============================================== Pub ==================================================>\\
 // Waitress -----------------------------------------------------------------
-geffen_in.gat,28,134,4	script	Waitress	69,
-{
+geffen_in.gat,28,134,4	script	Waitress	69,{
 	mes "[Waitress]";
 	mes "Meh! ALWAYS drinking and ALWAYS fighting..... HEY Mister! This is a place of BUSINESS!!";
 	emotion 6;
@@ -327,8 +322,7 @@ M_Menu:
 }
 
 // Drunkard ----------------------------------------------------------------------------
-geffen_in.gat,21,125,5	script	Drunkard	52,
-{
+geffen_in.gat,21,125,5	script	Drunkard	52,{
 	mes "[Drunkard]";
 	mes "You want to be an idiotic magician? Is that why you came here??";
 	emotion 1;
@@ -336,8 +330,7 @@ geffen_in.gat,21,125,5	script	Drunkard	52,
 }
 
 // Friend of Youth -----------------------------------------------------------------
-geffen_in.gat,37,124,5	script	Friend of Youth	704,
-{
+geffen_in.gat,37,124,5	script	Friend of Youth	704,{
 	set @temp,0;
 	mes "[Friend of Youth]";
 	mes "Welcome young one! Are you worrying about something? Tell me all your troubles and I will tell you your fortune with my silver ball of mystery!";
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 409ed7330..33f3eca14 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -388,8 +388,7 @@ moc_fild16.gat,199,212,4	script	Hashisid	48,{
 // Assassin Guild Guards
 //===================================================
 
-moc_fild16.gat,195,281,4	script	Assassin Guardian#1::SinGuard	707,
-{
+moc_fild16.gat,195,281,4	script	Assassin Guardian#1::SinGuard	707,{
 	mes "[Assassin Guardian]";
 	if(Class == Job_Assassin) mes "Welcome.";
 	if(Class == Job_Assassin) close;
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 8dc1227eb..cf1122e0a 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -388,8 +388,7 @@ prt_church.gat,103,76,2	script	Garnet	67,{
 
 // ----------------------------------------------------------------------------------------------- PUB -----------------------------------------------------------------------------------------------------\\
 // Sir Michael (West End Pub)
-prt_in.gat,26,30,1	script	Sir Michael	54,
-{
+prt_in.gat,26,30,1	script	Sir Michael	54,{
 	mes "[Sir Michael]";
 	mes "I dunno if you'll ever believe me, but I saw the WEIRDEST thing down in the ^5555FFCulvert Sewers^000000.";
 	mes "I've been training in the 3rd level of the sewers for a long time now, so there's nothing about that area that I don't know.";
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index e6199a54d..b44ce4a43 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -100,8 +100,7 @@ yuno.gat,158,205,4	script	Artisan	54,{
 }
 
 //======================================================================================
-yuno.gat,336,227,4	script	Yuno Granny	103,
-{
+yuno.gat,336,227,4	script	Yuno Granny	103,{
 	mes "[Granny]";
 	mes "Here you are......... I am an elderly Sage who can forsee everything before it happens.";
 	next;
@@ -119,8 +118,7 @@ yuno.gat,336,227,4	script	Yuno Granny	103,
 }
 
 //========================================================================================
-yuno.gat,329,239,4	script	Yuno Fighter	732,
-{
+yuno.gat,329,239,4	script	Yuno Fighter	732,{
 	mes "[Sergiof]";
 	mes "My name is Sergiof and I am Granny's protector.";
 	next;
@@ -137,8 +135,7 @@ yuno.gat,329,239,4	script	Yuno Fighter	732,
 }
 
 //========================================================================================
-yuno.gat,344,68,4	script	Yuno Tyrant	730,
-{
+yuno.gat,344,68,4	script	Yuno Tyrant	730,{
 	mes "[Ninno]";
 	mes "Have you ever heard of an Egyptian king who was once believed to be the son of a god?";
 	mes "His name was ^5533FF'Pharaoh'^000000";
@@ -173,8 +170,7 @@ yuno.gat,261,98,4	script	Ykla	735,{
 }
 
 //=========================================================================================
-yuno.gat,306,207,6	script	Sage Sykla	735,
-{
+yuno.gat,306,207,6	script	Sage Sykla	735,{
 		mes "[Sykla]";
 		mes "There is talk about a suspicious man living somewhere here in Yuno.";
 		mes "Apparently he is a dangerous person who is immersed in some kind of wicked research.";
@@ -196,8 +192,7 @@ yuno.gat,306,207,6	script	Sage Sykla	735,
 }
 
 //==========================================================================================
-yuno.gat,162,328,4	script	Sage Eskla	735,
-{
+yuno.gat,162,328,4	script	Sage Eskla	735,{
 	mes "[Eskla]";
 	mes "I remember seeing it once........ Yeah... I remember now....... ";
 	mes "There was this piece of paper floating in the air.  I asked myself, 'Hmm... who lost a piece of paper out here?'.";
@@ -288,8 +283,7 @@ yuno.gat,80,150,4	script	Young Woman	746,{
 //===================================================================================================//
 
 //========================================================================	
-yuno_in03.gat,25,39,3	script	Metto	709,
-{
+yuno_in03.gat,25,39,3	script	Metto	709,{
 	mes "[Metto]";
 	if(metto_q == 2 || metto_q == 4 || metto_q == 6) goto L_Check;
 	if(metto_q == 1) goto L_Stang;
@@ -387,8 +381,7 @@ L_Done:
 }
 
 //=====================================================================
-yuno_in01.gat,18,95,5	script	Stangckle	99,
-{
+yuno_in01.gat,18,95,5	script	Stangckle	99,{
 	mes "[Stangckle]";
 	if(metto_q > 2) goto L_Done;
 	if(metto_q == 2) goto L_Start;
@@ -439,8 +432,7 @@ L_Done:
 }
 
 //===================================================================
-yuno_in01.gat,19,182,3	script	Kato	55,
-{
+yuno_in01.gat,19,182,3	script	Kato	55,{
 	mes "[Kato]";
 	if(metto_q > 4) goto L_Done;
 	if(metto_q == 4) goto L_Start;
@@ -482,8 +474,7 @@ L_Done:
 }
 
 //===================================================================
-yuno_in03.gat,179,43,5	script	CiCi	121,
-{
+yuno_in03.gat,179,43,5	script	CiCi	121,{
 	mes "[CiCi]";
 	if(metto_q > 6) goto L_Done;
 	mes "My name is ^5533FFCiCi^000000.  I am one of the ^5533FF3 great scientists^000000 that live in this city.";
@@ -529,8 +520,7 @@ L_Done:
 }
 
 //===================================================================
-yuno_in01.gat,18,30,3	script	Wagan	85,
-{
+yuno_in01.gat,18,30,3	script	Wagan	85,{
 	mes "[Wagan]";
 	if(metto_q > 0) goto L_Check;
 	mes "I'm sure you know that our village has been able to prosper for many years because of the brilliant research done here.";