Skip to content

Commit

Permalink
5.29
Browse files Browse the repository at this point in the history
- Tukui 13.06
- add small config for dispelannouncement in Duffed/Config.lua and increase fontsize
- Add TinyDPS & Quartz Skin support
- rename the skin function stuff ..may it doesnt get in conflict with telui addonskins anymore idk
- integrate slightly changed sCombo (movable via /mtukui)
- config entry for the stuff above ofc + "showspellid" for buffs etc
- uffontsize = 11 if normalfont == true
- add some spellIDs (@Nihan)
- Hide BnetHolder instead of fade out
- libsharedmedia support (pretty sure i miss something)
- Totembar add shadow (and yeah its still buggy, sorry)
- allow Quest Objects etc infight :s
- BLIZZARD FRAMES are now usable -___-
- hide hp-value for pets
- pretty sure i missed something
  • Loading branch information
Duffed committed Feb 28, 2011
1 parent 0f606b1 commit cc5a554
Show file tree
Hide file tree
Showing 41 changed files with 464 additions and 144 deletions.
12 changes: 8 additions & 4 deletions Duffed/Config.lua
@@ -1,15 +1,19 @@
dStuff = {
-- Enable
ccannouncement = true, -- Announce CC/Buffs/Debuffs
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 (/dpriest)
tbtimer = false, -- Show Watchframe when entering tb (abuse :<)

-- blah
["dispelannouncement"] = {
enable = true, -- Announce dispels in a movable frame (/ddispel)
justify = "CENTER",
fontsize = 16,
textcolor = "|cff00ff00", -- |cff + HEX-Code (default |cffce3a19)
},

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

-- spelllist for the buff/debuff announcement
Expand Down Expand Up @@ -52,7 +56,7 @@ 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.dispelannouncement.enable = C["pvp"].dispelannouncement
dStuff.priest_SoS = false
end
dStuff.font = C.media.font
Expand Down
14 changes: 7 additions & 7 deletions Duffed/scripts/dispel_announcement.lua
@@ -1,10 +1,10 @@
if dStuff.dispelannouncement ~= true then return end
if dStuff.dispelannouncement.enable ~= 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:SetFont(dStuff.font, dStuff.dispelannouncement.fontsize)
f:SetShadowOffset(1, -1)
f:SetShadowColor(0,0,0)
f:SetTimeVisible(2)
Expand All @@ -13,14 +13,14 @@ f:SetBackdropColor(0,0,0,0)
f:SetMovable(true)
f:SetFrameStrata("HIGH")
f:SetInsertMode("TOP")
f:SetJustifyH(dStuff.dispelannouncement_justify)
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)
f:AddMessage("- "..dStuff.dispelannouncement.textcolor..select(13, ...), 1, 1, 1)
end
end)

Expand All @@ -30,9 +30,9 @@ 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:AddMessage("- "..dStuff.dispelannouncement.textcolor.."around!", 1, 1, 1)
f:AddMessage("- "..dStuff.dispelannouncement.textcolor.."Dispelframe", 1, 1, 1)
f:AddMessage("- "..dStuff.dispelannouncement.textcolor.."Move", 1, 1, 1)
f:SetTimeVisible(999)
f:EnableMouse(true)
f:SetScript("OnMouseDown", function() f:StartMoving() end)
Expand Down
4 changes: 2 additions & 2 deletions Tukui/Tukui.toc
Expand Up @@ -3,12 +3,12 @@
## 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.28)
## Version: 13.06 (Duffed UI v5.29)
## Title: |cffC495DDTukui|r
## Notes: UI of awesomeness!
## SavedVariables: TukuiData
## SavedVariablesPerCharacter: TukuiDataPerChar
## OptionalDeps: Tukui_ConfigUI, !ClassColors, Clique, Recount, Omen, a, b, nibHideBlackBar, Skada, TelUI_AddonSkins, TinyDPS
## OptionalDeps: Tukui_ConfigUI, !ClassColors, Clique, Recount, Omen, a, b, nibHideBlackBar, Skada, TelUI_AddonSkins, TinyDPS, Quartz
## X-oUF: oUFTukui

Tukui.xml
5 changes: 4 additions & 1 deletion Tukui/Tukui.xml
Expand Up @@ -132,11 +132,14 @@
<Script file="modules\skins\addons\Omen.lua"/>
<Script file="modules\skins\addons\Recount.lua"/>
<Script file="modules\skins\addons\KLE.lua"/>
<Script file="modules\skins\addons\TinyDPS.lua"/>
<Script file="modules\skins\addons\Quartz.lua"/>

<Include file="modules\unitframes\templates\tankassist.xml"/>
<Script file="modules\unitframes\tags\tags.lua"/>
<Script file="modules\unitframes\layouts\duffed.lua"/>
<Script file="modules\notifications\hunterpethappiness.lua"/>
<Script file="modules\notifications\hunterpethappiness.lua"/>
<Script file="modules\misc\sCombo.lua"/>

<Script file="modules\misc\altpowerbar.lua"/>
<Script file="modules\misc\threatbar.lua"/>
Expand Down
12 changes: 12 additions & 0 deletions Tukui/config/config.lua
Expand Up @@ -116,6 +116,12 @@ C["Addon_Skins"] = {
["Omen"] = true, -- Enable Omen Skin
["KLE"] = true, -- Enable KLE Skin
["TinyDPS"] = true, -- Enable TinyDPS Skin
["Quartz"] = true, -- Enable Quartz Skin
}

C["sCombo"] = {
["enable"] = true, -- Enable sCombo-Addon for combopoints instead of default cp-display
["energybar"] = false, -- show energy-Bar below cp bar
}

C["classtimer"] = {
Expand All @@ -126,6 +132,10 @@ C["classtimer"] = {
["trinketcolor"] = {75/255, 75/255, 75/255, 1 },
}

C["auras"] = {
["player"] = true, -- enable tukui buffs/debuffs
}

C["bags"] = {
["enable"] = true, -- enable an all in one bag mod that fit tukui perfectly
}
Expand Down Expand Up @@ -204,6 +214,8 @@ C["nameplate"] = {
}

C["tooltip"] = {
["showspellid"] = false,

["enable"] = true, -- true to enable this mod, false to disable
["hidecombat"] = false, -- hide bottom-right tooltip when in combat
["hidebuttons"] = false, -- always hide action bar buttons tooltip.
Expand Down
1 change: 1 addition & 0 deletions Tukui/config/profiles.lua
Expand Up @@ -42,6 +42,7 @@ if IsAddOnLoaded("a") or IsAddOnLoaded("b") then
C.castbar.classcolored = false
C.actionbar.hotkey = false
C.pvp.dispelannouncement = true
C.tooltip.showspellid = true
if UnitLevel("player") < MAX_PLAYER_LEVEL then
C.actionbar.hotkey = true
end
Expand Down
2 changes: 1 addition & 1 deletion Tukui/core/disable.lua
Expand Up @@ -40,7 +40,7 @@ end

if C.general.normalfont then
C.media.uffont = [=[Interface\Addons\Tukui\medias\fonts\normal_font.ttf]=]
if C.media.uffontsize == 8 then C.media.uffontsize = 12 end
if C.media.uffontsize == 8 then C.media.uffontsize = 11 end
C.datatext.font = [=[Interface\Addons\Tukui\medias\fonts\normal_font.ttf]=]
if C.datatext.fontsize == 8 then C.datatext.fontsize = 12 end
end
8 changes: 8 additions & 0 deletions Tukui/core/functions.lua
Expand Up @@ -1098,10 +1098,14 @@ if C["unitframes"].raidunitdebuffwatch == true then
SpellName(79835), --Poison Soaked Shell
SpellName(91433), --Lightning Conductor
SpellName(91521), --Incineration Security Measure
SpellName(92051), --Shadow Conductor
SpellName(79501), --Acquiring Target
SpellName(92048), --Shadow Infusion

--Maloriak
SpellName(77699), -- Flash Freeze
SpellName(77760), -- Biting Chill
SpellName(77786), -- Consuming Flames

--Atramedes
SpellName(92423), -- Searing Flame
Expand All @@ -1113,6 +1117,7 @@ if C["unitframes"].raidunitdebuffwatch == true then
SpellName(89084), -- Low Health

--Nefarian
SpellName(79339), --Explosive Cinders

--Sinestra
SpellName(92956), --Wrack
Expand All @@ -1134,10 +1139,12 @@ if C["unitframes"].raidunitdebuffwatch == true then
SpellName(83099), -- Lightning Rod
SpellName(92075), -- Gravity Core
SpellName(92488), -- Gravity Crush
SpellName(92067), -- Static Overload

--Cho'gall
SpellName(86028), -- Cho's Blast
SpellName(86029), -- Gall's Blast
SpellName(93133), -- Debilitating Beam

--Throne of the Four Winds
--Conclave of Wind
Expand All @@ -1151,6 +1158,7 @@ if C["unitframes"].raidunitdebuffwatch == true then
--Al'Akir
SpellName(93260), -- Ice Storm
SpellName(93295), -- Lightning Rod
SpellName(87856), -- Squall Line

-- SpellName(6788), --test
}
Expand Down
1 change: 1 addition & 0 deletions Tukui/core/launch.lua
Expand Up @@ -43,6 +43,7 @@ local function install()
SetCVar("bloatthreat", 0)
SetCVar("bloattest", 0)
SetCVar("bloatnameplates", 0)
SetCVar("threatWarning", 3)
if IsAddOnLoaded("a") then
SetCVar("ffxDeath", "0")
SetCVar("ffxNetherWorld", "0")
Expand Down
6 changes: 3 additions & 3 deletions Tukui/core/movers.lua
@@ -1,6 +1,5 @@
local T, C, L = unpack(select(2, ...)) -- Import: T - functions, constants, variables; C - config; L - locales

-- all the frame we want to move
-- all our frames that we want being movable.
T.MoverFrames = {
TukuiMinimap,
Expand All @@ -19,7 +18,7 @@ T.MoverFrames = {
-- used to exec various code if we enable or disable moving
local function exec(self, enable)

if self == TukuiGMFrameAnchor then
if self == TukuiGMFrameAnchor or self == TukuiBnetHolder then
if enable then
self:Show()
else
Expand Down Expand Up @@ -61,7 +60,7 @@ local function exec(self, enable)
end
end

if self == TukuiTooltipAnchor or self == TukuiRollAnchor or self == TukuiAchievementHolder or self == TukuiVehicleAnchor or self == TukuiBnetHolder then
if self == TukuiTooltipAnchor or self == TukuiRollAnchor or self == TukuiAchievementHolder or self == TukuiVehicleAnchor then
if enable then
self:SetAlpha(1)
else
Expand Down Expand Up @@ -114,6 +113,7 @@ local function moving()
-- don't allow moving while in combat
if InCombatLockdown() then print(ERR_NOT_IN_COMBAT) return end

SlashCmdList.MOVESCOMBO() -- :s
for i = 1, getn(T.MoverFrames) do
if T.MoverFrames[i] then
if enable then
Expand Down
10 changes: 10 additions & 0 deletions Tukui/medias/medias.lua
Expand Up @@ -32,3 +32,13 @@ C["media"] = {
["whisper"] = [[Interface\AddOns\Tukui\medias\sounds\whisper.mp3]],
["warning"] = [[Interface\AddOns\Tukui\medias\sounds\warning.mp3]],
}

-- LibSharedMedia crap
if not LibStub then return end
local LSM = LibStub("LibSharedMedia-3.0", true)
if not LSM then return end

LSM:Register("statusbar","Tukui Statusbar", C.media.normTex)
LSM:Register("border","Tukui Glow", C.media.glowTex)
LSM:Register("font","Tukui Datatext Font", C.datatext.font)
LSM:Register("font","Tukui UF Font", C.media.uffont)
2 changes: 1 addition & 1 deletion Tukui/modules/actionbars/BarShift.lua
Expand Up @@ -119,7 +119,7 @@ local ssborder = CreateFrame("Frame", "ShapeShiftBorder", ShapeshiftButton1)
if C["actionbar"].shapeshiftborder ~= true then
ssborder:SetAlpha(0)
else
ssborder:SetTemplate("Default")
ssborder:SetTemplate("Transparent")
ssborder:CreateShadow("Default")
end
ssborder:SetFrameLevel(1)
Expand Down
5 changes: 5 additions & 0 deletions Tukui/modules/actionbars/Style.lua
Expand Up @@ -314,6 +314,7 @@ local function StyleTotemFlyout(flyout)

for _,button in ipairs(flyout.buttons) do
button:SetTemplate("Default")
button:CreateShadow("")
local icon = select(1,button:GetRegions())
icon:SetTexCoord(.09,.91,.09,.91)
icon:SetDrawLayer("ARTWORK")
Expand All @@ -339,6 +340,7 @@ local function StyleTotemFlyout(flyout)
-- Skin Close button
local close = MultiCastFlyoutFrameCloseButton
close:SetTemplate("Default")
close:CreateShadow("")
close:GetHighlightTexture():SetTexture([[Interface\Buttons\ButtonHilight-Square]])
close:GetHighlightTexture():Point("TOPLEFT",close,"TOPLEFT",1,-1)
close:GetHighlightTexture():Point("BOTTOMRIGHT",close,"BOTTOMRIGHT",-1,1)
Expand Down Expand Up @@ -371,6 +373,7 @@ local function StyleTotemOpenButton(button, parent)
button.visibleBut.highlight:Point("TOPLEFT",button.visibleBut,"TOPLEFT",1,-1)
button.visibleBut.highlight:Point("BOTTOMRIGHT",button.visibleBut,"BOTTOMRIGHT",-1,1)
button.visibleBut:SetTemplate("Default")
button.visibleBut:CreateShadow("")
end

button.visibleBut:SetBackdropBorderColor(parent:GetBackdropBorderColor())
Expand All @@ -387,6 +390,7 @@ local bordercolors = {

local function StyleTotemSlotButton(button, index)
button:SetTemplate("Default")
button:CreateShadow("")
button.overlayTex:SetTexture(nil)
button.background:SetDrawLayer("ARTWORK")
button.background:ClearAllPoints()
Expand Down Expand Up @@ -428,6 +432,7 @@ local function StyleTotemSpellButton(button, index)
icon:Point("TOPLEFT",button,"TOPLEFT",2,-2)
icon:Point("BOTTOMRIGHT",button,"BOTTOMRIGHT",-2,2)
button:SetTemplate("Default")
button:CreateShadow("")
button:GetNormalTexture():SetTexture(nil)
if not InCombatLockdown() then button:Size(30, 30) end
_G[button:GetName().."Highlight"]:SetTexture(nil)
Expand Down
11 changes: 7 additions & 4 deletions Tukui/modules/blizzard/kill.lua
Expand Up @@ -30,10 +30,13 @@ Kill:SetScript("OnEvent", function(self, event, addon)
Advanced_UIScaleSlider:Kill()
PartyMemberBackground:Kill()
TutorialFrameAlertButton:Kill()
BuffFrame:Kill()
TemporaryEnchantFrame:Kill()
ConsolidatedBuffs:Kill()
InterfaceOptionsBuffsPanelConsolidateBuffs:Kill()

if C.auras.player or C.unitframes.playerauras then
BuffFrame:Kill()
TemporaryEnchantFrame:Kill()
ConsolidatedBuffs:Kill()
InterfaceOptionsBuffsPanelConsolidateBuffs:Kill()
end

InterfaceOptionsUnitFramePanelPartyBackground:Kill()

Expand Down
4 changes: 3 additions & 1 deletion Tukui/modules/buffs/buffs.lua
Expand Up @@ -76,7 +76,9 @@ local function UpdateAuras(header, button, weapon)
button.count:SetPoint("BOTTOMRIGHT", -1, 1)
button.count:SetFont(C.datatext.font, C.datatext.fontsize, "OUTLINE")

button.time = T.SetFontString(button, C.datatext.font, C.datatext.fontsize)
-- button.time = T.SetFontString(button, C.datatext.font, C.datatext.fontsize, "OUTLINE")
button.time = button:CreateFontString(nil, "ARTWORK")
button.time:SetFont(C.datatext.font, C.datatext.fontsize, "OUTLINE")
button.time:SetPoint("BOTTOM", 0, -16)

button:SetScript("OnUpdate", UpdateTime)
Expand Down
11 changes: 7 additions & 4 deletions Tukui/modules/chat/chatframes.lua
Expand Up @@ -207,7 +207,7 @@ local function SetupChatPosAndFont(self)
end

--Check if chat exists in the bottomright corner
if i == 4 and not ChatBG2 then
if i == C.chat.rightchatnumber and not ChatBG2 then
chat:SetJustifyH("RIGHT")
end
end
Expand Down Expand Up @@ -238,14 +238,17 @@ TukuiChat:SetScript("OnEvent", function(self, event, ...)
SetupChatPosAndFont(self)
TukuiChat:UnregisterEvent("PLAYER_ENTERING_WORLD")
end
if event == "PLAYER_LOGIN" then
SetupChatPosAndFont(self)
end
end)

-- Setup temp chat (BN, WHISPER) when needed.
local function SetupTempChat()
local frame = FCF_GetCurrentChatFrame()
local id = frame:GetID()
local buttonup = _G[format("ChatFrame%sButtonFrameUpButton", id)]

-- do a check if we already did a skinning earlier for this temp chat frame
if not buttonup:IsShown() then return end

SetChatStyle(frame)
end
hooksecurefunc("FCF_OpenTemporaryWindow", SetupTempChat)
2 changes: 1 addition & 1 deletion Tukui/modules/maps/minimap.lua
Expand Up @@ -236,7 +236,7 @@ local coord_Update = function(self,t)
x = math.floor(100 * x)
y = math.floor(100 * y)
if x == 0 and y == 0 then
m_coord_text:SetText("X _ X")
m_coord_text:SetText("")
else
if x < 10 then
xt = "0"..x
Expand Down

0 comments on commit cc5a554

Please sign in to comment.