Standardized header in scripts (part 6)

- Now including GPL-compliant license/copyright info
- Restored some missing copyrights
- Merchants scripts folders

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 62 insertions, 61 deletions

diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 8b3a34420..a3da896cf 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -1,95 +1,90 @@
-//===== Hercules Script ======================================
+//================= Hercules Script =======================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C)  Euphy
+//= Copyright (C)  Kisuka
+//= Copyright (C)  Samuray22
+//= Copyright (C)  L0ne_W0lf
+//= Copyright (C)  erKURITA
+//= Copyright (C)  kobra_k88
+//= Copyright (C)  Playtester
+//= Copyright (C)  Darkchild
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
 //= Inn Npcs
-//===== By: ==================================================
-//= Darkchild (1.1)
-//= Playtester (1.2)
-//===== Current Version: =====================================
-//= 2.9a
-//===== Description: =========================================
+//================= Description ===========================================
 //= Inn Npcs, Save and Heal
-//============================================================
-//= variables:
-//= arg0 - name of npc
-//= arg1 - name of the inn
-//= arg2 - map to save at
-//= arg3, arg4 - x and y cord. to save at
-//= @cost - cost of renting a room
-//===== Additional Comments: =================================
-//= 1.1 Blind Effect By Kobra_k88 (Taken from his old script)
-//= I added it to all of them though [Darkchild]
-//= 1.1a Minor bug fixes and optimizations. Switched from @variables
-//= to arguments.[kobra_k88]
-//= 1.2 Rewrote inn script [Playtester]
-//= 1.3 Added (finally) Rachel Inn Maid. Official warp
-//=     and save points[erKURITA]
-//= 1.4 Added Hugel inn [erKurita]
-//= 1.5 Added "end;" after warping the player. [L0ne_W0lf]
-//=	- Small corrections to the prontera Inns.
-//=	- Removed the Cancel dialog.
-//= 1.6 More fixes, changed progression of "Rest"ing.
-//=	- Corrected Morroc NPCs. [L0ne_W0lf]
-//= 1.7 Corrected Payon NPC. [L0ne_W0lf]
-//= 1.8 Corrected Geffen NPC. [L0ne_W0lf]
-//= 1.9 Added the Inn for Al De baran. [L0ne_W0lf]
-//= 2.0 Added Inn for the Town of Veins. [L0ne_W0lf]
-//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 2.1a Corrected a little Typo error. (bugreport:536 & 537) [Samuray22]
-//= 2.2 Small update to Vein's Inn Master. [L0ne_W0lf]
-//= 2.3 Added Lighthalzen Inn from Lighthalzen town file. [L0ne_W0lf]
-//= 2.4 Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191.
-//= 2.5 Added Moskovia Gostinitsa (Inn) from jA
-//= 2.6 Updated Alberta inn to official. [L0ne_W0lf]
-//= 2.7 Removed Morroc Inns as per episode 12.1. [L0ne_W0lf]
-//= 2.8 Removed Moscovia Inn; Its in quests/quest_moscovia.txt [Kisuka]
-//= 2.9 Added switch menus, updated to match AEGIS scripts. [Kisuka]
-//= 2.9a Added 'npcskill' command. [Euphy]
-//============================================================
-
-
-//========================Prontera ===================================
-// West Side Inn -------------------
+//================= Current Version =======================================
+//= 2.9a
+//=========================================================================
+
+//== Prontera ==============================================
+//- West Side Inn -
 prt_in,244,135,2	script	Inn Employee#Sammy	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130;
 	warp "prt_in",247,104; end;
 }
-// East Side Inn ------------------
+
+//- East Side Inn -
 prt_in,61,141,2	script	Inn Employee#Ahlma	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Ahlma]","Nenkaras","prt_in",64,136;
 	warp "prt_in",60,166; end;
 }
 
-//========================Alberta ====================================
+//== Alberta ===============================================
 alberta_in,32,142,3	script	Inn Employee#Jennie	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Jennie]","'Fisherman Inn'!","alberta_in",26,142;
 	warp "alberta_in",18,188; end;
 }
 
-//======================Geffen ======================================
+//== Geffen ================================================
 geffen_in,70,64,5	script	Inn Employee#Cena	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Cena]","'Ifrit,' the only Inn in the city of Geffen.","geffen_in",70,59;
 	warp "geffen_in",31,31; end;
 }
 
-//=======================Payon ======================================
+//== Payon =================================================
 payon_in01,132,62,5	script	Inn Employee#Ahee	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Ahee]","Payon Inn","payon_in01",136,61;
 	warp "payon_in01",132,11; end;
 }
 
-//========================Morocc ====================================
-// North East --------------------------
+//== Morocc ================================================
+//- North East -
 /*
 morocc_in,147,141,3	script	Inn Employee#Hasna	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Hasna]","Morroc Inn","morocc_in",142,140;
 	warp "morocc_in",173,135; end;
 }
-// South --------------------------------
+
+//- South -
 morocc_in,80,100,5	script	Inn Employee#Manar	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95;
@@ -97,21 +92,21 @@ morocc_in,80,100,5	script	Inn Employee#Manar	1_M_INNKEEPER,{
 }
 */
 
-//======================Aldebaran ===================================
+//== Aldebaran =============================================
 aldeba_in,92,58,5	script	Inn Maid#Rilim	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50;
 	warp "aldeba_in",92,112; end;
 }
 
-//========================Rachel ====================================
+//== Rachel ================================================
 ra_in01,376,69,4	script	Inn Keeper#Annie	4_M_RACHMAN1,{
 
 	callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
 	warp "ra_in01",384,128; end;
 }
 
-//======================Lighthalzen =================================
+//== Lighthalzen ===========================================
 lhz_in02,230,284,4	script	Hotel Employee#01	4_M_04,{
 	mes "[Hotel Employee]";
 	mes "Welcome to";
@@ -156,14 +151,14 @@ lhz_in02,230,284,4	script	Hotel Employee#01	4_M_04,{
 	}
 }
 
-//========================Hugel ====================================
+//== Hugel =================================================
 hu_in01,246,107,3	script	Inn Maid#Receptionist	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
 	warp "hu_in01",267,5; end;
 }
 
-//========================Veins ====================================
+//== Veins =================================================
 ve_in,157,219,5	script	Inn Master#Receptionist	4_M_SEAMAN,{
 	mes "[Inn Master]";
 	mes "Good day~";
@@ -201,7 +196,13 @@ ve_in,157,219,5	script	Inn Master#Receptionist	4_M_SEAMAN,{
 	}
 }
 
-//=======================Inn Function ==============================
+//== Inn Function ==========================================
+// Arguments:
+// 0 - name of npc
+// 1 - name of the inn
+// 2 - map to save at
+// 3 - x coordinate to save at
+// 4 - y coordinate to save at
 function	script	F_InnMaid	{
 	mes getarg(0);
 	mes "Welcome to";