From bcf67e7290acf3063c09e06ac0f5c98e7395cee9 Mon Sep 17 00:00:00 2001 From: sruon Date: Sat, 7 Feb 2026 00:29:25 -0700 Subject: [PATCH] Minotaur/KV party draw-in consider pet master --- scripts/zones/Phomiuna_Aqueducts/mobs/Minotaur.lua | 13 ++++++++++++- .../Western_Altepa_Desert/mobs/King_Vinegarroon.lua | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/scripts/zones/Phomiuna_Aqueducts/mobs/Minotaur.lua b/scripts/zones/Phomiuna_Aqueducts/mobs/Minotaur.lua index fb83efbe21c..a3ab836c9bd 100644 --- a/scripts/zones/Phomiuna_Aqueducts/mobs/Minotaur.lua +++ b/scripts/zones/Phomiuna_Aqueducts/mobs/Minotaur.lua @@ -31,8 +31,19 @@ entity.onMobFight = function(mob, target) { x = 55.13, y = 1.00, z = 304.64 }, } + -- If target is a pet, get the master for alliance lookup + local allianceTarget = target + if target:getObjType() ~= xi.objType.PC then + local master = target:getMaster() + if master and master:getObjType() == xi.objType.PC then + allianceTarget = master + else + return + end + end + local drewIn = false - for _, member in ipairs(target:getAlliance()) do + for _, member in ipairs(allianceTarget:getAlliance()) do local randomPos = drawInPositions[math.random(#drawInPositions)] randomPos.rot = member:getRotPos() diff --git a/scripts/zones/Western_Altepa_Desert/mobs/King_Vinegarroon.lua b/scripts/zones/Western_Altepa_Desert/mobs/King_Vinegarroon.lua index 45b0850f0b9..41e478dea14 100644 --- a/scripts/zones/Western_Altepa_Desert/mobs/King_Vinegarroon.lua +++ b/scripts/zones/Western_Altepa_Desert/mobs/King_Vinegarroon.lua @@ -123,7 +123,18 @@ entity.onMobSkillTarget = function(target, mob, mobskill) if math.random(0, 100) >= 50 then mob:drawIn() else - for _, member in ipairs(target:getAlliance()) do + -- If target is a pet, get the master for alliance lookup + local allianceTarget = target + if target:getObjType() ~= xi.objType.PC then + local master = target:getMaster() + if master and master:getObjType() == xi.objType.PC then + allianceTarget = master + else + return + end + end + + for _, member in ipairs(allianceTarget:getAlliance()) do mob:drawIn(member, 0, 0) end end