Add triggers on warp locations on #33.

1 files changed, 46 insertions, 41 deletions

diff --git a/npc/001-2-33/triggers.txt b/npc/001-2-33/triggers.txt
index 4445b7512..1d6e3e1a5 100644
--- a/npc/001-2-33/triggers.txt
+++ b/npc/001-2-33/triggers.txt
@@ -4,46 +4,7 @@
 // Description:
 //    Artis Aemil's Legion triggers to add and remove masks.
 
-// Functions
-
-
-function	script	artisALRemTopMask	{
-    if ((getareausers("001-2-33.gat", 23, 27, 45, 31) >= 1) ||
-        (getareausers("001-2-33.gat", 23, 32, 26, 38) >= 1) ||
-        (getareausers("001-2-33.gat", 42, 32, 45, 38) >= 1))
-    {
-        removemapmask "001-2-33", 4;
-    }
-    return 0;
-}
-
-function	script	artisALAddTopMask	{
-    if ((getareausers("001-2-33.gat", 23, 27, 45, 31) == 0) &&
-        (getareausers("001-2-33.gat", 23, 32, 26, 38) == 0) &&
-        (getareausers("001-2-33.gat", 42, 32, 45, 38) == 0))
-    {
-        addmapmask "001-2-33", 4;
-    }
-    return 0;
-}
-
-function	script	artisALRemBotMask	{
-    if (getareausers("001-2-33.gat", 23, 32, 45, 46) >= 1)
-    {
-        removemapmask "001-2-33", 8;
-    }
-    return 0;
-}
-
-function	script	artisALAddBotMask	{
-    if (getareausers("001-2-33.gat", 23, 32, 45, 46) == 0)
-    {
-        addmapmask "001-2-33", 8;
-    }
-    return 0;
-}
-
-// Top triggers
+// Transition Top triggers
 001-2-33,26,35,0	script	#001-2-33LeftRemTop	NPC_HIDDEN,0,2,{
 OnTouch:
     artisALRemTopMask;
@@ -68,7 +29,7 @@ OnTouch:
     close;
 }
 
-// Bottom triggers
+// Transition Bottom triggers
 
 001-2-33,25,32,0	script	#001-2-33LeftRemBot	NPC_HIDDEN,1,0,{
 OnTouch:
@@ -93,3 +54,47 @@ OnTouch:
     artisALAddBotMask;
     close;
 }
+
+// Warped location triggers
+
+001-2-33,24,29,0	script	#001-2-33WarpTopLeft	NPC_HIDDEN,1,1,{
+OnTouch:
+    artisALUpdateMask;
+    close;
+}
+
+001-2-33,44,29,0	script	#001-2-33WarpTopRight	NPC_HIDDEN,1,1,{
+OnTouch:
+    artisALUpdateMask;
+    close;
+}
+
+001-2-33,29,32,0	script	#001-2-33WarpMidLeft	NPC_HIDDEN,1,1,{
+OnTouch:
+    artisALUpdateMask;
+    close;
+}
+
+001-2-33,39,32,0	script	#001-2-33WarpMidRight	NPC_HIDDEN,1,1,{
+OnTouch:
+    artisALUpdateMask;
+    close;
+}
+
+001-2-33,24,34,0	script	#001-2-33WarpLeft	NPC_HIDDEN,1,1,{
+OnTouch:
+    artisALUpdateMask;
+    close;
+}
+
+001-2-33,44,34,0	script	#001-2-33WarpRight	NPC_HIDDEN,1,1,{
+OnTouch:
+    artisALUpdateMask;
+    close;
+}
+
+001-2-33,34,45,0	script	#001-2-33WarpArtis	NPC_HIDDEN,1,1,{
+OnTouch:
+    artisALUpdateMask;
+    close;
+}