Skip to content

Commit

Permalink
5.31
Browse files Browse the repository at this point in the history
- fix dps40 Raid (didnt test it but ..should be fixed)
- ICON or MODEL portrait for focus
- Tukui v13.07
- thats all for today!
  • Loading branch information
Duffed committed Mar 5, 2011
1 parent 5433e52 commit 67cd313
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Tukui/Tukui.toc
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Tukui/modules/datatext/friend.lua
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Tukui/modules/datatext/guild.lua
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Tukui/modules/unitframes/core/oUF/elements/aura.lua
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Tukui/modules/unitframes/core/oUF/elements/castbar.lua
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
56 changes: 30 additions & 26 deletions Tukui/modules/unitframes/layouts/duffed2.lua
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions Tukui_ClassTimer/core.lua
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Tukui_Raid/oUF_Tukz_Raid40.lua
Expand Up @@ -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
Expand Down

0 comments on commit 67cd313

Please sign in to comment.