Commit 1fa8f343 authored by TOM_RUS's avatar TOM_RUS

WOW-34615patch9.0.1_Beta

parent b1939861
......@@ -37,6 +37,15 @@ local BarberShop =
{ Name = "zoomLevel", Type = "number", Nilable = false },
},
},
{
Name = "GetCurrentCharacterData",
Type = "Function",
Returns =
{
{ Name = "characterData", Type = "BarberShopCharacterData", Nilable = false },
},
},
{
Name = "GetCurrentCost",
Type = "Function",
......@@ -46,6 +55,15 @@ local BarberShop =
{ Name = "cost", Type = "number", Nilable = false },
},
},
{
Name = "IsViewingAlteredForm",
Type = "Function",
Returns =
{
{ Name = "isViewingAlteredForm", Type = "bool", Nilable = false },
},
},
{
Name = "OldBarberShopLoaded",
Type = "Function",
......@@ -87,6 +105,15 @@ local BarberShop =
{ Name = "choiceID", Type = "number", Nilable = false },
},
},
{
Name = "SetViewingAlteredForm",
Type = "Function",
Arguments =
{
{ Name = "isViewingAlteredForm", Type = "bool", Nilable = false },
},
},
{
Name = "ZoomCamera",
Type = "Function",
......@@ -115,6 +142,11 @@ local BarberShop =
Type = "Event",
LiteralName = "BARBER_SHOP_COST_UPDATE",
},
{
Name = "BarberShopForceCustomizationsUpdate",
Type = "Event",
LiteralName = "BARBER_SHOP_FORCE_CUSTOMIZATIONS_UPDATE",
},
{
Name = "BarberShopOpen",
Type = "Event",
......@@ -133,6 +165,25 @@ local BarberShop =
Tables =
{
{
Name = "BarberShopCharacterData",
Type = "Structure",
Fields =
{
{ Name = "raceData", Type = "BarberShopRaceData", Nilable = false },
{ Name = "sex", Type = "number", Nilable = false },
},
},
{
Name = "BarberShopRaceData",
Type = "Structure",
Fields =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "fileName", Type = "string", Nilable = false },
{ Name = "alternateFormRaceData", Type = "CharacterAlternateFormData", Nilable = true },
},
},
},
};
......
......@@ -26,6 +26,19 @@ local CharacterCustomizationShared =
{ Name = "Slider", Type = "ChrCustomizationOptionType", EnumValue = 2 },
},
},
{
Name = "Unitsex",
Type = "Enumeration",
NumValues = 3,
MinValue = 0,
MaxValue = 2,
Fields =
{
{ Name = "Male", Type = "Unitsex", EnumValue = 0 },
{ Name = "Female", Type = "Unitsex", EnumValue = 1 },
{ Name = "None", Type = "Unitsex", EnumValue = 2 },
},
},
{
Name = "CharCustomizationChoice",
Type = "Structure",
......
......@@ -51,6 +51,22 @@ local GarrisonConstants =
{ Name = "EnemyRightBack", Type = "GarrAutoBoardIndex", EnumValue = 12 },
},
},
{
Name = "GarrAutoCombatantRole",
Type = "Enumeration",
NumValues = 6,
MinValue = 0,
MaxValue = 5,
Fields =
{
{ Name = "None", Type = "GarrAutoCombatantRole", EnumValue = 0 },
{ Name = "Melee", Type = "GarrAutoCombatantRole", EnumValue = 1 },
{ Name = "RangedPhysical", Type = "GarrAutoCombatantRole", EnumValue = 2 },
{ Name = "RangedMagic", Type = "GarrAutoCombatantRole", EnumValue = 3 },
{ Name = "HealSupport", Type = "GarrAutoCombatantRole", EnumValue = 4 },
{ Name = "Tank", Type = "GarrAutoCombatantRole", EnumValue = 5 },
},
},
{
Name = "GarrAutoEventFlags",
Type = "Enumeration",
......
......@@ -23,7 +23,7 @@ local GarrisonInfo =
},
},
{
Name = "GetAutoCombatSpellInfo",
Name = "GetAutoCombatSpellName",
Type = "Function",
Arguments =
......@@ -33,7 +33,7 @@ local GarrisonInfo =
Returns =
{
{ Name = "spellInfo", Type = "AutoCombatSpellInfo", Nilable = false },
{ Name = "spellName", Type = "string", Nilable = true },
},
},
{
......@@ -279,6 +279,15 @@ local GarrisonInfo =
{ Name = "failureString", Type = "string", Nilable = true },
},
},
{
Name = "RegenerateCombatLog",
Type = "Function",
Arguments =
{
{ Name = "missionID", Type = "number", Nilable = false },
},
},
{
Name = "RushHealFollower",
Type = "Function",
......
......@@ -139,6 +139,16 @@ local LFGListInfo =
Events =
{
{
Name = "LfgGroupDelistedLeadershipChange",
Type = "Event",
LiteralName = "LFG_GROUP_DELISTED_LEADERSHIP_CHANGE",
Payload =
{
{ Name = "listingName", Type = "string", Nilable = false },
{ Name = "automaticDelistTimeRemaining", Type = "number", Nilable = false },
},
},
{
Name = "LfgListActiveEntryUpdate",
Type = "Event",
......
......@@ -328,6 +328,22 @@ local Map =
{ Name = "maxY", Type = "number", Nilable = false },
},
},
{
Name = "GetMapWorldSize",
Type = "Function",
Documentation = { "Returns the size in yards of the area represented by the map." },
Arguments =
{
{ Name = "uiMapID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "width", Type = "number", Nilable = false },
{ Name = "height", Type = "number", Nilable = false },
},
},
{
Name = "GetPlayerMapPosition",
Type = "Function",
......
......@@ -6,6 +6,42 @@ local Minimap =
Functions =
{
{
Name = "GetDrawGroundTextures",
Type = "Function",
Returns =
{
{ Name = "draw", Type = "bool", Nilable = false },
},
},
{
Name = "GetViewRadius",
Type = "Function",
Returns =
{
{ Name = "yards", Type = "number", Nilable = false },
},
},
{
Name = "SetDrawGroundTextures",
Type = "Function",
Arguments =
{
{ Name = "draw", Type = "bool", Nilable = false },
},
},
{
Name = "ShouldUseHybridMinimap",
Type = "Function",
Returns =
{
{ Name = "shouldUse", Type = "bool", Nilable = false },
},
},
},
Events =
......
......@@ -6,6 +6,34 @@ local PlayerInfo =
Functions =
{
{
Name = "GetContentDifficultyCreatureForPlayer",
Type = "Function",
Arguments =
{
{ Name = "unitToken", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "difficulty", Type = "RelativeContentDifficulty", Nilable = false },
},
},
{
Name = "GetContentDifficultyQuestForPlayer",
Type = "Function",
Arguments =
{
{ Name = "questID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "difficulty", Type = "RelativeContentDifficulty", Nilable = false },
},
},
{
Name = "IsPlayerEligibleForNPE",
Type = "Function",
......
......@@ -486,7 +486,9 @@ end
function AuctionHouseUtil.AppendBattlePetVariationLines(tooltip)
GameTooltip_AddBlankLineToTooltip(tooltip);
GameTooltip_AddNormalLine(tooltip, AUCTION_HOUSE_BUCKET_VARIATION_PET_TOOLTIP);
local wrap = true;
GameTooltip_AddNormalLine(tooltip, AUCTION_HOUSE_BUCKET_VARIATION_PET_TOOLTIP, wrap);
end
function AuctionHouseUtil.SetAuctionHouseTooltip(owner, rowData)
......
BarberShopMixin = CreateFromMixins(CharCustomizeParentFrameBaseMixin);
function BarberShopMixin:OnLoad()
DefaultScaleFrameMixin.OnLoad(self);
self:RegisterEvent("BARBER_SHOP_RESULT");
self:RegisterEvent("BARBER_SHOP_COST_UPDATE");
self:RegisterEvent("BARBER_SHOP_FORCE_CUSTOMIZATIONS_UPDATE");
CharCustomizeFrame:AttachToParentFrame(self);
CharCustomizeFrame.SmallButtons.RandomizeAppearanceButton:Hide();
CharCustomizeFrame.RandomizeAppearanceButton:Hide();
end
function BarberShopMixin:OnEvent(event, ...)
DefaultScaleFrameMixin.OnEvent(self, event, ...);
if event == "BARBER_SHOP_RESULT" then
local success = ...;
if success then
......@@ -17,6 +22,8 @@ function BarberShopMixin:OnEvent(event, ...)
self:UpdateCharCustomizationFrame();
elseif event == "BARBER_SHOP_COST_UPDATE" then
self:UpdatePrice();
elseif event == "BARBER_SHOP_FORCE_CUSTOMIZATIONS_UPDATE" then
self:UpdateCharCustomizationFrame();
end
end
......@@ -33,6 +40,11 @@ function BarberShopMixin:OnShow()
local reset = true;
self:UpdateCharCustomizationFrame(reset);
local currentCharacterData = C_BarberShop.GetCurrentCharacterData();
if currentCharacterData then
CharCustomizeFrame:SetSelectedData(currentCharacterData.raceData, currentCharacterData.sex, C_BarberShop.IsViewingAlteredForm());
end
PlaySound(SOUNDKIT.BARBERSHOP_SIT);
end
......@@ -111,6 +123,11 @@ function BarberShopMixin:ResetCharacterRotation()
C_BarberShop.ResetCameraRotation();
end
function BarberShopMixin:SetViewingAlteredForm(viewingAlteredForm)
C_BarberShop.SetViewingAlteredForm(viewingAlteredForm);
self:UpdateCharCustomizationFrame();
end
BarberShopButtonMixin = {};
function BarberShopButtonMixin:OnClick()
......
......@@ -7,7 +7,10 @@
</Scripts>
</Button>
<Frame name="BarberShopFrame" mixin="BarberShopMixin" toplevel="true" setAllPoints="true" enableKeyboard="true" hidden="true">
<Frame name="BarberShopFrame" mixin="DefaultScaleFrameMixin, BarberShopMixin" toplevel="true" setAllPoints="true" ignoreParentScale="true" enableKeyboard="true" hidden="true">
<KeyValues>
<KeyValue key="maxScale" value="CHAR_CUSTOMIZE_MAX_SCALE" type="global"/>
</KeyValues>
<Layers>
<Layer level="OVERLAY">
<Texture parentKey="TopBackgroundOverlay" atlas="charactercreate-vignette-top">
......
......@@ -41,6 +41,9 @@ GlueDialogTypes["CHARACTER_CREATE_FAILURE"] = {
CharacterCreateMixin = CreateFromMixins(CharCustomizeParentFrameBaseMixin);
function CharacterCreateMixin:OnLoad()
DefaultScaleFrameMixin.OnLoad(self);
self:RegisterEvent("DISPLAY_SIZE_CHANGED");
self:RegisterEvent("CHARACTER_CREATION_RESULT");
self:RegisterEvent("RACE_FACTION_CHANGE_STARTED");
self:RegisterEvent("RACE_FACTION_CHANGE_RESULT");
......@@ -60,7 +63,6 @@ function CharacterCreateMixin:OnLoad()
ZoneChoiceFrame = self.ZoneChoiceFrame;
CharCustomizeFrame:AttachToParentFrame(self);
CharCustomizeFrame:SetScale(RaceAndClassFrame:GetScale());
self.navBlockers = {};
......@@ -75,8 +77,9 @@ function CharacterCreateMixin:OnLoad()
end
function CharacterCreateMixin:OnEvent(event, ...)
local showError;
DefaultScaleFrameMixin.OnEvent(self, event, ...);
local showError;
if event == "CHARACTER_CREATION_RESULT" then
local success, errorCode, guid = ...;
if success then
......@@ -300,6 +303,8 @@ function CharacterCreateMixin:SetMode(mode, instantRotate)
if mode == CHAR_CREATE_MODE_CLASS_RACE then
RaceAndClassFrame.allowClassAnimationsAfterSeconds = CLASS_ANIM_WAIT_TIME_SECONDS;
C_CharacterCreation.SetViewingAlteredForm(false);
if self.currentMode == CHAR_CREATE_MODE_CUSTOMIZE then
local useBlending = true;
RaceAndClassFrame:PlayClassIdleAnimation(useBlending);
......@@ -557,7 +562,7 @@ end
CharacterCreateNavButtonMixin = {};
function CharacterCreateNavButtonMixin:GetAppropriateTooltip()
return GlueTrueScaleNoHeaderTooltip;
return CharCustomizeNoHeaderTooltip;
end
function CharacterCreateNavButtonMixin:UpdateText(text, arrow)
......@@ -704,7 +709,7 @@ end
CharacterCreateRaceButtonMixin = CreateFromMixins(CharCustomizeFrameWithExpandableTooltipMixin, CharCustomizeMaskedButtonMixin);
function CharacterCreateRaceButtonMixin:GetAppropriateTooltip()
return GlueTrueScaleTooltip;
return CharCustomizeTooltip;
end
function CharacterCreateRaceButtonMixin:AddExtraStuffToTooltip()
......@@ -803,7 +808,7 @@ function CharacterCreateSpecButtonMixin:SetSpec(specData, selectedSpecID, layout
end
function CharacterCreateSpecButtonMixin:GetAppropriateTooltip()
return GlueTrueScaleTooltip;
return CharCustomizeTooltip;
end
function CharacterCreateSpecButtonMixin:OnClick()
......
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd">
<Button name="CharacterCreateNavButtonTemplate" inherits="GlueButtonTemplate" mixin="CharacterCreateNavButtonMixin" frameLevel="10" virtual="true" ignoreParentScale="true">
<Size x="170" y="40"/>
<Button name="CharacterCreateNavButtonTemplate" inherits="GlueButtonTemplate" mixin="CharacterCreateNavButtonMixin" frameLevel="10" virtual="true">
<NormalFont style="GameFontNormalOutlineHuge2"/>
<HighlightFont style="GameFontHighlightOutlineHuge2"/>
<DisabledFont style="GameFontDisableOutlineHuge2"/>
<Size x="250" y="60"/>
<Scripts>
<OnClick method="OnClick"/>
</Scripts>
......@@ -264,7 +267,10 @@
<Texture name="CharacterCreateBackgroundOverlayTexture" parentArray="BGTex" virtual="true"/>
<ModelFFX name="CharacterCreateFrame" mixin="CharacterCreateMixin" toplevel="true" parent="UIParent" setAllPoints="true" enableKeyboard="true" hidden="true" scale="0.7111">
<ModelFFX name="CharacterCreateFrame" mixin="DefaultScaleFrameMixin, CharacterCreateMixin" toplevel="true" parent="UIParent" setAllPoints="true" enableKeyboard="true" hidden="true">
<KeyValues>
<KeyValue key="maxScale" value="CHAR_CUSTOMIZE_MAX_SCALE" type="global"/>
</KeyValues>
<Layers>
<Layer level="OVERLAY">
<Texture parentKey="TopBackgroundOverlay" inherits="CharacterCreateBackgroundOverlayTexture" atlas="charactercreate-vignette-top">
......@@ -321,7 +327,7 @@
<Frames>
<Button parentKey="BackButton" inherits="CharacterCreateNavButtonTemplate">
<Anchors>
<Anchor point="BOTTOMLEFT" x="30" y="15"/>
<Anchor point="BOTTOMLEFT" x="49" y="28"/>
</Anchors>
<KeyValues>
<KeyValue key="charCreateOnClickMethod" value="NavBack" type="string"/>
......@@ -329,7 +335,7 @@
</Button>
<Button parentKey="ForwardButton" inherits="CharacterCreateNavButtonTemplate">
<Anchors>
<Anchor point="BOTTOMRIGHT" x="-30" y="15"/>
<Anchor point="BOTTOMRIGHT" x="-49" y="28"/>
</Anchors>
<KeyValues>
<KeyValue key="charCreateOnClickMethod" value="NavForward" type="string"/>
......@@ -511,6 +517,7 @@
<KeyValues>
<KeyValue key="simpleTooltipLine" value="RANDOMIZE" type="global"/>
<KeyValue key="iconAtlas" value="charactercreate-icon-dice" type="string"/>
<KeyValue key="tooltipAnchor" value="ANCHOR_BOTTOMLEFT" type="string"/>
</KeyValues>
</Button>
</Frames>
......
CHAR_CUSTOMIZE_MAX_SCALE = 0.75;
local showDebugTooltipInfo = GetCVarBool("debugTargetInfo");
CharCustomizeParentFrameBaseMixin = {};
......@@ -57,7 +59,7 @@ function CharCustomizeFrameWithTooltipMixin:AddBlankTooltipLine()
end
function CharCustomizeFrameWithTooltipMixin:GetAppropriateTooltip()
return UIParent and GameNoHeaderTooltip or GlueTrueScaleNoHeaderTooltip;
return CharCustomizeNoHeaderTooltip;
end
function CharCustomizeFrameWithTooltipMixin:SetupAnchors(tooltip)
......@@ -67,6 +69,12 @@ function CharCustomizeFrameWithTooltipMixin:SetupAnchors(tooltip)
elseif self.tooltipAnchor == "ANCHOR_TOPLEFT" then
tooltip:SetOwner(self, "ANCHOR_NONE");
tooltip:SetPoint("TOPRIGHT", self, "TOPLEFT", -self.tooltipXOffset, self.tooltipYOffset);
elseif self.tooltipAnchor == "ANCHOR_BOTTOMRIGHT" then
tooltip:SetOwner(self, "ANCHOR_NONE");
tooltip:SetPoint("TOPLEFT", self, "BOTTOMRIGHT", self.tooltipXOffset, self.tooltipYOffset);
elseif self.tooltipAnchor == "ANCHOR_BOTTOMLEFT" then
tooltip:SetOwner(self, "ANCHOR_NONE");
tooltip:SetPoint("TOPRIGHT", self, "BOTTOMLEFT", -self.tooltipXOffset, self.tooltipYOffset);
else
tooltip:SetOwner(self, self.tooltipAnchor, self.tooltipXOffset, self.tooltipYOffset);
end
......@@ -111,11 +119,6 @@ function CharCustomizeSmallButtonMixin:OnLoad()
self.Icon:SetAtlas(self.iconAtlas);
end
function CharCustomizeSmallButtonMixin:SetupAnchors(tooltip)
tooltip:SetOwner(self, "ANCHOR_NONE");
tooltip:SetPoint("TOPLEFT", self, "BOTTOMRIGHT", self.tooltipXOffset, self.tooltipYOffset);
end
function CharCustomizeSmallButtonMixin:OnMouseDown()
if self:IsEnabled() then
self.Icon:SetPoint("CENTER", self.PushedTexture);
......
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd">
<GameTooltip name="CharCustomizeTooltipTemplate" inherits="SharedTooltipTemplate" mixin="DefaultScaleFrameMixin" ignoreParentScale="true" virtual="true">
<KeyValues>
<KeyValue key="maxScale" value="CHAR_CUSTOMIZE_MAX_SCALE" type="global"/>
</KeyValues>
<Scripts>
<OnLoad method="OnLoad" inherit="append"/>
<OnEvent method="OnEvent"/>
</Scripts>
</GameTooltip>
<GameTooltip name="CharCustomizeTooltip" inherits="CharCustomizeTooltipTemplate">
<KeyValues>
<KeyValue key="textLeft1Font" value="GameFontNormalLarge2" type="string"/>
<KeyValue key="textRight1Font" value="GameFontNormalLarge2" type="string"/>
<KeyValue key="textLeft2Font" value="GameFontNormalMed3" type="string"/>
<KeyValue key="textRight2Font" value="GameFontNormalMed3" type="string"/>
</KeyValues>
</GameTooltip>
<GameTooltip name="CharCustomizeNoHeaderTooltip" inherits="CharCustomizeTooltipTemplate">
<KeyValues>
<KeyValue key="textLeft1Font" value="GameFontNormalMed3" type="string"/>
<KeyValue key="textRight1Font" value="GameFontNormalMed3" type="string"/>
<KeyValue key="textLeft2Font" value="GameFontNormalMed3" type="string"/>
<KeyValue key="textRight2Font" value="GameFontNormalMed3" type="string"/>
</KeyValues>
</GameTooltip>
<Frame name="CharCustomizeFrameWithTooltipTemplate" mixin="CharCustomizeFrameWithTooltipMixin" virtual="true">
<KeyValues>
<KeyValue key="tooltipAnchor" value="ANCHOR_TOPRIGHT" type="string"/>
......@@ -18,7 +46,7 @@
<Button name="CharCustomizeSmallButtonTemplate" inherits="CharCustomizeFrameWithTooltipTemplate" mixin="CharCustomizeSmallButtonMixin" motionScriptsWhileDisabled="true" virtual="true">
<Size x="48" y="48"/>
<KeyValues>
<KeyValue key="tooltipAnchor" value="ANCHOR_LEFT" type="string"/>
<KeyValue key="tooltipAnchor" value="ANCHOR_BOTTOMRIGHT" type="string"/>
<KeyValue key="tooltipMinWidth" value="nil" type="number"/>
</KeyValues>
<HitRectInsets left="6" right="6" top="6" bottom="6"/>
......@@ -210,6 +238,17 @@
</Anchors>
</Frame>
<Button parentKey="RandomizeAppearanceButton" inherits="CharCustomizeSmallButtonTemplate" mixin="CharCustomizeRandomizeAppearanceButtonMixin">
<KeyValues>
<KeyValue key="iconAtlas" value="charactercreate-icon-dice" type="string"/>
<KeyValue key="simpleTooltipLine" value="RANDOMIZE_APPEARANCE" type="global"/>
<KeyValue key="tooltipAnchor" value="ANCHOR_LEFT" type="string"/>
</KeyValues>
<Anchors>
<Anchor point="RIGHT" relativeKey="$parent.Categories" relativePoint="LEFT" x="-20"/>
</Anchors>
</Button>
<Frame parentKey="Options" inherits="VerticalLayoutFrame">
<KeyValues>
<KeyValue key="spacing" value="40" type="number"/>
......@@ -271,14 +310,6 @@
<KeyValue key="holdAmountPerSecond" value="100" type="number"/>
</KeyValues>
</Button>
<Button parentKey="RandomizeAppearanceButton" inherits="CharCustomizeSmallButtonTemplate" mixin="CharCustomizeRandomizeAppearanceButtonMixin">
<KeyValues>
<KeyValue key="layoutIndex" value="6" type="number"/>
<KeyValue key="iconAtlas" value="charactercreate-icon-dice" type="string"/>
<KeyValue key="simpleTooltipLine" value="RANDOMIZE_APPEARANCE" type="global"/>
<KeyValue key="leftPadding" value="30" type="number"/>
</KeyValues>
</Button>
</Frames>
</Frame>
</Frames>
......
......@@ -2,7 +2,7 @@
..\FrameXML\UI.xsd">
<Script file="Blizzard_FlightMap.lua"/>