* 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

1 files changed, 21 insertions, 10 deletions

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]";