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

- removed soul capacitor trinket fix (WoD).

Browse Source 
- removed heart seeker fix for kilrogg encounter (WoD).
- added an option to consolidade spells with the same name.
This commit is contained in:
Tercio
2016-09-17 21:43:00 -03:00
parent 3b1f180d2d
commit f7acdd327b
6 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+6 -7
View File
File diff suppressed because one or more lines are too long
classes/classe_damage.lua
+2 -2
View File
@@ -317,8 +317,8 @@
else
return _unpack (_detalhes.class_colors.ARENA_YELLOW)
end
elseif (actor.enemy and not actor.arena_enemy) then
return 0.94117, 0.1, 0.1, 1
--elseif (actor.enemy and not actor.arena_enemy) then
-- return 0.94117, 0.1, 0.1, 1
else
if (not is_player_class [actor.classe] and actor.flag_original and _bit_band (actor.flag_original, 0x00000020) ~= 0) then --> neutral
return _unpack (_detalhes.class_colors.NEUTRAL)
core/parser.lua
+42 -27
View File
@@ -86,7 +86,7 @@
--> ignore deaths
local ignore_death = {}
--> special items
local soul_capacitor = {} --> trinket from Socrethar the Eternal
--local soul_capacitor = {} --> trinket from Socrethar the Eternal --WOD only
local paladin_gbom = {} --greater blessing of might
local shaman_slash = {} --storm slash
local shaman_slash_timers = {} --storm slash
@@ -128,16 +128,20 @@
[184709] = 218617, --warrior rampage
[201364] = 218617, --warrior rampage
[201363] = 218617, --warrior rampage
[222031] = 199547, --deamonhunter ChaosStrike
[200685] = 199552, --deamonhunter Blade Dance
[210155] = 210153, --deamonhunter Death Sweep
[227518] = 201428, --deamonhunter Annihilation
[187727] = 178741, --deamonhunter Immolation Aura
[205164] = 205165, --death knight Crystalline Swords
[193315] = 197834, --rogue Saber Slash
[202822] = 202823, --rogue greed
}
local is_using_spellId_override = false
local WARRIOR_RAMPAGE = {
[184707] = true,
[184709] = true,
[201364] = true,
[201363] = true,
}
local SPELLID_WARRIOR_RAMPAGE = 218617
local SPELLID_SHAMAN_SLASH_AURA = 195222
local SPELLID_SHAMAN_SLASH_DAMAGE = 195256
local SPELLID_PALADIN_GBOM_AURA = 203528
@@ -238,8 +242,8 @@
return parser:SLT_damage (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spelltype, amount, overkill, school, resisted, blocked, absorbed, critical, glacing, crushing, isoffhand)
end
if (WARRIOR_RAMPAGE [spellid]) then
spellid = SPELLID_WARRIOR_RAMPAGE
if (is_using_spellId_override) then
spellid = override_spellId [spellid] or spellid
end
if (spellid == SPELLID_PALADIN_GBOM_DAMAGE) then
@@ -249,14 +253,14 @@
end
--> REMOVE AFTER LEGION LAUNCH
if (soul_capacitor [who_serial]) then
if (soul_capacitor [who_serial]+12 < _tempo) then
--> something went wrong, debuff didn't expired or we didn't saw it going out.
soul_capacitor [who_serial] = nil
else
return
end
end
--if (soul_capacitor [who_serial]) then
-- if (soul_capacitor [who_serial]+12 < _tempo) then
-- --> something went wrong, debuff didn't expired or we didn't saw it going out.
-- soul_capacitor [who_serial] = nil
-- else
-- return
-- end
--end
------------------------------------------------------------------------------------------------
--> check if need start an combat
@@ -866,6 +870,11 @@
end
else
--colocando aqui apenas pois ele confere o override dentro do damage
if (is_using_spellId_override) then
spellid = override_spellId [spellid] or spellid
end
--> actor spells table
local spell = este_jogador.spells._ActorTable [spellid]
if (not spell) then
@@ -895,9 +904,9 @@
--4/22 18:07:54.369 SPELL_SUMMON,Player-3296-009371B2,"Façade-Anasterian(US)",0x514,0x0,Creature-0-3198-1448-2131-90477-0000380DAA,"Blood Globule",0xa28,0x0,180410,"Heart Seeker",0x1
--5/4 15:45:24.222 SPELL_SUMMON,Player-3296-009576DD,"Àlëx-Brill(EU)",0x40514,0x0,Creature-0-2083-1448-25606-90513-000047BE44,"Fel Blood Globule",0xa28,0x0,180413,"Heart Seeker",0x1
if (spellid and (spellid == 180410 or spellid == 180413)) then -- Heart Seeker
return
end
--if (spellid and (spellid == 180410 or spellid == 180413)) then -- Heart Seeker --> WOD Kilrogg encounter
-- return
--end
if (not who_name) then
who_name = "[*] " .. spellName
@@ -1030,6 +1039,10 @@
return parser:SLT_healing (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spelltype, amount, overhealing, absorbed, critical, is_shield)
end
if (is_using_spellId_override) then
spellid = override_spellId [spellid] or spellid
end
--[[statistics]]-- _detalhes.statistics.heal_calls = _detalhes.statistics.heal_calls + 1
local cura_efetiva = absorbed
@@ -1297,8 +1310,8 @@
ignore_death [who_name] = true
return
elseif (spellid == 184293) then --> WOD trinket: Soul Capacitor T18 (soul eruption 184559) --REMOVE ON LEGION LAUNCH
soul_capacitor [who_serial] = _tempo
--elseif (spellid == 184293) then --> WOD trinket: Soul Capacitor T18 (soul eruption 184559) --REMOVE ON LEGION LAUNCH
-- soul_capacitor [who_serial] = _tempo
elseif (spellid == SPELLID_SHAMAN_SLASH_AURA) then --shaman slash
--> handle the buff on parser time
@@ -1683,10 +1696,10 @@
end
end
if (spellid == 184293) then --> WOD trinket: Soul Capacitor T18 REMOVE ON LEGION LAUNCH
soul_capacitor [who_serial] = nil
--if (spellid == 184293) then --> WOD trinket: Soul Capacitor T18 REMOVE ON LEGION LAUNCH
-- soul_capacitor [who_serial] = nil
elseif (spellid == SPELLID_SHAMAN_SLASH_AURA) then --shaman slash
if (spellid == SPELLID_SHAMAN_SLASH_AURA) then --shaman slash
--as @Kihra from WCL mentioned, slash has a travel time, the hit may land after the buff has gone
local delay_timer = _detalhes:ScheduleTimer ("HandleSlashUnbuff", 2.5, shaman_slash, who_serial, alvo_serial)
shaman_slash_timers [who_serial] = shaman_slash_timers [who_serial] or {}
@@ -4233,6 +4246,8 @@ SPELL_POWER_OBSOLETE2 = 15;
_hook_interrupt = false
end
is_using_spellId_override = _detalhes.override_spellids
return _detalhes:ClearParserCache()
end
functions/profiles.lua
+1
View File
@@ -998,6 +998,7 @@ local default_profile = {
use_battleground_server_parser = true,
force_activity_time_pvp = true,
death_tooltip_width = 300,
override_spellids = false,
--> skins
standard_skin = false,
functions/spellcache.lua
+2 -16
View File
@@ -86,29 +86,15 @@ do
[88082] = {name = GetSpellInfo (88082) .. " (" .. Loc ["STRING_MIRROR_IMAGE"] .. ")"}, --> Mirror Image's Fireball (mage)
[94472] = {name = GetSpellInfo (94472) .. " (" .. Loc ["STRING_CRITICAL_ONLY"] .. ")"}, --> Atonement critical hit (priest)
--[140816] = {name = GetSpellInfo (140816) .. " (" .. Loc ["STRING_CRITICAL_ONLY"] .. ")"}, --> Power Word: Solace critical hit (priest)
[33778] = {name = GetSpellInfo (33778) .. " (bloom)"}, --lifebloom (bloom)
[121414] = {name = GetSpellInfo (121414) .. " (Glaive #1)"}, --> glaive toss (hunter)
[120761] = {name = GetSpellInfo (120761) .. " (Glaive #2)"}, --> glaive toss (hunter)
--[108686] = {name = GetSpellInfo (108686) .. " (" .. GetSpellInfo (108683) .. ")" }, --> immolate (brimstone)
--[108685] = {name = GetSpellInfo (108685) .. " (" .. GetSpellInfo (108683) .. ")" }, --> conflagrate (brimstone)
--[114654] = {name = GetSpellInfo (114654) .. " (" .. GetSpellInfo (108683) .. ")" }, --> incinetate (brimstone)
[213786] = {name = GetSpellInfo (213786) .. " (trinket)"},
[214350] = {name = GetSpellInfo (214350) .. " (trinket)"},
}
-- removed on warlords of draenor:
-- [77451] = {name = GetSpellInfo (77451) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> lava burst (shaman)
-- [45284] = {name = GetSpellInfo (45284) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> lightningbolt (shaman)
-- [45297] = {name = GetSpellInfo (45297) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> chain lightning (shaman)
-- [131079] = {name = GetSpellInfo (131079) .. " (" .. GetSpellInfo (12472) .. ")"}, --> frostbolt with icy veins glyph (mage)
-- [131080] = {name = GetSpellInfo (131080) .. " (" .. GetSpellInfo (12472) .. ")"}, --> ice lance with icy veins glyph (mage)
-- [131081] = {name = GetSpellInfo (131081) .. " (" .. GetSpellInfo (12472) .. ")"}, --> frostfire with icy veins glyph (mage)
-- [124464] = {name = GetSpellInfo (124464) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> shadow word: pain mastery proc (priest)
-- [124465] = {name = GetSpellInfo (124465) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> vampiric touch mastery proc (priest)
-- [124468] = {name = GetSpellInfo (124468) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> mind flay mastery proc (priest)
-- [124469] = {name = GetSpellInfo (124469) .. " (" .. Loc ["STRING_MASTERY"] .. ")"}, --> mind sear mastery proc (priest)
function _detalhes:UserCustomSpellUpdate (index, name, icon)
local t = _detalhes.savedCustomSpells [index]
gumps/janela_options.lua
+13 -1
View File
@@ -3439,8 +3439,20 @@ function window:CreateFrame15()
titulo_customspells:SetPoint (10, window.title_y_pos)
titulo_customspells_desc:SetPoint (10, window.title_y_pos2)
panel:SetPoint (10, -80)
panel:SetPoint (10, -70)
--> consilidade spells
g:NewLabel (frame15, _, "$parentConsolidadeSpellsLabel", "ConsolidadeSpellsLabel", Loc ["STRING_OPTIONSMENU_SPELLS_CONSOLIDATE"], "GameFontHighlightLeft")
g:NewSwitch (frame15, _, "$parentConsolidadeSpellsSwitch", "ConsolidadeSpellsSwitch", 60, 20, nil, nil, _detalhes.override_spellids, nil, nil, nil, nil, options_switch_template)
frame15.ConsolidadeSpellsLabel:SetPoint ("left", frame15.ConsolidadeSpellsSwitch, "right", 3)
frame15.ConsolidadeSpellsSwitch:SetAsCheckBox()
frame15.ConsolidadeSpellsSwitch.OnSwitch = function (self, instance, value)
_detalhes.override_spellids = value
_detalhes:UpdateParserGears()
end
window:CreateLineBackground2 (frame15, "ConsolidadeSpellsSwitch", "ConsolidadeSpellsLabel", "")
frame15.ConsolidadeSpellsSwitch:SetPoint (10, -55)
_detalhes:SetFontSize (frame15.ConsolidadeSpellsLabel, 12)
end