summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-05-29 14:16:48 -0300
committerJesusaves <cpntb1@ymail.com>2019-05-29 14:16:48 -0300
commit3618ecc48dc775ead1888fa009756c491aeaf701 (patch)
treeebf35939fd194dd2b9d870901315987b0b2a30d9
parenta88a668bf87cf012029a04268c0af869f242921b (diff)
downloadserverdata-3618ecc48dc775ead1888fa009756c491aeaf701.tar.gz
serverdata-3618ecc48dc775ead1888fa009756c491aeaf701.tar.bz2
serverdata-3618ecc48dc775ead1888fa009756c491aeaf701.tar.xz
serverdata-3618ecc48dc775ead1888fa009756c491aeaf701.zip
Integrate @toevent with Candor Battle
-rw-r--r--npc/commands/event.txt11
1 files changed, 10 insertions, 1 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index c9996c67a..521ab3b08 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -288,7 +288,7 @@ OnEffect:
end;
}
- // Aeros Events takes precedence over permanent events
+ // Aeros Events takes precedence over player events
if ($@GM_EVENT)
{
.@gt=$@AEROS_SPWN;
@@ -304,6 +304,15 @@ OnEffect:
end;
}
+ // Player events takes precedence over permanent events
+ // They also have an hierarchy
+ // 1. Candor Battle
+ if ($@FEFE_DELAY > gettimetick(2) && !$@FEFE_CAVE_LEVEL && $@FEFE_CAVE_HERO$ != "" && !$@FEFE_WAVE) {
+ warp "006-1", 49, 53;
+ message strcharinfo(0), l("You are now at Candor Battle Cave at @@'s request.", $@FEFE_CAVE_HERO$);
+ end;
+ }
+
// Events are the least priority
if ($EVENT$ == "Valentine") {
warp "001-11", 38, 32;