Merge pull request #876 from MishimaHaruna/gpl

GPL Headers

1 files changed, 41 insertions, 31 deletions

diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 70b652508..a8008ffad 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -1,32 +1,44 @@
-//===== 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)  Lupus
+//= Copyright (C)  Silent
+//= Copyright (C)  Vicious_Pucca
+//= Copyright (C)  MasterOfMuppets
+//= Copyright (C)  Nexon
+//= Copyright (C)  L0ne_W0lf
+//= Copyright (C)  kobra_k88
+//=
+//= 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/>.
+//=========================================================================
 //= Morroc Town
-//===== By: ==================================================
-//= kobra_k88; L0ne_W0lf
-//===== Current Version: =====================================
-//= 2.2
-//===== Description: =========================================
-//= [Official Conversion]
+//================= Description ===========================================
 //= Morroc Town NPCs
-//===== Additional Comments: =================================
-//= Fully working
-//= Fixed Lapidary sprite, Implemented ANTHELL trigger
-//= (in both NPC/Warps) [Lupus]. Removed it from NPC and put in Warp
-//= 1.3 Removed some NPC due to Assassin Job Quest [kobra_k88]
-//= 1.3b mobs name corrected [Lupus], 1.3c - Adv classes support
-//= 1.4 Fixed typos [Nexon]
-//= 1.5 Added a lvl 4 weapon quest related NPC [MasterOfMuppets]
-//= 1.6 Added Bartender NPC, made by Persian69 [Vicious_Pucca]
-//= 1.7 Removed Duplicates [Silent]
-//= 1.8 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
-//= 1.9 Removed duplicate NPC, changed temp char vars to temp npc. [L0ne_W0;f]
-//= 2.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
-//= 2.0a Fixed outdated info about Milk [Lupus]
-//= 2.1 Updated/Added NPCs for episode 12.1. [L0ne_W0lf]
-//= 2.2 Removed duplicate bartender NPC. (bugreport:4555) [L0ne_W0lf]
-//============================================================
+//================= Current Version =======================================
+//= 2.2
+//=========================================================================
 
-// Morroc
-//============================================================
+//== Morroc ================================================
 morocc,150,120,5	script	Soldier - Morroc#01::MocSoldier	4_M_MOC_SOLDIER,3,3,{
 	mes "[Morroc Soldier]";
 	mes "Hey, you! Stop there.";
@@ -711,9 +723,8 @@ moc_fild16,211,254,4	script	Assassin#07rhea_30	2_M_THIEFMASTER,{
 	}
 }
 
-// Other NPCs
-//============================================================
-//Bartender
+//== Other NPCs ============================================
+//- Bartender -
 /*
 morocc_in,166,76,3	script	Bartender#02	1_ETC_01,{
 	mes "[Bartender]";
@@ -754,8 +765,7 @@ morocc_in,166,76,3	script	Bartender#02	1_ETC_01,{
 }
 */
 
-// Assassin Guild Guards
-//===================================================
+//== Assassin Guild Guards =================================
 moc_fild16,195,281,4	script	Assassin Guardian#1::SinGuard	4_M_MOC_SOLDIER,{
 	mes "[Assassin Guardian]";
 	if(BaseJob == Job_Assassin) {