Commit afbc2349 authored by TOM_RUS's avatar TOM_RUS

WOW-34821patch9.0.1_Beta

parent 1646bbce
......@@ -168,6 +168,7 @@ VignetteInfoDocumentation.lua
VoiceChatDocumentation.lua
VoidStorageInfoDocumentation.lua
WarCampaignDocumentation.lua
WeeklyRewardsDocumentation.lua
WorldStateInfoDocumentation.lua
WowEntitlementInfoDocumentation.lua
WowTokenUIDocumentation.lua
......
......@@ -7,7 +7,74 @@ local GossipInfo =
Functions =
{
{
Name = "GetGossipPoiForUiMapID",
Name = "CloseGossip",
Type = "Function",
},
{
Name = "ForceGossip",
Type = "Function",
Returns =
{
{ Name = "forceGossip", Type = "bool", Nilable = false },
},
},
{
Name = "GetActiveQuests",
Type = "Function",
Returns =
{
{ Name = "info", Type = "table", InnerType = "GossipQuestUIInfo", Nilable = false },
},
},
{
Name = "GetAvailableQuests",
Type = "Function",
Returns =
{
{ Name = "info", Type = "table", InnerType = "GossipQuestUIInfo", Nilable = false },
},
},
{
Name = "GetNumActiveQuests",
Type = "Function",
Returns =
{
{ Name = "numQuests", Type = "number", Nilable = false },
},
},
{
Name = "GetNumAvailableQuests",
Type = "Function",
Returns =
{
{ Name = "numQuests", Type = "number", Nilable = false },
},
},
{
Name = "GetNumOptions",
Type = "Function",
Returns =
{
{ Name = "numOptions", Type = "number", Nilable = false },
},
},
{
Name = "GetOptions",
Type = "Function",
Returns =
{
{ Name = "info", Type = "table", InnerType = "GossipOptionUIInfo", Nilable = false },
},
},
{
Name = "GetPoiForUiMapID",
Type = "Function",
Arguments =
......@@ -21,7 +88,7 @@ local GossipInfo =
},
},
{
Name = "GetGossipPoiInfo",
Name = "GetPoiInfo",
Type = "Function",
Arguments =
......@@ -35,6 +102,44 @@ local GossipInfo =
{ Name = "gossipPoiInfo", Type = "GossipPoiInfo", Nilable = true },
},
},
{
Name = "GetText",
Type = "Function",
Returns =
{
{ Name = "gossipText", Type = "string", Nilable = false },
},
},
{
Name = "SelectActiveQuest",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
},
{
Name = "SelectAvailableQuest",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
},
{
Name = "SelectOption",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
{ Name = "text", Type = "string", Nilable = true },
{ Name = "confirmed", Type = "bool", Nilable = true },
},
},
},
Events =
......@@ -83,6 +188,15 @@ local GossipInfo =
Tables =
{
{
Name = "GossipOptionUIInfo",
Type = "Structure",
Fields =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "type", Type = "string", Nilable = false },
},
},
{
Name = "GossipPoiInfo",
Type = "Structure",
......@@ -94,6 +208,22 @@ local GossipInfo =
{ Name = "inBattleMap", Type = "bool", Nilable = false },
},
},
{
Name = "GossipQuestUIInfo",
Type = "Structure",
Fields =
{
{ Name = "title", Type = "string", Nilable = false },
{ Name = "questLevel", Type = "number", Nilable = false },
{ Name = "isTrivial", Type = "bool", Nilable = false },
{ Name = "frequency", Type = "number", Nilable = true },
{ Name = "repeatable", Type = "bool", Nilable = true },
{ Name = "isComplete", Type = "bool", Nilable = true },
{ Name = "isLegendary", Type = "bool", Nilable = false },
{ Name = "isIgnored", Type = "bool", Nilable = false },
{ Name = "questID", Type = "number", Nilable = false },
},
},
},
};
......
......@@ -6,6 +6,16 @@ local LFGInfo =
Functions =
{
{
Name = "CanPlayerUseGroupFinder",
Type = "Function",
Returns =
{
{ Name = "canUse", Type = "bool", Nilable = false },
{ Name = "failureReason", Type = "string", Nilable = false },
},
},
{
Name = "CanPlayerUseLFD",
Type = "Function",
......@@ -36,6 +46,16 @@ local LFGInfo =
{ Name = "failureReason", Type = "string", Nilable = false },
},
},
{
Name = "CanPlayerUsePremadeGroup",
Type = "Function",
Returns =
{
{ Name = "canUse", Type = "bool", Nilable = false },
{ Name = "failureReason", Type = "string", Nilable = false },
},
},
{
Name = "CanPlayerUseScenarioFinder",
Type = "Function",
......
......@@ -24,6 +24,15 @@ local Minimap =
{ Name = "yards", Type = "number", Nilable = false },
},
},
{
Name = "IsRotateMinimapIgnored",
Type = "Function",
Returns =
{
{ Name = "isIgnored", Type = "bool", Nilable = false },
},
},
{
Name = "SetDrawGroundTextures",
Type = "Function",
......@@ -33,6 +42,15 @@ local Minimap =
{ Name = "draw", Type = "bool", Nilable = false },
},
},
{
Name = "SetIgnoreRotateMinimap",
Type = "Function",
Arguments =
{
{ Name = "ignore", Type = "bool", Nilable = false },
},
},
{
Name = "ShouldUseHybridMinimap",
Type = "Function",
......
......@@ -123,6 +123,8 @@ local PlayerChoice =
{ Name = "rarity", Type = "PlayerChoiceRarity", Nilable = false },
{ Name = "typeArtID", Type = "number", Nilable = true },
{ Name = "uiTextureKit", Type = "string", Nilable = true },
{ Name = "spellID", Type = "number", Nilable = true },
{ Name = "maxStacks", Type = "number", Nilable = false },
},
},
{
......
......@@ -26,9 +26,9 @@ local ScriptedAnimations =
{
Name = "ScriptedAnimationBehavior",
Type = "Enumeration",
NumValues = 5,
NumValues = 6,
MinValue = 0,
MaxValue = 4,
MaxValue = 5,
Fields =
{
{ Name = "None", Type = "ScriptedAnimationBehavior", EnumValue = 0 },
......@@ -36,6 +36,7 @@ local ScriptedAnimations =
{ Name = "TargetKnockBack", Type = "ScriptedAnimationBehavior", EnumValue = 2 },
{ Name = "SourceRecoil", Type = "ScriptedAnimationBehavior", EnumValue = 3 },
{ Name = "SourceCollideWithTarget", Type = "ScriptedAnimationBehavior", EnumValue = 4 },
{ Name = "UIParentShake", Type = "ScriptedAnimationBehavior", EnumValue = 5 },
},
},
{
......
......@@ -56,22 +56,6 @@ local TradeSkillUI =
{ Name = "slots", Type = "table", InnerType = "OptionalReagentSlot", Nilable = false },
},
},
{
Name = "GetOptionalReagentTooltipText",
Type = "Function",
Arguments =
{
{ Name = "recipeSpellID", Type = "number", Nilable = false },
{ Name = "optionalReagentIndex", Type = "number", Nilable = false },
{ Name = "optionalReagents", Type = "table", InnerType = "OptionalReagentInfo", Nilable = false },
},
Returns =
{
{ Name = "tooltipText", Type = "string", Nilable = true },
},
},
{
Name = "GetRecipeRepeatCount",
Type = "Function",
......@@ -212,9 +196,9 @@ local TradeSkillUI =
LiteralName = "TRADE_SKILL_NAME_UPDATE",
},
{
Name = "TradeSkillOptionalReagentTooltipUpdated",
Name = "TradeSkillOptionalReagentBonusTextUpdated",
Type = "Event",
LiteralName = "TRADE_SKILL_OPTIONAL_REAGENT_TOOLTIP_UPDATED",
LiteralName = "TRADE_SKILL_OPTIONAL_REAGENT_BONUS_TEXT_UPDATED",
Payload =
{
{ Name = "itemID", Type = "number", Nilable = false },
......@@ -234,6 +218,17 @@ local TradeSkillUI =
Tables =
{
{
Name = "OptionalReagentItemFlag",
Type = "Enumeration",
NumValues = 1,
MinValue = 0,
MaxValue = 0,
Fields =
{
{ Name = "TooltipShowsAsStatModifications", Type = "OptionalReagentItemFlag", EnumValue = 0 },
},
},
{
Name = "OptionalReagentSlot",
Type = "Structure",
......
local WeeklyRewards =
{
Name = "WeeklyRewards",
Type = "System",
Namespace = "C_WeeklyRewards",
Functions =
{
{
Name = "CanClaimRewards",
Type = "Function",
Returns =
{
{ Name = "canClaimRewards", Type = "bool", Nilable = false },
},
},
{
Name = "ClaimReward",
Type = "Function",
Arguments =
{
{ Name = "id", Type = "number", Nilable = false },
},
},
{
Name = "CloseInteraction",
Type = "Function",
},
{
Name = "GetActivities",
Type = "Function",
Returns =
{
{ Name = "activities", Type = "table", InnerType = "WeeklyRewardActivityInfo", Nilable = false },
},
},
{
Name = "GetActivityRewardHyperlink",
Type = "Function",
Arguments =
{
{ Name = "id", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "hyperlink", Type = "string", Nilable = false },
},
},
},
Events =
{
{
Name = "WeeklyRewardsHide",
Type = "Event",
LiteralName = "WEEKLY_REWARDS_HIDE",
},
{
Name = "WeeklyRewardsShow",
Type = "Event",
LiteralName = "WEEKLY_REWARDS_SHOW",
},
{
Name = "WeeklyRewardsUpdate",
Type = "Event",
LiteralName = "WEEKLY_REWARDS_UPDATE",
},
},
Tables =
{
{
Name = "WeeklyRewardActivityInfo",
Type = "Structure",
Fields =
{
{ Name = "type", Type = "WeeklyRewardChestThresholdType", Nilable = false },
{ Name = "index", Type = "number", Nilable = false },
{ Name = "threshold", Type = "number", Nilable = false },
{ Name = "progress", Type = "number", Nilable = false },
{ Name = "id", Type = "number", Nilable = false },
},
},
},
};
APIDocumentation:AddDocumentationTable(WeeklyRewards);
\ No newline at end of file
......@@ -16,6 +16,9 @@
<Frame name="AnimaDiversionModelScenePinTemplate" mixin="AnimaDiversionModelScenePinMixin" virtual="true">
<Frames>
<ModelScene parentKey="ModelScene" inherits="ScriptAnimatedModelSceneTemplate" useParentLevel="true" enableMouse="false">
<KeyValues>
<KeyValue key="useViewInsetNormalization" value="false" type="boolean"/>
</KeyValues>
<Anchors>
<Anchor point="CENTER"/>
</Anchors>
......
......@@ -94,7 +94,11 @@
<OnLeave method="OnLeave"/>
</Scripts>
<Frames>
<ModelScene parentKey="ModelScene" inherits="ScriptAnimatedModelSceneTemplate" setAllPoints="true" enableMouse="false"/>
<ModelScene parentKey="ModelScene" inherits="ScriptAnimatedModelSceneTemplate" setAllPoints="true" enableMouse="false">
<KeyValues>
<KeyValue key="useViewInsetNormalization" value="false" type="boolean"/>
</KeyValues>
</ModelScene>
</Frames>
</Button>
<Frame parentKey="ReinforceInfoFrame" mixin="ReinforceInfoFrameMixin" frameLevel="512">
......
......@@ -848,13 +848,18 @@ function AzeriteEssenceListMixin:Refresh()
if parent:ShouldPlayReveal() and not parent:IsRevealInProgress() then
ScrollBar_Disable(self.scrollBar);
if hasUnlockedEssence then
self.Tutorial:Show();
self.Tutorial:SetPoint("BOTTOM", self.buttons[1].Icon, "TOP", 0, 12);
local helpTipInfo = {
text = AZERITE_ESSENCE_TUTORIAL_FIRST_ESSENCE,
buttonStyle = HelpTip.ButtonStyle.Close,
targetPoint = HelpTip.Point.TopEdgeCenter,
offsetY = -12,
};
HelpTip:Show(self, helpTipInfo, self.buttons[1].Icon);
else
self.Tutorial:Hide();
HelpTip:Hide(self, AZERITE_ESSENCE_TUTORIAL_FIRST_ESSENCE);
end
else
self.Tutorial:Hide();
HelpTip:Hide(self, AZERITE_ESSENCE_TUTORIAL_FIRST_ESSENCE);
end
end
......
......@@ -616,31 +616,6 @@
<Anchor point="BOTTOMRIGHT" relativeKey="$parent.RightInset" x="-26" y="2"/>
</Anchors>
<Frames>
<Frame parentKey="Tutorial" inherits="GlowBoxTemplate" enableMouse="true" hidden="true" frameStrata="DIALOG">
<Size x="210" y="100"/>
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="Arrow" inherits="HelpPlateArrowDOWN">
<Anchors>
<Anchor point="BOTTOM" x="0" y="-19"/>
</Anchors>
</Texture>
</Layer>
<Layer level="OVERLAY">
<FontString parentKey="Text" inherits="GameFontHighlightLeft" justifyV="TOP" text="AZERITE_ESSENCE_TUTORIAL_FIRST_ESSENCE">
<Size x="190" y="0"/>
<Anchors>
<Anchor point="TOPLEFT" x="10" y="-18"/>
</Anchors>
</FontString>
</Layer>
</Layers>
<Scripts>
<OnLoad>
self:SetHeight(self.Text:GetHeight() + 34);
</OnLoad>
</Scripts>
</Frame>
<ModelScene parentKey="LearnEssenceModelScene" inherits="NonInteractableModelSceneMixinTemplate" frameStrata="HIGH" hidden="true">
<Size x="650" y="650"/>
</ModelScene>
......
......@@ -214,15 +214,21 @@ function ChannelFrameMixin:CheckShowTutorial()
local channels = self:GetList();
local channelButton = channels:GetButtonForAnyVoiceChannel();
if channelButton then
self.Tutorial:ClearAllPoints();
self.Tutorial:SetPoint("LEFT", channelButton, "RIGHT", 20, -1);
self.Tutorial:Show();
local helpTipInfo = {
text = TUTORIAL_VOICE,
buttonStyle = HelpTip.ButtonStyle.Close,
cvarBitfield = "closedInfoFrames",
bitfieldFlag = LE_FRAME_TUTORIAL_CHAT_CHANNELS,
targetPoint = HelpTip.Point.RightEdgeCenter,
offsetX = -4,
};
HelpTip:Show(self, helpTipInfo, channelButton);
end
end
end
function ChannelFrameMixin:HideTutorial()
self.Tutorial:Hide();
HelpTip:Hide(self, TUTORIAL_VOICE);
end
function ChannelFrameMixin:ShouldShowTutorial()
......
......@@ -76,49 +76,6 @@
</Anchors>
</Frame>
<Frame parentKey="Tutorial" inherits="GlowBoxTemplate" enableMouse="true" hidden="true" frameStrata="DIALOG">
<Size x="220" y="100"/>
<Layers>
<Layer level="OVERLAY">
<FontString parentKey="Text" inherits="GameFontHighlightLeft" justifyV="TOP" text="TUTORIAL_VOICE">
<Size x="188" y="0"/>
<Anchors>
<Anchor point="TOPLEFT" x="16" y="-14"/>
</Anchors>
</FontString>
</Layer>
</Layers>
<Frames>
<Button parentKey="CloseButton" inherits="UIPanelCloseButton">
<Anchors>
<Anchor point="TOPRIGHT" x="6" y="6"/>
</Anchors>
<Scripts>
<OnClick inherit="append">
SetCVarBitfield("closedInfoFrames", LE_FRAME_TUTORIAL_CHAT_CHANNELS, true);
</OnClick>
</Scripts>
</Button>
<Frame parentKey="Arrow" inherits="GlowBoxArrowTemplate">
<Anchors>
<Anchor point="RIGHT" relativePoint="LEFT" x="34" y="16"/>
</Anchors>
</Frame>
</Frames>
<Scripts>
<OnLoad>
self.Text:SetSpacing(4);
SetClampedTextureRotation(self.Arrow.Arrow, 90);
SetClampedTextureRotation(self.Arrow.Glow, 90);
self.Arrow.Glow:ClearAllPoints();
self.Arrow.Glow:SetPoint("CENTER", self.Arrow.Arrow, "CENTER", -5, 0);
</OnLoad>
<OnShow>
self:SetHeight(self.Text:GetHeight() + 32);
</OnShow>
</Scripts>
</Frame>
<Frame parentKey="Dropdown" hidden="true"/>
</Frames>
<Scripts>
......
......@@ -200,7 +200,7 @@ end
function CharacterCreateMixin:OnUpdateMouseRotate()
local x = GetCursorPosition();
if x ~= self.lastCursorPosX then
RaceAndClassFrame.allowClassAnimationsAfterSeconds = nil;
RaceAndClassFrame:ClearClassAnimationCountdown();