Skip to content

Feature: Add Dragonflight Expansion Summary & TWW Delves tracking #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HectorZaGa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feature: Add Dragonflight Expansion Summary & TWW Delves tracking #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Art/ExpansionLandingPage/MajorFactionIcons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 31 additions & 19 deletions Modules/ExpansionLandingPage/Basic.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,24 +553,35 @@ do --Atlas
local FACTION_ICONS = "Interface/AddOns/Plumber/Art/ExpansionLandingPage/MajorFactionIcons.png";
local FACTION_ICONS_COORDS = {
--[factionID] = {icon l, r, t, b, highlight l, r, t, b}
[2590] = {0 , 128, 0, 128}, --Council of Dornogal
[2594] = {128, 256, 0, 128}, --The Assembly of the Deeps
[2570] = {256, 384, 0, 128}, --Hallowfall Arathi
[2600] = {384, 512, 0, 128}, --Severed Threads
[2653] = {512, 640, 0, 128}, --Cartels of Undermine
[2685] = {640, 768, 0, 128}, --Gallagio Loyalty Rewards Club
[2688] = {768, 896, 0, 128}, --Flame's Radiance
[2658] = {896, 1024, 0, 128}, --The K'aresh Trust
[2736] = {0 , 128, 256, 384}, --Manaforge Vandals

[2710] = {128, 256, 256, 384}, --Silvermoon Court
[2696] = {256, 384, 256, 384}, --Amani Tribe
[2704] = {384, 512, 256, 384}, --Hara'ti
[2699] = {512, 640, 256, 384}, --The Singularity

[2764] = {640, 768, 256, 384}, --Prey
[2742] = {768, 896, 256, 384}, --Delves
[2792] = {896, 1024, 256, 384}, --Ritual Sites
---- DF ----
[2507] = {0 , 128, 0, 128}, --Dragonscale Expedition
[2503] = {128, 256, 0, 128}, --Maruuk Centaur
[2511] = {256, 384, 0, 128}, --Iskaara Tuskarr
[2510] = {384, 512, 0, 128}, --Valdrakken Accord
[2564] = {512, 640, 0, 128}, --Loamm Niffen
[2574] = {640, 768, 0, 128}, --Dream Wardens
[2593] = {768, 896, 0, 128}, --Plunderstorm (Keg Leg's Crew)

---- TWW ----
[2590] = {0 , 128, 256, 384}, --Council of Dornogal
[2594] = {128, 256, 256, 384}, --The Assembly of the Deeps
[2570] = {256, 384, 256, 384}, --Hallowfall Arathi
[2600] = {384, 512, 256, 384}, --Severed Threads
[2653] = {512, 640, 256, 384}, --Cartels of Undermine
[2685] = {640, 768, 256, 384}, --Gallagio Loyalty Rewards Club
[2688] = {768, 896, 256, 384}, --Flame's Radiance
[2658] = {896, 1024, 256, 384}, --The K'aresh Trust
[2722] = {768, 896, 512, 640}, --Delves

---- MIDNIGHT ----
[2736] = {0 , 128, 512, 640}, --Manaforge Vandals
[2710] = {128, 256, 512, 640}, --Silvermoon Court
[2696] = {256, 384, 512, 640}, --Amani Tribe
[2704] = {384, 512, 512, 640}, --Hara'ti
[2699] = {512, 640, 512, 640}, --The Singularity
[2764] = {640, 768, 512, 640}, --Prey
[2742] = {768, 896, 512, 640}, --Delves
[2792] = {896, 1024, 512, 640}, --Ritual Sites
};

local function SetTextureDimension(textureObject, file, width, height, l, r, t, b, useTrilinearFilter)
Expand Down Expand Up @@ -1717,13 +1728,14 @@ do --Expansion Select
local ExpansionList;
local CurrentExpansionID;
local ExpansionData = {
[10] = {name = EXPANSION_NAME9}, --DF
[11] = {name = EXPANSION_NAME10}, --TWW
[12] = {name = EXPANSION_NAME11, isWIP = false}, --MID
[5] = {name = EXPANSION_NAME4}, --MOP
};

if addon.IS_MIDNIGHT then
ExpansionList = {11, 12};
ExpansionList = {10, 11, 12};
else
ExpansionList = {5};
end
Expand Down
9 changes: 9 additions & 0 deletions Modules/ExpansionLandingPage/EncounterData.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,15 @@ LandingPageUtil.GetDifficultyName = GetEJDifficultyString;


do
local DF_EncounterTabInfo = {
JournalInstanceIDs = {
1207, --Amirdrassil, the Dream's Hope
1208, --Aberrus, the Shadowed Crucible
1200, --Vault of the Incarnates
},
};
LandingPageUtil.AddExpansionData(10, "encounter", DF_EncounterTabInfo);

local TWW_EncounterTabInfo = {
JournalInstanceIDs = {
1302, --Manaforge Omega
Expand Down
1 change: 1 addition & 0 deletions Modules/ExpansionLandingPage/ExpansionLandingPage_Retail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<Script file="Retail/ResourceList.lua"/>
<Script file="Retail/TWW_Activity.lua"/>
<Script file="Retail/MID_Activity.lua"/>
<Script file="Retail/DF_Activity.lua"/>
<Script file="Retail/TraitFrame.lua"/>

<!--Include file="LegionRemix/LegionRemix.xml"/-->
Expand Down
90 changes: 86 additions & 4 deletions Modules/ExpansionLandingPage/FactionUtil.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ local OverrideFactionInfo = {
barColor = {215/255, 160/255, 65/255},
},

[2744] = { --Valeera Sanguinar
barColor = {242/255, 141/255, 152/255},
},
[2744] = { --Valeera Sanguinar
barColor = {242/255, 141/255, 152/255},
},

[2770] = { --Slayer's Duellum
barColor = {56/255, 184/255, 255/255},
Expand Down Expand Up @@ -149,6 +149,59 @@ local OverrideFactionInfo = {
barColor = {197/255, 142/255, 255/255},
--rewardQuestID = 85109,
},

[2722] = { --Delves S3
barColor = {215/255, 160/255, 65/255},
},

[2640] = { --Brann Bronzebeard
barColor = {1/255, 185/255, 27/255},
},
Comment on lines +157 to +159

---- DF ----
[2507] = { --Dragonscale Expedition
barColor = {227/255, 86/255, 93/255},
},

[2511] = { --Iskaara Tuskarr
barColor = {87/255, 173/255, 246/255},
},

[2564] = { --Loamm Niffen
barColor = {246/255, 170/255, 126/255},
},

[2503] = { --Maruuk Centaur
barColor = {240/255, 189/255, 62/255},
},

[2574] = { --Dream Wardens
barColor = {99/255, 255/255, 156/255},
},

[2510] = { --Valdrakken Accord
barColor = {196/255, 213/255, 234/255},
},

[2544] = { --Artisan's Consortium
barColor = {255/255, 62/255, 96/255},
},

[2553] = { --Soridormi
barColor = {255/255, 206/255, 66/255},
},

[2518] = { --Sabellian
barColor = {104/255, 104/255, 104/255},
},

[2517] = { --Wrathion
barColor = {104/255, 104/255, 104/255},
},

[2550] = { --Cobalt Assembly
barColor = {34/255, 130/255, 255/255},
},
};


Expand Down Expand Up @@ -195,6 +248,11 @@ do --Layout TWW
{factionID = 2736}, --Manaforge Vandals
{factionID = 2658}, --The K'aresh Trust
{factionID = 2688}, --Flame's Radiance
{factionID = 2722, --Delves S3
subFactions = {
{factionID = 2640, creatureDisplayID = 115505, playerCompanionID = 1}, --Brann Bronzebeard.
},
},
},

[2] = {
Expand Down Expand Up @@ -229,6 +287,30 @@ do --Layout TWW
end


do --Layout DF
local MajorFactionLayout = {
[1] = {
{factionID = 2564}, --Loamm Niffen
{factionID = 2574}, --Dream Wardens
},
[2] = {
{factionID = 2507}, --Dragonscale Expedition
{factionID = 2503}, --Maruuk Centaur
{factionID = 2511}, --Iskaara Tuskarr
{factionID = 2510, --Valdrakken Accord
subFactions = {
{factionID = 2544, creatureDisplayID = 108377}, --Artisan's Consortium
{factionID = 2553, creatureDisplayID = 108314}, --Soridormi
{factionID = 2518, creatureDisplayID = 104559}, --Sabellian
{factionID = 2517, creatureDisplayID = 107146}, --Wrathion
{factionID = 2550, creatureDisplayID = 108695}, --Cobalt Assembly
},
},
},
};
LandingPageUtil.AddExpansionData(10, "factionLayout", MajorFactionLayout);
end

local RewardQuestXFaction = {};
for factionID, v in pairs(OverrideFactionInfo) do
if v.rewardQuestID then
Expand Down Expand Up @@ -295,7 +377,7 @@ end

function FactionUtil:GetBestExpansionIDWithRewardPending()
local IsOnQuest = C_QuestLog.IsOnQuest;
local expansionIDs = {12, 11}; -- newer expansion first
local expansionIDs = {12, 11, 10}; -- newer expansion first

for _, expansionID in ipairs(expansionIDs) do
local factionLayout = LandingPageUtil.GetExpansionData(expansionID, "factionLayout");
Expand Down
49 changes: 49 additions & 0 deletions Modules/ExpansionLandingPage/Retail/DF_Activity.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
local _, addon = ...
local API = addon.API;
local LandingPageUtil = addon.LandingPageUtil;
Comment on lines +2 to +3

local ActivityData = {
{isHeader = true, name = "Valdrakken Accord", factionID = 2510, categoryID = 2510,
entries = {
{name = "Aiding the Accord", questID = 70750, isWeeklyQuest = true},
{name = "Tailoring Services Requested", questID = 70595, isWeeklyQuest = true},
{name = "Sew Many Cooks", questID = 70586, isWeeklyQuest = true},
}
},

{isHeader = true, name = "Iskaara Tuskarr", factionID = 2511, categoryID = 2511,
entries = {
{name = "Community Feast", questID = 70893, isWeeklyQuest = true},
}
},

{isHeader = true, name = "Dragonscale Expedition", factionID = 2507, categoryID = 2507,
entries = {
{name = "Siege on Dragonbane Keep", questID = 71210, isWeeklyQuest = true},
{name = "Wanted: Fenistrasza's Skull", questID = 70995, isWeeklyQuest = true},
{name = "Wanted: Earthbound Primordial Core", questID = 71001, isWeeklyQuest = true},
}
},

{isHeader = true, name = "Loamm Niffen", factionID = 2564, categoryID = 2564,
entries = {
{name = "A Worthy Ally: Loamm Niffen", questID = 75665, isWeeklyQuest = true},
{name = "Researchers Under Fire", questID = 74905, isWeeklyQuest = true},
{name = "Mistie's Mix Magic", questID = 75301, isWeeklyQuest = true},
}
},

{isHeader = true, name = "Dream Wardens", factionID = 2574, categoryID = 2574,
entries = {
{name = "A Worthy Ally: Dream Wardens", questID = 78444, isWeeklyQuest = true},
{name = "Shaping the Dreamsurge", questID = 77251, isWeeklyQuest = true},
}
},
};

local DynamicQuestMaps = {
-- [questID] = { mapID, x, y }
};

LandingPageUtil.AddExpansionData(10, "activity", ActivityData);
LandingPageUtil.AddExpansionData(10, "activityQuestMap", DynamicQuestMaps);
15 changes: 15 additions & 0 deletions Modules/ExpansionLandingPage/Retail/ResourceList.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,18 @@ do --TWW

LandingPageUtil.AddExpansionData(11, "resource", ResourceList);
end


do --DF
local DF_ResourceList = {
{currencyID = 2003}, --Dragon Isles Supplies
{currencyID = 2245, shownIfOwned = true}, --Flightstones
{currencyID = 2118, shownIfOwned = true}, --Elemental Overflow
{currencyID = 2122, shownIfOwned = true}, --Storm Sigil
{currencyID = 1602, shownIfOwned = true}, --Conquest
{currencyID = 1792, shownIfOwned = true}, --Honor
{currencyID = 2123, shownIfOwned = true}, --Bloody Tokens
{currencyID = 2797, shownIfOwned = true}, --Trophy of Strife
};
LandingPageUtil.AddExpansionData(10, "resource", DF_ResourceList);
end