summaryrefslogtreecommitdiff
path: root/world/map/npc/029-3
diff options
context:
space:
mode:
authorcoffee <coffee@coffee-EP45-UD3L.(none)>2011-08-21 17:00:22 -0300
committercoffee <coffee@coffee-EP45-UD3L.(none)>2011-08-21 17:00:22 -0300
commitb46fcfd936c108b75a88ef5b9f09cbdbbb1a2edc (patch)
treef2557fe6111dd779de3f9fe50cd097ad658211dd /world/map/npc/029-3
parente6af141ede435de18a28af4fd58e0bdd62bfe23d (diff)
downloadserverdata-b46fcfd936c108b75a88ef5b9f09cbdbbb1a2edc.tar.gz
serverdata-b46fcfd936c108b75a88ef5b9f09cbdbbb1a2edc.tar.bz2
serverdata-b46fcfd936c108b75a88ef5b9f09cbdbbb1a2edc.tar.xz
serverdata-b46fcfd936c108b75a88ef5b9f09cbdbbb1a2edc.zip
Prevents parua from charging more than 1 player for the fight.
Diffstat (limited to 'world/map/npc/029-3')
-rw-r--r--world/map/npc/029-3/parua.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index cfc269fe..fe8ac5d7 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -19,6 +19,8 @@
L_Paying:
if (getareausers("029-3.gat", 20, 20, 70, 60) < 5) goto L_NotEnoughPlayers;
if (zeny < 20000) goto L_NotEnough;
+// Do not charge the money if the fight or the announces were already started by someone else
+ if ($@FIGHT_CAVE_STATUS != 0) close;
set zeny, zeny - 20000;
L_StartFight:
@@ -46,8 +48,8 @@ L_CallPlayers:
"In 15 minutes.", -,
"In 30 minutes.", -,
"I don't want to wait. Let's start it now!", L_Paying;
-
- if ($@FIGHT_CAVE_STATUS >= 2) close;
+// Do not charge the money if the fight or the announces were already started by someone else
+ if ($@FIGHT_CAVE_STATUS != 0) 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);