Merge branch 'master' into cell_noskill

33 files changed, 589 insertions, 399 deletions

diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index 1369a209b..5c13d3de9 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -9,18 +9,18 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Samuray22
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  SinSloth
-//= Copyright (C)  ultramage
-//= Copyright (C)  Playtester
-//= Copyright (C)  KarLaeda
-//= Copyright (C)  CBMaster
-//= Copyright (C)  Lupus
-//= Copyright (C)  Kisuka
-//= Copyright (C)  erKURITA
-//= Copyright (C)  RockmanEXE
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Samuray22
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) SinSloth
+//= Copyright (C) ultramage
+//= Copyright (C) Playtester
+//= Copyright (C) KarLaeda
+//= Copyright (C) CBMaster
+//= Copyright (C) Lupus
+//= Copyright (C) Kisuka
+//= Copyright (C) erKURITA
+//= Copyright (C) RockmanEXE
 //=
 //= 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/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index 762f94b4b..a1a0cc690 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.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)  SinSloth
-//= Copyright (C)  Playtester
-//= Copyright (C)  Lupus
-//= Copyright (C)  Kisuka
-//= Copyright (C)  Legionaire
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) SinSloth
+//= Copyright (C) Playtester
+//= Copyright (C) Lupus
+//= Copyright (C) Kisuka
+//= Copyright (C) Legionaire
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -93,9 +93,9 @@ alberta,30,65,3	script	Akagi	4_M_JOB_ASSASSIN,{
 	}
 }
 
-que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
+que_ng,30,65,3	script	Kuuga Gai#nq	4_M_JOB_ASSASSIN,{
 	if (Upper == 2) {
-		mes "[Cougar]";
+		mes "[Kuuga Gai]";
 		mes "I... I've never";
 		mes "seen a baby as";
 		mes "powerful as you!";
@@ -105,7 +105,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 	}
 	if (Class == Job_Novice) {
 		if (JobLevel < 10) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Hm? Have you come to";
 			mes "learn how to be a Ninja?";
 			mes "You're not quite experienced";
@@ -119,7 +119,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "Excuse me.";
 			mes "H-hello?";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "...............................";
 			mes "How did you do that?";
 			next;
@@ -127,7 +127,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "Do what? I didn't";
 			mes "do anything, I don't think...";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "H-How are you able to";
 			mes "see me? I'm supposed to";
 			mes "be invisible to the naked eye.";
@@ -140,7 +140,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "Calm down, there's no";
 			mes "need to get violent!";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "What...?";
 			mes "How did you dodge";
 			mes "all of my attacks?";
@@ -153,7 +153,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "to change my job";
 			mes "to a Ninja.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "...Oh. Is that all?";
 			mes "Hmm, you've got great";
 			mes "potential, but I can't help";
@@ -161,14 +161,14 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "enemies, and I can't let my";
 			mes "guard down for even a second.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "That Wildcat Joe is";
 			mes "completely ruthless...!";
 			mes "He could strike at any time!";
 			mes "He'll do anything to achieve";
 			mes "victory over his enemies!";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Wait, wait, I just";
 			mes "thought of something.";
 			mes "Maybe you can help me out.";
@@ -177,7 +177,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "really want to be a Ninja.";
 			next;
 			if(select("Sure.", "No, thanks.") == 2) {
-				mes "[Cougar]";
+				mes "[Kuuga Gai]";
 				mes "Hm? Well, alright.";
 				mes "Still, I don't see";
 				mes "why we can't help";
@@ -185,7 +185,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 				mes "little predicament...";
 				close;
 			}
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Great! Now, I wanted to";
 			mes "ask Wildcat Joe if he'd";
 			mes "agree to a temporary truce.";
@@ -193,7 +193,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "are out of weapons, so we";
 			mes "should get well equipped first.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Please take this letter,";
 			mes "and deliver it to Wildcat";
 			mes "Joe in Einbroch. He's a master";
@@ -201,7 +201,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "eye out for him. Ah, and look";
 			mes "for him in a high place.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Yeah, Wildcat Joe";
 			mes "always did have a thing";
 			mes "for hiding in high places.";
@@ -213,7 +213,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			close;
 		}
 		else if (NINJ_Q == 1) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Even if this task";
 			mes "isn't that urgent,";
 			mes "please hurry over to";
@@ -222,7 +222,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			close;
 		}
 		else if (NINJ_Q == 2) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Did you deliver that";
 			mes "letter to Wildcat Joe?";
 			mes "I still need to know his";
@@ -232,14 +232,14 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			close;
 		}
 		else if (NINJ_Q == 3) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Ah, you've returned.";
 			mes "So did Wildcat Joe send";
 			mes "you back here with his";
 			mes "response? Great, great,";
 			mes "please let me read it.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "What...?! How could he";
 			mes "reject my proposal for";
 			mes "a truce?! This can only";
@@ -247,14 +247,14 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "Kunai. Nuts! I have to catch";
 			mes "up to him, or I'm a goner!";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Listen, you've got to help";
 			mes "me out again! I need you to";
 			mes "gather some materials so that";
 			mes "I can craft my own Kunai to fight Wildcat Joe. Then, I'll go ahead";
 			mes "and change your job to a Ninja.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "All you need";
 			mes "to bring me is";
 			mes "^3355FF5 Cyfars^000000 and";
@@ -268,7 +268,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "asked me to gather";
 			mes "those same materials.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Curses! Then that means...";
 			mes "You actually helped Joe";
 			mes "in crafting his Kunai! No!";
@@ -281,7 +281,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 		}
 		else if (NINJ_Q == 4) {
 			if (countitem(Cyfar) < 5 || countitem(Phracon) < 1) {
-				mes "[Cougar]";
+				mes "[Kuuga Gai]";
 				mes "Hurry and bring";
 				mes "^3355FF5 Cyfars^000000 and";
 				mes "^3355FF1 Phracon^000000 to me,";
@@ -291,7 +291,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 				close;
 			}
 			if (SkillPoint != 0) {
-				mes "[Cougar]";
+				mes "[Kuuga Gai]";
 				mes "Whoa, whoa...";
 				mes "You still have some";
 				mes "leftover Skill Points.";
@@ -300,7 +300,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 				mes "change jobs, right?";
 				close;
 			}
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Ah, you're back with";
 			mes "everything that I need.";
 			mes "You've come earlier than";
@@ -308,14 +308,14 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "as promised, I'll turn";
 			mes "you into a Ninja.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Let me formally introduce";
-			mes "myself. I am High Ninja Cougar";
+			mes "myself. I am High Ninja Kuuga Gai";
 			mes "in the Touga Ninja Corps, and";
 			mes "I'm in charge of the search";
 			mes "party to find Sir Kazma.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Sir Kazma is the chief";
 			mes "of my village, but he's";
 			mes "run away. This has resulted";
@@ -323,7 +323,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "the Ninja Corps. Things are";
 			mes "pretty unstable right now...";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "I initially didn't want to";
 			mes "accept you as a Ninja because";
 			mes "of this complicated situation.";
@@ -331,14 +331,14 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "you're truly worthy of joining";
 			mes "the Ninja ranks.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "According to his letter, even";
 			mes "Joe thinks highly of you. Just";
 			mes "remember that, as a Ninja, your";
 			mes "mission is your highest priority. But don't let mission objectives";
 			mes "supercede your conscience.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "''Secrecy above all else.''";
 			mes "To keep our secrets in the";
 			mes "shadows, you can only buy";
@@ -346,7 +346,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "authorized dealers. Please";
 			mes "keep that in mind.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "As of today, you are";
 			mes "now a proud member of the";
 			mes "Touga Ninja Corps. Be as";
@@ -361,7 +361,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			close;
 		}
 		else {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "How have you been?";
 			mes "Train hard: you want";
 			mes "to be able to vanish";
@@ -372,7 +372,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 		}
 	} else {
 		if (BaseClass == Job_Ninja) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "How have you been?";
 			mes "Train hard: you want";
 			mes "to be able to vanish";
@@ -381,7 +381,7 @@ que_ng,30,65,3	script	Cougar#nq	4_M_JOB_ASSASSIN,{
 			mes "the respect of any Ninja~";
 			close;
 		} else {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "What...?";
 			mes "How were you able";
 			mes "to find me hidden";
@@ -478,7 +478,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		mes "?????!!";
 		next;
 		mes "[Suspicious Man]";
-		mes "Why? Didn't you bring Cougar's letter for me?";
+		mes "Why? Didn't you bring Kuuga Gai's letter for me?";
 		next;
 		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Are you...";
@@ -487,7 +487,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		mes "[Suspicious Man]";
 		mes "...Yes, but I prefer to";
 		mes "be called Red Leopard Joe.";
-		mes "Cougar sent you to me, right?";
+		mes "Kuuga Gai sent you to me, right?";
 		mes "He's the only one who calls";
 		mes "me that. So you want to be";
 		mes "a Ninja, eh? Hmm, alright.";
@@ -513,7 +513,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		mes "[Red Leopard Joe]";
 		mes "For now, let me read";
 		mes "this letter. Let's see...";
-		mes "Hm. I thought that Cougar";
+		mes "Hm. I thought that Kuuga Gai";
 		mes "would want to challenge me";
 		mes "again, but he actually wants";
 		mes "a temporary truce? Hah!";
@@ -540,7 +540,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		mes "[Red Leopard Joe]";
 		mes "Here you go.";
 		mes "Please bring this";
-		mes "letter to Cougar.";
+		mes "letter to Kuuga Gai.";
 		mes "It'll take a while to";
 		mes "return to Amatsu, so let";
 		mes "me send you there directly...";
@@ -557,7 +557,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 		mes "Eh? I'm not sure what";
 		mes "happened, but it seems";
 		mes "that you haven't delivered";
-		mes "my response to Cougar yet.";
+		mes "my response to Kuuga Gai yet.";
 		mes "Shall I directly send you";
 		mes "to Amatsu right now?";
 		next;
@@ -577,7 +577,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	4_M_SITDOWN,{
 	}
 	else if (NINJ_Q == 4) {
 		mes "[Red Leopard Joe]";
-		mes "Cougar asked you to";
+		mes "Kuuga Gai asked you to";
 		mes "gather some materials";
 		mes "too? Oh well, I suppose";
 		mes "that I can't blame him.";
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 80f3ba0ea..95e2e12f1 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -9,11 +9,11 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2016  Hercules Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Kisuka
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Tsuyuki
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Kisuka
+//= Copyright (C) Samuray22
+//= 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/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index fcc1c4c98..c6bdfc6be 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.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)  Euphy
-//= Copyright (C)  JayPee
-//= Copyright (C)  Kisuka
-//= Copyright (C)  brianluau
-//= Copyright (C)  Zephyrus
-//= Copyright (C)  Zephyrus_cr
-//= Copyright (C)  Samuray22
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Toms
-//= Copyright (C)  Silent
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Pgro Team (OwNaGe)
-//= Copyright (C)  kobra_k88
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) JayPee
+//= Copyright (C) Kisuka
+//= Copyright (C) brianluau
+//= Copyright (C) Zephyrus
+//= Copyright (C) Zephyrus_cr
+//= Copyright (C) Samuray22
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Toms
+//= Copyright (C) Silent
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Pgro Team (OwNaGe)
+//= 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/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 8b1c9e9d3..c87a43c5c 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.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)  Euphy
-//= Copyright (C)  Kisuka
-//= Copyright (C)  Yommy
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Silent
-//= Copyright (C)  Vicious
-//= Copyright (C)  Poki#3
-//= Copyright (C)  celest
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
-//= Copyright (C)  Komurka
-//= Copyright (C)  yoshiki
-//= Copyright (C)  EREMES THE CANIVALIZER(Aegis)
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Kisuka
+//= Copyright (C) Yommy
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Silent
+//= Copyright (C) Vicious
+//= Copyright (C) Poki#3
+//= Copyright (C) celest
+//= Copyright (C) Lupus
+//= Copyright (C) kobra_k88
+//= Copyright (C) Komurka
+//= Copyright (C) yoshiki
+//= Copyright (C) EREMES THE CANIVALIZER(Aegis)
 //=
 //= 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/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 76b3c4b39..4ee344a7b 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.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)  Vali
-//= Copyright (C)  Kisuka
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Samuray22
-//= Copyright (C)  FlavioJS
-//= Copyright (C)  Silent
-//= Copyright (C)  Vicious
-//= Copyright (C)  Poki#3
-//= Copyright (C)  celest
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
-//= Copyright (C)  yoshiki
-//= Copyright (C)  EREMES THE CANIVALIZER (Aegis)
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vali
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Samuray22
+//= Copyright (C) FlavioJS
+//= Copyright (C) Silent
+//= Copyright (C) Vicious
+//= Copyright (C) Poki#3
+//= Copyright (C) celest
+//= Copyright (C) Lupus
+//= Copyright (C) kobra_k88
+//= Copyright (C) yoshiki
+//= Copyright (C) EREMES THE CANIVALIZER (Aegis)
 //=
 //= 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/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index f75d0ea46..51d052fd5 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.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)  Joseph
-//= Copyright (C)  Euphy
-//= Copyright (C)  Vali
-//= Copyright (C)  Kisuka
-//= Copyright (C)  Samuray22
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
-//= Copyright (C)  PGRO TEAM (Aegis)
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Joseph
+//= Copyright (C) Euphy
+//= Copyright (C) Vali
+//= Copyright (C) Kisuka
+//= Copyright (C) Samuray22
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) kobra_k88
+//= Copyright (C) PGRO TEAM (Aegis)
 //=
 //= 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/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index fa33215d6..2f544e78a 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.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)  Kisuka
-//= Copyright (C)  Samuray22
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  KarLaeda
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
-//= Copyright (C)  Pgro Team (OwNaGe)(Aegis)
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) Samuray22
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) KarLaeda
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) kobra_k88
+//= Copyright (C) Pgro Team (OwNaGe)(Aegis)
 //=
 //= 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/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 08f2177d4..3814e1880 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -9,19 +9,19 @@
 //= 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)  Vali
-//= Copyright (C)  Kisuka
-//= Copyright (C)  SoulBlaker
-//= Copyright (C)  Yommy
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Zairik
-//= Copyright (C)  Vicious
-//= Copyright (C)  Silentdragon
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
-//= Copyright (C)  yoshiki
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Vali
+//= Copyright (C) Kisuka
+//= Copyright (C) SoulBlaker
+//= Copyright (C) Yommy
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Zairik
+//= Copyright (C) Vicious
+//= Copyright (C) Silentdragon
+//= Copyright (C) Lupus
+//= Copyright (C) kobra_k88
+//= Copyright (C) yoshiki
 //=
 //= 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/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index deb940dd2..6030f0372 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index 1b53a8732..359323b20 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 511d620f4..48e9d1b7c 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt
index da60caa92..04925806a 100644
--- a/npc/jobs/2-1a/LordKnight.txt
+++ b/npc/jobs/2-1a/LordKnight.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index f026ad30f..1a99dc48e 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index d8166cbab..512e39826 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index 9963eaf48..7a9c54afc 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.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)  Kisuka
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Lupus
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Celestria
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Lupus
+//= Copyright (C) Samuray22
+//= Copyright (C) Celestria
 //=
 //= 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/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 634e0753b..4111c2d6a 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -9,14 +9,14 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2016  Hercules Dev Team
-//= Copyright (C)  Kisuka
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
-//= Copyright (C)  Darkchild
-//= Copyright (C)  nestor_zulueta (Fusion)
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) kobra_k88
+//= Copyright (C) Darkchild
+//= Copyright (C) nestor_zulueta (Fusion)
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -567,33 +567,39 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 			mes "[Raspuchin Gregory]";
 			mes "12 + 23 + 34 + 45 = ?";
 			next;
-			input .@input;
-			if (.@input != 114) .@w_point += 1;
+			input(.@input);
+			if (.@input != 114)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "1000 - 36 - 227 - 348 = ?";
 			next;
-			input .@input;
-			if (.@input != 389) .@w_point += 1;
+			input(.@input);
+			if (.@input != 389)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "14 * 17 * 3 = ?";
 			next;
-			input .@input;
-			if (.@input != 714) .@w_point += 1;
+			input(.@input);
+			if (.@input != 714)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "9765 / 3 / 5 / 7 = ?";
 			next;
-			input .@input;
-			if (.@input != 93) .@w_point += 1;
+			input(.@input);
+			if (.@input != 93)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "(47 * 28) - (1376 / 4) = ?";
 			next;
-			input .@input;
-			if (.@input != 972) .@w_point += 1;
+			input(.@input);
+			if (.@input != 972)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "(2646 / 7) + (13 * 28) = ?";
 			next;
-			input .@input;
-			if (.@input != 742) .@w_point += 1;
+			input(.@input);
+			if (.@input != 742)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("How much do\r"
 				"12 %s,\r"
@@ -604,8 +610,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Wing_Of_Butterfly),
 				getitemname(Wing_Of_Fly));
 			next;
-			input .@input;
-			if (.@input != 909) .@w_point += 1;
+			input(.@input);
+			if (.@input != 909)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("What is the\r"
 				"total weight of\r"
@@ -615,8 +622,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Helm),
 				getitemname(Coat));
 			next;
-			input .@input;
-			if (.@input != 450) .@w_point += 1;
+			input(.@input);
+			if (.@input != 450)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("What is the\r"
 				"total defense of\r"
@@ -632,8 +640,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Boots),
 				getitemname(Ear_Mufs));
 			next;
-			input .@input;
-			if (.@input != 20) .@w_point += 1;
+			input(.@input);
+			if (.@input != 20)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("If you buy 5 %s\r"
 				"with a 24%% discount\r"
@@ -642,45 +651,53 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				"do you earn?",
 				getitemname(Helm));
 			next;
-			input .@input;
-			if (.@input != 8800) .@w_point += 1;
+			input(.@input);
+			if (.@input != 8800)
+				.@w_point += 1;
 			break;
 		case 2:
 			mes "[Raspuchin Gregory]";
 			mes "13 + 25 + 37 + 48 = ?";
 			next;
-			input .@input;
-			if (.@input != 123) .@w_point += 1;
+			input(.@input);
+			if (.@input != 123)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "1000 - 58 - 214 - 416 = ?";
 			next;
-			input .@input;
-			if (.@input != 312) .@w_point += 1;
+			input(.@input);
+			if (.@input != 312)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "12 * 24 * 3 = ?";
 			next;
-			input .@input;
-			if (.@input != 864) .@w_point += 1;
+			input(.@input);
+			if (.@input != 864)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "10530 / 3 / 5 / 2 = ?";
 			next;
-			input .@input;
-			if (.@input != 351) .@w_point += 1;
+			input(.@input);
+			if (.@input != 351)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "(35 * 19) - (1792 / 7) = ?";
 			next;
-			input .@input;
-			if (.@input != 409) .@w_point += 1;
+			input(.@input);
+			if (.@input != 409)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "(2368 / 8) + (24 * 17) = ?";
 			next;
-			input .@input;
-			if (.@input != 704) .@w_point += 1;
+			input(.@input);
+			if (.@input != 704)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "(2646 / 7) + (13 * 28) = ?";
 			next;
-			input .@input;
-			if (.@input != 742) .@w_point += 1;
+			input(.@input);
+			if (.@input != 742)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("What is the\r"
 				"total price of\r"
@@ -692,8 +709,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Spectacles),
 				getitemname(Booby_Trap));
 			next;
-			input .@input;
-			if (.@input != 934) .@w_point += 1;
+			input(.@input);
+			if (.@input != 934)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("What is the\r"
 				"total weight of\r"
@@ -703,8 +721,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Cap),
 				getitemname(Boots));
 			next;
-			input .@input;
-			if (.@input != 550) .@w_point += 1;
+			input(.@input);
+			if (.@input != 550)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("What is the\r"
 				"total defense of\r"
@@ -720,8 +739,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Sahkkat),
 				getitemname(Glasses));
 			next;
-			input .@input;
-			if (.@input != 16) .@w_point += 1;
+			input(.@input);
+			if (.@input != 16)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("How much profit do you\r"
 				"make if you buy %s\r"
@@ -730,40 +750,47 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				"the normal price?",
 				getitemname(Tights));
 			next;
-			input .@input;
-			if (.@input != 8520) .@w_point += 1;
+			input(.@input);
+			if (.@input != 8520)
+				.@w_point += 1;
 			break;
 		case 3:
 			mes "[Raspuchin Gregory]";
 			mes "12 + 23 + 34 + 45 = ?";
 			next;
-			input .@input;
-			if (.@input != 114) .@w_point += 1;
+			input(.@input);
+			if (.@input != 114)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "1000 - 58 - 214 - 416 = ?";
 			next;
-			input .@input;
-			if (.@input != 312) .@w_point += 1;
+			input(.@input);
+			if (.@input != 312)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "14 * 17 * 3 = ?";
 			next;
-			input .@input;
-			if (.@input != 714) .@w_point += 1;
+			input(.@input);
+			if (.@input != 714)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "10530 / 3 / 5 / 2 = ?";
 			next;
-			input .@input;
-			if (.@input != 351) .@w_point += 1;
+			input(.@input);
+			if (.@input != 351)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "(47 * 28) - (1376 / 4) = ?";
 			next;
-			input .@input;
-			if (.@input != 972) .@w_point += 1;
+			input(.@input);
+			if (.@input != 972)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mes "(2646 / 7) + (13 * 28) = ?";
 			next;
-			input .@input;
-			if (.@input != 742) .@w_point += 1;
+			input(.@input);
+			if (.@input != 742)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("What is the\r"
 				"total cost of\r"
@@ -775,8 +802,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Green_Potion),
 				getitemname(Wing_Of_Fly));
 			next;
-			input .@input;
-			if (.@input != 798) .@w_point += 1;
+			input(.@input);
+			if (.@input != 798)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("What is the\r"
 				"total weight of\r"
@@ -786,8 +814,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Cap),
 				getitemname(Boots));
 			next;
-			input .@input;
-			if (.@input != 480) .@w_point += 1;
+			input(.@input);
+			if (.@input != 480)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("What is the\r"
 				"total defense of\r"
@@ -800,8 +829,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				getitemname(Muffler),
 				getitemname(Eye_Bandage));
 			next;
-			input .@input;
-			if (.@input != 12) .@w_point += 1;
+			input(.@input);
+			if (.@input != 12)
+				.@w_point += 1;
 			mes "[Raspuchin Gregory]";
 			mesf("If you buy 4 Padded Armors\r"
 				"at a 24%% discount and sell\r"
@@ -810,8 +840,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				"you make from this sale?",
 				getitemname(Padded_Armor));
 			next;
-			input .@input;
-			if (.@input != 7680) .@w_point += 1;
+			input(.@input);
+			if (.@input != 7680)
+				.@w_point += 1;
 		}
 		if (.@w_point == 0) {
 			mes "[Raspuchin Gregory]";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index e44299193..c70d0e597 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.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)  Kisuka
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Vicious
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Lupus
-//= Copyright (C)  Muad_Dib(The Prometheus Project)
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Vicious
+//= Copyright (C) Samuray22
+//= Copyright (C) Lupus
+//= Copyright (C) Muad_Dib(The Prometheus Project)
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -499,7 +499,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "The evil giant Papner,";
 				mes "Turned into a dragon and ate him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "There was a man")
 					.@w_point += 1;
 
@@ -510,7 +510,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "The evil giant Papner,";
 				mes "Turned into a dragon and ate him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "who was said to be immortal.")
 					.@w_point += 1;
 
@@ -521,7 +521,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "The evil giant Papner,";
 				mes "Turned into a dragon and ate him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "His name Jichfreid,")
 					.@w_point += 1;
 
@@ -532,7 +532,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "The evil giant Papner,";
 				mes "Turned into a dragon and ate him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Son of the hero Jichmunt.")
 					.@w_point += 1;
 
@@ -543,7 +543,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "The evil giant Papner,^000000";
 				mes "Turned into a dragon and ate him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "The evil giant Papner,")
 					.@w_point += 1;
 
@@ -554,7 +554,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "The evil giant Papner,";
 				mes "Turned into a dragon and ate him.^000000";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Turned into a dragon and ate him.")
 					.@w_point += 1;
 			}
@@ -566,7 +566,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "At first he only sold Red Potions.";
 				mes "Some say he sold Sweet Potatoes, too.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "A Merchant without money or equipment,")
 					.@w_point += 1;
 
@@ -577,7 +577,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "At first he only sold Red Potions.";
 				mes "Some say he sold Sweet Potatoes, too.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "a Merchant that couldn't sell anything.")
 					.@w_point += 1;
 
@@ -588,7 +588,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "At first he only sold Red Potions.";
 				mes "Some say he sold Sweet Potatoes, too.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "But he was too proud to beg.")
 					.@w_point += 1;
 
@@ -599,7 +599,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "At first he only sold Red Potions.";
 				mes "Some say he sold Sweet Potatoes, too.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "So he gathered some money selling items.")
 					.@w_point += 1;
 
@@ -610,7 +610,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "At first he only sold Red Potions.^000000";
 				mes "Some say he sold Sweet Potatoes, too.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "At first he only sold Red Potions.")
 					.@w_point += 1;
 
@@ -621,7 +621,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "At first he only sold Red Potions.";
 				mes "Some say he sold Sweet Potatoes, too.^000000";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Some say he sold Sweet Potatoes, too.")
 					.@w_point += 1;
 			}
@@ -633,7 +633,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Her sweet apples in her basket,";
 				mes "All thanks to her sweet apples.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "All Gods never age.")
 					.@w_point += 1;
 
@@ -644,7 +644,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Her sweet apples in her basket,";
 				mes "All thanks to her sweet apples.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "The ever so Beautiful Goddess Eden,")
 					.@w_point += 1;
 
@@ -655,7 +655,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Her sweet apples in her basket,";
 				mes "All thanks to her sweet apples.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Beautiful and graceful Goddess Eden,")
 					.@w_point += 1;
 
@@ -666,7 +666,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Her sweet apples in her basket,";
 				mes "All thanks to her sweet apples.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Odin's daughter-in-law and Bragi's wife.")
 					.@w_point += 1;
 
@@ -677,7 +677,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Her sweet apples in her basket,^000000";
 				mes "All thanks to her sweet apples.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Her sweet apples in her basket,")
 					.@w_point += 1;
 
@@ -688,7 +688,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Her sweet apples in her basket,";
 				mes "All thanks to her sweet apples.^000000";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "All thanks to her sweet apples.")
 					.@w_point += 1;
 			}
@@ -700,7 +700,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "All wandering poets are his people,";
 				mes "And all praise shall go to him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Bragi, Bragi,")
 					.@w_point += 1;
 
@@ -711,7 +711,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "All wandering poets are his people,";
 				mes "And all praise shall go to him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Forever call the poets name.")
 					.@w_point += 1;
 
@@ -722,7 +722,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "All wandering poets are his people,";
 				mes "And all praise shall go to him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "My songs are his breath,")
 					.@w_point += 1;
 
@@ -733,7 +733,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "All wandering poets are his people,";
 				mes "And all praise shall go to him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "My mind is his will,")
 					.@w_point += 1;
 
@@ -744,7 +744,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "All wandering poets are his people,^000000";
 				mes "And all praise shall go to him.";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "All wandering poets are his people,")
 					.@w_point += 1;
 
@@ -755,7 +755,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "All wandering poets are his people,";
 				mes "And all praise shall go to him.^000000";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "And all praise shall go to him.")
 					.@w_point += 1;
 			}
@@ -767,7 +767,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Let the castle walls ring.";
 				mes "This day will never come again!";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Louder, louder, louder.")
 					.@w_point += 1;
 
@@ -778,7 +778,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Let the castle walls ring.";
 				mes "This day will never come again!";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Give strength to the warriors!")
 					.@w_point += 1;
 
@@ -789,7 +789,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Let the castle walls ring.";
 				mes "This day will never come again!";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Shake the sky and roar through the land.")
 					.@w_point += 1;
 
@@ -800,7 +800,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Let the castle walls ring.";
 				mes "This day will never come again!";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Make my heart pound again!")
 					.@w_point += 1;
 
@@ -811,7 +811,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Let the castle walls ring.^000000";
 				mes "This day will never come again!";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "Let the castle walls ring.")
 					.@w_point += 1;
 
@@ -822,7 +822,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Let the castle walls ring.";
 				mes "This day will never come again!^000000";
 				next;
-				input .@Song$;
+				input(.@Song$);
 				if (.@Song$ != "This day will never come again!")
 					.@w_point += 1;
 			}
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index b806d12c3..f554e8c05 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -9,18 +9,18 @@
 //= 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)  SinSloth
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Vicious
-//= Copyright (C)  DracoRPG
-//= Copyright (C)  massdriller
-//= Copyright (C)  Komurka
-//= Copyright (C)  Lupus
-//= Copyright (C)  Shin
-//= Copyright (C)  Black Dragon
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) SinSloth
+//= Copyright (C) Samuray22
+//= Copyright (C) Vicious
+//= Copyright (C) DracoRPG
+//= Copyright (C) massdriller
+//= Copyright (C) Komurka
+//= Copyright (C) Lupus
+//= Copyright (C) Shin
+//= Copyright (C) Black Dragon
 //=
 //= 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/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index f0ff55d94..f795ac49d 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -9,19 +9,19 @@
 //= 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)  Brainstorm
-//= Copyright (C)  Samuray22
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Skotlex
-//= Copyright (C)  Lance
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Fredzilla
-//= Copyright (C)  Athena
-//= Copyright (C)  Kalen
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Kisuka
+//= Copyright (C) Brainstorm
+//= Copyright (C) Samuray22
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Skotlex
+//= Copyright (C) Lance
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Fredzilla
+//= Copyright (C) Athena
+//= Copyright (C) Kalen
 //=
 //= 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/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 631da5f7d..015d90cb8 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.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)  Kisuka
-//= Copyright (C)  Samuray22
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Silent
-//= Copyright (C)  Vicious
-//= Copyright (C)  Zephiris
-//= Copyright (C)  Yor
-//= Copyright (C)  Lupus
-//= Copyright (C)  Celest
-//= Copyright (C)  Dino9021
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) Samuray22
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Silent
+//= Copyright (C) Vicious
+//= Copyright (C) Zephiris
+//= Copyright (C) Yor
+//= Copyright (C) Lupus
+//= Copyright (C) Celest
+//= Copyright (C) Dino9021
 //=
 //= 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/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 311915097..67cea1516 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.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)  Brainstorm
-//= Copyright (C)  Samuray22
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  SinSloth
-//= Copyright (C)  Silent
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  kobra_k88
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) Brainstorm
+//= Copyright (C) Samuray22
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) SinSloth
+//= Copyright (C) Silent
+//= Copyright (C) Vicious
+//= 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
@@ -1292,7 +1292,7 @@ in_rogue,270,130,0	script	he_to_rogue#rg	WARPNPC,1,1,{
 OnTouch:
 	mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
 	next;
-	input .@input;
+	input(.@input);
 	if (.@input < 1 || .@input > 10000) {
 		if (ROGUE_Q == 12)
 			mes "^3355FFIt didn't work. Please re-enter the four number combination.^000000";
@@ -1300,7 +1300,7 @@ OnTouch:
 			mes "^3355FFPlease enter a combination of four numbers.^000000";
 		close;
 	}
-	else if (.@input == 3019) {
+	if (.@input == 3019) {
 		if (ROGUE_Q == 12) {
 			mes "^3355FFThe door";
 			mes "has opened.^000000";
@@ -1308,8 +1308,7 @@ OnTouch:
 			warp "in_rogue",10,21;
 			ROGUE_Q = 12;
 			end;
-		}
-		else {
+		} else {
 			mes "[HermanthornJr.]";
 			mes "Well...";
 			mes "Didn't I tell you";
@@ -1318,11 +1317,9 @@ OnTouch:
 			close;
 		}
 	}
-	else {
-		mes "^3355FFThe door";
-		mes "is still locked.^000000";
-		close;
-	}
+	mes "^3355FFThe door";
+	mes "is still locked.^000000";
+	close;
 }
 
 in_rogue,200,389,0	script	gen_ro#1	FAKE_NPC,3,3,{
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 49245e1ed..c8e214777 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.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)  Brainstorm
-//= Copyright (C)  Samuray22
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  KarLaeda
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Darkchild
-//= Copyright (C)  Athena
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) Brainstorm
+//= Copyright (C) Samuray22
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) KarLaeda
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Darkchild
+//= Copyright (C) Athena
 //=
 //= 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/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index ef543c8bc..4fc970420 100644
--- a/npc/jobs/2-2a/Champion.txt
+++ b/npc/jobs/2-2a/Champion.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index b8f8f2ce0..ff23610db 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -9,11 +9,11 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Samuray22
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 97e571bf4..9773eb570 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.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)  Kisuka
-//= Copyright (C)  Haru
-//= Copyright (C)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Kisuka
+//= Copyright (C) Haru
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt
index fc4a42166..01b9d6066 100644
--- a/npc/jobs/2-2a/Gypsy.txt
+++ b/npc/jobs/2-2a/Gypsy.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt
index 2d208ed65..d4dcd2bd7 100644
--- a/npc/jobs/2-2a/Paladin.txt
+++ b/npc/jobs/2-2a/Paladin.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index 009b2d80d..46d380787 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt
index 511d26435..005d0cad0 100644
--- a/npc/jobs/2-2a/Stalker.txt
+++ b/npc/jobs/2-2a/Stalker.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)  Vicious
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Vicious
+//= Copyright (C) Lupus
+//= Copyright (C) Nana
 //=
 //= 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/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 6fc4e3aaa..28d9d4b93 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.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)  Kisuka
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Lupus
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Celestria
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Lupus
+//= Copyright (C) Samuray22
+//= Copyright (C) Celestria
 //=
 //= 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/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index ebe4ef8e2..b1428c685 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.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)  Kisuka
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Lupus
-//= Copyright (C)  Darkchild
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Kisuka
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Samuray22
+//= Copyright (C) Lupus
+//= 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
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index d4f1d3982..7962f03ec 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.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)  Silent
-//= Copyright (C)  Vicious
-//= Copyright (C)  Silentdragon
-//= Copyright (C)  Mass Zero
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Lupus
-//= Copyright (C)  Poki
-//= Copyright (C)  Nana
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Silent
+//= Copyright (C) Vicious
+//= Copyright (C) Silentdragon
+//= Copyright (C) Mass Zero
+//= Copyright (C) L0ne_W0lf
+//= Copyright (C) Lupus
+//= Copyright (C) Poki
+//= Copyright (C) Nana
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -216,6 +216,70 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	2_M_SAGE_B,{
 		if (valkyrie_Q == 0) {
 			mes "[Metheus Sylphe]";
 			mes "Welcome to the Library of the Schweicherbil Magic Academy.";
+			if (RENEWAL) {
+				if (questprogress(5160) != 0) { // Quest #5160 - Library Mistake
+					mes("I assume you have come here to confirm the status of the library guards report?");
+					next();
+					if (select((countitem(Captured_Book) > 0 ? "I'm here for the book." : "Tell me the report."), "Donate Zeny") == 1) {
+						if (countitem(Captured_Book) != 0) {
+							mes("[Metheus Sylphe]");
+							mes("Just now the libary guard report aren't helpful, but there is a reason for that...");
+							next();
+							mes("[Metheus Sylphe]");
+							mes("Most importantly, you found the escaped book!");
+							next();
+							mes("[Metheus Sylphe]");
+							mes("As promised, I'll allow you to read the book of Ymir, you may now go in and read the book.");
+							if (countitem(Captured_Book) == 0)
+								close();
+							delitem(Captured_Book, countitem(Captured_Book));
+							valkyrie_Q = 1;
+							if (questprogress(5160) != 0)
+								completequest 5160;
+							close();
+						}
+						mes("[Metheus Sylphe]");
+						mes("This is a note from the library guards we were searching for.");
+						next();
+						mes("[Metheus Sylphe]");
+						mes("Search for the escaped book near the Juno Fields.");
+						next();
+						mes("[Metheus Sylphe]");
+						mes("However, there is no detailed description of the location. I'm glad that the search range was reduced.");
+						next();
+						mes("[Metheus Sylphe]");
+						mes("Search for the escaped book near the Juno Fields.");
+						next();
+						mes("[Metheus Sylphe]");
+						mes("Why don't you try search around Kiel Heir Area first.");
+						next();
+						mes("[Metheus Sylphe]");
+						mes("Because there are more than one book escaped.");
+						close();
+					}
+					if (Zeny < 1285000) {
+						mes("[Metheus Sylphe]");
+						mes("It's all good, but I don't think there's enough Zeny to make donation. Donation requires 1,285,000 Zeny.");
+						close();
+					}
+					mes("[Metheus Sylphe]");
+					mes("Ah?! Did you give up searching for the escaped books?");
+					next();
+					if (select("Unable to tell.", "Just Donate..") != 2) {
+						mes("[Metheus Sylphe]");
+						mes("Haha. I thought you picked up Zeny anywhere.");
+						close();
+					}
+					Zeny -= 1285000;
+					valkyrie_Q = 1;
+					setquest(1000);
+					if (questprogress(5160) != 0)
+						completequest(5160);
+					mes("[Metheus Sylphe]");
+					mes("Thank you, your donation will be used for a good cause. You may now go in and read the book.");
+					close();
+				}
+			}
 			mes "I assume you have come here";
 			mes "to read the 'Book of Ymir.'";
 			next;
@@ -230,10 +294,12 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	2_M_SAGE_B,{
 			mes "donation amount is";
 			mes "1,285,000 zeny.";
 			next;
-			if (select("Donate.", "Cancel.") == 1) {
+			switch (select("Donate.", (RENEWAL ? "Can't we just see it?" : ""), "Cancel.")) {
+			case 1:
 				if (Zeny >= 1285000) {
 					Zeny -= 1285000;
 					valkyrie_Q = 1;
+					setquest(1000);
 					mes "[Metheus Sylphe]";
 					mes "Thank you, your donation will be used for a good cause. You may";
 					mes "now go in and read the book.";
@@ -242,20 +308,116 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	2_M_SAGE_B,{
 				mes "[Metheus Sylphe]";
 				mes "Unfortunately, you don't seem to possess enough zeny at the moment. Please check your funds and come back again.";
 				close;
+			case 2:
+				mes("[Metheus Sylphe]");
+				mes("It is to preserve the original 'Book of Ymir,' we have decided to accept donations from people who wish to read the copy we have provided.");
+				next();
+				mes("[Metheus Sylphe]");
+				mes("Although I understand your feeling, but that's the rule.");
+				next();
+				select("But, I dont have enough Zeny.");
+				mes("[Metheus Sylphe]");
+				mes("The rules stated that everyone must made a donation, if they want to read the book...");
+				next();
+				mes("[Metheus Sylphe]");
+				mes("I guess sometime when life is difficult, we may not follow with the principle?");
+				next();
+				if (select("I must follow the principle!", "I'll do anything.") != 2) {
+					close();
+				}
+				mes("[Metheus Sylphe]");
+				mes("I see enthusiasm within you, but I couldn't let you enter for free.");
+				next();
+				mes("[Metheus Sylphe]");
+				mes("So help me resolve the problems happen in the Schweicherbil Magic Academy's library.");
+				mes("I'll help you to read the book of Ymir.");
+				next();
+				while (true) {
+					switch (select("What happened?", "Where does it escaped?", "I'll find it.", "Ignore")) {
+					case 1:
+						mes("[Metheus Sylphe]");
+						mes("This is really a headache.");
+						mes("The library consists of a lot undisclosed books.");
+						next();
+						mes("[Metheus Sylphe]");
+						mes("For example, ^0055FFRideword Hat^000000 that would attack humans can't be disclose to the public.");
+						next();
+						mes("[Metheus Sylphe]");
+						mes("But not long ago, part of the undisclosed books escaped from the library...");
+						next();
+						mes("[Metheus Sylphe]");
+						mes("Although the library guards are currently searching for it, but failed due to lack of manpower.");
+						next();
+						continue;
+					case 2:
+						mes("[Metheus Sylphe]");
+						mes("We're still trying to figure out where it escaped to.");
+						mes("I'll inform you when the library guards have any news for it.");
+						next();
+						continue;
+					case 3:
+						mes("[Metheus Sylphe]");
+						mes("Do you already know the problem now? That's weird. Did you know anything else?");
+						next();
+						switch (select("Sorry.", "Worry about gift for girlfriend?", "Worry about the lunch?", "Worry about the escaped books?")) {
+						case 1:
+							mes("[Metheus Sylphe]");
+							mes("It seemed to be too. I think we need to know what are the problem first.");
+							next();
+							continue;
+						case 2:
+							mes("[Metheus Sylphe]");
+							mes("Isn't it polite to ask if you already have a girlfriend? But this isn't a problem.");
+							next();
+							continue;
+						case 3:
+							mes("[Metheus Sylphe]");
+							mes("It's not a problem these days because I'm not having lunch yet. You should listen to the library problem, not my problem.");
+							next();
+							continue;
+						case 4:
+							mes("[Metheus Sylphe]");
+							mes("Ah! You knew the problem already?");
+							mes("or the news already leaked to public?");
+							next();
+							mes("[Metheus Sylphe]");
+							mes("Wait a moment, the library guard has returned with the report.");
+							next();
+							mes("[Metheus Sylphe]");
+							mes("Let's hear the report before you left!");
+							if (questprogress(5160) == 0)
+								setquest(5160); // Quest #5160 - Library Mistake
+							close();
+						}
+					case 4:
+						close();
+					}
+				}
+				end;
+			default:
+				break;
 			}
 			mes "[Metheus Sylphe]";
 			mes "Take your time, and";
 			mes "enjoy your travels.";
 			close;
 		}
-		mes "[Metheus Sylphe]";
-		mes "Once again, thank you for your generous donation. Feel free to read a carbon copy of the 'Book of Ymir' at your leisure.";
-		close;
+		mes("[Metheus Sylphe]");
+		if (questprogress(5160) != 0)
+			mes("Once again, thank you for your generous assistance. Feel free to read a carbon copy of the 'Book of Ymir' at your leisure.");
+		else
+			mes("Once again, thank you for your generous donation. Feel free to read a carbon copy of the 'Book of Ymir' at your leisure.");
+		close();
 	}
 	mes "[Metheus Sylphe]";
 	mes "Welcome to the Library of the Schweicherbil Magic Academy.";
 	mes "Here, we have a countless number of books. Please take your time and look around.";
 	close;
+
+OnKill:
+	if (questprogress(5160) == 1) // Quest #5160 - Library Mistake
+		getitem(Captured_Book, 1);
+	end;
 }
 
 yuno_in02,93,207,1	script	Book of Ymir	HIDDEN_NPC,{