From 0ac0391767e4e78028a813f95d7d8bb9238301fc Mon Sep 17 00:00:00 2001 From: Flamanis Date: Sat, 25 Mar 2023 16:28:24 -0500 Subject: [PATCH 1/2] Merge attonement with crit, and contrition with crit. --- core/parser.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/parser.lua b/core/parser.lua index 445540d0..7181883e 100755 --- a/core/parser.lua +++ b/core/parser.lua @@ -322,6 +322,8 @@ [45284] = 188196, --shaman lightining bolt overloaded [228361] = 228360, --shadow priest void erruption + [94472] = 81751, --disc priest attonement and crit. Crits use separate id. + [281469] = 270501, --disc priest contrition attonement and crit. Crits use separate id. } end From bc4aa50343eb0ae4a3daa9e683abce02a09b11cb Mon Sep 17 00:00:00 2001 From: Flamanis Date: Sun, 26 Mar 2023 14:20:48 -0500 Subject: [PATCH 2/2] Add option to Combat Log section for merging critical heals --- core/parser.lua | 16 ++++++++++++++-- frames/window_options2_sections.lua | 13 +++++++++++++ functions/profiles.lua | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/core/parser.lua b/core/parser.lua index 7181883e..55412176 100755 --- a/core/parser.lua +++ b/core/parser.lua @@ -322,8 +322,7 @@ [45284] = 188196, --shaman lightining bolt overloaded [228361] = 228360, --shadow priest void erruption - [94472] = 81751, --disc priest attonement and crit. Crits use separate id. - [281469] = 270501, --disc priest contrition attonement and crit. Crits use separate id. + } end @@ -6036,6 +6035,19 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1 override_spellId[403257] = nil --Searing Smokey Stone end + if (Details.combat_log.merge_critical_heals) then + override_spellId[94472] = 81751, --disc priest attonement and crit. Crits use separate id. + override_spellId[281469] = 270501, --disc priest contrition attonement and crit. Crits use separate id. + override_spellId[388025] = 388024, --MW monk Ancient Teachings, heals from damage, crit and normal are separate. + override_spellId[389325] = 389328, --MW monk Awakened Faeline, ^ + else + override_spellId[94472] = nil, --disc priest attonement and crit. Crits use separate id. + override_spellId[281469] = nil, --disc priest contrition attonement and crit. Crits use separate id. + override_spellId[388025] = nil, --MW monk Ancient Teachings, heals from damage, crit and normal are separate. + override_spellId[389325] = nil, --MW monk Awakened Faeline, ^ + end + + damage_cache = setmetatable({}, _detalhes.weaktable) damage_cache_pets = setmetatable({}, _detalhes.weaktable) damage_cache_petsOwners = setmetatable({}, _detalhes.weaktable) diff --git a/frames/window_options2_sections.lua b/frames/window_options2_sections.lua index c5a5351a..4737f58d 100644 --- a/frames/window_options2_sections.lua +++ b/frames/window_options2_sections.lua @@ -7035,6 +7035,19 @@ do boxfirst = true, }, + {--merge healing criticals + type = "toggle", + get = function() return Details.combat_log.merge_critical_heals end, + set = function(self, fixedparam, value) + Details.combat_log.merge_critical_heals = value + afterUpdate() + Details:ClearParserCache() + end, + name = "Merge Critical Heals", + desc = "Merges spells like Atonement and Awakened Faeline with their critical damage component.", + boxfirst = true, + }, + {type = "blank"}, {type = "label", get = function() return "Class Options:" end, text_template = subSectionTitleTextTemplate}, diff --git a/functions/profiles.lua b/functions/profiles.lua index 88f32e88..a2dde70c 100644 --- a/functions/profiles.lua +++ b/functions/profiles.lua @@ -1149,6 +1149,7 @@ local default_player_data = { inverse_deathlog_overalldata = false, track_hunter_frenzy = false, merge_gemstones_1007 = false, + merge_critical_heals = false, }, --this is used by the new data capture for charts