Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
- re-update version numbers for changelog
- changed lfd icons
- fixed aggroborder in raids
- fixed focus/focustarget castbar
- fixed pala holypowerbar if not lvl 85
- fixed dbm skin error
- added bntoastframe mover
  • Loading branch information
kacaos committed Sep 4, 2012
1 parent c904b4e commit 3358c05
Show file tree
Hide file tree
Showing 14 changed files with 130 additions and 74 deletions.
2 changes: 1 addition & 1 deletion KacaosUI/KacaosUI.toc
@@ -1,6 +1,6 @@
## Interface: 50001
## Title: |cff1E90FFkacaosUI|r
## Version: 2.0.0
## Version: 2.0.4
## Credits: Tukz, Pat, Swordyy, Sinaris, Merith, Elv, Smelly, Saft, Ex, Sniffles, Gszus, JerichoHM, Nisha and some other people who helped or inspired me =)
## Notes: Kacaos edit of Tukui.
## Author: Kacaos (Jâsparjones - EU-Blackmoore)
Expand Down
22 changes: 22 additions & 0 deletions KacaosUI/core/api.lua
Expand Up @@ -41,6 +41,28 @@ oUF.Tags.Methods['Tukui:namemini'] = function(unit)
local name = UnitName(unit)
return utf7sub(name, 10, false)
end
-----------------------------------------------------
-- New roleicon
-----------------------------------------------------
T.RoleIconUpdate = function(self, event)
local lfdrole = self.LFDRole

local role = UnitGroupRolesAssigned(self.unit)

if(role == 'TANK' or role == 'HEALER' or role == 'DAMAGER') and UnitIsConnected(self.unit) then
if role == 'TANK' then
lfdrole:SetTexture([[Interface\AddOns\KacaosUI\media\textures\tank.tga]])
elseif role == 'HEALER' then
lfdrole:SetTexture([[Interface\AddOns\KacaosUI\media\textures\healer.tga]])
elseif role == 'DAMAGER' then
lfdrole:SetTexture([[Interface\AddOns\KacaosUI\media\textures\dps.tga]])
end

lfdrole:Show()
else
lfdrole:Hide()
end
end
--------------------------------------------------------
-- Api
--------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions KacaosUI/core/move.lua
Expand Up @@ -10,8 +10,8 @@ local function MoveUI()
if InCombatLockdown() then return end
if ENABLE_MOVE then ENABLE_MOVE = false else ENABLE_MOVE = true end

local movers = {RaidCD, FilgerPlayerPvEDebuffMover, FilgerPlayerCDMover, FilgerPlayerProccsMover, FilgerPlayerDebuffsMover, FilgerPlayerBuffsMover, tbMover, TukuiTargetCastbarMover, TukuiPlayerCastbarMover, DebuffsMover, TukuiBar1Mover, TukuiBar2Mover, TukuiBar3Mover, TukuiBar4Mover, TukuiBar5Mover, TukuiPetBarMover, MicroAnchormover}
if RaidCD or FilgerPlayerPvEDebuffMover or FilgerPlayerCDMover or FilgerPlayerProccsMover or FilgerPlayerDebuffsMover or FilgerPlayerBuffsMover or tbMover or TukuiTargetCastbarMover or TukuiPlayerCastbarMover or DebuffsMover or TukuiBar1Mover or TukuiBar2Mover or TukuiBar3Mover or TukuiBar4Mover or TukuiBar5Mover or TukuiPetBarMover or MicroAnchormover then
local movers = {RaidCD, FilgerPlayerPvEDebuffMover, FilgerPlayerCDMover, FilgerPlayerProccsMover, FilgerPlayerDebuffsMover, FilgerPlayerBuffsMover, tbMover, TukuiTargetCastbarMover, TukuiPlayerCastbarMover, DebuffsMover, TukuiBar1Mover, TukuiBar2Mover, TukuiBar3Mover, TukuiBar4Mover, TukuiBar5Mover, TukuiPetBarMover, MicroAnchormover, BNToastframeMover}
if RaidCD or FilgerPlayerPvEDebuffMover or FilgerPlayerCDMover or FilgerPlayerProccsMover or FilgerPlayerDebuffsMover or FilgerPlayerBuffsMover or tbMover or TukuiTargetCastbarMover or TukuiPlayerCastbarMover or DebuffsMover or TukuiBar1Mover or TukuiBar2Mover or TukuiBar3Mover or TukuiBar4Mover or TukuiBar5Mover or TukuiPetBarMover or MicroAnchormover or BNToastframeMover then
if ENABLE_MOVE then
for _, panels in pairs(movers) do
panels:Show()
Expand Down
Binary file added KacaosUI/media/textures/dps.tga
Binary file not shown.
Binary file added KacaosUI/media/textures/healer.tga
Binary file not shown.
Binary file added KacaosUI/media/textures/tank.tga
Binary file not shown.
56 changes: 37 additions & 19 deletions KacaosUI/modules/classbars/classbars.lua
Expand Up @@ -7,7 +7,7 @@ local ebWidth = C.classbar.ebwidth
-------------------------------------
-- mover
-------------------------------------
local mover = CreateFrame("Frame", "tbMover", TukuiBar1)
local mover = CreateFrame("Frame", "tbMover", UIParent)
mover:Width(tbWidth)
mover:Height(tbHeight+3)
mover:Point("BOTTOM", UIParent, "CENTER", 1, -250)
Expand Down Expand Up @@ -301,28 +301,46 @@ if T.myclass == "MONK" then

if( T.myclass == "PALADIN" ) then
if( C.classbar.paladin ~= true ) then
G.UnitFrames.Player.HolyPower:Kill()
for i = 1, 5 do
G.UnitFrames.Player.HolyPower[i]:Kill()
end
G.UnitFrames.Player.HolyPower:Kill()
for i = 1, 5 do
G.UnitFrames.Player.HolyPower[i]:Kill()
end
else
G.UnitFrames.Player.HolyPower:ClearAllPoints()
G.UnitFrames.Player.HolyPower:SetPoint("CENTER", mover)
G.UnitFrames.Player.HolyPower:Size((tbWidth*5)+4, tbHeight)
G.UnitFrames.Player.HolyPower:SetFrameStrata("LOW")
G.UnitFrames.Player.HolyPower:CreateBorder(false, true)
for i = 1, 5 do
if T.level == MAX_PLAYER_LEVEL then
G.UnitFrames.Player.HolyPower:ClearAllPoints()
G.UnitFrames.Player.HolyPower:SetPoint("CENTER", mover)
G.UnitFrames.Player.HolyPower:Size((tbWidth*5)+4, tbHeight)
G.UnitFrames.Player.HolyPower:SetFrameStrata("LOW")
G.UnitFrames.Player.HolyPower:CreateBorder(false, true)
for i = 1, 5 do
G.UnitFrames.Player.HolyPower[i]:SetStatusBarColor( 228 / 255, 225 / 255, 16 / 255 )
if i == 1 then
G.UnitFrames.Player.HolyPower[i]:Point("TOPLEFT", G.UnitFrames.Player.HolyPower, "BOTTOMLEFT", 0, tbHeight)
G.UnitFrames.Player.HolyPower[i]:Size(tbWidth, tbHeight)
else
G.UnitFrames.Player.HolyPower[i]:Point("LEFT", G.UnitFrames.Player.HolyPower[i-1], "RIGHT", 1, 0)
G.UnitFrames.Player.HolyPower[i]:Size(tbWidth, tbHeight)
end
end
else
G.UnitFrames.Player.HolyPower:ClearAllPoints()
G.UnitFrames.Player.HolyPower:SetPoint("CENTER", mover)
G.UnitFrames.Player.HolyPower:Size((tbWidth*3)+2, tbHeight)
G.UnitFrames.Player.HolyPower:SetFrameStrata("LOW")
G.UnitFrames.Player.HolyPower:CreateBorder(false, true)
for i = 1, 3 do
G.UnitFrames.Player.HolyPower[i]:SetStatusBarColor( 228 / 255, 225 / 255, 16 / 255 )
if i == 1 then
G.UnitFrames.Player.HolyPower[i]:Point("TOPLEFT", G.UnitFrames.Player.HolyPower, "BOTTOMLEFT", 0, tbHeight)
G.UnitFrames.Player.HolyPower[i]:Size(tbWidth, tbHeight)
else
G.UnitFrames.Player.HolyPower[i]:Point("LEFT", G.UnitFrames.Player.HolyPower[i-1], "RIGHT", 1, 0)
G.UnitFrames.Player.HolyPower[i]:Size(tbWidth, tbHeight)
if i == 1 then
G.UnitFrames.Player.HolyPower[i]:Point("TOPLEFT", G.UnitFrames.Player.HolyPower, "BOTTOMLEFT", 0, tbHeight)
G.UnitFrames.Player.HolyPower[i]:Size(tbWidth, tbHeight)
else
G.UnitFrames.Player.HolyPower[i]:Point("LEFT", G.UnitFrames.Player.HolyPower[i-1], "RIGHT", 1, 0)
G.UnitFrames.Player.HolyPower[i]:Size(tbWidth, tbHeight)
end
end
end
end
end
end
end

----------------------------------------
-- Rogue
Expand Down
15 changes: 15 additions & 0 deletions KacaosUI/modules/panels/panels.lua
Expand Up @@ -153,6 +153,21 @@ G.ActionBars.ExitVehicleLeft.text:SetText("X")
-- kill the right exit button
TukuiExitVehicleButtonRight:Kill()

----------------------------------------------------------
-- BNToastframe Mover
----------------------------------------------------------
local tfmover = CreateFrame("Frame", "BNToastframeMover", UIParent, "SecureHandlerStateTemplate")
tfmover:Size(BNToastFrame:GetWidth(), BNToastFrame:GetHeight())
tfmover:Point("BOTTOMLEFT", ChatBackgroundLeft, "BOTTOMRIGHT", 18, 0)
tfmover:SetTemplate("Transparent")
tfmover:SetBackdropBorderColor(1,0,0)
tfmover:SetClampedToScreen(true)
tfmover:SetMovable(true)
tfmover:Hide()
tfmover:FontString("Text", C.media.font, 12)
tfmover.Text:SetPoint("CENTER", BNToastframeMover, "CENTER", 0, 0)
tfmover.Text:SetText("Move BNToastframe")
tinsert(T.AllowFrameMoving, tfmover)
------------------------------------------------------------
--Filger Panels
------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions KacaosUI/modules/skins/addons/dbm.lua
Expand Up @@ -4,6 +4,8 @@ if C.skin.dbmreskin ~= true then return end
----------------------------------------------------------------------------------------
-- DBM skin(by Affli)
----------------------------------------------------------------------------------------
local color = RAID_CLASS_COLORS[T.myclass]

local forcebosshealthclasscolor = false -- Forces BossHealth to be classcolored. Not recommended.
local croprwicons = true -- Crops blizz shitty borders from icons in RaidWarning messages
local rwiconsize = 13 -- RaidWarning icon size. Works only if croprwicons = true
Expand Down
7 changes: 7 additions & 0 deletions KacaosUI/modules/unitframes/layouts/layout1/focustarget.lua
Expand Up @@ -59,6 +59,13 @@ do
G.UnitFrames.FocusTarget.Castbar:SetHeight( 9 )
G.UnitFrames.FocusTarget.Castbar:Point( "TOPLEFT", G.UnitFrames.FocusTarget, "BOTTOMLEFT", 0, -9 )
G.UnitFrames.FocusTarget.Castbar:AddBorder()

G.UnitFrames.FocusTarget.Castbar.bg:Kill()

G.UnitFrames.FocusTarget.Castbar.bg = G.UnitFrames.FocusTarget.Castbar:CreateTexture( nil, "BORDER" )
G.UnitFrames.FocusTarget.Castbar.bg:SetAllPoints( G.UnitFrames.FocusTarget.Castbar )
G.UnitFrames.FocusTarget.Castbar.bg:SetTexture( C["media"].normTex)
G.UnitFrames.FocusTarget.Castbar.bg:SetVertexColor( 0.05, 0.05, 0.05 )

G.UnitFrames.FocusTarget.Castbar.Time = T.SetFontString( G.UnitFrames.FocusTarget.Castbar,C.media.pixelfont, 8, "MONOCHROMEOUTLINE")
G.UnitFrames.FocusTarget.Castbar.Time:Point( "RIGHT", G.UnitFrames.FocusTarget.Castbar, "RIGHT", -4, 0)
Expand Down
2 changes: 1 addition & 1 deletion KacaosUI/modules/unitframes/layouts/layout1/target.lua
Expand Up @@ -19,7 +19,7 @@ do
--------------------------------------------------------------
do
G.UnitFrames.Target.Health:Height(20)
G.UnitFrames.Target.Health:SetFrameLevel(5)
G.UnitFrames.Target.Health:SetFrameLevel(4)
G.UnitFrames.Target.Health:AddBorder()
G.UnitFrames.Target.Power:ClearAllPoints()
G.UnitFrames.Target.Power:Point("BOTTOM", G.UnitFrames.Target.Health, 0,-5)
Expand Down
1 change: 1 addition & 0 deletions KacaosUI_Config/config/config.lua
Expand Up @@ -72,6 +72,7 @@ C.unitframes = {

mouseoverhighlight = true, -- mouseoverhiglight on raidframe
showraidpets = false, -- enable raidpets
maxraidplayer= true, -- Max raid frames displayed according to instance max players

healthBgColor = { .5, 0.1, 0.1 }, -- choose healthbackground colors
}
Expand Down
48 changes: 26 additions & 22 deletions KacaosUI_Raid/Raid.lua
Expand Up @@ -36,7 +36,7 @@ local width, height, showParty, showRaid, showPlayer, xOffset, yOffset, point, c
"groupFilter", "1,2,3,4,5,6,7,8",
"groupingOrder", "1,2,3,4,5,6,7,8",
"groupBy", "GROUP",
"maxColumns", 5,
"maxColumns", 8,
"unitsPerColumn", 5,
"columnSpacing", T.Scale(3),
"columnAnchorPoint", columnAnchorPoint
Expand All @@ -46,22 +46,26 @@ end
T.PostUpdateRaidUnit = function( self )

-- kill some frames
self.panel:Kill()
self.Power:Kill()
self.RaidDebuffs:Kill()
self.AuraWatch:Kill()
self.panel:Kill()
local panel = CreateFrame("Frame", nil, self)
panel:SetTemplate()
panel:Point("TOPRIGHT", self, "TOPRIGHT", 1, 1)
panel:Point("BOTTOMLEFT", self, "BOTTOMLEFT", -1, -1)
panel:SetFrameLevel(2)
panel:SetFrameStrata("MEDIUM")
self.panel = panel

self:SetFrameLevel(1)

self:HighlightUnit(1,1,1,1)
self.panel:Kill()
self.Power:Kill()
self.RaidDebuffs:Kill()
self.AuraWatch:Kill()
self.panel:Kill()

local panel = CreateFrame("Frame", nil, self)
panel:SetTemplate("Transparent")
panel:Point("TOPRIGHT", self, "TOPRIGHT", 1, 1)
panel:Point("BOTTOMLEFT", self, "BOTTOMLEFT", -1, -1)
panel:Size(60, 20)
panel:SetFrameLevel(2)
panel:SetFrameStrata("HIGH")
panel:SetBackdropColor(0,0,0,0)
panel:SetBackdropBorderColor(0,0,0,0)
self.panel = panel

self:SetFrameLevel(1)

self:HighlightUnit(1,1,1,1)

------------------------------------------------------
-- names
Expand Down Expand Up @@ -110,10 +114,11 @@ self.Health:SetFrameLevel(1)
self:RegisterEvent("PARTY_MEMBERS_CHANGED", T.MLAnchorUpdate)

local LFDRole = self.Health:CreateTexture( nil, "OVERLAY" )
LFDRole:Height(5)
LFDRole:Width(5)
LFDRole:Point("TOPLEFT", 0, 0)
LFDRole:SetTexture( "Interface\\AddOns\\Tukui\\medias\\textures\\lfdicons.blp" )
LFDRole:Height(10)
LFDRole:Width(10)
LFDRole:Point("TOPLEFT", -1, 1)
LFDRole.Override = T.RoleIconUpdate
self:RegisterEvent("UNIT_CONNECTION", T.RoleIconUpdate)
self.LFDRole = LFDRole

local Resurrect = CreateFrame( "Frame", nil, self.Health )
Expand Down Expand Up @@ -184,7 +189,6 @@ self.Health:SetFrameLevel(1)
end
end


---------------------------------------------------------------
-- Raidposition
---------------------------------------------------------------
Expand Down
45 changes: 16 additions & 29 deletions KacaosUI_Raid_Healing/Raid_Healing.lua
Expand Up @@ -47,14 +47,16 @@ T.PostUpdateRaidUnit = function( self )
-- kill some frames
self.panel:Kill()

self.panel:Kill()
local panel = CreateFrame("Frame", nil, self)
panel:SetTemplate()
panel:Point("TOPRIGHT", self, "TOPRIGHT", 1, 1)
panel:Point("BOTTOMLEFT", self, "BOTTOMLEFT", -1, -1)
panel:SetFrameLevel(2)
panel:SetFrameStrata("MEDIUM")
self.panel = panel
local panel = CreateFrame("Frame", nil, self)
panel:SetTemplate("Transparent")
panel:Point("TOPRIGHT", self, "TOPRIGHT", 1, 1)
panel:Point("BOTTOMLEFT", self, "BOTTOMLEFT", -1, -1)
panel:Size(60, 45)
panel:SetFrameLevel(2)
panel:SetFrameStrata("HIGH")
panel:SetBackdropColor(0,0,0,0)
panel:SetBackdropBorderColor(0,0,0,0)
self.panel = panel

self:SetFrameLevel(1)

Expand Down Expand Up @@ -150,10 +152,11 @@ self.Power:SetFrameLevel(8)
self:RegisterEvent("PARTY_MEMBERS_CHANGED", T.MLAnchorUpdate)

local LFDRole = self.Health:CreateTexture( nil, "OVERLAY" )
LFDRole:Height(5)
LFDRole:Width(5)
LFDRole:Point("TOPLEFT", 0, 0)
LFDRole:SetTexture( "Interface\\AddOns\\Tukui\\medias\\textures\\lfdicons.blp" )
LFDRole:Height(15)
LFDRole:Width(15)
LFDRole:Point("TOPLEFT", 1, 1)
LFDRole.Override = T.RoleIconUpdate
self:RegisterEvent("UNIT_CONNECTION", T.RoleIconUpdate)
self.LFDRole = LFDRole

local Resurrect = CreateFrame( "Frame", nil, self.Health )
Expand Down Expand Up @@ -190,22 +193,6 @@ self.Power:SetFrameLevel(8)
end
end

--------------------------------------------------------------
-- only show 5 groups in raid (25 mans raid)
--------------------------------------------------------------
local MaxGroup = CreateFrame("Frame")
MaxGroup:RegisterEvent("PLAYER_ENTERING_WORLD")
MaxGroup:RegisterEvent("ZONE_CHANGED_NEW_AREA")
MaxGroup:SetScript("OnEvent", function(self)
local inInstance, instanceType = IsInInstance()
local _, _, _, _, maxPlayers, _, _ = GetInstanceInfo()
if inInstance and instanceType == "raid" and maxPlayers ~= 40 then
G.UnitFrames.RaidUnits:SetAttribute("groupFilter", "1,2,3,4,5")
else
G.UnitFrames.RaidUnits:SetAttribute("groupFilter", "1,2,3,4,5,6,7,8")
end
end)

---------------------------------------------------------------
-- Raidposition
---------------------------------------------------------------
Expand All @@ -215,5 +202,5 @@ RaidPosition:SetScript("OnEvent", function(self, event)
local raid = G.UnitFrames.RaidUnits
local pets = G.UnitFrames.RaidPets
raid:ClearAllPoints()
raid:SetPoint("CENTER", UIParent, "CENTER", -500, -135)
raid:SetPoint("CENTER", UIParent, "CENTER", -515, -125)
end)

0 comments on commit 3358c05

Please sign in to comment.