Change Legion Main Hall Map Mask System

1 files changed, 21 insertions, 47 deletions

diff --git a/npc/functions/masks.txt b/npc/functions/masks.txt
index 9fb54919..03c81630 100644
--- a/npc/functions/masks.txt
+++ b/npc/functions/masks.txt
@@ -4,65 +4,39 @@
 // Description:
 //    Triggers functions to add and remove masks.
 // Variables:
-//    none
+//    4 - Top Mask
+//    8 - Bottom Mask
+//    Default mask: 13 (Top + Bottom + Display mask)
 
 // Artis Aemil's Legion
 
-function	script	artisALRemTopMask	{
-    if ((getareausers("001-2-33", 23, 27, 45, 31) >= 1) ||
-        (getareausers("001-2-33", 23, 32, 26, 38) >= 1) ||
-        (getareausers("001-2-33", 42, 32, 45, 38) >= 1))
-    {
-        removemapmask "001-2-33", 4;
-    }
+function	script	artisALResetMask	{
+    .@m=getmapmask("001-2-33");
+    sendmapmask(.@m);
     return 0;
 }
 
-function	script	artisALAddTopMask	{
-    if ((getareausers("001-2-33", 23, 27, 45, 31) == 0) &&
-        (getareausers("001-2-33", 23, 32, 26, 38) == 0) &&
-        (getareausers("001-2-33", 42, 32, 45, 38) == 0))
-    {
-        addmapmask "001-2-33", 4;
-    }
+function	script	artisALTopMask	{
+    addtimer 30, "artisALTopMaskDO::OnDoIt";
     return 0;
 }
 
-function	script	artisALRemBotMask	{
-    if (getareausers("001-2-33", 23, 32, 45, 46) >= 1)
-    {
-        removemapmask "001-2-33", 8;
-    }
+function	script	artisALBottomMask	{
+    addtimer 30, "artisALBottomMaskDO::OnDoIt";
     return 0;
 }
 
-function	script	artisALAddBotMask	{
-    if (getareausers("001-2-33", 23, 32, 45, 46) == 0)
-    {
-        addmapmask "001-2-33", 8;
-    }
-    return 0;
+// Show bottom mask is the same as hiding top mask
+-	script	artisALBottomMaskDO	NPC_HIDDEN,{
+OnDoIt:
+    .@m=getmapmask("001-2-33");
+    sendmapmask(.@m^4);
 }
 
-function	script	artisALUpdateMask	{
-    if (getareausers("001-2-33", 23, 32, 45, 46) >= 1)
-    {
-        removemapmask "001-2-33", 8;
-    }
-    else
-    {
-        addmapmask "001-2-33", 8;
-    }
-    if ((getareausers("001-2-33", 23, 27, 45, 31) >= 1) ||
-        (getareausers("001-2-33", 23, 32, 26, 38) >= 1) ||
-        (getareausers("001-2-33", 42, 32, 45, 38) >= 1))
-    {
-        removemapmask "001-2-33", 4;
-    }
-    else
-    {
-        addmapmask "001-2-33", 4;
-    }
-
-    return 0;
+// Show top mask is the same as hiding bottom mask
+-	script	artisALTopMaskDO	NPC_HIDDEN,{
+OnDoIt:
+    .@m=getmapmask("001-2-33");
+    sendmapmask(.@m^8);
 }
+