diff --git a/rCombatText/rCombatText.toc b/rCombatText/rCombatText.toc index 10af786..1c2baca 100644 --- a/rCombatText/rCombatText.toc +++ b/rCombatText/rCombatText.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rCombatText |cff1a9fc0BCC|r +## Title: rCombatText |cff1a9fc0WLK|r ## Notes: Small tweaks for the default combat text ## RequiredDeps: Blizzard_CombatText ## LoadWith: Blizzard_CombatText diff --git a/rDamageFont/rDamageFont.toc b/rDamageFont/rDamageFont.toc index b4e4f49..fc3e4b6 100644 --- a/rDamageFont/rDamageFont.toc +++ b/rDamageFont/rDamageFont.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rDamageFont |cff1a9fc0BCC|r +## Title: rDamageFont |cff1a9fc0WLK|r ## Notes: New damage font ## RequiredDeps: rLib diff --git a/rEmote/rEmote.toc b/rEmote/rEmote.toc index 8ad42c4..77f8bae 100644 --- a/rEmote/rEmote.toc +++ b/rEmote/rEmote.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rEmote |cff1a9fc0BCC|r +## Title: rEmote |cff1a9fc0WLK|r ## Notes: Boss Emotes and Whispers core.lua diff --git a/rError/rError.toc b/rError/rError.toc index 1359a91..aa3beb9 100644 --- a/rError/rError.toc +++ b/rError/rError.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rError |cff1a9fc0BCC|r +## Title: rError |cff1a9fc0WLK|r ## Notes: Blacklisting and redirecting of error messages core.lua diff --git a/rLib/rLib.toc b/rLib/rLib.toc index db496b3..13f5965 100644 --- a/rLib/rLib.toc +++ b/rLib/rLib.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rLib |cff1a9fc0BCC|r +## Title: rLib |cff1a9fc0WLK|r ## Notes: Zork's addon library. ## Classic: cocovanana diff --git a/rMinimap/core.lua b/rMinimap/core.lua index a0e6da8..76f3c00 100644 --- a/rMinimap/core.lua +++ b/rMinimap/core.lua @@ -46,21 +46,20 @@ MinimapZoomOut:Hide() MinimapBorderTop:Hide() MiniMapWorldMapButton:Hide() MinimapZoneText:Hide() -MinimapToggleButton:Hide() -GameTimeFrame:Hide() +-- MinimapToggleButton:Hide() -- removed fram warth +-- GameTimeFrame:Hide() --quest timer frame -QuestTimerFrame:SetParent(Minimap) -QuestTimerFrame:SetScale(1) -QuestTimerFrame:ClearAllPoints() -QuestTimerFrame:SetPoint("TOP",Minimap,"BOTTOM",0,-10) +-- QuestTimerFrame:SetParent(Minimap) +-- QuestTimerFrame:SetScale(1) +-- QuestTimerFrame:ClearAllPoints() +-- QuestTimerFrame:SetPoint("TOP",Minimap,"BOTTOM",0,-10) --dungeon info --- classic-disable ---[[ MiniMapInstanceDifficulty:ClearAllPoints() MiniMapInstanceDifficulty:SetPoint("TOP",Minimap,"TOP",0,-5) MiniMapInstanceDifficulty:SetScale(0.8) +--[[ GuildInstanceDifficulty:ClearAllPoints() GuildInstanceDifficulty:SetPoint("TOP",Minimap,"TOP",0,-5) GuildInstanceDifficulty:SetScale(0.7) @@ -70,16 +69,15 @@ MiniMapChallengeMode:SetScale(0.6) ]]-- --QueueStatusMinimapButton (lfi) --- classic-disable ---[[ -QueueStatusMinimapButton:SetParent(Minimap) -QueueStatusMinimapButton:SetScale(1) -QueueStatusMinimapButton:ClearAllPoints() -QueueStatusMinimapButton:SetPoint("BOTTOMLEFT",Minimap,0,0) -QueueStatusMinimapButtonBorder:Hide() -QueueStatusMinimapButton:SetHighlightTexture (nil) -QueueStatusMinimapButton:SetPushedTexture(nil) -]]-- +-- MiniMapLFGFrame (wrath) +MiniMapLFGFrame:SetParent(Minimap) +MiniMapLFGFrame:SetScale(.8) +MiniMapLFGFrame:ClearAllPoints() +MiniMapLFGFrame:SetPoint("BOTTOMLEFT",Minimap,8,8) +MiniMapLFGFrame:Hide() +MiniMapLFGFrame:SetHighlightTexture(nil) +MiniMapLFGFrame:SetPushedTexture(nil) +MiniMapLFGFrameBorder:Hide() --wrath --garrison (DIEEEEEE!!!) --GarrisonLandingPageMinimapButton @@ -102,16 +100,22 @@ MiniMapTracking:SetScale(.8) MiniMapTracking:ClearAllPoints() MiniMapTracking:SetPoint("TOPLEFT",Minimap,5,-5) MiniMapTracking:SetAlpha(0.6) -MiniMapTrackingBackground:Hide() -MiniMapTrackingBorder:Hide() +if _G.MiniMapTrackingButtonBorder then + _G.MiniMapTrackingButtonBorder:Hide() +end + +if _G.MiniMapTrackingBorder then + _G.MiniMapTrackingBorder:Hide() +end + +if _G.MiniMapTrackingBackground then + _G.MiniMapTrackingBackground:Hide() +end --- classic-disable ---[[ MiniMapTrackingButton:SetHighlightTexture (nil) MiniMapTrackingButton:SetPushedTexture(nil) MiniMapTrackingBackground:Hide() MiniMapTrackingButtonBorder:Hide() -]]-- --MiniMapNorthTag MinimapNorthTag:ClearAllPoints() @@ -133,13 +137,11 @@ TimeManagerClockTicker:SetFont(rLib.mediapath.."expressway.ttf",12,"OUTLINE") TimeManagerClockTicker:SetTextColor(0.8,0.8,0.6,1) --GameTimeFrame --- GameTimeFrame:SetParent(Minimap) --- GameTimeFrame:SetScale(0.25) --- GameTimeFrame:ClearAllPoints() --- GameTimeFrame:SetPoint("TOPRIGHT",Minimap,-8,-50) --- GameTimeFrame:SetHitRectInsets(0, 0, 0, 0) --- classic-disable ---[[ +GameTimeFrame:SetParent(Minimap) +GameTimeFrame:SetScale(0.35) +GameTimeFrame:ClearAllPoints() +GameTimeFrame:SetPoint("TOPRIGHT",Minimap,-32,-32) +GameTimeFrame:SetHitRectInsets(0, 0, 0, 0) GameTimeFrame:GetNormalTexture():SetTexCoord(0,1,0,1) GameTimeFrame:SetNormalTexture(mediapath.."calendar") GameTimeFrame:SetPushedTexture(nil) @@ -149,7 +151,6 @@ fs:ClearAllPoints() fs:SetPoint("CENTER",0,-5) fs:SetFont(STANDARD_TEXT_FONT,20) fs:SetTextColor(0.2,0.2,0.1,0.9) -]]-- --zoom Minimap:EnableMouseWheel() @@ -161,14 +162,14 @@ Minimap:SetScript("OnMouseWheel", Zoom) --onenter/show local function Show() - -- GameTimeFrame:SetAlpha(0.7) + GameTimeFrame:SetAlpha(0.7) -- MinimapToggleButton:SetAlpha(0.7) - -- MiniMapTracking:SetAlpha(0.9) + MiniMapTracking:SetAlpha(0.9) TimeManagerClockButton:SetAlpha(0.9) + MiniMapInstanceDifficulty:SetAlpha(0.9) -- classic-disable --[[ MiniMapChallengeMode:SetAlpha(0.9) - MiniMapInstanceDifficulty:SetAlpha(0.9) GuildInstanceDifficulty:SetAlpha(0.9) ]]-- end @@ -179,15 +180,14 @@ local lasttime = 0 local function Hide() if Minimap:IsMouseOver() then return end if time() == lasttime then return end - -- GameTimeFrame:SetAlpha(0) + GameTimeFrame:SetAlpha(0) -- MinimapToggleButton:SetAlpha(0) - -- MiniMapTracking:SetAlpha(0) + MiniMapTracking:SetAlpha(0) TimeManagerClockButton:SetAlpha(0) + MiniMapInstanceDifficulty:SetAlpha(0) -- classic-disable --[[ - TimeManagerClockButton:SetAlpha(0) MiniMapChallengeMode:SetAlpha(0) - MiniMapInstanceDifficulty:SetAlpha(0) GuildInstanceDifficulty:SetAlpha(0) ]]-- end diff --git a/rMinimap/rMinimap.toc b/rMinimap/rMinimap.toc index 901368c..63e7d69 100644 --- a/rMinimap/rMinimap.toc +++ b/rMinimap/rMinimap.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rMinimap |cff1a9fc0BCC|r +## Title: rMinimap |cff1a9fc0WLK|r ## Notes: Zork's Minimap adjustments ## RequiredDeps: rLib ## Classic: cocovanana diff --git a/rSellPoor/rSellPoor.toc b/rSellPoor/rSellPoor.toc index c4d89ea..33c1019 100644 --- a/rSellPoor/rSellPoor.toc +++ b/rSellPoor/rSellPoor.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rSellPoor |cff1a9fc0BCC|r +## Title: rSellPoor |cff1a9fc0WLK|r ## Notes: Sell items of poor quality automatically rSellPoor.lua diff --git a/rStatusButton/rStatusButton.toc b/rStatusButton/rStatusButton.toc index 15fdbad..f183750 100644 --- a/rStatusButton/rStatusButton.toc +++ b/rStatusButton/rStatusButton.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rStatusButton |cff1a9fc0BCC|r +## Title: rStatusButton |cff1a9fc0WLK|r ## Notes: Hover me for all dem statuses mon! ## RequiredDeps: rLib ## Classic: cocovanana diff --git a/rTooltip/core.lua b/rTooltip/core.lua index c664b26..46bc608 100644 --- a/rTooltip/core.lua +++ b/rTooltip/core.lua @@ -97,10 +97,10 @@ local function OnTooltipSetUnit(self) GameTooltipTextLeft7:SetTextColor(unpack(cfg.textColor)) GameTooltipTextLeft8:SetTextColor(unpack(cfg.textColor)) --position raidicon - --local raidIconIndex = GetRaidTargetIndex(unit) - --if raidIconIndex then - -- GameTooltipTextLeft1:SetText(("%s %s"):format(ICON_LIST[raidIconIndex].."14|t", unitName)) - --end + local raidIconIndex = GetRaidTargetIndex(unit) + if raidIconIndex then + GameTooltipTextLeft1:SetText(("%s %s"):format(ICON_LIST[raidIconIndex].."14|t", unitName)) + end if not UnitIsPlayer(unit) then --unit is not a player --color textleft1 and statusbar by faction color diff --git a/rTooltip/rTooltip.toc b/rTooltip/rTooltip.toc index dec5e89..3e22c57 100644 --- a/rTooltip/rTooltip.toc +++ b/rTooltip/rTooltip.toc @@ -1,6 +1,6 @@ -## Interface: 20504 +## Interface: 30400 ## Author: zork -## Title: rTooltip |cff1a9fc0BCC|r +## Title: rTooltip |cff1a9fc0WLK|r ## Notes: Tooltip enhancements core.lua