Skip to content

Commit

Permalink
Maintenance Update and Mythic Dungeon Plus development progress
Browse files Browse the repository at this point in the history
- Dungeon followers now correctly show into the damage done section.
- Fixed an error while statusbar plugin options.
- Framework update.
- Mythic Dungeon Plus code has been separated into six files (was just 2), this will help with the organization
and maintenance of the code.
  • Loading branch information
Tercioo committed Jan 31, 2024
1 parent d4da0b2 commit ee0b350
Show file tree
Hide file tree
Showing 32 changed files with 4,476 additions and 2,637 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ photoshop/ten_years_skin.tga
plugins/Details_EncounterDetails/Libs/LibLuaServer/LuaServerDefinitions.lua
plugins/Details_EncounterDetails/Definitions.lua
*.afphoto~lock~
annotations.txt
7 changes: 5 additions & 2 deletions Details.toc
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ functions\currentdps.lua
functions\report.lua
functions\rowanimation.lua
functions\raidinfo.lua
functions\dungeon.lua
functions\mythicdungeon\mythicdungeon.lua
functions\mythicdungeon\data_capture.lua
functions\mythicdungeon\segments.lua
functions\pack.lua
functions\mythicdungeon.lua
functions\immersion.lua
functions\schedules.lua
functions\autorun.lua
Expand Down Expand Up @@ -98,6 +99,8 @@ frames\window_breakdown\breakdown_spells_spellframes.lua
frames\window_breakdown\breakdown_spells_targetframes.lua
frames\window_breakdown\breakdown_spells_phaseframes.lua
frames\window_mythicplus\window_mythic_breakdown.lua
frames\window_mythicplus\window_end_of_run.lua
frames\window_mythicplus\window_chart.lua
frames\window_report.lua
frames\window_main.lua
frames\window_custom.lua
Expand Down
6 changes: 4 additions & 2 deletions Details_Classic.toc
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ functions\currentdps.lua
functions\report.lua
functions\rowanimation.lua
functions\raidinfo.lua
functions\dungeon.lua
functions\mythicdungeon\segments.lua
functions\mythicdungeon\mythicdungeon.lua
functions\mythicdungeon\data_capture.lua
functions\pack.lua
functions\mythicdungeon.lua
functions\immersion.lua
functions\schedules.lua
functions\autorun.lua
Expand Down Expand Up @@ -93,6 +94,7 @@ frames\window_breakdown\breakdown_spells_spellframes.lua
frames\window_breakdown\breakdown_spells_targetframes.lua
frames\window_breakdown\breakdown_spells_phaseframes.lua
frames\window_mythicplus\window_mythic_breakdown.lua
frames\window_mythicplus\window_end_of_run.lua
frames\window_report.lua
frames\window_main.lua
frames\window_custom.lua
Expand Down
6 changes: 4 additions & 2 deletions Details_Wrath.toc
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ functions\currentdps.lua
functions\report.lua
functions\rowanimation.lua
functions\raidinfo.lua
functions\dungeon.lua
functions\mythicdungeon\segments.lua
functions\mythicdungeon\mythicdungeon.lua
functions\mythicdungeon\data_capture.lua
functions\pack.lua
functions\mythicdungeon.lua
functions\immersion.lua
functions\schedules.lua
functions\autorun.lua
Expand Down Expand Up @@ -93,6 +94,7 @@ frames\window_breakdown\breakdown_spells_spellframes.lua
frames\window_breakdown\breakdown_spells_targetframes.lua
frames\window_breakdown\breakdown_spells_phaseframes.lua
frames\window_mythicplus\window_mythic_breakdown.lua
frames\window_mythicplus\window_end_of_run.lua
frames\window_report.lua
frames\window_main.lua
frames\window_custom.lua
Expand Down
5 changes: 4 additions & 1 deletion Libs/DF/definitions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
---@field internalFunctions table
---@field OptionsFunctions df_optionsmixin
---@field GlobalWidgetControlNames table
---@field DefaultRoundedCornerPreset table
---@field RoundedCornerPanelMixin df_roundedcornermixin
---@field Schedules df_schedule
---@field HeaderFunctions df_headerfunctions
Expand Down Expand Up @@ -142,6 +143,8 @@
---@field IsHtmlColor fun(self:table, colorName:any) : unknown return true if DF.alias_text_colors has the colorName as a key
---@field CreateColorTable fun(self:table, r:number, g:number, b:number, a:number) : table return a table with {r, g, b, a}
---@field FormatColor fun(self:table, newFormat:string, r:number|string, g:number?, b:number?, a:number?, decimalsAmount:number?) : string|table|number|nil, number|nil, number|nil, number|nil takes in a color in one format and converts it to another specified format.
---@field
---@field CreateEditor fun(self:table, parent:frame, name:string?, options:df_editor_defaultoptions?) : df_editor
---@field RandomBool fun(self:table, odds: number?) : boolean return a random boolean
---@field CreateHighlightTexture fun(self:table, parent:frame, parentKey:string?, alpha:number?, name:string?) : texture
---@field

7 changes: 6 additions & 1 deletion Libs/DF/dropdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ function DropDownMetaFunctions:Select(optionName, byOptionNumber, bOnlyShown, ru
return false
end

local optionsTable = DF:Dispatch(self.func, self) --399
local runOkay, optionsTable = xpcall(self.func, geterrorhandler(), self)

if (#optionsTable == 0) then
self:NoOption(true)
Expand Down Expand Up @@ -563,6 +563,11 @@ function DropDownMetaFunctions:Selected(thisOption)
self.statusbar:SetTexture([[Interface\Tooltips\CHATBUBBLE-BACKGROUND]])
end

if (self.widget.__rcorners) then
self.statusbar:SetPoint("topleft", self.widget, "topleft", 2, -2)
self.statusbar:SetPoint("bottomright", self.widget, "bottomright", -2, 2)
end

if (thisOption.color) then
local r, g, b, a = DF:ParseColors(thisOption.color)
self.label:SetTextColor(r, g, b, a)
Expand Down
Loading

0 comments on commit ee0b350

Please sign in to comment.