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

- Fixed damage on low level training dummies where it was showing 1 damage for each ability.

Browse Source 
- Added a line in the tooltip shown when hovering over the spec icon to show non-formated DPS, example: "12.0K" DPS shows "11,985.8".
- Developers: command /run Details:DumpTable() should now show the correct table names with quotation marks if string.
- Framework update.
This commit is contained in:
Tercio
2018-10-19 21:11:32 -03:00
parent 6cfb1a71c4
commit c8bac60626
7 changed files with 358 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/DF/button.lua
+14 -27
View File
@@ -32,8 +32,9 @@ local ButtonMetaFunctions = _G [DF.GlobalWidgetControlNames ["button"]]
------------------------------------------------------------------------------------------------------------
--> metatables
ButtonMetaFunctions.__call = function (_table, value, ...)
return self.func (_table.param1, _table.param2, value, ...)
ButtonMetaFunctions.__call = function (self)
local frameWidget = self.widget
DF:CoreDispatch ((frameWidget:GetName() or "Button") .. ":__call()", self.func, frameWidget, "LeftButton", self.param1, self.param2)
end
------------------------------------------------------------------------------------------------------------
@@ -494,13 +495,16 @@ local ButtonMetaFunctions = _G [DF.GlobalWidgetControlNames ["button"]]
-- exec
function ButtonMetaFunctions:Exec()
return self.func (self.param1, self.param2)
local frameWidget = self.widget
DF:CoreDispatch ((frameWidget:GetName() or "Button") .. ":Exec()", self.func, frameWidget, "LeftButton", self.param1, self.param2)
end
function ButtonMetaFunctions:Click()
return self.func (self.param1, self.param2)
local frameWidget = self.widget
DF:CoreDispatch ((frameWidget:GetName() or "Button") .. ":Click()", self.func, frameWidget, "LeftButton", self.param1, self.param2)
end
function ButtonMetaFunctions:RightClick()
return self.funcright()
local frameWidget = self.widget
DF:CoreDispatch ((frameWidget:GetName() or "Button") .. ":RightClick()", self.funcright, frameWidget, "RightButton", self.param1, self.param2)
end
--> custom textures
@@ -785,9 +789,9 @@ local ButtonMetaFunctions = _G [DF.GlobalWidgetControlNames ["button"]]
if (button.MyObject.options.OnGrab) then
if (_type (button.MyObject.options.OnGrab) == "string" and button.MyObject.options.OnGrab == "PassClick") then
if (buttontype == "LeftButton") then
button.MyObject.func (button.MyObject.param1, button.MyObject.param2)
DF:CoreDispatch ((button:GetName() or "Button") .. ":OnMouseDown()", button.MyObject.func, button, buttontype, button.MyObject.param1, button.MyObject.param2)
else
button.MyObject.funcright (button.MyObject.param1, button.MyObject.param2)
DF:CoreDispatch ((button:GetName() or "Button") .. ":OnMouseDown()", button.MyObject.funcright, button, buttontype, button.MyObject.param1, button.MyObject.param2)
end
end
end
@@ -877,21 +881,9 @@ local ButtonMetaFunctions = _G [DF.GlobalWidgetControlNames ["button"]]
(button.mouse_down+0.5 > GetTime() and button:IsMouseOver())
) then
if (buttontype == "LeftButton") then
local success, errorText = pcall (button.MyObject.func, button, buttontype, button.MyObject.param1, button.MyObject.param2)
if (not success) then
error ("Details! Framework: button " .. button:GetName() .. " error: " .. errorText)
end
--button.MyObject.func (button, buttontype, button.MyObject.param1, button.MyObject.param2)
DF:CoreDispatch ((button:GetName() or "Button") .. ":OnMouseUp()", button.MyObject.func, button, buttontype, button.MyObject.param1, button.MyObject.param2)
else
local success, errorText = pcall (button.MyObject.funcright, button, buttontype, button.MyObject.param1, button.MyObject.param2)
if (not success) then
error ("Details! Framework: button " .. button:GetName() .. " error: " .. errorText)
end
--button.MyObject.funcright (button, buttontype, button.MyObject.param1, button.MyObject.param2)
DF:CoreDispatch ((button:GetName() or "Button") .. ":OnMouseUp()", button.MyObject.funcright, button, buttontype, button.MyObject.param1, button.MyObject.param2)
end
end
end
@@ -1151,12 +1143,7 @@ local pickcolor_callback = function (self, r, g, b, a, button)
button.MyObject.color_texture:SetVertexColor (r, g, b, a)
--> safecall
--button.MyObject:color_callback (r, g, b, a)
local success, errorText = pcall (button.MyObject.color_callback, button.MyObject, r, g, b, a)
if (not success) then
error ("Details! Framework: colorpick " .. (self:GetName() or "-NONAME-") .. " error: " .. errorText)
end
DF:CoreDispatch ((self:GetName() or "ColorPicker") .. ".pickcolor_callback()", button.MyObject.color_callback, button.MyObject, r, g, b, a)
button.MyObject:RunHooksForWidget ("OnColorChanged", button.MyObject, r, g, b, a)
end