Merge branch 'master' into cell_noskill

26 files changed, 260 insertions, 258 deletions

diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index ed4be5438..ca1c91547 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -9,12 +9,12 @@
 //= 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)  L0ne_W0lf
-//= Copyright (C)  Lupus
-//= Copyright (C)  DZeroX
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Lupus
+//= Copyright (C) DZeroX
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -347,7 +347,7 @@ alberta,190,173,4	script	Phelix	4_M_03,{
 					mes "[Phelix]";
 					mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
 					mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
-					input .@amount;
+					input(.@amount);
 					next;
 					mes "[Phelix]";
 					if (.@amount <= 0) {
@@ -396,10 +396,10 @@ alberta,190,173,4	script	Phelix	4_M_03,{
 				case 2:
 					mes "[Phelix]";
 					mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
-					input .@amount;
+					input(.@amount);
 					next;
 					mes "[Phelix]";
-					if (.@amount == 0) {
+					if (.@amount <= 0) {
 						mes "Alright then, see you next time.";
 						close;
 					}
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index 57d4205df..c6fe6f5ed 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -9,15 +9,15 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  DZeroX
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  massdriller
-//= Copyright (C)  Lupus
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) rAthena Dev Team
+//= Copyright (C) eAthena Dev Team
+//= Copyright (C) DZeroX
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) massdriller
+//= Copyright (C) Lupus
+//= Copyright (C) L0ne_W0lf
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -1200,8 +1200,9 @@ function	script	F_Lottery	{
 	mes "[Kafra]";
 	mes "How many times do you want the Lottery Machine to spin? You can choose up to 5 times.";
 	next;
-	input @input;
-	if(@input < 1 || @input > 5) @input = rand(1,5); //Lupus's fix
+	input(@input);
+	if (@input < 1 || @input > 5)
+		@input = rand(1,5); // Lupus's fix
 	callsub sF_Spin;
 	mes "[Kafra]";
 	mes "Ok~ Let me check the results~ guess what it is?";
@@ -1274,7 +1275,8 @@ sF_Spin:
 		next;
 		@temp = rand(10);
 		--@input;
-		if(@input <= 0) return;
+		if (@input <= 0)
+			return;
 	}
 }
 
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index fd3e66629..31ae513b8 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -9,22 +9,22 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  Euphy
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  Skotlex
-//= Copyright (C)  Nexon
-//= Copyright (C)  Lupus
-//= Copyright (C)  massdriller
-//= Copyright (C)  Darkchild
-//= Copyright (C)  Valaris
-//= Copyright (C)  dj
-//= Copyright (C)  Makenshi
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) rAthena Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) eAthena Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) Skotlex
+//= Copyright (C) Nexon
+//= Copyright (C) Lupus
+//= Copyright (C) massdriller
+//= Copyright (C) Darkchild
+//= Copyright (C) Valaris
+//= Copyright (C) dj
+//= Copyright (C) Makenshi
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 79e3f8c13..2b5fe4446 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -9,14 +9,14 @@
 //= 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)  Lupus
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  ZoDIaC
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Lupus
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) ZoDIaC
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index d60278abd..f960ab23c 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -9,17 +9,17 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  Euphy
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  Nexon
-//= Copyright (C)  massdriller
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) rAthena Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) eAthena Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) Nexon
+//= Copyright (C) massdriller
+//= Copyright (C) Lupus
+//= 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
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index 33ba55ee0..417337165 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -9,14 +9,14 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  DZeroX
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  Lupus
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  Muad_Dib
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) DZeroX
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) Lupus
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) Muad_Dib
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index c16dbfeff..02a7e5547 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -9,15 +9,15 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  DZeroX
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  erKURITA
-//= Copyright (C)  Komurka
-//= Copyright (C)  MasterOfMuppets
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) DZeroX
+//= Copyright (C) Samuray22
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) erKURITA
+//= Copyright (C) Komurka
+//= Copyright (C) MasterOfMuppets
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index 7f299dfa2..c48e69ba1 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -9,17 +9,17 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  DeadlySilence
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Lupus
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Evera
-//= Copyright (C)  Musashiden
-//= Copyright (C)  Silent
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  Nexon
-//= Copyright (C)  massdriller
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) DeadlySilence
+//= Copyright (C) Samuray22
+//= Copyright (C) Lupus
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Evera
+//= Copyright (C) Musashiden
+//= Copyright (C) Silent
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) Nexon
+//= Copyright (C) massdriller
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -274,8 +274,8 @@ OnTouch:
 		mes "them at a time.";
 		next;
 		while(1) {
-			input .@input;
-			if (.@input == 0) {
+			input(.@input);
+			if (.@input <= 0) {
 				mes "[Suspicious Guy]";
 				if (Sex == SEX_MALE)
 					mes "Ah duuuuuude~ You're breakin' my heart! I mean, at these prices, I'm practically performing charity!";
@@ -283,14 +283,14 @@ OnTouch:
 					mes "W-waaaait! You didn't let me tell you the part about how Red Potions help you lose and gain weight in all the right places! Waaaaait!";
 				close;
 			}
-			else if (.@input > 100) {
+			if (.@input > 100) {
 				mes "[Suspicious Guy]";
 				mes "Whoa...";
 				mes "I can't let you buy that many. I mean, it's not like, you know, there's a trace impurity in these Potions or anything like that...";
 				next;
+				continue;
 			}
-			else
-				break;
+			break;
 		}
 		.@Red_potion_hap = .@input * 500;
 		if (Zeny < .@Red_potion_hap) {
@@ -344,8 +344,8 @@ OnTouch:
 		mes "There's no way you can pass this up! Now, how many do you want?";
 		next;
 		while(1) {
-			input .@input;
-			if (.@input == 0) {
+			input(.@input);
+			if (.@input <= 0) {
 				mes "[Suspicious Guy]";
 				mes "Man, how many chances of a lifetime have you passed up? Man, I hope you win the lottery...";
 				mes "You'd probably";
@@ -353,14 +353,14 @@ OnTouch:
 				close;
 
 			}
-			else if (.@input > 100) {
+			if (.@input > 100) {
 				mes "[Suspicious Guy]";
 				mes "Whoa!";
 				mes "I can't sell that many Daggers! That'll attract the Prontera Chiv--I mean, um, I was gonna donate some Daggers to... Hungry children?";
 				next;
+				continue;
 			}
-			else
-				break;
+			break;
 		}
 		.@Main_gauche_hap = .@input * 9400;
 		if (Zeny < .@Main_gauche_hap) {
@@ -398,21 +398,21 @@ OnTouch:
 		mes "Clearly, this is the deal of the century. So how many do you want?";
 		next;
 		while(1) {
-			input .@input;
-			if (.@input == 0) {
+			input(.@input);
+			if (.@input <= 0) {
 				mes "[Suspicious Guy]";
 				mes "Awww...";
 				mes "It wasn't because of the whole drawstrings thing, was it?";
 				close;
 			}
-			else if (.@input > 100) {
+			if (.@input > 100) {
 				mes "[Suspicious Guy]";
 				mes "Whoa~!";
 				mes "I can't sell you that many! What are you trying to do, take advantage of me?";
 				next;
+				continue;
 			}
-			else
-				break;
+			break;
 		}
 		.@Hood__hap = .@input * 930;
 		if (Zeny < .@Hood__hap) {
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index a6d43deaa..8dd65b1ef 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -9,15 +9,15 @@
 //= 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)  L0ne_W0lf
-//= Copyright (C)  x[tsk]
-//= Copyright (C)  Lupus
-//= Copyright (C)  Toms
-//= Copyright (C)  Silent
-//= Copyright (C)  Nexon
-//= Copyright (C)  KarLaeda
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) x[tsk]
+//= Copyright (C) Lupus
+//= Copyright (C) Toms
+//= Copyright (C) Silent
+//= Copyright (C) Nexon
+//= Copyright (C) KarLaeda
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index 6a02a4901..5f90aedee 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -9,16 +9,16 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Kisuka
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  DZeroX
-//= Copyright (C)  SinSloth
-//= Copyright (C)  Playtester
-//= Copyright (C)  Munin
-//= Copyright (C)  erKURITA
-//= Copyright (C)  Poki#3
-//= Copyright (C)  vicious_pucca
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) DZeroX
+//= Copyright (C) SinSloth
+//= Copyright (C) Playtester
+//= Copyright (C) Munin
+//= Copyright (C) erKURITA
+//= Copyright (C) Poki#3
+//= Copyright (C) vicious_pucca
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 7ee10f320..150226d05 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -9,17 +9,17 @@
 //= 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)  Paradox924X
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  Silentdragon
-//= Copyright (C)  Nexon
-//= Copyright (C)  Lupus
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  kobra_k88
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Paradox924X
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) Silentdragon
+//= Copyright (C) Nexon
+//= Copyright (C) Lupus
+//= 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
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 71ec8264f..f9feb6f80 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -9,16 +9,16 @@
 //= 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)  Samuray22
-//= Copyright (C)  Evera
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  Nexon
-//= Copyright (C)  Lupus
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  DNett123
-//= Copyright (C)  jAthena
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Samuray22
+//= Copyright (C) Evera
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) Nexon
+//= Copyright (C) Lupus
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) DNett123
+//= Copyright (C) jAthena
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -880,7 +880,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 				mes "Bartender,";
 				mes "I'm so depressed";
 				mes "because of...";
-				input .@inputstr$;
+				input(.@inputstr$);
 				mes .@inputstr$+"...";
 				next;
 				mes "[Bartender]";
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index 3cbe900c3..9c5f61b58 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -9,20 +9,20 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Gepard
-//= Copyright (C)  $ephiroth
-//= Copyright (C)  SinSloth
-//= Copyright (C)  KarLaeda
-//= Copyright (C)  Lupus
-//= Copyright (C)  Toms
-//= Copyright (C)  Silent
-//= Copyright (C)  Musashiden
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  Alan
-//= Copyright (C)  Au{R}oN
-//= Copyright (C)  erKURITA
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Gepard
+//= Copyright (C) $ephiroth
+//= Copyright (C) SinSloth
+//= Copyright (C) KarLaeda
+//= Copyright (C) Lupus
+//= Copyright (C) Toms
+//= Copyright (C) Silent
+//= Copyright (C) Musashiden
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) Alan
+//= Copyright (C) Au{R}oN
+//= Copyright (C) erKURITA
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -561,16 +561,8 @@ lighthalzen,182,102,3	script	Lucius#zen5	4_M_LGTGRAND,{
 			mes "starving children. If you wish";
 			mes "to cancel, please enter ''0.''";
 			next;
-			input .@input;
-			if (.@input > 30000 || .@input < 0) {
-				mes "[Lucius]";
-				mes "Please enter a value";
-				mes "from 1 to 30,000 in";
-				mes "order to make a donation";
-				mes "to the needy, youngster.";
-				close;
-			}
-			else if (.@input == 0) {
+			input(.@input);
+			if (.@input == 0) {
 				mes "[Lucius]";
 				mes "How disappointing,";
 				mes "but I'm sure you have";
@@ -580,6 +572,14 @@ lighthalzen,182,102,3	script	Lucius#zen5	4_M_LGTGRAND,{
 				mes "to come back at any time.";
 				close;
 			}
+			if (.@input > 30000 || .@input < 1) {
+				mes "[Lucius]";
+				mes "Please enter a value";
+				mes "from 1 to 30,000 in";
+				mes "order to make a donation";
+				mes "to the needy, youngster.";
+				close;
+			}
 			mes "[Lucius]";
 			mes "Thank you so much";
 			mes "for your " + .@input + " zeny donation.";
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index b4cfcb8ea..9dae2f03e 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -9,21 +9,21 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  Euphy
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  Celest
-//= Copyright (C)  Dino9021
-//= Copyright (C)  Mass Zero
-//= Copyright (C)  SinSloth
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  Nexon
-//= Copyright (C)  Lupus
-//= Copyright (C)  Vidar
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) rAthena Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) eAthena Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) Celest
+//= Copyright (C) Dino9021
+//= Copyright (C) Mass Zero
+//= Copyright (C) SinSloth
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) Nexon
+//= Copyright (C) Lupus
+//= Copyright (C) Vidar
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt
index 9f57cc2dc..3c0270dd6 100644
--- a/npc/cities/lutie.txt
+++ b/npc/cities/lutie.txt
@@ -9,14 +9,14 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  Kisuka
-//= Copyright (C)  DZeroX
-//= Copyright (C)  Nexon
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) rAthena Dev Team
+//= Copyright (C) eAthena Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) DZeroX
+//= Copyright (C) Nexon
+//= Copyright (C) Lupus
+//= 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
diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt
index db096a6bb..b70027d79 100644
--- a/npc/cities/manuk.txt
+++ b/npc/cities/manuk.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index e4400e7af..242a9f9cc 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -9,14 +9,14 @@
 //= 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
+//= Copyright (C) 2012-2020 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
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index c0029a91d..8bd4e3774 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -9,9 +9,9 @@
 //= 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) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Kisuka
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 92e57f434..603c8cbbd 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -9,17 +9,17 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  Vicious_Pucca
-//= Copyright (C)  Nexon
-//= Copyright (C)  Lupus
-//= Copyright (C)  Celest
-//= Copyright (C)  PKGINGO
-//= Copyright (C)  Dizzy
-//= Copyright (C)  Fyrien
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) Vicious_Pucca
+//= Copyright (C) Nexon
+//= Copyright (C) Lupus
+//= Copyright (C) Celest
+//= Copyright (C) PKGINGO
+//= Copyright (C) Dizzy
+//= Copyright (C) Fyrien
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 132ce7331..1d95c7565 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -9,16 +9,16 @@
 //= 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)  Evera
-//= Copyright (C)  Silent
-//= Copyright (C)  Nexon
-//= Copyright (C)  Lupus
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  DracoRPG
-//= Copyright (C)  Darkchild
-//= Copyright (C)  Muad Dib
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Evera
+//= Copyright (C) Silent
+//= Copyright (C) Nexon
+//= Copyright (C) Lupus
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) DracoRPG
+//= Copyright (C) Darkchild
+//= Copyright (C) Muad Dib
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index bbe6716e7..feff36c6f 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -9,13 +9,13 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Silent
-//= Copyright (C)  MasterOfMuppets
-//= Copyright (C)  massdriller
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Silent
+//= Copyright (C) MasterOfMuppets
+//= Copyright (C) massdriller
+//= Copyright (C) Lupus
+//= 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
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index 2fbb92f05..82716045d 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -9,12 +9,12 @@
 //= 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)  Lupus
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Harp
-//= Copyright (C)  Tsuyuki
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Lupus
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Harp
+//= Copyright (C) Tsuyuki
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt
index d49f50ada..858edc42f 100644
--- a/npc/cities/splendide.txt
+++ b/npc/cities/splendide.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index a8127c372..2dbaafed8 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -9,17 +9,17 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Toms
-//= Copyright (C)  Evera
-//= Copyright (C)  Lance
-//= Copyright (C)  massdriller
-//= Copyright (C)  Lupus
-//= Copyright (C)  Darkchild
-//= Copyright (C)  Muad Dib
-//= Copyright (C)  Fusion Dev Team
-//= Copyright (C)  jAthena
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Toms
+//= Copyright (C) Evera
+//= Copyright (C) Lance
+//= Copyright (C) massdriller
+//= Copyright (C) Lupus
+//= Copyright (C) Darkchild
+//= Copyright (C) Muad Dib
+//= Copyright (C) Fusion Dev Team
+//= Copyright (C) jAthena
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/veins.txt b/npc/cities/veins.txt
index 5323a2af5..26e52b77e 100644
--- a/npc/cities/veins.txt
+++ b/npc/cities/veins.txt
@@ -9,10 +9,10 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Kisuka
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Muad_Dib
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Muad_Dib
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index 944f5e9ae..17f585f74 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -9,13 +9,13 @@
 //= 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)  Samuray22
-//= Copyright (C)  massdriller
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  kobra_k88
-//= Copyright (C)  KitsuneStarwind
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Samuray22
+//= Copyright (C) massdriller
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) kobra_k88
+//= Copyright (C) KitsuneStarwind
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by