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

2 files changed, 21 insertions, 42 deletions

diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt
index 634337abf..d0910627b 100644
--- a/npc/other/msg_boards.txt
+++ b/npc/other/msg_boards.txt
@@ -18,16 +18,14 @@
 // 				Al De Baran				//
 //=======================================================================//
 / Welcome Sign ------------------------------------------------
-aldebaran.gat,133,104,1	script	Welcome Sign	111,
-{
+aldebaran.gat,133,104,1	script	Welcome Sign	111,{
   mes "~sign reads....~";
   mes "Hello and enjoy your visit to Aldebaran! Aldebaran is the mystical city of clocks and Kafras!";
   close;
 }
 
 // Kafra Corp. Main Office Sign ---------------------------------------------------------------
-aldebaran.gat,53,223,1	script	Kafra Corp. Main Office	111,
-{
+aldebaran.gat,53,223,1	script	Kafra Corp. Main Office	111,{
   mes "~sign reads...~";
   mes "This is the Kafra Services Main Office, home to the lovely Kafra employees.";
   close;
@@ -38,24 +36,21 @@ aldebaran.gat,53,223,1	script	Kafra Corp. Main Office	111,
 // 				Alberta					//
 //=======================================================================//
 // Sign: Alberta Harbor -----------------------------------------------
-alberta.gat,35,241,1	script	Alberta Harbor	111,
-{
+alberta.gat,35,241,1	script	Alberta Harbor	111,{
   mes "~sign reads....~";
   mes "Welcome to the port city Alberta! Alberta is the city of the sea! A tourist delight!";
   close;
 }
 
 // Welcome Sign -----------------------------------------------
-alberta.gat,196,152,1	script	Welcome Sign	111,
-{
+alberta.gat,196,152,1	script	Welcome Sign	111,{
   mes "~sign reads...~";
   mes "Welcome to the port city Alberta! Alberta is the city of the sea! A tourist delight!";
   close;
 }
 
 // Sign: Merchant Guild ------------------------------------------
-alberta.gat,37,39,1	script	Merchant Guild	111,
-{
+alberta.gat,37,39,1	script	Merchant Guild	111,{
   mes "~sign reads...~";
   mes "Enjoy the art of buying and selling?  Love making unbeatable deals?";
   mes "Then the Alberta Merchant Guild is perfect for you!";
@@ -68,48 +63,42 @@ alberta.gat,37,39,1	script	Merchant Guild	111,
 // 				Geffen					//
 //=======================================================================//
 // Welcome Sign ----------------------------------------------
-geffen.gat,116,58,1	script	Welcome Sign	111,
-{
+geffen.gat,116,58,1	script	Welcome Sign	111,{
   mes "~sign reads...~";
   mes "Greetings!! You are in the wonderfull city of Geffen! Geffen is the city of Magic and home to Mages and Wizards!.";
   close;
 }
 
 // Sign: Restaurant Inn ---------------------------------------------
-geffen.gat,167,175,1	script	Geffen Restaurant Inn	111,
-{
+geffen.gat,167,175,1	script	Geffen Restaurant Inn	111,{
   mes "~sign reads..... ~";
   mes "Welcome weary travelers!  Have a hot meal and stay the night at the the Geffen Restaurant Inn!";
   close;
 }
 
 // Sign: Mage Association ---------------------------------------
-geffen.gat,61,174,1	script	Mage Association	111,
-{
+geffen.gat,61,174,1	script	Mage Association	111,{
   mes "~sign reads...~";
   mes "Greetings!! This is the Geffen Magic Academy.  Come in if you have an interest in all things magic!";
   close;
 }
 
 // Sign: Geffen Tower Sign ----------------------------------------------
-geffen.gat,113,104,1	script	Geffen Tower	111,
-{
+geffen.gat,113,104,1	script	Geffen Tower	111,{
   mes "~sign reads...~";
   mes "This is the Geffen Tower, home to the Wizard Academey as well as the infamous Geffen Dungeon.  Novices beware!!!";
   close;
 }
 
 // Sign: Blacksmith Guild -------------------------------------------
-geffen.gat,184,61,1	script	Blacksmith Guild	111,
-{
+geffen.gat,184,61,1	script	Blacksmith Guild	111,{
   mes "~sign reads...~";
   mes "This is the Blacksmith Guild.";
   close;
 }
 
 // Sign Post -----------------------------------------------------------
-geffen.gat,119,190,0	script	Sign Post	111,
-{
+geffen.gat,119,190,0	script	Sign Post	111,{
   mes "~sign reads...~";
   mes "North to Geffen Fields";
   mes "NorthEast to Al De Baran";
@@ -128,16 +117,14 @@ geffen.gat,119,190,0	script	Sign Post	111,
 // 				Morroc					//
 //=======================================================================//
 // Welcome Sign ---------------------------------------------------
-morocc.gat,168,264,1	script	Welcome Sign	111,
-{
+morocc.gat,168,264,1	script	Welcome Sign	111,{
  mes "~sign reads...~";
  mes "Morocc welcomes you! Morocc is the city of the desert and home to Thieves, Assassins, and alls sorts of Egyption temptations!";
  close;
 }
 
 // Sign: Inn ----------------------------------------------------------
-morocc.gat,272,272,1	script	Morroc Town Inn	111,
-{
+morocc.gat,272,272,1	script	Morroc Town Inn	111,{
   mes "~sign reads....~";
   mes "Welcome weary travelers!  Stay the night at the Morroc Town Inn.";
   close;
@@ -154,16 +141,14 @@ morocc.gat,272,272,1	script	Morroc Town Inn	111,
 // 				Prontera					//
 //=======================================================================//
 // Welcome Sign -----------------------------------------------------------
-prontera.gat,156,197,1	script	Welcome Sign	111,
-{
+prontera.gat,156,197,1	script	Welcome Sign	111,{
   mes"~sign reads...~";
   mes "You've found yourself in the great city of Prontera! Prontera is one of the largest cities in Rune-Midgard and is home to the Prontera Chivalry!";
   close;
 }
 
 // Sign Post ----------------------------------------------------------------
-prontera.gat,158,213,1	script	Sign Post	111,
-{
+prontera.gat,158,213,1	script	Sign Post	111,{
 	mes "~ the sign post reads ~";
 	mes "North to Prontera Castle";
 	mes "Farther North to Al De Baran";
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index b4d2fe583..c29d1f3d2 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -22,32 +22,27 @@
 //==========================================================================
 
 // Alberta -----------------------------------------
-alberta_in.gat, 22, 146,4	script	PvP Narrator#1	84,
-{
+alberta_in.gat, 22, 146,4	script	PvP Narrator#1	84,{
 	callfunc "F_PvPNarr", "alberta_in.gat", 24, 143;
 	end;
 }
 // Payon -------------------------------------
-payon_in01.gat,173,109,3	script	PvP Narrator#2	84,
-{
+payon_in01.gat,173,109,3	script	PvP Narrator#2	84,{
 	callfunc "F_PvPNarr", "payon_in01.gat", 169, 108;
 	end;
 }
 // Prontera -------------------------------------
-prt_in.gat,56,140,4	script	PvP Narrator#3	84,
-{
+prt_in.gat,56,140,4	script	PvP Narrator#3	84,{
 	callfunc "F_PvPNarr", "prt_in.gat", 54, 137;
 	end;
 }
 // Morocc --------------------------------------
-morocc_in.gat,144,138,4	script	PvP Narrator#4	84,
-{
+morocc_in.gat,144,138,4	script	PvP Narrator#4	84,{
 	callfunc "F_PvPNarr", "morocc_in.gat", 141, 140;
 	end;
 }
 // Geffen --------------------------------------
-geffen_in.gat, 67,63,4	script	PvP Narrator#5	84,
-{
+geffen_in.gat, 67,63,4	script	PvP Narrator#5	84,{
 	callfunc "F_PvPNarr", "geffen_in.gat", 64, 60;
 	end;
 }
@@ -134,8 +129,7 @@ function	script	F_PvPNarr	{
 //==========================================================================
 
 // Alberta -----------------------------------
-alberta_in.gat, 26,146,4	script	Gate Keeper#1::GateKeep	83,
-{
+alberta_in.gat, 26,146,4	script	Gate Keeper#1::GateKeep	83,{
 	mes "[Gate Keeper]";
 	mes "Hi.  I'm glad to be of service.  I will open the PvP fight square for you!";
 	mes "If you have any questions about the PvP modes or rules, please ask the Narrator.....";