From 821d5db25b3561850480ae1c0fded08fe4b2a039 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Wed, 6 May 2015 16:03:31 -0400
Subject: fix candor timer

---
 world/map/npc/029-3/parua.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'world')

diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 41e1fe8c..1ac59e0a 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -8,7 +8,7 @@
     set @FIGHT_CAVE_ANNOUNCE_COST, 3000;
     set @FIGHT_CAVE_ANNOUNCE_COST$, "3,000";
     if ($@FIGHT_CAVE_STATUS == 1) goto L_Enjoy;
-    if ($@FIGHT_CAVE_STATUS >= 2) goto L_Wait;
+    if ($@FIGHT_CAVE_STATUS >= 2 && $@ANNOUNCE_TIME > gettimetick(2)) goto L_Wait;
     mes "[Parua]";
     mes "\"Hello.\"";
     next;
@@ -105,7 +105,7 @@ L_Enjoy:
     goto L_Exit;
 
 L_Wait:
-    set @ms, ($@ANNOUNCE_TIME - gettimetick(2)) * 1000;
+    set @seconds, $@ANNOUNCE_TIME - gettimetick(2);
     callfunc "HumanTime";
     mes "[Parua]";
     mes "\"Be Patient... The fight will start in " + @time$ + ".\"";
@@ -362,6 +362,7 @@ L_CleanUp:
     donpcevent "#CandorAnnouncer::OnCommandTalk";
     areatimer "029-3", 20, 20, 70, 60, 10, "Parua::OnReward";
     set $@FIGHT_CAVE_STATUS, 0;
+    set $@ANNOUNCE_TIME, 0;
     set $@FIGHT_CAVE_PAID, 0;
     set $@FIGHT_CAVE_PLAYER_COUNT, 0;
     set $@FIGHT_CAVE_LEVEL, 1;
-- 
cgit v1.2.3-70-g09d2