LandSandBoat · TracentEden2 · Jul 13, 2024
diff --git a/scripts/battlefields/Apollyon/sw_apollyon.lua b/scripts/battlefields/Apollyon/sw_apollyon.lua
@@ -351,10 +351,10 @@ content.groups =
         mobs    = { 'Armoury_Crate_Mimic' },
         mobMods =
         {
-            [xi.mobMod.DRAW_IN   ] = 1,
-            [xi.mobMod.NO_MOVE   ] = 1,
-            [xi.mobMod.NO_DESPAWN] = 1,
-            [xi.mobMod.NO_AGGRO  ] = 1,
+            [xi.mobMod.DRAW_IN_BITMASK ] = xi.drawin.NORMAL,
+            [xi.mobMod.NO_MOVE   ]       = 1,
+            [xi.mobMod.NO_DESPAWN]       = 1,
+            [xi.mobMod.NO_AGGRO  ]       = 1,
         },
 
         setup = function(battlefield, mobs)

diff --git a/scripts/enum/drawin.lua b/scripts/enum/drawin.lua
@@ -0,0 +1,12 @@
+-----------------------------------
+-- Drawin bits
+-----------------------------------
+xi = xi or {}
+
+xi.drawin =
+{
+    NONE             = 0x000, -- no draw-in (mob can only draw-in by explictly calling the lua drawin function)
+    NORMAL           = 0x001, -- basic draw-in where mob will draw-in battle target when target some distance from mob
+    TO_FRONT_OF_MOB  = 0x002, -- determines if draw-in to the center of mob (bit not set) or front of mob (bit set)
+    INCLUDE_ALLIANCE = 0x004, -- determines if draw-in includes just the battle target (bit not set) or entire alliance (bit set)
+}
diff --git a/scripts/enum/mob_mod.lua b/scripts/enum/mob_mod.lua
@@ -20,7 +20,7 @@ xi.mobMod =
     HP_HEAL_CHANCE         = 9,  -- can cast cures below this HP %
     SUBLINK                = 10, -- sub link group
     LINK_RADIUS            = 11, -- link radius
-    DRAW_IN                = 12, -- 1 - player draw in, 2 - alliance draw in -- only add as a spawn mod!
+    DRAW_IN_BITMASK        = 12, -- bitmask with different binary options for draw-in (see DRAWIN enum for options)
     SEVERE_SPELL_CHANCE    = 13, -- % chance to use a severe spell like death or impact
     SKILL_LIST             = 14, -- uses given mob skill list
     MUG_GIL                = 15, -- amount gil carried for mugging
@@ -89,4 +89,6 @@ xi.mobMod =
     STANDBACK_RANGE        = 78, -- Applies a specific standback range for the mob
     CANNOT_GUARD           = 79, -- Check if the mob does not guard (despite being a MNK or PUP mob)
     SKIP_ALLEGIANCE_CHECK  = 80, -- Skip the allegiance check for valid target (allows for example a mob to cast a TARGET_ENEMY spell on itself)
+    DRAW_IN_TRIGGER_DIST   = 81, -- Distance to trigger a draw-in (overrides a default of 2 * melee dist)
+    DRAW_IN_MAX_RANGE      = 82, -- Max range to draw-in an entity (overrides a default of entire zone)
 }
diff --git a/scripts/zones/Attohwa_Chasm/mobs/Tiamat.lua b/scripts/zones/Attohwa_Chasm/mobs/Tiamat.lua
@@ -15,7 +15,8 @@ end
 
 entity.onMobInitialize = function(mob)
     mob:setCarefulPathing(true)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 8)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 8)
 end
 
 entity.onMobSpawn = function(mob)

diff --git a/scripts/zones/Balgas_Dais/mobs/Black_Dragon.lua b/scripts/zones/Balgas_Dais/mobs/Black_Dragon.lua
@@ -7,7 +7,7 @@
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 end
 
 entity.onMobDeath = function(mob, player, optParams)

diff --git a/scripts/zones/Balgas_Dais/mobs/Large_Box.lua b/scripts/zones/Balgas_Dais/mobs/Large_Box.lua
@@ -22,7 +22,7 @@ entity.onMobEngage = function(mob, target)
     then
         small:setLocalVar('engaged', 1)
 
-        mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+        mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
         DespawnMob(mobId - 2)
         DespawnMob(mobId - 1)
 

diff --git a/scripts/zones/Balgas_Dais/mobs/Medium_Box.lua b/scripts/zones/Balgas_Dais/mobs/Medium_Box.lua
@@ -16,7 +16,7 @@ entity.onMobEngage = function(mob, target)
     then
         small:setLocalVar('engaged', 1)
 
-        mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+        mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
         DespawnMob(mobId - 1)
         DespawnMob(mobId + 1)
 

diff --git a/scripts/zones/Balgas_Dais/mobs/Small_Box.lua b/scripts/zones/Balgas_Dais/mobs/Small_Box.lua
@@ -18,7 +18,7 @@ entity.onMobEngage = function(mob, target)
     if mob:getLocalVar('engaged') == 0 then
         mob:setLocalVar('engaged', 1)
 
-        mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+        mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
         DespawnMob(mobId + 1)
         DespawnMob(mobId + 2)
 

diff --git a/scripts/zones/Balgas_Dais/mobs/Wyrm.lua b/scripts/zones/Balgas_Dais/mobs/Wyrm.lua
@@ -11,7 +11,7 @@ entity.onMobInitialize = function(mob)
 end
 
 entity.onMobSpawn = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1) -- has a bug during flight, like Tiamat
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL) -- has a bug during flight, like Tiamat
     mob:setTP(3000) -- opens fight with a skill
 end
 

diff --git a/scripts/zones/Behemoths_Dominion/mobs/King_Behemoth.lua b/scripts/zones/Behemoths_Dominion/mobs/King_Behemoth.lua
@@ -14,6 +14,8 @@ entity.onMobInitialize = function(mob)
 end
 
 entity.onMobSpawn = function(mob)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 25)
     mob:setLocalVar('[rage]timer', 3600) -- 60 minutes
 
     -- Despawn the ???

diff --git a/scripts/zones/Dragons_Aery/mobs/Fafnir.lua b/scripts/zones/Dragons_Aery/mobs/Fafnir.lua
@@ -9,6 +9,8 @@ mixins = { require('scripts/mixins/rage') }
 local entity = {}
 
 entity.onMobSpawn = function(mob)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 20)
     mob:setLocalVar('[rage]timer', 3600) -- 60 minutes
     mob:setMobMod(xi.mobMod.WEAPON_BONUS, 50) -- Level 90 + 50 = 140 Base Weapon Damage
 

diff --git a/scripts/zones/FeiYin/mobs/Capricious_Cassie.lua b/scripts/zones/FeiYin/mobs/Capricious_Cassie.lua
@@ -8,7 +8,7 @@ mixins = { require('scripts/mixins/rage') }
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 2)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, bit.bor(xi.drawin.NORMAL, xi.drawin.INCLUDE_ALLIANCE))
 end
 
 entity.onMobDeath = function(mob, player, optParams)

diff --git a/scripts/zones/Garlaige_Citadel/mobs/Serket.lua b/scripts/zones/Garlaige_Citadel/mobs/Serket.lua
@@ -8,7 +8,7 @@ mixins = { require('scripts/mixins/rage') }
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 end
 
 entity.onMobSpawn = function(mob)

diff --git a/scripts/zones/Ifrits_Cauldron/mobs/Bomb_Queen.lua b/scripts/zones/Ifrits_Cauldron/mobs/Bomb_Queen.lua
@@ -9,7 +9,7 @@ local entity = {}
 entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.IDLE_DESPAWN, 180)
     mob:setMobMod(xi.mobMod.HP_STANDBACK, -1)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
     mob:setMod(xi.mod.STUN_MEVA, 50)
 end
 

diff --git a/scripts/zones/King_Ranperres_Tomb/mobs/Cemetery_Cherry.lua b/scripts/zones/King_Ranperres_Tomb/mobs/Cemetery_Cherry.lua
@@ -20,7 +20,7 @@ end
 
 entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.IDLE_DESPAWN, 180)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 
     local saplingsRespawn = math.random(1800, 3600) -- 30 to 60 minutes
     mob:timer(saplingsRespawn * 1000, function(mobArg)

diff --git a/scripts/zones/Konschtat_Highlands/mobs/Steelfleece_Baldarich.lua b/scripts/zones/Konschtat_Highlands/mobs/Steelfleece_Baldarich.lua
@@ -10,7 +10,7 @@ local entity = {}
 
 entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.ALWAYS_AGGRO, 1)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 end
 
 entity.onMobSpawn = function(mob)

diff --git a/scripts/zones/La_Theine_Plateau/mobs/Bloodtear_Baldurf.lua b/scripts/zones/La_Theine_Plateau/mobs/Bloodtear_Baldurf.lua
@@ -10,7 +10,7 @@ local entity = {}
 
 entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.ALWAYS_AGGRO, 1)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 end
 
 entity.onMobSpawn = function(mob)

diff --git a/scripts/zones/Labyrinth_of_Onzozo/mobs/Lord_of_Onzozo.lua b/scripts/zones/Labyrinth_of_Onzozo/mobs/Lord_of_Onzozo.lua
@@ -8,7 +8,7 @@ mixins = { require('scripts/mixins/rage') }
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 end
 
 entity.onMobDeath = function(mob, player, optParams)

diff --git a/scripts/zones/Mamook/mobs/Gulool_Ja_Ja.lua b/scripts/zones/Mamook/mobs/Gulool_Ja_Ja.lua
@@ -10,7 +10,7 @@ local entity = {}
 
 entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.DOUBLE_ATTACK, 20)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 2)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, bit.bor(xi.drawin.NORMAL, xi.drawin.INCLUDE_ALLIANCE))
 end
 
 entity.onMobEngage = function(mob, target)

diff --git a/scripts/zones/Meriphataud_Mountains/mobs/Waraxe_Beak.lua b/scripts/zones/Meriphataud_Mountains/mobs/Waraxe_Beak.lua
@@ -6,7 +6,7 @@
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
     mob:setMobMod(xi.mobMod.HP_STANDBACK, -1)
 end
 

diff --git a/scripts/zones/Nyzul_Isle/mobs/Alexander.lua b/scripts/zones/Nyzul_Isle/mobs/Alexander.lua
@@ -10,7 +10,7 @@ local entity = {}
 entity.onMobSpawn = function(mob)
     mob:setMobMod(xi.mobMod.NO_MOVE, 1)
     -- 'Draw in' should only trigger when target is beyond 20' (out of Radiant_Sacrament range)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 
     mob:addListener('WEAPONSKILL_STATE_ENTER', 'WS_START_MSG', function(mobArg, skillID)
         -- Radiant Sacrament

diff --git a/scripts/zones/Phomiuna_Aqueducts/mobs/Minotaur.lua b/scripts/zones/Phomiuna_Aqueducts/mobs/Minotaur.lua
@@ -8,7 +8,8 @@ mixins = { require('scripts/mixins/fomor_hate') }
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 15)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, bit.bor(xi.drawin.NORMAL, xi.drawin.INCLUDE_ALLIANCE))
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 15)
 end
 
 entity.onMobSpawn = function(mob)

diff --git a/scripts/zones/Riverne-Site_A01/mobs/Ouryu.lua b/scripts/zones/Riverne-Site_A01/mobs/Ouryu.lua
@@ -7,7 +7,8 @@
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 15)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 15)
 end
 
 entity.onMobSpawn = function(mob)

diff --git a/scripts/zones/Riverne-Site_B01/mobs/Vrtra.lua b/scripts/zones/Riverne-Site_B01/mobs/Vrtra.lua
@@ -6,7 +6,8 @@
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 15)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 15)
 end
 
 return entity
diff --git a/scripts/zones/Temenos/mobs/Proto-Ultima.lua b/scripts/zones/Temenos/mobs/Proto-Ultima.lua
@@ -47,7 +47,7 @@ executeCitadelBusterState = function(mob)
         mob:setMagicCastingEnabled(true)
         mob:setAutoAttackEnabled(true)
         mob:setMobAbilityEnabled(true)
-        mob:setMobMod(xi.mobMod.DRAW_IN, 0)
+        mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NONE)
         -- Use Citadel Buster at a regular interval
         mob:setLocalVar('citadelBusterTime', os.time() + math.random(90, 100))
         return
@@ -64,7 +64,7 @@ entity.onMobSpawn = function(mob)
     mob:setMagicCastingEnabled(false)
     mob:setAutoAttackEnabled(true)
     mob:setMobAbilityEnabled(true)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 0)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NONE)
     mob:setMobMod(xi.mobMod.SKILL_LIST, 729)
 end
 
@@ -99,7 +99,7 @@ entity.onMobFight = function(mob, target)
         mob:setMobAbilityEnabled(false)
         mob:setMagicCastingEnabled(false)
         mob:setAutoAttackEnabled(false)
-        mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+        mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
         executeCitadelBusterState(mob)
     end
 end

diff --git a/scripts/zones/The_Boyahda_Tree/mobs/Ancient_Goobbue.lua b/scripts/zones/The_Boyahda_Tree/mobs/Ancient_Goobbue.lua
@@ -18,7 +18,7 @@ entity.onMobSpawn = function(mob)
             { id = xi.jsa.HUNDRED_FISTS, cooldown = 60, hpp = math.random(85, 95) },
         },
     })
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 end
 
 entity.onMobDeath = function(mob, player, optParams)

diff --git a/scripts/zones/The_Boyahda_Tree/mobs/Voluptuous_Vivian.lua b/scripts/zones/The_Boyahda_Tree/mobs/Voluptuous_Vivian.lua
@@ -8,7 +8,7 @@ mixins = { require('scripts/mixins/job_special') }
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 2)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, bit.bor(xi.drawin.NORMAL, xi.drawin.INCLUDE_ALLIANCE))
 end
 
 entity.onMobDeath = function(mob, player, optParams)

diff --git a/scripts/zones/Uleguerand_Range/mobs/Jormungand.lua b/scripts/zones/Uleguerand_Range/mobs/Jormungand.lua
@@ -14,7 +14,8 @@ end
 
 entity.onMobInitialize = function(mob)
     mob:setCarefulPathing(true)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 15)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 15)
 end
 
 entity.onMobSpawn = function(mob)

diff --git a/scripts/zones/Wajaom_Woodlands/mobs/Tinnin.lua b/scripts/zones/Wajaom_Woodlands/mobs/Tinnin.lua
@@ -18,7 +18,7 @@ entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.GIL_MIN, 12000)
     mob:setMobMod(xi.mobMod.GIL_MAX, 30000)
     mob:setMobMod(xi.mobMod.MUG_GIL, 8000)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
     mob:setMod(xi.mod.UDMGBREATH, -10000) -- immune to breath damage
     mob:setMobMod(xi.mobMod.IDLE_DESPAWN, 300)
 end

diff --git a/scripts/zones/Waughroon_Shrine/mobs/Dark_Dragon.lua b/scripts/zones/Waughroon_Shrine/mobs/Dark_Dragon.lua
@@ -7,7 +7,8 @@
 local entity = {}
 
 entity.onMobInitialize = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 25)
 end
 
 entity.onMobDeath = function(mob, player, optParams)

diff --git a/scripts/zones/Waughroon_Shrine/mobs/Flayer_Franz.lua b/scripts/zones/Waughroon_Shrine/mobs/Flayer_Franz.lua
@@ -7,7 +7,7 @@
 local entity = {}
 
 entity.onMobSpawn = function(mob)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 end
 
 entity.onMobDeath = function(mob, player, optParams)

diff --git a/scripts/zones/Western_Altepa_Desert/mobs/King_Vinegarroon.lua b/scripts/zones/Western_Altepa_Desert/mobs/King_Vinegarroon.lua
@@ -17,7 +17,8 @@ end
 
 entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.ADD_EFFECT, 1)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 2)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, bit.bor(xi.drawin.NORMAL, xi.drawin.INCLUDE_ALLIANCE))
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 15)
 end
 
 entity.onMobDrawIn = function(mob, target)

diff --git a/scripts/zones/Xarcabard/mobs/Boreal_Coeurl.lua b/scripts/zones/Xarcabard/mobs/Boreal_Coeurl.lua
@@ -86,6 +86,8 @@ entity.onMobEngage = function(mob)
 end
 
 entity.onMobSpawn = function(mob)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, bit.bor(xi.drawin.NORMAL, xi.drawin.INCLUDE_ALLIANCE))
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 15)
     mob:setSpeed(baseSpeed)
     -- Failsafe to make sure NPC is down when NM is up
     if xi.settings.main.OLDSCHOOL_G2 then

diff --git a/scripts/zones/Xarcabard/mobs/Boreal_Hound.lua b/scripts/zones/Xarcabard/mobs/Boreal_Hound.lua
@@ -88,6 +88,8 @@ entity.onMobEngage = function(mob)
 end
 
 entity.onMobSpawn = function(mob)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, bit.bor(xi.drawin.NORMAL, xi.drawin.INCLUDE_ALLIANCE))
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 15)
     mob:setSpeed(baseSpeed)
     -- Failsafe to make sure NPC is down when NM is up
     if xi.settings.main.OLDSCHOOL_G2 then

diff --git a/scripts/zones/Xarcabard/mobs/Boreal_Tiger.lua b/scripts/zones/Xarcabard/mobs/Boreal_Tiger.lua
@@ -83,6 +83,8 @@ entity.onMobEngage = function(mob)
 end
 
 entity.onMobSpawn = function(mob)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, bit.bor(xi.drawin.NORMAL, xi.drawin.INCLUDE_ALLIANCE))
+    mob:setMobMod(xi.mobMod.DRAW_IN_TRIGGER_DIST, 15)
     mob:setSpeed(baseSpeed)
     -- Failsafe to make sure NPC is down when NM is up
     if xi.settings.main.OLDSCHOOL_G2 then

diff --git a/scripts/zones/Xarcabard_[S]/mobs/Zirnitra.lua b/scripts/zones/Xarcabard_[S]/mobs/Zirnitra.lua
@@ -14,7 +14,7 @@ entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.REGEN, 50)
     mob:setMod(xi.mod.REGAIN, 100)
     mob:setMod(xi.mod.WIND_ABSORB, 100)
-    mob:setMobMod(xi.mobMod.DRAW_IN, 1)
+    mob:setMobMod(xi.mobMod.DRAW_IN_BITMASK, xi.drawin.NORMAL)
 end
 
 entity.onMobEngage = function(mob)