- Fixed some issues with tooltiops popup when the user press SHIFT.

- Now is possible to change the bar durating when selecting Cast Start trigger on Details! Forge.
- Kil'Jaeden adds should be consolidated into only one actor instead of having one for each player targeted.
This commit is contained in:
Tercio
2017-07-12 13:39:04 -03:00
parent 80e18d3841
commit 4dbd9ceba4
4 changed files with 55 additions and 20 deletions
+8 -7
View File
File diff suppressed because one or more lines are too long
+27 -2
View File
@@ -177,6 +177,7 @@
local _recording_buffs_and_debuffs = false
--> in combat flag
local _in_combat = false
local _current_encounter_id
--> deathlog
local _death_event_amt = 16
--> hooks
@@ -190,7 +191,10 @@
local _hook_battleress_container = _detalhes.hooks ["HOOK_BATTLERESS"]
local _hook_interrupt_container = _detalhes.hooks ["HOOK_INTERRUPT"]
--> kil jaeden encounter:
--> REMOVE THIS ON 7.3 RELEASE
local _encounter_kiljaeden_eruptingreflection_loc = "Erupting Reflection"
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> internal functions
@@ -277,6 +281,22 @@
return
end
--Erupting Reflection on kiljaeden encounter on ToS
--REMOVE THIS ON 7.3 RELEASE
if (_current_encounter_id == 2051) then --2051 = kiljaeden
if (alvo_serial:match ("^Creature%-0%-%d+%-%d+%-%d+%-119206%-%w+$")) then
if (_encounter_kiljaeden_eruptingreflection_loc == "Erupting Reflection") then
_encounter_kiljaeden_eruptingreflection_loc = GetSpellInfo (236710)
end
alvo_name = _encounter_kiljaeden_eruptingreflection_loc
elseif (who_serial:match ("^Creature%-0%-%d+%-%d+%-%d+%-119206%-%w+$")) then
if (_encounter_kiljaeden_eruptingreflection_loc == "Erupting Reflection") then
_encounter_kiljaeden_eruptingreflection_loc = GetSpellInfo (236710)
end
who_name = _encounter_kiljaeden_eruptingreflection_loc
end
end
--> Second try with :find
-- it's 20% faster when comparing Npcs serials, but very slow when comparing other things.
--if (alvo_serial:find ("-76933-")) then
@@ -3938,6 +3958,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
local encounterID, encounterName, difficultyID, raidSize = _select (1, ...)
--print ("START", encounterID, encounterName, difficultyID, raidSize)
_current_encounter_id = encounterID
if (_in_combat and not _detalhes.tabela_vigente.is_boss) then
_detalhes:SairDoCombate()
@@ -4003,6 +4025,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
_detalhes:Msg ("(debug) |cFFFFFF00ENCOUNTER_END|r event triggered.")
end
_current_encounter_id = nil
if (_detalhes.zone_type == "party") then
if (_detalhes.debug) then
_detalhes:Msg ("(debug) the zone type is 'party', ignoring ENCOUNTER_END.")
@@ -4077,7 +4101,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
function _detalhes.parser_functions:PLAYER_REGEN_ENABLED (...)
_detalhes.LatestCombatDone = GetTime()
-- print ("REGEN ENABLED", GetTime())
_current_encounter_id = nil
--> playing alone, just finish the combat right now
if (not _IsInGroup() and not IsInRaid()) then
+13 -11
View File
@@ -1084,18 +1084,16 @@
["auto"] = false,
["animation"] = {
["start"] = {
["type"] = "none",
["duration_type"] = "seconds",
["type"] = "preset",
["preset"] = "grow",
},
["main"] = {
["type"] = "none",
["duration_type"] = "seconds",
["type"] = "preset",
["preset"] = "pulse",
},
["finish"] = {
["duration_type"] = "seconds",
["type"] = "none",
["duration_type"] = "seconds",
},
},
["trigger"] = {
@@ -1514,6 +1512,7 @@
add.trigger.spellId = tostring (spellid)
add.trigger.spellName = spellname
add.trigger.subeventSuffix = "_CAST_START"
add.trigger.duration = stacksize
if (not use_spellid) then
add.trigger.use_spellName = true
add.trigger.use_spellId = false
@@ -1803,7 +1802,8 @@
aura_on:SetPoint ("left", aura_on_label, "right", 2, 0)
--stack
local stack_slider = fw:NewSlider (f, f, "$parentStackSlider", "StackSlider", 150, 20, 0, 30, 1, 0)
local stack_slider = fw:NewSlider (f, f, "$parentStackSlider", "StackSlider", 150, 20, 0, 30, 1, 0, true)
stack_slider.useDecimals = true
local stack_label = fw:CreateLabel (f, "Stack Size: ", nil, nil, "GameFontNormal")
stack_slider:SetPoint ("left", stack_label, "right", 2, 0)
stack_slider.tooltip = "Minimum amount of stacks to trigger the aura."
@@ -2085,23 +2085,25 @@
if (aura_type == "icon") then
aura_text_label:SetText ("Icon Text: ")
icon_size_label:SetText ("Width/Height: ")
f.IconSizeSlider:SetValue (64)
elseif (aura_type == "text") then
aura_text_label:SetText ("Text: ")
icon_size_label:SetText ("Font Size: ")
f.IconSizeSlider:SetValue (12)
elseif (aura_type == "aurabar") then
aura_text_label:SetText ("Left Text: ")
icon_size_label:SetText ("Bar Width: ")
f.IconSizeSlider:SetValue (250)
end
if (trigger >= 1 and trigger <= 19) then --buff and debuff
stack_label:SetText ("Stack Size: ")
elseif (trigger >= 20 and trigger <= 29) then --cast start and end
stack_label:SetText ("Stack Size: ")
f.StackSlider:Disable()
elseif (trigger >= 20 and trigger <= 29) then --cast end cast start
stack_label:SetText ("Duration: ")
f.StackSlider:SetValue (2)
elseif (trigger >= 30 and trigger <= 39) then --boss mods
stack_label:SetText ("Remaining Time:")
+7
View File
@@ -1816,7 +1816,14 @@ local unSnapButtonOnLeave = function (self)
end
end
--> this should run only when the mouse is over a instance bar
local shift_monitor = function (self)
if (not self:IsMouseOver()) then
self:SetScript ("OnUpdate", shift_monitor)
return
end
if (_IsShiftKeyDown()) then
if (not self.showing_allspells) then
self.showing_allspells = true