From 3618ecc48dc775ead1888fa009756c491aeaf701 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 29 May 2019 14:16:48 -0300
Subject: Integrate @toevent with Candor Battle

---
 npc/commands/event.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'npc/commands/event.txt')

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;
-- 
cgit v1.2.3-60-g2f50