* Moved quest_variables.txt to /doc

* Added comments to some getitem/delitem calls
* Disabled nightmare drop in the custom mvp arena script
* Fixed problem with baby novice + swordsman quest (topic:160247)
* Fixed a typo and problem in the airship typing challenge

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11138 54d463be-8e91-2dee-dedb-b68131a5f0ec

12 files changed, 460 insertions, 452 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index fa646f2da..bfe32de0b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1555,7 +1555,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 	* Applied Rayce's suggestion to improve the script hash size usage. eA now
 	  uses a hash of 1024.
 	* Full Buster's auto-blind chance is now reducable by stats/items.
-2006/12/2
+2006/12/26
 	* Updated Charge Attack's damage equation as per the only source I've seen
 	  of it so far.
 	* Now Guardians/Emperium can't hit /be hit if their current map isn't a
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 77daf18aa..4cbd243d9 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -27,6 +27,8 @@
 	4425 Atros_Card			Chance that for 10 seconds your aspd will increase by 100% while attacking.
 
 ========================
+09/07
+	* Updated packet_db.txt with latest info [ultramage]
 09/06
 	* Fixed some item names and updated drop rates a little [Playtester]
 	* Updated two prices and a drop rate [Playtester]
diff --git a/db/packet_db.txt b/db/packet_db.txt
index e4753e551..7c48eb862 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -895,7 +895,7 @@ packet_ver: 20
 //2006-10-23aSakexe
 0x006d,110
 
-//2007-01-02aSakexe (grouped changes between this and 2006-04-24aSakexe)
+//2006-04-24aSakexe to 2007-01-02aSakexe
 0x023e,8
 0x0277,84
 0x0278,2
@@ -995,7 +995,7 @@ packet_ver: 22
 //2007-05-07aSakexe
 0x01fd,15,repairitem,2
 
-//2007-07-31aSakexe (grouped changes between this and 2007-02-27aSakexe)
+//2007-02-27aSakexe to 2007-09-04aSakexe
 0x0288,10
 0x0289,12
 0x02a6,22
@@ -1003,22 +1003,40 @@ packet_ver: 22
 0x02a8,162
 0x02a9,58
 0x02ad,8
-0x02ae,10
-0x02af,2
 0x02b0,85
 0x02b1,-1
-0x02b3,31
+0x02b2,-1
+0x02b3,107
 0x02b4,6
-0x02b5,12
+0x02b5,-1
 0x02b6,7
-0x02b7,10
+0x02b7,7
 0x02b8,22
 0x02b9,191
 0x02ba,11,hotkey,2:4:5:9
 0x02bb,8
 0x02bc,6
+0x02bf,10
+0x02c0,2
+0x02c1,-1
+0x02c2,-1
 0x02c4,26,partyinvite2,2
+0x02c5,30
+0x02c6,30
 0x02c7,7,replypartyinvite2,2,6
+0x02c8,3
+0x02c9,3
+0x02ca,3
+0x02cb,20
+0x02cc,4
+0x02cd,26
+0x02ce,10
+0x02cf,6
+0x02d0,-1
+0x02d1,-1
+0x02d2,-1
+0x02d3,4
+0x02d4,29
 
 //Add new packets here
 //packet_ver: 23
diff --git a/npc/quest_variables.txt b/doc/quest_variables.txt
index 1f2270dc1..1f2270dc1 100644
--- a/npc/quest_variables.txt
+++ b/doc/quest_variables.txt
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 355b023b9..8655908b4 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,11 @@
 Date		Added
 ======
+2007/09/07
+	* Moved quest_variables.txt to /doc
+	* Added comments to some getitem/delitem calls
+	* Disabled nightmare drop in the custom mvp arena script
+	* Fixed problem with baby novice + swordsman quest (topic:160247)
+	* Fixed a typo and problem in the airship typing challenge [ultramage]
 2007/08/30
 	* Updated Cursed Abbey spawns some more [Playtester]
 	* Fixed some minor bugs in the Sign Quest. [SinSloth]
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 934f96a68..3ea1ae87e 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -1,9 +1,9 @@
 //===== eAthena Script ======================================= 
 //= The Airship System Script
 //===== By: ================================================== 
-//= MasterOfMuppets
+//= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 0.9
+//= 0.9b
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -26,6 +26,7 @@
 //= 0.8 Moved Gambling NPC Kaci since it's part of a quest. [SinSloth]
 //= 0.8b Fixed a Little Bug with the "How Does the Airship Work" Quest. [Samuray22]
 //= 0.9 Fixed a incorrect variable changed form "mob_inv" to "mobinv". [Samuray22]
+//= 0.9b Fixed a typo and bad variable use in the Typing Challenge [ultramage]
 //============================================================ 
 
 //============================================================ 
@@ -423,8 +424,10 @@ s_Play:
 	mes "mistakes! Let's start~!";
 	next;
 	//below arrays are for simplified entering of new lines ;P
+
 	//first lines array
-	setarray $@textstringsa$[0],"^00FFFFthkelfkskeldmsiejdlsle^0000FFhfndkelsheidl",
+	setarray $@textstringsa$[0],
+	"^00FFFFthkelfkskeldmsiejdlsle^0000FFhfndkelsheidl",
 	"^993366hfjdkeldjsieldjs^663366hfjdjeiskdlefvbd",
 	"^00FFFFCoboman no chikara-yumei na",
 	"^993366belief love luck grimace sweat rush",
@@ -436,6 +439,7 @@ s_Play:
 	"^00CCFFI'm the King of all Weirdos! Now",
 	"^00CCFFBy the power of^000000",
 	"^00CCFF...silence. quiet benevolence...";
+
 	//second lines array
 	setarray $@textstringsb$[0],"skemd",
 	"",
@@ -450,6 +454,7 @@ s_Play:
 	"p-po-poi-po-poi-poin-poing",
 	"soul mate... wonder. enigma...";
 	//for the few 3-liners... =X
+
 	setarray $@textstringsc$[0],"",
 	"",
 	"COBO ON!",
@@ -462,10 +467,12 @@ s_Play:
 	"",
 	"GOD-POING. I NEVER LOSE!",
 	"cloud.";
+
 	//comparisation strings
-	setarray $@compstring$[0],"thkelfkskeldmsiejdlslehfndkelsheidlskemd",
+	setarray $@compstring$[0],
+	"thkelfkskeldmsiejdlslehfndkelsheidlskemd",
 	"hfjdkeldjsieldjshfjdjeiskdlefvbd",
-	"Coboman no chikara-yumei na chikara-dalookii na chikara da ze! COBO ON",
+	"Coboman no chikara-yumei na chikara-dalookii na chikara da ze! COBO ON!",
 	"belief love luck grimace sweat rush folktale rodimus optimus bumblebee",
 	"callipygian salacious lascivious licentious prurient concupiscent",
 	"uNflAPPaBLe LoVaBLe SeCreTs AnD BoWLiNg aGaINST tHe KarMA of YoUtH",
@@ -475,16 +482,18 @@ s_Play:
 	"I'm the King of all Weirdos! Now you know of my true power. Obey~!",
 	"By the power of p-po-poi-po-poi-poin-poing GOD-POING. I NEVER LOSE!",
 	"...silence. quiet benevolence... soul mate... wonder. enigma... cloud";
+
 	//lengths
 	setarray $@lengths[0],20,32,73,73,65,66,67,55,67,66,67,69;
+
 	//	initnpctimer;
-	mes "[Nils]";
+	// pick 2 distinct phrases and initialize related variables
 	set @index,rand(1,getarraysize($@textstringsa$))-1;
 	set @string1a$,$@textstringsa$[@index];
 	set @string1b$,$@textstringsb$[@index];
 	set @string1c$,$@textstringsc$[@index];
 	set @typingstring1$,$@compstring$[@index];
-	set @typingkeys,$@lengths[@index];
+
 	set @index2,rand(1,getarraysize($@textstringsa$))-1;
 	while (@index2 == @index) {
 		set @index2,rand(1,getarraysize($@textstringsa$))-1;
@@ -493,8 +502,11 @@ s_Play:
 	set @string2b$,$@textstringsb$[@index2];
 	set @string2c$,$@textstringsc$[@index2];
 	set @typingstring2$,$@compstring$[@index2];
-	set @typingkeys,@typingkeys+$@lengths[@index2];
+
+	set @typingkeys,$@lengths[@index]+$@lengths[@index2];
 	set @start,gettime(3)*60*60+gettime(2)*60+gettime(1);
+
+	mes "[Nils]";
 	mes @string1a$;
 	if(@string1b$ != "")mes @string1b$;
 	if(@string1c$ != "")mes @string1c$;
@@ -505,9 +517,8 @@ s_Play:
 	if(@string2b$ != "")mes @string2b$;
 	if(@string2c$ != "")mes @string2c$;
 	input @comparisonvar$[2];
-	if(@comparisonvar$[1] == @typingstring1$ && @comparisonvar$[2] == @typingstring2$)set @typingcorrect,1;
 	next;
-	if(!@typingcorrect)goto s_Fail;
+	if(@comparisonvar$[1] == @typingstring1$ && @comparisonvar$[2] == @typingstring2$) goto s_Fail;
 	set @time,(gettime(3)*60*60+gettime(2)*60+gettime(1))-@start; //seconds taken
 	set @mypoints,(@typingkeys * 100) / @time;
 	mes "[Nils]";
diff --git a/npc/custom/MVP_arena/amvp_func.txt b/npc/custom/MVP_arena/amvp_func.txt
index c7240956a..02e45e45a 100644
--- a/npc/custom/MVP_arena/amvp_func.txt
+++ b/npc/custom/MVP_arena/amvp_func.txt
@@ -67,35 +67,3 @@ function	script	Ramvp_M2	{
 		close;
 
 }
-
-function	script	Ramvp_Main	{
-
-menu "Intro",L_Intro,"I want to go back",L_Leave,"Heal me please",L_Heal,"Cancel",L_Cancel;
-
-L_Intro:
-mes "[ ^0065DFMVP Arena Guide^000000 ]";
-mes "Welcome and behold this sacred place, Here you will find out if you truly have what it takes to call yourself a warrior, and a Team mate.";
-next;
-mes "Here in [ ^0065DFSvRO^000000 ] we like to be a family, and as a family you learn you must help and assist one-another, so if you want to survive you should learn to Co-operate.";
-next;
-mes "There are Plenty of rooms with MVP's in them so don't all fight over the one room just cause you think it's the only one, just move to the next one.";
-next;
-mes "If you can't get along, and there is too much complaining about people stealing MVP kills and items... then this place will be removed.";
-next;
-mes "Now the npc's are in groups of monsters, there are 4 different mvps per each npc, i won't tell you which it's a surprise hehe.";
-next;
-mes "Good luck, Live long and Prosper!.";
-close;
-
-L_Leave:
-warp "prontera",156,179;
-close;
-
-L_Heal:
-Heal 32500,32500;
-close;
-
-L_Cancel:
-close;
-
-}
\ No newline at end of file
diff --git a/npc/custom/MVP_arena/arena_mvp.txt b/npc/custom/MVP_arena/arena_mvp.txt
index ac0694acb..a6853d3b5 100644
--- a/npc/custom/MVP_arena/arena_mvp.txt
+++ b/npc/custom/MVP_arena/arena_mvp.txt
@@ -4,328 +4,366 @@
 // - Removed Duplicates [Silent]
 
 prontera,154,197,3	script	MVP Warper	768,{
-mes "[ ^0065DFMVP Warper^000000 ]";
-mes "Would you like to go to the MVP Arena ?...";
-menu "Yes!",L_MVP,"No thanks.",L_No;
 
-L_MVP:
-warp "quiz_00",50,24;
-close;
-L_No:
-close;
+	mes "[ ^0065DFMVP Warper^000000 ]";
+	mes "Would you like to go to the MVP Arena ?...";
+
+	if (select("Yes!","No thanks.") == 2)
+		close;
+
+	close2;
+	warp "quiz_00",50,24;
+	end;
 }
+
+
 // --- Inside the Arena
 // --- NPC's That explains thigns
 quiz_00,49,31,4	script	MVP Arena Guide	778,{
-	callfunc "Ramvp_Main";
 
+	switch(select("Intro","I want to go back","Heal me please","Cancel"))
+	{
+	case 1:
+		mes "[ ^0065DFMVP Arena Guide^000000 ]";
+		mes "Welcome and behold this sacred place, Here you will find out if you truly have what it takes to call yourself a warrior, and a Team mate.";
+		next;
+		mes "Here in [ ^0065DFSvRO^000000 ] we like to be a family, and as a family you learn you must help and assist one-another, so if you want to survive you should learn to Co-operate.";
+		next;
+		mes "There are Plenty of rooms with MVP's in them so don't all fight over the one room just cause you think it's the only one, just move to the next one.";
+		next;
+		mes "If you can't get along, and there is too much complaining about people stealing MVP kills and items... then this place will be removed.";
+		next;
+		mes "Now the npc's are in groups of monsters, there are 4 different mvps per each npc, i won't tell you which it's a surprise hehe.";
+		next;
+		mes "Good luck, Live long and Prosper!.";
+		close;
+	break;
+	case 2:
+		close2;
+		warp "prontera",156,179;
+		end;
+	break;
+	case 3:
+		percentheal 100,100;
+		close;
+	break;
+	case 4:
+		close;
+	break;
+	}
+	close;
 }
 
 // --- The first Alpha-MVP warper
 quiz_00,56,31,4	script	Alpha MVP	770,{
-mes "[ ^0065DFAlpha MVP^000000 ]";
-mes "I am the first Keeper, are you ready?.";
-menu "Yes!",L_Yes,"Urrr No.",Lcancel;
+	mes "[ ^0065DFAlpha MVP^000000 ]";
+	mes "I am the first Keeper, are you ready?.";
+	if (select("Yes!","Urrr No.") == 2)
+		close;
 
-L_Yes:
-mes "[ ^0065DFAlpha MVP^000000 ]";
-mes "Which Arena you want to go to??";
-	menu "Arena 1 [" + getmapusers("pvp_n_1-2") + " / 50]",Larena1,
+	mes "[ ^0065DFAlpha MVP^000000 ]";
+	mes "Which Arena you want to go to??";
+	menu
+	"Arena 1 [" + getmapusers("pvp_n_1-2") + " / 50]",Larena1,
 	"Arena 2 [" + getmapusers("pvp_n_2-2") + " / 50]",Larena2,
 	"Arena 3 [" + getmapusers("pvp_n_3-2") + " / 15]",Larena3,
 	"Arena 4 [" + getmapusers("pvp_n_4-2") + " / 15]",Larena4,
 	"Arena 5 [" + getmapusers("pvp_n_5-2") + " / 15]",Larena5,
-	"Arena 6 [" + getmapusers("pvp_n_2-2") + " / 15]",Larena6,
-	"Arena 7 [" + getmapusers("pvp_n_3-2") + " / 15]",Larena7,
-	"Arena 8 [" + getmapusers("pvp_n_4-2") + " / 15]",Larena8,
+	"Arena 6 [" + getmapusers("pvp_n_6-2") + " / 15]",Larena6,
+	"Arena 7 [" + getmapusers("pvp_n_7-2") + " / 15]",Larena7,
+	"Arena 8 [" + getmapusers("pvp_n_8-2") + " / 15]",Larena8,
 	"Quit",Lcancel;
 
 Lcancel:
-close;
+	close;
 
 Larena1:
-if (getmapusers("pvp_n_1-2") > 49) goto Lsorry;
-callfunc "Ramvp_1";
-warp "pvp_n_1-2",102,102;
-close;
+	if (getmapusers("pvp_n_1-2") > 49) goto Lsorry;
+	callfunc "Ramvp_1";
+	warp "pvp_n_1-2",102,102;
+	close;
 
 Larena2:
-if (getmapusers("pvp_n_2-2") > 49) goto Lsorry;
-callfunc "Ramvp_1";
-warp "pvp_n_2-2",102,102;
-close;
+	if (getmapusers("pvp_n_2-2") > 49) goto Lsorry;
+	callfunc "Ramvp_1";
+	warp "pvp_n_2-2",102,102;
+	close;
 
 Larena3:
-if (getmapusers("pvp_n_3-2") > 14) goto Lsorry;
-callfunc "Ramvp_1";
-warp "pvp_n_3-2",102,102;
-close;
+	if (getmapusers("pvp_n_3-2") > 14) goto Lsorry;
+	callfunc "Ramvp_1";
+	warp "pvp_n_3-2",102,102;
+	close;
 
 Larena4:
-if (getmapusers("pvp_n_4-2") > 14) goto Lsorry;
-callfunc "Ramvp_1";
-warp "pvp_n_4-2",102,102;
-close;
+	if (getmapusers("pvp_n_4-2") > 14) goto Lsorry;
+	callfunc "Ramvp_1";
+	warp "pvp_n_4-2",102,102;
+	close; 
 
 Larena5:
-if (getmapusers("pvp_n_5-2") > 14) goto Lsorry;
-callfunc "Ramvp_1";
-warp "pvp_n_5-2",102,102;
-close;
+	if (getmapusers("pvp_n_5-2") > 14) goto Lsorry;
+	callfunc "Ramvp_1";
+	warp "pvp_n_5-2",102,102;
+	close;
 
 Larena6:
-if (getmapusers("pvp_n_6-2") > 14) goto Lsorry;
-callfunc "Ramvp_1";
-warp "pvp_n_6-2",102,102;
-close;
+	if (getmapusers("pvp_n_6-2") > 14) goto Lsorry;
+	callfunc "Ramvp_1";
+	warp "pvp_n_6-2",102,102;
+	close;
 
 Larena7:
-if (getmapusers("pvp_n_7-2") > 14) goto Lsorry;
-callfunc "Ramvp_1";
-warp "pvp_n_7-2",102,102;
-close;
+	if (getmapusers("pvp_n_7-2") > 14) goto Lsorry;
+	callfunc "Ramvp_1";
+	warp "pvp_n_7-2",102,102;
+	close;
 
 Larena8:
-if (getmapusers("pvp_n_8-2") > 14) goto Lsorry;
-callfunc "Ramvp_1";
-warp "pvp_n_8-2",102,102;
-close;
+	if (getmapusers("pvp_n_8-2") > 14) goto Lsorry;
+	callfunc "Ramvp_1";
+	warp "pvp_n_8-2",102,102;
+	close;
 
 Lsorry:
-mes "[ ^0065DFAlpha MVP^000000 ]";
-mes "Sorry but this Arena is already full, maybe you can try another one!";
-close;
+	mes "[ ^0065DFAlpha MVP^000000 ]";
+	mes "Sorry but this Arena is already full, maybe you can try another one!";
+	close;
 }
 
+
 // --- The first Beta-MVP warper
 quiz_00,58,31,4	script	Beta MVP	773,{
-mes "[ ^0065DFAlpha MVP^000000 ]";
-mes "I am the first Keeper, are you ready?.";
-menu "Yes!",L_Yes,"Urrr No.",Lcancel;
+	mes "[ ^0065DFAlpha MVP^000000 ]";
+	mes "I am the first Keeper, are you ready?.";
+	menu "Yes!",L_Yes,"Urrr No.",Lcancel;
 
 L_Yes:
-mes "[ ^0065DFBeta MVP^000000 ]";
-mes "Which Arena you want to go to??";
-	menu "Arena 1 [" + getmapusers("pvp_n_1-3") + " / 50]",Larena1,
+	mes "[ ^0065DFBeta MVP^000000 ]";
+	mes "Which Arena you want to go to??";
+	menu
+	"Arena 1 [" + getmapusers("pvp_n_1-3") + " / 50]",Larena1,
 	"Arena 2 [" + getmapusers("pvp_n_2-3") + " / 15]",Larena2,
 	"Arena 3 [" + getmapusers("pvp_n_3-3") + " / 15]",Larena3,
 	"Arena 4 [" + getmapusers("pvp_n_4-3") + " / 15]",Larena4,
 	"Arena 5 [" + getmapusers("pvp_n_5-3") + " / 15]",Larena5,
-	"Arena 6 [" + getmapusers("pvp_n_2-3") + " / 15]",Larena6,
-	"Arena 7 [" + getmapusers("pvp_n_3-3") + " / 15]",Larena7,
-	"Arena 8 [" + getmapusers("pvp_n_4-3") + " / 15]",Larena8,
+	"Arena 6 [" + getmapusers("pvp_n_6-3") + " / 15]",Larena6,
+	"Arena 7 [" + getmapusers("pvp_n_7-3") + " / 15]",Larena7,
+	"Arena 8 [" + getmapusers("pvp_n_8-3") + " / 15]",Larena8,
 	"Quit",Lcancel;
 
 Lcancel:
-close;
+	close;
 
 Larena1:
-if (getmapusers("pvp_n_1-3") > 49) goto Lsorry;
-callfunc "Ramvp_2";
-warp "pvp_n_1-3",102,102;
-close;
+	if (getmapusers("pvp_n_1-3") > 49) goto Lsorry;
+	callfunc "Ramvp_2";
+	warp "pvp_n_1-3",102,102;
+	close;
 
 Larena2:
-if (getmapusers("pvp_n_2-3") > 14) goto Lsorry;
-callfunc "Ramvp_2";
-warp "pvp_n_2-3",102,102;
-close;
+	if (getmapusers("pvp_n_2-3") > 14) goto Lsorry;
+	callfunc "Ramvp_2";
+	warp "pvp_n_2-3",102,102;
+	close;
 
 Larena3:
-if (getmapusers("pvp_n_3-3") > 14) goto Lsorry;
-callfunc "Ramvp_2";
-warp "pvp_n_3-3",102,102;
-close;
+	if (getmapusers("pvp_n_3-3") > 14) goto Lsorry;
+	callfunc "Ramvp_2";
+	warp "pvp_n_3-3",102,102;
+	close;
 
 Larena4:
-if (getmapusers("pvp_n_4-3") > 14) goto Lsorry;
-callfunc "Ramvp_2";
-warp "pvp_n_4-3",102,102;
-close;
+	if (getmapusers("pvp_n_4-3") > 14) goto Lsorry;
+	callfunc "Ramvp_2";
+	warp "pvp_n_4-3",102,102;
+	close;
 
 Larena5:
-if (getmapusers("pvp_n_5-3") > 14) goto Lsorry;
-callfunc "Ramvp_2";
-warp "pvp_n_5-3",102,102;
-close;
+	if (getmapusers("pvp_n_5-3") > 14) goto Lsorry;
+	callfunc "Ramvp_2";
+	warp "pvp_n_5-3",102,102;
+	close;
 
 Larena6:
-if (getmapusers("pvp_n_6-3") > 14) goto Lsorry;
-callfunc "Ramvp_2";
-warp "pvp_n_6-3",102,102;
-close;
+	if (getmapusers("pvp_n_6-3") > 14) goto Lsorry;
+	callfunc "Ramvp_2";
+	warp "pvp_n_6-3",102,102;
+	close;
 
 Larena7:
-if (getmapusers("pvp_n_7-3") > 14) goto Lsorry;
-callfunc "Ramvp_2";
-warp "pvp_n_7-3",102,102;
-close;
+	if (getmapusers("pvp_n_7-3") > 14) goto Lsorry;
+	callfunc "Ramvp_2";
+	warp "pvp_n_7-3",102,102;
+	close;
 
 Larena8:
-if (getmapusers("pvp_n_8-3") > 14) goto Lsorry;
-callfunc "Ramvp_2";
-warp "pvp_n_8-3",102,102;
-close;
+	if (getmapusers("pvp_n_8-3") > 14) goto Lsorry;
+	callfunc "Ramvp_2";
+	warp "pvp_n_8-3",102,102;
+	close;
 
 Lsorry:
-mes "[ ^0065DFBeta MVP^000000 ]";
-mes "Sorry but this Arena is already full, maybe you can try another one!";
-close;
+	mes "[ ^0065DFBeta MVP^000000 ]";
+	mes "Sorry but this Arena is already full, maybe you can try another one!";
+	close;
 }
 
 
 // --- The first Theta-MVP warper
 quiz_00,60,31,4	script	Theta MVP	774,{
-mes "[ ^0065DFTheta MVP^000000 ]";
-mes "I am the first Keeper, are you ready?.";
-menu "Yes!",L_Yes,"Urrr No.",Lcancel;
+	mes "[ ^0065DFTheta MVP^000000 ]";
+	mes "I am the first Keeper, are you ready?.";
+	menu "Yes!",L_Yes,"Urrr No.",Lcancel;
 
 L_Yes:
-mes "[ ^0065DFTheta MVP^000000 ]";
-mes "Which Arena you want to go to??";
-	menu "Arena 1 [" + getmapusers("pvp_n_1-4") + " / 50]",Larena1,
+	mes "[ ^0065DFTheta MVP^000000 ]";
+	mes "Which Arena you want to go to??";
+	menu
+	"Arena 1 [" + getmapusers("pvp_n_1-4") + " / 50]",Larena1,
 	"Arena 2 [" + getmapusers("pvp_n_2-4") + " / 15]",Larena2,
 	"Arena 3 [" + getmapusers("pvp_n_3-4") + " / 15]",Larena3,
 	"Arena 4 [" + getmapusers("pvp_n_4-4") + " / 15]",Larena4,
 	"Arena 5 [" + getmapusers("pvp_n_5-4") + " / 15]",Larena5,
-	"Arena 6 [" + getmapusers("pvp_n_2-4") + " / 15]",Larena6,
-	"Arena 7 [" + getmapusers("pvp_n_3-4") + " / 15]",Larena7,
-	"Arena 8 [" + getmapusers("pvp_n_4-4") + " / 15]",Larena8,
+	"Arena 6 [" + getmapusers("pvp_n_6-4") + " / 15]",Larena6,
+	"Arena 7 [" + getmapusers("pvp_n_7-4") + " / 15]",Larena7,
+	"Arena 8 [" + getmapusers("pvp_n_8-4") + " / 15]",Larena8,
 	"Quit",Lcancel;
 
 Lcancel:
-close;
+	close;
 
 Larena1:
-if (getmapusers("pvp_n_1-4") > 49) goto Lsorry;
-callfunc "Ramvp_3";
-warp "pvp_n_1-4",102,102;
-close;
+	if (getmapusers("pvp_n_1-4") > 49) goto Lsorry;
+	callfunc "Ramvp_3";
+	warp "pvp_n_1-4",102,102;
+	close;
 
 Larena2:
-if (getmapusers("pvp_n_2-4") > 14) goto Lsorry;
-callfunc "Ramvp_3";
-warp "pvp_n_2-4",102,102;
-close;
+	if (getmapusers("pvp_n_2-4") > 14) goto Lsorry;
+	callfunc "Ramvp_3";
+	warp "pvp_n_2-4",102,102;
+	close;
 
 Larena3:
-if (getmapusers("pvp_n_3-4") > 14) goto Lsorry;
-callfunc "Ramvp_3";
-warp "pvp_n_3-4",102,102;
-close;
+	if (getmapusers("pvp_n_3-4") > 14) goto Lsorry;
+	callfunc "Ramvp_3";
+	warp "pvp_n_3-4",102,102;
+	close;
 
 Larena4:
-if (getmapusers("pvp_n_4-4") > 14) goto Lsorry;
-mes "[ ^0065DFTheta MVP^000000 ]";
-mes "Here you go!";
-warp "pvp_n_4-4",102,102;
-close;
+	if (getmapusers("pvp_n_4-4") > 14) goto Lsorry;
+	mes "[ ^0065DFTheta MVP^000000 ]";
+	mes "Here you go!";
+	warp "pvp_n_4-4",102,102;
+	close;
 
 Larena5:
-if (getmapusers("pvp_n_5-4") > 14) goto Lsorry;
-callfunc "Ramvp_3";
-warp "pvp_n_5-4",102,102;
-close;
+	if (getmapusers("pvp_n_5-4") > 14) goto Lsorry;
+	callfunc "Ramvp_3";
+	warp "pvp_n_5-4",102,102;
+	close;
 
 Larena6:
-if (getmapusers("pvp_n_6-4") > 14) goto Lsorry;
-callfunc "Ramvp_3";
-warp "pvp_n_6-4",102,102;
-close;
+	if (getmapusers("pvp_n_6-4") > 14) goto Lsorry;
+	callfunc "Ramvp_3";
+	warp "pvp_n_6-4",102,102;
+	close;
 
 Larena7:
-if (getmapusers("pvp_n_7-4") > 14) goto Lsorry;
-callfunc "Ramvp_3";
-warp "pvp_n_7-4",102,102;
-close;
+	if (getmapusers("pvp_n_7-4") > 14) goto Lsorry;
+	callfunc "Ramvp_3";
+	warp "pvp_n_7-4",102,102;
+	close;
 
 Larena8:
-if (getmapusers("pvp_n_8-4") > 14) goto Lsorry;
-callfunc "Ramvp_3";
-warp "pvp_n_8-4",102,102;
-close;
+	if (getmapusers("pvp_n_8-4") > 14) goto Lsorry;
+	callfunc "Ramvp_3";
+	warp "pvp_n_8-4",102,102;
+	close;
 
 Lsorry:
-mes "[ ^0065DFTheta MVP^000000 ]";
-mes "Sorry but this Arena is already full, maybe you can try another one!";
-close;
+	mes "[ ^0065DFTheta MVP^000000 ]";
+	mes "Sorry but this Arena is already full, maybe you can try another one!";
+	close;
 }
 
 
 // --- The first Epsilon-MVP warper
 quiz_00,62,31,4	script	Epsilon MVP	776,{
-mes "[ ^0065DFEpsilon MVP^000000 ]";
-mes "I am the first Keeper, are you ready?.";
-menu "Yes!",L_Yes,"Urrr No.",Lcancel;
+	mes "[ ^0065DFEpsilon MVP^000000 ]";
+	mes "I am the first Keeper, are you ready?.";
+	menu "Yes!",L_Yes,"Urrr No.",Lcancel;
 
 L_Yes:
-mes "[ ^0065DFEpsilon MVP^000000 ]";
-mes "Which Arena you want to go to??";
-	menu "Arena 1 [" + getmapusers("pvp_n_1-5") + " / 50]",Larena1,
+	mes "[ ^0065DFEpsilon MVP^000000 ]";
+	mes "Which Arena you want to go to??";
+	menu
+	"Arena 1 [" + getmapusers("pvp_n_1-5") + " / 50]",Larena1,
 	"Arena 2 [" + getmapusers("pvp_n_2-5") + " / 15]",Larena2,
 	"Arena 3 [" + getmapusers("pvp_n_3-5") + " / 15]",Larena3,
 	"Arena 4 [" + getmapusers("pvp_n_4-5") + " / 15]",Larena4,
 	"Arena 5 [" + getmapusers("pvp_n_5-5") + " / 15]",Larena5,
-	"Arena 6 [" + getmapusers("pvp_n_2-5") + " / 15]",Larena6,
-	"Arena 7 [" + getmapusers("pvp_n_3-5") + " / 15]",Larena7,
-	"Arena 8 [" + getmapusers("pvp_n_4-5") + " / 15]",Larena8,
+	"Arena 6 [" + getmapusers("pvp_n_6-5") + " / 15]",Larena6,
+	"Arena 7 [" + getmapusers("pvp_n_7-5") + " / 15]",Larena7,
+	"Arena 8 [" + getmapusers("pvp_n_8-5") + " / 15]",Larena8,
 	"Quit",Lcancel;
 
 Lcancel:
-close;
+	close;
 
 Larena1:
-if (getmapusers("pvp_n_1-5") > 49) goto Lsorry;
-callfunc "Ramvp_4";
-warp "pvp_n_1-5",102,102;
-close;
+	if (getmapusers("pvp_n_1-5") > 49) goto Lsorry;
+	callfunc "Ramvp_4";
+	warp "pvp_n_1-5",102,102;
+	close;
 
 Larena2:
-if (getmapusers("pvp_n_2-5") > 14) goto Lsorry;
-callfunc "Ramvp_4";
-warp "pvp_n_2-5",102,102;
-close;
+	if (getmapusers("pvp_n_2-5") > 14) goto Lsorry;
+	callfunc "Ramvp_4";
+	warp "pvp_n_2-5",102,102;
+	close;
 
 Larena3:
-if (getmapusers("pvp_n_3-5") > 14) goto Lsorry;
-callfunc "Ramvp_4";
-warp "pvp_n_3-5",102,102;
-close;
+	if (getmapusers("pvp_n_3-5") > 14) goto Lsorry;
+	callfunc "Ramvp_4";
+	warp "pvp_n_3-5",102,102;
+	close;
 
 Larena4:
-if (getmapusers("pvp_n_4-5") > 14) goto Lsorry;
-callfunc "Ramvp_4";
-warp "pvp_n_4-5",102,102;
-close;
+	if (getmapusers("pvp_n_4-5") > 14) goto Lsorry;
+	callfunc "Ramvp_4";
+	warp "pvp_n_4-5",102,102;
+	close;
 
 Larena5:
-if (getmapusers("pvp_n_5-5") > 14) goto Lsorry;
-callfunc "Ramvp_4";
-warp "pvp_n_5-5",102,102;
-close;
+	if (getmapusers("pvp_n_5-5") > 14) goto Lsorry;
+	callfunc "Ramvp_4";
+	warp "pvp_n_5-5",102,102;
+	close;
 
 Larena6:
-if (getmapusers("pvp_n_6-5") > 14) goto Lsorry;
-callfunc "Ramvp_4";
-warp "pvp_n_6-5",102,102;
-close;
+	if (getmapusers("pvp_n_6-5") > 14) goto Lsorry;
+	callfunc "Ramvp_4";
+	warp "pvp_n_6-5",102,102;
+	close;
 
 Larena7:
-if (getmapusers("pvp_n_7-5") > 14) goto Lsorry;
-callfunc "Ramvp_4";
-warp "pvp_n_7-5",102,102;
-close;
+	if (getmapusers("pvp_n_7-5") > 14) goto Lsorry;
+	callfunc "Ramvp_4";
+	warp "pvp_n_7-5",102,102;
+	close;
 
 Larena8:
-if (getmapusers("pvp_n_8-5") > 14) goto Lsorry;
-callfunc "Ramvp_4";
-warp "pvp_n_8-5",102,102;
-close;
+	if (getmapusers("pvp_n_8-5") > 14) goto Lsorry;
+	callfunc "Ramvp_4";
+	warp "pvp_n_8-5",102,102;
+	close;
 
 Lsorry:
-mes "[ ^0065DFEpsilon MVP^000000 ]";
-mes "Sorry but this Arena is already full, maybe you can try another one!";
-close;
+	mes "[ ^0065DFEpsilon MVP^000000 ]";
+	mes "Sorry but this Arena is already full, maybe you can try another one!";
+	close;
 }
 
 
@@ -335,20 +373,19 @@ pvp_n_1-2,100,100,4	script	MVP-Protector#01	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_2-2",102,102;
-		close;
+L_Next:
+	warp "pvp_n_2-2",102,102;
+	close;
 
 }
-
 // --- Alpha-MVP #2
 pvp_n_2-2,100,100,4	script	MVP-Protector#02	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_3-2",102,102;
-		close;
+L_Next:
+	warp "pvp_n_3-2",102,102;
+	close;
 
 }
 // --- Alpha-MVP #3
@@ -356,9 +393,9 @@ pvp_n_3-2,100,100,4	script	MVP-Protector#03	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_4-2",102,102;
-		close;
+L_Next:
+	warp "pvp_n_4-2",102,102;
+	close;
 
 }
 // --- Alpha-MVP #4
@@ -366,9 +403,9 @@ pvp_n_4-2,100,100,4	script	MVP-Protector#04	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_5-2",102,102;
-		close;
+L_Next:
+	warp "pvp_n_5-2",102,102;
+	close;
 
 }
 // --- Alpha-MVP #5
@@ -376,9 +413,9 @@ pvp_n_5-2,100,100,4	script	MVP-Protector#05	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-		L_Next:
-		warp "pvp_n_6-2",102,102;
-		close;
+L_Next:
+	warp "pvp_n_6-2",102,102;
+	close;
 
 }
 // --- Alpha-MVP #6
@@ -386,9 +423,9 @@ pvp_n_6-2,100,100,4	script	MVP-Protector#06	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_7-2",102,102;
-		close;
+L_Next:
+	warp "pvp_n_7-2",102,102;
+	close;
 
 }
 // --- Alpha-MVP #7
@@ -396,100 +433,93 @@ pvp_n_7-2,100,100,4	script	MVP-Protector#07	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_8-2",102,102;
-		close;
+L_Next:
+	warp "pvp_n_8-2",102,102;
+	close;
 }
 // --- Alpha-MVP #8
 pvp_n_8-2,100,100,4	script	MVP-Protector#08	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M2";
 }
+
 // --- Beta-MVP #1
 pvp_n_1-3,100,100,4	script	MVP-Protector#09	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_2-3",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_2-3",102,102;
+	close;
 }
-
 // --- Beta-MVP #2
 pvp_n_2-3,100,100,4	script	MVP-Protector#10	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_3-3",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_3-3",102,102;
+	close;
 }
 // --- Beta-MVP #3
 pvp_n_3-3,100,100,4	script	MVP-Protector#11	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_4-3",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_4-3",102,102;
+	close;
 }
 // --- Beta-MVP #4
 pvp_n_4-3,100,100,4	script	MVP-Protector#12	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_5-3",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_5-3",102,102;
+	close;
 }
 // --- Beta-MVP #5
 pvp_n_5-3,100,100,4	script	MVP-Protector#13	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-		L_Next:
-		warp "pvp_n_6-3",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_6-3",102,102;
+	close;
 }
 // --- Beta-MVP #6
 pvp_n_6-3,100,100,4	script	MVP-Protector#14	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_7-3",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_7-3",102,102;
+	close;
 }
 // --- Beta-MVP #7
 pvp_n_7-3,100,100,4	script	MVP-Protector#15	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_8-3",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_8-3",102,102;
+	close;
 }
 // --- Beta-MVP #8
 pvp_n_8-3,100,100,4	script	MVP-Protector#16	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M2";
 }
+
 // --- Theta-MVP #1
 pvp_n_1-4,100,100,4	script	MVP-Protector#17	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_2-4",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_2-4",102,102;
+	close;
 }
 
 // --- Theta-MVP #2
@@ -497,75 +527,69 @@ pvp_n_2-4,100,100,4	script	MVP-Protector#18	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_3-4",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_3-4",102,102;
+	close;
 }
 // --- Theta-MVP #3
 pvp_n_3-4,100,100,4	script	MVP-Protector#19	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_4-4",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_4-4",102,102;
+	close;
 }
 // --- Theta-MVP #4
 pvp_n_4-4,100,100,4	script	MVP-Protector#20	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_5-4",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_5-4",102,102;
+	close;
 }
 // --- Theta-MVP #5
 pvp_n_5-4,100,100,4	script	MVP-Protector#21	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-		L_Next:
-		warp "pvp_n_6-4",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_6-4",102,102;
+	close;
 }
 // --- Theta-MVP #6
 pvp_n_6-4,100,100,4	script	MVP-Protector#22	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_7-4",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_7-4",102,102;
+	close;
 }
 // --- Theta-MVP #7
 pvp_n_7-4,100,100,4	script	MVP-Protector#23	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_8-4",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_8-4",102,102;
+	close;
 }
 // --- Theta-MVP #8
 pvp_n_8-4,100,100,4	script	MVP-Protector#24	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M2";
 }
+
 // --- Epsilon-MVP #1
 pvp_n_1-5,100,100,4	script	MVP-Protector#25	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_2-5",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_2-5",102,102;
+	close;
 }
 
 // --- Epsilon-MVP #2
@@ -573,59 +597,54 @@ pvp_n_2-5,100,100,4	script	MVP-Protector#26	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_3-5",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_3-5",102,102;
+	close;
 }
 // --- Epsilon-MVP #3
 pvp_n_3-5,100,100,4	script	MVP-Protector#27	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_4-5",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_4-5",102,102;
+	close;
 }
 // --- Epsilon-MVP #4
 pvp_n_4-5,100,100,4	script	MVP-Protector#28	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_5-5",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_5-5",102,102;
+	close;
 }
 // --- Epsilon-MVP #5
 pvp_n_5-5,100,100,4	script	MVP-Protector#29	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-		L_Next:
-		warp "pvp_n_6-5",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_6-5",102,102;
+	close;
 }
 // --- Epsilon-MVP #6
 pvp_n_6-5,100,100,4	script	MVP-Protector#30	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_7-5",102,102;
-		close;
-
+L_Next:
+	warp "pvp_n_7-5",102,102;
+	close;
 }
 // --- Epsilon-MVP #7
 pvp_n_7-5,100,100,4	script	MVP-Protector#31	727,{
 	mes "[ ^0065DFMVP-Protector^000000 ]";
 	callfunc "Ramvp_M";
 
-	L_Next:
-		warp "pvp_n_8-5",102,102;
-		close;
+L_Next:
+	warp "pvp_n_8-5",102,102;
+	close;
 }
 // --- Epsilon-MVP #8
 pvp_n_8-5,100,100,4	script	MVP-Protector#32	727,{
@@ -787,3 +806,45 @@ pvp_n_8-5,0,0,0,0	monster	Incantation Samurai	1492,3,60000,66000
 pvp_n_8-5,0,0,0,0	monster	Pharoh	1157,2,60000,66000
 pvp_n_8-5,0,0,0,0	monster	Dark Lord	1272,2,60000,66000
 pvp_n_8-5,0,0,0,0	monster	Baphomet	1039,2,60000,66000
+
+// ---- Mapflags for the MVP-Arena
+pvp_n_1-1	mapflag	pvp_nightmaredrop	off
+pvp_n_2-1	mapflag	pvp_nightmaredrop	off
+pvp_n_3-1	mapflag	pvp_nightmaredrop	off
+pvp_n_4-1	mapflag	pvp_nightmaredrop	off
+pvp_n_5-1	mapflag	pvp_nightmaredrop	off
+pvp_n_6-1	mapflag	pvp_nightmaredrop	off
+pvp_n_7-1	mapflag	pvp_nightmaredrop	off
+pvp_n_8-1	mapflag	pvp_nightmaredrop	off
+pvp_n_1-2	mapflag	pvp_nightmaredrop	off
+pvp_n_2-2	mapflag	pvp_nightmaredrop	off
+pvp_n_3-2	mapflag	pvp_nightmaredrop	off
+pvp_n_4-2	mapflag	pvp_nightmaredrop	off
+pvp_n_5-2	mapflag	pvp_nightmaredrop	off
+pvp_n_6-2	mapflag	pvp_nightmaredrop	off
+pvp_n_7-2	mapflag	pvp_nightmaredrop	off
+pvp_n_8-2	mapflag	pvp_nightmaredrop	off
+pvp_n_1-3	mapflag	pvp_nightmaredrop	off
+pvp_n_2-3	mapflag	pvp_nightmaredrop	off
+pvp_n_3-3	mapflag	pvp_nightmaredrop	off
+pvp_n_4-3	mapflag	pvp_nightmaredrop	off
+pvp_n_5-3	mapflag	pvp_nightmaredrop	off
+pvp_n_6-3	mapflag	pvp_nightmaredrop	off
+pvp_n_7-3	mapflag	pvp_nightmaredrop	off
+pvp_n_8-3	mapflag	pvp_nightmaredrop	off
+pvp_n_1-4	mapflag	pvp_nightmaredrop	off
+pvp_n_2-4	mapflag	pvp_nightmaredrop	off
+pvp_n_3-4	mapflag	pvp_nightmaredrop	off
+pvp_n_4-4	mapflag	pvp_nightmaredrop	off
+pvp_n_5-4	mapflag	pvp_nightmaredrop	off
+pvp_n_6-4	mapflag	pvp_nightmaredrop	off
+pvp_n_7-4	mapflag	pvp_nightmaredrop	off
+pvp_n_8-4	mapflag	pvp_nightmaredrop	off
+pvp_n_1-5	mapflag	pvp_nightmaredrop	off
+pvp_n_2-5	mapflag	pvp_nightmaredrop	off
+pvp_n_3-5	mapflag	pvp_nightmaredrop	off
+pvp_n_4-5	mapflag	pvp_nightmaredrop	off
+pvp_n_5-5	mapflag	pvp_nightmaredrop	off
+pvp_n_6-5	mapflag	pvp_nightmaredrop	off
+pvp_n_7-5	mapflag	pvp_nightmaredrop	off
+pvp_n_8-5	mapflag	pvp_nightmaredrop	off
diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 072df242e..d66971121 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9b
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -31,6 +31,7 @@
 //=	Removed "green" traps, quest is no longer timed.
 //=	No longer uses function "F_ToHigh"
 //= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf]
+//= 1.9b Fixed usage of wrong jobchange func messing up baby classes [ultramage]
 //============================================================ 
 
 izlude_in,74,172,4	script	Swordman	119,{
@@ -150,7 +151,7 @@ izlude_in,74,172,4	script	Swordman	119,{
 		else if (job_sword_q == 4) {
 			mes "Hahaha! Congratulations! Now you are fully qualified to be a real Swordman! I will transform you right away!";
 			next;
-			jobchange Job_Swordman;
+			callfunc "Job_Change",Job_Swordman;
 			set job_sword_q,0;
 			mes "[Swordman]";
 			mes "Once again, congratulations. I expect that you will be a good representative of the Swordman Association.";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 3c8511741..4bd960bca 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -115,94 +115,36 @@ Lget:
 	next;
 	if (event_momo >= 1 && event_momo < 4)
 	{
-	switch(rand(1,10))
+		switch(rand(1,10))
 		{
-	case 1:
-		getitem 622,1; //rainbow carrot
-	break;
-
-	case 2:
-		getitem 627,1; //sweet milk
-	break;
-
-	case 3:
-		getitem 629,1; //singing flower
-	break;
-
-	case 4:
-		getitem 632,1; //fatty chubby earthworm
-	break;
-
-	case 5:
-		getitem 623,1; //earthworm the dude
-	break;
-
-	case 6:
-		getitem 619,1; //unripe apple
-	break;
-
-	case 7:
-		getitem 621,1; //bitter herb
-	break;
-
-	case 8:
-		getitem 620,1; //orange juice
-	break;
-
-	case 9:
-		getitem 625,1; //rusty iron
-	break;
-
-	case 10:
-		getitem 624,1; //rotten fish
-	break;
+		case 1: getitem 622,1; break; //rainbow carrot
+		case 2: getitem 627,1; break; //sweet milk
+		case 3: getitem 629,1; break; //singing flower
+		case 4: getitem 632,1; break; //fatty chubby earthworm
+		case 5: getitem 623,1; break; //earthworm the dude
+		case 6: getitem 619,1; break; //unripe apple
+		case 7: getitem 621,1; break; //bitter herb
+		case 8: getitem 620,1; break; //orange juice
+		case 9: getitem 625,1; break; //rusty iron
+		case 10: getitem 624,1; break; //rotten fish
 		}
 	}
 
 //Am Mut successful finish unknown
 	if (event_momo == 4)
 	{
-	switch(rand(1,10))
+		switch(rand(1,10))
 		{
-	case 1:
-		getitem 659,1; //her heart
-	break;
-
-	case 2:
-		getitem 633,1; //sweet potato
-	break;
-
-	case 3:
-		getitem 634,1; //tropical banana
-	break;
-
-	case 4:
-		getitem 639,1; //armlet of obedience
-	break;
-
-	case 5:
-		getitem 636,1; //no recipient
-	break;
-
-	case 6:
-		getitem 628,1; //well-dried bone
-	break;
-
-	case 7:
-		getitem 637,1; //old broom
-	break;
-
-	case 8:
-		getitem 635,1; //orc trophy
-	break;
-
-	case 9:
-		getitem 626,1; //monster juice
-	break;
-
-	case 10:
-		getitem 641,1; //contract in shadow
-	break;
+		case 1: getitem 659,1; break; //her heart
+		case 2: getitem 633,1; break; //sweet potato
+		case 3: getitem 634,1; break; //tropical banana
+		case 4: getitem 639,1; break; //armlet of obedience
+		case 5: getitem 636,1; break; //no recipient
+		case 6: getitem 628,1; break; //well-dried bone
+		case 7: getitem 637,1; break; //old broom
+		case 8: getitem 635,1; break; //orc trophy
+		case 9: getitem 626,1; break; //monster juice
+		case 10: getitem 641,1; break; //contract in shadow
 		}
 	}
 	set event_momo,5;
@@ -674,14 +616,14 @@ ama_in01,162,17,0	script	Iron Chef	765,{
 		L1_1:
 			if (Zeny < 700) goto Lzeny;
 			set Zeny,Zeny-700;
-			getitem 551,10;
+			getitem 551,10; //Sushi
 			mes "[If you have a chance, come try a little sashimi!]";
 			mes "Thank you very much";
 			close;
 		L1_2:
 			if (Zeny < 74) goto Lzeny;
 			set Zeny,Zeny-74;
-			getitem 551,1;
+			getitem 551,1; //Sushi
 			mes "[If you have a chance, come try a little sashimi!]";
 			mes "Thank you very much";
 			close;
@@ -701,14 +643,14 @@ ama_in01,162,17,0	script	Iron Chef	765,{
 		L2_1:
 			if (Zeny < 350) goto Lzeny;
 			set Zeny,Zeny-350;
-			getitem 544,10;
+			getitem 544,10; //Raw Fish
 			mes "[ShabuShabu]";
 			mes "Thank you very much";
 			close;
 		L2_2:
 			if (Zeny < 37) goto Lzeny;
 			set Zeny,Zeny-37;
-			getitem 544,1;
+			getitem 544,1; //Raw Fish
 			mes "[ShabuShabu]";
 			mes "Thank you very much";
 			close;
@@ -748,8 +690,8 @@ LStart2:
 	mes "You must help me find them!";
 	close;
 Lok:
-	delitem 964,10;
-	getitem 551,20;
+	delitem 964,10; //Clam Shell
+	getitem 551,20; //Sushi
 	mes "[ShabuShabu]";
 	mes "Hmm! Thank you so much";
 	next;
@@ -946,7 +888,7 @@ LStart2:
 	next;
 	monster "ama_in01",22,112,"Fox",1180,1;
 	killmonsterall "ama_in01";
-	getitem 1022,1;
+	getitem 1022,1; //Nine Tails
 	mes "[...]";
 	mes "^FF0066Everything that Paul Shinaku did";
 	mes "will sooner or later";
@@ -1073,7 +1015,7 @@ L1_2:
 L1_2_1:
 		if (Zeny < 10000) goto LError;
 		set Zeny,Zeny-10000;
-		getitem 7160,1;
+		getitem 7160,1; //Feudal Lord Permit
 		mes "[Kyro]";
 		mes "Come, this is it.";
 		mes "Please be careful and don't lose it again.";
@@ -1320,7 +1262,7 @@ LStart4:
 	mes "In this town";
 	next;
 	set event_amatsu,7;
-	getitem 7160,1;
+	getitem 7160,1; //Feudal Lord Permit
 	mes "[Ishida Yushinaku]";
 	mes "Although it's not such a great gift, but";
 	mes "I believe you will have use for it someday...";
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 9fd974c59..d1419003c 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -1547,7 +1547,7 @@ s_Tom:
 s_Take:
 	if(Zeny < 11000) goto s_NoZeny;
 	set Zeny, Zeny - 11000;
-	getitem 567,20;
+	getitem 567,20; //Shrimp
 	emotion e_no1;
 	mes "[Thongpool]";
 	mes "Good, now you have the freshest Shrimp in this village!";
@@ -1959,11 +1959,11 @@ s_ICheck:
 	next;
 s_Process:
 	if(countitem(523) < 2 || countitem(610) < 1 || countitem(7213) < 2 || countitem(7217) < 2)goto s_NEnoughItems;
-	delitem 523,2;
-	delitem 610,1;
-	delitem 7213,2;
-	delitem 7217,2;
-	getitem 7287,1;
+	delitem 523,2; //Holy Water
+	delitem 610,1; //Yggdrasil Leaf
+	delitem 7213,2; //Needle Packet
+	delitem 7217,2; //Spool
+	getitem 7287,1; //Holier Threads
 	if(ayodot != 8)set ayodot,8;
 	mes "[Boonthom]";
 	mes "Here you go.";
@@ -2389,7 +2389,7 @@ s_Shrimp:
 	close;
 
 s_EnoughShrimp:
-	delitem 567,20;
+	delitem 567,20; //Shrimp
 	mes "[Mali the Spicy]";
 	mes "Ah you came back!";
 	mes "Now, let me see what"; 
@@ -2449,7 +2449,7 @@ s_Lemons:
 	mes "Lemons so that I can make some Tom Yum Goong!";
 	close;
 s_EnoughLemon:
-	delitem 568,10;
+	delitem 568,10; //Lemon
 	emotion e_gasp;
 	mes "[Mali the Spicy]";
 	mes "Welcome back!";
@@ -2498,7 +2498,7 @@ s_Chilee:
 	mes "You should talk to the Merchants in the Market, they'll know what you want.";
 	close;
 s_EnoughChilee:
-	delitem 7286,30;
+	delitem 7286,30; //Red Chile
 	mes "[Mali the Spicy]";
 	mes "Now...";
 	mes "Everything is all set!";
@@ -2542,7 +2542,7 @@ s_EnoughChilee:
 	next;
 	set tomyumgoong,5;
 	set ayoshrimps,0;
-	getitem 566,10;
+	getitem 566,10; //Tom Yum Goong
 	emotion e_no1;
 	mes "[Mali the Spicy]";
 	mes "Here's your";
@@ -2635,7 +2635,7 @@ s_Chili:
 s_Take:
 	if(Zeny < 2000) goto s_NoZeny;
 	set Zeny, Zeny - 2000;
-	getitem 7286,30;
+	getitem 7286,30; //Red Chile
 	mes "[Merchant Thongdum]";
 	mes "Thank you.";
 	mes "I hhope you will enjoy";
@@ -2884,7 +2884,7 @@ s_Win2:
 	mes "Grab as many as you want!";
 	next;
 	set ayolemon,2;
-	getitem 568,10;
+	getitem 568,10; //Lemon
 	mes "^3C2EE6You have plucked";
 	mes "^3C2EE610 Lemons from the tree.";
 	next;
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index 5f84a1d7e..42b720eda 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -63,10 +63,9 @@ npc: npc/custom/adoption.txt
 // -- Unofficial Airplane Script
 //npc: npc/custom/airplane.txt
 // -- MVP Arena
+// ~ If you wish to use the mvp arena, please enable both scripts.
 //npc: npc/custom/MVP_arena/arena_mvp.txt
 //npc: npc/custom/MVP_arena/amvp_func.txt
-// ~ If you wish to have the mvp arena in your server, 
-// ~ please enable the mvp funtion too.
 // -- WoE Time Setter - Lets you set War of Emperium time easily from inside the game [Fredzilla]
 //npc: npc/custom/WoE_Setter.txt
 //