From 270ea9d6ada343b9d05e4c5d6d2616759efb02f9 Mon Sep 17 00:00:00 2001
From: L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 20 Mar 2008 20:01:56 +0000
Subject: Fixed Juperos Elevator not working after failing once.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12405 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt             |  1 +
 npc/quests/quests_juperos.txt | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 2dbf37eb8..63754f991 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/03/20
+	* Rev. 12405 Fixed Juperos Elevator not working after failing once. [L0ne_W0lf]
 	* Rev. 12404 Added Gym Pass NPC (disabled by default.) [L0ne_W0lf]
 	- Enabled Auction NPCs now that the auction system is implemented.
 	* Rev. 12403 Updated Umbala npcs, quests, and warps. [L0ne_W0lf]
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 91cd8cbc6..87f9e276e 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= MasterOfMuppets
 //===== Version ==============================================
-//= 1.3b
+//= 1.
 //===== Compatible With ======================================
 //= eAthena SVN
 //===== Description ==========================================
@@ -18,6 +18,7 @@
 //=	event-driven story progressive NPCs. Optimization needed.
 //= 1.3a Adjusted the elevafor timer. (132000 -> 142000) [L0ne_W0lf]
 //= 1.3b Minor updates to juperos elevator NPCs. [L0ne_W0lf]
+//= 1.4 Fixed Elevator not working after failing once. [L0ne_W0lf]
 //============================================================
 
 yuno_in04,190,125,4	script	Scholar	700,{
@@ -4695,10 +4696,10 @@ OnTimer59000:
 	if (getmapusers("jupe_ele") == 0) {
 		set $@JupeElevatorInUse2,5;
 		killmonsterall "jupe_ele";
-		disablenpc "Guard-1#ufe";
-		disablenpc "Guard-2#ufe";
-		disablenpc "Guard-3#ufe";
-		disablenpc "Guard-4#ufe";
+		donpcevent "Guard-1#ufe::OnDisable";
+		donpcevent "Guard-2#ufe::OnDisable";
+		donpcevent "Guard-3#ufe::OnDisable";
+		donpcevent "Guard-4#ufe::OnDisable";
 		stopnpctimer;
 		set $@JupeElevatorInUse2,0;
 		set $@JupeElevatorInUse,0;
@@ -4709,10 +4710,10 @@ OnTimer59000:
 
 OnTimer120000:
 	killmonsterall "jupe_ele";
-	disablenpc "Guard-1#ufe";
-	disablenpc "Guard-2#ufe";
-	disablenpc "Guard-3#ufe";
-	disablenpc "Guard-4#ufe";
+	donpcevent "Guard-1#ufe::OnDisable";
+	donpcevent "Guard-2#ufe::OnDisable";
+	donpcevent "Guard-3#ufe::OnDisable";
+	donpcevent "Guard-4#ufe::OnDisable";
 	mapannounce "jupe_ele","In the end, you can't even overcome your inner fear...",bc_map,"0xFF0000";
 	end;
 
-- 
cgit v1.2.3-60-g2f50