diff --git a/Interface/AddOns/Blizzard_APIDocumentation/CurrencyConstantsDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentation/CurrencyConstantsDocumentation.lua new file mode 100644 index 0000000000000000000000000000000000000000..bf7b86bfb8d58e2941ff42fb4dc91b51dfb62225 --- /dev/null +++ b/Interface/AddOns/Blizzard_APIDocumentation/CurrencyConstantsDocumentation.lua @@ -0,0 +1,224 @@ +local CurrencyConstants = +{ + Tables = + { + { + Name = "CurrencyDestroyReason", + Type = "Enumeration", + NumValues = 12, + MinValue = 0, + MaxValue = 11, + Fields = + { + { Name = "Cheat", Type = "CurrencyDestroyReason", EnumValue = 0 }, + { Name = "Spell", Type = "CurrencyDestroyReason", EnumValue = 1 }, + { Name = "VersionUpdate", Type = "CurrencyDestroyReason", EnumValue = 2 }, + { Name = "QuestTurnin", Type = "CurrencyDestroyReason", EnumValue = 3 }, + { Name = "Vendor", Type = "CurrencyDestroyReason", EnumValue = 4 }, + { Name = "Trade", Type = "CurrencyDestroyReason", EnumValue = 5 }, + { Name = "Capped", Type = "CurrencyDestroyReason", EnumValue = 6 }, + { Name = "Garrison", Type = "CurrencyDestroyReason", EnumValue = 7 }, + { Name = "DroppedToCorpse", Type = "CurrencyDestroyReason", EnumValue = 8 }, + { Name = "BonusRoll", Type = "CurrencyDestroyReason", EnumValue = 9 }, + { Name = "FactionConversion", Type = "CurrencyDestroyReason", EnumValue = 10 }, + { Name = "Last", Type = "CurrencyDestroyReason", EnumValue = 11 }, + }, + }, + { + Name = "CurrencyFlags", + Type = "Enumeration", + NumValues = 32, + MinValue = -2147483648, + MaxValue = 1073741824, + Fields = + { + { Name = "CurrencyTradable", Type = "CurrencyFlags", EnumValue = 1 }, + { Name = "CurrencyAppearsInLootWindow", Type = "CurrencyFlags", EnumValue = 2 }, + { Name = "CurrencyComputedWeeklyMaximum", Type = "CurrencyFlags", EnumValue = 4 }, + { Name = "Currency_100_Scaler", Type = "CurrencyFlags", EnumValue = 8 }, + { Name = "CurrencyNoLowLevelDrop", Type = "CurrencyFlags", EnumValue = 16 }, + { Name = "CurrencyIgnoreMaxQtyOnLoad", Type = "CurrencyFlags", EnumValue = 32 }, + { Name = "CurrencyLogOnWorldChange", Type = "CurrencyFlags", EnumValue = 64 }, + { Name = "CurrencyTrackQuantity", Type = "CurrencyFlags", EnumValue = 128 }, + { Name = "CurrencyResetTrackedQuantity", Type = "CurrencyFlags", EnumValue = 256 }, + { Name = "CurrencyUpdateVersionIgnoreMax", Type = "CurrencyFlags", EnumValue = 512 }, + { Name = "CurrencySuppressChatMessageOnVersionChange", Type = "CurrencyFlags", EnumValue = 1024 }, + { Name = "CurrencySingleDropInLoot", Type = "CurrencyFlags", EnumValue = 2048 }, + { Name = "CurrencyHasWeeklyCatchup", Type = "CurrencyFlags", EnumValue = 4096 }, + { Name = "CurrencyDoNotCompressChat", Type = "CurrencyFlags", EnumValue = 8192 }, + { Name = "CurrencyDoNotLogAcquisitionToBi", Type = "CurrencyFlags", EnumValue = 16384 }, + { Name = "CurrencyNoRaidDrop", Type = "CurrencyFlags", EnumValue = 32768 }, + { Name = "CurrencyNotPersistent", Type = "CurrencyFlags", EnumValue = 65536 }, + { Name = "CurrencyDeprecated", Type = "CurrencyFlags", EnumValue = 131072 }, + { Name = "CurrencyDynamicMaximum", Type = "CurrencyFlags", EnumValue = 262144 }, + { Name = "CurrencySuppressChatMessages", Type = "CurrencyFlags", EnumValue = 524288 }, + { Name = "CurrencyDoNotToast", Type = "CurrencyFlags", EnumValue = 1048576 }, + { Name = "CurrencyDestroyExtraOnLoot", Type = "CurrencyFlags", EnumValue = 2097152 }, + { Name = "CurrencyDontShowTotalInTooltip", Type = "CurrencyFlags", EnumValue = 4194304 }, + { Name = "CurrencyDontCoalesceInLootWindow", Type = "CurrencyFlags", EnumValue = 8388608 }, + { Name = "CurrencyAccountWide", Type = "CurrencyFlags", EnumValue = 16777216 }, + { Name = "CurrencyAllowOverflowMailer", Type = "CurrencyFlags", EnumValue = 33554432 }, + { Name = "CurrencyHideAsReward", Type = "CurrencyFlags", EnumValue = 67108864 }, + { Name = "CurrencyHasWarmodeBonus", Type = "CurrencyFlags", EnumValue = 134217728 }, + { Name = "CurrencyIsAllianceOnly", Type = "CurrencyFlags", EnumValue = 268435456 }, + { Name = "CurrencyIsHordeOnly", Type = "CurrencyFlags", EnumValue = 536870912 }, + { Name = "CurrencyLimitWarmodeBonusOncePerTooltip", Type = "CurrencyFlags", EnumValue = 1073741824 }, + { Name = "DeprecatedCurrencyFlag", Type = "CurrencyFlags", EnumValue = -2147483648 }, + }, + }, + { + Name = "CurrencyFlagsB", + Type = "Enumeration", + NumValues = 2, + MinValue = 1, + MaxValue = 2, + Fields = + { + { Name = "CurrencyBUseTotalEarnedForMaxQty", Type = "CurrencyFlagsB", EnumValue = 1 }, + { Name = "CurrencyBShowQuestXpGainInTooltip", Type = "CurrencyFlagsB", EnumValue = 2 }, + }, + }, + { + Name = "CurrencyGainFlags", + Type = "Enumeration", + NumValues = 3, + MinValue = 1, + MaxValue = 4, + Fields = + { + { Name = "BonusAward", Type = "CurrencyGainFlags", EnumValue = 1 }, + { Name = "DroppedFromDeath", Type = "CurrencyGainFlags", EnumValue = 2 }, + { Name = "FromAccountServer", Type = "CurrencyGainFlags", EnumValue = 4 }, + }, + }, + { + Name = "CurrencySource", + Type = "Enumeration", + NumValues = 49, + MinValue = 0, + MaxValue = 48, + Fields = + { + { Name = "ConvertOldItem", Type = "CurrencySource", EnumValue = 0 }, + { Name = "ConvertOldPvPCurrency", Type = "CurrencySource", EnumValue = 1 }, + { Name = "ItemRefund", Type = "CurrencySource", EnumValue = 2 }, + { Name = "QuestReward", Type = "CurrencySource", EnumValue = 3 }, + { Name = "Cheat", Type = "CurrencySource", EnumValue = 4 }, + { Name = "Vendor", Type = "CurrencySource", EnumValue = 5 }, + { Name = "PvPKillCredit", Type = "CurrencySource", EnumValue = 6 }, + { Name = "PvPMetaCredit", Type = "CurrencySource", EnumValue = 7 }, + { Name = "PvPScriptedAward", Type = "CurrencySource", EnumValue = 8 }, + { Name = "Loot", Type = "CurrencySource", EnumValue = 9 }, + { Name = "UpdatingVersion", Type = "CurrencySource", EnumValue = 10 }, + { Name = "LfgReward", Type = "CurrencySource", EnumValue = 11 }, + { Name = "Trade", Type = "CurrencySource", EnumValue = 12 }, + { Name = "Spell", Type = "CurrencySource", EnumValue = 13 }, + { Name = "ItemDeletion", Type = "CurrencySource", EnumValue = 14 }, + { Name = "RatedBattleground", Type = "CurrencySource", EnumValue = 15 }, + { Name = "RandomBattleground", Type = "CurrencySource", EnumValue = 16 }, + { Name = "Arena", Type = "CurrencySource", EnumValue = 17 }, + { Name = "ExceededMaxQty", Type = "CurrencySource", EnumValue = 18 }, + { Name = "PvPCompletionBonus", Type = "CurrencySource", EnumValue = 19 }, + { Name = "Script", Type = "CurrencySource", EnumValue = 20 }, + { Name = "GuildBankWithdrawal", Type = "CurrencySource", EnumValue = 21 }, + { Name = "Pushloot", Type = "CurrencySource", EnumValue = 22 }, + { Name = "GarrisonBuilding", Type = "CurrencySource", EnumValue = 23 }, + { Name = "PvPDrop", Type = "CurrencySource", EnumValue = 24 }, + { Name = "GarrisonFollowerActivation", Type = "CurrencySource", EnumValue = 25 }, + { Name = "GarrisonBuildingRefund", Type = "CurrencySource", EnumValue = 26 }, + { Name = "GarrisonMissionReward", Type = "CurrencySource", EnumValue = 27 }, + { Name = "GarrisonResourceOverTime", Type = "CurrencySource", EnumValue = 28 }, + { Name = "QuestRewardIgnoreCaps", Type = "CurrencySource", EnumValue = 29 }, + { Name = "GarrisonTalent", Type = "CurrencySource", EnumValue = 30 }, + { Name = "GarrisonWorldQuestBonus", Type = "CurrencySource", EnumValue = 31 }, + { Name = "PvPHonorReward", Type = "CurrencySource", EnumValue = 32 }, + { Name = "BonusRoll", Type = "CurrencySource", EnumValue = 33 }, + { Name = "AzeriteRespec", Type = "CurrencySource", EnumValue = 34 }, + { Name = "WorldQuestReward", Type = "CurrencySource", EnumValue = 35 }, + { Name = "WorldQuestRewardIgnoreCaps", Type = "CurrencySource", EnumValue = 36 }, + { Name = "FactionConversion", Type = "CurrencySource", EnumValue = 37 }, + { Name = "DailyQuestReward", Type = "CurrencySource", EnumValue = 38 }, + { Name = "DailyQuestWarModeReward", Type = "CurrencySource", EnumValue = 39 }, + { Name = "WeeklyQuestReward", Type = "CurrencySource", EnumValue = 40 }, + { Name = "WeeklyQuestWarModeReward", Type = "CurrencySource", EnumValue = 41 }, + { Name = "AccountCopy", Type = "CurrencySource", EnumValue = 42 }, + { Name = "WeeklyRewardChest", Type = "CurrencySource", EnumValue = 43 }, + { Name = "GarrisonTalentTreeReset", Type = "CurrencySource", EnumValue = 44 }, + { Name = "DailyReset", Type = "CurrencySource", EnumValue = 45 }, + { Name = "AddConduitToCollection", Type = "CurrencySource", EnumValue = 46 }, + { Name = "Last", Type = "CurrencySource", EnumValue = 47 }, + { Name = "Barbershop", Type = "CurrencySource", EnumValue = 48 }, + }, + }, + { + Name = "CurrencyTokenCategoryFlags", + Type = "Enumeration", + NumValues = 4, + MinValue = 1, + MaxValue = 8, + Fields = + { + { Name = "FlagSortLast", Type = "CurrencyTokenCategoryFlags", EnumValue = 1 }, + { Name = "FlagPlayerItemAssignment", Type = "CurrencyTokenCategoryFlags", EnumValue = 2 }, + { Name = "Hidden", Type = "CurrencyTokenCategoryFlags", EnumValue = 4 }, + { Name = "Virtual", Type = "CurrencyTokenCategoryFlags", EnumValue = 8 }, + }, + }, + { + Name = "PlayerCurrencyFlags", + Type = "Enumeration", + NumValues = 2, + MinValue = 1, + MaxValue = 2, + Fields = + { + { Name = "Incremented", Type = "PlayerCurrencyFlags", EnumValue = 1 }, + { Name = "Loading", Type = "PlayerCurrencyFlags", EnumValue = 2 }, + }, + }, + { + Name = "PlayerCurrencyFlagsDbFlags", + Type = "Enumeration", + NumValues = 5, + MinValue = 1, + MaxValue = 16, + Fields = + { + { Name = "IgnoreMaxQtyOnload", Type = "PlayerCurrencyFlagsDbFlags", EnumValue = 1 }, + { Name = "Reuse1", Type = "PlayerCurrencyFlagsDbFlags", EnumValue = 2 }, + { Name = "InBackpack", Type = "PlayerCurrencyFlagsDbFlags", EnumValue = 4 }, + { Name = "UnusedInUI", Type = "PlayerCurrencyFlagsDbFlags", EnumValue = 8 }, + { Name = "Reuse2", Type = "PlayerCurrencyFlagsDbFlags", EnumValue = 16 }, + }, + }, + { + Name = "CurrencyConsts", + Type = "Constants", + Values = + { + { Name = "PLAYER_CURRENCY_CLIENT_FLAGS", Type = "number", Value = Enum.PlayerCurrencyFlagsDbFlags.InBackpack + Enum.PlayerCurrencyFlagsDbFlags.UnusedInUI }, + { Name = "MAX_CURRENCY_QUANTITY", Type = "number", Value = 100000000 }, + { Name = "CONQUEST_ARENA_AND_BG_META_CURRENCY_ID", Type = "number", Value = 483 }, + { Name = "CONQUEST_RATED_BG_META_CURRENCY_ID", Type = "number", Value = 484 }, + { Name = "CONQUEST_ASHRAN_META_CURRENCY_ID", Type = "number", Value = 692 }, + { Name = "ACCOUNT_WIDE_HONOR_CURRENCY_ID", Type = "number", Value = 1585 }, + { Name = "ACCOUNT_WIDE_HONOR_LEVEL_CURRENCY_ID", Type = "number", Value = 1586 }, + { Name = "CONQUEST_CURRENCY_ID", Type = "number", Value = 1602 }, + { Name = "HONOR_CURRENCY_ID", Type = "number", Value = 1792 }, + { Name = "ARTIFACT_KNOWLEDGE_CURRENCY_ID", Type = "number", Value = 1171 }, + { Name = "WAR_RESOURCES_CURRENCY_ID", Type = "number", Value = 1560 }, + { Name = "ECHOES_OF_NYALOTHA_CURRENCY_ID", Type = "number", Value = 1803 }, + { Name = "QUESTIONMARK_INV_ICON", Type = "number", Value = 134400 }, + { Name = "CURRENCY_ID_RENOWN", Type = "number", Value = 1822 }, + { Name = "CURRENCY_ID_RENOWN_KYRIAN", Type = "number", Value = 1829 }, + { Name = "CURRENCY_ID_RENOWN_VENTHYR", Type = "number", Value = 1830 }, + { Name = "CURRENCY_ID_RENOWN_NIGHT_FAE", Type = "number", Value = 1831 }, + { Name = "CURRENCY_ID_RENOWN_NECROLORD", Type = "number", Value = 1832 }, + { Name = "CURRENCY_ID_WILLING_SOUL", Type = "number", Value = 1810 }, + { Name = "CURRENCY_ID_RESERVOIR_ANIMA", Type = "number", Value = 1813 }, + }, + }, + }, +}; + +APIDocumentation:AddDocumentationTable(CurrencyConstants); \ No newline at end of file diff --git a/Interface/AddOns/Blizzard_APIDocumentation/GarrisonConstantsDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentation/GarrisonConstantsDocumentation.lua index 08189f79b57db633b5ba3febb5624741b15bbce8..aadc55f481fbc8809768bb0d9115fc20c732b957 100644 --- a/Interface/AddOns/Blizzard_APIDocumentation/GarrisonConstantsDocumentation.lua +++ b/Interface/AddOns/Blizzard_APIDocumentation/GarrisonConstantsDocumentation.lua @@ -186,8 +186,8 @@ local GarrisonConstants = { Name = "Generic", Type = "GarrTalentFeatureSubtype", EnumValue = 0 }, { Name = "Bastion", Type = "GarrTalentFeatureSubtype", EnumValue = 1 }, { Name = "Revendreth", Type = "GarrTalentFeatureSubtype", EnumValue = 2 }, - { Name = "Maldraxxus", Type = "GarrTalentFeatureSubtype", EnumValue = 3 }, - { Name = "Ardenweald", Type = "GarrTalentFeatureSubtype", EnumValue = 4 }, + { Name = "Ardenweald", Type = "GarrTalentFeatureSubtype", EnumValue = 3 }, + { Name = "Maldraxxus", Type = "GarrTalentFeatureSubtype", EnumValue = 4 }, }, }, { diff --git a/Interface/AddOns/Blizzard_APIDocumentation/PlayerMentorshipDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentation/PlayerMentorshipDocumentation.lua index efeec24eff60c86bb92972d75b8c36ca83890de8..98d8dd04aee121c97b62b0f9cddd50080d2fde4e 100644 --- a/Interface/AddOns/Blizzard_APIDocumentation/PlayerMentorshipDocumentation.lua +++ b/Interface/AddOns/Blizzard_APIDocumentation/PlayerMentorshipDocumentation.lua @@ -38,6 +38,15 @@ local PlayerMentorship = { Name = "status", Type = "PlayerMentorshipStatus", Nilable = false }, }, }, + { + Name = "IsActivePlayerConsideredNewcomer", + Type = "Function", + + Returns = + { + { Name = "isConsideredNewcomer", Type = "bool", Nilable = false }, + }, + }, { Name = "IsMentorRestricted", Type = "Function", diff --git a/Interface/AddOns/Blizzard_APIDocumentation/SoulbindsDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentation/SoulbindsDocumentation.lua index e56677347e534992e589ea3ce2d7d188a49c8bb6..96e3d659a5d8d637827741b1df6e0e965e34d3d6 100644 --- a/Interface/AddOns/Blizzard_APIDocumentation/SoulbindsDocumentation.lua +++ b/Interface/AddOns/Blizzard_APIDocumentation/SoulbindsDocumentation.lua @@ -16,22 +16,31 @@ local Soulbinds = }, }, { - Name = "AddPendingConduit", + Name = "CanActivateSoulbind", Type = "Function", Arguments = { - { Name = "nodeID", Type = "number", Nilable = false }, - { Name = "conduitID", Type = "number", Nilable = false }, + { Name = "soulbindID", Type = "number", Nilable = false }, }, Returns = { { Name = "result", Type = "bool", Nilable = false }, + { Name = "errorDescription", Type = "string", Nilable = true }, }, }, { - Name = "CanActivateSoulbind", + Name = "CanModifySoulbind", + Type = "Function", + + Returns = + { + { Name = "result", Type = "bool", Nilable = false }, + }, + }, + { + Name = "CanResetConduitsInSoulbind", Type = "Function", Arguments = @@ -46,40 +55,76 @@ local Soulbinds = }, }, { - Name = "CanModifySoulbind", + Name = "CloseUI", Type = "Function", + }, + { + Name = "CommitPendingConduitsInSoulbind", + Type = "Function", + + Arguments = + { + { Name = "soulbindID", Type = "number", Nilable = false }, + }, + }, + { + Name = "FindNodeIDActuallyInstalled", + Type = "Function", + + Arguments = + { + { Name = "soulbindID", Type = "number", Nilable = false }, + { Name = "conduitID", Type = "number", Nilable = false }, + }, Returns = { - { Name = "result", Type = "bool", Nilable = false }, + { Name = "nodeID", Type = "number", Nilable = false }, }, }, { - Name = "CanResetConduitsInSoulbind", + Name = "FindNodeIDAppearingInstalled", Type = "Function", Arguments = { { Name = "soulbindID", Type = "number", Nilable = false }, + { Name = "conduitID", Type = "number", Nilable = false }, }, Returns = { - { Name = "result", Type = "bool", Nilable = false }, - { Name = "errorDescription", Type = "string", Nilable = true }, + { Name = "nodeID", Type = "number", Nilable = false }, }, }, { - Name = "CloseUI", + Name = "FindNodeIDPendingInstall", Type = "Function", + + Arguments = + { + { Name = "soulbindID", Type = "number", Nilable = false }, + { Name = "conduitID", Type = "number", Nilable = false }, + }, + + Returns = + { + { Name = "nodeID", Type = "number", Nilable = false }, + }, }, { - Name = "CommitPendingConduitsInSoulbind", + Name = "FindNodeIDPendingUninstall", Type = "Function", Arguments = { { Name = "soulbindID", Type = "number", Nilable = false }, + { Name = "conduitID", Type = "number", Nilable = false }, + }, + + Returns = + { + { Name = "nodeID", Type = "number", Nilable = false }, }, }, { @@ -146,6 +191,20 @@ local Soulbinds = { Name = "collectionData", Type = "ConduitCollectionData", Nilable = true }, }, }, + { + Name = "GetConduitDisplayed", + Type = "Function", + + Arguments = + { + { Name = "nodeID", Type = "number", Nilable = false }, + }, + + Returns = + { + { Name = "conduitID", Type = "number", Nilable = false }, + }, + }, { Name = "GetConduitHyperlink", Type = "Function", @@ -161,6 +220,20 @@ local Soulbinds = { Name = "link", Type = "string", Nilable = false }, }, }, + { + Name = "GetConduitIDPendingInstall", + Type = "Function", + + Arguments = + { + { Name = "nodeID", Type = "number", Nilable = false }, + }, + + Returns = + { + { Name = "conduitID", Type = "number", Nilable = false }, + }, + }, { Name = "GetConduitItemLevel", Type = "Function", @@ -221,7 +294,7 @@ local Soulbinds = }, }, { - Name = "GetNode", + Name = "GetInstalledConduitID", Type = "Function", Arguments = @@ -231,11 +304,11 @@ local Soulbinds = Returns = { - { Name = "node", Type = "SoulbindNode", Nilable = false }, + { Name = "conduitID", Type = "number", Nilable = false }, }, }, { - Name = "GetPendingConduitID", + Name = "GetNode", Type = "Function", Arguments = @@ -245,26 +318,34 @@ local Soulbinds = Returns = { - { Name = "conduitID", Type = "number", Nilable = false }, + { Name = "node", Type = "SoulbindNode", Nilable = false }, }, }, { - Name = "GetPendingNodeIDInSoulbind", + Name = "GetSoulbindData", Type = "Function", Arguments = { { Name = "soulbindID", Type = "number", Nilable = false }, - { Name = "conduitID", Type = "number", Nilable = false }, }, Returns = { - { Name = "nodeID", Type = "number", Nilable = false }, + { Name = "data", Type = "SoulbindData", Nilable = false }, }, }, { - Name = "GetSoulbindData", + Name = "GetTotalConduitChargesPending", + Type = "Function", + + Returns = + { + { Name = "count", Type = "number", Nilable = false }, + }, + }, + { + Name = "GetTotalConduitChargesPendingInSoulbind", Type = "Function", Arguments = @@ -274,7 +355,7 @@ local Soulbinds = Returns = { - { Name = "data", Type = "SoulbindData", Nilable = false }, + { Name = "count", Type = "number", Nilable = false }, }, }, { @@ -314,21 +395,6 @@ local Soulbinds = { Name = "result", Type = "bool", Nilable = false }, }, }, - { - Name = "HasPendingConduitInSoulbind", - Type = "Function", - - Arguments = - { - { Name = "soulbindID", Type = "number", Nilable = false }, - { Name = "conduitID", Type = "number", Nilable = false }, - }, - - Returns = - { - { Name = "result", Type = "bool", Nilable = false }, - }, - }, { Name = "HasPendingConduitsInSoulbind", Type = "Function", @@ -387,12 +453,12 @@ local Soulbinds = }, }, { - Name = "IsUnselectedConduitPendingInSoulbind", + Name = "IsNodePendingModify", Type = "Function", Arguments = { - { Name = "soulbindID", Type = "number", Nilable = false }, + { Name = "nodeID", Type = "number", Nilable = false }, }, Returns = @@ -401,21 +467,28 @@ local Soulbinds = }, }, { - Name = "RemovePendingConduit", + Name = "IsUnselectedConduitPendingInSoulbind", Type = "Function", Arguments = { - { Name = "nodeID", Type = "number", Nilable = false }, + { Name = "soulbindID", Type = "number", Nilable = false }, + }, + + Returns = + { + { Name = "result", Type = "bool", Nilable = false }, }, }, { - Name = "ResetSoulbindConduits", + Name = "ModifyNode", Type = "Function", Arguments = { - { Name = "soulbindID", Type = "number", Nilable = false }, + { Name = "nodeID", Type = "number", Nilable = false }, + { Name = "conduitID", Type = "number", Nilable = false }, + { Name = "type", Type = "SoulbindConduitTransactionType", Nilable = false }, }, }, { @@ -428,12 +501,12 @@ local Soulbinds = }, }, { - Name = "SetConduitCharges", + Name = "UnmodifyNode", Type = "Function", Arguments = { - { Name = "charges", Type = "number", Nilable = false }, + { Name = "nodeID", Type = "number", Nilable = false }, }, }, }, @@ -501,11 +574,6 @@ local Soulbinds = { Name = "data", Type = "SoulbindConduitData", Nilable = false }, }, }, - { - Name = "SoulbindConduitsReset", - Type = "Event", - LiteralName = "SOULBIND_CONDUITS_RESET", - }, { Name = "SoulbindForgeInteractionEnded", Type = "Event", @@ -556,7 +624,6 @@ local Soulbinds = { { Name = "nodeID", Type = "number", Nilable = false }, { Name = "conduitID", Type = "number", Nilable = false }, - { Name = "pending", Type = "bool", Nilable = false }, }, }, }, diff --git a/Interface/AddOns/Blizzard_APIDocumentation/UIWidgetManagerDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentation/UIWidgetManagerDocumentation.lua index 24cfe3b7d16cc962d87b93e584569787bf9f0e4f..c2829ff03f13d8879593b8001fd0ea1e28f5e3e3 100644 --- a/Interface/AddOns/Blizzard_APIDocumentation/UIWidgetManagerDocumentation.lua +++ b/Interface/AddOns/Blizzard_APIDocumentation/UIWidgetManagerDocumentation.lua @@ -337,7 +337,7 @@ local UIWidgetManager = }, }, { - Name = "GetWidgetLayoutDirectionFromWidgetSetID", + Name = "GetWidgetSetInfo", Type = "Function", Arguments = @@ -347,7 +347,7 @@ local UIWidgetManager = Returns = { - { Name = "layoutDirection", Type = "UIWidgetLayoutDirection", Nilable = false }, + { Name = "widgetSetInfo", Type = "UIWidgetSetInfo", Nilable = false }, }, }, { @@ -1188,6 +1188,15 @@ local UIWidgetManager = { Name = "unitToken", Type = "string", Nilable = true }, }, }, + { + Name = "UIWidgetSetInfo", + Type = "Structure", + Fields = + { + { Name = "layoutDirection", Type = "UIWidgetSetLayoutDirection", Nilable = false }, + { Name = "verticalPadding", Type = "number", Nilable = false }, + }, + }, { Name = "UIWidgetSpellInfo", Type = "Structure", diff --git a/Interface/AddOns/Blizzard_APIDocumentation/VignetteInfoDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentation/VignetteInfoDocumentation.lua index 64d7c85da53a16d926ddb98a9fe1821ba4e476e2..73d0db3d8dbe184cd1993bb35db9bf206ea290d7 100644 --- a/Interface/AddOns/Blizzard_APIDocumentation/VignetteInfoDocumentation.lua +++ b/Interface/AddOns/Blizzard_APIDocumentation/VignetteInfoDocumentation.lua @@ -105,6 +105,7 @@ local VignetteInfo = { Name = "name", Type = "string", Nilable = false }, { Name = "isDead", Type = "bool", Nilable = false }, { Name = "onWorldMap", Type = "bool", Nilable = false }, + { Name = "zoneInfiniteAOI", Type = "bool", Nilable = false }, { Name = "onMinimap", Type = "bool", Nilable = false }, { Name = "isUnique", Type = "bool", Nilable = false }, { Name = "inFogOfWar", Type = "bool", Nilable = false }, diff --git a/Interface/AddOns/Blizzard_AnimaDiversionUI/Blizzard_AnimaDiversionUI.lua b/Interface/AddOns/Blizzard_AnimaDiversionUI/Blizzard_AnimaDiversionUI.lua index f4f7dee5835762240dad9afa61d3550c8130b0b7..ae3e18da2d68eff39bbab9fb67714cf70ad3c855 100644 --- a/Interface/AddOns/Blizzard_AnimaDiversionUI/Blizzard_AnimaDiversionUI.lua +++ b/Interface/AddOns/Blizzard_AnimaDiversionUI/Blizzard_AnimaDiversionUI.lua @@ -333,8 +333,7 @@ function AnimaDiversionFrameMixin:SetupCurrencyFrame() local animaCurrencyID, maxDisplayableValue = C_CovenantSanctumUI.GetAnimaInfo() local currencyInfo = C_CurrencyInfo.GetCurrencyInfo(animaCurrencyID); if(currencyInfo) then - self.AnimaDiversionCurrencyFrame.CurrencyFrame.Quantity:SetText(currencyInfo.quantity); - self.AnimaDiversionCurrencyFrame.CurrencyFrame.CurrencyIcon:SetTexture(currencyInfo.iconFileID); + self.AnimaDiversionCurrencyFrame.CurrencyFrame.Quantity:SetText(ANIMA_DIVERSION_CURRENCY_DISPLAY:format(currencyInfo.quantity, currencyInfo.iconFileID)); end end @@ -420,7 +419,7 @@ function AnimaDiversionSelectionInfoMixin:SetupCosts(CurrencyCosts) end end self.SelectButton:ClearAllPoints(); - self.SelectButton:SetPoint("TOP", self.lastCurrency, "BOTTOM", 10, -20); + self.SelectButton:SetPoint("TOP", self.lastCurrency, "BOTTOM", 10, -10); self.AlreadySelected:ClearAllPoints(); self.AlreadySelected:SetPoint("CENTER", self.SelectButton); return playerCanAfford; @@ -429,15 +428,15 @@ end function AnimaDiversionSelectionInfoMixin:SetupSingleCurrency(index, costInfo) local currency = self.currencyPool:Acquire(); if(index == 1) then - currency:SetPoint("TOP", self.Description, "BOTTOM", -15, 8); + currency:SetPoint("TOP", self.Description, "BOTTOM", -15, -10); else currency:SetPoint("TOP", self.lastCurrency, "BOTTOM", 0, -10); end local currencyInfo = C_CurrencyInfo.GetCurrencyInfo(costInfo.currencyID); if(currencyInfo) then - currency.Quantity:SetText(costInfo.quantity); - currency.CurrencyIcon:SetTexture(currencyInfo.iconFileID); + currency.Quantity:SetJustifyH("LEFT"); + currency.Quantity:SetText(ANIMA_DIVERSION_CURRENCY_DISPLAY:format(costInfo.quantity, currencyInfo.iconFileID)); end currency.currencyInfo = currencyInfo; diff --git a/Interface/AddOns/Blizzard_AnimaDiversionUI/Blizzard_AnimaDiversionUI.xml b/Interface/AddOns/Blizzard_AnimaDiversionUI/Blizzard_AnimaDiversionUI.xml index a63cbbee473bfe8c7c6342214f98d88e27fc6ba9..2318ac281f1f46dac06db4c4299a3a3c89a79af4 100644 --- a/Interface/AddOns/Blizzard_AnimaDiversionUI/Blizzard_AnimaDiversionUI.xml +++ b/Interface/AddOns/Blizzard_AnimaDiversionUI/Blizzard_AnimaDiversionUI.xml @@ -16,20 +16,12 @@ - + - - - - + + - - - - - - @@ -61,6 +53,15 @@ + + + + + + + + + C_AnimaDiversion.CloseUI(); @@ -81,7 +82,7 @@ - + diff --git a/Interface/AddOns/Blizzard_BattlefieldMap/Blizzard_BattlefieldMap.lua b/Interface/AddOns/Blizzard_BattlefieldMap/Blizzard_BattlefieldMap.lua index 8e53f96cbde73d63ac226383d08948282d0f4d7e..57ab4f2f17356b1e9d67b8246bf14d58472d79ff 100644 --- a/Interface/AddOns/Blizzard_BattlefieldMap/Blizzard_BattlefieldMap.lua +++ b/Interface/AddOns/Blizzard_BattlefieldMap/Blizzard_BattlefieldMap.lua @@ -152,6 +152,7 @@ function BattlefieldMapMixin:OnLoad() self:RegisterEvent("ADDON_LOADED"); self:RegisterEvent("PLAYER_ENTERING_WORLD"); self:RegisterEvent("ZONE_CHANGED_NEW_AREA"); + self:RegisterEvent("NEW_WMO_CHUNK"); end function BattlefieldMapMixin:OnShow() @@ -190,7 +191,7 @@ function BattlefieldMapMixin:OnEvent(event, ...) self:UpdateUnitsVisibility(); self:UnregisterEvent("ADDON_LOADED"); end - elseif event == "PLAYER_ENTERING_WORLD" or event == "ZONE_CHANGED_NEW_AREA" then + elseif event == "PLAYER_ENTERING_WORLD" or event == "ZONE_CHANGED_NEW_AREA" or event == "NEW_WMO_CHUNK" then if GetCVar("showBattlefieldMinimap") == "1" then local mapID = MapUtil.GetDisplayableMapForPlayer(); self:SetMapID(mapID); diff --git a/Interface/AddOns/Blizzard_CharacterCreate/Blizzard_CharacterCreate.lua b/Interface/AddOns/Blizzard_CharacterCreate/Blizzard_CharacterCreate.lua index 8c1a7f8e45953f7813d39b4e4dbaa11cb7b27ce8..2b5f5036a9363b752073165e74df1fd1e596059e 100644 --- a/Interface/AddOns/Blizzard_CharacterCreate/Blizzard_CharacterCreate.lua +++ b/Interface/AddOns/Blizzard_CharacterCreate/Blizzard_CharacterCreate.lua @@ -1346,7 +1346,6 @@ function CharacterCreateRaceAndClassMixin:LayoutButtons() self.AllianceAlliedRaces:MarkDirty(); self.HordeRaces:MarkDirty(); self.HordeAlliedRaces:MarkDirty(); - self.Classes:MarkDirty(); end function CharacterCreateRaceAndClassMixin:IsRaceValid(raceData, faction) @@ -1441,15 +1440,31 @@ function CharacterCreateRaceAndClassMixin:UpdateRaceButtons(releaseButtons) end end +local function SortClasses(classData1, classData2) + return classLayoutIndices[classData1.fileName] < classLayoutIndices[classData2.fileName]; +end + function CharacterCreateRaceAndClassMixin:UpdateClassButtons(releaseButtons) if releaseButtons then self.buttonPool:ReleaseAllByTemplate("CharacterCreateClassButtonTemplate"); end local classes = C_CharacterCreation.GetAvailableClasses(); - for _, classData in pairs(classes) do + table.sort(classes, SortClasses); + + local lastButton; + for i, classData in ipairs(classes) do local button = self.buttonPool:Acquire("CharacterCreateClassButtonTemplate"); button:SetClass(classData, self.selectedClassID); + + if i == 1 then + button:SetPoint("TOPLEFT", self.Classes, "TOPLEFT", 0, 0); + else + button:SetPoint("TOPLEFT", lastButton, "TOPRIGHT", 15, 0); + end + + lastButton = button; + button:Show(); end end diff --git a/Interface/AddOns/Blizzard_CharacterCreate/Blizzard_CharacterCreate.xml b/Interface/AddOns/Blizzard_CharacterCreate/Blizzard_CharacterCreate.xml index 0fe94ba1d2b6a3a13709b033266d61136588fd27..2835e40927dd2e053751d30ec80a3291e902fb5b 100644 --- a/Interface/AddOns/Blizzard_CharacterCreate/Blizzard_CharacterCreate.xml +++ b/Interface/AddOns/Blizzard_CharacterCreate/Blizzard_CharacterCreate.xml @@ -400,10 +400,8 @@ - - - - + + diff --git a/Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.lua b/Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.lua index 14f7e3f1c508cd92e8a889a0e8767c3083993a26..7855f9e4b8a12b22b10a62cd91cd3fff213aa074 100644 --- a/Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.lua +++ b/Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.lua @@ -76,6 +76,7 @@ end function CovenantPreviewFrameMixin:OnShow() self:RegisterEvent("COVENANT_PREVIEW_CLOSE"); self:RegisterEvent("PLAYER_CHOICE_CLOSE"); + UpdateScaleForFit(self); end function CovenantPreviewFrameMixin:OnHide() @@ -91,7 +92,7 @@ end function CovenantPreviewFrameMixin:OnEvent(event, ...) if (event == "COVENANT_PREVIEW_CLOSE" or event =="PLAYER_CHOICE_CLOSE") then - HideUIPanel(self); + self:Hide(); end end @@ -99,7 +100,7 @@ function CovenantPreviewFrameMixin:HandleEscape() if (self.showingFromPlayerChoice and PlayerChoiceFrame and PlayerChoiceFrame:IsShown()) then HideUIPanel(PlayerChoiceFrame); end - HideUIPanel(self); + self:Hide(); end function CovenantPreviewFrameMixin:Reset() @@ -146,7 +147,7 @@ function CovenantPreviewFrameMixin:SetupFramesWithTextureKit() end local function CovenantPreviewSortFunction(firstValue, secondValue) - return firstValue > secondValue; + return firstValue < secondValue; end function CovenantPreviewFrameMixin:TryShow(covenantInfo) @@ -172,7 +173,7 @@ function CovenantPreviewFrameMixin:TryShow(covenantInfo) self:SetupSoulbindButtons(covenantInfo.covenantSoulbinds); self:SetupCovenantInfoPanel(covenantInfo); self:SetupCovenantFeature(covenantInfo.featureInfo) - ShowUIPanel(self); + self:Show(); end function CovenantPreviewFrameMixin:SetupCovenantFeature(covenantFeatureInfo) @@ -231,11 +232,11 @@ end function CovenantPreviewFrameMixin:SetupModelSceneFrame(transmogSetID, mountID) self:SetupTextureKits(self.ModelSceneContainer, modelSceneContainerTextureKitRegions); + SetUpTransmogAndMountDressupFrame(self.ModelSceneContainer, transmogSetID, mountID, 414, 432, "CENTER", "CENTER", 0 , 0, true); local sources = C_TransmogSets.GetAllSourceIDs(transmogSetID); - DressUpTransmogSet(sources); - - TransmogAndMountDressupFrame:RemoveWeapons(); + DressUpTransmogSet(sources, TransmogAndMountDressupFrame); + TransmogAndMountDressupFrame:RemoveWeapons(); end function CovenantPreviewFrameMixin:SetupCovenantInfoPanel(covenantInfo) @@ -309,4 +310,9 @@ end function CovenantSoulbindButtonMixin:OnLeave() EmbeddedItemTooltip:Hide(); +end + +CovenantPreviewModelSceneContainerMixin = { }; +function CovenantPreviewModelSceneContainerMixin:ShouldAcceptDressUp() + return false; end \ No newline at end of file diff --git a/Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.xml b/Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.xml index 162f430bdaaa9f7e8fad1ba6005f105f350002c8..578f70866b41673e564da1cf54aa182e1f00609e 100644 --- a/Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.xml +++ b/Interface/AddOns/Blizzard_CovenantPreviewUI/Blizzard_CovenantPreviewUI.xml @@ -115,7 +115,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -175,9 +175,9 @@ - + - + @@ -279,10 +279,16 @@ - - diff --git a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetBelowMinimapFrame.xml b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetBelowMinimapFrame.xml index 4277f8b84fbb0b6668e78791ab176fc69f157e96..4aa9b10b8f7a07a9d1eb9825d050682e94da69aa 100644 --- a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetBelowMinimapFrame.xml +++ b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetBelowMinimapFrame.xml @@ -4,7 +4,6 @@ - diff --git a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetManager.lua b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetManager.lua index f73b690ac9d2d316d727deb357b2768902a421a0..f4d482a1d37a8533f7cd9ef6aacf576e5a13925e 100644 --- a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetManager.lua +++ b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetManager.lua @@ -170,7 +170,10 @@ function UIWidgetContainerMixin:RegisterForWidgetSet(widgetSetID, widgetLayoutFu self.timerWidgets = {}; self.numTimers = 0; self.numWidgetsShowing = 0; - self.widgetSetLayoutDirection = C_UIWidgetManager.GetWidgetLayoutDirectionFromWidgetSetID(widgetSetID); + + local widgetSetInfo = C_UIWidgetManager.GetWidgetSetInfo(widgetSetID); + self.widgetSetLayoutDirection = widgetSetInfo.layoutDirection; + self.verticalAnchorYOffset = -widgetSetInfo.verticalPadding; if self.attachedToUnit then C_UIWidgetManager.RegisterUnitForWidgetUpdates(self.attachedToUnit); diff --git a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetManager.xml b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetManager.xml index d83787a3dd56eeff973ea0a6073afd432da842ca..f30e7c1486cee6b5a1b96b4cc9a33cd8d92506bd 100644 --- a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetManager.xml +++ b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetManager.xml @@ -18,7 +18,6 @@ - diff --git a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateBase.lua b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateBase.lua index 1b6a3467a49c83c38a8d4633a318f7e2c49fd0dc..fcb5a8e3f37ec74d2d12bc81b08b877770c7944c 100644 --- a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateBase.lua +++ b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateBase.lua @@ -8,9 +8,13 @@ end function UIWidgetTemplateTooltipFrameMixin:OnLoad() end +function UIWidgetTemplateTooltipFrameMixin:UpdateMouseEnabled() + self:SetMouse(self.disableTooltip); +end + function UIWidgetTemplateTooltipFrameMixin:Setup(widgetContainer) - local disableMouse = widgetContainer.disableWidgetTooltips; - self:SetMouse(disableMouse); + self.disableTooltip = widgetContainer.disableWidgetTooltips; + self:UpdateMouseEnabled(); self:SetMouseClickEnabled(false); end @@ -25,7 +29,7 @@ function UIWidgetTemplateTooltipFrameMixin:SetTooltip(tooltip, color) if tooltip then self.tooltipContainsHyperLink, self.preString, self.hyperLinkString, self.postString = ExtractHyperlinkString(tooltip); end - self:SetMouse(); + self:UpdateMouseEnabled(); end function UIWidgetTemplateTooltipFrameMixin:SetTooltipOwner() diff --git a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateDiscreteProgressSteps.lua b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateDiscreteProgressSteps.lua index 27e307aeebf79e2e86a6c310f48c2baaa6bff00c..57fb74aa2a7359c5d2e4b7aa844dcdf171393606 100644 --- a/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateDiscreteProgressSteps.lua +++ b/Interface/AddOns/Blizzard_UIWidgets/Blizzard_UIWidgetTemplateDiscreteProgressSteps.lua @@ -54,6 +54,21 @@ function UIWidgetTemplateDiscreteProgressStepsMixin:OnLoad() self.wasActivated = {}; end +function UIWidgetTemplateDiscreteProgressStepsMixin:EvaluateTutorials(textureKit) + if ( (textureKit == "eyeofthejailer") and (not GetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_EYE_OF_JAILER)) ) then + local helpTipInfo = { + text = EYE_OF_JAILER_TUTORIAL, + buttonStyle = HelpTip.ButtonStyle.Close, + cvarBitfield = "closedInfoFrames", + bitfieldFlag = LE_FRAME_TUTORIAL_EYE_OF_JAILER, + targetPoint = HelpTip.Point.BottomEdgeCenter, + offsetY = -20, + extraRightMarginPadding = 12, + }; + HelpTip:Show(self, helpTipInfo); + end +end + function UIWidgetTemplateDiscreteProgressStepsMixin:Setup(widgetInfo, widgetContainer) UIWidgetBaseTemplateMixin.Setup(self, widgetInfo, widgetContainer); @@ -98,6 +113,7 @@ function UIWidgetTemplateDiscreteProgressStepsMixin:Setup(widgetInfo, widgetCont self.wasDeactivated[i] = true; self.wasActivated[i] = false; end + self:EvaluateTutorials(textureKit); end function UIWidgetTemplateDiscreteProgressStepsMixin:OnReset() diff --git a/Interface/FrameXML/ChatFrame.lua b/Interface/FrameXML/ChatFrame.lua index aca8047c8199826153e0edcfb71299ff7c4b81da..999fa2ab0084fa9ab6f2f9128568cd9f86478389 100644 --- a/Interface/FrameXML/ChatFrame.lua +++ b/Interface/FrameXML/ChatFrame.lua @@ -3402,7 +3402,7 @@ local function GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, ar -- Add Blizzard Icon if this was sent by a GM/DEV return "|TInterface\\ChatFrame\\UI-ChatIcon-Blizz:12:20:0:0:32:16:4:28:0:16|t "; elseif specialFlag == "GUIDE" then - if IsActivePlayerNewcomer() then + if C_PlayerMentorship.IsActivePlayerConsideredNewcomer() then return NPEV2_CHAT_USER_TAG_GUIDE .. " "; -- possibly unable to save global string with trailing whitespace... end elseif specialFlag == "NEWCOMER" then diff --git a/Interface/FrameXML/ContainerFrame.lua b/Interface/FrameXML/ContainerFrame.lua index 4aeb3b5f087f0ec93ca1b3dc3a8597cbb0d6be65..a4d9ea89b4e6f803bf228dfd8549ef006b841a2f 100644 --- a/Interface/FrameXML/ContainerFrame.lua +++ b/Interface/FrameXML/ContainerFrame.lua @@ -137,8 +137,8 @@ function ToggleBackpack() for i=1, NUM_CONTAINER_FRAMES, 1 do local frame = _G["ContainerFrame"..i]; if ( frame:IsShown() ) then - EventRegistry:TriggerEvent("ContainerFrame.CloseBackpack"); frame:Hide(); + EventRegistry:TriggerEvent("ContainerFrame.CloseBackpack"); end -- Hide the token bar if closing the backpack if ( BackpackTokenFrame ) then @@ -1460,7 +1460,8 @@ function ToggleAllBags() local totalBags = 1; if ( IsBagOpen(0) ) then bagsOpen = bagsOpen +1; - CloseBackpack() + CloseBackpack(); + EventRegistry:TriggerEvent("ContainerFrame.CloseBackpack"); end local bagClosed = false; diff --git a/Interface/FrameXML/DressUpFrames.lua b/Interface/FrameXML/DressUpFrames.lua index 97ea9de5c24a3197b5ee998fd9dd75880a6cebeb..3965400025d880db22ae2e2b12c4723e135ba48f 100644 --- a/Interface/FrameXML/DressUpFrames.lua +++ b/Interface/FrameXML/DressUpFrames.lua @@ -18,14 +18,27 @@ function DressUpTransmogLink(link) return DressUpVisual(link); end +local function ShouldAcceptDressUp(frame) + local parentFrame = frame.parentFrame; + if parentFrame == nil then + return; + end + + if parentFrame.ShouldAcceptDressUp then + return parentFrame:ShouldAcceptDressUp(); + end + + return parentFrame:IsShown(); +end + local function GetFrameAndSetBackground(raceFilename, classFilename) local frame; - if SideDressUpFrame.parentFrame and SideDressUpFrame.parentFrame:IsShown() then + if ShouldAcceptDressUp(SideDressUpFrame) then frame = SideDressUpFrame; if not raceFilename then raceFilename = select(2, UnitRace("player")); end - elseif( TransmogAndMountDressupFrame.parentFrame and TransmogAndMountDressupFrame.parentFrame:IsShown()) then + elseif ShouldAcceptDressUp(TransmogAndMountDressupFrame) then frame = TransmogAndMountDressupFrame; if not raceFilename then raceFilename = select(2, UnitRace("player")); @@ -59,8 +72,8 @@ function DressUpVisual(...) return true; end -function DressUpTransmogSet(itemModifiedAppearanceIDs) - local frame = GetFrameAndSetBackground(); +function DressUpTransmogSet(itemModifiedAppearanceIDs, forcedFrame) + local frame = forcedFrame or GetFrameAndSetBackground(); DressUpFrame_Show(frame); DressUpFrame_ApplyAppearances(frame, itemModifiedAppearanceIDs); end @@ -134,12 +147,12 @@ function DressUpMountLink(link) return false end -function DressUpMount(mountID) +function DressUpMount(mountID, forcedFrame) if ( not mountID or mountID == 0 ) then return false; end - local frame = GetFrameAndSetBackground("Pet", "warrior"); --default to warrior BG when viewing full Pet/Mounts for now + local frame = forcedFrame or GetFrameAndSetBackground("Pet", "warrior"); --default to warrior BG when viewing full Pet/Mounts for now --Show the frame if ( not frame:IsShown() or frame.mode ~= "mount" ) then @@ -217,7 +230,7 @@ function DressUpFrame_Show(frame) frame.ResetButton:SetShown(frame ~= TransmogAndMountDressupFrame); -- If there's not enough space as-is, try minimizing. - if not CanShowRightUIPanel(frame) and not frame.MaximizeMinimizeFrame:IsMinimized() then + if not CanShowRightUIPanel(frame) and frame.MaximizeMinimizeFrame and not frame.MaximizeMinimizeFrame:IsMinimized() then local isAutomaticAction = true; frame.MaximizeMinimizeFrame:Minimize(isAutomaticAction); diff --git a/Interface/FrameXML/GameTooltip.lua b/Interface/FrameXML/GameTooltip.lua index 2f8917d08d4f808e55191a2dc9ddf0570657eb6c..5bf203e9168a3d869d79e0efbacc700cda6b6717 100644 --- a/Interface/FrameXML/GameTooltip.lua +++ b/Interface/FrameXML/GameTooltip.lua @@ -780,7 +780,6 @@ function GameTooltip_AddWidgetSet(self, widgetSetID) self.widgetContainer = self.widgetFrame.WidgetContainer; self.widgetContainer.verticalAnchorPoint = "TOPLEFT"; self.widgetContainer.verticalRelativePoint = "BOTTOMLEFT"; - self.widgetContainer.verticalAnchorYOffset = -10; self.widgetContainer.showAndHideOnWidgetSetRegistration = false; self.widgetContainer.disableWidgetTooltips = true; self.widgetContainer:Hide(); diff --git a/Interface/FrameXML/ItemButtonTemplate.lua b/Interface/FrameXML/ItemButtonTemplate.lua index 3c63e693762a28c5b58f024d9992833ee668e665..0e8339c7f937d89eba84197b47286fef773fe117 100644 --- a/Interface/FrameXML/ItemButtonTemplate.lua +++ b/Interface/FrameXML/ItemButtonTemplate.lua @@ -187,6 +187,9 @@ function SetItemButtonOverlay(button, itemIDOrLink, quality) elseif IsCorruptedItem(itemIDOrLink) then button.IconOverlay:SetAtlas("Nzoth-inventory-icon"); button.IconOverlay:Show(); + elseif IsCosmeticItem(itemIDOrLink) then + button.IconOverlay:SetAtlas("CosmeticIconFrame"); + button.IconOverlay:Show(); elseif C_Soulbinds.IsItemConduitByItemInfo(itemIDOrLink) then if not quality or not BAG_ITEM_QUALITY_COLORS[quality] then quality = Enum.ItemQuality.Common; diff --git a/Interface/FrameXML/MailFrame.xml b/Interface/FrameXML/MailFrame.xml index 5e1a27f56e65ab03dad048a352bc43f2932e18c1..0d9f59e5e25c0bccfba910348418b6dce521414f 100644 --- a/Interface/FrameXML/MailFrame.xml +++ b/Interface/FrameXML/MailFrame.xml @@ -126,6 +126,14 @@ + + + @@ -200,6 +208,14 @@ + + + diff --git a/Interface/FrameXML/MultiActionBars.xml b/Interface/FrameXML/MultiActionBars.xml index 930484a317be347d54d10a954cd68419d2c56e84..e70076e532a66336adb2721c62b9ecaf29452238 100644 --- a/Interface/FrameXML/MultiActionBars.xml +++ b/Interface/FrameXML/MultiActionBars.xml @@ -283,7 +283,7 @@ - +