Commit 373adda2 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-26131patch8.0.1_Beta

parent 8aa51bb4
......@@ -64,6 +64,20 @@ local AzeriteEmpoweredItem =
{ Name = "isAzeriteEmpoweredItem", Type = "bool", Nilable = false },
},
},
{
Name = "IsAzeriteEmpoweredItemByID",
Type = "Function",
Arguments =
{
{ Name = "itemInfo", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "isAzeriteEmpoweredItem", Type = "bool", Nilable = false },
},
},
{
Name = "SelectPower",
Type = "Function",
......@@ -122,6 +136,7 @@ local AzeriteEmpoweredItem =
Type = "Structure",
Fields =
{
{ Name = "tierIndex", Type = "number", Nilable = false },
{ Name = "azeritePowerIDs", Type = "table", InnerType = "number", Nilable = false },
{ Name = "unlockLevel", Type = "number", Nilable = false },
},
......
......@@ -38,6 +38,20 @@ local AzeriteItem =
{ Name = "itemLocation", Type = "table", Mixin = "ItemLocationMixin", Nilable = false },
},
Returns =
{
{ Name = "isAzeriteItem", Type = "bool", Nilable = false },
},
},
{
Name = "IsAzeriteItemByID",
Type = "Function",
Arguments =
{
{ Name = "itemInfo", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "isAzeriteItem", Type = "bool", Nilable = false },
......
......@@ -382,7 +382,6 @@
</Anchors>
<MaskedTextures>
<MaskedTexture childKey="Icon"/>
<MaskedTexture childKey="Rune"/>
</MaskedTextures>
</MaskTexture>
</Layer>
......
......@@ -393,14 +393,19 @@ function ChallengesKeystoneFrameMixin:OnKeystoneSlotted()
self.PowerLevel:Show();
local dmgPct, healthPct = C_ChallengeMode.GetPowerLevelDamageHealthMod(powerLevel);
local highLevelKeyDamageHealthModifier = 0;
self:CreateAndPositionAffixes(2 + #affixes);
self.Affixes[1]:SetUp({key = "dmg", pct = dmgPct});
self.Affixes[2]:SetUp({key = "health", pct = healthPct});
if (powerLevel >= 3) then
highLevelKeyDamageHealthModifier = 2;
self:CreateAndPositionAffixes(highLevelKeyDamageHealthModifier + #affixes);
self.Affixes[1]:SetUp({key = "dmg", pct = dmgPct});
self.Affixes[2]:SetUp({key = "health", pct = healthPct});
else
self:CreateAndPositionAffixes(highLevelKeyDamageHealthModifier + #affixes);
end
for i = 1, #affixes do
self.Affixes[i+2]:SetUp(affixes[i]);
self.Affixes[i+highLevelKeyDamageHealthModifier]:SetUp(affixes[i]);
end
end
......
......@@ -1132,7 +1132,6 @@
<OnShow method="OnShow"/>
<OnHide method="OnHide"/>
<OnEvent method="OnEvent"/>
<OnMouseWheel method="OnMouseWheel"/>
</Scripts>
</Frame>
<Frame parentKey="SetsTransmogFrame" parentArray="ContentFrames" inherits="CollectionsBackgroundTemplate" mixin="WardrobeSetsTransmogMixin" hidden="true">
......
......@@ -11,7 +11,7 @@
<Layer level="ARTWORK">
<FontString parentKey="Text" inherits="NumberFont_Shadow_Small" justifyH="LEFT" justifyV="MIDDLE" wordwrap="false">
<Size x="120" />
<Size x="240" />
<Anchors>
<Anchor point="TOPLEFT" x="5" />
<Anchor point="BOTTOMLEFT" x="5" />
......
......@@ -47,11 +47,6 @@
<Size x="64" y="36"/>
<TexCoords left="0.00000000" right="1.00000000" top="0.67382813" bottom="0.74414063"/>
</Texture>
<Texture name="_SearchBarLg" file="Interface\EncounterJournal\UI-EncounterJournalTextures_Tile" virtual="true" horizTile="true" >
<Size x="64" y="49"/>
<TexCoords left="0.00000000" right="1.00000000" top="0.74804688" bottom="0.84375000"/>
</Texture>
<!--size=512,1024-->
<Texture name="UI-EJ-AbilityIconBorder" file="Interface\EncounterJournal\UI-EncounterJournalTextures" virtual="true" >
......@@ -869,7 +864,6 @@
<Size x="5" y="10"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parentAbilityIcon" relativePoint="RIGHT" x="5" y="-1"/>
<Anchor point="RIGHT" relativeTo="$parentIcon4" relativePoint="LEFT" x="-5" y="0"/>
</Anchors>
</FontString>
</Layer>
......
......@@ -184,17 +184,12 @@
</OnClick>
</Scripts>
</Button>
<Frame name="LootJournalLegendariesClassDropDown" parentKey="ClassDropDown" inherits="UIDropDownMenuTemplate" hidden="true">
<Scripts>
<OnLoad function="LootJournalLegendariesClassDropDown_OnLoad"/>
</Scripts>
</Frame>
<Frame name="LootJournalLegendariesClassDropDown" parentKey="ClassDropDown" inherits="UIDropDownMenuTemplate" hidden="true"/>
</Frames>
<Scripts>
<OnLoad method="OnLoad"/>
<OnShow method="OnShow"/>
<OnHide method="OnHide"/>
<OnEvent method="OnEvent"/>
</Scripts>
</ScrollFrame>
<ScrollFrame parentKey="ItemSetsFrame" inherits="MinimalHybridScrollFrameTemplate" hidden="true" mixin="LootJournalListMixin, LootJournalItemSetsMixin">
......
......@@ -943,11 +943,6 @@
</Frames>
</Frame>
</ScrollChild>
<Scripts>
<OnLoad method="OnLoad"/>
<OnMouseDown method="OnMouseDown"/>
<OnMouseUp method="OnMouseUp"/>
</Scripts>
<Frames>
<Frame parentKey="UpgradeFrame" inherits="GarrisonFollowerModelUpgradeTemplate">
<Anchors>
......@@ -1511,7 +1506,7 @@
</Scripts>
</Button>
<Frame name="GarrisonMissionMechanicTooltip" inherits="GameTooltipTemplate" frameStrata="TOOLTIP">
<GameTooltip name="GarrisonMissionMechanicTooltip" inherits="GameTooltipTemplate" frameStrata="TOOLTIP">
<Size x="280" y="200"/>
<Anchors>
<Anchor point="CENTER"/>
......@@ -1544,9 +1539,9 @@
</FontString>
</Layer>
</Layers>
</Frame>
</GameTooltip>
<Frame name="GarrisonMissionMechanicFollowerCounterTooltip" inherits="GameTooltipTemplate" parent="UIParent" frameStrata="TOOLTIP">
<GameTooltip name="GarrisonMissionMechanicFollowerCounterTooltip" inherits="GameTooltipTemplate" parent="UIParent" frameStrata="TOOLTIP">
<Size x="280" y="250"/>
<Anchors>
<Anchor point="CENTER"/>
......@@ -1601,6 +1596,6 @@
</FontString>
</Layer>
</Layers>
</Frame>
</GameTooltip>
</Ui>
......@@ -304,6 +304,20 @@ function GarrisonFollowerListButton:GetFollowerList()
return self:GetParent():GetParent():GetParent();
end
function GarrisonFollowerListButton_OnDragStart(self, button)
local mainFrame = self:GetFollowerList():GetParent();
if (mainFrame.OnDragStartFollowerButton) then
mainFrame:OnDragStartFollowerButton(GarrisonFollowerPlacer, self, 24);
end
end
function GarrisonFollowerListButton_OnDragStop(self)
local mainFrame = self:GetFollowerList():GetParent();
if (mainFrame.OnDragStopFollowerButton) then
mainFrame:OnDragStopFollowerButton(GarrisonFollowerPlacer);
end
end
GarrisonMissionFollowerOrCategoryListButtonMixin = { }
function GarrisonMissionFollowerOrCategoryListButtonMixin:GetFollowerList()
......
......@@ -386,6 +386,82 @@
<Size x="100" y="11"/>
</Frame>
<Frame name="GarrisonAbilityCounterTemplate" virtual="true">
<Size x="20" y="20"/>
<Layers>
<Layer level="ARTWORK" textureSubLevel="-1">
<Texture parentKey="Icon">
<Size x="20" y="20"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
<Layer level="ARTWORK">
<Texture parentKey="Border" atlas="GarrMission_EncounterAbilityBorder" useAtlasSize="true">
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
</Layers>
</Frame>
<Frame name="GarrisonMissionAbilityCounterTemplate" inherits="GarrisonAbilityCounterTemplate" virtual="true">
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="AbilityFeedbackGlow" hidden="false" alpha="0.01" alphaMode="ADD" atlas="GarrMission-AbilityHighlight">
<Size x="30" y="30"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Animations>
<AnimationGroup parentKey="AbilityFeedbackGlowAnim" setToFinalAlpha="true">
<Alpha childKey="AbilityFeedbackGlow" smoothing="IN" duration="0.25" order="1" fromAlpha="0" toAlpha="1"/>
<Scale childKey="AbilityFeedbackGlow" duration="0.25" order="1" fromScaleX="0.8" fromScaleY="0.8" toScaleX="1.4" toScaleY="1.4"/>
<Alpha childKey="AbilityFeedbackGlow" startDelay="0.2" duration="0.5" order="1" fromAlpha="1" toAlpha="0"/>
</AnimationGroup>
</Animations>
<Scripts>
<OnEnter function="GarrisonMissionMechanicFollowerCounter_OnEnter"/>
<OnLeave function="GarrisonMissionMechanicFollowerCounter_OnLeave"/>
</Scripts>
</Frame>
<Frame name="GarrisonFollowerListButtonAbilityTemplate" virtual="true">
<Size x="234" y="20"/>
<KeyValues>
<KeyValue key="followerTypeID" value="1" type="number"/>
</KeyValues>
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="Icon">
<Size x="20" y="20"/>
<Anchors>
<Anchor point="LEFT" x="2"/>
</Anchors>
</Texture>
<FontString parentKey="Name" inherits="GameFontHighlight" justifyH="LEFT">
<Anchors>
<Anchor point="LEFT" relativeKey="$parent.Icon" relativePoint="RIGHT" x="2"/>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnEnter>
ShowGarrisonFollowerAbilityTooltip(self, self.abilityID, self.followerTypeID);
</OnEnter>
<OnLeave>
HideGarrisonFollowerAbilityTooltip(self.followerTypeID);
</OnLeave>
</Scripts>
</Frame>
<Button name="GarrisonMissionFollowerButtonTemplate" inherits="GarrisonFollowerButtonTemplate" virtual="true">
<Layers>
<Layer level="BACKGROUND" textureSubLevel="-1">
......@@ -560,27 +636,6 @@
</Scripts>
</Frame>
<Frame name="GarrisonAbilityCounterTemplate" virtual="true">
<Size x="20" y="20"/>
<Layers>
<Layer level="ARTWORK" textureSubLevel="-1">
<Texture parentKey="Icon">
<Size x="20" y="20"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
<Layer level="ARTWORK">
<Texture parentKey="Border" atlas="GarrMission_EncounterAbilityBorder" useAtlasSize="true">
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
</Layers>
</Frame>
<Frame name="GarrisonAbilityCounterWithCheckTemplate" inherits="GarrisonAbilityCounterTemplate" virtual="true">
<Layers>
<Layer level="OVERLAY">
......
......@@ -1370,20 +1370,6 @@ end
---------------------------------------------------------------------------------
--- Mission Page: Placing Followers/Starting Mission ---
---------------------------------------------------------------------------------
function GarrisonFollowerListButton_OnDragStart(self, button)
local mainFrame = self:GetFollowerList():GetParent();
if (mainFrame.OnDragStartFollowerButton) then
mainFrame:OnDragStartFollowerButton(GarrisonFollowerPlacer, self, 24);
end
end
function GarrisonFollowerListButton_OnDragStop(self)
local mainFrame = self:GetFollowerList():GetParent();
if (mainFrame.OnDragStopFollowerButton) then
mainFrame:OnDragStopFollowerButton(GarrisonFollowerPlacer);
end
end
function GarrisonMissionPageFollowerFrame_OnDragStart(self)
local mainFrame = self:GetParent():GetParent():GetParent();
mainFrame:OnDragStartMissionFollower(GarrisonFollowerPlacer, self, 24);
......
......@@ -120,61 +120,6 @@
</Scripts>
</Button>
<Frame name="GarrisonFollowerListButtonAbilityTemplate" virtual="true">
<Size x="234" y="20"/>
<KeyValues>
<KeyValue key="followerTypeID" value="1" type="number"/>
</KeyValues>
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="Icon">
<Size x="20" y="20"/>
<Anchors>
<Anchor point="LEFT" x="2"/>
</Anchors>
</Texture>
<FontString parentKey="Name" inherits="GameFontHighlight" justifyH="LEFT">
<Anchors>
<Anchor point="LEFT" relativeKey="$parent.Icon" relativePoint="RIGHT" x="2"/>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnEnter>
ShowGarrisonFollowerAbilityTooltip(self, self.abilityID, self.followerTypeID);
</OnEnter>
<OnLeave>
HideGarrisonFollowerAbilityTooltip(self.followerTypeID);
</OnLeave>
</Scripts>
</Frame>
<Frame name="GarrisonMissionAbilityCounterTemplate" inherits="GarrisonAbilityCounterTemplate" virtual="true">
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="AbilityFeedbackGlow" hidden="false" alpha="0.01" alphaMode="ADD" atlas="GarrMission-AbilityHighlight">
<Size x="30" y="30"/>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Animations>
<AnimationGroup parentKey="AbilityFeedbackGlowAnim" setToFinalAlpha="true">
<Alpha childKey="AbilityFeedbackGlow" smoothing="IN" duration="0.25" order="1" fromAlpha="0" toAlpha="1"/>
<Scale childKey="AbilityFeedbackGlow" duration="0.25" order="1" fromScaleX="0.8" fromScaleY="0.8" toScaleX="1.4" toScaleY="1.4"/>
<Alpha childKey="AbilityFeedbackGlow" startDelay="0.2" duration="0.5" order="1" fromAlpha="1" toAlpha="0"/>
</AnimationGroup>
</Animations>
<Scripts>
<OnEnter function="GarrisonMissionMechanicFollowerCounter_OnEnter"/>
<OnLeave function="GarrisonMissionMechanicFollowerCounter_OnLeave"/>
</Scripts>
</Frame>
<Frame name="GarrisonMissionAbilityLargeCounterTemplate" inherits="GarrisonAbilityLargeCounterTemplate" virtual="true">
<Scripts>
<OnEnter function="GarrisonMissionMechanicFollowerCounter_OnEnter"/>
......
......@@ -1323,7 +1323,7 @@
</Texture>
</Layer>
<Layer level="OVERLAY" textureSubLevel="5">
<Texture parentKey="MissionType" atlas="ShipMission_MissionIcon-Combat" useAtlasSize="true">
<Texture parentKey="MissionType" atlas="ShipMissionIcon-Combat-Mission" useAtlasSize="true">
<Anchors>
<Anchor point="TOPLEFT" x="12" y="-2"/>
</Anchors>
......@@ -1377,7 +1377,7 @@
</Layer>
<Layer level="ARTWORK">
<Texture parentKey="HighlightAnimTexture" hidden="false" alpha="0.01" alphaMode="BLEND" atlas="NavalMap-OpenWatersHighlight" useAtlasSize="true">
<Texture parentKey="HighlightAnimTexture" hidden="false" alpha="0.01" alphaMode="BLEND" atlas="NavalMap-OpenWaters-Highlight" useAtlasSize="true">
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.None"/>
</Anchors>
......
......@@ -345,7 +345,7 @@
<Texture parentKey="BorderShield" atlas="nameplates-InterruptShield" hidden="true" ignoreParentAlpha="true">
<Size x="10" y="12" />
<Anchors>
<Anchor point="CENTER" relativeTo="LEFT" x="-2" y="-1"/>
<Anchor point="CENTER" x="-2" y="-1"/>
</Anchors>
</Texture>
<Texture parentKey="Icon" hidden="true" ignoreParentAlpha="true">
......
......@@ -89,7 +89,7 @@
</Frame>
<Frame parentKey="BuffsFrame" inherits="GarrisonMissionPartyBuffsFrameTemplate" hidden="true">
<Anchors>
<Anchor point="BOTTOM" relativeKey="BuffsFrameAnchor" x="0" y="0"/>
<Anchor point="BOTTOM" relativeKey="$parent.BuffsFrameAnchor" x="0" y="0"/>
</Anchors>
</Frame>
<Button inherits="StartMissionButtonTemplate">
......
......@@ -1535,22 +1535,6 @@
</Texture>
</Layer>
</Layers>
<Scripts>
<!--
WARNING: ScopeModifiers don't work for templates!
These functions will fail to load properly if this template is instantiated outside
of the initial LoadAddon call becuase we'll have lost the scoped modifiers and the
reference to the addon environment if we instantiate them later.
Except for the first category, which is declared in .xml, we have to manually set these
scripts after the frame has been instantiated in Lua for them to work properly.
-->
<OnEnter function="StoreCategory_OnEnter" />
<OnLeave function="StoreCategory_OnLeave" />
<OnClick function="StoreCategory_OnClick" />
</Scripts>
</Button>
<Frame name="GoldBorderFrameTemplate" virtual="true">
<Size x="398" y="556" />
......@@ -2141,6 +2125,22 @@
<Anchors>
<Anchor point="TOPLEFT" relativeKey="$parent.LeftInset" relativePoint="TOPLEFT" x="9" y="-20" />
</Anchors>
<Scripts>
<!--
WARNING: ScopeModifiers don't work for templates!
These functions will fail to load properly if this template is instantiated outside
of the initial LoadAddon call becuase we'll have lost the scoped modifiers and the
reference to the addon environment if we instantiate them later.
Except for the first category, which is declared in .xml, we have to manually set these
scripts after the frame has been instantiated in Lua for them to work properly.
-->
<OnEnter function="StoreCategory_OnEnter" />
<OnLeave function="StoreCategory_OnLeave" />
<OnClick function="StoreCategory_OnClick" />
</Scripts>
</Button>
<Button parentArray="ProductCards" inherits="StoreProductCardTemplate">
<Anchors>
......
......@@ -81,7 +81,7 @@ end
function ArtifactBarMixin:OnLeave()
self:HideText();
self.Tick:OnLeave();
self.Tick:OnLeave();
end
function ArtifactBarMixin:UpdateTick()
......
......@@ -9,7 +9,7 @@
<Size x="32" y="32"/>
<Scripts>
<OnEnter method="OnEnter"/>
<OnLeave function="OnLeave"/>
<OnLeave method="OnLeave"/>
</Scripts>
<NormalTexture parentKey="Normal" file="Interface\MainMenuBar\UI-ExhaustionTickNormal"/>
<HighlightTexture parentKey="Highlight" file="Interface\MainMenuBar\UI-ExhaustionTickHighlight" alphaMode="ADD"/>
......
......@@ -101,11 +101,27 @@ function SetItemButtonSlotVertexColor(button, r, g, b)
_G[button:GetName().."SlotTexture"]:SetVertexColor(r, g, b);
end
function SetItemButtonQuality(button, quality, itemIDOrLink)
if itemIDOrLink and IsArtifactRelicItem(itemIDOrLink) then
button.IconBorder:SetTexture([[Interface\Artifacts\RelicIconFrame]]);
function SetItemButtonQuality(button, quality, itemIDOrLink, suppressOverlays)
if itemIDOrLink then
if IsArtifactRelicItem(itemIDOrLink) then
button.IconBorder:SetTexture([[Interface\Artifacts\RelicIconFrame]]);
else
button.IconBorder:SetTexture([[Interface\Common\WhiteIconFrame]]);
end
if button.IconOverlay then
if not suppressOverlays and C_AzeriteEmpoweredItem.IsAzeriteEmpoweredItemByID(itemIDOrLink) then
button.IconOverlay:SetAtlas([[AzeriteIconFrame]]);
button.IconOverlay:Show();
else
button.IconOverlay:Hide();
end
end
else
button.IconBorder:SetTexture([[Interface\Common\WhiteIconFrame]]);
if button.IconOverlay then
button.IconOverlay:Hide();
end
end
if quality then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment