diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 9e7e90e4..ab7e281e 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -3396,7 +3396,7 @@ local frameshake_play = function(parent, shakeObject, scaleDirection, scaleAmpli --update the amount of shake running on this frame parent.__frameshakes.enabled = parent.__frameshakes.enabled + 1 - if (parent:HasScript("OnUpdate") and not parent:GetScript("OnUpdate")) then + if (parent.HasScript and parent:HasScript("OnUpdate") and not parent:GetScript("OnUpdate")) then parent:SetScript("OnUpdate", function()end) end end diff --git a/frames/window_mythicplus/window_end_of_run.lua b/frames/window_mythicplus/window_end_of_run.lua index 96e995d4..34d5708f 100644 --- a/frames/window_mythicplus/window_end_of_run.lua +++ b/frames/window_mythicplus/window_end_of_run.lua @@ -463,7 +463,7 @@ end -- /run _G.DetailsMythicDungeonChartHandler.ShowEndOfMythicPlusPanel() if (CONST_DEBUG_MODE) then - C_Timer.After(3, function() + C_Timer.After(10, function() LoadAddOn("Ascension_MythicPlus"); _G.MythicDungeonFrames.ShowEndOfMythicPlusPanel() end) @@ -818,9 +818,6 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel() end) end) - --/run PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_KEYSTONE_UPGRADE); - --PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_COMPLETE_NO_UPGRADE); - --fin the overall mythic dungeon combat, starting with the current combat ---@type combat local overallMythicDungeonCombat = Details:GetCurrentCombat() @@ -871,7 +868,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel() readyFrame.YouBeatTheTimerLabel:SetFormattedText(MYTHIC_PLUS_COMPLETE_BEAT_TIMER .. " | " .. MYTHIC_PLUS_COMPLETE_KEYSTONE_UPGRADED, Details222.MythicPlus.KeystoneUpgradeLevels) --"You beat the timer!" readyFrame.YouBeatTheTimerLabel.textcolor = "limegreen" --readyFrame.KeystoneUpgradeLabel:SetFormattedText(CHALLENGE_MODE_COMPLETE_KEYSTONE_UPGRADED, Details222.MythicPlus.KeystoneUpgradeLevels) - PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_KEYSTONE_UPGRADE) + PlaySound(SOUNDKIT.UI_CHALLENGEMODE_NEWRECORD) C_Timer.After(0.020, function() --PlaySoundFile([[Interface\AddOns\Details\sounds\bassdrop2.mp3]]) end) @@ -879,7 +876,7 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel() readyFrame.YouBeatTheTimerLabel.textcolor = "white" readyFrame.YouBeatTheTimerLabel.text = MYTHIC_PLUS_COMPLETE_TIME_EXPIRED --"Time expired!" --readyFrame.KeystoneUpgradeLabel.text = MYTHIC_PLUS_COMPLETE_TRY_AGAIN --"Try again! Beat the timer to upgrade your keystone!" - PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_COMPLETE_NO_UPGRADE) + PlaySound(SOUNDKIT.UI_CHALLENGEMODE_WARNING) end readyFrame.RantingLabel.text = "" diff --git a/functions/mythicdungeon/mythicdungeon.lua b/functions/mythicdungeon/mythicdungeon.lua index ab757086..29ae381f 100644 --- a/functions/mythicdungeon/mythicdungeon.lua +++ b/functions/mythicdungeon/mythicdungeon.lua @@ -24,7 +24,7 @@ Details222.MythicPlus.Charts.Listener = mythicDungeonCharts -- ~mythic ~dungeon local DetailsMythicPlusFrame = _G.CreateFrame("frame", "DetailsMythicPlusFrame", UIParent) -DetailsMythicPlusFrame.DevelopmentDebug = false +DetailsMythicPlusFrame.DevelopmentDebug = true --disabling the mythic+ feature if the user is playing in wow classic DetailsMythicPlusFrame:RegisterEvent("MYTHIC_PLUS_STARTED") @@ -405,7 +405,7 @@ end) ---@param combatObject combat function DetailsMythicPlusFrame.SaveMythicPlusStats(combatObject) - local mapChallengeModeID, mythicLevel, time, onTime = CMythicPlusUtil.GetCompletionInfo(true) + local mapChallengeModeID, mythicLevel, time, onTime = MythicPlusUtil.GetCompletionInfo(true) if (mapChallengeModeID) then local statName = "mythicdungeoncompletedDF2"