summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorCoffee <coffee@coffee-EP45-UD3L.(none)>2011-06-18 19:29:30 -0300
committerCoffee <coffee@coffee-EP45-UD3L.(none)>2011-06-18 19:29:30 -0300
commit55848c939ee6fa54f0813ab488d3f6fb4d93863e (patch)
tree7c3ddded02f8181c1f498355c62ca4fa71d13285 /npc
parente39e7595f815aa5a6571533489dee1fcb046a4d9 (diff)
parent93e8e99219e3935ccd47b27a8fdcdbff4bde12e9 (diff)
downloadserverdata-55848c939ee6fa54f0813ab488d3f6fb4d93863e.tar.gz
serverdata-55848c939ee6fa54f0813ab488d3f6fb4d93863e.tar.bz2
serverdata-55848c939ee6fa54f0813ab488d3f6fb4d93863e.tar.xz
serverdata-55848c939ee6fa54f0813ab488d3f6fb4d93863e.zip
Merge branch 'master' of git://gitorious.org/+tmw-admins/tmw/tmwa-server-test
Diffstat (limited to 'npc')
-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;