From ed4ad5bac73b0fe58d9bf243f0f86abbd716e9d4 Mon Sep 17 00:00:00 2001 From: Skold177 <113406182+Skold177@users.noreply.github.com> Date: Wed, 13 May 2026 12:14:55 -0400 Subject: [PATCH] [lua] AA MR Pet Fix Fixes AA ME so it is only allowed one pet --- scripts/battlefields/LaLoff_Amphitheater/divine_might.lua | 1 + scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angel_MR.lua | 7 +++++++ .../zones/LaLoff_Amphitheater/mobs/Ark_Angels_Tiger.lua | 6 ------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/battlefields/LaLoff_Amphitheater/divine_might.lua b/scripts/battlefields/LaLoff_Amphitheater/divine_might.lua index 28c457701f1..7e8bae0c59f 100644 --- a/scripts/battlefields/LaLoff_Amphitheater/divine_might.lua +++ b/scripts/battlefields/LaLoff_Amphitheater/divine_might.lua @@ -54,6 +54,7 @@ content.groups = }, }, + superlink = true, allDeath = function(battlefield, mob) battlefield:setStatus(xi.battlefield.status.WON) end, diff --git a/scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angel_MR.lua b/scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angel_MR.lua index ec216feca56..86325371ac1 100644 --- a/scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angel_MR.lua +++ b/scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angel_MR.lua @@ -28,6 +28,7 @@ local function spawnArkAngelPet(mob) if xi.mob.callPets(mob, petId, callPetParams) then pet = GetMobByID(petId) if pet then + mob:setPet(pet) battlefield:insertEntity(pet:getTargID(), false, true) pet:addListener('DEATH', 'AAMR_PET_DEATH_' .. petId, function(petArg) @@ -75,6 +76,12 @@ entity.onMobFight = function(mob, target) local battlefield = mob:getBattlefield() if battlefield then local respawnTime = battlefield:getLocalVar('petRespawnMR') + local pet = mob:getPet() + + if pet and pet:isAlive() then + return + end + if respawnTime ~= 0 and respawnTime <= GetSystemTime() diff --git a/scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angels_Tiger.lua b/scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angels_Tiger.lua index 6b4ecebad06..cf6a6e7c280 100644 --- a/scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angels_Tiger.lua +++ b/scripts/zones/LaLoff_Amphitheater/mobs/Ark_Angels_Tiger.lua @@ -16,10 +16,4 @@ entity.onMobEngage = function(mob, target) end end -entity.onMobFight = function(mob, target) -end - -entity.onMobDeath = function(mob, player, optParams) -end - return entity