From 67cd3135e6248d0005d8dc6dd609b6b69dc9e18b Mon Sep 17 00:00:00 2001 From: Duffed Date: Sat, 5 Mar 2011 23:50:00 +0100 Subject: [PATCH] 5.31 - fix dps40 Raid (didnt test it but ..should be fixed) - ICON or MODEL portrait for focus - Tukui v13.07 - thats all for today! --- Tukui/Tukui.toc | 2 +- Tukui/modules/datatext/friend.lua | 2 +- Tukui/modules/datatext/guild.lua | 2 +- .../unitframes/core/oUF/elements/aura.lua | 2 +- .../unitframes/core/oUF/elements/castbar.lua | 4 +- Tukui/modules/unitframes/layouts/duffed2.lua | 56 ++++++++++--------- Tukui_ClassTimer/core.lua | 1 + Tukui_Raid/oUF_Tukz_Raid40.lua | 2 +- 8 files changed, 38 insertions(+), 33 deletions(-) diff --git a/Tukui/Tukui.toc b/Tukui/Tukui.toc index cc48b23..290950f 100644 --- a/Tukui/Tukui.toc +++ b/Tukui/Tukui.toc @@ -3,7 +3,7 @@ ## Project Collaborators: Elv22, Nightcracker ## Credits to: Caith, Caellian, Shestak, Haste, Tekkub, Alza, Roth, P3lim, Tulla, Hungtar, hankthetank, Ishtara and others... ## Special Thanks to: Admins, Moderator and VIP's from tukui.org -## Version: 13.06 (Duffed UI v5.30) +## Version: 13.07 (Duffed UI v5.31) ## Title: |cffC495DDTukui|r ## Notes: UI of awesomeness! ## SavedVariables: TukuiData diff --git a/Tukui/modules/datatext/friend.lua b/Tukui/modules/datatext/friend.lua index fdf67ca..02da15c 100644 --- a/Tukui/modules/datatext/friend.lua +++ b/Tukui/modules/datatext/friend.lua @@ -7,7 +7,7 @@ if not C["datatext"].friends or C["datatext"].friends == 0 then return end local Stat = CreateFrame("Frame") Stat:EnableMouse(true) -Stat:SetFrameStrata("MEDIUM") +Stat:SetFrameStrata("BACKGROUND") Stat:SetFrameLevel(3) local Text = TukuiInfoLeft:CreateFontString(nil, "OVERLAY") diff --git a/Tukui/modules/datatext/guild.lua b/Tukui/modules/datatext/guild.lua index 050b4f6..7b99c76 100644 --- a/Tukui/modules/datatext/guild.lua +++ b/Tukui/modules/datatext/guild.lua @@ -22,7 +22,7 @@ local totalOnline = 0 local Stat = CreateFrame("Frame") Stat:EnableMouse(true) -Stat:SetFrameStrata("MEDIUM") +Stat:SetFrameStrata("BACKGROUND") Stat:SetFrameLevel(3) Stat.update = false diff --git a/Tukui/modules/unitframes/core/oUF/elements/aura.lua b/Tukui/modules/unitframes/core/oUF/elements/aura.lua index 0adb280..bbe9b87 100644 --- a/Tukui/modules/unitframes/core/oUF/elements/aura.lua +++ b/Tukui/modules/unitframes/core/oUF/elements/aura.lua @@ -5,7 +5,7 @@ local VISIBLE = 1 local HIDDEN = 0 local UpdateTooltip = function(self) - GameTooltip:SetUnitAura(self.parent:GetParent().unit or self.parent:GetParent():GetParent().unit, self:GetID(), self.filter) + GameTooltip:SetUnitAura(self.parent.__owner.unit, self:GetID(), self.filter) end local OnEnter = function(self) diff --git a/Tukui/modules/unitframes/core/oUF/elements/castbar.lua b/Tukui/modules/unitframes/core/oUF/elements/castbar.lua index 6d528f3..a210441 100644 --- a/Tukui/modules/unitframes/core/oUF/elements/castbar.lua +++ b/Tukui/modules/unitframes/core/oUF/elements/castbar.lua @@ -269,7 +269,7 @@ local onUpdate = function(self, elapsed) if(self.SafeZone) then local width = self:GetWidth() - local _, _, ms = GetNetStats() + local _, _, _, ms = GetNetStats() -- MADNESS! local safeZonePercent = (width / self.max) * (ms / 1e5) if(safeZonePercent > 1) then safeZonePercent = 1 end @@ -311,7 +311,7 @@ local onUpdate = function(self, elapsed) if(self.SafeZone) then local width = self:GetWidth() - local _, _, ms = GetNetStats() + local _, _, _, ms = GetNetStats() -- MADNESS! local safeZonePercent = (width / self.max) * (ms / 1e5) if(safeZonePercent > 1) then safeZonePercent = 1 end diff --git a/Tukui/modules/unitframes/layouts/duffed2.lua b/Tukui/modules/unitframes/layouts/duffed2.lua index c95c8ba..7a42d83 100644 --- a/Tukui/modules/unitframes/layouts/duffed2.lua +++ b/Tukui/modules/unitframes/layouts/duffed2.lua @@ -18,7 +18,6 @@ local glowTex = C["media"].glowTex local bubbleTex = C["media"].bubbleTex local fontsize = C["media"].uffontsize local playerwidth = 214 --- if T.lowversion and not C.general.overridehightolow then playerwidth = C["unitframes"].framewidth - 25 end local nameoffset = 4 local backdrop = { @@ -1103,31 +1102,6 @@ local function Shared(self, unit) shd:SetPoint("TOPLEFT") shd:SetPoint("BOTTOMRIGHT", panel) shd:CreateShadow("") - - -- Auratracker Frame - local TrackBorder = CreateFrame("Frame", "TrackBorder", self) - TrackBorder:CreatePanel("Default", 40, 40, "BOTTOMRIGHT", panel, "BOTTOMLEFT", -3, 0) - TrackBorder:CreateShadow("Default") - - local AuraTracker = CreateFrame("Frame", nil, self) - AuraTracker:SetFrameLevel(9) - self.AuraTracker = AuraTracker - - AuraTracker.icon = AuraTracker:CreateTexture(nil, "OVERLAY") - AuraTracker.icon:Point("TOPLEFT", TrackBorder, 2, -2) - AuraTracker.icon:Point("BOTTOMRIGHT", TrackBorder, -2, 2) - AuraTracker.icon:SetTexCoord(0.07,0.93,0.07,0.93) - - AuraTracker.text = T.SetFontString(AuraTracker, font2, 15, "THINOUTLINE") - AuraTracker.text:SetPoint("CENTER", TrackBorder, 0, 0) - AuraTracker:SetScript("OnUpdate", updateAuraTrackerTime) - - -- Portrait - local portrait = CreateFrame("PlayerModel", nil, TrackBorder) - portrait:SetFrameLevel(8) - portrait:Point("TOPLEFT", 2, -2) - portrait:Point("BOTTOMRIGHT", -2, 2) - self.Portrait = portrait -- create debuffs if C.unitframes.focusdebuffs then @@ -1186,6 +1160,36 @@ local function Shared(self, unit) self.Castbar.Time = castbar.time self.Castbar.Icon = castbar.icon end + + -- portrait + local pb = CreateFrame("Frame", self:GetName().."_PortraitBorder", self) + pb:CreateShadow("") + pb:CreatePanel("", 40, 40, "BOTTOMRIGHT", panel, "BOTTOMLEFT", -3, 0) + + if C.unitframes.portraitstyle == "MODEL" then + local portrait = CreateFrame("PlayerModel", self:GetName().."_Portrait", pb) + portrait:SetFrameLevel(1) + portrait:Point("TOPLEFT", 2, -2) + portrait:Point("BOTTOMRIGHT", -2, 2) + self.Portrait = portrait + else + local class = pb:CreateTexture(self:GetName().."_ClassIcon", "ARTWORK") + class:Point("TOPLEFT", 2, -2) + class:Point("BOTTOMRIGHT", -2, 2) + self.ClassIcon = class + end + + local AuraTracker = CreateFrame("Frame") + self.AuraTracker = AuraTracker + + AuraTracker.icon = pb:CreateTexture(nil, "OVERLAY") + AuraTracker.icon:Point("TOPLEFT", 2, -2) + AuraTracker.icon:Point("BOTTOMRIGHT", -2, 2) + AuraTracker.icon:SetTexCoord(0.07,0.93,0.07,0.93) + + AuraTracker.text = T.SetFontString(pb, font2, 15, "THINOUTLINE") + AuraTracker.text:SetPoint("CENTER") + AuraTracker:SetScript("OnUpdate", updateAuraTrackerTime) end ------------------------------------------------------------------------ diff --git a/Tukui_ClassTimer/core.lua b/Tukui_ClassTimer/core.lua index ca6c46b..9c878f3 100644 --- a/Tukui_ClassTimer/core.lua +++ b/Tukui_ClassTimer/core.lua @@ -427,6 +427,7 @@ local CLASS_FILTERS = { CreateSpellEntry( 84747 ), -- Deep Insight }, player = { + CreateSpellEntry( 13750 ), -- adrenalin stuff CreateSpellEntry( 32645 ), -- Envenom CreateSpellEntry( 2983 ), -- Sprint CreateSpellEntry( 5277 ), -- Evasion diff --git a/Tukui_Raid/oUF_Tukz_Raid40.lua b/Tukui_Raid/oUF_Tukz_Raid40.lua index 91808bc..617f0cf 100644 --- a/Tukui_Raid/oUF_Tukz_Raid40.lua +++ b/Tukui_Raid/oUF_Tukz_Raid40.lua @@ -123,7 +123,7 @@ oUF:Factory(function(self) "groupingOrder", "1,2,3,4,5,6,7,8", "groupBy", "GROUP", - "yOffset", T.Scale(-8), + "yOffset", T.Scale(8), "point", "BOTTOM" ) if ChatBG1 then