This commit is contained in:
Tercio
2015-09-14 17:07:42 -03:00
parent 45e2b4d918
commit 8a62868b0e
11 changed files with 185 additions and 27 deletions
+5 -1
View File
@@ -11,4 +11,8 @@ move-folders:
Details/plugins/Details_DungeonInfo-Warlords: Details_DungeonInfo-Warlords
Details/plugins/Details_3DModelsPaths: Details_3DModelsPaths
Details/plugins/Details_RaidCheck: Details_RaidCheck
Details/plugins/Details_DpsTuning: Details_DpsTuning
Details/plugins/Details_DpsTuning: Details_DpsTuning
required-dependencies:
- details_raidpowerbars
- details-legacy-raids-info
+12
View File
@@ -7,6 +7,18 @@ do
end
DF.alias_text_colors = {
["HUNTER"] = {0.67, 0.83, 0.45},
["WARLOCK"] = {0.58, 0.51, 0.79},
["PRIEST"] = {1.0, 1.0, 1.0},
["PALADIN"] = {0.96, 0.55, 0.73},
["MAGE"] = {0.41, 0.8, 0.94},
["ROGUE"] = {1.0, 0.96, 0.41},
["DRUID"] = {1.0, 0.49, 0.04},
["SHAMAN"] = {0.0, 0.44, 0.87},
["WARRIOR"] = {0.78, 0.61, 0.43},
["DEATHKNIGHT"] = {0.77, 0.12, 0.23},
["MONK"] = {0.0, 1.00, 0.59},
["aliceblue"] = {0.941176, 0.972549, 1, 1},
["antiquewhite"] = {0.980392, 0.921569, 0.843137, 1},
["aqua"] = {0, 1, 1, 1},
+5 -1
View File
@@ -1,5 +1,5 @@
local major, minor = "DetailsFramework-1.0", 8
local major, minor = "DetailsFramework-1.0", 9
local DF, oldminor = LibStub:NewLibrary (major, minor)
if (not DF) then
@@ -167,6 +167,10 @@ DF.www_icons = {
mmoc = {0, 0.7890625, 80/123, 123/128},
}
function DF:IntegerToTimer (value)
return "" .. floor (value/60) .. ":" .. format ("%02.f", value%60)
end
function DF:Embed (target)
for k, v in pairs (embed_functions) do
target[v] = self[v]
+61 -14
View File
@@ -509,48 +509,92 @@ local APIBarFunctions
function BarMetaFunctions:OnTimerEnd()
if (self.OnTimerEndHook) then
local interrupt = self.OnTimerEndHook()
local interrupt = self.OnTimerEndHook (self)
if (interrupt) then
return
end
end
self.timer_texture:Hide()
self.timer_textureR:Hide()
self.div_timer:Hide()
self:Hide()
self.timer = false
end
local OnUpdate = function (self, elapsed)
local timepct = (elapsed / self.tempo) * 100
self.c = self.c - (timepct*self.width/100)
--> percent of elapsed
local pct = abs (self.end_timer - GetTime() - self.tempo) / self.tempo
if (self.inverse) then
self.t:SetWidth (self.total_size * pct)
else
self.t:SetWidth (self.total_size * abs (pct-1))
end
--> right text
self.remaining = self.remaining - elapsed
self.righttext:SetText (_math_floor (self.remaining))
self.timertexture:SetWidth (self.c)
if (self.c < 1) then
if (self.MyObject.RightTextIsTimer) then
self.righttext:SetText (DF:IntegerToTimer (self.remaining))
else
self.righttext:SetText (_math_floor (self.remaining))
end
if (pct >= 1) then
self.righttext:SetText ("")
self:SetScript ("OnUpdate", nil)
self.MyObject:OnTimerEnd()
end
end
function BarMetaFunctions:SetTimer (tempo)
self.statusbar.width = self.statusbar:GetWidth()
-- o que é inverso
-- barra cheia
-- barra vazia
-- o que é left to right
-- barra que faz da direita pra esquerda
-- contrário
self.statusbar.tempo = tempo
self.statusbar.remaining = tempo
self.statusbar.c = self.statusbar.width
self.statusbar.total_size = self.statusbar:GetWidth()
self.statusbar.end_timer = GetTime() + tempo
self.statusbar.inverse = self.BarIsInverse
self.timer_texture:Show()
self.timer_texture:SetWidth (self.statusbar.width)
self.statusbar.t = self.timer_texture
self (1)
self (0)
self.div_timer:Show()
self.background:Show()
self:Show()
if (self.LeftToRight) then
self.timer_texture:Hide()
self.timer_textureR:Show()
self.statusbar.t = self.timer_textureR
self.timer_textureR:ClearAllPoints()
self.timer_textureR:SetPoint ("right", self.statusbar, "right")
self.div_timer:SetPoint ("left", self.timer_textureR, "left", -14, -1)
else
self.timer_texture:Show()
self.timer_textureR:Hide()
self.statusbar.t = self.timer_texture
self.timer_texture:ClearAllPoints()
self.timer_texture:SetPoint ("left", self.statusbar, "left")
self.div_timer:SetPoint ("left", self.timer_texture, "right", -16, -1)
end
if (self.BarIsInverse) then
self.statusbar.t:SetWidth (1)
else
self.statusbar.t:SetWidth (self.statusbar.total_size)
end
self.timer = true
self.statusbar:SetScript ("OnUpdate", OnUpdate)
DF:ScheduleTimer ("StartTimeBarAnimation", 0.1, self)
end
function DF:StartTimeBarAnimation (timebar)
timebar.statusbar:SetScript ("OnUpdate", OnUpdate)
end
------------------------------------------------------------------------------------------------------------
@@ -644,6 +688,9 @@ function DF:NewBar (parent, container, name, member, w, h, value, texture_name)
BarObject.timer_texture:SetWidth (w)
BarObject.timer_texture:SetHeight (h)
BarObject.timer_textureR = _G [name .. "_timerTextureR"]
BarObject.timer_textureR:Hide()
BarObject._texture = _G [name .. "_statusbarTexture"]
BarObject.background = _G [name .. "_background"]
BarObject._icon = _G [name .. "_icon"]
+8
View File
@@ -23,6 +23,14 @@
<Anchor point="LEFT" relativeTo="$parent" />
</Anchors>
</Texture>
<Texture name="$parent_timerTextureR" hidden="true" parentKey="timertextureR" file = "Interface\PaperDollInfoFrame\UI-Character-Skills-Bar" horizTile="false" vertTile="false">
<Size x="300" y="14" />
<Color a = "1" r = "1" g = "1" b = "1" />
<Anchors>
<Anchor point="TOPRIGHT" relativeTo="$parent" x="0" y="0"/>
<Anchor point="BOTTOMRIGHT" relativeTo="$parent" x="0" y="0"/>
</Anchors>
</Texture>
<!-- statusbar texture -->
<Texture name="$parent_statusbarTexture" hidden="false" parentKey="texture" file = "Interface\PaperDollInfoFrame\UI-Character-Skills-Bar" horizTile="false" vertTile="false">
+3 -3
View File
File diff suppressed because one or more lines are too long
+7 -7
View File
@@ -145,8 +145,8 @@
end
-- /run local f=CreateFrame("frame");f:RegisterAllEvents();f:SetScript("OnEvent", function(self, ...)print (...);end)
-- /run
-- local f=CreateFrame("frame");f:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED");f:SetScript("OnEvent", function(self, ...) print (...) end)
-- /run local f=CreateFrame("frame");f:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED");f:SetScript("OnEvent", function(self, ...) print (...) end)
-- /run local f=CreateFrame("frame");f:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED");f:SetScript("OnEvent", function(self, ...) print (...) end)
-- /run local f=CreateFrame("frame");f:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED");f:SetScript("OnEvent", function(self, ...)print (...);end)
@@ -462,13 +462,13 @@
--> firendly fire
if (
(
--(
(_bit_band (alvo_flags, REACTION_FRIENDLY) ~= 0 and _bit_band (who_flags, REACTION_FRIENDLY) ~= 0) or --ajdt d' brx
(raid_members_cache [who_serial] and raid_members_cache [alvo_serial]) --amrl
)
and
(raid_members_cache [alvo_serial] and raid_members_cache [who_serial] and alvo_serial:find ("Player") and who_serial:find ("Player")) --amrl
--)
--and
--spellid ~= 124255 --stagger
spellid ~= 999997 --stagger
--spellid ~= 999997 --stagger
) then
--> ignore soul link (damage from the warlock on his pet)
+4
View File
@@ -151,6 +151,10 @@
return left..(num:reverse():gsub('(%d%d%d)','%1,'):reverse())..right
end
function _detalhes:GetCurrentToKFunction()
return _detalhes.ToKFunctions [_detalhes.ps_abbreviation]
end
_detalhes.ToKFunctions = {_detalhes.NoToK, _detalhes.ToK, _detalhes.ToK2, _detalhes.ToK0, _detalhes.ToKMin, _detalhes.ToK2Min, _detalhes.ToK0Min, _detalhes.comma_value}
_detalhes.string = {}
+1 -1
View File
@@ -934,7 +934,7 @@ local default_profile = {
--> death log
deadlog_limit = 16,
deadlog_events = 16,
deadlog_events = 32,
--> report
report_lines = 5,
+46
View File
@@ -7996,6 +7996,52 @@ local modo_selecao_on_leave = function (self)
end
end
local title_bar_icons = {
{texture = [[Interface\AddOns\Details\images\toolbar_icons]], texcoord = {0/256, 32/256, 0, 1}},
{texture = [[Interface\AddOns\Details\images\toolbar_icons]], texcoord = {32/256, 64/256, 0, 1}},
{texture = [[Interface\AddOns\Details\images\toolbar_icons]], texcoord = {66/256, 93/256, 0, 1}},
{texture = [[Interface\AddOns\Details\images\toolbar_icons]], texcoord = {96/256, 128/256, 0, 1}},
{texture = [[Interface\AddOns\Details\images\toolbar_icons]], texcoord = {128/256, 160/256, 0, 1}},
}
function _detalhes:GetTitleBarIconsTexture (button)
return title_bar_icons [button] or title_bar_icons
end
function _detalhes:CreateFakeWindow()
local t = CreateFrame ("frame")
t:SetSize (200, 91)
t:SetBackdrop ({bgFile = "Interface\\AddOns\\Details\\images\\background", tile = true, tileSize = 16 })
t:SetBackdropColor (0.0941, 0.0941, 0.0941, 0.3)
local tb = CreateFrame ("frame", nil, t)
tb:SetPoint ("bottomleft", t, "topleft", 0, 0)
tb:SetPoint ("bottomright", t, "topright", 0, 0)
tb:SetHeight (16)
tb:SetBackdrop ({bgFile = "Interface\\AddOns\\Details\\images\\background", tile = true, tileSize = 16 })
tb:SetBackdropColor (0.7, 0.7, 0.7, 0.4)
local tt = tb:CreateFontString (nil, "overlay", "GameFontNormal")
_detalhes:SetFontColor (tt, "white")
_detalhes:SetFontSize (tt, 10)
_detalhes:SetFontFace (tt, LibStub:GetLibrary("LibSharedMedia-3.0"):Fetch ("font", "Accidental Presidency"))
tt:SetPoint ("bottomleft", tb, 3, 4)
tt:SetText ("Damage Done")
t.TitleIcons = {}
for i = 1, 5 do
local b = tb:CreateTexture (nil, "overlay")
b:SetSize (12, 12)
b:SetPoint ("bottomright", tb, "bottomright", -((abs(i-6)-1)*11) - 1, 2)
local button_texture_texcoord = _detalhes:GetTitleBarIconsTexture (i)
b:SetTexture (button_texture_texcoord.texture)
b:SetTexCoord (unpack (button_texture_texcoord.texcoord))
tinsert (t.TitleIcons, b)
end
t.TitleBar = tb
t.TitleText = tt
return t
end
function gump:CriaCabecalho (baseframe, instancia)
baseframe.cabecalho = {}
+33
View File
@@ -176,6 +176,39 @@ do
DetailsSwitchPanel.all_switch = all_switch
function _detalhes:ShowAllSwitch()
--_detalhes:SetTutorialCVar ("SWITCH_PANEL_FIRST_OPENED", false)
if (not _detalhes:GetTutorialCVar ("SWITCH_PANEL_FIRST_OPENED")) then
_detalhes:SetTutorialCVar ("SWITCH_PANEL_FIRST_OPENED", true)
local fake_window = _detalhes:CreateFakeWindow()
fake_window:SetPoint ("bottomleft", all_switch, "topleft", 0, 10)
local all_switch_titlebar_help = CreateFrame ("frame", "DetailsSwitchAllPopUp1", fake_window, "DetailsHelpBoxTemplate")
all_switch_titlebar_help.ArrowUP:Show()
all_switch_titlebar_help.ArrowGlowUP:Show()
all_switch_titlebar_help.Text:SetText ("Right click on Title Bar to open all displays menu.")
all_switch_titlebar_help:SetPoint ("bottom", fake_window.TitleBar, "top", 0, 30)
all_switch_titlebar_help:Show()
local all_switch_titlebar2_help = CreateFrame ("frame", "DetailsSwitchAllPopUp1", fake_window, "DetailsHelpBoxTemplate")
all_switch_titlebar2_help.ArrowLEFT:Show()
all_switch_titlebar2_help.ArrowGlowLEFT:Show()
all_switch_titlebar2_help.Text:SetText ("Right clicking anywhere else opens your Bookmarks.")
all_switch_titlebar2_help:SetPoint ("right", fake_window, "left", -30, 0)
all_switch_titlebar2_help:Show()
local close = CreateFrame ("button", nil, fake_window)
close:SetPoint ("bottomright", fake_window, "bottomright", -10, 10)
close:SetScript ("OnClick", function() fake_window:Hide(); all_switch_titlebar2_help:Hide(); all_switch_titlebar_help:Hide() end)
close:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = "Interface\\AddOns\\Details\\images\\background", tile = true, tileSize = 16 })
close:SetBackdropColor (0.7, 0.7, 0.7, 0.4)
close:SetSize (100, 20)
local t = close:CreateFontString (nil, "overlay", "GameFontNormal")
t:SetPoint ("center", 0, 0)
t:SetText ("CLOSE")
end
if (all_switch:IsShown()) then
return all_switch:Hide()
end