diff options
| author | Wushin <pasekei@gmail.com> | 2014-11-14 00:26:02 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-11-14 00:26:02 -0600 |
| commit | 31d8a90ac839a35455b15a5f8aabb7a90ca9e87b (patch) | |
| tree | f000bbafc6f5e6274619f0a9926da1a82e4e743b | |
| parent | 0ca075ae66c4e6a983e1f25f6e63a39ee12a568e (diff) | |
| parent | 92bcfe4faa8a6451a908b667ab02128868b2c555 (diff) | |
| download | serverdata-31d8a90ac839a35455b15a5f8aabb7a90ca9e87b.tar.gz serverdata-31d8a90ac839a35455b15a5f8aabb7a90ca9e87b.tar.bz2 serverdata-31d8a90ac839a35455b15a5f8aabb7a90ca9e87b.tar.xz serverdata-31d8a90ac839a35455b15a5f8aabb7a90ca9e87b.zip | |
Merge pull request #207 from mekolat/candor-fix-redux
urgent candor fix
| -rw-r--r-- | world/map/npc/029-3/parua.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt index 3047396e..4d8dc384 100644 --- a/world/map/npc/029-3/parua.txt +++ b/world/map/npc/029-3/parua.txt @@ -36,9 +36,9 @@ L_Paying: 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; + goto L_AlreadyStarted; if ($@FIGHT_CAVE_PAID != 0) - close; + goto L_AlreadyStarted; set Zeny, Zeny - @FIGHT_CAVE_COST; set $@FIGHT_CAVE_PAID, 1; goto L_StartFight; @@ -76,13 +76,13 @@ L_AcceptHelp: L_TimeFightStart: // Do not charge the money if the fight or the announces were already started by someone else if ($@FIGHT_CAVE_STATUS != 0) - close; + goto L_AlreadyStarted; if (getmapusers("029-3.gat") < 5) goto L_NotEnoughPlayers; if (Zeny < @FIGHT_CAVE_COST + @FIGHT_CAVE_ANNOUNCE_COST) goto L_NotEnough_Announce; if ($@FIGHT_CAVE_PAID != 0) - close; + goto L_AlreadyStarted; set Zeny, Zeny - (@FIGHT_CAVE_COST + @FIGHT_CAVE_ANNOUNCE_COST); set $@FIGHT_CAVE_PAID, 1; set $@SPONSOR$, strcharinfo(0); @@ -325,6 +325,7 @@ L_CleanUp: mapannounce "029-1.gat", "Parua:* The dungeon is now ready for its next victims.", 0; areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnReward"; set $@FIGHT_CAVE_STATUS, 0; + set $@FIGHT_CAVE_PAID, 0; set $@FIGHT_CAVE_PLAYER_COUNT, 0; set $@FIGHT_CAVE_LEVEL, 1; set $@FIGHT_CAVE_ROUND_TIMER, 0; |