diff options
author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2011-12-23 15:42:11 +0100 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-12-28 01:20:39 +0100 |
commit | fa608091cde4da71d99b78ce1563ee654189228a (patch) | |
tree | 29beaec827ed9e32ac2fbd29a1aeff63aa13634b /world/map/npc/029-3 | |
parent | abc8f8cb09b135151d8c860761837bdf5e0fdfd5 (diff) | |
download | serverdata-fa608091cde4da71d99b78ce1563ee654189228a.tar.gz serverdata-fa608091cde4da71d99b78ce1563ee654189228a.tar.bz2 serverdata-fa608091cde4da71d99b78ce1563ee654189228a.tar.xz serverdata-fa608091cde4da71d99b78ce1563ee654189228a.zip |
Prevented use of getareausers when possible
Diffstat (limited to 'world/map/npc/029-3')
-rw-r--r-- | world/map/npc/029-3/parua.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt index a8ba664b..17a69bba 100644 --- a/world/map/npc/029-3/parua.txt +++ b/world/map/npc/029-3/parua.txt @@ -19,7 +19,7 @@ goto L_CallPlayers; L_Paying: - if (getareausers("029-3.gat", 20, 20, 70, 60) < 5) + if (getmapusers("029-3.gat") < 5) goto L_NotEnoughPlayers; if (Zeny < 20000) goto L_NotEnough; @@ -29,12 +29,12 @@ L_Paying: set Zeny, Zeny - 20000; L_StartFight: - if (getareausers("029-3.gat", 20, 20, 70, 60) < 5) + if (getmapusers("029-3.gat") < 5) goto L_NotEnoughPlayers; npctalk "Let the battle begin!"; set $@FIGHT_CAVE_STATUS, 1; set $@FIGHT_CAVE_LEVEL, 1; - set $@FIGHT_CAVE_PLAYER_COUNT, getareausers("029-3.gat", 20, 20, 70, 60); + set $@FIGHT_CAVE_PLAYER_COUNT, getmapusers("029-3.gat"); startnpctimer; goto L_Exit; @@ -58,7 +58,7 @@ L_CallPlayers: // 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) + if (getmapusers("029-3.gat") < 5) goto L_NotEnoughPlayers; if (Zeny < 20000 + 3000) goto L_NotEnough_Announce; @@ -206,19 +206,19 @@ L_GlobalAnnounce: L_Five_Minutes: if ($@ANNOUNCE_TIME - gettimetick(2) > 300) end; - announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getareausers("029-3.gat", 20, 20, 70, 60) + " fighter(s) in the cave.", 0; + announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 2; end; L_Fifteen_Minutes: if ($@ANNOUNCE_TIME - gettimetick(2) > 900) end; - announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 15 minutes. Right now, there are " + getareausers("029-3.gat", 20, 20, 70, 60) + " fighter(s) in the cave.", 0; + announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 15 minutes. Right now, there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 3; end; L_Thirty_Minutes: - announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 30 minutes, so prepare yourself and call your friends. At the moment there are " + getareausers("029-3.gat", 20, 20, 70, 60) + " fighter(s) in the cave.", 0; + announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 30 minutes, so prepare yourself and call your friends. At the moment there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0; set $@FIGHT_CAVE_STATUS, 4; end; |