Skip to content

Commit

Permalink
5.27
Browse files Browse the repository at this point in the history
- Add dispel announce to Duffed Addon (move frame with /ddispel)
- Added config entrys:
--> dispelannouncement (well .. u know what its for! btw turned off by default)
--> fading for the chat
--> Enable Addonskins ..config entry for every single skin
- place Addonbackground to ChatFrameX if rightchatborder is enabled (like the ChatFrameX ..yeah ..:>)
- fix target debuffs position
- fix AuraTracker below portrait for larger focus frame
- Add portrait to bossframes and enlarge buffs (portrait size ..will overlap (hope u'll like it))
- btw /testui buffs crashes ur game :>
  • Loading branch information
Duffed committed Feb 25, 2011
1 parent e9109e8 commit 72ec0b0
Show file tree
Hide file tree
Showing 15 changed files with 119 additions and 34 deletions.
12 changes: 10 additions & 2 deletions Duffed/Config.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
dStuff = {
-- Enable
ccannouncement = true, -- Announce CC/Buffs/Debuffs
tbtimer = false, -- Show Watchframe when entering tb (abuse :<)
dispelannouncement = true, -- Announce dispels in a movable frame (/ddispel)
drinkannouncement = true, -- drink announcement for arena
sayinterrupt = true, -- Announce interrupt in /p or /ra
priest_SoS = true, -- Priest Soul of Strength Icon
priest_SoS = true, -- Priest Soul of Strength Icon (/dpriest)
tbtimer = false, -- Show Watchframe when entering tb (abuse :<)

-- blah
font = "Fonts\\FRIZQT__.ttf",
dispelannouncement_justify = "CENTER",
}

-- spelllist for the buff/debuff announcement
Expand Down Expand Up @@ -46,6 +52,8 @@ if IsAddOnLoaded("Tukui") then
dStuff.drinkannouncement = C["pvp"].drinkannouncement
dStuff.ccannouncement = C["pvp"].ccannouncement
dStuff.sayinterrupt = C["pvp"].sayinterrupt
dStuff.dispelannouncement = C["pvp"].dispelannouncement
dStuff.priest_SoS = false
end
dStuff.font = C.media.font
end
3 changes: 2 additions & 1 deletion Duffed/Duffed.toc
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ scripts\drink_announcement.lua
scripts\targethp.lua
scripts\tbtimer.lua
scripts\sayinterrupt.lua
scripts\priest.lua
scripts\priest.lua
scripts\dispel_announcement.lua
49 changes: 49 additions & 0 deletions Duffed/scripts/dispel_announcement.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
if dStuff.dispelannouncement ~= true then return end

-- Create movable frame for dispel announcements
local f = CreateFrame("MessageFrame", "dDispelFrame", UIParent)
f:SetPoint("TOP", 0, -220)
f:SetSize(200, 100)
f:SetFont(dStuff.font, 14)
f:SetShadowOffset(1, -1)
f:SetShadowColor(0,0,0)
f:SetTimeVisible(2)
f:SetBackdrop({bgFile = "Interface\\ChatFrame\\ChatFrameBackground"})
f:SetBackdropColor(0,0,0,0)
f:SetMovable(true)
f:SetFrameStrata("HIGH")
f:SetInsertMode("TOP")
f:SetJustifyH(dStuff.dispelannouncement_justify)
f:SetClampedToScreen(true)
f:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")

f:SetScript("OnEvent", function(self, event, ...)
local timestamp, type, sourceGUID, sourceName, sourceFlags, destGUID, destName, destFlags = ...
if (type == "SPELL_DISPEL" or type == "SPELL_STOLEN") and sourceName == UnitName("player") then
f:AddMessage("- |cffce3a19"..select(13, ...), 1, 1, 1)
end
end)

-- slash command
local move = false
SLASH_DUFFEDDISPELLYEAH1 = "/ddispel"
SlashCmdList.DUFFEDDISPELLYEAH = function()
if not move then
move = true
f:AddMessage("- |cffce3a19around!", 1, 1, 1)
f:AddMessage("- |cffce3a19Dispelframe", 1, 1, 1)
f:AddMessage("- |cffce3a19Move", 1, 1, 1)
f:SetTimeVisible(999)
f:EnableMouse(true)
f:SetScript("OnMouseDown", function() f:StartMoving() end)
f:SetScript("OnMouseUp", function() f:StopMovingOrSizing() end)
f:SetBackdropColor(0.1, 0.1, 0.1, 0.6)
print("|cffce3a19dStuff|r - Frame unlocked.")
else
f:SetTimeVisible(2)
move = false
f:EnableMouse(false)
f:SetBackdropColor(0,0,0,0)
print("|cffce3a19dStuff|r - Frame locked.")
end
end
2 changes: 1 addition & 1 deletion Duffed/scripts/priest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ p.icon:SetPoint("BOTTOMRIGHT", -2, 2)
p.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)

p.text = p:CreateFontString(nil, "OVERLAY")
p.text:SetFont("Fonts\\FRIZQT__.ttf", 14, "THINOUTLINE")
p.text:SetFont(dStuff.font, 14, "THINOUTLINE")
p.text:SetPoint("CENTER", 0, 0)

local spells = { 89489, 96219 }
Expand Down
2 changes: 1 addition & 1 deletion Tukui/Tukui.toc
Original file line number Diff line number Diff line change
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.05 (Duffed UI v5.26)
## Version: 13.05 (Duffed UI v5.27)
## Title: |cffC495DDTukui|r
## Notes: UI of awesomeness!
## SavedVariables: TukuiData
Expand Down
10 changes: 8 additions & 2 deletions Tukui/config/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,19 @@ C["arena"] = {
}

C["pvp"] = {
["drinkannouncement"] = true, -- drink announcement for arena
["drinkannouncement"] = true, -- Drink announcement for arena
["ccannouncement"] = true, -- Announce CC/Buffs/Debuffs (config in AddOns/Stuff/Config.lua)
["sayinterrupt"] = true, -- Announce when u interrupt someone
["sayinterrupt"] = true, -- Interrupt announce
["dispelannouncement"] = false, -- Announce dispels in a movable frame (/ddispel)
}

C["Addon_Skins"] = {
["background"] = false, -- Create a Panel that has the exactly same size as the left chat, placed at the bottomright (for addon placement)
["combat_toggle"] = false, -- Shows the Addon Background, Omen, Recount & Skada infight, hides outfight
["Recount"] = true, -- Enable Recount Skin
["Skada"] = true, -- Enable Skada Skin
["Omen"] = true, -- Enable Omen Skin
["KLE"] = true, -- Enable KLE Skin
}

C["classtimer"] = {
Expand Down Expand Up @@ -177,6 +182,7 @@ C["chat"] = {
["leftchatbackground"] = true, -- attached to ChatFrame1
["rightchatbackground"] = true, -- attached to ChatFrameX
["rightchatnumber"] = 4, -- Rightchat-background is attached to ChatFrameX ..X = value
["fading"] = true, -- Enable Fading

["enable"] = true, -- blah
["whispersound"] = true, -- play a sound when receiving whisper
Expand Down
2 changes: 1 addition & 1 deletion Tukui/modules/actionbars/Bar2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ for i=1, 12 do
if T.lowversion then
b:SetPoint("TOPLEFT", bar, "TOPLEFT", T.buttonspacing, -T.buttonspacing)
else
b:SetPoint("LEFT", bar, "CENTER", T.buttonspacing/2, 0)
b:SetPoint("BOTTOMLEFT", bar, "BOTTOM", T.buttonspacing/2, T.buttonspacing)
end
else
b:SetPoint("LEFT", b2, "RIGHT", T.buttonspacing, 0)
Expand Down
3 changes: 3 additions & 0 deletions Tukui/modules/chat/chatframes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ local function SetChatStyle(frame)
_G[chat.."TabText"].SetTextColor = T.dummy
_G[chat.."TabText"]:SetFont(C.datatext.font,C.datatext.fontsize,"THINOUTLINE")

-- fading
_G[chat]:SetFading(C.chat.fading)

-- yeah baby
_G[chat]:SetClampRectInsets(0,0,0,0)

Expand Down
2 changes: 1 addition & 1 deletion Tukui/modules/skins/addons/KLE.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local T, C, L = unpack(select(2, ...)) -- Import Functions/Constants, Config, Locales


if not IsAddOnLoaded("KLE") then return end
if not IsAddOnLoaded("KLE") or not C.Addon_Skins.KLE then return end
local KLE = KLE
local _G = getfenv(0)

Expand Down
2 changes: 1 addition & 1 deletion Tukui/modules/skins/addons/Omen.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
local T, C, L = unpack(select(2, ...)) -- Import Functions/Constants, Config, Locales


if not IsAddOnLoaded("Omen") then return end
if not IsAddOnLoaded("Omen") or not C.Addon_Skins.Omen then return end

local Omen = LibStub("AceAddon-3.0"):GetAddon("Omen")

Expand Down
6 changes: 3 additions & 3 deletions Tukui/modules/skins/addons/Recount.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
local T, C, L = unpack(select(2, ...)) -- Import Functions/Constants, Config, Locales


if not IsAddOnLoaded("Recount") then return end
if not IsAddOnLoaded("Recount") or not C.Addon_Skins.Recount then return end
local Recount = _G.Recount

local LSM = LibStub("LibSharedMedia-3.0")
if LSM then LSM:Register("font","Tukui Font", [[Interface\AddOns\Tukui\medias\fonts\uf_font.ttf]]) end
if LSM then LSM:Register("font","Tukui Font", C.datatext.font) end

Mod_AddonSkins:RegisterSkin("Recount",function(Skin, skin, Layout, layout, config)

Expand Down Expand Up @@ -54,7 +54,7 @@ Mod_AddonSkins:RegisterSkin("Recount",function(Skin, skin, Layout, layout, confi
v.RightText:SetPoint("RIGHT", -4, 0)
v.RightText:SetFont(C.datatext.font, C.datatext.fontsize)
end
Recount:SetFont("Tukui Font")
-- Recount:SetFont("Tukui Font")
end
Recount.SetBarTextures = Recount.UpdateBarTextures

Expand Down
2 changes: 1 addition & 1 deletion Tukui/modules/skins/addons/Skada.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]]
local E, C, L = unpack(select(2, ...)) -- Import Functions/Constants, Config, Locales

if not IsAddOnLoaded("Skada") then return end
if not IsAddOnLoaded("Skada") or not C.Addon_Skins.Skada then return end
local Skada = Skada

Mod_AddonSkins:RegisterSkin("Skada",function(Skin,skin,Layout,layout,config)
Expand Down
5 changes: 5 additions & 0 deletions Tukui/modules/skins/addons/addons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ if C.Addon_Skins.background then
bgtab:CreateShadow("Default")

if C.chat.rightchatbackground then
-- Use Chatsize if there is the rightchatbackground
bg:ClearAllPoints()
bg:Point("TOPLEFT", _G["ChatFrame"..C.chat.rightchatnumber], "TOPLEFT", -5, 29)
bg:Point("BOTTOMRIGHT", _G["ChatFrame"..C.chat.rightchatnumber], "BOTTOMRIGHT", 5, -5)

bgtab:ClearAllPoints()
bgtab:Point("TOPLEFT", bg, "TOPLEFT", 5, -5)
bgtab:Point("TOPRIGHT", bg, "TOPRIGHT", -28, -5)
Expand Down
47 changes: 27 additions & 20 deletions Tukui/modules/unitframes/layouts/duffed.lua
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ local function Shared(self, unit)

debuffs:SetHeight(22)
debuffs:SetWidth(playerwidth+4)
debuffs:SetPoint("BOTTOMLEFT", buffs, "TOPLEFT", 0, 2)
debuffs:SetPoint("BOTTOMLEFT", buffs, "TOPLEFT", -2, 4)
debuffs.size = debuffs:GetHeight()
debuffs.spacing = 3
debuffs.num = 27
Expand Down Expand Up @@ -1171,25 +1171,25 @@ local function Shared(self, unit)
power.border:Point("BOTTOMRIGHT", power, "BOTTOMRIGHT", 2, -2)

-- Auratracker Frame
local TrackBorder = CreateFrame("Frame", "TrackBorder", self)
TrackBorder:CreatePanel("Default", 40, 40, "BOTTOMRIGHT", health.border, "BOTTOMLEFT", -3, 0)
TrackBorder:CreateShadow("Default")

local AuraTracker = CreateFrame("Frame", nil, self)
AuraTracker:Size(40)
AuraTracker:Point("BOTTOMRIGHT", health.border, "BOTTOMLEFT", -3, 0)
AuraTracker:SetTemplate("Default")
AuraTracker:CreateShadow("Default")
AuraTracker:SetFrameLevel(9)
self.AuraTracker = AuraTracker

AuraTracker.icon = AuraTracker:CreateTexture(nil, "OVERLAY")
AuraTracker.icon:SetAllPoints(AuraTracker)
AuraTracker.icon:Point("TOPLEFT", AuraTracker, 2, -2)
AuraTracker.icon:Point("BOTTOMRIGHT", AuraTracker, -2, 2)
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", AuraTracker, 0, 0)
AuraTracker.text:SetPoint("CENTER", TrackBorder, 0, 0)
AuraTracker:SetScript("OnUpdate", updateAuraTrackerTime)

-- Portrait
local portrait = CreateFrame("PlayerModel", nil, AuraTracker)
local portrait = CreateFrame("PlayerModel", nil, TrackBorder)
portrait:SetFrameLevel(8)
portrait:Point("TOPLEFT", 2, -2)
portrait:Point("BOTTOMRIGHT", -2, 2)
Expand Down Expand Up @@ -1443,18 +1443,28 @@ local function Shared(self, unit)
AltPowerBar:SetPoint("LEFT")
AltPowerBar:SetPoint("RIGHT")
AltPowerBar:SetPoint("TOP", self.Health, "TOP")

-- AltPowerBar:SetBackdrop({bgFile = C["media"].blank})
-- AltPowerBar:SetBackdropColor(.1,.1,.1)

self.AltPowerBar = AltPowerBar

-- Portrait Border
local PBorder = CreateFrame("Frame", nil, self)
PBorder:CreatePanel("Default", 40, 40, "BOTTOMRIGHT", health.border, "BOTTOMLEFT", -3, 0)
PBorder:CreateShadow("Default")

local portrait = CreateFrame("PlayerModel", nil, PBorder)
portrait:SetFrameLevel(8)
portrait:Point("TOPLEFT", 2, -2)
portrait:Point("BOTTOMRIGHT", -2, 2)
table.insert(self.__elements, T.HidePortrait)
self.Portrait = portrait

-- create buff at left of unit if they are boss units
local buffs = CreateFrame("Frame", nil, self)
buffs:SetHeight(22)
buffs:SetHeight(40)
buffs:SetWidth(252)
buffs:Point("RIGHT", health, "LEFT", -4, -3)
buffs.size = 26
buffs:Point("BOTTOMRIGHT", health.border, "BOTTOMLEFT", -3, 0)
buffs.size = 40
buffs.num = 3
buffs.spacing = 2
buffs.initialAnchor = 'RIGHT'
Expand Down Expand Up @@ -1790,11 +1800,10 @@ TestUI = function(msg)
TukuiBoss1:Show(); TukuiBoss1.Hide = function() end; TukuiBoss1.unit = "player"
TukuiBoss2:Show(); TukuiBoss2.Hide = function() end; TukuiBoss2.unit = "player"
TukuiBoss3:Show(); TukuiBoss3.Hide = function() end; TukuiBoss3.unit = "player"
elseif msg == "buffs" then
testui()
elseif msg == "buffs" then -- better dont test it ^^
UnitAura = function()
-- name, rank, texture, count, dtype, duration, timeLeft, caster
return 80167, 'Rank 1', 'Interface\\Icons\\Spell_Holy_Penance', random(5), 'Magic', 0, 0, "player"
return 139, 'Rank 1', 'Interface\\Icons\\Spell_Holy_Penance', 1, 'Magic', 0, 0, "player"
end
if(oUF) then
for i, v in pairs(oUF.units) do
Expand All @@ -1803,8 +1812,6 @@ TestUI = function(msg)
end
end
end
elseif msg == "g1" then
TukuiGridUnitButton1:Show(); TukuiGridUnitButton1.Hide = function() end; TukuiGridUnitButton1.unit = "player"
end
end
SlashCmdList.TestUI = TestUI
Expand Down
6 changes: 6 additions & 0 deletions Tukui_ConfigUI/core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ local function Local(o)
if o == "TukuiConfigUIpvpdrinkannouncement" then o = "Announce 'drinking' in Arena" end
if o == "TukuiConfigUIpvpccannouncement" then o = "Announce CC/Buffs/Debuffs" end
if o == "TukuiConfigUIpvpsayinterrupt" then o = "Announce when u interrupt someone" end
if o == "TukuiConfigUIpvpdispelannouncement" then o = "Announce Dispels in a movable Frame (/ddispel)" end

if o == "TukuiConfigUIclasstimer" then o = "ClassTimer" end
if o == "TukuiConfigUIclasstimerplayercolor" then o = "Player-Bar Color" end
Expand All @@ -92,10 +93,15 @@ local function Local(o)
if o == "TukuiConfigUIchatleftchatbackground" then o = "Show Background for the left Chat (ChatFrame1)" end
if o == "TukuiConfigUIchatrightchatbackground" then o = "Show Background for the right Chat (ChatFrame4)" end
if o == "TukuiConfigUIchatrightchatnumber" then o = "(For Rightchat-Background) Chat Number X" end
if o == "TukuiConfigUIchatfading" then o = "Enable fading" end

if o == "TukuiConfigUIAddon_Skins" then o = "AddOn Skins" end
if o == "TukuiConfigUIAddon_Skinsbackground" then o = "Create Panel that looks exactly like the left chat (by default) at the BOTTOMRIGHT" end
if o == "TukuiConfigUIAddon_Skinscombat_toggle" then o = "Toggle Addonbackground, Recount, Omen & Skada in-/outfight (NOTE: Turn off auto-hide functions in these Addons)" end
if o == "TukuiConfigUIAddon_SkinsSkada" then o = "Enable Skada Skin" end
if o == "TukuiConfigUIAddon_SkinsRecount" then o = "Enable Recount Skin" end
if o == "TukuiConfigUIAddon_SkinsOmen" then o = "Enable Omen Skin" end
if o == "TukuiConfigUIAddon_SkinsKLE" then o = "Enable KLE Skin" end

-- general
if o == "TukuiConfigUIgeneral" then o = TukuiL.option_general end
Expand Down

0 comments on commit 72ec0b0

Please sign in to comment.