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

Full Revamp on Auto Hide Settings

Browse Source
This commit is contained in:
Tercio Jose
2020-06-21 18:56:17 -03:00
parent fe702cf97f
commit 2d40243d25
14 changed files with 481 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/control.lua
-2
View File
@@ -412,7 +412,6 @@
--> hide / alpha / switch in combat
for index, instancia in ipairs (_detalhes.tabela_instancias) do
if (instancia.ativa) then
--instancia:SetCombatAlpha (nil, nil, true) --passado para o regen disable
instancia:CheckSwitchOnCombatStart (true)
end
end
@@ -884,7 +883,6 @@
--> hide / alpha in combat
for index, instancia in ipairs (_detalhes.tabela_instancias) do
if (instancia.ativa) then
--instancia:SetCombatAlpha (nil, nil, true) --passado para o regen enabled
if (instancia.auto_switch_to_old) then
instancia:CheckSwitchOnCombatEnd()
end
core/parser.lua
+10 -9
View File
@@ -4379,8 +4379,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
_detalhes.last_zone_type = zoneType
for index, instancia in ipairs (_detalhes.tabela_instancias) do
if (instancia.ativa and instancia.hide_in_combat_type ~= 1) then --> 1 = none, we doesn't need to call
instancia:SetCombatAlpha (nil, nil, true)
if (instancia.ativa) then
instancia:AdjustAlphaByContext(true)
end
end
end
@@ -4672,8 +4672,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
end
for index, instancia in ipairs (_detalhes.tabela_instancias) do
if (instancia.ativa and instancia.hide_in_combat_type ~= 1) then --> 1 = none, we doesn't need to call
instancia:SetCombatAlpha (nil, nil, true)
if (instancia.ativa) then --> 1 = none, we doesn't need to call
instancia:AdjustAlphaByContext(true)
end
end
@@ -4757,8 +4757,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
end
for index, instancia in ipairs (_detalhes.tabela_instancias) do
if (instancia.ativa and instancia.hide_in_combat_type ~= 1) then --> 1 = none, we doesn't need to call
instancia:SetCombatAlpha (nil, nil, true)
if (instancia.ativa) then --> 1 = none, we doesn't need to call
instancia:AdjustAlphaByContext(true)
end
end
@@ -5033,7 +5033,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
_detalhes:IniciarColetaDeLixo (true)
_detalhes:WipePets()
_detalhes:SchedulePetUpdate (1)
_detalhes:InstanceCall (_detalhes.SetCombatAlpha, nil, nil, true)
_detalhes:InstanceCall (_detalhes.AdjustAlphaByContext)
_detalhes:CheckSwitchOnLogon()
_detalhes:CheckVersion()
_detalhes:SendEvent ("GROUP_ONENTER")
@@ -5053,7 +5054,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
_detalhes:WipePets()
_detalhes:SchedulePetUpdate (1)
_table_wipe (_detalhes.details_users)
_detalhes:InstanceCall (_detalhes.SetCombatAlpha, nil, nil, true)
_detalhes:InstanceCall (_detalhes.AdjustAlphaByContext)
_detalhes:CheckSwitchOnLogon()
_detalhes:SendEvent ("GROUP_ONLEAVE")
@@ -5202,7 +5203,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
if (_detalhes.debug) then
_detalhes:Msg ("(debug 2) restoring windows after Pet Battle.")
end
instance:SetCombatAlpha (nil, nil, true)
instance:AdjustAlphaByContext(true)
end
end
end
core/util.lua
+1 -4
View File
@@ -1209,10 +1209,6 @@ end
function gump:Fade (frame, tipo, velocidade, parametros)
--if (frame.GetObjectType and frame:GetObjectType() == "Frame" and frame.GetName and type (frame:GetName()) == "string" and frame:GetName():find ("DetailsBaseFrame")) then
-- print (debugstack())
--end
if (_type (frame) == "table") then
if (frame.meu_id) then --> ups, � uma inst�ncia
@@ -1281,6 +1277,7 @@ end
frame.fadeInfo.finishedArg1 = frame
elseif (_upper (tipo) == "OUT") then --> aparecer
if (frame:GetAlpha() == 1 and not frame.hidden and not frame.fading_in) then --> ja esta na tela
return
elseif (frame.fading_out) then --> j� ta com fading out