Hook up Porthos with the world, but instancing still NYI

3 files changed, 22 insertions, 0 deletions

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index ba81ca96c..969de4791 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -539,6 +539,13 @@ OnEffect:
             doevent "sDreamTower::OnWarpTo";
             end;
         }
+        if ($EVENT$ == "Olympics") {
+            if (callfunc("FYE_Olympics_TO")) {
+                dispbottom l("You are now at Porthos - The Town of Portals.");
+                end;
+            }
+            // Failed for some reason - ignore
+        }
         if ($EVENT$ == "Raid") {
             .@id = array_find($FYRAID_OWNER, getcharid(3));
             if (.@id >= 0) {
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 0e11c47fe..bbb707b40 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -622,6 +622,15 @@ function	script	FYE_Olympics_AL	{
     return;
 }
 
+// Send to Porthos, returns false on failure, true on success
+function	script	FYE_Olympics_TO	{
+    if ($EVENT$ != "Olympics") return false;
+
+    // FIXME: Instancing
+    warp "001-14", 92, 90;
+    return true;
+}
+
 
 
 
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index 92fd8b688..3121f7b7c 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -23,6 +23,7 @@ function	script	SoulMenhir	{
         rif($EVENT$ == "Christmas" && BaseLevel >= 20, l("[Christmas] Send soul to the Christmas Workshop!")), L_Xmas, // TODO: In future there'll be an event map
         rif($EVENT$ == "Tower" && countitem(EventDreamTicket), l("Dream Tower")), L_Tower,
         rif($EVENT$ == "Raid", l("Boss Raid")), L_Raid,
+        rif($EVENT$ == "Olympics", l("[Magic Olympics] Send soul to Porthos")), L_Porthos,
         l("Leave it alone."), -;
 
     return;
@@ -104,6 +105,11 @@ L_Raid:
     callfunc("FYRaid_Select");
     close;
 
+L_Porthos:
+    if ($EVENT$ != "Olympics") goto L_DontPanic;
+    callfunc("FYE_Olympics_TO");
+    close;
+
 L_DontPanic:
     message strcharinfo(0), l("(A strange barrier keeps you from touching the stone at this time.)");
     return;