* Standardization in some database files, and other minor cleaning

* Disabled Ash Vacuum Warper since it's no longer in iRO - fixes bugreport:6560 (quests\quests_13_1.txt)

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

3 files changed, 80 insertions, 115 deletions

diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt
index 2cc3fb36d..277895d6c 100644
--- a/npc/custom/etc/mvp_arena.txt
+++ b/npc/custom/etc/mvp_arena.txt
@@ -9,14 +9,14 @@
 //===== Description: =========================================
 //= Rooms containing 16 different MVPs
 //===== Additional Comments: =================================
-//= 1.0 first version of script
-//= 1.1 Optimised The MVP arena [massdriller]
+//= 1.0 - First version of script
+//= 1.1 - Optimised The MVP arena [massdriller]
 //= 1.2 - NPC in prontera [Silent]
 //= 1.3 - Removed Duplicates
 //= 1.4 - Optimized, text edited [Euphy]
 //============================================================
 
-// ==== Entrance ====
+// Entrance
 prontera,154,197,3	script	MVP Warper	768,{
 	mes "[ ^0065DFMVP Warper^000000 ]";
 	mes "Would you like to enter";
@@ -26,29 +26,30 @@ prontera,154,197,3	script	MVP Warper	768,{
 	close;
 }
 
-// ==== Information NPC ====
+// Information
 quiz_00,49,31,4	script	MVP Arena Guide	778,{
 	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.";
 	next;
 	switch(select("Information","Heal me!","Return to Prontera","Cancel")) {
-		case 1:
-			mes "[ ^0065DFMVP Arena Guide^000000 ]";
-			mes "There are four Keepers, and each can spawn four different MVPs.";
-			mes "There are eight rooms per Keeper, and sixteen MVPs in total.";
-			close;
-		case 2:
-			specialeffect2 313;
-			percentheal 100,100;
-			close;
-		case 3:
-			warp "prontera",156,179;
-			close;
-		case 4:
-			close; }
+	case 1:
+		mes "[ ^0065DFMVP Arena Guide^000000 ]";
+		mes "There are four Keepers, and each can spawn four different MVPs.";
+		mes "There are eight rooms per Keeper, and sixteen MVPs in total.";
+		close;
+	case 2:
+		specialeffect2 313;
+		percentheal 100,100;
+		close;
+	case 3:
+		warp "prontera",156,179;
+		close;
+	case 4:
+		close;
+	}
 }
 
-// ==== Keepers ====
+// Keepers
 function	script	Keeper	{
 	mes "[ ^0065DF"+strnpcinfo(1)+"^000000 ]";
 	mes "Which arena would you";
@@ -60,104 +61,65 @@ function	script	Keeper	{
 	if (getmapusers("pvp_n_"+.@i+"-"+getarg(0))>19) {
 		mes "[ ^0065DF"+strnpcinfo(1)+"^000000 ]";
 		mes "Sorry, this arena is full!";
-		close; }
+		close;
+	}
 	warp "pvp_n_"+.@i+"-"+getarg(0),102,102;
 	close;
 }
+quiz_00,56,31,4	script	Alpha MVP	770,{ callfunc "Keeper",2; }
+quiz_00,58,31,4	script	Beta MVP	773,{ callfunc "Keeper",3; }
+quiz_00,60,31,4	script	Theta MVP	774,{ callfunc "Keeper",4; }
+quiz_00,62,31,4	script	Epsilon MVP	776,{ callfunc "Keeper",5; }
 
-quiz_00,56,31,4	script	Alpha MVP	770,{
-	callfunc "Keeper",2; }
-quiz_00,58,31,4	script	Beta MVP	773,{
-	callfunc "Keeper",3; }
-quiz_00,60,31,4	script	Theta MVP	774,{
-	callfunc "Keeper",4; }
-quiz_00,62,31,4	script	Epsilon MVP	776,{
-	callfunc "Keeper",5; }
-
-// ==== Protectors ====
+// Protectors
 function	script	Protector	{
 	switch(select(""+((getarg(0)=="")?"":"Harder Monsters")+":Heal:Exit")) {
-		case 1:
-			warp getarg(0),102,102;
-			close;
-		case 2:
-			specialeffect2 313;
-			percentheal 100,100;
-			close;
-		case 3:
-			warp "prontera",156,179;
-			close; }
+	case 1:
+		warp getarg(0),102,102;
+		close;
+	case 2:
+		specialeffect2 313;
+		percentheal 100,100;
+		close;
+	case 3:
+		warp "prontera",156,179;
+		close;
+	}
 }
+pvp_n_1-2,100,100,4	script	MVP-Protector#01	727,{ callfunc "Protector","pvp_n_2-2"; }
+pvp_n_2-2,100,100,4	script	MVP-Protector#02	727,{ callfunc "Protector","pvp_n_3-2"; }
+pvp_n_3-2,100,100,4	script	MVP-Protector#03	727,{ callfunc "Protector","pvp_n_4-2"; }
+pvp_n_4-2,100,100,4	script	MVP-Protector#04	727,{ callfunc "Protector","pvp_n_5-2"; }
+pvp_n_5-2,100,100,4	script	MVP-Protector#05	727,{ callfunc "Protector","pvp_n_6-2"; }
+pvp_n_6-2,100,100,4	script	MVP-Protector#06	727,{ callfunc "Protector","pvp_n_7-2"; }
+pvp_n_7-2,100,100,4	script	MVP-Protector#07	727,{ callfunc "Protector","pvp_n_8-2"; }
+pvp_n_8-2,100,100,4	script	MVP-Protector#08	727,{ callfunc "Protector",""; }
+pvp_n_1-3,100,100,4	script	MVP-Protector#09	727,{ callfunc "Protector","pvp_n_2-3"; }
+pvp_n_2-3,100,100,4	script	MVP-Protector#10	727,{ callfunc "Protector","pvp_n_3-3"; }
+pvp_n_3-3,100,100,4	script	MVP-Protector#11	727,{ callfunc "Protector","pvp_n_4-3"; }
+pvp_n_4-3,100,100,4	script	MVP-Protector#12	727,{ callfunc "Protector","pvp_n_5-3"; }
+pvp_n_5-3,100,100,4	script	MVP-Protector#13	727,{ callfunc "Protector","pvp_n_6-3"; }
+pvp_n_6-3,100,100,4	script	MVP-Protector#14	727,{ callfunc "Protector","pvp_n_7-3"; }
+pvp_n_7-3,100,100,4	script	MVP-Protector#15	727,{ callfunc "Protector","pvp_n_8-3"; }
+pvp_n_8-3,100,100,4	script	MVP-Protector#16	727,{ callfunc "Protector",""; }
+pvp_n_1-4,100,100,4	script	MVP-Protector#17	727,{ callfunc "Protector","pvp_n_2-4"; }
+pvp_n_2-4,100,100,4	script	MVP-Protector#18	727,{ callfunc "Protector","pvp_n_3-4"; }
+pvp_n_3-4,100,100,4	script	MVP-Protector#19	727,{ callfunc "Protector","pvp_n_4-4"; }
+pvp_n_4-4,100,100,4	script	MVP-Protector#20	727,{ callfunc "Protector","pvp_n_5-4"; }
+pvp_n_5-4,100,100,4	script	MVP-Protector#21	727,{ callfunc "Protector","pvp_n_6-4"; }
+pvp_n_6-4,100,100,4	script	MVP-Protector#22	727,{ callfunc "Protector","pvp_n_7-4"; }
+pvp_n_7-4,100,100,4	script	MVP-Protector#23	727,{ callfunc "Protector","pvp_n_8-4"; }
+pvp_n_8-4,100,100,4	script	MVP-Protector#24	727,{ callfunc "Protector",""; }
+pvp_n_1-5,100,100,4	script	MVP-Protector#25	727,{ callfunc "Protector","pvp_n_2-5"; }
+pvp_n_2-5,100,100,4	script	MVP-Protector#26	727,{ callfunc "Protector","pvp_n_3-5"; }
+pvp_n_3-5,100,100,4	script	MVP-Protector#27	727,{ callfunc "Protector","pvp_n_4-5"; }
+pvp_n_4-5,100,100,4	script	MVP-Protector#28	727,{ callfunc "Protector","pvp_n_5-5"; }
+pvp_n_5-5,100,100,4	script	MVP-Protector#29	727,{ callfunc "Protector","pvp_n_6-5"; }
+pvp_n_6-5,100,100,4	script	MVP-Protector#30	727,{ callfunc "Protector","pvp_n_7-5"; }
+pvp_n_7-5,100,100,4	script	MVP-Protector#31	727,{ callfunc "Protector","pvp_n_8-5"; }
+pvp_n_8-5,100,100,4	script	MVP-Protector#32	727,{ callfunc "Protector",""; }
 
-pvp_n_1-2,100,100,4	script	MVP-Protector#01	727,{
-	callfunc "Protector","pvp_n_2-2"; }
-pvp_n_2-2,100,100,4	script	MVP-Protector#02	727,{
-	callfunc "Protector","pvp_n_3-2"; }
-pvp_n_3-2,100,100,4	script	MVP-Protector#03	727,{
-	callfunc "Protector","pvp_n_4-2"; }
-pvp_n_4-2,100,100,4	script	MVP-Protector#04	727,{
-	callfunc "Protector","pvp_n_5-2"; }
-pvp_n_5-2,100,100,4	script	MVP-Protector#05	727,{
-	callfunc "Protector","pvp_n_6-2"; }
-pvp_n_6-2,100,100,4	script	MVP-Protector#06	727,{
-	callfunc "Protector","pvp_n_7-2"; }
-pvp_n_7-2,100,100,4	script	MVP-Protector#07	727,{
-	callfunc "Protector","pvp_n_8-2"; }
-pvp_n_8-2,100,100,4	script	MVP-Protector#08	727,{
-	callfunc "Protector",""; }
-
-pvp_n_1-3,100,100,4	script	MVP-Protector#09	727,{
-	callfunc "Protector","pvp_n_2-3"; }
-pvp_n_2-3,100,100,4	script	MVP-Protector#10	727,{
-	callfunc "Protector","pvp_n_3-3"; }
-pvp_n_3-3,100,100,4	script	MVP-Protector#11	727,{
-	callfunc "Protector","pvp_n_4-3"; }
-pvp_n_4-3,100,100,4	script	MVP-Protector#12	727,{
-	callfunc "Protector","pvp_n_5-3"; }
-pvp_n_5-3,100,100,4	script	MVP-Protector#13	727,{
-	callfunc "Protector","pvp_n_6-3"; }
-pvp_n_6-3,100,100,4	script	MVP-Protector#14	727,{
-	callfunc "Protector","pvp_n_7-3"; }
-pvp_n_7-3,100,100,4	script	MVP-Protector#15	727,{
-	callfunc "Protector","pvp_n_8-3"; }
-pvp_n_8-3,100,100,4	script	MVP-Protector#16	727,{
-	callfunc "Protector",""; }
-
-pvp_n_1-4,100,100,4	script	MVP-Protector#17	727,{
-	callfunc "Protector","pvp_n_2-4"; }
-pvp_n_2-4,100,100,4	script	MVP-Protector#18	727,{
-	callfunc "Protector","pvp_n_3-4"; }
-pvp_n_3-4,100,100,4	script	MVP-Protector#19	727,{
-	callfunc "Protector","pvp_n_4-4"; }
-pvp_n_4-4,100,100,4	script	MVP-Protector#20	727,{
-	callfunc "Protector","pvp_n_5-4"; }
-pvp_n_5-4,100,100,4	script	MVP-Protector#21	727,{
-	callfunc "Protector","pvp_n_6-4"; }
-pvp_n_6-4,100,100,4	script	MVP-Protector#22	727,{
-	callfunc "Protector","pvp_n_7-4"; }
-pvp_n_7-4,100,100,4	script	MVP-Protector#23	727,{
-	callfunc "Protector","pvp_n_8-4"; }
-pvp_n_8-4,100,100,4	script	MVP-Protector#24	727,{
-	callfunc "Protector",""; }
-
-pvp_n_1-5,100,100,4	script	MVP-Protector#25	727,{
-	callfunc "Protector","pvp_n_2-5"; }
-pvp_n_2-5,100,100,4	script	MVP-Protector#26	727,{
-	callfunc "Protector","pvp_n_3-5"; }
-pvp_n_3-5,100,100,4	script	MVP-Protector#27	727,{
-	callfunc "Protector","pvp_n_4-5"; }
-pvp_n_4-5,100,100,4	script	MVP-Protector#28	727,{
-	callfunc "Protector","pvp_n_5-5"; }
-pvp_n_5-5,100,100,4	script	MVP-Protector#29	727,{
-	callfunc "Protector","pvp_n_6-5"; }
-pvp_n_6-5,100,100,4	script	MVP-Protector#30	727,{
-	callfunc "Protector","pvp_n_7-5"; }
-pvp_n_7-5,100,100,4	script	MVP-Protector#31	727,{
-	callfunc "Protector","pvp_n_8-5"; }
-pvp_n_8-5,100,100,4	script	MVP-Protector#32	727,{
-	callfunc "Protector",""; }
-
-// ==== Alpha ====
+// Alpha
 pvp_n_1-2,0,0,0,0	monster	Eddga	1115,3,60000,66000
 pvp_n_1-2,0,0,0,0	monster	Mistress	1059,1,60000,66000
 pvp_n_2-2,0,0,0,0	monster	Mistress	1059,3,60000,66000
@@ -186,7 +148,7 @@ pvp_n_8-2,0,0,0,0	monster	Mistress	1059,3,60000,66000
 pvp_n_8-2,0,0,0,0	monster	Moonlight	1150,3,60000,66000
 pvp_n_8-2,0,0,0,0	monster	Maya	1147,3,60000,66000
 
-// ==== Beta ====
+// Beta
 pvp_n_1-3,0,0,0,0	monster	Phreeoni	1159,3,60000,66000
 pvp_n_1-3,0,0,0,0	monster	Turtle General	1312,1,60000,66000
 pvp_n_2-3,0,0,0,0	monster	Phreeoni	1159,2,60000,66000
@@ -217,7 +179,7 @@ pvp_n_8-3,0,0,0,0	monster	Turtle General	1312,3,60000,66000
 pvp_n_8-3,0,0,0,0	monster	Orc Hero	1087,3,60000,66000
 pvp_n_8-3,0,0,0,0	monster	Orc Lord	1190,3,60000,66000
 
-// ==== Theta ====
+// Theta
 pvp_n_1-4,0,0,0,0	monster	Drake	1112,3,60000,66000
 pvp_n_1-4,0,0,0,0	monster	Osiris	1038,1,60000,66000
 pvp_n_2-4,0,0,0,0	monster	Drake	1112,2,60000,66000
@@ -248,7 +210,7 @@ pvp_n_8-4,0,0,0,0	monster	Osiris	1038,3,60000,66000
 pvp_n_8-4,0,0,0,0	monster	Doppelganger	1046,3,60000,66000
 pvp_n_8-4,0,0,0,0	monster	Lord of Death	1373,3,60000,66000
 
-// ==== Epsilon ====
+// Epsilon
 pvp_n_1-5,0,0,0,0	monster	Incantation Samurai	1492,3,60000,66000
 pvp_n_1-5,0,0,0,0	monster	Pharoh	1157,1,60000,66000
 pvp_n_2-5,0,0,0,0	monster	Incantation Samurai	1492,2,60000,66000
@@ -279,7 +241,7 @@ 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 ====
+// Mapflags
 pvp_n_1-1	mapflag	pvp_nightmaredrop	off
 pvp_n_2-1	mapflag	pvp_nightmaredrop	off
 pvp_n_3-1	mapflag	pvp_nightmaredrop	off
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index d0952decc..12709ac15 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -430,7 +430,7 @@ Zeny_short_HP:
 	if (select("Yes","No") == 2) goto L_end;
 	set @Hp, Zeny/$QW_HP_H_PRICE;
     	set @HpPrice, @Hp*$QW_HP_H_PRICE;
-    	if (@Sp == 1) mes "You're not worth the effort.";
+    	if (@Hp == 1) mes "You're not worth the effort.";
     	if (@Hp == 1) goto L_end;
     	set Zeny, Zeny-@HpPrice;
 	heal @Hp,0;
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index b86e393c2..9ec9edd61 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.5a
+//= 2.6
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -43,6 +43,7 @@
 //= 2.4 More optimization (-32kb). [Euphy]
 //= 2.5 Yet more optimization (-22kb). [Euphy]
 //= 2.5a Minor fixes. [Euphy]
+//= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
 //============================================================ 
 
 // Onward to the New World
@@ -14905,6 +14906,7 @@ que_dan02,102,42,3	script	Disfigured Corpse#moc2	457,{
 	close;
 }
 
+/*
 //Mid Camp Warper (gogoash), Translated from the Official [Slim]
 prontera,161,192,5	script	Ash Vacuum Warper	707,{
 	mes "[Warp Soldier]";
@@ -14934,3 +14936,4 @@ prontera,161,192,5	script	Ash Vacuum Warper	707,{
 	}
 	end;
 }
+*/
\ No newline at end of file