Skip to content

Commit

Permalink
5.2.192-Release
Browse files Browse the repository at this point in the history
  • Loading branch information
@Goldpaw
Goldpaw committed Dec 4, 2024
1 parent 4eb28bf commit 0442770
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 65 deletions.
2 changes: 1 addition & 1 deletion AzeriteUI/AzeriteUI_Vanilla.toc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 11504
## Interface: 11505
## IconTexture: Interface\Addons\AzeriteUI\Assets\power-crystal-ice-icon.tga

## Title: |TInterface\Addons\AzeriteUI\Assets\power-crystal-ice-icon.tga:16:16:0:0:512:512:70:442:40:472|t |cff4488bbAzerite|r |cfffafafaUI|r |cffcccccc5.2|r
Expand Down
161 changes: 97 additions & 64 deletions AzeriteUI/Components/Misc/Minimap.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,46 +135,62 @@ local ObjectSnippets = {
},
Eye = {
Enable = function(object)
if (ns.IsCata) then
if (ns.IsClassic) then

elseif (ns.IsCata) then
object:SetFrameLevel(object:GetParent():GetFrameLevel() + 2)
elseif (ns.IsRetail) then
end
end,
Disable = function(object)
if (ns.IsCata) then
if (ns.IsClassic) then
elseif (ns.IsCata) then
elseif (ns.IsRetail) then
end
end,
Update = function(object)
if (ns.IsCata) then
if (ns.IsClassic) then
elseif (ns.IsCata) then
elseif (ns.IsRetail) then
end
end
},
EyeClassicPvP = {
Enable = function(object)
MiniMapBattlefieldIcon:Show()
MiniMapBattlefieldBorder:Show()
BattlegroundShine:Show()
if (BattlefieldIconText) then BattlefieldIconText:Show() end
end,
Disable = function(object)
MiniMapBattlefieldIcon:Hide()
MiniMapBattlefieldBorder:Hide()
BattlegroundShine:Hide()
if (BattlefieldIconText) then BattlefieldIconText:Hide() end
end,
Update = function(object)
if (PVPBattleground_UpdateQueueStatus) then PVPBattleground_UpdateQueueStatus() end
BattlefieldFrame_UpdateStatus(false)
end
},
--EyeClassicPvP = {
-- Enable = function(object)
-- LFGMinimapFrameBorder:Show()
-- LFGMinimapFrameIcon:Show()
-- --MiniMapBattlefieldIcon:Show()
-- --MiniMapBattlefieldBorder:Show()
-- --BattlegroundShine:Show()
-- --if (BattlefieldIconText) then BattlefieldIconText:Show() end
-- end,
-- Disable = function(object)
-- LFGMinimapFrameBorder:Hide()
-- LFGMinimapFrameIcon:Hide()
-- --MiniMapBattlefieldIcon:Hide()
-- --MiniMapBattlefieldBorder:Hide()
-- --BattlegroundShine:Hide()
-- --if (BattlefieldIconText) then BattlefieldIconText:Hide() end
-- end,
-- Update = function(object)
-- --if (PVPBattleground_UpdateQueueStatus) then PVPBattleground_UpdateQueueStatus() end
-- BattlefieldFrame_UpdateStatus(false)
-- end
--},

-- AzeriteUI Objects
------------------------------------------
AzeriteEye = {
Enable = function(object)
if (ns.IsCata) then
if (ns.IsClassic) then
LFGMinimapFrame:SetParent(Minimap)
LFGMinimapFrame:SetFrameLevel(100)
LFGMinimapFrame:ClearAllPoints()
LFGMinimapFrame:SetPoint("BOTTOMLEFT", Minimap, 4, 2)
LFGMinimapFrame:SetHitRectInsets(-8, -8, -8, -8)
LFGMinimapFrameBorder:Hide()
LFGMinimapFrameIconTexture:Hide()
elseif (ns.IsCata) then
MiniMapLFGFrame:SetParent(Minimap)
MiniMapLFGFrame:SetFrameLevel(100)
MiniMapLFGFrame:ClearAllPoints()
Expand All @@ -193,7 +209,15 @@ local ObjectSnippets = {
end
end,
Disable = function(object)
if (ns.IsCata) then
if (ns.IsClassic) then
LFGMinimapFrame:SetParent(_G[ObjectOwners.Eye])
LFGMinimapFrame:SetFrameLevel(MinimapBackdrop:GetFrameLevel() + 2)
LFGMinimapFrame:ClearAllPoints()
LFGMinimapFrame:SetPoint("TOPLEFT", 33, -4)
LFGMinimapFrame:SetHitRectInsets(0, 0, 0, 0)
LFGMinimapFrameBorder:Show()
LFGMinimapFrameIconTexture:Show()
elseif (ns.IsCata) then
MiniMapLFGFrame:SetParent(_G[ObjectOwners.Eye])
MiniMapLFGFrame:SetFrameLevel(MinimapBackdrop:GetFrameLevel() + 2)
MiniMapLFGFrame:ClearAllPoints()
Expand All @@ -216,40 +240,40 @@ local ObjectSnippets = {
Update = function(object)
end
},
AzeriteEyeClassicPvP = {
Enable = function(object)
MiniMapBattlefieldFrame:SetFrameStrata("MEDIUM")
MiniMapBattlefieldFrame:SetFrameLevel(70) -- Minimap's XP button is 60
MiniMapBattlefieldFrame:ClearAllPoints()
MiniMapBattlefieldFrame:SetPoint("BOTTOMLEFT", Minimap, 4, 2)
MiniMapBattlefieldFrame:SetHitRectInsets(-8, -8, -8, -8)
MiniMapBattlefieldIcon:Hide()
MiniMapBattlefieldBorder:Hide()
BattlegroundShine:Hide()
if (BattlefieldIconText) then BattlefieldIconText:Hide() end
end,
Disable = function(object)
MiniMapBattlefieldFrame:SetFrameStrata(Minimap:GetFrameStrata())
MiniMapBattlefieldFrame:SetFrameLevel(Minimap:GetFrameLevel() + 1)
MiniMapBattlefieldFrame:ClearAllPoints()
MiniMapBattlefieldFrame:SetPoint("BOTTOMLEFT", Minimap, 13, -13)
MiniMapBattlefieldFrame:SetHitRectInsets(0, 0, 0, 0)
MiniMapBattlefieldIcon:Show()
MiniMapBattlefieldBorder:Show()
BattlegroundShine:Show()
if (BattlefieldIconText) then BattlefieldIconText:Show() end
end,
Update = function(object)
end
}
--AzeriteEyeClassicPvP = {
-- Enable = function(object)
-- MiniMapBattlefieldFrame:SetFrameStrata("MEDIUM")
-- MiniMapBattlefieldFrame:SetFrameLevel(70) -- Minimap's XP button is 60
-- MiniMapBattlefieldFrame:ClearAllPoints()
-- MiniMapBattlefieldFrame:SetPoint("BOTTOMLEFT", Minimap, 4, 2)
-- MiniMapBattlefieldFrame:SetHitRectInsets(-8, -8, -8, -8)
-- MiniMapBattlefieldIcon:Hide()
-- MiniMapBattlefieldBorder:Hide()
-- BattlegroundShine:Hide()
-- if (BattlefieldIconText) then BattlefieldIconText:Hide() end
-- end,
-- Disable = function(object)
-- MiniMapBattlefieldFrame:SetFrameStrata(Minimap:GetFrameStrata())
-- MiniMapBattlefieldFrame:SetFrameLevel(Minimap:GetFrameLevel() + 1)
-- MiniMapBattlefieldFrame:ClearAllPoints()
-- MiniMapBattlefieldFrame:SetPoint("BOTTOMLEFT", Minimap, 13, -13)
-- MiniMapBattlefieldFrame:SetHitRectInsets(0, 0, 0, 0)
-- MiniMapBattlefieldIcon:Show()
-- MiniMapBattlefieldBorder:Show()
-- BattlegroundShine:Show()
-- if (BattlefieldIconText) then BattlefieldIconText:Show() end
-- end,
-- Update = function(object)
-- end
--}
}

-- Element type of custom elements.
local ElementTypes = {
Backdrop = "Texture",
Border = "Texture",
AzeriteEye = "Texture",
AzeriteEyeClassicPvP = "Texture"
--AzeriteEyeClassicPvP = "Texture"
}

-- Mask textures for the supported shapes.
Expand Down Expand Up @@ -310,21 +334,21 @@ local Skins = {
Owner = "Eye",
DrawLayer = "BORDER",
DrawLevel = 2,
Path = GetMedia("group-finder-eye-green"),
Path = GetMedia("group-finder-eye-orange"),
Size = { 64, 64 },
Point = { "CENTER", 0, 0 },
Color = { .90, .95, 1 }
},
-- CATA: check
AzeriteEyeClassicPvP = (ns.IsClassic or ns.IsCata) and {
Owner = "EyeClassicPvP",
DrawLayer = "BORDER",
DrawLevel = 2,
Path = GetMedia("group-finder-eye-orange"),
Size = { 64, 64 },
Point = { "CENTER", 0, 0 },
Color = { .90, .95, 1 }
}
--AzeriteEyeClassicPvP = (ns.IsClassic or ns.IsCata) and {
-- Owner = "EyeClassicPvP",
-- DrawLayer = "BORDER",
-- DrawLevel = 2,
-- Path = GetMedia("group-finder-eye-orange"),
-- Size = { 64, 64 },
-- Point = { "CENTER", 0, 0 },
-- Color = { .90, .95, 1 }
--}
}
}
}
Expand Down Expand Up @@ -972,6 +996,7 @@ MinimapMod.PostUpdatePositionAndScale = function(self)

-- TODO: Figure out all the elements I should rescale.
for name in next,{
LFGMinimapFrame = true, -- New Classic (and Cata?) Group Finder Eye
MiniMapBattlefieldFrame = true,
MiniMapLFGFrame = true,
QueueStatusButton = true
Expand Down Expand Up @@ -1070,8 +1095,8 @@ MinimapMod.InitializeObjectTables = function(self)
Objects.Clock = TimeManagerClockButton
Objects.Compass = MinimapCompassTexture
Objects.Difficulty = MiniMapInstanceDifficulty
Objects.Eye = MiniMapLFGFrame
Objects.EyeClassicPvP = MiniMapBattlefieldFrame
Objects.Eye = LFGMinimapFrame or MiniMapLFGFrame
Objects.EyeClassicPvP = LFGMinimapFrame or MiniMapBattlefieldFrame
Objects.Mail = MiniMapMailFrame
Objects.Tracking = MiniMapTracking
Objects.Zone = MinimapZoneTextButton
Expand All @@ -1087,8 +1112,8 @@ MinimapMod.InitializeObjectTables = function(self)
Objects.Clock = TimeManagerClockButton
Objects.Compass = MinimapCompassTexture
Objects.Difficulty = MiniMapInstanceDifficulty
Objects.Eye = MiniMapLFGFrame
Objects.EyeClassicPvP = MiniMapBattlefieldFrame
Objects.Eye = LFGMinimapFrame -- MinimapBackdrop
--Objects.EyeClassicPvP = LFGMinimapFrame or MiniMapBattlefieldFrame
Objects.Mail = MiniMapMailFrame
Objects.ToggleButton = MinimapToggleButton
Objects.Tracking = MiniMapTrackingFrame
Expand Down Expand Up @@ -1117,6 +1142,8 @@ MinimapMod.InitializeObjectTables = function(self)
ObjectOwners.ZoomOut = Minimap
end

--[[--
-- CATA: check
if (ns.IsCata) then
ObjectOwners.BorderTop = MinimapCluster
Expand Down Expand Up @@ -1155,6 +1182,8 @@ MinimapMod.InitializeObjectTables = function(self)
ObjectOwners.WorldMap = MinimapBackdrop
end
--]]--

end

MinimapMod.OnEvent = function(self, event, ...)
Expand All @@ -1167,6 +1196,10 @@ end
MinimapMod.OnEnable = function(self)
LoadAddOn("Blizzard_TimeManager")

if (ns.IsClassic) then
LoadAddOn("Blizzard_GroupFinder_VanillaStyle")
end

-- Clean out deprecated settings
self.db.profile.useHalfClock = nil
self.db.profile.useServerTime = nil
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. Be aware th
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [5.2.192-Release] 2024-12-04
### Fixed
- Fixed the new Group Finder Eye in Classic Era.

## [5.2.191-Release] 2024-11-01
### Fixed
- The player's party unitframe is no longer always visible. I forgot to turn off a developer setting before uploading the previous fix.
Expand Down

0 comments on commit 0442770

Please sign in to comment.