summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Kandiman <kandiman@kandiman.(none)>2011-06-18 18:22:14 -0400
committerThe Kandiman <kandiman@kandiman.(none)>2011-06-18 18:22:43 -0400
commit93e8e99219e3935ccd47b27a8fdcdbff4bde12e9 (patch)
treed2360f65ad7aea59fa0ceeb24a4d0873375d3ea6
parent1f64b236cf35b9a82b6b177792b5dece6cb668ce (diff)
downloadserverdata-93e8e99219e3935ccd47b27a8fdcdbff4bde12e9.tar.gz
serverdata-93e8e99219e3935ccd47b27a8fdcdbff4bde12e9.tar.bz2
serverdata-93e8e99219e3935ccd47b27a8fdcdbff4bde12e9.tar.xz
serverdata-93e8e99219e3935ccd47b27a8fdcdbff4bde12e9.zip
Small fix for Candor announce script
Removes bug that allowed 2 chars to pay for announcement and would freeze timer.
-rw-r--r--npc/029-3/parua.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/npc/029-3/parua.txt b/npc/029-3/parua.txt
index c292f963..cfc269fe 100644
--- a/npc/029-3/parua.txt
+++ b/npc/029-3/parua.txt
@@ -47,6 +47,7 @@ L_CallPlayers:
"In 30 minutes.", -,
"I don't want to wait. Let's start it now!", L_Paying;
+ if ($@FIGHT_CAVE_STATUS >= 2) close;
if (getareausers("029-3.gat", 20, 20, 70, 60) < 5) goto L_NotEnoughPlayers;
if (zeny < 20000 + 3000) goto L_NotEnough_Announce;
set zeny, zeny - (20000 + 3000);
@@ -54,7 +55,7 @@ L_CallPlayers:
set $@FIGHT_CAVE_STATUS, $@FIGHT_CAVE_STATUS + (@menu + 2);
if ($@FIGHT_CAVE_STATUS == 3) set $@ANNOUNCE_TIME, gettimetick(2) + 300;
if ($@FIGHT_CAVE_STATUS == 4) set $@ANNOUNCE_TIME, gettimetick(2) + 900;
- if ($@FIGHT_CAVE_STATUS == 5) set $@ANNOUNCE_TIME, gettimetick(2) + 1800;
+ if ($@FIGHT_CAVE_STATUS >= 5) set $@ANNOUNCE_TIME, gettimetick(2) + 1800;
startnpctimer;
close;
@@ -153,7 +154,7 @@ L_Announce:
L_GlobalAnnounce:
if ($@FIGHT_CAVE_STATUS == 3) goto L_Five_Minutes;
if ($@FIGHT_CAVE_STATUS == 4) goto L_Fifteen_Minutes;
- if ($@FIGHT_CAVE_STATUS == 5) goto L_Thirty_Minutes;
+ if ($@FIGHT_CAVE_STATUS >= 5) goto L_Thirty_Minutes;
if (gettimetick(2) >= $@ANNOUNCE_TIME) goto L_StartFight;
end;