From 8f36e881469a42a5a8c6a41e66fd380f91a3e523 Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Fri, 10 Mar 2023 19:45:22 -0300 Subject: [PATCH] Mythic+ Clean Up: Removed deprecated option "Always in Combat" --- core/util.lua | 5 ----- frames/window_options2_sections.lua | 9 --------- functions/mythicdungeon.lua | 19 +------------------ functions/profiles.lua | 2 -- 4 files changed, 1 insertion(+), 34 deletions(-) diff --git a/core/util.lua b/core/util.lua index fd741f12..bc763f33 100644 --- a/core/util.lua +++ b/core/util.lua @@ -1140,11 +1140,6 @@ end end end - --mythic dungeon always in combat - if (_detalhes.MythicPlus.Started and _detalhes.mythic_plus.always_in_combat) then - return true - end - --coach feature if (not Details.Coach.Server.IsEnabled()) then if (Details.debug) then diff --git a/frames/window_options2_sections.lua b/frames/window_options2_sections.lua index bf98fdbf..c23bc137 100644 --- a/frames/window_options2_sections.lua +++ b/frames/window_options2_sections.lua @@ -6915,15 +6915,6 @@ do local sectionOptions = { {type = "label", get = function() return Loc["STRING_OPTIONS_GENERAL_ANCHOR"] end, text_template = subSectionTitleTextTemplate}, - {--always in combat - type = "toggle", - get = function() return Details.mythic_plus.always_in_combat end, - set = function(self, fixedparam, value) - Details.mythic_plus.always_in_combat = value - end, - name = "Always in Combat", - desc = "Details won't create new segments for trash or boss and treat the run as a single segment.", - }, {--dedicated segment for bosses type = "toggle", diff --git a/functions/mythicdungeon.lua b/functions/mythicdungeon.lua index 05ad260d..efc3a8d0 100644 --- a/functions/mythicdungeon.lua +++ b/functions/mythicdungeon.lua @@ -475,15 +475,8 @@ function DetailsMythicPlusFrame.BossDefeated(this_is_end_end, encounterID, encou --close the combat if (this_is_end_end) then --player left the dungeon - if (in_combat and _detalhes.mythic_plus.always_in_combat) then - Details:SairDoCombate() - end + --had some deprecated code removed about alweays in combat else - --re-enter in combat if details! is set to always be in combat during mythic plus - if (Details.mythic_plus.always_in_combat) then - Details:EntrarEmCombate() - end - --increase the segment number for the mythic run Details.MythicPlus.SegmentID = Details.MythicPlus.SegmentID + 1 @@ -680,16 +673,6 @@ function DetailsMythicPlusFrame.MythicDungeonStarted() Details:SaveState_CurrentMythicDungeonRun (Details.mythic_dungeon_id, zoneName, currentZoneID, time()+9.7, 1, mythicLevel, ejID, time()) - --start a new combat segment after 10 seconds - if (_detalhes.mythic_plus.always_in_combat) then - C_Timer.After(9.7, function() - if (DetailsMythicPlusFrame.DevelopmentDebug) then - print("Details!", "New segment for mythic dungeon created.") - end - _detalhes:EntrarEmCombate() - end) - end - local name, groupType, difficultyID, difficult = GetInstanceInfo() if (groupType == "party" and Details.overall_clear_newchallenge) then Details.historico:resetar_overall() diff --git a/functions/profiles.lua b/functions/profiles.lua index fe7e05dd..2268f233 100644 --- a/functions/profiles.lua +++ b/functions/profiles.lua @@ -1492,7 +1492,6 @@ local default_global_data = { --mythic plus config mythic_plus = { - always_in_combat = false, -- merge_boss_trash = true, -- delete_trash_after_merge = true, -- --merge_boss_with_trash = false, --this won't be used @@ -1892,7 +1891,6 @@ function Details:ImportProfile (profileString, newProfileName, bImportAutoRunCod --profile imported, set mythic dungeon to default settings local mythicPlusSettings = Details.mythic_plus - mythicPlusSettings.always_in_combat = false mythicPlusSettings.merge_boss_trash = true mythicPlusSettings.delete_trash_after_merge = true mythicPlusSettings.boss_dedicated_segment = true