Commit 86da2430 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-30774patch8.2.0_PTR

parent 266f308b
......@@ -61,6 +61,7 @@ local ChallengeModeInfo =
{ Name = "time", Type = "number", Nilable = false },
{ Name = "onTime", Type = "bool", Nilable = false },
{ Name = "keystoneUpgradeLevels", Type = "number", Nilable = false },
{ Name = "practiceRun", Type = "bool", Nilable = false },
},
},
{
......
......@@ -6,6 +6,15 @@ local ItemUpgrade =
Functions =
{
{
Name = "GetItemHyperlink",
Type = "Function",
Returns =
{
{ Name = "link", Type = "string", Nilable = false },
},
},
},
Events =
......
......@@ -50,6 +50,20 @@ local PaperDollInfo =
{ Name = "azeritePowerIDs", Type = "table", InnerType = "number", Nilable = false },
},
},
{
Name = "GetInspectItemLevel",
Type = "Function",
Arguments =
{
{ Name = "unit", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "equippedItemLevel", Type = "number", Nilable = false },
},
},
{
Name = "GetMinItemLevel",
Type = "Function",
......
......@@ -365,9 +365,9 @@ local QuestLog =
{
Name = "QuestTag",
Type = "Enumeration",
NumValues = 10,
NumValues = 11,
MinValue = 0,
MaxValue = 102,
MaxValue = 266,
Fields =
{
{ Name = "Group", Type = "QuestTag", EnumValue = 1 },
......@@ -380,6 +380,7 @@ local QuestLog =
{ Name = "Raid25", Type = "QuestTag", EnumValue = 89 },
{ Name = "Scenario", Type = "QuestTag", EnumValue = 98 },
{ Name = "Account", Type = "QuestTag", EnumValue = 102 },
{ Name = "CombatAlly", Type = "QuestTag", EnumValue = 266 },
},
},
{
......
......@@ -178,6 +178,9 @@ local QuestTaskInfo =
{ Name = "inProgress", Type = "bool", Nilable = false },
{ Name = "numObjectives", Type = "number", Nilable = false },
{ Name = "mapID", Type = "number", Nilable = false },
{ Name = "isQuestStart", Type = "bool", Nilable = false },
{ Name = "isDaily", Type = "bool", Nilable = false },
{ Name = "isCombatAllyQuest", Type = "bool", Nilable = false },
{ Name = "childDepth", Type = "number", Nilable = true },
},
},
......
......@@ -881,6 +881,7 @@ local UIWidgetManager =
{ Name = "shownState", Type = "WidgetShownState", Nilable = false },
{ Name = "enabledState", Type = "WidgetEnabledState", Nilable = false },
{ Name = "text", Type = "string", Nilable = false },
{ Name = "tooltip", Type = "string", Nilable = false },
{ Name = "widgetSizeSetting", Type = "number", Nilable = false },
{ Name = "textureKitID", Type = "number", Nilable = false },
{ Name = "frameTextureKitID", Type = "number", Nilable = false },
......
......@@ -1020,9 +1020,9 @@ local VoiceChat =
{
Name = "VoiceChatStatusCode",
Type = "Enumeration",
NumValues = 23,
NumValues = 25,
MinValue = 0,
MaxValue = 22,
MaxValue = 24,
Fields =
{
{ Name = "Success", Type = "VoiceChatStatusCode", EnumValue = 0 },
......@@ -1048,6 +1048,8 @@ local VoiceChat =
{ Name = "InvalidCommunityStream", Type = "VoiceChatStatusCode", EnumValue = 20 },
{ Name = "PlayerSilenced", Type = "VoiceChatStatusCode", EnumValue = 21 },
{ Name = "PlayerVoiceChatParentalDisabled", Type = "VoiceChatStatusCode", EnumValue = 22 },
{ Name = "InvalidInputDevice", Type = "VoiceChatStatusCode", EnumValue = 23 },
{ Name = "InvalidOutputDevice", Type = "VoiceChatStatusCode", EnumValue = 24 },
},
},
{
......
......@@ -34,6 +34,9 @@ local REVEAL_MODEL_SCENE_ACTOR_SETTINGS = {
["effect"] = { startDelay = 0, duration = 0.4, speed = 1 },
["effect2"] = { startDelay = 0.4, duration = 1.2, speed = 1 },
};
local MAJOR_BLUE_GEM_MODEL_SCENE_INFO = StaticModelInfo.CreateModelSceneEntry(287, 165995); -- BlueGlow_High.m2
local MAJOR_PURPLE_GEM_MODEL_SCENE_INFO = StaticModelInfo.CreateModelSceneEntry(288, 166008); -- PurpleGlow_High.m2
local MINOR_PURPLE_GEM_MODEL_SCENE_INFO = StaticModelInfo.CreateModelSceneEntry(289, 166008); -- PurpleGlow_High.m2
local LEARN_SHAKE_DELAY = 0.869;
local LEARN_SHAKE = { { x = 0, y = -20}, { x = 0, y = 20}, { x = 0, y = -20}, { x = 0, y = 20}, { x = -9, y = -8}, { x = 8, y = 8}, { x = -3, y = -8}, { x = 9, y = 8}, { x = -3, y = -1}, { x = 2, y = 2}, { x = -2, y = -3}, { x = -1, y = -1}, { x = 4, y = 2}, { x = 3, y = 4}, { x = -3, y = 4}, { x = 4, y = -4}, { x = -4, y = 2}, { x = -2, y = 1}, { x = -3, y = -1}, { x = 2, y = 2}, { x = -2, y = -3}, { x = -1, y = -1}, { x = 4, y = 2}, { x = 3, y = 4}, { x = -3, y = 4}, { x = 4, y = -4}, { x = -4, y = 2}, { x = -2, y = 1}, { x = -3, y = -1}, { x = 2, y = 2}, { x = -2, y = -3}, { x = -1, y = -1}, { x = 4, y = 2}, { x = 3, y = 4}, { x = -3, y = 4}, { x = 4, y = -4}, { x = -4, y = 2}, { x = -2, y = 1}, { x = -3, y = -1}, { x = 2, y = 2}, { x = -2, y = -3}, { x = -1, y = -1}, { x = 4, y = 2}, { x = 3, y = 4}, { x = -3, y = 4}, { x = 4, y = -4}, { x = -4, y = 2}, { x = -2, y = 1}, { x = -3, y = -1}, { x = 2, y = 2}, { x = -2, y = -3}, { x = -1, y = -1}, { x = 4, y = 2}, { x = 3, y = 4}, { x = -3, y = 4}, { x = 4, y = -4}, { x = -4, y = 2}, { x = -2, y = 1}, { x = -3, y = -1}, { x = 2, y = 2}, { x = -2, y = -3}, { x = -1, y = -1}, { x = 4, y = 2}, { x = 3, y = 4}, { x = -3, y = 4}, { x = 4, y = -4}, { x = -4, y = 2}, { x = -2, y = 1}, };
......@@ -84,6 +87,9 @@ function AzeriteEssenceUIMixin:OnLoad()
self:SetupModelScene();
self:SetupMilestones();
self:RefreshPowerLevel();
self.OrbGlass.AlphaAnim:Play();
self.ItemModelScene.AlphaAnim:Play();
end
function AzeriteEssenceUIMixin:SetupMilestones()
......@@ -274,7 +280,7 @@ function AzeriteEssenceUIMixin:OnEssenceActivated(essenceID, slotFrame)
);
else
local soundID = SOUNDKIT.UI_82_HEARTOFAZEROTH_SLOTESSENCE;
if slotFrame:IsMainSlot() then
if slotFrame:IsMajorSlot() then
local essenceInfo = C_AzeriteEssence.GetEssenceInfo(essenceID);
if essenceInfo.rank == MAX_ESSENCE_RANK then
soundID = SOUNDKIT.UI_82_HEARTOFAZEROTH_SLOTMAJORESSENCE_RANK4;
......@@ -328,7 +334,7 @@ end
function AzeriteEssenceUIMixin:RefreshMilestones()
for i, milestoneFrame in ipairs(self.Milestones) do
-- Main slot is always present
if self:ShouldPlayReveal() and (not milestoneFrame.slot or not milestoneFrame:IsMainSlot()) then
if self:ShouldPlayReveal() and (not milestoneFrame.slot or not milestoneFrame:IsMajorSlot()) then
milestoneFrame:Hide();
else
milestoneFrame:Show();
......@@ -513,7 +519,7 @@ end
function AzeriteEssenceDependencyLineMixin:Refresh()
if self.toButton.unlocked then
self:SetState(PowerDependencyLineMixin.LINE_STATE_CONNECTED);
self:SetAlpha(0.15);
self:SetAlpha(0.2);
else
if self.fromButton.unlocked and self.toButton.canUnlock then
self:SetDisconnectedColor(DISCONNECTED_LINE_COLOR);
......@@ -889,6 +895,10 @@ function AzeriteMilestoneBaseMixin:OnEvent(event, ...)
if event == "UI_MODEL_SCENE_INFO_UPDATED" then
self.EffectsModelScene.primaryEffect = nil;
self.EffectsModelScene.secondaryEffect = nil;
if self.slot then
local forceUpdate = true;
self:UpdateGemModelScenes(forceUpdate);
end
end
end
......@@ -924,7 +934,7 @@ function AzeriteMilestoneBaseMixin:CheckAndSetUpUnlockEffect()
local forceUpdate = true;
local stopAnim = true;
local sceneInfo = self.slot and UNLOCK_SLOT_MODEL_SCENE_INFO or UNLOCK_STAMINA_MODEL_SCENE_INFO;
scene.primaryEffect, scene.secondaryEffect = StaticModelInfo.SetupModelScene(scene, sceneInfo, forceUpdate, true);
scene.primaryEffect, scene.secondaryEffect = StaticModelInfo.SetupModelScene(scene, sceneInfo, forceUpdate, stopAnim);
end
end
......@@ -1017,12 +1027,17 @@ function AzeriteMilestoneBaseMixin:AddStateToTooltip(requiredLevelString, return
end
end
function AzeriteMilestoneBaseMixin:IsMainSlot()
return self.slot == Enum.AzeriteEssence.MainSlot;
function AzeriteMilestoneBaseMixin:IsMajorSlot()
return self.isMajorSlot;
end
AzeriteMilestoneSlotMixin = CreateFromMixins(AzeriteMilestoneBaseMixin);
function AzeriteMilestoneSlotMixin:OnLoad()
self.UnlockedState.EmptyGlow.Anim:Play();
AzeriteMilestoneBaseMixin.OnLoad(self);
end
function AzeriteMilestoneSlotMixin:OnDragStart()
local spellID = C_AzeriteEssence.GetMilestoneSpell(self.milestoneID);
if spellID then
......@@ -1039,11 +1054,42 @@ function AzeriteMilestoneSlotMixin:ShowStateFrame(stateFrame)
end
end
function AzeriteMilestoneSlotMixin:UpdateGemModelScenes(forceUpdate)
if not self.unlocked then
return;
end
if forceUpdate then
self.UnlockedState.PurpleGemModelScene.forceUpdate = true;
if self:IsMajorSlot() then
self.UnlockedState.BlueGemModelScene.forceUpdate = true;
end
end
if self:GetParent():GetEffectiveEssence(self.milestoneID) then
local purpleGemModelSceneInfo = MINOR_PURPLE_GEM_MODEL_SCENE_INFO;
if self:IsMajorSlot() then
purpleGemModelSceneInfo = MAJOR_PURPLE_GEM_MODEL_SCENE_INFO;
local scene = self.UnlockedState.BlueGemModelScene;
scene:Show();
scene.forceUpdate = not StaticModelInfo.SetupModelScene(scene, MAJOR_BLUE_GEM_MODEL_SCENE_INFO, scene.forceUpdate);
end
local scene = self.UnlockedState.PurpleGemModelScene;
scene:Show();
scene.forceUpdate = not StaticModelInfo.SetupModelScene(scene, purpleGemModelSceneInfo, scene.forceUpdate);
else
if self:IsMajorSlot() then
self.UnlockedState.BlueGemModelScene:Hide();
end
self.UnlockedState.PurpleGemModelScene:Hide();
end
end
function AzeriteMilestoneSlotMixin:Refresh()
self:UpdateMilestoneInfo();
if self.unlocked then
if self:IsMainSlot() and self:GetParent():ShouldPlayReveal() then
if self:IsMajorSlot() and self:GetParent():ShouldPlayReveal() then
self:CheckAndSetUpRevealEffect();
end
self:ShowStateFrame(self.UnlockedState);
......@@ -1064,11 +1110,9 @@ function AzeriteMilestoneSlotMixin:Refresh()
stateFrame.Icon:Hide();
stateFrame.EmptyIcon:Show();
stateFrame.EmptyGlow:Show();
stateFrame.EmptyGlow.Anim:Stop();
stateFrame.EmptyGlow.Anim:Play();
end
else
if not self:IsMainSlot() then
if not self:IsMajorSlot() then
self:CheckAndSetUpUnlockEffect();
end
if self:ShouldShowUnlockState() then
......@@ -1085,10 +1129,23 @@ function AzeriteMilestoneSlotMixin:Refresh()
self.LockedState.UnlockLevelText:SetText(self.requiredLevel);
end
end
self:UpdateGemModelScenes();
end
function AzeriteMilestoneSlotMixin:OnMouseUp(button)
if button == "LeftButton" then
if IsModifiedClick("CHATLINK") then
local essenceID = C_AzeriteEssence.GetMilestoneEssence(self.milestoneID);
if essenceID then
local essenceInfo = C_AzeriteEssence.GetEssenceInfo(essenceID);
if essenceInfo then
if HandleModifiedItemClick(C_AzeriteEssence.GetEssenceHyperlink(essenceInfo.ID, essenceInfo.rank)) then
return;
end
end
end
end
if C_AzeriteEssence.HasPendingActivationEssence() then
if self.unlocked then
if self:GetParent():HasNewlyActivatedEssence() then
......@@ -1112,7 +1169,7 @@ function AzeriteMilestoneSlotMixin:OnMouseUp(button)
end
function AzeriteMilestoneSlotMixin:OnEnter()
if self:IsMainSlot() then
if self:IsMajorSlot() then
GameTooltip:SetOwner(self, "ANCHOR_RIGHT", -20, 0);
else
GameTooltip:SetOwner(self, "ANCHOR_RIGHT", -10, -5);
......@@ -1140,7 +1197,7 @@ function AzeriteMilestoneSlotMixin:OnEnter()
GameTooltip_SetTitle(GameTooltip, AZERITE_ESSENCE_PASSIVE_SLOT);
self:AddStateToTooltip(AZERITE_ESSENCE_LOCKED_SLOT_LEVEL, AZERITE_ESSENCE_UNLOCK_SLOT);
else
if self:IsMainSlot() then
if self:IsMajorSlot() then
GameTooltip_SetTitle(GameTooltip, AZERITE_ESSENCE_EMPTY_MAIN_SLOT);
GameTooltip_AddColoredLine(GameTooltip, AZERITE_ESSENCE_EMPTY_MAIN_SLOT_DESC, NORMAL_FONT_COLOR, wrapText);
else
......
......@@ -6,6 +6,7 @@
<KeyValues>
<KeyValue key="isDraggable" type="boolean" value="false"/>
<KeyValue key="swirlScale" type="number" value="1"/>
<KeyValue key="isMajorSlot" type="boolean" value="false"/>
</KeyValues>
<Frames>
<ModelScene parentKey="EffectsModelScene" drawLayer="OVERLAY" inherits="NonInteractableModelSceneMixinTemplate" hidden="true">
......@@ -78,6 +79,14 @@
</Texture>
</Layer>
</Layers>
<Frames>
<ModelScene parentKey="PurpleGemModelScene" drawLayer="OVERLAY" inherits="NonInteractableModelSceneMixinTemplate" hidden="true" alpha="0.75">
<Size x="400" y="400"/>
<Anchors>
<Anchor point="CENTER" relativePoint="BOTTOM" x="3" y="11"/>
</Anchors>
</ModelScene>
</Frames>
</Frame>
<Frame parentKey="AvailableState" parentArray="StateFrames" setAllPoints="true">
<Layers>
......@@ -134,6 +143,7 @@
<Size x="110" y="82"/>
<KeyValues>
<KeyValue key="isDraggable" type="boolean" value="true"/>
<KeyValue key="isMajorSlot" type="boolean" value="true"/>
</KeyValues>
<Frames>
<Frame parentKey="UnlockedState" parentArray="StateFrames" setAllPoints="true">
......@@ -207,6 +217,20 @@
</Texture>
</Layer>
</Layers>
<Frames>
<ModelScene parentKey="BlueGemModelScene" drawLayer="OVERLAY" inherits="NonInteractableModelSceneMixinTemplate" hidden="true" alpha="0.75">
<Size x="400" y="400"/>
<Anchors>
<Anchor point="CENTER" relativePoint="TOP" x="3" y="-5"/>
</Anchors>
</ModelScene>
<ModelScene parentKey="PurpleGemModelScene" drawLayer="OVERLAY" inherits="NonInteractableModelSceneMixinTemplate" hidden="true" alpha="0.75">
<Size x="400" y="400"/>
<Anchors>
<Anchor point="CENTER" relativePoint="BOTTOM" x="3" y="11"/>
</Anchors>
</ModelScene>
</Frames>
</Frame>
</Frames>
<Scripts>
......@@ -457,6 +481,11 @@
<Anchors>
<Anchor point="TOPLEFT" relativeKey="$parent.LeftInset" x="6" y="-6"/>
</Anchors>
<Animations>
<AnimationGroup parentKey="AlphaAnim" looping="BOUNCE">
<Alpha parentKey="AlphaAnim" fromAlpha="0.45" toAlpha="0.55" duration="14"/>
</AnimationGroup>
</Animations>
</ModelScene>
<Frame parentKey="StarsAnimationFrame1" inherits="AzeriteEssenceStarsAnimationFrameTemplate">
<KeyValues>
......@@ -615,6 +644,11 @@
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.OrbBackground"/>
</Anchors>
<Animations>
<AnimationGroup parentKey="AlphaAnim" looping="BOUNCE">
<Alpha parentKey="AlphaAnim" fromAlpha="0.25" toAlpha="0.6" duration="10"/>
</AnimationGroup>
</Animations>
</Texture>
</Layer>
<Layer level="ARTWORK" textureSubLevel="2">
......
## Title: Blizzard Battlefield Map
## LoadOnDemand: 1
## SavedVariablesPerCharacter: BattlefieldMapOptions
## RequiredDep: Blizzard_MapCanvas
Blizzard_BattlefieldMap.xml
Localization.lua
......@@ -765,9 +765,11 @@ end
function ChallengeModeCompleteBannerMixin:OnEvent(event, ...)
if (event == "CHALLENGE_MODE_COMPLETED") then
local mapID, level, time, onTime, keystoneUpgradeLevels = C_ChallengeMode.GetCompletionInfo();
local mapID, level, time, onTime, keystoneUpgradeLevels, practiceRun = C_ChallengeMode.GetCompletionInfo();
TopBannerManager_Show(self, { mapID = mapID, level = level, time = time, onTime = onTime, keystoneUpgradeLevels = keystoneUpgradeLevels });
if not practiceRun then
TopBannerManager_Show(self, { mapID = mapID, level = level, time = time, onTime = onTime, keystoneUpgradeLevels = keystoneUpgradeLevels });
end
end
end
......
......@@ -150,17 +150,22 @@
</Anchors>
<Layers>
<Layer level="OVERLAY">
<Texture parentKey="Border" atlas="mythicplus-popup-ring" useAtlasSize="true"/>
<Texture parentKey="AffixBorder" atlas="mythicplus-popup-ring" useAtlasSize="true"/>
</Layer>
<Layer level="ARTWORK">
<Texture parentKey="Portrait">
<Size x="77" y="77"/>
<Size x="70" y="70"/>
<Anchors>
<Anchor point="CENTER" relativeKey="$parent.Border"/>
<Anchor point="CENTER" relativeKey="$parent.AffixBorder"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Scripts>
<OnShow>
self.Border:Hide();
</OnShow>
</Scripts>
</Frame>
<Button parentKey="Leave" inherits="UIPanelButtonNoTooltipTemplate" text="CLOSE">
<Size x="125" y="22"/>
......
......@@ -997,7 +997,7 @@ function WardrobeItemsCollectionMixin:OnShow()
self:RegisterEvent("TRANSMOGRIFY_SUCCESS");
local needsUpdate = false; -- we don't need to update if we call WardrobeCollectionFrame_SetActiveSlot as that will do an update
if ( self.jumpToLatestCategoryID and self.jumpToLatestCategoryID ~= self.activeCategory ) then
if ( self.jumpToLatestCategoryID and self.jumpToLatestCategoryID ~= self.activeCategory and not WardrobeFrame_IsAtTransmogrifier() ) then
local slot = WardrobeCollectionFrame_GetSlotFromCategoryID(self.jumpToLatestCategoryID);
-- The model got reset from OnShow, which restored all equipment.
-- But ChangeModelsSlot tries to be smart and only change the difference from the previous slot to the current slot, so some equipment will remain left on.
......@@ -1323,6 +1323,9 @@ function WardrobeItemsCollectionMixin:SetActiveSlot(slot, transmogType, category
local appliedSourceID, appliedVisualID, selectedSourceID, selectedVisualID = self:GetActiveSlotInfo();
if ( selectedSourceID ~= NO_TRANSMOG_SOURCE_ID ) then
category = C_TransmogCollection.GetAppearanceSourceInfo(selectedSourceID);
if not self:IsValidWeaponCategoryForSlot(category, slot) then
category = nil;
end
end
end
if ( not category ) then
......@@ -1419,7 +1422,7 @@ function WardrobeItemsCollectionMixin:ResetPage()
if ( self.jumpToVisualID ) then
selectedVisualID = self.jumpToVisualID;
self.jumpToVisualID = nil;
elseif ( self.jumpToLatestAppearanceID ) then
elseif ( self.jumpToLatestAppearanceID and not WardrobeFrame_IsAtTransmogrifier() ) then
selectedVisualID = self.jumpToLatestAppearanceID;
self.jumpToLatestAppearanceID = nil;
end
......@@ -1997,6 +2000,11 @@ function WardrobeItemsModelMixin:OnEnter()
self:SetScript("OnUpdate", self.OnUpdate);
if ( C_TransmogCollection.IsNewAppearance(self.visualInfo.visualID) ) then
C_TransmogCollection.ClearNewAppearance(self.visualInfo.visualID);
local collection = self:GetParent();
if collection.jumpToLatestAppearanceID == self.visualInfo.visualID then
collection.jumpToLatestAppearanceID = nil;
collection.jumpToLatestCategoryID = nil;
end
self.NewString:Hide();
self.NewGlow:Hide();
end
......@@ -2537,7 +2545,7 @@ function WardrobeCollectionFrameWeaponDropDown_Init(self)
for categoryID = FIRST_TRANSMOG_COLLECTION_WEAPON_TYPE, LAST_TRANSMOG_COLLECTION_WEAPON_TYPE do
local name, isWeapon, canEnchant, canMainHand, canOffHand = C_TransmogCollection.GetCategoryInfo(categoryID);
if ( name and isWeapon ) then
if ( name and isWeapon ) then
if ( (slot == "MAINHANDSLOT" and canMainHand) or (slot == "SECONDARYHANDSLOT" and canOffHand) ) then
if ( not checkCategory or C_TransmogCollection.IsCategoryValidForItem(categoryID, equippedItemID) ) then
info.text = name;
......
......@@ -15,8 +15,6 @@ CommunitiesAddDialogInsecure.xml
CommunitiesAddDialog.xml
CommunitiesAddDialogOutbound.lua
CommunitiesTabs.xml
ClubFinderApplicantList.xml
ClubFinder.xml
CommunitiesSettings.xml
CommunitiesTicketManagerDialog.xml
CommunitiesErrors.lua
......
......@@ -197,15 +197,11 @@ function CommunitiesListMixin:Update()
-- We probably need to change the create flow as well, since it's possible you are
-- allowed to create more bnet groups, but not more wow communities or vice versa.
local shouldAddJoinCommunityEntry = C_Club.ShouldAllowClubType(Enum.ClubType.Character) or C_Club.ShouldAllowClubType(Enum.ClubType.BattleNet);
local shouldFindCommunityEntry = C_Club.ShouldAllowClubType(Enum.ClubType.Character);
-- We need 1 for the blank entry at the top of the list.
local clubsHeight = height * (totalNumClubs + 1);
if shouldAddJoinCommunityEntry then
clubsHeight = clubsHeight + height;
if(shouldFindCommunityEntry) then
clubsHeight = clubsHeight + height;
end
end
local usedHeight = height;
......@@ -249,10 +245,10 @@ function CommunitiesListMixin:Update()
button:SetFocused(isInvitation or clubInfo.clubId == selectedClubId);
button:Show();
usedHeight = usedHeight + height;
elseif shouldAddJoinCommunityEntry then
elseif shouldAddJoinCommunityEntry then
button:SetAddCommunity();
button:Show();
usedHeight = usedHeight + height;
button:Show();
usedHeight = usedHeight + height;
shouldAddJoinCommunityEntry = false;
else
button:SetClubInfo(nil);
......@@ -507,38 +503,6 @@ function CommunitiesListEntryMixin:UpdateUnreadNotification()
self.UnreadNotificationIcon:SetShown(isNewInvitation or hasUnread);
end
function CommunitiesListEntryMixin:SetFindCommunity()
self.overrideOnClick = function()
PlaySound(SOUNDKIT.IG_CHARACTER_INFO_OPEN);
self:GetCommunitiesFrame():SetDisplayMode(COMMUNITIES_FRAME_DISPLAY_MODES.COMMUNITY_FINDER);
self:GetCommunitiesFrame():SelectClub(nil);
end;
self.clubId = nil;
self.Name:SetText(COMMUNITY_FINDER_FIND_COMMUNITY);
self.Name:SetTextColor(GREEN_FONT_COLOR:GetRGB());
self.Name:SetPoint("LEFT", self.Icon, "RIGHT", 13, 0);
self.Selection:SetShown(self:GetCommunitiesFrame():GetDisplayMode() == COMMUNITIES_FRAME_DISPLAY_MODES.COMMUNITY_FINDER);
self.Background:SetTexture("Interface\\Common\\bluemenu-main");
self.Background:SetTexCoord(0.00390625, 0.87890625, 0.75195313, 0.83007813);
self.Selection:SetTexture("Interface\\Common\\bluemenu-main");
self.Selection:SetTexCoord(0.00390625, 0.87890625, 0.59179688, 0.66992188);
self.FavoriteIcon:Hide();
self.InvitationIcon:Hide();
self.Icon:Show();
self.CircleMask:Hide();
self.IconRing:Hide();
self.GuildTabardEmblem:Hide();
self.GuildTabardBackground:Hide();
self.GuildTabardBorder:Hide();
self.UnreadNotificationIcon:Hide();
self.Icon:SetAtlas("communities-icon-searchmagnifyingglass");
self.Icon:SetSize(30, 30);
self.Icon:SetPoint("TOPLEFT", 17, -18);
end
function CommunitiesListEntryMixin:SetAddCommunity()
self.overrideOnClick = function()
PlaySound(SOUNDKIT.IG_CHARACTER_INFO_OPEN);
......
......@@ -443,13 +443,13 @@ function CommunitiesMemberListMixin:OnLoad()
self.ListScrollFrame.scrollBar.doNotHide = true;
self.ListScrollFrame.scrollBar:SetValue(0);
self:SetExpandedDisplay(false);
self:SetGuildColumnIndex(EXTRA_GUILD_COLUMN_ACHIEVEMENT);
end