Skip to content

Commit b229957

Browse files
tomrus88tomrus88
committed
WOW-21874patch7.0.3_Beta
1 parent a129960 commit b229957

File tree

64 files changed

+744
-402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+744
-402
lines changed

‎Interface/AddOns/Blizzard_AdventureMap/AM_QuestChoiceDataProvider.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ end
159159

160160
function AdventureMap_QuestChoicePinMixin:OnClick(button)
161161
if button == "LeftButton" then
162+
PlaySound("UI_Mission_Map_Zoom");
162163
self:GetMap():SetDefaultMaxZoom();
163164
self:PanAndZoomTo();
164165
end

‎Interface/AddOns/Blizzard_AdventureMap/AM_QuestDialog.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
</Anchors>
104104
<Scripts>
105105
<OnClick>
106+
PlaySound("igQuestCancel");
106107
self:GetParent():DeclineQuest();
107108
</OnClick>
108109
</Scripts>
@@ -252,6 +253,7 @@
252253
</Anchors>
253254
<Scripts>
254255
<OnClick>
256+
PlaySound("igQuestCancel");
255257
self:GetParent():DeclineQuest();
256258
</OnClick>
257259
</Scripts>

‎Interface/AddOns/Blizzard_ArtifactUI/Blizzard_ArtifactAppearances.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function ArtifactAppearancesMixin:SetupAppearanceSet(setIndex, prevAppearanceSet
7676
if setID and numAppearanceSlots > 0 then
7777
local appearanceSet;
7878
for appearanceIndex = 1, numAppearanceSlots do
79-
local appearanceID, appearanceName, displayIndex, appearanceUnlocked, unlockFailureReason, uiCameraID, altHandUICameraID, swatchR, swatchG, swatchB, modelAlpha, modelDesaturation, suppressGlobalAnim = C_ArtifactUI.GetAppearanceInfo(setIndex, appearanceIndex);
79+
local appearanceID, appearanceName, displayIndex, appearanceUnlocked, unlockConditionText, uiCameraID, altHandUICameraID, swatchR, swatchG, swatchB, modelAlpha, modelDesaturation, suppressGlobalAnim = C_ArtifactUI.GetAppearanceInfo(setIndex, appearanceIndex);
8080

8181
if appearanceID then
8282
if not appearanceSet then
@@ -95,7 +95,7 @@ function ArtifactAppearancesMixin:SetupAppearanceSet(setIndex, prevAppearanceSet
9595
appearanceSet:Show();
9696
end
9797

98-
self:AddAppearanceSlot(appearanceSet, appearanceID, swatchR, swatchG, swatchB, appearanceUnlocked, unlockFailureReason);
98+
self:AddAppearanceSlot(appearanceSet, appearanceID, swatchR, swatchG, swatchB, appearanceUnlocked, unlockConditionText);
9999
end
100100
end
101101

@@ -110,7 +110,7 @@ do
110110
local STARTING_Y_OFFSET = 0;
111111
local SLOT_PADDING = 12;
112112

113-
function ArtifactAppearancesMixin:AddAppearanceSlot(appearanceSet, appearanceID, swatchR, swatchG, swatchB, appearanceUnlocked, unlockFailureReason)
113+
function ArtifactAppearancesMixin:AddAppearanceSlot(appearanceSet, appearanceID, swatchR, swatchG, swatchB, appearanceUnlocked, unlockConditionText)
114114
appearanceSet.numAppearanceSlots = appearanceSet.numAppearanceSlots + 1;
115115

116116
local appearanceSlot = self.appearanceSlotPool:Acquire();
@@ -131,7 +131,7 @@ do
131131

132132
appearanceSlot.appearanceID = appearanceID;
133133
appearanceSlot.appearanceUnlocked = appearanceUnlocked;
134-
appearanceSlot.unlockFailureReason = unlockFailureReason;
134+
appearanceSlot.unlockConditionText = unlockConditionText;
135135
appearanceSlot.isActive = isActive;
136136

137137
appearanceSlot:Show();
@@ -178,9 +178,9 @@ function ArtifactAppearanceSlotMixin:OnClick(button)
178178
end
179179

180180
function ArtifactAppearanceSlotMixin:OnEnter()
181-
if self.unlockFailureReason then
181+
if self.unlockConditionText then
182182
GameTooltip:SetOwner(self, "ANCHOR_RIGHT", 0, 0);
183-
GameTooltip:SetText(self.unlockFailureReason, nil, nil, nil, nil, true);
183+
GameTooltip:SetText(self.unlockConditionText, nil, nil, nil, nil, true);
184184
GameTooltip:Show();
185185
end
186186
end

‎Interface/AddOns/Blizzard_ArtifactUI/Blizzard_ArtifactPerks.lua

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -559,12 +559,11 @@ function ArtifactTitleTemplateMixin:SetRelicSlotHighlighted(relicSlotIndex, high
559559
if relicSlot:IsShown() then
560560
if highlighted then
561561
relicSlot:LockHighlight();
562-
relicSlot.HighlightTexture:Show();
563562
relicSlot.CanSlotAnim:Play();
564563
else
565564
relicSlot:UnlockHighlight();
566565
relicSlot.CanSlotAnim:Stop();
567-
relicSlot.HighlightTexture:Hide();
566+
relicSlot.HighlightTexture:SetAlpha(1);
568567
end
569568
end
570569
end
@@ -609,6 +608,7 @@ StaticPopupDialogs["CONFIRM_RELIC_REPLACE"] = {
609608

610609
OnAccept = function(self, relicSlotIndex)
611610
C_ArtifactUI.ApplyCursorRelicToSlot(relicSlotIndex);
611+
ArtifactFrame.PerksTab.TitleContainer.RelicSlots[relicSlotIndex].GlowAnim:Play();
612612
PlaySound("UI_70_Artifact_Forge_Relic_Place");
613613
end,
614614
OnCancel = function()
@@ -625,12 +625,19 @@ function ArtifactTitleTemplateMixin:OnRelicSlotClicked(relicSlot)
625625
for i = 1, #self.RelicSlots do
626626
if self.RelicSlots[i] == relicSlot then
627627
if C_ArtifactUI.CanApplyCursorRelicToSlot(i) then
628-
if C_ArtifactUI.GetRelicInfo(i) then
628+
local _, itemName = C_ArtifactUI.GetRelicInfo(i);
629+
if itemName then
629630
StaticPopup_Show("CONFIRM_RELIC_REPLACE", nil, nil, i);
630631
else
631632
C_ArtifactUI.ApplyCursorRelicToSlot(i);
633+
self.RelicSlots[i].GlowAnim:Play();
632634
PlaySound("UI_70_Artifact_Forge_Relic_Place");
633635
end
636+
else
637+
local _, itemID = GetCursorInfo();
638+
if itemID and IsArtifactRelicItem(itemID) then
639+
UIErrorsFrame:AddMessage(RELIC_SLOT_INVALID, 1.0, 0.1, 0.1, 1.0);
640+
end
634641
end
635642
break;
636643
end
@@ -658,8 +665,9 @@ function ArtifactTitleTemplateMixin:EvaluateRelics()
658665

659666
local relicAtlasName = ("Relic-%s-Slot"):format(relicType);
660667
relicSlot:GetNormalTexture():SetAtlas(relicAtlasName, true);
661-
relicSlot:GetHighlightTexture():SetAtlas(relicAtlasName, true);
662-
668+
relicSlot.GlowBorder1:SetAtlas(relicAtlasName, true);
669+
relicSlot.GlowBorder2:SetAtlas(relicAtlasName, true);
670+
relicSlot.GlowBorder3:SetAtlas(relicAtlasName, true);
663671
local lockedReason, relicName, relicIcon, relicLink = C_ArtifactUI.GetRelicInfo(i);
664672
if lockedReason then
665673
relicSlot:GetNormalTexture():SetAlpha(.5);

‎Interface/AddOns/Blizzard_ArtifactUI/Blizzard_ArtifactPerks.xml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,30 @@
6262
<Anchor point="CENTER"/>
6363
</Anchors>
6464
</Texture>
65+
<Texture parentKey="GlowBorder1" alpha="0" alphaMode="ADD">
66+
<Anchors>
67+
<Anchor point="CENTER" />
68+
</Anchors>
69+
</Texture>
70+
<Texture parentKey="GlowBorder2" alpha="0" alphaMode="ADD">
71+
<Anchors>
72+
<Anchor point="CENTER" />
73+
</Anchors>
74+
</Texture>
75+
<Texture parentKey="GlowBorder3" alpha="0" alphaMode="ADD">
76+
<Anchors>
77+
<Anchor point="CENTER" />
78+
</Anchors>
79+
</Texture>
6580
</Layer>
6681
</Layers>
6782

6883
<NormalTexture parentKey="NormalTexture" />
69-
<HighlightTexture parentKey="HighlightTexture" alphaMode="ADD" />
84+
<HighlightTexture parentKey="HighlightTexture" atlas="bags-roundhighlight" useAtlasSize="true" alphaMode="ADD">
85+
<Anchors>
86+
<Anchor point="CENTER"/>
87+
</Anchors>
88+
</HighlightTexture>
7089

7190
<Scripts>
7291
<OnEnter>
@@ -89,6 +108,14 @@
89108

90109
<Alpha childKey="HighlightTexture" smoothing="IN" duration=".75" order="2" fromAlpha="1" toAlpha="0"/>
91110
</AnimationGroup>
111+
<AnimationGroup parentKey="GlowAnim" setToFinalAlpha="true">
112+
<Alpha childKey="GlowBorder1" fromAlpha="0" toAlpha="1" duration="0.1"/>
113+
<Alpha childKey="GlowBorder1" fromAlpha="1" toAlpha="0" duration="1.5"/>
114+
<Alpha childKey="GlowBorder2" fromAlpha="0" toAlpha="1" duration="0.1"/>
115+
<Alpha childKey="GlowBorder2" fromAlpha="1" toAlpha="0" duration="1.5"/>
116+
<Alpha childKey="GlowBorder3" fromAlpha="0" toAlpha="1" duration="0.1"/>
117+
<Alpha childKey="GlowBorder3" fromAlpha="1" toAlpha="0" duration="1.5"/>
118+
</AnimationGroup>
92119
</Animations>
93120
</Button>
94121

‎Interface/AddOns/Blizzard_ArtifactUI/Blizzard_ArtifactUI.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UIPanelWindows["ArtifactFrame"] = { area = "doublewide", pushable = 0, xoffset = 35, bottomClampOverride = 80, showFailedFunc = C_ArtifactUI.Clear, };
1+
UIPanelWindows["ArtifactFrame"] = { area = "doublewide", pushable = 0, xoffset = 35, yoffset = -9, bottomClampOverride = 100, showFailedFunc = C_ArtifactUI.Clear, };
22

33
StaticPopupDialogs["CONFIRM_ARTIFACT_RESPEC"] = {
44
text = ARTIFACT_RESPEC,

‎Interface/AddOns/Blizzard_ArtifactUI/Blizzard_ArtifactUI.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,14 @@
156156
<Frame parentKey="KnowledgeLevelHelpBox" inherits="GlowBoxTemplate" enableMouse="true" hidden="true" frameStrata="DIALOG">
157157
<Size x="220" y="100"/>
158158
<Anchors>
159-
<Anchor point="LEFT" relativeKey="$parent.ForgeLevelFrame" relativePoint="RIGHT" x="-8" y="20"/>
159+
<Anchor point="LEFT" relativeKey="$parent.ForgeLevelFrame" relativePoint="RIGHT" x="-8" y="14"/>
160160
</Anchors>
161161
<Layers>
162162
<Layer level="OVERLAY">
163163
<FontString parentKey="Text" inherits="GameFontHighlightLeft" justifyV="TOP" text="ARTIFACT_TUTORIAL_KNOWLEDGE">
164164
<Size x="188" y="0"/>
165165
<Anchors>
166-
<Anchor point="TOPLEFT" x="16" y="-24"/>
166+
<Anchor point="TOPLEFT" x="16" y="-20"/>
167167
</Anchors>
168168
</FontString>
169169
</Layer>
@@ -181,7 +181,7 @@
181181
</Button>
182182
<Frame parentKey="Arrow" inherits="GlowBoxArrowTemplate">
183183
<Anchors>
184-
<Anchor point="TOPLEFT" x="-17" y="-15"/>
184+
<Anchor point="TOPLEFT" x="-17" y="-9"/>
185185
</Anchors>
186186
</Frame>
187187
</Frames>

‎Interface/AddOns/Blizzard_BarbershopUI/Blizzard_BarberShopUI.lua

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ STYLE_FACE = 5;
66
STYLE_CUSTOM_DISPLAY1 = 6;
77
STYLE_CUSTOM_DISPLAY2 = 7;
88
STYLE_CUSTOM_DISPLAY3 = 8;
9-
STYLE_NUM_CUSTOM_DISPLAY = 3;
9+
STYLE_CUSTOM_DISPLAY4 = 9;
10+
STYLE_NUM_CUSTOM_DISPLAY = 4;
1011

1112
function BarberShop_OnLoad(self)
1213
BarberShop_UpdateHairCustomization(self);
@@ -25,11 +26,7 @@ function BarberShop_OnLoad(self)
2526
end
2627
end
2728

28-
for i = STYLE_CUSTOM_DISPLAY1, (STYLE_CUSTOM_DISPLAY1 + STYLE_NUM_CUSTOM_DISPLAY - 1) do
29-
if ( IsBarberShopStyleValid(i) ) then
30-
self.Selector[i]:Show();
31-
end
32-
end
29+
BarberShop_UpdateCustomDisplays(self)
3330
end
3431

3532
function BarberShop_OnShow(self)
@@ -110,6 +107,7 @@ function BarberShop_UpdateSelector(self)
110107
local name, _, _, isCurrent = GetBarberShopStyleInfo(self:GetID());
111108
BarberShop_UpdateBanner(name);
112109
BarberShop_SetLabelColor(self.Category, isCurrent);
110+
BarberShop_UpdateCustomDisplays(self:GetParent());
113111
end
114112

115113
function BarberShop_UpdateHairCustomization(self)
@@ -135,3 +133,10 @@ function BarberShop_ResetLabelColors()
135133
BarberShop_SetLabelColor(BarberShopFrame.Selector[i].Category, i);
136134
end
137135
end
136+
137+
function BarberShop_UpdateCustomDisplays(self)
138+
for i = STYLE_CUSTOM_DISPLAY1, (STYLE_CUSTOM_DISPLAY1 + STYLE_NUM_CUSTOM_DISPLAY - 1) do
139+
self.Selector[i]:SetShown(IsBarberShopStyleValid(i));
140+
end
141+
self:Layout();
142+
end

‎Interface/AddOns/Blizzard_BarbershopUI/Blizzard_BarberShopUI.xml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,32 +181,44 @@
181181
</KeyValues>
182182
<Scripts>
183183
<OnLoad>
184-
self:SetID(STYLE_CUSTOM_DISPLAY1);
185-
self.Category:SetText(DEMONHUNTER_TATTOO_STYLE);
186-
</OnLoad>
184+
self:SetID(STYLE_CUSTOM_DISPLAY1);
185+
self.Category:SetText(DEMONHUNTER_TATTOO_STYLE);
186+
</OnLoad>
187187
</Scripts>
188188
</Frame>
189189
<Frame parentKey="CustomSelector2" parentArray="Selector" inherits="BarberShopSelectorTemplate" hidden="true">
190190
<KeyValues>
191-
<KeyValue key="layoutIndex" value="7" type="number"/>
191+
<KeyValue key="layoutIndex" value="8" type="number"/>
192192
<KeyValue key="align" value="center" type="string"/>
193193
</KeyValues>
194194
<Scripts>
195195
<OnLoad>
196-
self:SetID(STYLE_CUSTOM_DISPLAY2);
197-
self.Category:SetText(DEMONHUNTER_HORN_STYLE);
198-
</OnLoad>
196+
self:SetID(STYLE_CUSTOM_DISPLAY2);
197+
self.Category:SetText(DEMONHUNTER_HORN_STYLE);
198+
</OnLoad>
199199
</Scripts>
200200
</Frame>
201201
<Frame parentKey="CustomSelector3" parentArray="Selector" inherits="BarberShopSelectorTemplate" hidden="true">
202202
<KeyValues>
203-
<KeyValue key="layoutIndex" value="8" type="number"/>
203+
<KeyValue key="layoutIndex" value="9" type="number"/>
204+
<KeyValue key="align" value="center" type="string"/>
205+
</KeyValues>
206+
<Scripts>
207+
<OnLoad>
208+
self:SetID(STYLE_CUSTOM_DISPLAY3);
209+
self.Category:SetText(DEMONHUNTER_BLINDFOLD_STYLE);
210+
</OnLoad>
211+
</Scripts>
212+
</Frame>
213+
<Frame parentKey="CustomSelector4" parentArray="Selector" inherits="BarberShopSelectorTemplate" hidden="true">
214+
<KeyValues>
215+
<KeyValue key="layoutIndex" value="7" type="number"/>
204216
<KeyValue key="align" value="center" type="string"/>
205217
</KeyValues>
206218
<Scripts>
207219
<OnLoad>
208-
self:SetID(STYLE_CUSTOM_DISPLAY3);
209-
self.Category:SetText(DEMONHUNTER_BLINDFOLD_STYLE);
220+
self:SetID(STYLE_CUSTOM_DISPLAY4);
221+
self.Category:SetText(DEMONHUNTER_TATTOO_COLOR);
210222
</OnLoad>
211223
</Scripts>
212224
</Frame>

‎Interface/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,16 @@ function WardrobeTransmogFrame_ApplyPending(lastAcceptedWarningIndex)
348348
end
349349
end
350350

351-
function WardrobeTransmogFrame_LoadOutfit(outfitID)
351+
WardrobeOutfitMixin = { };
352+
353+
function WardrobeOutfitMixin:LoadOutfit(outfitID)
354+
if ( not outfitID ) then
355+
return;
356+
end
352357
C_Transmog.LoadOutfit(outfitID);
353358
end
354359

355-
function WardrobeTransmogFrame_GetSourceIDForOutfit(slot, transmogType)
360+
function WardrobeOutfitMixin:GetSlotSourceID(slot, transmogType)
356361
local slotID = GetInventorySlotInfo(slot);
357362
local isTransmogrified, hasPending, isPendingCollected, canTransmogrify, cannotTransmogrifyReason, hasUndo = C_Transmog.GetSlotInfo(slotID, transmogType);
358363
if ( not canTransmogrify and not hasUndo ) then
@@ -363,6 +368,19 @@ function WardrobeTransmogFrame_GetSourceIDForOutfit(slot, transmogType)
363368
return sourceID;
364369
end
365370

371+
function WardrobeOutfitMixin:OnSelectOutfit(outfitID)
372+
if ( outfitID ) then
373+
SetCVar("lastTransmogOutfitID", outfitID);
374+
else
375+
-- outfitID can be 0, so use empty string for none
376+
SetCVar("lastTransmogOutfitID", "");
377+
end
378+
end
379+
380+
function WardrobeOutfitMixin:GetLastOutfitID()
381+
return tonumber(GetCVar("lastTransmogOutfitID"));
382+
end
383+
366384
-- ***** BUTTONS
367385

368386
function WardrobeTransmogButton_OnLoad(self)
@@ -1049,18 +1067,21 @@ function WardrobeCollectionFrame_ResetPage()
10491067
end
10501068

10511069
function WardrobeCollectionFrame_FilterVisuals()
1052-
if ( WardrobeFrame_IsAtTransmogrifier() ) then
1053-
local visualsList = WardrobeCollectionFrame.visualsList;
1054-
local filteredVisualsList = { };
1055-
for i = 1, #visualsList do
1070+
local isAtTransmogrifier = WardrobeFrame_IsAtTransmogrifier();
1071+
local visualsList = WardrobeCollectionFrame.visualsList;
1072+
local filteredVisualsList = { };
1073+
for i = 1, #visualsList do
1074+
if ( isAtTransmogrifier ) then
10561075
if ( visualsList[i].isUsable and visualsList[i].isCollected ) then
10571076
tinsert(filteredVisualsList, visualsList[i]);
10581077
end
1078+
else
1079+
if ( not visualsList[i].isHideVisual ) then
1080+
tinsert(filteredVisualsList, visualsList[i]);
1081+
end
10591082
end
1060-
WardrobeCollectionFrame.filteredVisualsList = filteredVisualsList;
1061-
else
1062-
WardrobeCollectionFrame.filteredVisualsList = WardrobeCollectionFrame.visualsList;
10631083
end
1084+
WardrobeCollectionFrame.filteredVisualsList = filteredVisualsList;
10641085
end
10651086

10661087
function WardrobeCollectionFrame_SortVisuals()

0 commit comments

Comments
 (0)