mirror of
https://github.com/brues-code/pfUI.git
synced 2026-09-28 10:26:02 +00:00
Show party pets in raidpet frames under raidforgroup
When "Use Raid Frames To Display Group Members" is on and in a party, raid pet frames tried to show raidpet1..40 (nonexistent in a party) instead of the player pet and partypet1..4. Remap raidpet grid slots to pet / partypet<N> in UpdateVisibility, keyed on a stable pfRaidPet<N> slot, mirroring the raid player frames. LayoutPets now mirror-places the party pet slots, and the raid updater runs LayoutPets when in a party (not just a raid). Also exclude raid pet frames (label "partypet", cache_raidpet set) from the hide_in_raid group-hiding clause so they are not hidden.
This commit is contained in:
+24
-2
@@ -125,6 +125,7 @@ pfUI:RegisterModule("raid", function ()
|
||||
local grid = self.petgrid
|
||||
|
||||
local function place(pet, cell, id)
|
||||
pet.label = "raidpet"
|
||||
pet.id = id
|
||||
local r, g = SlotToCoord(cell, grid.fill, grid.x, grid.y)
|
||||
pet:ClearAllPoints()
|
||||
@@ -140,6 +141,22 @@ pfUI:RegisterModule("raid", function ()
|
||||
return
|
||||
end
|
||||
|
||||
-- Party shown as a raid grid: mirror slots 1..5 (player + party members)
|
||||
-- into fixed cells. UpdateVisibility maps each slot to pet / partypet<N>.
|
||||
if not IsInRaid() and IsInGroup() and C.unitframes.raidforgroup == "1" then
|
||||
for id = 1, maxraid do
|
||||
if self.pets[id] then
|
||||
if id <= 5 then
|
||||
place(self.pets[id], id, id)
|
||||
else
|
||||
self.pets[id].id = 0
|
||||
self.pets[id]:Hide()
|
||||
end
|
||||
end
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
if C.unitframes.raidpet.collapse == "1" then
|
||||
-- Pack the pets that exist into the leading cells, no gaps.
|
||||
local k = 0
|
||||
@@ -213,8 +230,13 @@ pfUI:RegisterModule("raid", function ()
|
||||
this.tick = GetTime() + 1.0
|
||||
this.pendingUpdate = nil
|
||||
|
||||
-- don't proceed without raid
|
||||
if not IsInRaid() then return end
|
||||
-- Without a raid there is nothing to sort, but a party shown as a raid
|
||||
-- grid still needs its pet frames placed and mapped to the party pets.
|
||||
if not IsInRaid() then
|
||||
this:LayoutPets()
|
||||
this:Hide()
|
||||
return
|
||||
end
|
||||
|
||||
-- clear all existing frames
|
||||
for i=1, maxraid do SetRaidIndex(pfUI.uf.raid[i], 0) end
|
||||
|
||||
Reference in New Issue
Block a user