From aad2fc895a758a35ccde40fd7db64539908f7c3b Mon Sep 17 00:00:00 2001 From: fuba Date: Sun, 26 Nov 2023 17:07:44 +0100 Subject: [PATCH] added Emerald Dream Raid: Amirdrassil, the Dream's Hope hopefully fixed possible taints, needs more testing! --- IPAInstanceDB.lua | 2 + IPAInstancePortalPinTemplate.lua | 79 ++------------------------------ IPAPinDB.lua | 2 + 3 files changed, 7 insertions(+), 76 deletions(-) diff --git a/IPAInstanceDB.lua b/IPAInstanceDB.lua index 857eded..f339dae 100644 --- a/IPAInstanceDB.lua +++ b/IPAInstanceDB.lua @@ -220,6 +220,8 @@ IPAUIInstanceMapDB = { [1200]={"Vault of the Incarnates", 2, 60, 10}, [1208]={"Aberrus, the Shadowed Crucible", 2, 60, 10}, + + [1207]={"Amirdrassil, the Dream's Hope", 2, 1, 10}, } diff --git a/IPAInstancePortalPinTemplate.lua b/IPAInstancePortalPinTemplate.lua index d0a3a67..934940e 100644 --- a/IPAInstancePortalPinTemplate.lua +++ b/IPAInstancePortalPinTemplate.lua @@ -166,9 +166,8 @@ function IPAInstancePortalProviderPinMixin:OnClick(button) if ( not EncounterJournal ) then EncounterJournal_LoadUI(); end - _G.EncounterJournal:SetScript("OnShow", BugfreeEncounterJournal_OnShow) EncounterJournal_OpenJournal(nil, self.journalInstanceID) - --_G.EncounterJournal:SetScript("OnShow", _G.EncounterJournal_OnShow) + _G.EncounterJournal:SetScript("OnShow", nil) end else -- if self.hub ~= 0, try to use Map Pin itself as Source if (button == "LeftButton" and IsShiftKeyDown() and useWaypoints == true) then @@ -221,9 +220,8 @@ local function WaypointDungeonEntrancePinMixin(self, button) if ( not EncounterJournal ) then EncounterJournal_LoadUI(); end - _G.EncounterJournal:SetScript("OnShow", BugfreeEncounterJournal_OnShow) EncounterJournal_OpenJournal(nil, self.journalInstanceID) - --_G.EncounterJournal:SetScript("OnShow", _G.EncounterJournal_OnShow) + _G.EncounterJournal:SetScript("OnShow", nil) end @@ -231,75 +229,4 @@ local function WaypointDungeonEntrancePinMixin(self, button) AddWaypoint(wp_mapid, wp_x, wp_y, wp_name, useTomTom) end end -_G.DungeonEntrancePinMixin.OnMouseClickAction = WaypointDungeonEntrancePinMixin - --- VERY DIRTY workaround to prevent error on EncounterJournal open?! --- WHY Blizzard... WHY block open EncounterJournal?! -local function BugfreeEncounterJournal_OnShow(self) - self:RegisterEvent("SPELL_TEXT_UPDATE"); - if ( tonumber(GetCVar("advJournalLastOpened")) == 0 ) then - SetCVar("advJournalLastOpened", GetServerTime() ); - end - MainMenuMicroButton_HideAlert(EJMicroButton); - MicroButtonPulseStop(EJMicroButton); - - UpdateMicroButtons(); - PlaySound(SOUNDKIT.IG_CHARACTER_INFO_OPEN); - EncounterJournal_LootUpdate(); - --C_EncounterJournal.OnOpen(); - - if not self.lootJournalView then - EncounterJournal_SetLootJournalView(LOOT_JOURNAL_POWERS); - end - - local instanceSelect = EncounterJournal.instanceSelect; - - --automatically navigate to the current dungeon if you are in one; - local mapID = C_Map.GetBestMapForUnit("player"); - local instanceID = mapID and EJ_GetInstanceForMap(mapID) or 0; - local _, instanceType, difficultyID = GetInstanceInfo(); - if ( EncounterJournal_HasChangedContext(instanceID, instanceType, difficultyID) ) then - EncounterJournal_ResetDisplay(instanceID, instanceType, difficultyID); - EncounterJournal.queuedPortraitUpdate = nil; - elseif ( self.encounter.overviewFrame:IsShown() and EncounterJournal.overviewDefaultRole and not EncounterJournal.encounter.overviewFrame.linkSection ) then - local spec, role; - - spec = GetSpecialization(); - if (spec) then - role = GetSpecializationRole(spec); - else - role = "DAMAGER"; - end - - if ( EncounterJournal.overviewDefaultRole ~= role ) then - EncounterJournal_ToggleHeaders(EncounterJournal.encounter.overviewFrame); - end - end - - if ( EncounterJournal.queuedPortraitUpdate ) then - -- fixes portraits when switching between fullscreen and windowed mode - EncounterJournal.queuedPortraitUpdate = false; - EncounterJournal_UpdatePortraits(); - end - - local tierData = GetEJTierData(EJ_GetCurrentTier()); - if ( not EncounterJournal.suggestTab:IsEnabled() or EncounterJournal.suggestFrame:IsShown() ) then - tierData = GetEJTierData(EJSuggestTab_GetPlayerTierIndex()); - end - instanceSelect.bg:SetAtlas(tierData.backgroundAtlas, true); - - local shouldShowPowerTab, powerID = EJMicroButton:ShouldShowPowerTab(); - if shouldShowPowerTab then - self.LootJournal:SetPendingPowerID(powerID); - EJ_ContentTab_Select(EncounterJournal.LootJournalTab:GetID()); - SetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_FIRST_RUNEFORGE_LEGENDARY_POWER, true); - elseif EncounterJournal.instanceSelect:IsShown() then - EJ_ContentTab_Select(self.selectedTab); - end - - EncounterJournal_CheckAndDisplayLootTab(); - EncounterJournal_CheckAndDisplayTradingPostTab(); - - -- Request raid locks to show the defeated overlay for bosses the player has killed this week. - RequestRaidInfo(); -end \ No newline at end of file +_G.DungeonEntrancePinMixin.OnMouseClickAction = WaypointDungeonEntrancePinMixin \ No newline at end of file diff --git a/IPAPinDB.lua b/IPAPinDB.lua index b87b38e..292211e 100644 --- a/IPAPinDB.lua +++ b/IPAPinDB.lua @@ -655,5 +655,7 @@ IPAUIPinDB = { {64.421785, 58.471715, {1209}}, -- Dawn of the Infinite -- Zaralek Caverns {87.000000, 74.000000, {1208}}, -- Aberrus, the Shadowed Crucible (needs an update for exact coords later!) + -- Emerals Dream + {31.000000, 56.000000, {1207}}, -- Amirdrassil, the Dream's Hope } } \ No newline at end of file