Commit 819e0b70 authored by TOM_RUS's avatar TOM_RUS

WOW-36512patch9.0.2_Beta

parent b8655359
...@@ -105,6 +105,7 @@ local CovenantPreview = ...@@ -105,6 +105,7 @@ local CovenantPreview =
{ Name = "uiTextureKit", Type = "string", Nilable = false }, { Name = "uiTextureKit", Type = "string", Nilable = false },
{ Name = "name", Type = "string", Nilable = false }, { Name = "name", Type = "string", Nilable = false },
{ Name = "description", Type = "string", Nilable = false }, { Name = "description", Type = "string", Nilable = false },
{ Name = "sortOrder", Type = "number", Nilable = false },
}, },
}, },
}, },
......
...@@ -146,8 +146,8 @@ local CurrencyConstants = ...@@ -146,8 +146,8 @@ local CurrencyConstants =
{ Name = "GarrisonTalentTreeReset", Type = "CurrencySource", EnumValue = 44 }, { Name = "GarrisonTalentTreeReset", Type = "CurrencySource", EnumValue = 44 },
{ Name = "DailyReset", Type = "CurrencySource", EnumValue = 45 }, { Name = "DailyReset", Type = "CurrencySource", EnumValue = 45 },
{ Name = "AddConduitToCollection", Type = "CurrencySource", EnumValue = 46 }, { Name = "AddConduitToCollection", Type = "CurrencySource", EnumValue = 46 },
{ Name = "Last", Type = "CurrencySource", EnumValue = 47 }, { Name = "Barbershop", Type = "CurrencySource", EnumValue = 47 },
{ Name = "Barbershop", Type = "CurrencySource", EnumValue = 48 }, { Name = "Last", Type = "CurrencySource", EnumValue = 48 },
}, },
}, },
{ {
......
...@@ -357,14 +357,6 @@ local GarrisonConstants = ...@@ -357,14 +357,6 @@ local GarrisonConstants =
{ Name = "Type_9_0", Type = "GarrisonType", EnumValue = 111 }, { Name = "Type_9_0", Type = "GarrisonType", EnumValue = 111 },
}, },
}, },
{
Name = "GarrisonConstsExposed",
Type = "Constants",
Values =
{
{ Name = "GARRISON_AUTO_COMBATANT_FULL_HEAL_COST", Type = "number", Value = 100 },
},
},
}, },
}; };
......
...@@ -560,6 +560,15 @@ local GarrisonInfo = ...@@ -560,6 +560,15 @@ local GarrisonInfo =
{ Name = "followerDurability", Type = "number", Nilable = false }, { Name = "followerDurability", Type = "number", Nilable = false },
}, },
}, },
{
Name = "GarrisonFollowerHealed",
Type = "Event",
LiteralName = "GARRISON_FOLLOWER_HEALED",
Payload =
{
{ Name = "followerID", Type = "string", Nilable = false },
},
},
{ {
Name = "GarrisonFollowerListUpdate", Name = "GarrisonFollowerListUpdate",
Type = "Event", Type = "Event",
...@@ -1086,6 +1095,7 @@ local GarrisonInfo = ...@@ -1086,6 +1095,7 @@ local GarrisonInfo =
{ Name = "maxHealth", Type = "number", Nilable = false }, { Name = "maxHealth", Type = "number", Nilable = false },
{ Name = "attack", Type = "number", Nilable = false }, { Name = "attack", Type = "number", Nilable = false },
{ Name = "healingTimestamp", Type = "number", Nilable = false }, { Name = "healingTimestamp", Type = "number", Nilable = false },
{ Name = "healCost", Type = "number", Nilable = false },
}, },
}, },
{ {
......
...@@ -60,6 +60,11 @@ local PlayerMentorship = ...@@ -60,6 +60,11 @@ local PlayerMentorship =
Events = Events =
{ {
{
Name = "MentorshipStatusChanged",
Type = "Event",
LiteralName = "MENTORSHIP_STATUS_CHANGED",
},
{ {
Name = "NewcomerGraduation", Name = "NewcomerGraduation",
Type = "Event", Type = "Event",
......
...@@ -89,9 +89,9 @@ local ScenarioInfo = ...@@ -89,9 +89,9 @@ local ScenarioInfo =
{ {
Name = "JailersTowerType", Name = "JailersTowerType",
Type = "Enumeration", Type = "Enumeration",
NumValues = 11, NumValues = 12,
MinValue = 0, MinValue = 0,
MaxValue = 10, MaxValue = 11,
Fields = Fields =
{ {
{ Name = "TwistingCorridors", Type = "JailersTowerType", EnumValue = 0 }, { Name = "TwistingCorridors", Type = "JailersTowerType", EnumValue = 0 },
...@@ -105,6 +105,7 @@ local ScenarioInfo = ...@@ -105,6 +105,7 @@ local ScenarioInfo =
{ Name = "TormentChamberJaina", Type = "JailersTowerType", EnumValue = 8 }, { Name = "TormentChamberJaina", Type = "JailersTowerType", EnumValue = 8 },
{ Name = "TormentChamberThrall", Type = "JailersTowerType", EnumValue = 9 }, { Name = "TormentChamberThrall", Type = "JailersTowerType", EnumValue = 9 },
{ Name = "TormentChamberAnduin", Type = "JailersTowerType", EnumValue = 10 }, { Name = "TormentChamberAnduin", Type = "JailersTowerType", EnumValue = 10 },
{ Name = "AdamantVaults", Type = "JailersTowerType", EnumValue = 11 },
}, },
}, },
}, },
......
...@@ -28,7 +28,7 @@ function AdventureMap_MissionDataProviderMixin:OnEvent(event, ...) ...@@ -28,7 +28,7 @@ function AdventureMap_MissionDataProviderMixin:OnEvent(event, ...)
end end
elseif event == "GARRISON_MISSION_LIST_UPDATE" then elseif event == "GARRISON_MISSION_LIST_UPDATE" then
local followerType = ...; local followerType = ...;
if followerType == Enum.GarrisonFollowerType.FollowerType_7_0 then if followerType == Enum.GarrisonFollowerType.FollowerType_7_0 or followerType == Enum.GarrisonFollowerType.FollowerType_9_0 then
self:RefreshAllData(); self:RefreshAllData();
end end
elseif event == "GARRISON_MISSION_FINISHED" then elseif event == "GARRISON_MISSION_FINISHED" then
......
...@@ -173,11 +173,13 @@ function BarberShopMixin:ResetCharacterRotation() ...@@ -173,11 +173,13 @@ function BarberShopMixin:ResetCharacterRotation()
end end
function BarberShopMixin:SetViewingAlteredForm(viewingAlteredForm, resetCategory) function BarberShopMixin:SetViewingAlteredForm(viewingAlteredForm, resetCategory)
self:RegisterEvent("BARBER_SHOP_CAMERA_VALUES_UPDATED");
C_BarberShop.SetViewingAlteredForm(viewingAlteredForm); C_BarberShop.SetViewingAlteredForm(viewingAlteredForm);
self:UpdateCharCustomizationFrame(resetCategory); self:UpdateCharCustomizationFrame(resetCategory);
end end
function BarberShopMixin:SetViewingShapeshiftForm(formID) function BarberShopMixin:SetViewingShapeshiftForm(formID)
self:RegisterEvent("BARBER_SHOP_CAMERA_VALUES_UPDATED");
C_BarberShop.SetViewingShapeshiftForm(formID); C_BarberShop.SetViewingShapeshiftForm(formID);
self.Sexes:SetShown(formID == nil); self.Sexes:SetShown(formID == nil);
end end
......
...@@ -757,6 +757,8 @@ end ...@@ -757,6 +757,8 @@ end
QuickKeybindFrameMixin = {}; QuickKeybindFrameMixin = {};
function QuickKeybindFrameMixin:OnShow() function QuickKeybindFrameMixin:OnShow()
EventRegistry:TriggerEvent("QuickKeybindFrame.QuickKeybindModeEnabled");
self.characterSpecificButton:SetChecked(KeyBindingFrame.characterSpecificButton:GetChecked()); self.characterSpecificButton:SetChecked(KeyBindingFrame.characterSpecificButton:GetChecked());
self.mouseOverButton = nil; self.mouseOverButton = nil;
Enable_BagButtons(); Enable_BagButtons();
...@@ -769,6 +771,8 @@ function QuickKeybindFrameMixin:OnShow() ...@@ -769,6 +771,8 @@ function QuickKeybindFrameMixin:OnShow()
end end
function QuickKeybindFrameMixin:OnHide() function QuickKeybindFrameMixin:OnHide()
EventRegistry:TriggerEvent("QuickKeybindFrame.QuickKeybindModeDisabled");
KeybindFrames_ClearOutputText(); KeybindFrames_ClearOutputText();
if ( not GameMenuFrame:IsShown() ) then if ( not GameMenuFrame:IsShown() ) then
ShowUIPanel(KeyBindingFrame); ShowUIPanel(KeyBindingFrame);
......
...@@ -166,6 +166,8 @@ function ChannelFrameMixin:OnEvent(event, ...) ...@@ -166,6 +166,8 @@ function ChannelFrameMixin:OnEvent(event, ...)
self:MarkDirty("UpdateChannelList"); self:MarkDirty("UpdateChannelList");
elseif event == "CHAT_MSG_CHANNEL_NOTICE" then elseif event == "CHAT_MSG_CHANNEL_NOTICE" then
self:OnChannelNotice(...); self:OnChannelNotice(...);
elseif event == "MENTORSHIP_STATUS_CHANGED" then
self:OnMentorshipStatusChanged();
end end
end end
...@@ -638,16 +640,33 @@ function ChannelFrameMixin:OnChannelNotice(...) ...@@ -638,16 +640,33 @@ function ChannelFrameMixin:OnChannelNotice(...)
local channelIndex = select(8, ...); local channelIndex = select(8, ...);
if eventType == "YOU_CHANGED" and C_ChatInfo.GetChannelRuleset(channelIndex) == Enum.ChatChannelRuleset.Mentor then if eventType == "YOU_CHANGED" and C_ChatInfo.GetChannelRuleset(channelIndex) == Enum.ChatChannelRuleset.Mentor then
local channelSlashCommand = GetSlashCommandForChannelOpenChat(channelIndex); self:CheckNewcomerChannelJoin(channelIndex);
if IsActivePlayerNewcomer() then end
ChatFrame_DisplaySystemMessageInPrimary(NPEV2_CHAT_WELCOME_TO_CHANNEL_NEWCOMER:format(channelSlashCommand)); end
ChatFrame_DisplaySystemMessageInPrimary(NPEV2_CHAT_WELCOME_TO_CHANNEL_NEWCOMER1:format(channelSlashCommand));
ChatFrame_DisplaySystemMessageInPrimary(NPEV2_CHAT_WELCOME_TO_CHANNEL_NEWCOMER2:format(channelSlashCommand)); function ChannelFrameMixin:OnMentorshipStatusChanged()
else if self.pendingNewcomerChannelIndex then
-- NOTE: Guide flags won't be set at this point if the user is joining from the NPC, assume that if the channel join is happening, local channelIndex = self.pendingNewcomerChannelIndex;
-- then if you're not a newcomer, you must be a guide. self.pendingNewcomerChannelIndex = nil;
ChatFrame_DisplaySystemMessageInPrimary(NPEV2_CHAT_WELCOME_TO_CHANNEL_GUIDE:format(channelSlashCommand)); self:UnregisterEvent("MENTORSHIP_STATUS_CHANGED");
end self:CheckNewcomerChannelJoin(channelIndex);
end
end
function ChannelFrameMixin:CheckNewcomerChannelJoin(channelIndex)
local channelSlashCommand = GetSlashCommandForChannelOpenChat(channelIndex);
if IsActivePlayerNewcomer() then
ChatFrame_DisplaySystemMessageInPrimary(NPEV2_CHAT_WELCOME_TO_CHANNEL_NEWCOMER:format(channelSlashCommand));
ChatFrame_DisplaySystemMessageInPrimary(NPEV2_CHAT_WELCOME_TO_CHANNEL_NEWCOMER1:format(channelSlashCommand));
ChatFrame_DisplaySystemMessageInPrimary(NPEV2_CHAT_WELCOME_TO_CHANNEL_NEWCOMER2:format(channelSlashCommand));
elseif IsActivePlayerMentor() then
-- NOTE: Guide flags won't be set at this point if the user is joining from the NPC, assume that if the channel join is happening,
-- then if you're not a newcomer, you must be a guide.
ChatFrame_DisplaySystemMessageInPrimary(NPEV2_CHAT_WELCOME_TO_CHANNEL_GUIDE:format(channelSlashCommand));
else
self.pendingNewcomerChannelIndex = channelIndex;
self:RegisterEvent("MENTORSHIP_STATUS_CHANGED");
end end
end end
......
...@@ -195,7 +195,7 @@ local rafHelpTipInfo = { ...@@ -195,7 +195,7 @@ local rafHelpTipInfo = {
function CharacterCreateMixin:UpdateRecruitInfo() function CharacterCreateMixin:UpdateRecruitInfo()
local active, faction = C_RecruitAFriend.GetRecruitInfo(); local active, faction = C_RecruitAFriend.GetRecruitInfo();
if active and not self.paidServiceType and C_CharacterCreation.IsNewPlayerRestricted() then if active and not self.paidServiceType and C_CharacterCreation.UseBeginnerMode() then
local recruiterIsHorde = (PLAYER_FACTION_GROUP[faction] == "Horde"); local recruiterIsHorde = (PLAYER_FACTION_GROUP[faction] == "Horde");
rafHelpTipInfo.text = recruiterIsHorde and RECRUIT_A_FRIEND_FACTION_SUGGESTION_HORDE or RECRUIT_A_FRIEND_FACTION_SUGGESTION_ALLIANCE; rafHelpTipInfo.text = recruiterIsHorde and RECRUIT_A_FRIEND_FACTION_SUGGESTION_HORDE or RECRUIT_A_FRIEND_FACTION_SUGGESTION_ALLIANCE;
rafHelpTipInfo.targetPoint = recruiterIsHorde and HelpTip.Point.RightEdgeCenter or HelpTip.Point.LeftEdgeCenter; rafHelpTipInfo.targetPoint = recruiterIsHorde and HelpTip.Point.RightEdgeCenter or HelpTip.Point.LeftEdgeCenter;
...@@ -448,7 +448,7 @@ function CharacterCreateMixin:SetMode(mode, instantRotate) ...@@ -448,7 +448,7 @@ function CharacterCreateMixin:SetMode(mode, instantRotate)
ClassTrialSpecs:SetShown(mode == CHAR_CREATE_MODE_CUSTOMIZE and (C_CharacterCreation.GetCharacterCreateType() == Enum.CharacterCreateType.TrialBoost)); ClassTrialSpecs:SetShown(mode == CHAR_CREATE_MODE_CUSTOMIZE and (C_CharacterCreation.GetCharacterCreateType() == Enum.CharacterCreateType.TrialBoost));
NameChoiceFrame:SetShown(mode == CHAR_CREATE_MODE_CUSTOMIZE); NameChoiceFrame:SetShown(mode == CHAR_CREATE_MODE_CUSTOMIZE);
ZoneChoiceFrame:SetShown(mode == CHAR_CREATE_MODE_ZONE_CHOICE); ZoneChoiceFrame:SetShown(mode == CHAR_CREATE_MODE_ZONE_CHOICE);
NewPlayerTutorial:SetShown(mode == CHAR_CREATE_MODE_CUSTOMIZE and C_CharacterCreation.IsNewPlayerRestricted()); NewPlayerTutorial:SetShown(mode == CHAR_CREATE_MODE_CUSTOMIZE and C_CharacterCreation.UseBeginnerMode());
self.currentMode = mode; self.currentMode = mode;
self.creatingCharacter = false; self.creatingCharacter = false;
...@@ -747,7 +747,7 @@ function CharacterCreateClassButtonMixin:SetClass(classData, selectedClassID) ...@@ -747,7 +747,7 @@ function CharacterCreateClassButtonMixin:SetClass(classData, selectedClassID)
local validAllianceRaceNames = {}; local validAllianceRaceNames = {};
local validHordeRaceNames = {}; local validHordeRaceNames = {};
for _, raceData in ipairs(validRaces) do for _, raceData in ipairs(validRaces) do
if not raceData.isAlliedRace or not C_CharacterCreation.IsNewPlayerRestricted() then if not raceData.isAlliedRace or not C_CharacterCreation.UseBeginnerMode() then
if raceData.isNeutralRace or (raceData.factionInternalName == "Alliance") then if raceData.isNeutralRace or (raceData.factionInternalName == "Alliance") then
tinsert(validAllianceRaceNames, raceData.name); tinsert(validAllianceRaceNames, raceData.name);
end end
...@@ -865,10 +865,10 @@ function CharacterCreateRaceButtonMixin:SetRace(raceData, selectedSexID, selecte ...@@ -865,10 +865,10 @@ function CharacterCreateRaceButtonMixin:SetRace(raceData, selectedSexID, selecte
end end
self.RaceName.Text:SetText(raceData.name); self.RaceName.Text:SetText(raceData.name);
self.RaceName:SetShown(C_CharacterCreation.IsNewPlayerRestricted()); self.RaceName:SetShown(C_CharacterCreation.UseBeginnerMode());
if not raceData.isAlliedRace then if not raceData.isAlliedRace then
if C_CharacterCreation.IsNewPlayerRestricted() then if C_CharacterCreation.UseBeginnerMode() then
self.tooltipXOffset = 16; self.tooltipXOffset = 16;
else else
self.tooltipXOffset = 113; self.tooltipXOffset = 113;
...@@ -1021,8 +1021,9 @@ end ...@@ -1021,8 +1021,9 @@ end
function CharacterCreateRaceAndClassMixin:OnShow() function CharacterCreateRaceAndClassMixin:OnShow()
local isNewPlayerRestricted = C_CharacterCreation.IsNewPlayerRestricted(); local isNewPlayerRestricted = C_CharacterCreation.IsNewPlayerRestricted();
self.AllianceAlliedRaces:SetShown(not isNewPlayerRestricted); local useNewPlayerMode = C_CharacterCreation.UseBeginnerMode();
self.HordeAlliedRaces:SetShown(not isNewPlayerRestricted); self.AllianceAlliedRaces:SetShown(not useNewPlayerMode);
self.HordeAlliedRaces:SetShown(not useNewPlayerMode);
self.ClassTrialCheckButton:ClearTooltipLines(); self.ClassTrialCheckButton:ClearTooltipLines();
self.ClassTrialCheckButton:AddTooltipLine(CHARACTER_TYPE_FRAME_TRIAL_BOOST_CHARACTER_TOOLTIP:format(C_CharacterCreation.GetTrialBoostStartingLevel())); self.ClassTrialCheckButton:AddTooltipLine(CHARACTER_TYPE_FRAME_TRIAL_BOOST_CHARACTER_TOOLTIP:format(C_CharacterCreation.GetTrialBoostStartingLevel()));
......
...@@ -1231,7 +1231,7 @@ end ...@@ -1231,7 +1231,7 @@ end
function CardRightClickOptionsMenuInitialize(self, level) function CardRightClickOptionsMenuInitialize(self, level)
if(self:GetParent():IsReported()) then if(self:GetParent():IsReported() or not self:GetParent().cardInfo) then
return; return;
end end
......
...@@ -362,8 +362,9 @@ function CommunitiesListMixin:OnCommunitiesFrameDisplayModeChanged() ...@@ -362,8 +362,9 @@ function CommunitiesListMixin:OnCommunitiesFrameDisplayModeChanged()
end end
function CommunitiesListMixin:OnCommunityInviteDeclined(invitationId, clubId) function CommunitiesListMixin:OnCommunityInviteDeclined(invitationId, clubId)
local communitiesFrame = self:GetCommunitiesFrame();
self.declinedInvitationIds[#self.declinedInvitationIds + 1] = invitationId; self.declinedInvitationIds[#self.declinedInvitationIds + 1] = invitationId;
communitiesFrame:UpdateClubSelection(); self:GetCommunitiesFrame():UpdateClubSelection();
self:UpdateInvitations(); self:UpdateInvitations();
self:Update(); self:Update();
end end
......
...@@ -169,6 +169,13 @@ function CovenantPreviewFrameMixin:TryShow(covenantInfo) ...@@ -169,6 +169,13 @@ function CovenantPreviewFrameMixin:TryShow(covenantInfo)
end); end);
end end
if (covenantInfo.covenantSoulbinds and #covenantInfo.covenantSoulbinds > 1) then
table.sort(covenantInfo.covenantSoulbinds, function(a, b)
return CovenantPreviewSortFunction(a.sortOrder, b.sortOrder);
end);
end
self:SetupAbilityButtons(covenantInfo.covenantAbilities); self:SetupAbilityButtons(covenantInfo.covenantAbilities);
self:SetupSoulbindButtons(covenantInfo.covenantSoulbinds); self:SetupSoulbindButtons(covenantInfo.covenantSoulbinds);
self:SetupCovenantInfoPanel(covenantInfo); self:SetupCovenantInfoPanel(covenantInfo);
...@@ -248,6 +255,7 @@ end ...@@ -248,6 +255,7 @@ end
CovenantAbilityButtonMixin = { }; CovenantAbilityButtonMixin = { };
function CovenantAbilityButtonMixin:OnEnter() function CovenantAbilityButtonMixin:OnEnter()
EmbeddedItemTooltip:Hide();
GameTooltip:SetOwner(self, "ANCHOR_RIGHT"); GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
GameTooltip:SetSpellByID(self.spellID); GameTooltip:SetSpellByID(self.spellID);
GameTooltip:Show(); GameTooltip:Show();
...@@ -274,6 +282,7 @@ function CovenantFeatureButtonMixin:Setup(covenantFeatureInfo) ...@@ -274,6 +282,7 @@ function CovenantFeatureButtonMixin:Setup(covenantFeatureInfo)
end end
function CovenantFeatureButtonMixin:OnEnter() function CovenantFeatureButtonMixin:OnEnter()
EmbeddedItemTooltip:Hide();
GameTooltip:SetOwner(self, "ANCHOR_RIGHT", -30, -30); GameTooltip:SetOwner(self, "ANCHOR_RIGHT", -30, -30);
GameTooltip_AddHighlightLine(GameTooltip, self.name); GameTooltip_AddHighlightLine(GameTooltip, self.name);
GameTooltip_AddNormalLine(GameTooltip, self.description); GameTooltip_AddNormalLine(GameTooltip, self.description);
...@@ -296,6 +305,8 @@ function CovenantSoulbindButtonMixin:OnEnter() ...@@ -296,6 +305,8 @@ function CovenantSoulbindButtonMixin:OnEnter()
return; return;
end end
GameTooltip:Hide();
local spell = Spell:CreateFromSpellID(self.spellID); local spell = Spell:CreateFromSpellID(self.spellID);
spell:ContinueOnSpellLoad(function() spell:ContinueOnSpellLoad(function()
EmbeddedItemTooltip:SetOwner(self, "ANCHOR_RIGHT", -12, -10); EmbeddedItemTooltip:SetOwner(self, "ANCHOR_RIGHT", -12, -10);
......
...@@ -486,8 +486,8 @@ CovenantRenownTrackFrameMixin = { ...@@ -486,8 +486,8 @@ CovenantRenownTrackFrameMixin = {
elementTemplate = "CovenantRenownLevelTemplate", elementTemplate = "CovenantRenownLevelTemplate",
scrollStartSound = SOUNDKIT.UI_COVENANT_RENOWN_SLIDE_START, scrollStartSound = SOUNDKIT.UI_COVENANT_RENOWN_SLIDE_START,
scrollLoopSound = SOUNDKIT.UI_COVENANT_RENOWN_SLIDE_LOOP,
scrollStopSound = SOUNDKIT.UI_COVENANT_RENOWN_SLIDE_STOP, scrollStopSound = SOUNDKIT.UI_COVENANT_RENOWN_SLIDE_STOP,
scrollCenterChangeSound = SOUNDKIT.UI_COVENANT_RENOWN_SLIDE_START,
}; };
function CovenantRenownTrackFrameMixin:OnLoad() function CovenantRenownTrackFrameMixin:OnLoad()
...@@ -588,6 +588,9 @@ function CovenantRenownTrackFrameMixin:RefreshView() ...@@ -588,6 +588,9 @@ function CovenantRenownTrackFrameMixin:RefreshView()
local leftIndex = math.max(1, centerIndex - self.numElementsPerHalf); local leftIndex = math.max(1, centerIndex - self.numElementsPerHalf);
local rightIndex = math.min(centerIndex + self.numElementsPerHalf, self.numElements); local rightIndex = math.min(centerIndex + self.numElementsPerHalf, self.numElements);
self:GetParent():OnTrackUpdate(leftIndex, centerIndex, rightIndex, self.moving); self:GetParent():OnTrackUpdate(leftIndex, centerIndex, rightIndex, self.moving);
if self.moving and self.scrollCenterChangeSound then
PlaySound(self.scrollCenterChangeSound, nil, SOUNDKIT_ALLOW_DUPLICATES);
end
end end
self.LeftButton:SetEnabled(self.offset > 0); self.LeftButton:SetEnabled(self.offset > 0);
...@@ -680,7 +683,7 @@ function CovenantRenownTrackButtonMixin:OnMouseDown() ...@@ -680,7 +683,7 @@ function CovenantRenownTrackButtonMixin:OnMouseDown()
local track = self:GetParent(); local track = self:GetParent();
track:StartScroll(self.direction); track:StartScroll(self.direction);
if track.scrollStartSound then if track.scrollStartSound then
PlaySound(track.scrollStartSound); PlaySound(track.scrollStartSound, nil, SOUNDKIT_ALLOW_DUPLICATES);
end end
end end
end end
......
...@@ -86,10 +86,10 @@ end ...@@ -86,10 +86,10 @@ end
local SOUND_KIT_BY_TEXTURE_KIT = local SOUND_KIT_BY_TEXTURE_KIT =
{ {
Kyrian = { default = 172612, [20] = 172613, [40] = 172614, }, Kyrian = { default = 172612, milestone = 172613, final = 172614, },
Venthyr = { default = 172642, [20] = 172645, [40] = 172649, }, Venthyr = { default = 172642, milestone = 172645, final = 172649, },
NightFae = { default = 172643, [20] = 172646, [40] = 172650, }, NightFae = { default = 172643, milestone = 172646, final = 172650, },
Necrolord = { default = 172644, [20] = 172648, [40] = 172651, }, Necrolord = { default = 172644, milestone = 172648, final = 172651, },
}; };
function CovenantRenownToastMixin:PlayBanner(data) function CovenantRenownToastMixin:PlayBanner(data)
...@@ -118,7 +118,15 @@ function CovenantRenownToastMixin:PlayBanner(data) ...@@ -118,7 +118,15 @@ function CovenantRenownToastMixin:PlayBanner(data)
self:SetupRewardVisuals(data.covenantID, data.renownLevel); self:SetupRewardVisuals(data.covenantID, data.renownLevel);
local soundKitData = SOUND_KIT_BY_TEXTURE_KIT[data.textureKit] local soundKitData = SOUND_KIT_BY_TEXTURE_KIT[data.textureKit]
PlaySound(soundKitData[data.renownLevel] or soundKitData.default) local levels = C_CovenantSanctumUI.GetRenownLevels(data.covenantID);
local levelInfo = levels[data.renownLevel];
local soundID = soundKitData.default;
if data.renownLevel == #levels then
soundID = soundKitData.final;
elseif levelInfo.isMilestone then
soundID = soundKitData.milestone;
end
PlaySound(soundID);
self.bannerData = data; self.bannerData = data;
......
...@@ -1806,7 +1806,7 @@ function EncounterJournal_SetLootButton(item) ...@@ -1806,7 +1806,7 @@ function EncounterJournal_SetLootButton(item)
if itemInfo.weaponTypeError then if itemInfo.weaponTypeError then
item.armorType:SetText(INVALID_EQUIPMENT_COLOR:WrapTextInColorCode(itemInfo.armorType)); item.armorType:SetText(INVALID_EQUIPMENT_COLOR:WrapTextInColorCode(itemInfo.armorType));
else else
item.armorType:SetText(itemInfo.slot); item.armorType:SetText(itemInfo.armorType);
end end
local numEncounters = EJ_GetNumEncountersForLootByIndex(item.index); local numEncounters = EJ_GetNumEncountersForLootByIndex(item.index);
...@@ -2843,7 +2843,7 @@ end ...@@ -2843,7 +2843,7 @@ end
function EJSuggestFrame_OnEvent(self, event, ...) function EJSuggestFrame_OnEvent(self, event, ...)
if ( event == "AJ_REFRESH_DISPLAY" ) then if ( event == "AJ_REFRESH_DISPLAY" ) then
if self:GetParent().selectedTab == self.id then if self:GetParent().selectedTab == EncounterJournal.instanceSelect.suggestTab.id then
EJSuggestFrame_RefreshDisplay(); EJSuggestFrame_RefreshDisplay();
local newAdventureNotice = ...; local newAdventureNotice = ...;
if ( newAdventureNotice ) then if ( newAdventureNotice ) then
......
...@@ -3,12 +3,19 @@ UIPanelWindows["FlightMapFrame"] = { area = "center", pushable = 1, showFailedFu ...@@ -3,12 +3,19 @@ UIPanelWindows["FlightMapFrame"] = { area = "center", pushable = 1, showFailedFu
FlightMapMixin = {}; FlightMapMixin = {};
function FlightMapMixin:SetupTitle() function FlightMapMixin:SetupTitle()
self.BorderFrame.TitleText:SetText(FLIGHT_MAP);
self.BorderFrame.Bg:SetColorTexture(0, 0, 0, 1);