Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Initialization.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local VERSION_TEXT = "1.9.4";
local VERSION_DATE = 1786300000;
local VERSION_TEXT = "1.9.4 b";
local VERSION_DATE = 1786800000;


local addonName, addon = ...
Expand Down
3 changes: 0 additions & 3 deletions Locales/Localization.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd">

<Script file="enUS.lua"/>
<Script file="zhCN.lua"/>
<Script file="zhTW.lua"/>
Expand All @@ -13,6 +12,4 @@
<Script file="koKR.lua"/>
<Script file="esMX.lua"/>
<Script file="esES.lua"/>

<Script file="PostLoad.lua"/>
</Ui>
18 changes: 0 additions & 18 deletions Locales/PostLoad.lua

This file was deleted.

51 changes: 51 additions & 0 deletions Modules/ControlCenter/Changelog/enUS.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,57 @@ local L = addon.L;
local changelogs = addon.ControlCenter.changelogs;

changelogs[10904] = {
{
type = "date",
versionText = "1.9.4 b",
timestamp = 1786800000,
},

{
type = "h1",
text = "Bug Fixes",
},

{
type = "p",
bullet = true,
text = "Housing Dashboard: Fixed an issue where the House Information tab was sometimes empty.",
},

{
type = "p",
bullet = true,
text = "Housing Editor, Customize Mode: Fixed an error that appeared when changing dyes.",
},

{
type = "br",
},

{
type = "h1",
text = MISCELLANEOUS,
},

{
type = "p",
bullet = true,
text = "Expansion Summary UI: Added Captain Tokka to Factions.",
},

{
type = "p",
bullet = true,
text = "Expansion Summary UI: Added Community Coupons and Coiled Filament to the resource list.",
},

{
type = "br",
},
{
type = "br",
},

{
type = "date",
versionText = "1.9.4",
Expand Down
10 changes: 0 additions & 10 deletions Modules/DevTool.lua
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,3 @@ do
end
end
end

do --Enable ExpansionLandingButton on PTR
if IsTestBuild() then
function C_PlayerInfo.IsExpansionLandingPageUnlockedForPlayer(index)
if index == LE_EXPANSION_MIDNIGHT then
return true
end
end
end
end
21 changes: 16 additions & 5 deletions Modules/ExpansionLandingPage/Currency.lua
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,26 @@ do
elseif v.conditionFunc then
valid = v.conditionFunc();
elseif v.uiMapID then
valid = false;

if not uiMapID then
uiMapID = C_Map.GetBestMapForUnit("player");
end
if uiMapID and uiMapID == v.uiMapID then
valid = true;
else
valid = false;

if uiMapID then
if type(v.uiMapID) == "table" then
for _, id in ipairs(v.uiMapID) do
if uiMapID == id then
valid = true;
end
end
else
valid = uiMapID == v.uiMapID;
end
end
elseif v.shownIfOwned then
end

if valid and v.shownIfOwned then
valid = GetResourcesQuantity(v) > 0;
end

Expand Down
6 changes: 5 additions & 1 deletion Modules/ExpansionLandingPage/FactionTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1222,9 +1222,13 @@ do
for _, factionInfo in ipairs(rowInfo) do
index = index + 1;
local f = self.factionButtonPool:Acquire();
f:ClearAllPoints();
local majorFactionID = factionInfo.factionID;

f:ClearAllPoints();
if factionInfo.preSpacer then
offsetX = offsetX + 2.5 * FACTION_BUTTON_GAP_H;
end

if factionInfo.shownAsSubfaction then
f:SetMinimized(true);
local childOffsetY = offsetY - 0.5 * (FACTION_BUTTON_SIZE - SUBFACTION_BUTTON_SIZE);
Expand Down
44 changes: 21 additions & 23 deletions Modules/ExpansionLandingPage/FactionUtil.lua
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,17 @@ local OverrideFactionInfo = {
};

local Seasonal = {
Delves = 2742,
Prey = 2764,
Delves = 2796,
Prey = 2808,
};

--[[
if addon.IS_12_1_0 then
-- MID Season 2
-- Reserved for MID Season 3
Seasonal.Delves = 2796;
Seasonal.Prey = 2808;
end
--]]

for k, factionID in pairs(Seasonal) do
if not OverrideFactionInfo[factionID] then
Expand All @@ -182,15 +184,28 @@ do --Layout MID
{factionID = 2744, creatureDisplayID = 26365, playerCompanionID = 2}, --Valeera Sanguinar. Get playerCompanionID from C_MajorFactions.GetMajorFactionData(C_DelvesUI.GetDelvesFactionForSeason())
},
},
RitualSites = {factionID = 2792}, --Ritual Sites
RitualSites = {factionID = 2792, preSpacer = true}, --Ritual Sites
OpenWorldPVP = {factionID = 2770, shownAsSubfaction = true, iconFileID = 7448209}, --Slayer's Duellum
Zuljarra = {factionID = 2772}, --Zul'jarra's Forces
Zuljarra = {factionID = 2772, --Zul'jarra's Forces
subFactions = {
{factionID = 2773, creatureDisplayID = 145432}, -- Tokka
},
},
};

local MajorFactionLayout = {
[1] = {},
[1] = {
MajorFactionEntry.Prey,
MajorFactionEntry.Delves,
},

[2] = {
MajorFactionEntry.Zuljarra,
MajorFactionEntry.RitualSites,
MajorFactionEntry.OpenWorldPVP,
},

[3] = {
{factionID = 2696}, --Amani Tribe
{factionID = 2699}, --The Singularity
{factionID = 2704}, --Hara'ti
Expand All @@ -207,23 +222,6 @@ do --Layout MID

LandingPageUtil.AddExpansionData(12, "factionLayout", MajorFactionLayout);

if addon.IS_12_1_0 then --For PTR
MajorFactionLayout[1] = {
MajorFactionEntry.Zuljarra,
MajorFactionEntry.Prey,
MajorFactionEntry.Delves,
MajorFactionEntry.RitualSites,
MajorFactionEntry.OpenWorldPVP,
};
else
MajorFactionLayout[1] = {
MajorFactionEntry.RitualSites,
MajorFactionEntry.Prey,
MajorFactionEntry.Delves,
MajorFactionEntry.OpenWorldPVP,
};
end

FactionUtil.ActiveFactionLayout = MajorFactionLayout;
end

Expand Down
15 changes: 8 additions & 7 deletions Modules/ExpansionLandingPage/Retail/ResourceList.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,22 @@ do --MID
{currencyID = 3028}, --Restored Coffer Key
{currencyID = 3310, hasWeeklyCap = true}, --Coffer Key Shard
{currencyID = 3316}, --Voidlight Marl
{currencyID = 3405}, --Field Accolade
{currencyID = 3363, shownIfOwned = true}, --Community Coupons
{currencyID = 3405, shownIfOwned = true}, --Field Accolade

{itemID = 242241, uiMapID = 2395}, --Latent Arcana
{itemID = 246951, uiMapID = 2405}, --Stormarion Core
{itemID = 242241, uiMapID = 2395}, --Latent Arcana
{itemID = 246951, uiMapID = 2405}, --Stormarion Core
{currencyID = 3546, uiMapID = {2509, 2512}, shownIfOwned = true}, --Coiled Filament

{currencyID = 3392}, --Remnant of Anguish
{currencyID = 2803}, --Undercoin

{currencyID = 3379, shownIfOwned = true}, --Brimming Arcana
{currencyID = 3392}, --Remnant of Anguish
{currencyID = 3376, hasWeeklyCap = true}, --Shard of Dundun
{currencyID = 3377, shownIfOwned = true}, --Unalloyed Abundance

{currencyID = 1602, shownIfOwned = true}, --Conquest
{currencyID = 1792, shownIfOwned = true}, --Honor

{currencyID = 2803}, --Undercoin

{currencyID = 2123, shownIfOwned = true}, --Bloody Tokens
{currencyID = 2797, shownIfOwned = true}, --Trophy of Strife
};
Expand Down
2 changes: 1 addition & 1 deletion Modules/GameTooltipExtension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<Script file="GameTooltip_ItemQuest.lua"/>
<Script file="GameTooltip_DelvesItem.lua"/>
<Script file="GameTooltip_TransmogEnsemble.lua"/>
<Script file="GameTooltip_DyeDeez.lua"/>
<Script file="GameTooltip_RichSoil.lua"/>
<Script file="GameTooltip_VendorLocation.lua"/>


<!--No Longer Relevant-->
<!--Script file="GameTooltip_MountRecolor.lua"/-->
<!--Script file="GameTooltip_DyeDeez.lua"/-->
</Ui>
2 changes: 1 addition & 1 deletion Modules/Housing/HouseEditor_CustomizeMode.lua
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ do

local CustomizeModeFrame = HouseEditorFrame.CustomizeModeFrame;
self.parentFrame = CustomizeModeFrame;
self.DyePane = self.parentFrame.DecorCustomizationsPane;
self.DyePane = CustomizeModeFrame.DecorCustomizationsPane.CustomizeComponentContainer.DyePane;
self.DyePopout = DyeSelectionPopout;


Expand Down
5 changes: 5 additions & 0 deletions Modules/Housing/Housing_Macro.lua
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,11 @@ local function Blizzard_HousingDashboard_OnLoaded()
if not Flags.TeleportToHouseButton then
Flags.TeleportToHouseButton = true;

local blizzardDropdown = API.GetGlobalObject("HousingDashboardFrame.HouseDropdown");
if blizzardDropdown then
blizzardDropdown.playerHouseList = nil;
end

local TeleportButton = API.GetGlobalObject("HousingDashboardFrame.HouseInfoContent.ContentFrame.HouseUpgradeFrame.TeleportToHouseButton");
if TeleportButton then
TeleportButton:RegisterForDrag("LeftButton");
Expand Down
19 changes: 13 additions & 6 deletions Modules/Shared/SharedData.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ do --Item Upgrade Track
3383, --Adventurer (LFR, H)
},

CrestSources = { --TODO: Midnight S1: Dawncrest
CrestSources = {
(PLAYER_DIFFICULTY6 or "Mythic") .. ", +9",
(PLAYER_DIFFICULTY2 or "Heroic") .. ", +4",
(PLAYER_DIFFICULTY1 or "Normal") .. ", +2",
Expand All @@ -48,12 +48,19 @@ do --Item Upgrade Track

addon.ItemUpgradeConstant = ItemUpgradeConstant;

local CrestNameAbbreviation = {
L["Upgrade Track 6"],
L["Upgrade Track 5"],
L["Upgrade Track 4"],
L["Upgrade Track 3"],
L["Upgrade Track 1"],
};

for index, currencyID in ipairs(ItemUpgradeConstant.Crests) do
L["currency-"..currencyID] = CrestNameAbbreviation[index];
end

L["currency-3347"] = L["Upgrade Track 6"];
L["currency-3345"] = L["Upgrade Track 5"];
L["currency-3343"] = L["Upgrade Track 4"];
L["currency-3341"] = L["Upgrade Track 3"];
L["currency-3383"] = L["Upgrade Track 1"];
CrestNameAbbreviation = nil;
end


Expand Down
2 changes: 1 addition & 1 deletion Plumber.toc
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ Modules\QueueStatus.lua
Modules\RaidCheck\RaidCheck.xml
Modules\TransmogUtil.lua
Modules\QuestWatchCycle.lua
Modules\CraftSearchExtended.lua
Modules\SourceAchievementLink.lua
Modules\OutfitSelect.xml
Modules\BreakTime.xml
Expand All @@ -104,3 +103,4 @@ Modules\PreyQuestSuperTrack.lua
#Modules\Timerunning\LegionRemix.xml
#Modules\SpellcastInfo.lua
#Modules\BlizzFix_ModelLoading.lua
#Modules\CraftSearchExtended.lua