Skip to content

Commit

Permalink
added Emerald Dream Raid: Amirdrassil, the Dream's Hope
Browse files Browse the repository at this point in the history
hopefully fixed possible taints, needs more testing!
  • Loading branch information
fuba82 committed Nov 26, 2023
1 parent 0bb9299 commit aad2fc8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 76 deletions.
2 changes: 2 additions & 0 deletions IPAInstanceDB.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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},

}

Expand Down
79 changes: 3 additions & 76 deletions IPAInstancePortalPinTemplate.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -221,85 +220,13 @@ 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

if (button == "LeftButton" and IsShiftKeyDown() and useWaypoints == true) and wp_mapid and wp_x and wp_y and wp_name then
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
_G.DungeonEntrancePinMixin.OnMouseClickAction = WaypointDungeonEntrancePinMixin
2 changes: 2 additions & 0 deletions IPAPinDB.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

0 comments on commit aad2fc8

Please sign in to comment.