Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Simpy
BlizzardInterfaceCode
Commits
4f7261bc
Commit
4f7261bc
authored
Jun 15, 2019
by
TOM_RUS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WOW-30827patch8.2.0_PTR
parent
86da2430
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
217 additions
and
110 deletions
+217
-110
Interface/AddOns/Blizzard_APIDocumentation/AzeriteEssenceDocumentation.lua
...Blizzard_APIDocumentation/AzeriteEssenceDocumentation.lua
+14
-0
Interface/AddOns/Blizzard_APIDocumentation/ChatInfoDocumentation.lua
...ddOns/Blizzard_APIDocumentation/ChatInfoDocumentation.lua
+14
-0
Interface/AddOns/Blizzard_AzeriteEssenceUI/Blizzard_AzeriteEssenceUI.lua
...s/Blizzard_AzeriteEssenceUI/Blizzard_AzeriteEssenceUI.lua
+1
-3
Interface/AddOns/Blizzard_Communities/GuildRoster.xml
Interface/AddOns/Blizzard_Communities/GuildRoster.xml
+4
-18
Interface/AddOns/Blizzard_GarrisonTemplates/Blizzard_GarrisonSharedTemplates.lua
...rd_GarrisonTemplates/Blizzard_GarrisonSharedTemplates.lua
+6
-4
Interface/AddOns/Blizzard_ObjectiveTracker/Blizzard_BonusObjectiveTracker.lua
...zzard_ObjectiveTracker/Blizzard_BonusObjectiveTracker.lua
+0
-4
Interface/AddOns/Blizzard_PVPMatch/PVPMatchResults.xml
Interface/AddOns/Blizzard_PVPMatch/PVPMatchResults.xml
+1
-1
Interface/AddOns/Blizzard_PVPMatch/PVPMatchScoreboard.xml
Interface/AddOns/Blizzard_PVPMatch/PVPMatchScoreboard.xml
+1
-1
Interface/AddOns/Blizzard_PVPUI/Blizzard_PVPUI.lua
Interface/AddOns/Blizzard_PVPUI/Blizzard_PVPUI.lua
+13
-1
Interface/FrameXML/AzeriteEssenceUtil.lua
Interface/FrameXML/AzeriteEssenceUtil.lua
+45
-0
Interface/FrameXML/ChatFrame.lua
Interface/FrameXML/ChatFrame.lua
+20
-3
Interface/FrameXML/CompactUnitFrame.lua
Interface/FrameXML/CompactUnitFrame.lua
+73
-64
Interface/FrameXML/MainMenuBarMicroButtons.lua
Interface/FrameXML/MainMenuBarMicroButtons.lua
+4
-10
Interface/FrameXML/PaperDollFrame.lua
Interface/FrameXML/PaperDollFrame.lua
+21
-1
No files found.
Interface/AddOns/Blizzard_APIDocumentation/AzeriteEssenceDocumentation.lua
View file @
4f7261bc
...
...
@@ -31,6 +31,20 @@ local AzeriteEssence =
{
Name
=
"canActivate"
,
Type
=
"bool"
,
Nilable
=
false
},
},
},
{
Name
=
"CanDeactivateEssence"
,
Type
=
"Function"
,
Arguments
=
{
{
Name
=
"milestoneID"
,
Type
=
"number"
,
Nilable
=
false
},
},
Returns
=
{
{
Name
=
"canDeactivate"
,
Type
=
"bool"
,
Nilable
=
false
},
},
},
{
Name
=
"CanOpenUI"
,
Type
=
"Function"
,
...
...
Interface/AddOns/Blizzard_APIDocumentation/ChatInfoDocumentation.lua
View file @
4f7261bc
...
...
@@ -24,6 +24,20 @@ local ChatInfo =
{
Name
=
"guid"
,
Type
=
"string"
,
Nilable
=
false
},
},
},
{
Name
=
"GetClubStreamIDs"
,
Type
=
"Function"
,
Arguments
=
{
{
Name
=
"clubID"
,
Type
=
"string"
,
Nilable
=
false
},
},
Returns
=
{
{
Name
=
"ids"
,
Type
=
"table"
,
InnerType
=
"string"
,
Nilable
=
false
},
},
},
{
Name
=
"GetNumActiveChannels"
,
Type
=
"Function"
,
...
...
Interface/AddOns/Blizzard_AzeriteEssenceUI/Blizzard_AzeriteEssenceUI.lua
View file @
4f7261bc
...
...
@@ -249,9 +249,7 @@ function AzeriteEssenceUIMixin:TryShow()
if
C_AzeriteEssence
.
CanOpenUI
()
then
ShowUIPanel
(
AzeriteEssenceUI
);
if
not
C_AzeriteEssence
.
IsAtForge
()
then
if
C_AzeriteEssence
.
GetNumUnlockedEssences
()
>
1
then
SetCVarBitfield
(
"closedInfoFrames"
,
LE_FRAME_TUTORIAL_CHANGE_AZERITE_ESSENCES
,
true
);
end
AzeriteEssenceUtil
.
TryAcknowledgeEssenceSwapTutorial
();
end
return
true
;
end
...
...
Interface/AddOns/Blizzard_Communities/GuildRoster.xml
View file @
4f7261bc
...
...
@@ -58,32 +58,18 @@
<Anchor
point=
"TOPLEFT"
relativeKey=
"$parent.NoteLabel"
relativePoint=
"BOTTOMLEFT"
x=
"0"
y=
"-43"
/>
</Anchors>
</FontString>
<Texture
file=
"Interface\FriendsFrame\UI-GuildMember-Patch"
>
<Size
x=
"256"
y=
"32"
/>
<Anchors>
<Anchor
point=
"BOTTOMLEFT"
x=
"12"
y=
"3"
/>
</Anchors>
</Texture>
</Layer>
<Layer
level=
"OVERLAY"
>
<Texture
parentKey=
"Corner"
file=
"Interface\DialogFrame\UI-DialogBox-Corner"
>
<Size
x=
"32"
y=
"32"
/>
<Anchors>
<Anchor
point=
"TOPRIGHT"
x=
"-6"
y=
"-7"
/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Frames>
<Frame
parentKey=
"Border"
inherits=
"DialogBorderDarkTemplate"
>
<Anchors>
<Anchor
point=
"TOPLEFT"
x=
"
6
"
y=
"
-6
"
/>
<Anchor
point=
"BOTTOMRIGHT"
x=
"
-
6"
y=
"
6
"
/>
<Anchor
point=
"TOPLEFT"
x=
"
4
"
y=
"
0
"
/>
<Anchor
point=
"BOTTOMRIGHT"
x=
"6"
y=
"
1
"
/>
</Anchors>
</Frame>
<Button
parentKey=
"CloseButton"
inherits=
"UIPanelCloseButton"
>
<Anchors>
<Anchor
point=
"TOPRIGHT"
x=
"
-
3"
y=
"-
3
"
/>
<Anchor
point=
"TOPRIGHT"
x=
"3"
y=
"-
4
"
/>
</Anchors>
<Scripts>
<OnClick>
...
...
@@ -95,7 +81,7 @@
<Button
parentKey=
"RemoveButton"
inherits=
"UIPanelButtonTemplate"
text=
"REMOVE"
>
<Size
x=
"96"
y=
"22"
/>
<Anchors>
<Anchor
point=
"BOTTOMLEFT"
x=
"1
0
"
y=
"12"
/>
<Anchor
point=
"BOTTOMLEFT"
x=
"1
6
"
y=
"12"
/>
</Anchors>
<Scripts>
<OnClick>
...
...
Interface/AddOns/Blizzard_GarrisonTemplates/Blizzard_GarrisonSharedTemplates.lua
View file @
4f7261bc
...
...
@@ -722,10 +722,12 @@ function GarrisonFollowerButton_SetCounterButton(button, followerID, index, info
counter
=
button
.
Counters
[
index
];
end
local
numPerRow
,
innerSpacing
,
outerSpacingX
,
outerSpacingY
,
scale
=
GetFollowerButtonCounterSpacings
(
followerTypeID
);
if
((
index
-
1
)
%
numPerRow
~=
0
)
then
counter
:
SetPoint
(
"RIGHT"
,
button
.
Counters
[
index
-
1
],
"LEFT"
,
-
innerSpacing
,
0
);
else
counter
:
SetPoint
(
"TOP"
,
button
.
Counters
[
index
-
2
],
"BOTTOM"
,
0
,
-
innerSpacing
);
if
index
>
1
then
if
((
index
-
1
)
%
numPerRow
~=
0
)
then
counter
:
SetPoint
(
"RIGHT"
,
button
.
Counters
[
index
-
1
],
"LEFT"
,
-
innerSpacing
,
0
);
else
counter
:
SetPoint
(
"TOP"
,
button
.
Counters
[
index
-
numPerRow
],
"BOTTOM"
,
0
,
-
innerSpacing
);
end
end
counter
:
SetScale
(
scale
);
counter
.
info
=
info
;
...
...
Interface/AddOns/Blizzard_ObjectiveTracker/Blizzard_BonusObjectiveTracker.lua
View file @
4f7261bc
...
...
@@ -138,10 +138,6 @@ end
function
BonusObjectiveTracker_OnBlockLeave
(
block
)
block
.
module
:
OnBlockHeaderLeave
(
block
);
GameTooltipTextLeft1
:
SetFontObject
(
GameTooltipHeaderText
);
for
i
=
2
,
4
do
_G
[
"GameTooltipTextLeft"
..
i
]:
SetFontObject
(
GameTooltipText
);
end
GameTooltip
:
Hide
();
block
.
module
.
tooltipBlock
=
nil
;
end
...
...
Interface/AddOns/Blizzard_PVPMatch/PVPMatchResults.xml
View file @
4f7261bc
...
...
@@ -8,7 +8,7 @@
</Anchors>
</Button>
<Frame
name=
"PVPMatchResults"
mixin=
"PVPMatchResultsMixin"
toplevel=
"true"
parent=
"UIParent"
enableMouse=
"true"
hidden=
"true"
>
<Frame
name=
"PVPMatchResults"
mixin=
"PVPMatchResultsMixin"
toplevel=
"true"
frameStrata=
"DIALOG"
parent=
"UIParent"
enableMouse=
"true"
hidden=
"true"
>
<Size
x=
"1024"
y=
"620"
/>
<Anchors>
<Anchor
point=
"CENTER"
/>
...
...
Interface/AddOns/Blizzard_PVPMatch/PVPMatchScoreboard.xml
View file @
4f7261bc
...
...
@@ -2,7 +2,7 @@
..\FrameXML\UI.xsd"
>
<Script
file=
"PVPMatchScoreboard.lua"
/>
<Frame
name=
"PVPMatchScoreboard"
mixin=
"PVPMatchScoreboardMixin"
toplevel=
"true"
parent=
"UIParent"
enableMouse=
"true"
hidden=
"true"
>
<Frame
name=
"PVPMatchScoreboard"
mixin=
"PVPMatchScoreboardMixin"
frameStrata=
"DIALOG"
toplevel=
"true"
parent=
"UIParent"
enableMouse=
"true"
hidden=
"true"
>
<Size
x=
"1024"
y=
"420"
/>
<Anchors>
<Anchor
point=
"CENTER"
/>
...
...
Interface/AddOns/Blizzard_PVPUI/Blizzard_PVPUI.lua
View file @
4f7261bc
...
...
@@ -1533,10 +1533,22 @@ local SEASON_REWARD_ACHIEVEMENTS = {
[
PLAYER_FACTION_GROUP
[
0
]]
=
13227
,
[
PLAYER_FACTION_GROUP
[
1
]]
=
13228
,
},
[
BFA_START_SEASON
+
2
]
=
{
[
PLAYER_FACTION_GROUP
[
0
]]
=
13636
,
[
PLAYER_FACTION_GROUP
[
1
]]
=
13637
,
},
};
function
PVPUISeasonRewardFrameMixin
:
GetAchievementID
()
local
seasonAchievements
=
SEASON_REWARD_ACHIEVEMENTS
[
GetCurrentArenaSeason
()];
local
seasonID
=
GetCurrentArenaSeason
();
if
seasonID
==
NO_ARENA_SEASON
then
seasonID
=
GetPreviousArenaSeason
();
end
if
seasonID
and
seasonID
<
BFA_START_SEASON
then
return
nil
;
end
local
seasonAchievements
=
SEASON_REWARD_ACHIEVEMENTS
[
seasonID
];
local
achievementID
=
seasonAchievements
and
seasonAchievements
[
UnitFactionGroup
(
"player"
)];
if
achievementID
then
local
id
,
name
,
points
,
completed
=
GetAchievementInfo
(
achievementID
);
...
...
Interface/FrameXML/AzeriteEssenceUtil.lua
View file @
4f7261bc
...
...
@@ -51,4 +51,49 @@ function AzeriteEssenceUtil.HasAnyEmptySlots()
end
end
return
false
;
end
local
ESSENCE_SWAP_TUTORIAL_STATE_NOT_SEEN
=
0
;
local
ESSENCE_SWAP_TUTORIAL_STATE_SEEN
=
1
;
local
ESSENCE_SWAP_TUTORIAL_STATE_ACKNOWLEDGED
=
2
;
local
function
GetEssenceSwapTutorialState
()
return
tonumber
(
GetCVar
(
"azeriteEssenceSwapTutorial"
));
end
function
AzeriteEssenceUtil
.
ShouldShowEssenceSwapTutorial
()
if
GetEssenceSwapTutorialState
()
==
ESSENCE_SWAP_TUTORIAL_STATE_ACKNOWLEDGED
then
return
false
;
end
if
not
C_AzeriteEssence
.
CanOpenUI
()
then
return
false
;
end
if
C_AzeriteEssence
.
GetNumUnlockedEssences
()
<
2
then
return
false
;
end
local
milestones
=
C_AzeriteEssence
.
GetMilestones
();
if
milestones
then
for
i
,
milestoneInfo
in
ipairs
(
milestones
)
do
if
milestoneInfo
.
slot
and
C_AzeriteEssence
.
CanDeactivateEssence
(
milestoneInfo
.
ID
)
then
return
true
;
end
end
end
return
false
;
end
function
AzeriteEssenceUtil
.
SetEssenceSwapTutorialSeen
()
if
GetEssenceSwapTutorialState
()
~=
ESSENCE_SWAP_TUTORIAL_STATE_ACKNOWLEDGED
then
SetCVar
(
"azeriteEssenceSwapTutorial"
,
ESSENCE_SWAP_TUTORIAL_STATE_SEEN
);
end
end
function
AzeriteEssenceUtil
.
TryAcknowledgeEssenceSwapTutorial
()
if
GetEssenceSwapTutorialState
()
==
ESSENCE_SWAP_TUTORIAL_STATE_SEEN
then
SetCVar
(
"azeriteEssenceSwapTutorial"
,
ESSENCE_SWAP_TUTORIAL_STATE_ACKNOWLEDGED
);
end
end
\ No newline at end of file
Interface/FrameXML/ChatFrame.lua
View file @
4f7261bc
...
...
@@ -2731,6 +2731,7 @@ function ChatFrame_OnLoad(self)
self
:
RegisterEvent
(
"UPDATE_CHAT_WINDOWS"
);
self
:
RegisterEvent
(
"CHAT_MSG_CHANNEL"
);
self
:
RegisterEvent
(
"CHAT_MSG_COMMUNITIES_CHANNEL"
);
self
:
RegisterEvent
(
"CLUB_REMOVED"
);
self
:
RegisterEvent
(
"UPDATE_INSTANCE_INFO"
);
self
:
RegisterEvent
(
"UPDATE_CHAT_COLOR_NAME_BY_CLASS"
);
self
:
RegisterEvent
(
"VARIABLES_LOADED"
);
...
...
@@ -2905,11 +2906,14 @@ function ChatFrame_GetCommunitiesChannelLocalID(clubId, streamId)
return
localID
;
end
function
ChatFrame_RemoveCommunitiesChannel
(
chatFrame
,
clubId
,
streamId
)
function
ChatFrame_RemoveCommunitiesChannel
(
chatFrame
,
clubId
,
streamId
,
omitMessage
)
local
channelName
=
Chat_GetCommunitiesChannelName
(
clubId
,
streamId
);
local
channelIndex
=
ChatFrame_RemoveChannel
(
chatFrame
,
channelName
);
local
r
,
g
,
b
=
Chat_GetCommunitiesChannelColor
(
clubId
,
streamId
);
chatFrame
:
AddMessage
(
COMMUNITIES_CHANNEL_REMOVED_FROM_CHAT_WINDOW
:
format
(
channelIndex
,
ChatFrame_ResolveChannelName
(
channelName
)),
r
,
g
,
b
);
if
not
omitMessage
then
local
r
,
g
,
b
=
Chat_GetCommunitiesChannelColor
(
clubId
,
streamId
);
chatFrame
:
AddMessage
(
COMMUNITIES_CHANNEL_REMOVED_FROM_CHAT_WINDOW
:
format
(
channelIndex
,
ChatFrame_ResolveChannelName
(
channelName
)),
r
,
g
,
b
);
end
end
function
ChatFrame_RemoveChannel
(
chatFrame
,
channel
)
...
...
@@ -3180,6 +3184,19 @@ function ChatFrame_SystemEventHandler(self, event, ...)
local
guid
=
...
;
FCF_RemoveAllMessagesFromChanSender
(
self
,
guid
);
return
true
;
elseif
(
event
==
"CLUB_REMOVED"
)
then
local
clubId
=
...
;
local
streamIDs
=
C_ChatInfo
.
GetClubStreamIDs
(
clubId
);
for
k
,
streamID
in
pairs
(
streamIDs
)
do
local
channelName
=
Chat_GetCommunitiesChannelName
(
clubId
,
streamID
);
for
i
=
1
,
FCF_GetNumActiveChatFrames
()
do
local
chatWindow
=
_G
[
"ChatFrame"
..
i
];
if
ChatFrame_ContainsChannel
(
chatWindow
,
channelName
)
then
local
omitMessage
=
true
;
ChatFrame_RemoveCommunitiesChannel
(
chatWindow
,
clubId
,
streamID
,
omitMessage
);
end
end
end
end
end
...
...
Interface/FrameXML/CompactUnitFrame.lua
View file @
4f7261bc
...
...
@@ -74,72 +74,81 @@ function CompactUnitFrame_OnEvent(self, event, ...)
CompactUnitFrame_UpdateMaxPower
(
self
);
CompactUnitFrame_UpdatePower
(
self
);
CompactUnitFrame_UpdatePowerColor
(
self
);
elseif
(
arg1
==
self
.
unit
or
arg1
==
self
.
displayedUnit
)
then
if
(
event
==
"UNIT_MAXHEALTH"
)
then
CompactUnitFrame_UpdateMaxHealth
(
self
);
CompactUnitFrame_UpdateHealth
(
self
);
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"UNIT_HEALTH"
or
event
==
"UNIT_HEALTH_FREQUENT"
)
then
CompactUnitFrame_UpdateHealth
(
self
);
CompactUnitFrame_UpdateStatusText
(
self
);
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"UNIT_MAXPOWER"
)
then
CompactUnitFrame_UpdateMaxPower
(
self
);
CompactUnitFrame_UpdatePower
(
self
);
elseif
(
event
==
"UNIT_POWER_UPDATE"
)
then
CompactUnitFrame_UpdatePower
(
self
);
elseif
(
event
==
"UNIT_DISPLAYPOWER"
or
event
==
"UNIT_POWER_BAR_SHOW"
or
event
==
"UNIT_POWER_BAR_HIDE"
)
then
CompactUnitFrame_UpdateMaxPower
(
self
);
CompactUnitFrame_UpdatePower
(
self
);
CompactUnitFrame_UpdatePowerColor
(
self
);
elseif
(
event
==
"UNIT_NAME_UPDATE"
)
then
CompactUnitFrame_UpdateName
(
self
);
CompactUnitFrame_UpdateHealthColor
(
self
);
--This may signify that we now have the unit's class (the name cache entry has been received).
elseif
(
event
==
"UNIT_AURA"
)
then
CompactUnitFrame_UpdateAuras
(
self
);
elseif
(
event
==
"UNIT_THREAT_SITUATION_UPDATE"
)
then
CompactUnitFrame_UpdateAggroHighlight
(
self
);
CompactUnitFrame_UpdateAggroFlash
(
self
);
CompactUnitFrame_UpdateHealthBorder
(
self
);
elseif
(
event
==
"UNIT_THREAT_LIST_UPDATE"
)
then
if
(
self
.
optionTable
.
considerSelectionInCombatAsHostile
)
then
CompactUnitFrame_UpdateHealthColor
(
self
);
else
local
unitMatches
=
arg1
==
self
.
unit
or
arg1
==
self
.
displayedUnit
;
if
(
unitMatches
)
then
if
(
event
==
"UNIT_MAXHEALTH"
)
then
CompactUnitFrame_UpdateMaxHealth
(
self
);
CompactUnitFrame_UpdateHealth
(
self
);
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"UNIT_HEALTH"
or
event
==
"UNIT_HEALTH_FREQUENT"
)
then
CompactUnitFrame_UpdateHealth
(
self
);
CompactUnitFrame_UpdateStatusText
(
self
);
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"UNIT_MAXPOWER"
)
then
CompactUnitFrame_UpdateMaxPower
(
self
);
CompactUnitFrame_UpdatePower
(
self
);
elseif
(
event
==
"UNIT_POWER_UPDATE"
)
then
CompactUnitFrame_UpdatePower
(
self
);
elseif
(
event
==
"UNIT_DISPLAYPOWER"
or
event
==
"UNIT_POWER_BAR_SHOW"
or
event
==
"UNIT_POWER_BAR_HIDE"
)
then
CompactUnitFrame_UpdateMaxPower
(
self
);
CompactUnitFrame_UpdatePower
(
self
);
CompactUnitFrame_UpdatePowerColor
(
self
);
elseif
(
event
==
"UNIT_NAME_UPDATE"
)
then
CompactUnitFrame_UpdateName
(
self
);
CompactUnitFrame_UpdateHealthColor
(
self
);
--This may signify that we now have the unit's class (the name cache entry has been received).
elseif
(
event
==
"UNIT_AURA"
)
then
CompactUnitFrame_UpdateAuras
(
self
);
elseif
(
event
==
"UNIT_THREAT_SITUATION_UPDATE"
)
then
CompactUnitFrame_UpdateAggroHighlight
(
self
);
CompactUnitFrame_UpdateAggroFlash
(
self
);
CompactUnitFrame_UpdateHealthBorder
(
self
);
elseif
(
event
==
"UNIT_THREAT_LIST_UPDATE"
)
then
if
(
self
.
optionTable
.
considerSelectionInCombatAsHostile
)
then
CompactUnitFrame_UpdateHealthColor
(
self
);
CompactUnitFrame_UpdateName
(
self
);
end
CompactUnitFrame_UpdateAggroFlash
(
self
);
CompactUnitFrame_UpdateHealthBorder
(
self
);
elseif
(
event
==
"UNIT_CONNECTION"
)
then
--Might want to set the health/mana to max as well so it's easily visible? This happens unless the player is out of AOI.
CompactUnitFrame_UpdateHealthColor
(
self
);
CompactUnitFrame_UpdatePowerColor
(
self
);
CompactUnitFrame_UpdateStatusText
(
self
);
elseif
(
event
==
"UNIT_HEAL_PREDICTION"
)
then
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"UNIT_PET"
)
then
CompactUnitFrame_UpdateAll
(
self
);
elseif
(
event
==
"READY_CHECK_CONFIRM"
)
then
CompactUnitFrame_UpdateReadyCheck
(
self
);
elseif
(
event
==
"INCOMING_RESURRECT_CHANGED"
)
then
CompactUnitFrame_UpdateCenterStatusIcon
(
self
);
elseif
(
event
==
"UNIT_OTHER_PARTY_CHANGED"
)
then
CompactUnitFrame_UpdateCenterStatusIcon
(
self
);
elseif
(
event
==
"UNIT_ABSORB_AMOUNT_CHANGED"
)
then
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"UNIT_HEAL_ABSORB_AMOUNT_CHANGED"
)
then
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"PLAYER_FLAGS_CHANGED"
)
then
CompactUnitFrame_UpdateStatusText
(
self
);
elseif
(
event
==
"UNIT_PHASE"
or
event
==
"UNIT_FLAGS"
)
then
CompactUnitFrame_UpdateCenterStatusIcon
(
self
);
elseif
(
event
==
"GROUP_JOINED"
)
then
CompactUnitFrame_UpdateAggroFlash
(
self
);
CompactUnitFrame_UpdateHealthBorder
(
self
);
elseif
(
event
==
"GROUP_LEFT"
)
then
CompactUnitFrame_UpdateHealthBorder
(
self
);
elseif
(
event
==
"UNIT_CLASSIFICATION_CHANGED"
)
then
CompactUnitFrame_UpdateClassificationIndicator
(
self
);
elseif
(
event
==
"INCOMING_SUMMON_CHANGED"
)
then
CompactUnitFrame_UpdateCenterStatusIcon
(
self
);
end
end
if
(
unitMatches
or
arg1
==
"player"
)
then
if
(
event
==
"UNIT_ENTERED_VEHICLE"
or
event
==
"UNIT_EXITED_VEHICLE"
)
then
CompactUnitFrame_UpdateAll
(
self
);
end
CompactUnitFrame_UpdateAggroFlash
(
self
);
CompactUnitFrame_UpdateHealthBorder
(
self
);
elseif
(
event
==
"UNIT_CONNECTION"
)
then
--Might want to set the health/mana to max as well so it's easily visible? This happens unless the player is out of AOI.
CompactUnitFrame_UpdateHealthColor
(
self
);
CompactUnitFrame_UpdatePowerColor
(
self
);
CompactUnitFrame_UpdateStatusText
(
self
);
elseif
(
event
==
"UNIT_HEAL_PREDICTION"
)
then
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"UNIT_ENTERED_VEHICLE"
or
event
==
"UNIT_EXITED_VEHICLE"
or
event
==
"UNIT_PET"
)
then
CompactUnitFrame_UpdateAll
(
self
);
elseif
(
event
==
"READY_CHECK_CONFIRM"
)
then
CompactUnitFrame_UpdateReadyCheck
(
self
);
elseif
(
event
==
"INCOMING_RESURRECT_CHANGED"
)
then
CompactUnitFrame_UpdateCenterStatusIcon
(
self
);
elseif
(
event
==
"UNIT_OTHER_PARTY_CHANGED"
)
then
CompactUnitFrame_UpdateCenterStatusIcon
(
self
);
elseif
(
event
==
"UNIT_ABSORB_AMOUNT_CHANGED"
)
then
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"UNIT_HEAL_ABSORB_AMOUNT_CHANGED"
)
then
CompactUnitFrame_UpdateHealPrediction
(
self
);
elseif
(
event
==
"PLAYER_FLAGS_CHANGED"
)
then
CompactUnitFrame_UpdateStatusText
(
self
);
elseif
(
event
==
"UNIT_PHASE"
or
event
==
"UNIT_FLAGS"
)
then
CompactUnitFrame_UpdateCenterStatusIcon
(
self
);
elseif
(
event
==
"GROUP_JOINED"
)
then
CompactUnitFrame_UpdateAggroFlash
(
self
);
CompactUnitFrame_UpdateHealthBorder
(
self
);
elseif
(
event
==
"GROUP_LEFT"
)
then
CompactUnitFrame_UpdateHealthBorder
(
self
);
elseif
(
event
==
"UNIT_CLASSIFICATION_CHANGED"
)
then
CompactUnitFrame_UpdateClassificationIndicator
(
self
);
elseif
(
event
==
"INCOMING_SUMMON_CHANGED"
)
then
CompactUnitFrame_UpdateCenterStatusIcon
(
self
);
end
end
end
...
...
Interface/FrameXML/MainMenuBarMicroButtons.lua
View file @
4f7261bc
...
...
@@ -484,15 +484,7 @@ function CharacterMicroButtonMixin:ShouldShowAzeriteEssenceSwapAlert()
return
false
;
end
if
GetCVarBitfield
(
"closedInfoFrames"
,
LE_FRAME_TUTORIAL_CHANGE_AZERITE_ESSENCES
)
then
return
false
;
end
if
IsPlayerInWorld
()
and
C_AzeriteEssence
.
GetNumUnlockedEssences
()
>
1
then
return
true
;
end
return
false
;
return
AzeriteEssenceUtil
.
ShouldShowEssenceSwapTutorial
();
end
function
CharacterMicroButtonMixin
:
EvaluateAlertVisibility
()
...
...
@@ -504,8 +496,10 @@ function CharacterMicroButtonMixin:EvaluateAlertVisibility()
end
end
if
self
:
ShouldShowAzeriteEssenceSwapAlert
()
then
if
not
self
.
seenAzeriteEssenceSwapAlert
and
self
:
ShouldShowAzeriteEssenceSwapAlert
()
then
if
MainMenuMicroButton_ShowAlert
(
CharacterMicroButtonAlert
,
CHARACTER_SHEET_MICRO_BUTTON_AZERITE_ESSENCE_CHANGE_ESSENCES
)
then
self
.
seenAzeriteEssenceSwapAlert
=
true
;
AzeriteEssenceUtil
.
SetEssenceSwapTutorialSeen
();
return
;
end
end
...
...
Interface/FrameXML/PaperDollFrame.lua
View file @
4f7261bc
...
...
@@ -2853,6 +2853,7 @@ do
AzeriteEssenceUnlockTipClosed
=
0x0004
,
AzeriteEssenceSlotTipClosed
=
0x0008
,
AzeriteEssenceUIShown
=
0x0010
,
AzeriteEssenceSwapTipClosed
=
0x0020
,
};
function
PaperDollItemsMixin
:
OnLoad
()
...
...
@@ -2863,7 +2864,7 @@ do
self
.
helpFlags
=
CreateFromMixins
(
FlagsMixin
);
self
.
helpFlags
:
OnLoad
();
self
.
helpFlags
:
AddNamedFlagsFromTable
(
helpFlags
);
self
.
clearableFlags
=
Flags_CreateMaskFromTable
(
helpFlags
)
-
self
.
helpFlags
.
AzeriteEssenceUnlockTipClosed
;
self
.
clearableFlags
=
Flags_CreateMaskFromTable
(
helpFlags
)
-
self
.
helpFlags
.
AzeriteEssenceUnlockTipClosed
-
self
.
helpFlags
.
AzeriteEssenceSwapTipClosed
;
end
end
...
...
@@ -2994,6 +2995,18 @@ function PaperDollItemsMixin:ShouldShowAzeriteEssenceSlotHelpTip()
return
true
;
end
function
PaperDollItemsMixin
:
ShouldShowAzeriteEssenceSwapHelpTip
()
if
self
.
helpFlags
:
IsSet
(
self
.
helpFlags
.
AzeriteEssenceSwapTipClosed
)
then
return
false
;
end
if
self
.
helpFlags
:
IsSet
(
self
.
helpFlags
.
AzeriteEssenceUIShown
)
then
return
false
;
end
return
AzeriteEssenceUtil
.
ShouldShowEssenceSwapTutorial
();
end
function
PaperDollItemsMixin
:
OnHelpTipManuallyClosed
(
closeFlag
)
self
.
helpFlags
:
Set
(
closeFlag
);
self
:
MarkDirty
();
...
...
@@ -3018,6 +3031,13 @@ function PaperDollItemsMixin:EvaluateHelpTip()
helpCloseFlag
=
self
.
helpFlags
.
AzeriteEssenceSlotTipClosed
;
end
end
if
not
bestHelpTipButton
and
self
:
ShouldShowAzeriteEssenceSwapHelpTip
()
then
bestHelpTipButton
=
self
:
FindActiveAzeriteItemButton
();
helpTipText
=
CHARACTER_SHEET_MICRO_BUTTON_AZERITE_ESSENCE_CHANGE_ESSENCES
;
helpCloseFlag
=
self
.
helpFlags
.
AzeriteEssenceSwapTipClosed
;
AzeriteEssenceUtil
.
SetEssenceSwapTutorialSeen
();
end
if
not
bestHelpTipButton
and
self
:
ShouldShowAzeriteEmpoweredItemHelpTip
()
then
bestHelpTipButton
=
self
:
FindBestAzeriteEmpoweredItemUIHelpTipButton
();
helpTipText
=
AZERITE_EMPOWERED_UNSELECTED_TRAITS_HELPTIP
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment