Merge branch 'master' into cell_noskill

40 files changed, 579 insertions, 593 deletions

diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt
index 72e1bd6c9..77d6cf6ee 100644
--- a/npc/re/quests/cupet.txt
+++ b/npc/re/quests/cupet.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)  Z3RO
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Z3RO
 //=
 //= 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/re/quests/eden/100-110.txt b/npc/re/quests/eden/100-110.txt
index 3cc47f6ef..aadca748b 100644
--- a/npc/re/quests/eden/100-110.txt
+++ b/npc/re/quests/eden/100-110.txt
@@ -9,9 +9,9 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2015  Hercules Dev Team
-//= Copyright (C)  Dastgir
-//= Copyright (C)  Capuche
+//= Copyright (C) 2015-2020 Hercules Dev Team
+//= Copyright (C) Dastgir
+//= Copyright (C) Capuche
 //=
 //= 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/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt
index f65ad9090..900e62978 100644
--- a/npc/re/quests/eden/11-25.txt
+++ b/npc/re/quests/eden/11-25.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= 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/re/quests/eden/111-120.txt b/npc/re/quests/eden/111-120.txt
index 4422c92c7..787950ad1 100644
--- a/npc/re/quests/eden/111-120.txt
+++ b/npc/re/quests/eden/111-120.txt
@@ -9,9 +9,9 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2015  Hercules Dev Team
-//= Copyright (C)  Dastgir
-//= Copyright (C)  Capuche
+//= Copyright (C) 2015-2020 Hercules Dev Team
+//= Copyright (C) Dastgir
+//= Copyright (C) Capuche
 //=
 //= 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/re/quests/eden/121-130.txt b/npc/re/quests/eden/121-130.txt
index d48c71702..4b808b1b8 100644
--- a/npc/re/quests/eden/121-130.txt
+++ b/npc/re/quests/eden/121-130.txt
@@ -9,9 +9,9 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2015  Hercules Dev Team
-//= Copyright (C)  Dastgir
-//= Copyright (C)  Capuche
+//= Copyright (C) 2015-2020 Hercules Dev Team
+//= Copyright (C) Dastgir
+//= Copyright (C) Capuche
 //=
 //= 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/re/quests/eden/131-140.txt b/npc/re/quests/eden/131-140.txt
index fa6061b42..607468142 100644
--- a/npc/re/quests/eden/131-140.txt
+++ b/npc/re/quests/eden/131-140.txt
@@ -9,9 +9,9 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2015  Hercules Dev Team
-//= Copyright (C)  Dastgir
-//= Copyright (C)  Capuche
+//= Copyright (C) 2015-2020 Hercules Dev Team
+//= Copyright (C) Dastgir
+//= Copyright (C) Capuche
 //=
 //= 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/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt
index 029881068..de2e64732 100644
--- a/npc/re/quests/eden/26-40.txt
+++ b/npc/re/quests/eden/26-40.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= 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/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt
index ee32d4306..d4f70ba3f 100644
--- a/npc/re/quests/eden/41-55.txt
+++ b/npc/re/quests/eden/41-55.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= 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/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt
index c6aeb8c15..33ecf9bdc 100644
--- a/npc/re/quests/eden/56-70.txt
+++ b/npc/re/quests/eden/56-70.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)  Joseph
-//= Copyright (C)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Joseph
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= 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/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt
index cbb6c3e0c..5c81ef422 100644
--- a/npc/re/quests/eden/71-85.txt
+++ b/npc/re/quests/eden/71-85.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= 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/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt
index 394970944..c0409d626 100644
--- a/npc/re/quests/eden/86-90.txt
+++ b/npc/re/quests/eden/86-90.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  Chilly
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= Copyright (C) Chilly
 //=
 //= 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/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index 328cc4474..81f00eaea 100644
--- a/npc/re/quests/eden/91-99.txt
+++ b/npc/re/quests/eden/91-99.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  Chilly
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= Copyright (C) Chilly
 //=
 //= 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/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt
index 9085cad91..b4c45b15a 100644
--- a/npc/re/quests/eden/eden_common.txt
+++ b/npc/re/quests/eden/eden_common.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  Brian
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= Copyright (C) Brian
+//= 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
@@ -96,7 +96,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor	4_F_EDEN_OFFICER,{
 				case 1:
 					mes "[Lime Evenor]";
 					mes "Aright. Excellent! Please write down your name here.";
-					input .@input$;
+					input(.@input$);
 					next;
 					mes "[Lime Evenor]";
 					mes "Are you done?";
@@ -113,7 +113,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor	4_F_EDEN_OFFICER,{
 					next;
 					mes "[Lime Evenor]";
 					mes "Would you please write your name again? Please write it ^3131FFClearly^000000.";
-					input .@input$;
+					input(.@input$);
 					next;
 					mes "[Lime Evenor]";
 					mes "Ah~ ha. You are ^3131FF"+strcharinfo(PC_NAME)+"^000000.";
@@ -148,7 +148,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor	4_F_EDEN_OFFICER,{
 			if(select("Yes, I want to register.", "No, I don't.") == 1) {
 				mes "[Lime Evenor]";
 				mes "Alrigh. Please write down your name on it.";
-				input .@input$;
+				input(.@input$);
 				next;
 				mes "[Lime Evenor]";
 				mes "^3131FF"+strcharinfo(PC_NAME)+"^000000.. Is that your name?";
@@ -157,7 +157,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor	4_F_EDEN_OFFICER,{
 				mes "[Lime Evenor]";
 				mes "^3131FF"+strcharinfo(PC_NAME)+"^000000, tell me what you want to register. for";
 				mes "Which map should we go to?";
-				input .@input$;
+				input(.@input$);
 				next;
 				mes "[Lime Evenor]";
 				mes "^3131FFMission Map: "+.@inputstr$+"^000000";
@@ -166,7 +166,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor	4_F_EDEN_OFFICER,{
 				mes "[Lime Evenor]";
 				mes "Please let me know what kind of missions your are lookng for.";
 				mes "It should be briefly like 'Hunt 10 Porings.'";
-				input .@input$;
+				input(.@input$);
 				next;
 				mes "[Lime Evenor]";
 				mes "Are you done?";
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index aae9a5566..2012571b5 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -9,10 +9,10 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Frost
-//= Copyright (C)  Euphy
-//= Copyright (C)  -SkittleNugget-
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Frost
+//= Copyright (C) Euphy
+//= Copyright (C) -SkittleNugget-
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -142,7 +142,7 @@ moc_para01,166,51,3	script	Phelix#edco	4_M_03,{
 		mes "[Phelix]";
 		mes "How many do you want?";
 		mes "^ff0000You have enough for up to " + .@available + " Carrots.^000000";
-		input .@input;
+		input(.@input);
 		next;
 		if (.@input < 1 || .@input > 10000) {
 			mes "[Phelix]";
@@ -321,12 +321,13 @@ moc_para01,50,39,4	script	Eve Natalia	4_F_SITDOWN,{
 		mes "So do you want to trade the 1st one in your inventory for ^00CC00"+.@amount+" Random Safe to 7 Certificates^000000?";
 		mes "Tell me '1' if you do, or '0' to cancel.";
 		next;
-		input .@input;
+		input(.@input);
 		if (.@input < 0 || .@input > 1) {
 			mes "[Eve Natalia]";
 			mes "It is a 0 or 1, it can't be that difficult.";
 			close;
-		} else if (.@input == 0) {
+		}
+		if (.@input == 0) {
 			mes "[Eve Natalia]";
 			mes "It's best to be sure before trading, have a good day.";
 			close;
@@ -417,12 +418,13 @@ L_Exchange:
 	mes "I can give you up to 60.";
 	mes "Type 0 to cancel.";
 	next;
-	input .@amount;
-	if (.@amount == 0) {
+	input(.@amount);
+	if (.@amount <= 0) {
 		mes "[Trader Machine]";
 		mes "Cancelled.";
 		close;
-	} else if (.@amount < 0 || .@amount > 60) {
+	}
+	if (.@amount > 60) {
 		mes "[Trader Machine]";
 		mes "I said only 60 max.";
 		close;
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index a0f4fa922..926f4c7ab 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.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)  Capuche
-//= Copyright (C)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Capuche
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= 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
@@ -4302,7 +4302,7 @@ sec_in02,25,33,4	script	Assistant#para_suvquest	4_M_BABYCAT,{
 		.@var =  select("para_suv01", "para_suv02");
 		mes "Enter the modified value";
 		next;
-		input .@input,0,9999;
+		input(.@input, 0, 9999);
 		mes "Value of para_suv0"+.@var+" has been changed to "+.@input+".";
 		setd "para_suv0"+.@var,.@input;
 		close;
diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt
index ce6efaa67..1c9d02f64 100644
--- a/npc/re/quests/eden/eden_service.txt
+++ b/npc/re/quests/eden/eden_service.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)  Masao
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Masao
+//= 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/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt
index 902db7945..1f6b17574 100644
--- a/npc/re/quests/eden/eden_tutorial.txt
+++ b/npc/re/quests/eden/eden_tutorial.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -228,7 +228,7 @@ moc_para01,34,178,3	script	Tutorial Instructor	4_M_KHMAN,{
 			close;
 		}
 	} else if (questprogress(9167) == 1) {
-		if (!getmercinfo(1)) {
+		if (!getmercinfo(MERCINFO_CLASS)) {
 			mes "[Tutorial Instructor]";
 			mes "You haven't gotten a mercenary yet.";
 			next;
@@ -319,7 +319,7 @@ moc_para01,34,178,3	script	Tutorial Instructor	4_M_KHMAN,{
 			mes "if you really checked it?";
 			mes "Write down what material I asked you to get.";
 			next;
-			input .@inputstr$;
+			input(.@inputstr$);
 			if (.@inputstr$ == "10 Jellopy") {
 				mes "[Tutorial Instructor]";
 				mes "Good, you know.";
diff --git a/npc/re/quests/first_class/tu_archer.txt b/npc/re/quests/first_class/tu_archer.txt
index 519b07bf2..5a6f4a28d 100644
--- a/npc/re/quests/first_class/tu_archer.txt
+++ b/npc/re/quests/first_class/tu_archer.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
 //=
 //= 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/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt
index c1ee52d52..95dea2bf6 100644
--- a/npc/re/quests/homun_s.txt
+++ b/npc/re/quests/homun_s.txt
@@ -9,9 +9,9 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
-//= Copyright (C)  Masao
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
 //=
 //= 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/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt
index bcf94c4a0..8d23f77e0 100644
--- a/npc/re/quests/magic_books.txt
+++ b/npc/re/quests/magic_books.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  Muad_Dib
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= 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/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt
index 6464ae6fc..6781d93bb 100644
--- a/npc/re/quests/monstertamers.txt
+++ b/npc/re/quests/monstertamers.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
 //=
 //= 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/re/quests/mrsmile.txt b/npc/re/quests/mrsmile.txt
index a98ac8b0e..03ecfad61 100644
--- a/npc/re/quests/mrsmile.txt
+++ b/npc/re/quests/mrsmile.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  Daegaladh
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= Copyright (C) Daegaladh
 //=
 //= 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/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt
index 80df8d650..d9e8bbd22 100644
--- a/npc/re/quests/newgears/2012_headgears.txt
+++ b/npc/re/quests/newgears/2012_headgears.txt
@@ -9,9 +9,9 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2015  Hercules Dev Team
-//= Copyright (C)  -SkittleNugget-
-//= Copyright (C)  Euphy
+//= Copyright (C) 2015-2020 Hercules Dev Team
+//= Copyright (C) -SkittleNugget-
+//= Copyright (C) Euphy
 //=
 //= 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/re/quests/pile_bunker.txt b/npc/re/quests/pile_bunker.txt
index 5362211ab..f32897fd7 100644
--- a/npc/re/quests/pile_bunker.txt
+++ b/npc/re/quests/pile_bunker.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  JayPee Mateo
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= Copyright (C) JayPee Mateo
 //=
 //= 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/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt
index d29a167b1..977c28071 100644
--- a/npc/re/quests/quests_13_1.txt
+++ b/npc/re/quests/quests_13_1.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
 //=
 //= 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/re/quests/quests_aldebaran.txt b/npc/re/quests/quests_aldebaran.txt
index 336ddb1c7..65460a598 100644
--- a/npc/re/quests/quests_aldebaran.txt
+++ b/npc/re/quests/quests_aldebaran.txt
@@ -9,9 +9,9 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2016  Hercules Dev Team
-//= Copyright (C) 2016  Ridley
-//= Copyright (C) 2016  Aleos
+//= Copyright (C) 2016-2020 Hercules Dev Team
+//= Copyright (C) 2016 Ridley
+//= Copyright (C) 2016 Aleos
 //=
 //= 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/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index 4a60fd2bb..debaba2e5 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.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)  Panikon
-//= Copyright (C)  Michieru
-//= Copyright (C)  Euphy
-//= Copyright (C)  L0ne_W0lf
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Panikon
+//= Copyright (C) Michieru
+//= Copyright (C) Euphy
+//= 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
@@ -2231,449 +2231,400 @@ brasilis,180,249,5	script	Daniel#bra	4_M_KID1,{
 }
 
 bra_in01,149,184,3	script	Door#bra	CLEAR_NPC,{
-	if (brazil_ghost > 0) {
-		mes "- A key is inserted in the locked door.-";
+	mes "- A key is inserted in the locked door.-";
+	if (brazil_ghost == 0) {
+		close;
+	}
+	next;
+	switch(select("Turn the key.", "Ignore it.")) {
+	case 1:
+		mes "You start saying the first line of the magic words.";
+		input(.@input$);
 		next;
-		switch(select("Turn the key.", "Ignore it.")) {
+		mes "["+strcharinfo(PC_NAME)+"]";
+		mes .@input$;
+		next;
+		.@braspell$ = "Mother the door won't open!";
+		.@chkspell = compare(.@braspell$,.@input$);
+		if (!.@chkspell) {
+			mes "Seems like you said something wrong.";
+			close;
+		}
+		if (brazil_ghost != 2) {
+			mes "Mother the door won't open!";
+			close;
+		}
+		mes "[Sobbing Voice]";
+		mes "'^FF0000Turn the key as many times as there are colors in the rainbow.^000000'";
+		next;
+		switch(select("Open the door", "Knock on the door.", "Turn the key.", "Take the key out.")) {
 		case 1:
-			mes "You start saying the first line of the magic words.";
-			input .@input$;
+			mes "The door is locked.";
+			mes "So nothing happens.";
+			close;
+		case 2:
+			mes "How many times should I try to knock?";
+			input(.@input, 0, 999);
 			next;
-			mes "["+strcharinfo(PC_NAME)+"]";
-			mes .@input$;
+			mes "You knocked on the door "+.@input+" times.";
 			next;
-			.@braspell$ = "Mother the door won't open!";
-			.@chkspell = compare(.@braspell$,.@input$);
-			if (!.@chkspell) {
-				mes "Seems like you said something wrong.";
+			mes "But, nothing happens.";
+			close;
+		case 3:
+			mes "How many times should I turn the key?";
+			input(.@input, 0, 999);
+			next;
+			mes "You turned over the key "+.@input+" times.";
+			next;
+			if (.@input != 7) {
+				mes "But nothing doesn't happened.";
 				close;
 			}
-			else {
-				if (brazil_ghost == 2) {
-					mes "[Sobbing Voice]";
-					mes "'^FF0000Turn the key as many times as there are colors in the rainbow.^000000'";
-					next;
-					switch(select("Open the door", "Knock on the door.", "Turn the key.", "Take the key out.")) {
-					case 1:
-						mes "The door is locked.";
-						mes "So nothing happens.";
-						close;
-					case 2:
-						mes "How many times should I try to knock?";
-						input .@input,0,999;
-						next;
-						mes "You knocked on the door "+.@input+" times.";
-						next;
-						mes "But, nothing happens.";
-						close;
-					case 3:
-						mes "How many times should I turn the key?";
-						input .@input,0,999;
-						next;
-						if (.@input == 7) {
-							mes "You turn the key 7 times.";
-							next;
-							mes "Click! Click! Click!";
-							mes "Click! Click! Click!";
-							mes "Click...!";
-							next;
-							mes "[Distant Sound]";
-							mes "^FF0000kkkkhee- hihihihi!!!^000000";
-							mes "You hear water flushing.";
-							next;
-							specialeffect(EF_VENOMDUST, AREA, playerattached());
-							mes "Faint laughing can be heard off in the direction of the toilet.";
-							brazil_ghost = 3;
-							changequest 2208,60351;
-							close;
-						}
-						else {
-							mes "You turned over the key "+.@input+" times.";
-							next;
-							mes "But nothing doesn't happened.";
-							close;
-						}
-					case 4:
-						mes "How many times should I insert the key into the door?";
-						input .@input,0,999;
-						next;
-						mes "You inserted the key "+.@input+" times.";
-						next;
-						mes "But nothing happened.";
-						close;
-					}
-				}
-				else {
-					mes "Mother the door won't open!";
-					close;
-				}
-			}
-		case 2:
-			mes "You do nothing.";
+			mes "Click! Click! Click!";
+			mes "Click! Click! Click!";
+			mes "Click...!";
+			next;
+			mes "[Distant Sound]";
+			mes "^FF0000kkkkhee- hihihihi!!!^000000";
+			mes "You hear water flushing.";
+			next;
+			specialeffect(EF_VENOMDUST, AREA, playerattached());
+			mes "Faint laughing can be heard off in the direction of the toilet.";
+			brazil_ghost = 3;
+			changequest 2208,60351;
+			close;
+		case 4:
+			mes "How many times should I insert the key into the door?";
+			input(.@input, 0, 999);
+			next;
+			mes "You inserted the key "+.@input+" times.";
+			next;
+			mes "But nothing happened.";
 			close;
 		}
-	}
-	else {
-		mes "- A key is inserted in the locked door.-";
+	case 2:
+		mes "You do nothing.";
 		close;
 	}
 }
 
 bra_in01,144,187,3	script	Toilet#bra	CLEAR_NPC,{
-	if (brazil_ghost > 0) {
-		mes "- Looks like an ordinary toilet -";
+	mes "- Looks like an ordinary toilet -";
+	if (brazil_ghost == 0) {
+		close;
+	}
+	next;
+	if (brazil_ghost > 6) {
+		switch(select("Flush the toilet.", "Doing nothing.")) {
+		case 1:
+			mes "After flushing the toilet, you suddenly feel dizzy and are suddenly swept away somewhere.";
+			specialeffect(EF_WATERFALL_SMALL_T2_90, AREA, playerattached());
+			close2;
+			warp "bra_in01",206,102;
+			end;
+		case 2:
+			mes "The water in the toilet looks gross.";
+			close;
+		}
+	}
+	switch(select("Use the toilet", "Ignore.")) {
+	case 1:
+		mes "- What was the second line to that spell now? -";
+		input(.@input$);
 		next;
-		if (brazil_ghost > 6) {
-			switch(select("Flush the toilet.", "Doing nothing.")) {
-			case 1:
-				mes "After flushing the toilet, you suddenly feel dizzy and are suddenly swept away somewhere.";
-				specialeffect(EF_WATERFALL_SMALL_T2_90, AREA, playerattached());
-				close2;
-				warp "bra_in01",206,102;
-				end;
-			case 2:
-				mes "The water in the toilet looks gross.";
-				close;
-			}
+		mes "["+strcharinfo(PC_NAME)+"]";
+		mes .@input$;
+		next;
+		.@braspell$ = "Mother the water is flooding!";
+		.@chkspell = compare(.@braspell$,.@input$);
+		if (!.@chkspell) {
+			mes "Seems like you said something wrong.";
+			close;
 		}
-		switch(select("Use the toilet", "Ignore.")) {
+		if (brazil_ghost != 3) {
+			mes "Nothing happens.";
+			close;
+		}
+		mes "[Sobbing Voice]";
+		mes "^FF0000If the moon disappears 3 times... don't worry.....^000000";
+		next;
+		switch(select("Flush the toilet.", "Close the lid.")) {
 		case 1:
-			mes "- What was the second line to that spell now? -";
-			input .@input$;
+			mes "How many times should I flush?";
+			input(.@input, 0, 999);
 			next;
-			mes "["+strcharinfo(PC_NAME)+"]";
-			mes .@input$;
+			mes "You flush the toilet "+.@input+" times.";
 			next;
-			.@braspell$ = "Mother the water is flooding!";
-			.@chkspell = compare(.@braspell$,.@input$);
-			if (!.@chkspell) {
-				mes "Seems like you said something wrong.";
+			if (.@input != 3) {
+				mes "But nothing happens.";
 				close;
 			}
-			else {
-				if (brazil_ghost == 3) {
-					mes "[Sobbing Voice]";
-					mes "^FF0000If the moon disappears 3 times... don't worry.....^000000";
-					next;
-					switch(select("Flush the toilet.", "Close the lid.")) {
-					case 1:
-						mes "How many times should I flush?";
-						input .@input,0,999;
-						next;
-						if (.@input == 3) {
-							mes "You flush the toilet 3 times.";
-							next;
-							mes "qwaaaaaaaaa!";
-							mes "kwaaaaaaaaaa!";
-							mes "kwaaaaaaaaaaaaaaaaaaa!";
-							next;
-							mes "[Distant Sound]";
-							mes "^FF0000kkkkhee- hihihihi!!!^000000";
-							mes "Suddenly the sink sounds like water is flowing freely from it.";
-							next;
-							specialeffect(EF_VENOMDUST, AREA, playerattached());
-							mes "Faint laughing can be heard off in the direction of the faucet.";
-							brazil_ghost = 4;
-							changequest 60351,60352;
-							close;
-						}
-						else {
-							mes "You flush the toilet "+.@input+" times.";
-							next;
-							mes "But nothing happens.";
-							close;
-						}
-					case 2:
-						mes "You close the lid of the toilet.";
-						mes "Nothing seems to be happening.";
-						close;
-					}
-				}
-				else {
-					mes "Nothing happens.";
-					close;
-				}
-			}
+			mes "qwaaaaaaaaa!";
+			mes "kwaaaaaaaaaa!";
+			mes "kwaaaaaaaaaaaaaaaaaaa!";
+			next;
+			mes "[Distant Sound]";
+			mes "^FF0000kkkkhee- hihihihi!!!^000000";
+			mes "Suddenly the sink sounds like water is flowing freely from it.";
+			next;
+			specialeffect(EF_VENOMDUST, AREA, playerattached());
+			mes "Faint laughing can be heard off in the direction of the faucet.";
+			brazil_ghost = 4;
+			changequest 60351,60352;
+			close;
 		case 2:
-			mes "You do nothing.";
+			mes "You close the lid of the toilet.";
+			mes "Nothing seems to be happening.";
 			close;
 		}
-	}
-	else {
-		mes "- Looks like an ordinary toilet -";
+	case 2:
+		mes "You do nothing.";
 		close;
 	}
 }
 
 bra_in01,134,189,3	script	Faucet#bra	CLEAR_NPC,{
-	if (brazil_ghost > 0) {
-		mes "- It seems like an ordinary faucet -";
+	mes "- It seems like an ordinary faucet -";
+	if (brazil_ghost == 0) {
+		close;
+	}
+	next;
+	switch(select("Examine it.", "Ignore.")) {
+	case 1:
+		mes "- What was the next line to that spell now? -";
+		input(.@input$);
+		next;
+		mes "["+strcharinfo(PC_NAME)+"]";
+		mes .@input$;
+		next;
+		.@braspell$ = "Mother the drought has started!";
+		.@chkspell = compare(.@braspell$,.@input$);
+		if (!.@chkspell) {
+			mes "Seems like you said something wrong.";
+			close;
+		}
+		if (brazil_ghost != 4) {
+			mes "Nothing happens.";
+			close;
+		}
+		mes "[Sobbing Voice]";
+		mes "^FF0000Don't worry... the waterfall will help it....^000000";
 		next;
-		switch(select("Examine it.", "Ignore.")) {
+		switch(select("Tap on the faucet.", "Turn on the water.")) {
 		case 1:
-			mes "- What was the next line to that spell now? -";
-			input .@input$;
+			mes "How many times will you tap the faucet?";
+			input(.@input, 0, 999);
 			next;
-			mes "["+strcharinfo(PC_NAME)+"]";
-			mes .@input$;
+			mes "You tap the faucet "+.@input+" times.";
+			next;
+			mes "But nothing happens.";
+			close;
+		case 2:
+			mes "How many times should I turn the water on?";
+			input(.@input, 0, 999);
 			next;
-			.@braspell$ = "Mother the drought has started!";
-			.@chkspell = compare(.@braspell$,.@input$);
-			if (!.@chkspell) {
-				mes "Seems like you said something wrong.";
+			if (.@input != 1) {
+				mes "You turn the faucet on "+.@input+" times.";
+				next;
+				mes "But nothing happens.";
 				close;
 			}
-			else {
-				if (brazil_ghost == 4) {
-					mes "[Sobbing Voice]";
-					mes "^FF0000Don't worry... the waterfall will help it....^000000";
-					next;
-					switch(select("Tap on the faucet.", "Turn on the water.")) {
-					case 1:
-						mes "How many times will you tap the faucet?";
-						input .@input,0,999;
-						next;
-						mes "You tap the faucet "+.@input+" times.";
-						next;
-						mes "But nothing happens.";
-						close;
-					case 2:
-						mes "How many times should I turn the water on?";
-						input .@input,0,999;
-						next;
-						if (.@input == 1) {
-							mes "You turn the faucet on once.";
-							next;
-							mes "swwwaaaaaaa-";
-							next;
-							mes "[Distant Sound]";
-							mes "^FF0000kkkkhee- hihihihi!!!^000000";
-							mes "You see the carpet move.";
-							next;
-							specialeffect(EF_VENOMDUST, AREA, playerattached());
-							mes "Faint laughing can be heard off in the direction of the carpet.";
-							brazil_ghost = 5;
-							changequest 60352,60353;
-							close;
-						}
-						else {
-							mes "You turn the faucet on "+.@input+" times.";
-							next;
-							mes "But nothing happens.";
-							close;
-						}
-					}
-				}
-				else {
-					mes "Nothing happens.";
-					close;
-				}
-			}
-		case 2:
-			mes "You do nothing.";
+			mes "You turn the faucet on once.";
+			next;
+			mes "swwwaaaaaaa-";
+			next;
+			mes "[Distant Sound]";
+			mes "^FF0000kkkkhee- hihihihi!!!^000000";
+			mes "You see the carpet move.";
+			next;
+			specialeffect(EF_VENOMDUST, AREA, playerattached());
+			mes "Faint laughing can be heard off in the direction of the carpet.";
+			brazil_ghost = 5;
+			changequest 60352,60353;
 			close;
 		}
-	}
-	else {
-		mes "- It seems like an ordinary faucet -";
+	case 2:
+		mes "You do nothing.";
 		close;
 	}
 }
 
 bra_in01,138,184,3	script	Carpet#bra	CLEAR_NPC,{
-	if (brazil_ghost > 0) {
-		mes "- A carpet with an intricate pattern on it -";
+	mes "- A carpet with an intricate pattern on it -";
+	if (brazil_ghost == 0) {
+		close;
+	}
+	next;
+	switch(select("Examine it.", "Ignore.")) {
+	case 1:
+		mes "- What was the next line to that spell now? -";
+		input(.@input$);
 		next;
-		switch(select("Examine it.", "Ignore.")) {
+		mes "["+strcharinfo(PC_NAME)+"]";
+		mes .@input$;
+		next;
+		.@braspell$ = "Mother where are my friends?";
+		.@chkspell = compare(.@braspell$,.@input$);
+		if (!.@chkspell) {
+			mes "Seems like you said something wrong.";
+			close;
+		}
+		if (brazil_ghost != 5) {
+			mes "Nothing happens.";
+			close;
+		}
+		mes "[Sobbing Voice]";
+		mes "^FF0000your 7 friends....are...sleeping... now it...'s time ....to wake them........^000000";
+		next;
+		switch(select("Jump on the carpet.", "Lie on the carpet.", "Shake the carpet.")) {
 		case 1:
-			mes "- What was the next line to that spell now? -";
-			input .@input$;
+			mes "How many times should I jump?";
+			input(.@input, 0, 999);
 			next;
-			mes "["+strcharinfo(PC_NAME)+"]";
-			mes .@input$;
+			mes "You jump on the carpet "+.@input+" times.";
+			next;
+			mes "But nothing happens.";
+			close;
+		case 2:
+			mes "How many times should I lie on the carpet?";
+			input(.@input, 0, 999);
+			next;
+			mes "You lie on the carpet "+.@input+" times.";
+			next;
+			mes "But nothing happens.";
+			close;
+		case 3:
+			mes "How many times should I shake the carpet?";
+			input(.@input, 0, 999);
 			next;
-			.@braspell$ = "Mother where are my friends?";
-			.@chkspell = compare(.@braspell$,.@input$);
-			if (!.@chkspell) {
-				mes "Seems like you said something wrong.";
+			mes "You shake the carpet "+.@input+" times.";
+			next;
+			if (.@input != 7) {
+				mes "But nothing happens.";
 				close;
 			}
-			else {
-				if (brazil_ghost == 5) {
-					mes "[Sobbing Voice]";
-					mes "^FF0000your 7 friends....are...sleeping... now it...'s time ....to wake them........^000000";
-					next;
-					switch(select("Jump on the carpet.", "Lie on the carpet.", "Shake the carpet.")) {
-					case 1:
-						mes "How many times should I jump?";
-						input .@input,0,999;
-						next;
-						mes "You jump on the carpet "+.@input+" times.";
-						next;
-						mes "But nothing happens.";
-						close;
-					case 2:
-						mes "How many times should I lie on the carpet?";
-						input .@input,0,999;
-						next;
-						mes "You lie on the carpet "+.@input+" times.";
-						next;
-						mes "But nothing happens.";
-						close;
-					case 3:
-						mes "How many times should I shake the carpet?";
-						input .@input,0,999;
-						next;
-						if (.@input == 7) {
-							mes "You shake the carpet 7 times.";
-							next;
-							mes "- fly~ fly~ fly~ fly~ fly~ fly~ fly~ -";
-							next;
-							mes "[Distant Sound]";
-							mes "^FF0000kkkkhee- hihihihi!!!^000000";
-							next;
-							specialeffect(EF_VENOMDUST, AREA, playerattached());
-							mes "Faint laughing can be heard off in the direction of the mirror.";
-							brazil_ghost = 6;
-							changequest 60353,60354;
-							close;
-						}
-						else {
-							mes "You shake the carpet "+.@input+" times.";
-							next;
-							mes "But nothing happens.";
-							close;
-						}
-					}
-				}
-				else {
-					mes "Nothing happens.";
-					close;
-				}
-			}
-		case 2:
-			mes "You do nothing.";
+			mes "- fly~ fly~ fly~ fly~ fly~ fly~ fly~ -";
+			next;
+			mes "[Distant Sound]";
+			mes "^FF0000kkkkhee- hihihihi!!!^000000";
+			next;
+			specialeffect(EF_VENOMDUST, AREA, playerattached());
+			mes "Faint laughing can be heard off in the direction of the mirror.";
+			brazil_ghost = 6;
+			changequest 60353,60354;
 			close;
 		}
-	}
-	else {
-		mes "- A carpet with an intricate pattern on it -";
+	case 2:
+		mes "You do nothing.";
 		close;
 	}
 }
 
 bra_in01,151,180,3	script	Mirror#bra	CLEAR_NPC,{
-	if (brazil_ghost > 0) {
-		mes "- You can see a clean mirror without any marks or dust -";
+	mes "- You can see a clean mirror without any marks or dust -";
+	if (brazil_ghost == 0) {
+		close;
+	}
+	next;
+	switch(select("Examine it.", "Ignore.")) {
+	case 1:
+		mes "- What was the next line to that spell now? -";
+		input(.@input$);
+		next;
+		mes "["+strcharinfo(PC_NAME)+"]";
+		mes .@input$;
+		next;
+		.@braspell$ = "Where are you mom?";
+		.@chkspell = compare(.@braspell$,.@input$);
+		if (!.@chkspell) {
+			mes "Seems like you said something wrong.";
+			close;
+		}
+		if (brazil_ghost != 6) {
+			mes "Nothing happens.";
+			close;
+		}
+		mes "[Distant Sound]";
+		mes "^FF0000kihe! hit! hit! hit! hit!^000000";
+		next;
+		mes "[Distant Sound]";
+		mes "^FF0000kihe! hit! hit! hit! hit!^000000";
+		mes "^FF0000kihe! hit! hit! hit! hit!^000000";
+		next;
+		mes "[Distant Sound]";
+		mes "Behind you...";
+		enablenpc "Ghost#bra";
+		next;
+		emotion e_omg,1;
+		mes "["+strcharinfo(PC_NAME)+"]";
+		mes "The stories about the ghost are true~!";
+		next;
+		mes "[Ghost]";
+		mes "^FF0000my baby....^000000";
+		next;
+		mes "[Ghost]";
+		mes "^FF0000I can't see.... my eye....^000000";
+		mes "^FF0000What's going on....?^000000";
 		next;
-		switch(select("Examine it.", "Ignore.")) {
+		mes "- You take a deep breath and then look at the Ghost and notice it has an eye patch -";
+		next;
+		mes "[Ghost]";
+		mes "^FF0000My eyes are so tight... can you take this off?^000000";
+		next;
+		mes "You step carefully towards the ghost.";
+		next;
+		mes "His face was covered with dust making strange contortions with it's face.";
+		next;
+		mes "[Ghost]";
+		mes "^FF0000Come on help mom.....^000000";
+		next;
+		switch(select("Take the eye bandage off.", "Run away~.")) {
 		case 1:
-			mes "- What was the next line to that spell now? -";
-			input .@input$;
-			next;
-			mes "["+strcharinfo(PC_NAME)+"]";
-			mes .@input$;
-			next;
-			.@braspell$ = "Where are you mom?";
-			.@chkspell = compare(.@braspell$,.@input$);
-			if (!.@chkspell) {
-				mes "Seems like you said something wrong.";
-				close;
+			while(1) {
+				.@cpudice = rand(1,6);
+				.@pcdice = rand(1,6);
+				if (.@cpudice != .@pcdice) {
+					emotion (57+.@cpudice),0,"Ghost#bra";
+					emotion (57+.@cpudice),1;
+					break;
+				}
+			}
+			if (.@cpudice > .@pcdice) {
+				specialeffect(EF_DEVIL, AREA, playerattached());
+				mes "[Ghost]";
+				mes "^FF0000Go away!^000000";
+				brazil_ghost = 1;
+				changequest 60354,2208;
+				percentheal -50,-50;
+				close2;
+				disablenpc "Ghost#bra";
+				warp "bra_in01",12,183;
+				end;
 			}
 			else {
-				if (brazil_ghost == 6) {
-					mes "[Distant Sound]";
-					mes "^FF0000kihe! hit! hit! hit! hit!^000000";
-					next;
-					mes "[Distant Sound]";
-					mes "^FF0000kihe! hit! hit! hit! hit!^000000";
-					mes "^FF0000kihe! hit! hit! hit! hit!^000000";
-					next;
-					mes "[Distant Sound]";
-					mes "Behind you...";
-					enablenpc "Ghost#bra";
-					next;
-					emotion e_omg,1;
-					mes "["+strcharinfo(PC_NAME)+"]";
-					mes "The stories about the ghost are true~!";
-					next;
-					mes "[Ghost]";
-					mes "^FF0000my baby....^000000";
-					next;
-					mes "[Ghost]";
-					mes "^FF0000I can't see.... my eye....^000000";
-					mes "^FF0000What's going on....?^000000";
-					next;
-					mes "- You take a deep breath and then look at the Ghost and notice it has an eye patch -";
-					next;
-					mes "[Ghost]";
-					mes "^FF0000My eyes are so tight... can you take this off?^000000";
-					next;
-					mes "You step carefully towards the ghost.";
-					next;
-					mes "His face was covered with dust making strange contortions with it's face.";
-					next;
-					mes "[Ghost]";
-					mes "^FF0000Come on help mom.....^000000";
-					next;
-					switch(select("Take the eye bandage off.", "Run away~.")) {
-					case 1:
-						while(1) {
-							.@cpudice = rand(1,6);
-							.@pcdice = rand(1,6);
-							if (.@cpudice != .@pcdice) {
-								emotion (57+.@cpudice),0,"Ghost#bra";
-								emotion (57+.@cpudice),1;
-								break;
-							}
-						}
-						if (.@cpudice > .@pcdice) {
-							specialeffect(EF_DEVIL, AREA, playerattached());
-							mes "[Ghost]";
-							mes "^FF0000Go away!^000000";
-							brazil_ghost = 1;
-							changequest 60354,2208;
-							percentheal -50,-50;
-							close2;
-							disablenpc "Ghost#bra";
-							warp "bra_in01",12,183;
-							end;
-						}
-						else {
-							emotion e_bzz,1;
-							mes "[Ghost]";
-							mes "^FF0000Ahh!^000000";
-							mes "The Ghost disappeared into the toilet.";
-							brazil_ghost = 7;
-							changequest 60354,60355;
-							close2;
-							disablenpc "Ghost#bra";
-							warp "bra_in01",206,100;
-							end;
-						}
-					case 2:
-						mes "You run away from the ghost.";
-						close2;
-						brazil_ghost = 1;
-						changequest 60354,2208;
-						warp "bra_in01",12,183;
-						disablenpc "Ghost#bra";
-						end;
-					}
-					close;
-				}
-				else {
-					mes "Nothing happens.";
-					close;
-				}
+				emotion e_bzz,1;
+				mes "[Ghost]";
+				mes "^FF0000Ahh!^000000";
+				mes "The Ghost disappeared into the toilet.";
+				brazil_ghost = 7;
+				changequest 60354,60355;
+				close2;
+				disablenpc "Ghost#bra";
+				warp "bra_in01",206,100;
+				end;
 			}
 		case 2:
-			mes "You do nothing.";
-			close;
+			mes "You run away from the ghost.";
+			close2;
+			brazil_ghost = 1;
+			changequest 60354,2208;
+			warp "bra_in01",12,183;
+			disablenpc "Ghost#bra";
+			end;
 		}
-	}
-	else {
-		mes "- You can see a clean mirror without any marks or dust -";
+		close;
+	case 2:
+		mes "You do nothing.";
 		close;
 	}
 }
diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt
index 1b57e4397..ac6e54622 100644
--- a/npc/re/quests/quests_dewata.txt
+++ b/npc/re/quests/quests_dewata.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)  Lemongrass
-//= Copyright (C)  Euphy
-//= Copyright (C)  Muad_Dib
-//= Copyright (C)  Gennosuke Kouga
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Lemongrass
+//= Copyright (C) Euphy
+//= Copyright (C) Muad_Dib
+//= Copyright (C) Gennosuke Kouga
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -1706,7 +1706,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	2_M_OLDBLSMITH,{
 		next;
 		mes "- He seems to be asking for the Island name. -";
 		next;
-		input .@island_name$;
+		input(.@island_name$);
 		next;
 		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "It's called "+ .@island_name$ +". What's wrong?";
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 817b4780d..960d3a580 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.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)  Frost
-//= Copyright (C)  Dastgir
-//= Copyright (C)  Joseph
-//= Copyright (C)  Masao
-//= Copyright (C)  Euphy
-//= Copyright (C)  Muad_Dib
-//= Copyright (C)  Gennosuke Kouga
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Frost
+//= Copyright (C) Dastgir
+//= Copyright (C) Joseph
+//= Copyright (C) Masao
+//= Copyright (C) Euphy
+//= Copyright (C) Muad_Dib
+//= Copyright (C) Gennosuke Kouga
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -131,7 +131,7 @@ dic_dun01,266,113,5	script	Curious Sapha#ep13_3_	4_MAN_BENKUNI,{
 		mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall.";
 		mes "How many do you want? You can buy up to 100.";
 		next;
-		input .@input;
+		input(.@input);
 		.@deal = 500 * .@input;
 		if (.@deal == 0) {
 			mes "[Curious Sapha]";
@@ -164,7 +164,7 @@ dic_dun01,266,113,5	script	Curious Sapha#ep13_3_	4_MAN_BENKUNI,{
 		mes "[Curious Sapha]";
 		mes "Do you have any useful information?";
 		mes "Please let me know!";
-		input .@str$;
+		input(.@str$);
 		next;
 		mes "[Curious Sapha]";
 		mes "It says ^0000FF"+.@str$+"^000000.";
@@ -4588,7 +4588,7 @@ dic_fild01,231,174,5	script	BK#ep133_18	4_M_MERCAT2,{
 		mes "- BK of the Cat Merchant group is being difficult.";
 		mes "What did Shay tell you to do?-";
 		next;
-		input .@inputstr$;
+		input(.@inputstr$);
 		if (.@inputstr$ == "Shay's special drink will be delivered" || .@inputstr$ == "Shay's special drink will be delivered.") {
 			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Hmm. If you don't cooperate,";
@@ -7517,7 +7517,7 @@ moc_para01,44,19,3	script	Cat Hand Agent#gekk	4_M_MERCAT2,{
 						mes "If you really mean it, then sign here.";
 						mes "I'm collecting signs to get on Gyareuk's good side... never mind. I will let them know you are my sponsor!";
 						next;
-						input .@inputstr$;
+						input(.@inputstr$);
 						mes "[Agent Geck]";
 						mes "" + strcharinfo(PC_NAME) + "? Human names are strange to me.";
 						next;
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index ac6717529..9cd41566a 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Dastgir
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Dastgir
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -140,13 +140,13 @@ ecl_fild01,94,322,5	script	Security Guard#ep14_2	4_M_FAIRYSOLDIER,{
 		mes "Please fill out your name, occupation, and level here.";
 		next;
 		mes "Write your name.";
-		input .@inputstr$;
+		input(.@inputstr$);
 		next;
 		mes "Write your occupation.";
-		input .@inputstr$;
+		input(.@inputstr$);
 		next;
 		mes "Write your level.";
-		input .@inputstr$;
+		input(.@inputstr$);
 		next;
 		mes "[Security Guard]";
 		mes "If you completed your forms, please submit them to the administrator over there.";
@@ -624,7 +624,7 @@ eclage,102,32,4	script	Fairy Carpenter#ep14_2	4_M_FAIRYKID2,{
 		next;
 		mes "[Fairy Carpenter]";
 		mes "Please write the number of pieces necessary for each length. If no pieces for that length are necessary, please write 0.";
-		input .@inputstr$;
+		input(.@inputstr$);
 		next;
 		if (.@inputstr$ != "002") {
 			mes "[Fairy Carpenter]";
@@ -1467,7 +1467,7 @@ eclage,191,200,4	script	Yube#ep14_2	4_M_FAIRYKID5,{
 		emotion e_what;
 		cutin "war_y3",2;
 		next;
-		input .@inputnum;
+		input(.@inputnum);
 		if (.@inputnum != 128) {
 			mes "[Yube]";
 			mes "Hmm~ I don't think so.";
@@ -1591,7 +1591,7 @@ eclage,191,200,4	script	Yube#ep14_2	4_M_FAIRYKID5,{
 		mes "I can make as many as 128. How many do you need?";
 		cutin "war_y4",2;
 		next;
-		input .@input;
+		input(.@input);
 		if (.@input < 1 || .@input > 128) {
 			mes "[Yube]";
 			mes "You aren't going to make them?";
@@ -10100,19 +10100,17 @@ ecl_in04,109,215,3	script	Hiel#pa0829	4_M_FAIRYSCHOLAR,{
 		mes "[Hiel]";
 		mes "Oh~ Someone referred you to me? Who was it? You better make sense, or I'll be sure to kick you out.";
 		next;
-		input .@inputstr$;
-		if (.@inputstr$ == "Clever"){
-			mes "[" + strcharinfo(PC_NAME) + "]";
-			mes .@inputstr$ + " referred me(" + strcharinfo(PC_NAME) + ") to you.";
-			next;
-		}
-		else {
+		input(.@inputstr$);
+		if (.@inputstr$ != "Clever") {
 			mes "[Hiel]";
 			mes "I don't know that person! Aren't you suspicious!";
 			close2;
 			warp "eclage",152,91;
 			end;
 		}
+		mes "[" + strcharinfo(PC_NAME) + "]";
+		mes .@inputstr$ + " referred me(" + strcharinfo(PC_NAME) + ") to you.";
+		next;
 		mes "[Hiel]";
 		mes "Oh really? Give me a minute. I'm going to wrap up what I am doing and come back.";
 		ep14_2_etran = 11;
@@ -10923,13 +10921,8 @@ ecl_in02,133,115,7	script	Prison Guard#pa0829	4_M_FAIRYSOLDIER2,{
 		mes "[Prison Guard]";
 		mes "I see, I don't think I ever saw you on our visitor's list. Who are you visiting?";
 		next;
-		input .@inputstr$;
-		if (.@inputstr$ == "Clever") {
-			mes "[Prison Guard]";
-			mes "^000099" + .@inputstr$ + "^000000? ... That means...";
-			next;
-		}
-		else {
+		input(.@inputstr$);
+		if (.@inputstr$ != "Clever") {
 			mes "[Prison Guard]";
 			mes "Hmm? You want to visit ^000099" + .@inputstr$ + "^000000? I don't see that visitation on the list. Are you sure you made a formal request?";
 			next;
@@ -10939,6 +10932,9 @@ ecl_in02,133,115,7	script	Prison Guard#pa0829	4_M_FAIRYSOLDIER2,{
 			}
 			close;
 		}
+		mes "[Prison Guard]";
+		mes "^000099" + .@inputstr$ + "^000000? ... That means...";
+		next;
 		mes "[Clever]";
 		mes "Huh? I've got a visitor? Yahoo! It's a visit! Yay~";
 		next;
@@ -11753,12 +11749,12 @@ ecl_in04,108,215,4	script	Supreme Elec rope#pa0829	HIDDEN_NPC,{
 }
 
 sec_in02,85,187,4	script	#pa0829Reactor11	4_M_FAIRYKID,3,3,{
-	input .@input;
+	input(.@input);
 	if (.@input == 1854) {
 		mes "[????]";
 		mes "Baby, you don't know why I'm upset, do you?";
 		mes "Present" + ep14_2_etran + "Dog";
-		input .@input;
+		input(.@input, 0);
 		ep14_2_etran = .@input;
 		if (ep14_2_mylord < 7) {
 			ep14_2_mylord = 7;
@@ -13748,7 +13744,7 @@ sec_in02,16,11,5	script	New Oz Image#1	4_M_MINSTREL1,1,1,{
 
 //== Memory of Professor Worm ==============================
 sec_in02,10,17,4	script	Professor Aide#worm	4_BULL,{
-	input .@input;
+	input(.@input);
 	if (.@input != 1917) {
 		mes "EEK!";
 		close;
@@ -19129,7 +19125,7 @@ que_avan01,18,38,0	script	Desk#tl01	CLEAR_NPC,{
 								mes "In the middle, there is a small numerical panel. A 5-digit number can be inputted.";
 								next;
 								if (select("Input a number.", "Look at other parts of the desk.")==1) {
-									input .@input;
+									input(.@input);
 									if (.@input == 31425) {
 										mes "As soon as the number is inputted, a click is heard.";
 										mes "The hinged device can be opened.";
diff --git a/npc/re/quests/quests_glastheim.txt b/npc/re/quests/quests_glastheim.txt
index cc6f2dc9d..c3ec8d06d 100644
--- a/npc/re/quests/quests_glastheim.txt
+++ b/npc/re/quests/quests_glastheim.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2016  Hercules Dev Team
-//= Copyright (C) 2016  Ridley
+//= Copyright (C) 2016-2020 Hercules Dev Team
+//= Copyright (C) 2016 Ridley
 //=
 //= 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/re/quests/quests_izlude.txt b/npc/re/quests/quests_izlude.txt
index 661fb735e..bd71f9fa2 100644
--- a/npc/re/quests/quests_izlude.txt
+++ b/npc/re/quests/quests_izlude.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)  Euphy
-//= Copyright (C)  Masao
-//= Copyright (C)  Daegaladh
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
+//= Copyright (C) Daegaladh
 //=
 //= 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/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt
index 070368a23..9369f298a 100644
--- a/npc/re/quests/quests_lighthalzen.txt
+++ b/npc/re/quests/quests_lighthalzen.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2016  Hercules Dev Team
-//= Copyright (C)  AtlantisRO
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) AtlantisRO
 //=
 //= 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/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 786aeccb1..0d22c9565 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.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)  Muad_Dib
+//= Copyright (C) 2012-2020 Hercules Dev Team
+//= Copyright (C) Euphy
+//= 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
@@ -185,12 +185,13 @@ mal_in02,134,31,5	script	Investment Cat Helper	4_WHITETIGER,{
 			mes "Isn't it lovely?";
 			mes "How many will you invest in? Enter 0 to cancel.";
 			next;
-			input .@input;
-			if (.@input == 0) {
+			input(.@input);
+			if (.@input <= 0) {
 				mes "[Investment Cat Helper]";
 				mes "Please invest next time~";
 				close;
-			} else if (.@input > 10) {
+			}
+			if (.@input > 10) {
 				mes "[Investment Cat Helper]";
 				mes "You can get a maximum of 10 accounts~";
 				close;
@@ -299,29 +300,29 @@ mal_in02,134,31,5	script	Investment Cat Helper	4_WHITETIGER,{
 		mes "[Investment Cat Helper]";
 		mes "The can donation can range from a minimum of 20 to a maximum of 10,000.";
 		next;
-		input .@input;
+		input(.@input);
 		if (.@input < 20 || .@input > 10000) {
 			mes "[Investment Cat Helper]";
 			mes "The can donation can range from a minimum of 20 to a maximum of 10,000.";
 			close;
-		} else if (countitem(Malang_Sp_Can) < .@input) { // Malang_Sp_Can
+		}
+		if (countitem(Malang_Sp_Can) < .@input) { // Malang_Sp_Can
 			mes "[Investment Cat Helper]";
 			mes "Hmm? You don't have enough cans.";
 			close;
-		} else {
-			delitem Malang_Sp_Can,.@input;
-			mes "[Investment Cat Helper]";
-			mes "Ohh! Thank you~";
-			next;
-			mes "[Investment Cat Helper]";
-			mes "Dear "+strcharinfo(PC_NAME)+" ~";
-			mes "I have only Increase AGI";
-			mes "and Blessing to give you.";
-			mes "Thank you.";
-			npcskill "AL_INCAGI",10,0,0;
-			npcskill "AL_BLESSING",10,0,0;
-			close;
 		}
+		delitem Malang_Sp_Can,.@input;
+		mes "[Investment Cat Helper]";
+		mes "Ohh! Thank you~";
+		next;
+		mes "[Investment Cat Helper]";
+		mes "Dear "+strcharinfo(PC_NAME)+" ~";
+		mes "I have only Increase AGI";
+		mes "and Blessing to give you.";
+		mes "Thank you.";
+		npcskill "AL_INCAGI",10,0,0;
+		npcskill "AL_BLESSING",10,0,0;
+		close;
 	}
 }
 
@@ -5556,7 +5557,7 @@ L_Viewpoint:
 				break;
 			}
 			next;
-			input .@input;
+			input(.@input);
 			if (.@input == .@nori_c) {
 				mes "The card slides out with a sound after entering the number.";
 				mes "^4d4dffYou have passed the "+strnpcinfo(NPC_NAME_VISIBLE)+"! Run to the next destination!^000000";
@@ -7755,7 +7756,7 @@ malangdo,161,197,4	script	Eryu#gamer	4_CAT,{
 		next;
 		mes "What do you want to say?";
 		next;
-		input .@inputstr$;
+		input(.@inputstr$);
 		if (.@inputstr$ == "Come back") {
 			erasequest 5083;
 			setquest 5084;
@@ -7984,7 +7985,7 @@ malangdo,230,197,4	script	Stew#gamer	4_CAT_3COLOR,{
 		next;
 		mes "What do you want to say?";
 		next;
-		input .@inputstr$;
+		input(.@inputstr$);
 		if (.@inputstr$ == "Come back") {
 			erasequest 5085;
 			setquest 5086;
@@ -8166,7 +8167,7 @@ malangdo,244,144,4	script	Ketchup#gamer	4_CAT_SAILOR3,{
 		next;
 		mes "What do you want to say?";
 		next;
-		input .@inputstr$;
+		input(.@inputstr$);
 		if (.@inputstr$ == "Come back") {
 			erasequest 5087;
 			setquest 5088;
@@ -8433,7 +8434,7 @@ malangdo,181,119,7	script	Eff#gamer	4_CAT_ADV2,{
 		next;
 		mes "What do you want to say?";
 		next;
-		input .@inputstr$;
+		input(.@inputstr$);
 		if (.@inputstr$ == "Come back") {
 			erasequest 5089;
 			setquest 5090;
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 091d8527a..143fc07bc 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -9,11 +9,11 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Michieru
-//= Copyright (C)  DeadlySilence
-//= Copyright (C)  Euphy
-//= Copyright (C)  Masao
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Michieru
+//= Copyright (C) DeadlySilence
+//= Copyright (C) Euphy
+//= Copyright (C) Masao
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -2088,13 +2088,14 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 				mes "How many Silver Crosses do you need?";
 				mes "I can make up to 50 at a time.";
 				next;
-				input .@amount;
-				if (.@amount == 0) {
+				input(.@amount);
+				if (.@amount <= 0) {
 					mes "[Pandoi]";
 					mes "Don't need Silver Crosses?";
 					mes "Well, I can take a rest then. Ha ha ha ha~";
 					close;
-				} else if (.@amount > 50) {
+				}
+				if (.@amount > 50) {
 					mes "[Pandoi]";
 					mes "A maximum of 50 at a time!";
 					close;
@@ -8317,7 +8318,7 @@ ma_fild01,1,1,4	script	Pintados Manager#pin	4_F_KHELLISIA,{
 				mes "295 - 343 -> Day 7";
 				mes "Global 1 = 1 hr.";
 				next;
-				input .@input;
+				input(.@input);
 				if (.@input < 0 || .@input > 344)
 					close;
 				$malaya_pintados_00 = .@input;
@@ -8326,7 +8327,7 @@ ma_fild01,1,1,4	script	Pintados Manager#pin	4_F_KHELLISIA,{
 				mes "Adjust the accumulated value for the Lesser Agimat.";
 				mes "Values can be adjusted between 0 to 1000.";
 				next;
-				input .@input;
+				input(.@input);
 				if (.@input < 0 || .@input > 1000)
 					close;
 				$malaya_pintados_01 = .@input;
@@ -8335,7 +8336,7 @@ ma_fild01,1,1,4	script	Pintados Manager#pin	4_F_KHELLISIA,{
 				mes "Adjust the accumulated value of the Silver Cross.";
 				mes "Values can be adjusted between 0 to 1000.";
 				next;
-				input .@input;
+				input(.@input);
 				if (.@input < 0 || .@input > 1000)
 					close;
 				$malaya_pintados_02 = .@input;
@@ -8344,7 +8345,7 @@ ma_fild01,1,1,4	script	Pintados Manager#pin	4_F_KHELLISIA,{
 				mes "Adjust the accumulated value for the Dyestuff.";
 				mes "Values can be adjusted between 0 to 300.";
 				next;
-				input .@input;
+				input(.@input);
 				if (.@input < 0 || .@input > 300)
 					close;
 				$malaya_pintados_03 = .@input;
@@ -8577,7 +8578,7 @@ ma_fild01,179,260,2	script	Festival Helper Boy#pin	4_M_BARYO_BOY,{
 			mes "[Isco]";
 			mes "He he... I'm slow with numbers. I get lost when it's over 50. How many will you give me?";
 			next;
-			input .@amount;
+			input(.@amount);
 			if (.@amount < 1 || .@amount > 50) {
 				mes "[Isco]";
 				mes "Sigh~ I'm lost! I can't count if the numbers are weird.";
@@ -8609,7 +8610,7 @@ ma_fild01,179,260,2	script	Festival Helper Boy#pin	4_M_BARYO_BOY,{
 			mes "[Isco]";
 			mes "He he... I'm slow with numbers. I get lost when it's over 50. How many will you give me?";
 			next;
-			input .@amount;
+			input(.@amount);
 			if (.@amount < 1 || .@amount > 50) {
 				mes "[Isco]";
 				mes "Sigh~ I told you I'm not good with numbers.";
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 34293d200..1ba417904 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -3618,7 +3618,7 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 			mes "You...  I saw. Feeling. I saw. Feeling.";
 			mes "You... Name?";
 			next;
-			input .@inputstr$;
+			input(.@inputstr$);
 			mes "[Fishee]";
 			mes .@inputstr$+" do.";
 			mes "No know. No remember..";
@@ -3756,7 +3756,7 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 			} else if (questprogress(5017)) {
 				mes "How will you bully the creature?";
 				next;
-				input .@inputstr$;
+				input(.@inputstr$);
 				mes "You do ^0000FF"+.@inputstr$+"^000000 to bully the unidentified creature.";
 				next;
 				setquest 5029;
@@ -4311,7 +4311,7 @@ mora,118,86,0	duplicate(???#mora)	???#ep14_muk05	CLEAR_NPC,2,2
 		next;
 		mes "What was the name of the unidentified creature?";
 		next;
-		input .@inputstr$;
+		input(.@inputstr$);
 		if (.@inputstr$ != "Fishee") {
 			mes "[???]";
 			mes "No Family. "+.@inputstr$+" No.";
diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt
index f88692561..08bd16769 100644
--- a/npc/re/quests/quests_morocc.txt
+++ b/npc/re/quests/quests_morocc.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
 //=
 //= 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/re/quests/quests_nameless.txt b/npc/re/quests/quests_nameless.txt
index 6d80c1c6a..440af3207 100644
--- a/npc/re/quests/quests_nameless.txt
+++ b/npc/re/quests/quests_nameless.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
 //=
 //= 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/re/quests/quests_payon.txt b/npc/re/quests/quests_payon.txt
new file mode 100644
index 000000000..6af5e647c
--- /dev/null
+++ b/npc/re/quests/quests_payon.txt
@@ -0,0 +1,35 @@
+//================= Hercules Script =======================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) JohnnyPlayy
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Quest NPCs located in Payon
+//================= Description ===========================================
+//= Quests related to Payon City.
+//================= Current Version =======================================
+//= 1.0
+//=========================================================================
+
+payon_in01,46,21,4	duplicate(Young man#12)	Young man#1	4_M_ORIENT02
diff --git a/npc/re/quests/quests_veins.txt b/npc/re/quests/quests_veins.txt
index 28509ef46..bcff20157 100644
--- a/npc/re/quests/quests_veins.txt
+++ b/npc/re/quests/quests_veins.txt
@@ -9,8 +9,8 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Euphy
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//= Copyright (C) Euphy
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by