* Several fixes to various scripts.

- Resolves: bugreport:351, bugreport:379, bugreport:393, bugreport:407, bugreport:414, partially resolves bug report:414


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

6 files changed, 51 insertions, 66 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 6b79bdb44..fe002906d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2007/11/15
+	* Rev. 11733 Several fixes to various scripts. [L0ne_W0lf]
+	- Resolves: bugreport:351, bugreport:379, bugreport:393, bugreport:407,
+	  bugreport:414, partially resolves bug report:414
 2007/11/14
 	* Rev. 11729 Fixed warning in star gladiator job test. [L0ne_W0lf]
 	* Fixed error in assassin job test (missing ;)
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 7e3c8827d..6e1d889c0 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -3,14 +3,15 @@
 //===== By: ================================================== 
 //= DZeroX
 //===== Current Version: ===================================== 
-//= 1.02
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
 //= Town-specific Alberta NPCs
 //===== Additional Comments: ================================= 
 //= 1.0 Converted from Aegis 10.4 [DZeroX]
-//= 1.02 Optimized, missing next, REMOVED .GATs! again [Lupus]
+//= 1.1 Optimized, missing next, REMOVED .GATs! again [Lupus]
+//= 1.2 Implemented progression fixes provided by $ephiroth. [L0ne_W0lf]
 //============================================================
 
 alberta,97,51,0	script	Fabian	84,{
@@ -85,9 +86,9 @@ alberta,189,151,5	script	Fisk	100,{
 	mes "Ahoy mate,";
 	mes "where'd ya";
 	mes "wanna go?";
+	next;
 	switch(select("Sunken Ship -> 250 zeny.","Izlude Marina -> 500 zeny.","Never mind.")) {
 		case 1:
-			next;
 			if (Zeny < 250) {
 				mes "[Fisk]";
 				mes "Hey now, don't try to cheat me!";
@@ -98,7 +99,6 @@ alberta,189,151,5	script	Fisk	100,{
 			warp "alb2trea",43,53;
 			end;
 		case 2:
-			next;
 			if (Zeny < 500) {
 				mes "[Fisk]";
 				mes "Ain't no way yer getting there";
@@ -109,7 +109,6 @@ alberta,189,151,5	script	Fisk	100,{
 			warp "izlude",176,182;
 			end;
 		case 3:
-			next;
 			mes "[Fisk]";
 			mes "Alright...";
 			mes "Landlubber.";
@@ -121,6 +120,7 @@ alb2trea,39,50,6	script	Fisk#a2t	100,{
 	mes "[Fisk]";
 	mes "So you wanna head back to the";
 	mes "mainland in Alberta, eh?";
+	next;
 	if(select("Yes please.","I changed my mind.")==1)
 		warp "alberta",192,169;
 	close;
@@ -131,17 +131,17 @@ alberta,131,139,2	script	Drunken Old Man	54,{
 	mes "*^CCCCCCHiccup^000000*";
 	mes "Wh-what are you";
 	mes "staring at? Get lost!!";
+	next;	
 	switch(select("Say nothing.","Leave him alone.")) {
 		case 1:
-			next;
 			mes "[Deagle]";
 			mes "Hahahahaha *^CCCCCChiccup^000000*... You've got";
 			mes "some nerve. I may look worthless";
 			mes "now, but I used to be a sailor on";
 			mes "the 'Going Mary.'";
+			next;
 			switch(select("Never heard of it.","Really? No kidding!")) {
 				case 1:
-					next;
 					mes "[Deagle]";
 					mes "Never heard of it?! Everybody knows";
 					mes "th'notorious pirate ship 'Going";
@@ -158,7 +158,6 @@ alberta,131,139,2	script	Drunken Old Man	54,{
 					mes "before cap'n's sword.";
 					close;
 				case 2:
-					next;
 					mes "[Deagle]";
 					mes "That's right! NOBODY meshes with";
 					mes "the crew of the 'Going Mary!' And";
@@ -188,7 +187,6 @@ alberta,131,139,2	script	Drunken Old Man	54,{
 					close;
 			}
 		case 2:
-			next;
 			mes "[Deagle]";
 			mes "That's right!";
 			mes "Go AWAY~";
@@ -356,9 +354,9 @@ alberta,195,151,2	script	Paul	86,{
 	mes "The admission";
 	mes "fee is only";
 	mes "200 Zeny.";
+	next;
 	switch(select("Sign me up!","Uh, no thanks.")) {
 		case 1:
-			next;
 			if (Zeny < 200) {
 				mes "[Paul]";
 				mes "It seems you don't have the money,";
@@ -371,7 +369,6 @@ alberta,195,151,2	script	Paul	86,{
 				close;
 			}
 		case 2:
-			next;
 			mes "[Paul]";
 			mes "Alright, well...";
 			mes "I'll be around";
@@ -415,9 +412,9 @@ alberta,190,173,4	script	Phelix	85,{
 		mes "Hmm... you want to exchange";
 		mes "jellopies for Red Potions or some";
 		mes "Carrots eh? Well... which one?";
+		next;
 		switch(select("Red Potions please.","Carrots please.")) {
 		case 1:
-			next;
 			mes "[Phelix]";
 			mes "Alright...";
 			mes "Let's see";
@@ -434,6 +431,7 @@ alberta,190,173,4	script	Phelix	85,{
 				mes "Hmm, not bad...";
 				mes "How many potions";
 				mes "do you want to get?";
+				next;
 				switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
 				case 1:
 					delitem 909,.@max*10;
@@ -444,7 +442,6 @@ alberta,190,173,4	script	Phelix	85,{
 					mes "go suckin' them all down at once.";
 					close;
 				case 2:
-					next;
 					mes "[Phelix]";
 					mes "I'm not giving you more than 100";
 					mes "at a time so don't bother, OK? If";
@@ -479,7 +476,6 @@ alberta,190,173,4	script	Phelix	85,{
 					mes "go suckin' them all down at once.";
 					close;
 				case 3:
-					next;
 					mes "[Phelix]";
 					mes "No problem,";
 					mes "see you next time.";
@@ -487,7 +483,6 @@ alberta,190,173,4	script	Phelix	85,{
 				}
 			}
 		case 2:
-			next;
 			mes "[Phelix]";
 			mes "Alright, let's see what ya got...";
 			next;
@@ -500,6 +495,7 @@ alberta,190,173,4	script	Phelix	85,{
 				set .@max,countitem(909)/3;
 				mes "Not too bad pansy...";
 				mes "How many do you want?";
+				next;
 				switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
 				case 1:
 					delitem 909,.@max*3;
@@ -510,7 +506,6 @@ alberta,190,173,4	script	Phelix	85,{
 					mes "not to stuff yer face.";
 					close;
 				case 2:
-					next;
 					mes "[Phelix]";
 					mes "Right I'm not giving you more than";
 					mes "100 at a time so don't bother,";
@@ -543,7 +538,6 @@ alberta,190,173,4	script	Phelix	85,{
 					mes "not to stuff yer face.";
 					close;
 				case 3:
-					next;
 					mes "[Phelix]";
 					mes "Catch'ya later.";
 					close;
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index b69eb74fa..8b40063f4 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -4,33 +4,18 @@
 //= (Aegis) Translated by yoshiki, converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 2.5b
+//= 2.5c
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Job Change quest for Wizard class.
 //===== Additional Comments: ================================= 
-//= 1.1 Now using the initnpctimer command, donpcevent,
-//= and new waitingroom event commands.  No more addtimer spamming.
-//= No longer have to talk to the npc to take the test.  Just enter the chat room.
-//= 1.2 Changed global variable names to unique ones.
-//= 1.2a Rollback from the wrong Kashy's fix
-//= 1.2b Fixed issue with duplicating monsters thx to Bison.[kobra_k88]
-//= 1.2c changed one Horong to Frilldora (now 3rd room contains 1 agressive mob.)
-//= 1.2d more simplified fire room - removed agressive Desert Wolf [Lupus]
-//= 1.3 Added Baby Class support. 1.5 Fixed possible EXP abuse [Lupus]
-//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where to go. [Lupus]
-//= 1.7 Replaced 2 Hodes with 2 Horong's (according to the official guide) [Lupus]
-//= 1.8 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
-//= 2.1 Changed numbers to constants. [Vicious]
-//= 2.2 Merged back JFunc [Lupus] 2.2a Removed extra MES, added missing NEXT
-//= 2.3 Bigfoot monster summon corrected [Zairik]
 //= 2.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 2.5 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
 //= 2.5a More bugfixes care of Barron-Monster. [L0ne_W0lf]
 //= 2.5b Fixed tests calling on a non-existant label in "Room of x#Failed" npcs. [L0ne_W0lf]
+//= 2.5c Bug fixes. Cleaned up some NPCs slightly. [L0ne_W0lf]
 //============================================================ 
 
 gef_tower,111,37,4	script	Wizard Guildsman	70,{
@@ -1222,7 +1207,7 @@ OnTimer60000:
 	end;
 
 OnTimer61000:
-	donpcevent "Room of Water#Failed::OnEnable";
+	enablenpc "Room of Water#Failed";
 	end;
 
 OnTimer62000:
@@ -1244,10 +1229,6 @@ OnTouch:
 	mapannounce "job_wiz",strcharinfo(0)+" has not succeeded.",bc_map;
 	warp "geffen",120,110;
 	end;
-
-OnEnable:
-	enablenpc "Room of Water#Failed";
-	end;
 }
 
 // Earth Room (Test 2 part 2)
@@ -1329,7 +1310,7 @@ OnTimer183000:
 	end;
 
 OnTimer184000:
-	donpcevent "Room of Earth#Failed::OnEnable";
+	enablenpc "Room of Earth#Failed";
 	end;
 
 OnTimer185000:
@@ -1350,7 +1331,6 @@ OnInit:
 OnEnable:
 	enablenpc "Room of Earth#Door";
 	donpcevent "Room of Earth::OnDisable";
-	donpcevent "Room of Earth::OnDisable";
 	set .MyMobs,7;
 	monster "job_wiz",116,97,"Flora",1118,1,"Room of Earth#Door::OnMyMobDead";
 	monster "job_wiz",114,95,"Mandragora",1020,1,"Room of Earth#Door::OnMyMobDead";
@@ -1419,13 +1399,6 @@ OnTouch:
 	mapannounce "job_wiz",strcharinfo(0) + " has not succeeded.",bc_map;
 	warp "geffen",120,110;
 	end;
-
-OnEnable:
-	enablenpc "Room of Earth#Failed";
-	end;
-
-OnDisable:
-	disablenpc "Room of Earth#Failed";
 }
 
 // Fire Room (Test 2 part 3)
@@ -1576,7 +1549,7 @@ OnTimer120000:
 	end;
 
 OnTimer121000:
-	donpcevent "Room of Fire#Failed::OnEnable";
+	enablenpc "Room of Fire#Failed";
 	end;
 
 OnTimer122000:
@@ -1597,13 +1570,6 @@ OnInit:
 OnTouch:
 	warp "geffen",120,110;
 	end;
-
-OnEnable:
-	enablenpc "Room of Fire#Failed";
-	end;
-
-OnDisable:
-	disablenpc "Room of Fire#Failed";
 }
 
 job_wiz,1,7,1	script	Test Helper#wiz	66,{
@@ -1783,11 +1749,8 @@ gef_tower,107,36,4	script	White Dog#wiz	81,{
 			mes "It's better to just try it yourself than to listen to my descriptions.";
 			close2;
 			cutin "job_wizard_maria01",255;
-			close2;
-			cutin "job_wizard_maria01",255;
 			warp "gef_dun00",116,102;
 			end;
-			end;
 		case 2:
 			mes "[Maria]";
 			mes "Really? Ok, then go apply and do your best.";
@@ -1948,3 +1911,23 @@ gef_tower,107,36,4	script	White Dog#wiz	81,{
 		end;
 	}
 }
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.1 Now using the initnpctimer command, donpcevent,
+//= and new waitingroom event commands.  No more addtimer spamming.
+//= No longer have to talk to the npc to take the test.  Just enter the chat room.
+//= 1.2 Changed global variable names to unique ones.
+//= 1.2a Rollback from the wrong Kashy's fix
+//= 1.2b Fixed issue with duplicating monsters thx to Bison.[kobra_k88]
+//= 1.2c changed one Horong to Frilldora (now 3rd room contains 1 agressive mob.)
+//= 1.2d more simplified fire room - removed agressive Desert Wolf [Lupus]
+//= 1.3 Added Baby Class support. 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//= 2nd Job Quests again. It also guides adv classes where to go. [Lupus]
+//= 1.7 Replaced 2 Hodes with 2 Horong's (according to the official guide) [Lupus]
+//= 1.8 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
+//= 2.1 Changed numbers to constants. [Vicious]
+//= 2.2 Merged back JFunc [Lupus] 2.2a Removed extra MES, added missing NEXT
+//= 2.3 Bigfoot monster summon corrected [Zairik]
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index 5d0c8d65a..41c492c2e 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -14,6 +14,7 @@
 //= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
 //= 1.2b Fixed typos in variable names [ultramage]
 //= 1.3 Made the checks more dynamic [ultramage]
+//= 1.4 Fixed offset in getarraysize. (counting starts at 1.) [L0ne_W0lf]
 //============================================================ 
 
 morocc_in,146,99,3	script	Java Dullihan	58,{
@@ -167,7 +168,7 @@ S_MakeDye:
 	}
 	next;
 	if (select("Make Dyestuffs:Cancel") == 1) {
-		set .@size, getarraysize(.@item);
+		set .@size, (getarraysize(.@item)-1);
 		// check requirements
 		for( set .@i,0 ; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i] ; set .@i,.@i+1 );
 		if( .@i < .@size || Zeny < .@cost ) {
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index 6838293b2..25850f893 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -29,6 +29,7 @@
 //=	Added the Juno portion of the Doomed Swords quest.
 //= 1.6 Fixed various errors in the Bajin NPC. [L0ne_W0lf]
 //= 1.7 Changed ALCH_Q check and set to corrispond to new alchemist job quest. [L0ne_W0lf]
+//= 1.8 Fixed metto_q never reaching 2. Made some names more unique. [L0ne_W0lf]
 //============================================================ 
 
 // Metto Quest
@@ -46,6 +47,7 @@ yuno_in03,26,39,3	script	Metto#juno	709,{
 		close;
 	}
 	else if (metto_q == 1) {
+		set metto_q,2;
 		mes "I'm going to ask my colleague ^FF0000Stangckle^000000 to help me. I am sure he will be more than willing to help out an old friend.";
 		next;
 		mes "[Metto]";
@@ -314,7 +316,7 @@ yuno_in01,17,95,5	script	Stangckle#juno	99,{
 	}
 }
 
-yuno_in01,19,183,5	script	Kato	55,{
+yuno_in01,19,183,5	script	Kato#juno	55,{
 	mes "[Kato]";
 	if (metto_q == 4) {
 		mes "I am a scientist researching all sorts of things.";
@@ -402,7 +404,7 @@ yuno_in01,19,183,5	script	Kato	55,{
 	}
 }
 
-yuno_in03,178,43,0	script	CiCi	121,{
+yuno_in03,178,43,0	script	CiCi#juno	121,{
 	if (metto_q == 6) {
 		mes "[CiCi]";
 		mes "My name is CiCi. I am one of the three great scientists in this city.";
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index 17c33fe08..e6559a77c 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.6a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Bug fixes as pointed out by Brainstorm in bugreport:351 [L0ne_W0lf]
+//= 1.6a Fixed(?) antoher problem (NPCs not disabling) hopefully. [L0ne_W0lf]
 //============================================================
 
 in_rogue,359,177,0	script	#killershow01	-1,{
@@ -1434,7 +1435,7 @@ function	script	F_Kienna	{
 		mes "of this training.";
 		set ROG_SK,6;
 		close2;
-		disablenpc "Kienna#8th";
+		disablenpc "Kienna#"+getarg(0);
 		donpcevent "#1stmove::OnEnable";
 		warp "prt_are01",150,150;
 		end;