Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

- Custom Displays updated to track WoD potions.

Browse Source 
- Added Feedback panel at options panel.
This commit is contained in:
tercio
2014-11-13 19:24:34 -02:00
parent cf3219f436
commit 07b587d340
9 changed files with 186 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+7 -4
View File
File diff suppressed because one or more lines are too long
classes/classe_custom.lua
+30 -30
View File
@@ -1038,8 +1038,8 @@
local debuff_uptime_container = player.debuff_uptime and player.debuff_uptime_spells and player.debuff_uptime_spells._ActorTable
if (debuff_uptime_container) then
--potion of focus (can't use as pre-potion, so, its amount is always 1
--local focus_potion = debuff_uptime_container [156432] --WoD
local focus_potion = debuff_uptime_container [105701] --MoP
local focus_potion = debuff_uptime_container [156432] --WoD
--local focus_potion = debuff_uptime_container [105701] --MoP
if (focus_potion) then
total = total + 1
found_potion = true
@@ -1056,8 +1056,8 @@
if (buff_uptime_container) then
--potion of the jade serpent
--local jade_serpent_potion = buff_uptime_container [156426] --WoD
local jade_serpent_potion = buff_uptime_container [105702] --MoP
local jade_serpent_potion = buff_uptime_container [156426] --WoD
--local jade_serpent_potion = buff_uptime_container [105702] --MoP
if (jade_serpent_potion) then
local used = jade_serpent_potion.activedamt
if (used > 0) then
@@ -1072,8 +1072,8 @@
end
--potion of mogu power
--local mogu_power_potion = buff_uptime_container [156428] --WoD
local mogu_power_potion = buff_uptime_container [105706] --MoP
local mogu_power_potion = buff_uptime_container [156428] --WoD
--local mogu_power_potion = buff_uptime_container [105706] --MoP
if (mogu_power_potion) then
local used = mogu_power_potion.activedamt
if (used > 0) then
@@ -1088,8 +1088,8 @@
end
--virmen's bite
--local virmens_bite_potion = buff_uptime_container [156423] --WoD
local virmens_bite_potion = buff_uptime_container [105697] --MoP
local virmens_bite_potion = buff_uptime_container [156423] --WoD
--local virmens_bite_potion = buff_uptime_container [105697] --MoP
if (virmens_bite_potion) then
local used = virmens_bite_potion.activedamt
if (used > 0) then
@@ -1104,8 +1104,8 @@
end
--potion of the mountains
--local mountains_potion = buff_uptime_container [156430] --WoD
local mountains_potion = buff_uptime_container [105698] --MoP
local mountains_potion = buff_uptime_container [156430] --WoD
--local mountains_potion = buff_uptime_container [105698] --MoP
if (mountains_potion) then
local used = mountains_potion.activedamt
if (used > 0) then
@@ -1136,11 +1136,11 @@
--get the debuff container for potion of focus
local debuff_uptime_container = player.debuff_uptime and player.debuff_uptime_spells and player.debuff_uptime_spells._ActorTable
if (debuff_uptime_container) then
--local focus_potion = debuff_uptime_container [156432] --WoD
local focus_potion = debuff_uptime_container [105701] --MoP
local focus_potion = debuff_uptime_container [156432] --WoD
--local focus_potion = debuff_uptime_container [105701] --MoP
if (focus_potion) then
--local name, _, icon = GetSpellInfo (156432) --WoD
local name, _, icon = GetSpellInfo (105701) --MoP
local name, _, icon = GetSpellInfo (156432) --WoD
--local name, _, icon = GetSpellInfo (105701) --MoP
GameCooltip:AddLine (name, 1) --> can use only 1 focus potion (can't be pre-potion)
_detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddIcon (icon, 1, 1, 14, 14)
@@ -1151,44 +1151,44 @@
local buff_uptime_container = player.buff_uptime and player.buff_uptime_spells and player.buff_uptime_spells._ActorTable
if (buff_uptime_container) then
--potion of the jade serpent
--local jade_serpent_potion = buff_uptime_container [156426] --WoD
local jade_serpent_potion = buff_uptime_container [105702] --MoP
local jade_serpent_potion = buff_uptime_container [156426] --WoD
--local jade_serpent_potion = buff_uptime_container [105702] --MoP
if (jade_serpent_potion) then
--local name, _, icon = GetSpellInfo (156426) --WoD
local name, _, icon = GetSpellInfo (105702) --MoP
local name, _, icon = GetSpellInfo (156426) --WoD
--local name, _, icon = GetSpellInfo (105702) --MoP
GameCooltip:AddLine (name, jade_serpent_potion.activedamt)
_detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddIcon (icon, 1, 1, 14, 14)
end
--potion of mogu power
--local mogu_power_potion = buff_uptime_container [156428] --WoD
local mogu_power_potion = buff_uptime_container [105706] --MoP
local mogu_power_potion = buff_uptime_container [156428] --WoD
--local mogu_power_potion = buff_uptime_container [105706] --MoP
if (mogu_power_potion) then
--local name, _, icon = GetSpellInfo (156428) --WoD
local name, _, icon = GetSpellInfo (105706) --MoP
local name, _, icon = GetSpellInfo (156428) --WoD
--local name, _, icon = GetSpellInfo (105706) --MoP
GameCooltip:AddLine (name, mogu_power_potion.activedamt)
_detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddIcon (icon, 1, 1, 14, 14)
end
--virmen's bite
--local virmens_bite_potion = buff_uptime_container [156423] --WoD
local virmens_bite_potion = buff_uptime_container [105697] --MoP
local virmens_bite_potion = buff_uptime_container [156423] --WoD
--local virmens_bite_potion = buff_uptime_container [105697] --MoP
if (virmens_bite_potion) then
--local name, _, icon = GetSpellInfo (156423) --WoD
local name, _, icon = GetSpellInfo (105697) --MoP
local name, _, icon = GetSpellInfo (156423) --WoD
--local name, _, icon = GetSpellInfo (105697) --MoP
GameCooltip:AddLine (name, virmens_bite_potion.activedamt)
_detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddIcon (icon, 1, 1, 14, 14)
end
--potion of the mountains
--local mountains_potion = buff_uptime_container [156430] --WoD
local mountains_potion = buff_uptime_container [105698] --MoP
local mountains_potion = buff_uptime_container [156430] --WoD
--local mountains_potion = buff_uptime_container [105698] --MoP
if (mountains_potion) then
--local name, _, icon = GetSpellInfo (156430) --WoD
local name, _, icon = GetSpellInfo (105698) --MoP
local name, _, icon = GetSpellInfo (156430) --WoD
--local name, _, icon = GetSpellInfo (105698) --MoP
GameCooltip:AddLine (name, mountains_potion.activedamt)
_detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddIcon (icon, 1, 1, 14, 14)
core/windows.lua
+94 -4
View File
@@ -763,10 +763,100 @@
_detalhes:GetFramework():ShowTutorialAlertFrame ("How to Use Bookmarks", "switch fast between displays", func)
end
--> feedback window
function _detalhes:OpenFeedbackWindow()
if (not _G.DetailsFeedbackPanel) then
gump:CreateSimplePanel (UIParent, 340, 300, Loc ["STRING_FEEDBACK_SEND_FEEDBACK"], "DetailsFeedbackPanel")
local panel = _G.DetailsFeedbackPanel
local label = gump:CreateLabel (panel, Loc ["STRING_FEEDBACK_PREFERED_SITE"])
label:SetPoint ("topleft", panel, "topleft", 15, -60)
local wowi = gump:NewImage (panel, [[Interface\AddOns\Details\images\icons2]], 101, 34, "artwork", {0/512, 101/512, 163/512, 200/512})
local curse = gump:NewImage (panel, [[Interface\AddOns\Details\images\icons2]], 101, 34, "artwork", {0/512, 101/512, 201/512, 242/512})
local mmoc = gump:NewImage (panel, [[Interface\AddOns\Details\images\icons2]], 101, 34, "artwork", {0/512, 101/512, 243/512, 285/512})
wowi:SetDesaturated (true)
curse:SetDesaturated (true)
mmoc:SetDesaturated (true)
wowi:SetPoint ("topleft", panel, "topleft", 17, -100)
curse:SetPoint ("topleft", panel, "topleft", 17, -160)
mmoc:SetPoint ("topleft", panel, "topleft", 17, -220)
local wowi_title = gump:CreateLabel (panel, "Wow Interface:", nil, nil, "GameFontNormal")
local wowi_desc = gump:CreateLabel (panel, Loc ["STRING_FEEDBACK_WOWI_DESC"], nil, "silver")
wowi_desc:SetWidth (202)
wowi_title:SetPoint ("topleft", wowi, "topright", 5, 0)
wowi_desc:SetPoint ("topleft", wowi_title, "bottomleft", 0, -1)
--
local curse_title = gump:CreateLabel (panel, "Curse:", nil, nil, "GameFontNormal")
local curse_desc = gump:CreateLabel (panel, Loc ["STRING_FEEDBACK_CURSE_DESC"], nil, "silver")
curse_desc:SetWidth (202)
curse_title:SetPoint ("topleft", curse, "topright", 5, 0)
curse_desc:SetPoint ("topleft", curse_title, "bottomleft", 0, -1)
--
local mmoc_title = gump:CreateLabel (panel, "MMO-Champion:", nil, nil, "GameFontNormal")
local mmoc_desc = gump:CreateLabel (panel, Loc ["STRING_FEEDBACK_MMOC_DESC"], nil, "silver")
mmoc_desc:SetWidth (202)
mmoc_title:SetPoint ("topleft", mmoc, "topright", 5, 0)
mmoc_desc:SetPoint ("topleft", mmoc_title, "bottomleft", 0, -1)
local on_enter = function (self, capsule)
capsule.image:SetDesaturated (false)
end
local on_leave = function (self, capsule)
capsule.image:SetDesaturated (true)
end
local on_click = function (website)
if (website == 1) then
_detalhes:CopyPaste ([[http://www.wowinterface.com/downloads/addcomment.php?action=addcomment&fileid=23056]])
elseif (website == 2) then
_detalhes:CopyPaste ([[http://www.curse.com/addons/wow/details]])
elseif (website == 3) then
_detalhes:CopyPaste ([[http://www.mmo-champion.com/threads/1480721-New-damage-meter-%28Details!%29-need-help-with-tests-and-feedbacks]])
end
end
local wowi_button = gump:CreateButton (panel, on_click, 103, 34, "", 1)
wowi_button:SetPoint ("topleft", wowi, "topleft", -1, 0)
wowi_button:InstallCustomTexture (nil, nil, nil, nil, true)
wowi_button.image = wowi
wowi_button:SetHook ("OnEnter", on_enter)
wowi_button:SetHook ("OnLeave", on_leave)
local curse_button = gump:CreateButton (panel, on_click, 103, 34, "", 2)
curse_button:SetPoint ("topleft", curse, "topleft", -1, 0)
curse_button:InstallCustomTexture (nil, nil, nil, nil, true)
curse_button.image = curse
curse_button:SetHook ("OnEnter", on_enter)
curse_button:SetHook ("OnLeave", on_leave)
local mmoc_button = gump:CreateButton (panel, on_click, 103, 34, "", 3)
mmoc_button:SetPoint ("topleft", mmoc, "topleft", -1, 0)
mmoc_button:InstallCustomTexture (nil, nil, nil, nil, true)
mmoc_button.image = mmoc
mmoc_button:SetHook ("OnEnter", on_enter)
mmoc_button:SetHook ("OnLeave", on_leave)
end
_G.DetailsFeedbackPanel:Show()
end
--> config class colors
function _detalhes:OpenClassColorsConfig()
if (not _G.DetailsClassColorManager) then
gump:CreateSimplePanel (UIParent, 300, 280, "Modify Class Colors", "DetailsClassColorManager")
gump:CreateSimplePanel (UIParent, 300, 280, Loc ["STRING_OPTIONS_CLASSCOLOR_MODIFY"], "DetailsClassColorManager")
local panel = _G.DetailsClassColorManager
local upper_panel = CreateFrame ("frame", nil, panel)
upper_panel:SetAllPoints (panel)
@@ -804,7 +894,7 @@
--GameCooltip:Hide()
end
local reset = gump:NewLabel (panel, _, nil, nil, "|TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:" .. 20 .. ":" .. 20 .. ":0:1:512:512:8:70:328:409|t " .. "Right Click to Reset")
local reset = gump:NewLabel (panel, _, nil, nil, "|TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:" .. 20 .. ":" .. 20 .. ":0:1:512:512:8:70:328:409|t " .. Loc ["STRING_OPTIONS_CLASSCOLOR_RESET"])
reset:SetPoint ("bottomright", panel, "bottomright", -23, 38)
local reset_texture = gump:CreateImage (panel, [[Interface\MONEYFRAME\UI-MONEYFRAME-BORDER]], 138, 45, "border")
reset_texture:SetPoint ("center", reset, "center", 0, -7)
@@ -853,7 +943,7 @@
function _detalhes:OpenBookmarkConfig()
if (not _G.DetailsBookmarkManager) then
gump:CreateSimplePanel (UIParent, 300, 480, "Manage Bookmarks", "DetailsBookmarkManager")
gump:CreateSimplePanel (UIParent, 300, 480, Loc ["STRING_OPTIONS_MANAGE_BOOKMARKS"], "DetailsBookmarkManager")
local panel = _G.DetailsBookmarkManager
panel.blocks = {}
@@ -2175,7 +2265,7 @@
function _detalhes:CreateTestBars()
local current_combat = _detalhes:GetCombat ("current")
local actors_name = {"Ragnaros", "The Lich King", "Your Neighbor", "Your Raid Leader", "Your Internet Girlfriend", "Mr. President", "A Shadow Priest Complaining About Dps", "Ms. Gray", "Parry Hotter", "Your Math Teacher", "King Djoffrey", UnitName ("player") .. " Snow", "A Drunk Dawrf", "Somebody That You Used To Know", "Low Dps Guy", "Helvis Phresley (Death Log Not Found)", "Stormwind Guard", "A PvP Player", "Bolvar Fordragon","Malygos","Akama","Anachronos","Lady Blaumeux","Cairne Bloodhoof","Borivar","C'Thun","Drek'Thar","Durotan","Eonar","Footman Malakai","Bolvar Fordragon","Fritz Fizzlesprocket","Lisa Gallywix","M'uru","High Priestess MacDonnell","Nazgrel","Ner'zhul","Saria Nightwatcher","Chief Ogg'ora","Ogoun","Grimm Onearm","Apothecary Oni'jus","Orman of Stromgarde","General Rajaxx","Baron Rivendare","Roland","Archmage Trelane","Liam Trollbane"}
local actors_name = {"Ragnaros", "The Lich King", "Your Neighbor", "Your Raid Leader", "Huffer", "Your Internet Girlfriend", "Mr. President", "A Shadow Priest Complaining About Dps", "Ms. Gray", "Parry Hotter", "Your Math Teacher", "King Djoffrey", UnitName ("player") .. " Snow", "A Drunk Dawrf", "Somebody That You Used To Know", "Low Dps Guy", "Helvis Phresley (Death Log Not Found)", "Stormwind Guard", "A PvP Player", "Bolvar Fordragon","Malygos","Akama","Anachronos","Lady Blaumeux","Cairne Bloodhoof","Borivar","C'Thun","Drek'Thar","Durotan","Eonar","Footman Malakai","Bolvar Fordragon","Fritz Fizzlesprocket","Lisa Gallywix","M'uru","High Priestess MacDonnell","Nazgrel","Ner'zhul","Saria Nightwatcher","Chief Ogg'ora","Ogoun","Grimm Onearm","Apothecary Oni'jus","Orman of Stromgarde","General Rajaxx","Baron Rivendare","Roland","Archmage Trelane","Liam Trollbane"}
local actors_classes = CLASS_SORT_ORDER
local total_damage = 0
gumps/janela_news.lua
+9 -2
View File
@@ -9,7 +9,9 @@ function _detalhes:OpenNewsWindow()
news_window:Title (Loc ["STRING_NEWS_TITLE"])
news_window:Text (Loc ["STRING_VERSION_LOG"])
news_window:Icon ("Interface\\CHARACTERFRAME\\TempPortrait")
news_window:Icon ([[Interface\AddOns\Details\images\icons2]], {108/512, 189/512, 319/512, 400/512})
news_window:Show()
end
@@ -133,8 +135,13 @@ function _detalhes:CreateOrOpenNewsWindow()
texto:SetText (text or "")
end
function frame:Icon (path)
function frame:Icon (path, coords)
frame.portrait:SetTexture (path or nil)
if (coords) then
frame.portrait:SetTexCoord (unpack (coords))
else
frame.portrait:SetTexCoord (0, 1, 0, 1)
end
end
frame:Hide()
gumps/janela_options.lua
+40 -1
View File
@@ -320,15 +320,54 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section)
window.Disable3DColorPick:SetColor (.5, .5, .5, 1)
window.Disable3DColorPick:Hide()
--> disabled
hide_3d_world:Hide()
--> create bars
local fillbars = g:NewButton (window, _, "$parentCreateExampleBarsButton", nil, 110, 14, _detalhes.CreateTestBars, nil, nil, nil, Loc ["STRING_OPTIONS_TESTBARS"])
fillbars:SetPoint ("bottomleft", window.widget, "bottomleft", 200, 12)
fillbars:SetPoint ("bottomleft", window.widget, "bottomleft", 41, 12)
fillbars.textalign = "left"
fillbars:SetHook ("OnEnter", function()
fillbars:SetTextColor (1, 1, 0)
end)
fillbars:SetHook ("OnLeave", function()
fillbars:SetTextColor (0.9999, 0.8196, 0, 1)
end)
local fillbars_image = g:NewImage (window, [[Interface\Buttons\UI-RADIOBUTTON]], 8, 9, "artwork", {20/64, 27/64, 4/16, 11/16})
fillbars_image:SetPoint ("right", fillbars, "left", -1, 0)
--> change log
local changelog = g:NewButton (window, _, "$parentOpenChangeLogButton", nil, 110, 14, _detalhes.OpenNewsWindow, nil, nil, nil, Loc ["STRING_OPTIONS_CHANGELOG"])
changelog:SetPoint ("left", fillbars, "right", 10, 0)
changelog.textalign = "left"
changelog:SetHook ("OnEnter", function()
changelog:SetTextColor (1, 1, 0)
end)
changelog:SetHook ("OnLeave", function()
changelog:SetTextColor (0.9999, 0.8196, 0, 1)
end)
local changelog_image = g:NewImage (window, [[Interface\Buttons\UI-RADIOBUTTON]], 8, 9, "artwork", {20/64, 27/64, 4/16, 11/16})
changelog_image:SetPoint ("right", changelog, "left", -1, 0)
--> send feedback
local feedback_button = g:NewButton (window, _, "$parentOpenFeedbackButton", nil, 110, 14, _detalhes.OpenFeedbackWindow, nil, nil, nil, Loc ["STRING_OPTIONS_SENDFEEDBACK"])
feedback_button:SetPoint ("left", changelog, "right", 10, 0)
feedback_button.textalign = "left"
feedback_button:SetHook ("OnEnter", function()
feedback_button:SetTextColor (1, 1, 0)
end)
feedback_button:SetHook ("OnLeave", function()
feedback_button:SetTextColor (0.9999, 0.8196, 0, 1)
end)
local feedback_image = g:NewImage (window, [[Interface\Buttons\UI-RADIOBUTTON]], 8, 9, "artwork", {20/64, 27/64, 4/16, 11/16})
feedback_image:SetPoint ("right", feedback_button, "left", -1, 0)
--> right click to close
--local right_click_close = window:CreateRightClickLabel ("short", 14, 14, "Close")
images/icons2.tga
BIN
View File
Binary file not shown.
locales/Details-ruRU.lua
+4
View File
@@ -0,0 +1,4 @@
local L = LibStub("AceLocale-3.0"):NewLocale("Details", "ruRU")
if not L then return end
@localization(locale="ruRU", format="lua_additive_table", escape-non-ascii=true)@
plugins/Details_EncounterDetails/images/icon_shadow.tga
BIN
View File
Binary file not shown.
startup.lua
+2 -26
View File
@@ -313,36 +313,12 @@ function _G._detalhes:Start()
_detalhes:AddDefaultCustomDisplays()
--> Reset for the new structure
if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 43 and enable_reset_warning) then
for i = 1, #_detalhes.custom do
if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 47 and enable_reset_warning) then
for i = #_detalhes.custom, 1, -1 do
_detalhes.atributo_custom:RemoveCustom (i)
end
_detalhes:AddDefaultCustomDisplays()
end
if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 20 and enable_reset_warning) then
table.wipe (self.custom)
_detalhes:AddDefaultCustomDisplays()
end
if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 18 and enable_reset_warning) then
for index, instance in ipairs (_detalhes.tabela_instancias) do
if (not instance.iniciada) then
instance:RestauraJanela()
local skin = instance.skin
instance:ChangeSkin ("Default Skin")
instance:ChangeSkin ("Minimalistic v2")
instance:ChangeSkin (skin)
instance:DesativarInstancia()
else
local skin = instance.skin
instance:ChangeSkin ("Default Skin")
instance:ChangeSkin ("Minimalistic v2")
instance:ChangeSkin (skin)
end
end
end
end