From 7b39d9ddd5d1fb45fca1f282431cc484eabbf3de Mon Sep 17 00:00:00 2001
From: L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 12 Oct 2008 20:22:24 +0000
Subject: Reverted donpcevent change to wizard quest. Moved a percentheal,
 which should fix bugreport:2311.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13289 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt       |  1 +
 npc/jobs/2-1/wizard.txt | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 6570fd49a..b60fdea48 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/10/12
+	* Rev. 13289 Reverted donpcevent change to wizard quest. Moved a percentheal, which should fix bugreport:2311. [L0ne_W0lf]
 	* Changed An nonexistent variable in Refine NPC. (bugreport:2340) [Samuray22]
 	* Fixed a Exploit in Thief Quest Skill. (bugreport:2332)
 	* Fixed donpcevent to doevent. (bugreport:2311)
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index cb37bba64..996ff952e 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -4,7 +4,7 @@
 //= (Aegis) Translated by yoshiki, converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 2.8
+//= 2.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,8 @@
 //= 	Other minor fixes to various NPCs.
 //= 2.7a Added end; :D (bugreport:2038) [Yommy]
 //= 2.8 Fixed donpcevent to doevent. (bugreport:2311) [SoulBlaker]
+//= 2.9 Reverted the change of donpcevent to doevent. [L0ne_W0lf]
+//=     Was probably cuased by a warp BEFORE a percentheal
 //============================================================ 
 
 gef_tower,111,37,4	script	Wizard Guildsman	70,{
@@ -1100,7 +1102,7 @@ OnMyMobDead:
 	if (.MyMobs < 1) {
 		set WIZ_Q2,WIZ_Q2+1;
 		mapannounce "job_wiz",strcharinfo(0)+" has succeeded in eliminating the monsters.",bc_map;
-		doevent "Room of Water#Door::OnEnable";
+		donpcevent "Room of Water#Door::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1187,10 +1189,10 @@ OnMyMobDead:
 	set .MyMobs,.MyMobs-1;
 	if (.MyMobs < 1) {
 		mapannounce "job_wiz",strcharinfo(0)+" has succeeded in eliminating the monsters.",bc_map;
-		warp "job_wiz",116,97;
 		percentheal 100,100;
-		doevent "Room of Water#Door::OnDisable";
-		doevent "Room of Earth::OnEnable";
+		warp "job_wiz",116,97;
+		donpcevent "Room of Water#Door::OnDisable";
+		donpcevent "Room of Earth::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1270,7 +1272,7 @@ OnMyMobDead:
 	set .MyMobs,.MyMobs-1;
 	if (.MyMobs < 1) {
 		mapannounce "job_wiz",strcharinfo(0) + " has succeeded in eliminating the monsters.",bc_map;
-		doevent "Room of Earth#Door::OnEnable";
+		donpcevent "Room of Earth#Door::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1361,8 +1363,8 @@ OnMyMobDead:
 		mapannounce "job_wiz",strcharinfo(0) + " has succeeded in eliminating the monster.",bc_map;
 		percentheal 100,100;
 		warp "job_wiz",46,99;
-		doevent "Room of Earth#Door::OnDisable";
-		doevent "Room of Fire::OnEnable";
+		donpcevent "Room of Earth#Door::OnDisable";
+		donpcevent "Room of Fire::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1440,7 +1442,7 @@ OnMyMobDead:
 	set .MyMobs,.MyMobs-1;
 	if (.MyMobs < 1) {
 		mapannounce "job_wiz",strcharinfo(0) + " has succeeded in eliminating the monsters.",bc_map;
-		doevent "Room of Fire#Door::OnEnable";
+		donpcevent "Room of Fire#Door::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1526,8 +1528,8 @@ OnMyMobDead:
 	if (.MyMobs < 1) {
 		mapannounce "job_wiz","Congratulations, " + strcharinfo(0) + ". You have passed the job change test.",bc_map;
 		set WIZ_Q,7;
-		doevent "Room of Fire#Door::OnDisable";
-		doevent "Test Helper#wiz::OnEnable";
+		donpcevent "Room of Fire#Door::OnDisable";
+		donpcevent "Test Helper#wiz::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1913,7 +1915,6 @@ gef_tower,107,36,4	script	White Dog#wiz	81,{
 		mes "[Maria]";
 		mes "As I thought, I knew you'd be able to do it, I could smell it in yah! *Woof*";
 		mes "Now I can call you Wizard.";
-
 		next;
 		mes "[Maria]";
 		mes "Congratulations. Always give your best at everything, no matter what.";
@@ -1941,4 +1942,4 @@ gef_tower,107,36,4	script	White Dog#wiz	81,{
 //= 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]
\ No newline at end of file
+//= 2.3 Bigfoot monster summon corrected [Zairik]
-- 
cgit v1.2.3-60-g2f50