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

- Added real time compile error while writing a custom script.

Browse Source 
- Added protection on compiling a custom script to show in the window, an error text should be printed to chat window.
- Added events: COMM_EVENT_RECEIVED and COMM_EVENT_SENT.
- When options panel is not in the screen, the script will attempt to fix the position.
- While doing a sync on guild statistics, more information about the download is shown.
This commit is contained in:
Tercio
2018-02-09 11:33:02 -02:00
parent 521fee8ba7
commit 0b38e849bc
10 changed files with 211 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/classe_custom.lua
+38 -17
View File
@@ -110,22 +110,39 @@
if (_detalhes.custom_function_cache [instance.customName]) then
func = _detalhes.custom_function_cache [instance.customName]
else
func = loadstring (custom_object.script)
local errortext
func, errortext = loadstring (custom_object.script)
if (func) then
_detalhes.custom_function_cache [instance.customName] = func
else
_detalhes:Msg ("|cFFFF9900error compiling code for custom display " .. (instance.customName or "") .. " |r:", errortext)
end
local tooltip_script = custom_object.tooltip and loadstring (custom_object.tooltip)
if (tooltip_script) then
_detalhes.custom_function_cache [instance.customName .. "Tooltip"] = tooltip_script
if (custom_object.tooltip) then
local tooltip_script, errortext = loadstring (custom_object.tooltip)
if (tooltip_script) then
_detalhes.custom_function_cache [instance.customName .. "Tooltip"] = tooltip_script
else
_detalhes:Msg ("|cFFFF9900error compiling tooltip code for custom display " .. (instance.customName or "") .. " |r:", errortext)
end
end
local total_script = custom_object.total_script and loadstring (custom_object.total_script)
if (total_script) then
_detalhes.custom_function_cache [instance.customName .. "Total"] = total_script
if (custom_object.total_script) then
local total_script, errortext = loadstring (custom_object.total_script)
if (total_script) then
_detalhes.custom_function_cache [instance.customName .. "Total"] = total_script
else
_detalhes:Msg ("|cFFFF9900error compiling total code for custom display " .. (instance.customName or "") .. " |r:", errortext)
end
end
local percent_script = custom_object.percent_script and loadstring (custom_object.percent_script)
if (percent_script) then
_detalhes.custom_function_cache [instance.customName .. "Percent"] = percent_script
if (custom_object.percent_script) then
local percent_script, errortext = loadstring (custom_object.percent_script)
if (percent_script) then
_detalhes.custom_function_cache [instance.customName .. "Percent"] = percent_script
else
_detalhes:Msg ("|cFFFF9900error compiling percent code for custom display " .. (instance.customName or "") .. " |r:", errortext)
end
end
end
@@ -134,9 +151,6 @@
_detalhes:EndRefresh (instance, 0, combat, combat [1])
end
--> call the loop function
--total, top, amount = func (combat, instance_container, instance)
okey, total, top, amount = _pcall (func, combat, instance_container, instance)
if (not okey) then
_detalhes:Msg ("|cFFFF9900error on custom display function|r:", total)
@@ -470,7 +484,7 @@
end
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> custom object functions
local actor_class_color_r, actor_class_color_g, actor_class_color_b
function atributo_custom:UpdateBar (row_container, index, percentage_type, rank, total, top, instance, is_forced, percent_script, total_script, combat, bars_show_data, bars_brackets, bars_separator)
@@ -484,14 +498,14 @@
local percent
local okey
if (percent_script) then
--local value, top, total, combat, instance = ...
okey, percent = _pcall (percent_script, self.value, top, total, combat, instance, self)
if (not okey) then
_detalhes:Msg ("|cFFFF9900error on custom display function|r:", percent)
return _detalhes:EndRefresh (instance, 0, combat, combat [1])
end
end
else
if (percentage_type == 1) then
percent = _cstr ("%.1f", self.value / total * 100)
@@ -503,7 +517,11 @@
if (not bars_show_data [3]) then
percent = ""
else
percent = percent .. "%"
if (percent) then
percent = percent .. "%"
else
percent = ""
end
end
if (total_script) then
@@ -930,6 +948,9 @@
if (custom_object:IsScripted()) then
if (custom_object.tooltip) then
local func = _detalhes.custom_function_cache [instance.customName .. "Tooltip"]
if (func) then
end
local okey, errortext = _pcall (func, actor, instance.showing, instance)
if (not okey) then
_detalhes:Msg ("|cFFFF9900error on custom display tooltip function|r:", errortext)
classes/classe_others.lua
+2 -2
View File
@@ -518,7 +518,7 @@ function atributo_misc:ReportSingleDebuffUptimeLine (misc_actor, instance)
end
function atributo_misc:DeadAtualizarBarra (morte, qual_barra, colocacao, instancia)
morte ["dead"] = true --> marca que esta tabela é uma tabela de mortes, usado no controla na hora de montar o tooltip
local esta_barra = instancia.barras[qual_barra] --> pega a referência da barra na janela
@@ -539,7 +539,7 @@ function atributo_misc:DeadAtualizarBarra (morte, qual_barra, colocacao, instanc
_setmetatable (morte, {__call = RefreshBarraMorte})
morte._custom = true
end
esta_barra.texto_esquerdo:SetText (colocacao .. ". " .. morte [3]:gsub (("%-.*"), ""))
esta_barra.texto_direita:SetText (morte [6])