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

- Added Rallying Cry on warrior cooldown list.

Browse Source 
- Healthstone now is considered both healing and cooldown attributes.
- Fixed the sort method for custom displays, now the bars wuth same value is correctly sort by alphabetical.
- Fixed non-combat switch by role where changing role wasn't changing the attribute.
- Fixed the icons hiding and showing with Alpha Modify Types.
- NickTag now don't check if a received name is invalid.
This commit is contained in:
tercio
2014-06-27 22:10:13 -03:00
parent 4fca65b5f3
commit eb87774f40
12 changed files with 152 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/classe_custom.lua
+13 -13
View File
@@ -129,7 +129,7 @@ function atributo_custom:RefreshWindow (instance, combat, force, export)
total = atributo_custom._TargetActorsProcessedTotal
top = atributo_custom._TargetActorsProcessedTop
end
if (amount == 0) then
if (force) then
if (instance:IsGroupMode()) then
@@ -163,7 +163,6 @@ end
--> refresh functions
function atributo_custom:Refresh (instance, instance_container, combat, force, total, top)
local qual_barra = 1
local barras_container = instance.barras
local percentage_type = instance.row_info.percent_type
@@ -277,7 +276,6 @@ end
atributo_custom._TargetActorsProcessedAmt = 0
atributo_custom._TargetActorsProcessedTotal = 0
atributo_custom._TargetActorsProcessedTop = 0
instance_container:ResetCustomActorContainer()
end
@@ -321,6 +319,7 @@ end
instance_container:SetValue (actor, actortotal)
end
end
end
@@ -465,7 +464,7 @@ end
for _, targetactor in _ipairs (spell.targets._ActorTable) do
if (roster [targetactor.nome]) then
--> add amount
instance_container:AddValue (targetactor, targetactor.total)
instance_container:AddValue (targetactor, targetactor.total, true)
atributo_custom._TargetActorsProcessedTotal = atributo_custom._TargetActorsProcessedTotal + targetactor.total
--> add to processed container
if (not atributo_custom._TargetActorsProcessed [targetactor.nome]) then
@@ -481,7 +480,7 @@ end
if (targetactor) then
targetactor = spell.targets._ActorTable [targetactor]
--> add amount
instance_container:AddValue (targetactor, targetactor.total)
instance_container:AddValue (targetactor, targetactor.total, true)
atributo_custom._TargetActorsProcessedTotal = atributo_custom._TargetActorsProcessedTotal + targetactor.total
--> add to processed container
if (not atributo_custom._TargetActorsProcessed [targetactor.nome]) then
@@ -496,7 +495,7 @@ end
if (targetactor) then
targetactor = spell.targets._ActorTable [targetactor]
--> add amount
instance_container:AddValue (targetactor, targetactor.total)
instance_container:AddValue (targetactor, targetactor.total, true)
atributo_custom._TargetActorsProcessedTotal = atributo_custom._TargetActorsProcessedTotal + targetactor.total
--> add to processed container
if (not atributo_custom._TargetActorsProcessed [targetactor.nome]) then
@@ -644,7 +643,7 @@ end
for _, targetactor in _ipairs (spell.targets._ActorTable) do
if (roster [targetactor.nome]) then
--> add amount
instance_container:AddValue (targetactor, targetactor.total)
instance_container:AddValue (targetactor, targetactor.total, true)
atributo_custom._TargetActorsProcessedTotal = atributo_custom._TargetActorsProcessedTotal + targetactor.total
--> add to processed container
if (not atributo_custom._TargetActorsProcessed [targetactor.nome]) then
@@ -660,7 +659,7 @@ end
if (targetactor) then
targetactor = spell.targets._ActorTable [targetactor]
--> add amount
instance_container:AddValue (targetactor, targetactor.total)
instance_container:AddValue (targetactor, targetactor.total, true)
atributo_custom._TargetActorsProcessedTotal = atributo_custom._TargetActorsProcessedTotal + targetactor.total
--> add to processed container
if (not atributo_custom._TargetActorsProcessed [targetactor.nome]) then
@@ -675,7 +674,7 @@ end
if (targetactor) then
targetactor = spell.targets._ActorTable [targetactor]
--> add amount
instance_container:AddValue (targetactor, targetactor.total)
instance_container:AddValue (targetactor, targetactor.total, true)
atributo_custom._TargetActorsProcessedTotal = atributo_custom._TargetActorsProcessedTotal + targetactor.total
--> add to processed container
if (not atributo_custom._TargetActorsProcessed [targetactor.nome]) then
@@ -754,9 +753,9 @@ end
end
local row_value = _math_floor ((self.value / top) * 100)
--tooltip function--
-- update tooltip function--
actor_class_color_r, actor_class_color_g, actor_class_color_b = self:GetBarColor()
self:RefreshBarra2 (row, instance, previous_table, is_forced, row_value, index, row_container)
@@ -926,7 +925,7 @@ end
function atributo_custom:ResetCustomActorContainer()
for _, actor in _ipairs (self._ActorTable) do
actor.value = 0
actor.value = _detalhes:GetAlphabeticalOrderNumber (actor.nome)
end
end
@@ -936,6 +935,7 @@ end
end
function atributo_custom:AddValue (actor, actortotal, checktop)
--print (debugstack())
local actor_table = self:GetActorTable (actor)
actor_table.my_actor = actor
actor_table.value = actor_table.value + actortotal
classes/classe_instancia.lua
+33 -4
View File
@@ -1179,21 +1179,35 @@ function _detalhes:SwitchTo (switch_table, nosave)
end
--backtable indexes: [1]: mode [2]: attribute [3]: sub attribute [4]: segment [5]: raidmode index [6]: solomode index
function _detalhes:CheckSwitchOnCombatEnd (nowipe)
function _detalhes:CheckSwitchOnCombatEnd (nowipe, warning)
self:SwitchBack()
local role = _UnitGroupRolesAssigned ("player")
local got_switch = false
if (role == "DAMAGER" and self.switch_damager) then
self:SwitchTo (self.switch_damager)
got_switch = true
elseif (role == "HEALER" and self.switch_healer) then
self:SwitchTo (self.switch_healer)
got_switch = true
elseif (role == "TANK" and self.switch_tank) then
self:SwitchTo (self.switch_tank, true)
got_switch = true
elseif (role == "NONE" and _detalhes.last_assigned_role ~= "NONE") then
self:SwitchBack()
got_switch = true
end
if (warning and got_switch) then
local attribute_name = self:GetInstanceAttributeText()
self:InstanceAlert (string.format (Loc ["STRING_SWITCH_WARNING"], attribute_name), {[[Interface\AddOns\Details\images\sword]], 18, 18, false}, 4)
end
if (self.switch_all_roles_after_wipe and not nowipe) then
@@ -1205,36 +1219,51 @@ function _detalhes:CheckSwitchOnCombatEnd (nowipe)
end
function _detalhes:CheckSwitchOnLogon()
function _detalhes:CheckSwitchOnLogon (warning)
for index, instancia in ipairs (_detalhes.tabela_instancias) do
if (instancia.ativa) then
instancia:CheckSwitchOnCombatEnd (true)
instancia:CheckSwitchOnCombatEnd (true, warning)
end
end
end
function _detalhes:CheckSwitchOnCombatStart()
function _detalhes:CheckSegmentForSwitchOnCombatStart()
end
function _detalhes:CheckSwitchOnCombatStart (check_segment)
self:SwitchBack()
local all_roles = self.switch_all_roles_in_combat
local role = _UnitGroupRolesAssigned ("player")
local got_switch = false
if (role == "DAMAGER" and self.switch_damager_in_combat) then
self:SwitchTo (self.switch_damager_in_combat)
got_switch = true
elseif (role == "HEALER" and self.switch_healer_in_combat) then
self:SwitchTo (self.switch_healer_in_combat)
got_switch = true
elseif (role == "TANK" and self.switch_tank_in_combat) then
self:SwitchTo (self.switch_tank_in_combat)
got_switch = true
elseif (self.switch_all_roles_in_combat) then
self:SwitchTo (self.switch_all_roles_in_combat)
got_switch = true
end
if (check_segment and got_switch) then
if (self:GetSegment() ~= 0) then
self:TrocaTabela (0)
end
end
end
function _detalhes:ExportSkin()