11.0.7 (57528)

Gethe · Nov 13, 2024 · e0d078d · e0d078d
1 parent 94d3470
commit e0d078d
Show file tree

Hide file tree

Showing 46 changed files with 501 additions and 136 deletions.
diff --git a/Interface/AddOns/Blizzard_APIDocumentationGenerated/AccountConstantsDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentationGenerated/AccountConstantsDocumentation.lua
@@ -70,9 +70,9 @@ local AccountConstants =
 		{
 			Name = "AccountTransType",
 			Type = "Enumeration",
-			NumValues = 55,
+			NumValues = 59,
 			MinValue = 0,
-			MaxValue = 54,
+			MaxValue = 58,
 			Fields =
 			{
 				{ Name = "ProxyForwarder", Type = "AccountTransType", EnumValue = 0 },
@@ -130,6 +130,10 @@ local AccountConstants =
 				{ Name = "PlayerDataElements", Type = "AccountTransType", EnumValue = 52 },
 				{ Name = "CharacterDataMerge", Type = "AccountTransType", EnumValue = 53 },
 				{ Name = "AccountStore", Type = "AccountTransType", EnumValue = 54 },
+				{ Name = "WarbandGroups", Type = "AccountTransType", EnumValue = 55 },
+				{ Name = "Mapping", Type = "AccountTransType", EnumValue = 56 },
+				{ Name = "CharacterItems", Type = "AccountTransType", EnumValue = 57 },
+				{ Name = "CurrencyTransferLog", Type = "AccountTransType", EnumValue = 58 },
 			},
 		},
 		{

diff --git a/Interface/AddOns/Blizzard_APIDocumentationGenerated/Blizzard_APIDocumentationGenerated.toc b/Interface/AddOns/Blizzard_APIDocumentationGenerated/Blizzard_APIDocumentationGenerated.toc
@@ -82,7 +82,6 @@ GMTicketInfoDocumentation.lua
 GameCursorDocumentation.lua
 GameEnvironmentManagerDocumentation.lua
 GameErrorDocumentation.lua
-GameModeManagerDocumentation.lua
 GamePadDocumentation.lua
 GameRulesDocumentation.lua
 GameUIDocumentation.lua
@@ -364,6 +363,7 @@ GamePadConstDocumentation.lua
 GameRulesConstantsDocumentation.lua
 GarrisonConstantsDocumentation.lua
 GossipConstantsDocumentation.lua
+GroupFinderConstantsDocumentation.lua
 GuildInfoSharedDocumentation.lua
 InputConstantsDocumentation.lua
 ItemConstantsDocumentation.lua

diff --git a/Interface/AddOns/Blizzard_APIDocumentationGenerated/GameModeManagerDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentationGenerated/GameModeManagerDocumentation.lua
diff --git a/Interface/AddOns/Blizzard_APIDocumentationGenerated/GameRulesConstantsDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentationGenerated/GameRulesConstantsDocumentation.lua
@@ -5,13 +5,27 @@ local GameRulesConstants =
 		{
 			Name = "GameRuleFlags",
 			Type = "Enumeration",
-			NumValues = 2,
+			NumValues = 3,
 			MinValue = 0,
-			MaxValue = 1,
+			MaxValue = 2,
 			Fields =
 			{
 				{ Name = "None", Type = "GameRuleFlags", EnumValue = 0 },
 				{ Name = "AllowClient", Type = "GameRuleFlags", EnumValue = 1 },
+				{ Name = "RequiresDefault", Type = "GameRuleFlags", EnumValue = 2 },
+			},
+		},
+		{
+			Name = "GameRuleType",
+			Type = "Enumeration",
+			NumValues = 3,
+			MinValue = 0,
+			MaxValue = 2,
+			Fields =
+			{
+				{ Name = "Int", Type = "GameRuleType", EnumValue = 0 },
+				{ Name = "Float", Type = "GameRuleType", EnumValue = 1 },
+				{ Name = "Bool", Type = "GameRuleType", EnumValue = 2 },
 			},
 		},
 	},

diff --git a/Interface/AddOns/Blizzard_APIDocumentationGenerated/GarrisonInfoDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentationGenerated/GarrisonInfoDocumentation.lua
@@ -444,6 +444,20 @@ local GarrisonInfo =
 				{ Name = "followerOnCompletedMission", Type = "bool", Nilable = false },
 			},
 		},
+		{
+			Name = "IsLandingPageMinimapButtonVisible",
+			Type = "Function",
+
+			Arguments =
+			{
+				{ Name = "garrType", Type = "number", Nilable = false },
+			},
+
+			Returns =
+			{
+				{ Name = "isLandingPageMinimapButtonVisible", Type = "bool", Nilable = false },
+			},
+		},
 		{
 			Name = "IsTalentConditionMet",
 			Type = "Function",

diff --git a/Interface/AddOns/Blizzard_APIDocumentationGenerated/GroupFinderConstantsDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentationGenerated/GroupFinderConstantsDocumentation.lua
@@ -0,0 +1,8 @@
+local GroupFinderConstants =
+{
+	Tables =
+	{
+	},
+};
+
+APIDocumentation:AddDocumentationTable(GroupFinderConstants);
diff --git a/Interface/AddOns/Blizzard_APIDocumentationGenerated/MinimapDocumentation.lua b/Interface/AddOns/Blizzard_APIDocumentationGenerated/MinimapDocumentation.lua
@@ -158,6 +158,20 @@ local Minimap =
 				{ Name = "isFiltered", Type = "bool", Nilable = false },
 			},
 		},
+		{
+			Name = "IsInsideQuestBlob",
+			Type = "Function",
+
+			Arguments =
+			{
+				{ Name = "questID", Type = "number", Nilable = false },
+			},
+
+			Returns =
+			{
+				{ Name = "isInside", Type = "bool", Nilable = false },
+			},
+		},
 		{
 			Name = "IsRotateMinimapIgnored",
 			Type = "Function",
@@ -267,6 +281,16 @@ local Minimap =
 			Type = "Event",
 			LiteralName = "MINIMAP_UPDATE_ZOOM",
 		},
+		{
+			Name = "PlayerInsideQuestBlobStateChanged",
+			Type = "Event",
+			LiteralName = "PLAYER_INSIDE_QUEST_BLOB_STATE_CHANGED",
+			Payload =
+			{
+				{ Name = "questID", Type = "number", Nilable = false },
+				{ Name = "isInside", Type = "bool", Nilable = false },
+			},
+		},
 	},
 
 	Tables =

diff --git a/Interface/AddOns/Blizzard_AccountStore/Blizzard_AccountStore.lua b/Interface/AddOns/Blizzard_AccountStore/Blizzard_AccountStore.lua
@@ -22,10 +22,12 @@ function AccountStoreMixin:OnLoad()
 end
 
 function AccountStoreMixin:OnShow()
+	PlaySound(SOUNDKIT.ACCOUNT_STORE_OPEN);
 	EventRegistry:TriggerEvent("AccountStore.ShownState", true);
 end
 
 function AccountStoreMixin:OnHide()
+	PlaySound(SOUNDKIT.ACCOUNT_STORE_CLOSE);
 	EventRegistry:TriggerEvent("AccountStore.ShownState", false);
 
 	if self.inFullscreenMode then

diff --git a/Interface/AddOns/Blizzard_AccountStore/Blizzard_AccountStore.xml b/Interface/AddOns/Blizzard_AccountStore/Blizzard_AccountStore.xml
@@ -75,7 +75,7 @@
 		</Layers>
 	</Frame>
 
-	<Frame name="AccountStoreFrame" mixin="AccountStoreMixin" frameStrata="HIGH" parent="UIParent" inherits="PortraitFrameTemplate, PingReceiverAttributeTemplate" enableMouse="true" hidden="true">
+	<Frame name="AccountStoreFrame" mixin="AccountStoreMixin" frameStrata="HIGH" parent="UIParent" inherits="PortraitFrameTemplate, PingReceiverAttributeTemplate" enableMouse="true" hidden="true" toplevel="true">
 		<Size x="800" y="537" />
 		<Anchors>
 			<Anchor point="LEFT" x="50" y="0" />

diff --git a/Interface/AddOns/Blizzard_AccountStore/Blizzard_AccountStoreCardTemplates.lua b/Interface/AddOns/Blizzard_AccountStore/Blizzard_AccountStoreCardTemplates.lua
@@ -58,6 +58,11 @@ function AccountStoreBaseCardMixin:OnHide()
 end
 
 function AccountStoreBaseCardMixin:OnEnter()
+	if not self.hoverSoundPlayed then
+		self.hoverSoundPlayed = true;
+		PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_HOVER);
+	end
+
 	local itemInfo = self.itemInfo;
 	local description = itemInfo.description;
 	if not description then
@@ -79,6 +84,10 @@ function AccountStoreBaseCardMixin:OnEnter()
 end
 
 function AccountStoreBaseCardMixin:OnLeave()
+	if not self:IsMouseOver() and not self.ModelScene:IsMouseOver() then
+		self.hoverSoundPlayed = false;
+	end
+
 	GetAppropriateTooltip():Hide();
 end
 
@@ -147,6 +156,8 @@ function AccountStoreBaseCardMixin:SetItemID(itemID)
 end
 
 function AccountStoreBaseCardMixin:SelectCard()
+	PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_SELECT);
+
 	local itemInfo = self.itemInfo;
 	local isRefundable = itemInfo.status == Enum.AccountStoreItemStatus.Refundable;
 	local confirmationFormat = isRefundable and ACCOUNT_STORE_REFUND_CONFIRMATION_FORMAT or PLUNDERSTORE_PURCHASE_CONFIRMATION_FORMAT;
@@ -156,6 +167,7 @@ function AccountStoreBaseCardMixin:SelectCard()
 		StaticPopup_Hide("GENERIC_CONFIRMATION");
 
 		StaticPopup_ShowGenericConfirmation(confirmation, function ()
+			PlaySound(SOUNDKIT.ACCOUNT_STORE_ITEM_PURCHASE);
 			if isRefundable then
 				C_AccountStore.RefundItem(itemInfo.id);
 			else

diff --git a/Interface/AddOns/Blizzard_AccountStore/Blizzard_AccountStoreItemDisplay.lua b/Interface/AddOns/Blizzard_AccountStore/Blizzard_AccountStoreItemDisplay.lua
@@ -9,8 +9,15 @@ function AccountStoreItemDisplayMixin:OnLoad()
 	self.categoryTypeToItemRack = {};
 	self.currentPage = 1;
 
-	self.Footer.PrevPageButton:SetScript("OnClick", function() self:SetPage(self.currentPage - 1); end);
-	self.Footer.NextPageButton:SetScript("OnClick", function() self:SetPage(self.currentPage + 1); end);
+	self.Footer.PrevPageButton:SetScript("OnClick", function()
+		PlaySound(SOUNDKIT.ACCOUNT_STORE_PAGE_NAVIGATION);
+		self:SetPage(self.currentPage - 1);
+	end);
+
+	self.Footer.NextPageButton:SetScript("OnClick", function()
+		PlaySound(SOUNDKIT.ACCOUNT_STORE_PAGE_NAVIGATION);
+		self:SetPage(self.currentPage + 1);
+	end);
 
 	self.Footer.CurrencyAvailable:SetScript("OnEnter", function(onEnterSelf)
 		local tooltip = GetAppropriateTooltip();

diff --git a/Interface/AddOns/Blizzard_ActionBar/Cata/MainMenuBarMicroButtons.lua b/Interface/AddOns/Blizzard_ActionBar/Cata/MainMenuBarMicroButtons.lua
@@ -4,6 +4,7 @@ MICRO_BUTTONS = {
 	"TalentMicroButton",
 	"AchievementMicroButton",
 	"QuestLogMicroButton",
+	"SocialsMicroButton",
 	"GuildMicroButton",
 	"EJMicroButton",
 	"CollectionsMicroButton",
@@ -63,6 +64,10 @@ function UpdateMicroButtons()
 		QuestLogMicroButton:SetButtonState("NORMAL");
 	end
 
+	SocialsMicroButton:UpdateMicroButton();
+
+	GuildMicroButton:UpdateMicroButton();
+
 	if ( EncounterJournal and EncounterJournal:IsShown() ) then
 		EJMicroButton:SetButtonState("PUSHED", 1);
 	else
@@ -129,8 +134,6 @@ function UpdateMicroButtons()
 			AchievementMicroButton:Disable();
 		end
 	end
-
-	GuildMicroButton:UpdateMicroButton();
 end
 
 function AchievementMicroButton_OnLoad()

diff --git a/Interface/AddOns/Blizzard_ActionBar/Cata/MainMenuBarMicroButtons.xml b/Interface/AddOns/Blizzard_ActionBar/Cata/MainMenuBarMicroButtons.xml
@@ -223,16 +223,25 @@
 			</OnClick>
 		</Scripts>
 	</Button>
-	<Button name="GuildMicroButton" inherits="MainMenuBarMicroButton" mixin="GuildMicroButtonMixin">
+	<Button name="SocialsMicroButton" inherits="MainMenuBarMicroButton" mixin="SocialsMicroButtonMixin">
+		<!-- Note: SocialMicroButton and GuildMicroButton occupy the same space. Only one will be visible at a time. -->
+		<Anchors>
+			<Anchor point="BOTTOMLEFT" relativeTo="QuestLogMicroButton" relativePoint="BOTTOMRIGHT" x="-3" y="0"/>
+		</Anchors>
+		<Scripts>
+			<OnLoad method="OnLoad"/>
+			<OnEvent method="OnEvent"/>
+			<OnShow function="MicroButton_KioskModeDisable" inherit="append"/>
+			<OnClick method="OnClick" inherit="append"/>
+		</Scripts>
+	</Button>
+	<Button name="GuildMicroButton" inherits="MainMenuBarMicroButton" mixin="GuildMicroButtonMixin" hidden="true">
+		<!-- Note: SocialMicroButton and GuildMicroButton occupy the same space. Only one will be visible at a time. -->
 		<KeyValues>
 			<KeyValue key="commandName" value="TOGGLEGUILDTAB" type="string"/>
 		</KeyValues>
 		<Anchors>
-			<Anchor point="BOTTOMLEFT" relativeTo="QuestLogMicroButton" relativePoint="BOTTOMRIGHT">
-				<Offset>
-					<AbsDimension x="-3" y="0"/>
-				</Offset>
-			</Anchor>
+			<Anchor point="CENTER" relativeTo="SocialsMicroButton" relativePoint="CENTER"/>
 		</Anchors>
 		<Frames>
 			<Frame parentKey="NotificationOverlay" frameLevel="100" setAllPoints="true" hidden="true"/>

diff --git a/Interface/AddOns/Blizzard_ActionBar/Mainline/ActionButtonOverrides.lua b/Interface/AddOns/Blizzard_ActionBar/Mainline/ActionButtonOverrides.lua
@@ -223,6 +223,10 @@ if C_GameModeManager.GetCurrentGameMode() == Enum.GameMode.Plunderstorm then
 	end
 
 	function ActionBarActionButtonDerivedMixin:SetSwappableState(swappable)
+		if not WOWLABS_ACTIONBUTTON_MAP[self.action] then
+			return;
+		end
+
 		self:SetNormalAtlas(swappable and "plunderstorm-actionbar-slot-border-swappable" or "plunderstorm-actionbar-slot-border");
 	end
 

diff --git a/Interface/AddOns/Blizzard_ActionBar/Mainline/MainMenuBarMicroButtons.lua b/Interface/AddOns/Blizzard_ActionBar/Mainline/MainMenuBarMicroButtons.lua
@@ -1172,6 +1172,7 @@ function LFDMicroButtonMixin:UpdateMicroButton()
 		else
 			self:Enable();
 			self:SetNormal();
+			EventRegistry:TriggerEvent("PlunderstormQueueTutorial.Update");
 		end
 	end
 end
-Original file line number
+Diff line change
@@ Expand Up @@
     	end
     	function ActionBarActionButtonDerivedMixin:SetSwappableState(swappable)
+    		if not WOWLABS_ACTIONBUTTON_MAP[self.action] then
+    			return;
+    		end
     		self:SetNormalAtlas(swappable and "plunderstorm-actionbar-slot-border-swappable" or "plunderstorm-actionbar-slot-border");
     	end
@@ Expand Down @@