summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Dombrowski <sdo451@gmail.com>2013-03-04 23:06:38 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-03-05 09:28:25 +0100
commitb976cc54209283a62c43f2208a62be2809483493 (patch)
treeeef219f4477d29a774517a65455f2342c87e38fd
parent4cde67202c8b2959de372134a9930d8d03a61a57 (diff)
downloadserverdata-b976cc54209283a62c43f2208a62be2809483493.tar.gz
serverdata-b976cc54209283a62c43f2208a62be2809483493.tar.bz2
serverdata-b976cc54209283a62c43f2208a62be2809483493.tar.xz
serverdata-b976cc54209283a62c43f2208a62be2809483493.zip
Candor: Fixing mapannounce on the outdoor map
It did work only for one round of Candor after server restart, because the variable $@FIGHT_CAVE_LAST was not reset to 0.
-rw-r--r--world/map/npc/029-3/parua.txt12
1 files changed, 2 insertions, 10 deletions
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 69507ebd..78014e98 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -166,11 +166,8 @@ L_NextRound:
goto L_CleanUp;
set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_LEVEL;
- if ($@FIGHT_CAVE_LAST + 30 < $@FIGHT_CAVE_LEVEL)
- goto L_Announce;
-
-L_Return_2:
- mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
+ mapannounce "029-1.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
+ mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
set $@MOB_1_SUMMON, 0;
set $@MOB_2_SUMMON, 0;
@@ -200,11 +197,6 @@ L_Summon:
goto L_MOB6;
goto L_Return_1;
-L_Announce:
- mapannounce "029-1.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
- set $@FIGHT_CAVE_LAST, $@FIGHT_CAVE_LAST + 30;
- goto L_Return_2;
-
L_GlobalAnnounce:
if ($@FIGHT_CAVE_STATUS == 3)
goto L_Five_Minutes;