* 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

1 files changed, 25 insertions, 42 deletions

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]