diff --git a/SVUI_!Core/system/_docklets/garrison.lua b/SVUI_!Core/system/_docklets/garrison.lua index 24cb72a..e93a851 100644 --- a/SVUI_!Core/system/_docklets/garrison.lua +++ b/SVUI_!Core/system/_docklets/garrison.lua @@ -222,7 +222,7 @@ local function GetBuildingData() if(remaining) then if(not prefixed) then GameTooltip:AddLine(" ", 1, 1, 1) - GameTooltip:AddLine("Buildings", 1, 0.7, 0) + GameTooltip:AddLine("Buildings / Work Orders", 1, 0.7, 0) prefixed = true end local building = ("|cffFF5500%s|r|cff888888 - |r|cffFFFF00Rank %s|r"):format(name, rank); diff --git a/SVUI_!Core/system/debug.lua b/SVUI_!Core/system/debug.lua index 3f47d80..a44a367 100644 --- a/SVUI_!Core/system/debug.lua +++ b/SVUI_!Core/system/debug.lua @@ -206,7 +206,7 @@ _G.DebugThisFrame = function(arg) outputString = outputString.."|cff00D1FF".."Alpha: |cffFFD100"..arg:GetAlpha().."\n" end - if(arg.GetText and arg:GetText()) then + if(arg.GetText and arg:GetText() and arg.GetTextColor) then outputString = outputString.."|cff00D1FF".."Text: |cffFFD100"..arg:GetText().."\n" local tr, tg, tb = arg:GetTextColor(); outputString = outputString.."|cff00D1FF".."Text Color: \n" diff --git a/SVUI_!Core/system/dock.lua b/SVUI_!Core/system/dock.lua index dbf2fa8..c0f4d00 100644 --- a/SVUI_!Core/system/dock.lua +++ b/SVUI_!Core/system/dock.lua @@ -976,10 +976,12 @@ local DockBar_UpdateLayout = function(self) divider:SetPoint(anchor, anchorParent, anchor, (offset * offsetMod), 0); offset = offset + 3; - nextButton:Show(); - nextButton:ClearAllPoints(); - nextButton:SetSize(calcWidth, size); - nextButton:SetPoint(anchor, anchorParent, anchor, (offset * offsetMod), 0); + if(not InCombatLockdown() or (not nextButton:IsProtected())) then + nextButton:Show(); + nextButton:ClearAllPoints(); + nextButton:SetSize(calcWidth, size); + nextButton:SetPoint(anchor, anchorParent, anchor, (offset * offsetMod), 0); + end offset = offset + (calcWidth + 2); safeIndex = safeIndex + 1; diff --git a/SVUI_Chat/SVUI_Chat.lua b/SVUI_Chat/SVUI_Chat.lua index 2dbfe2f..70ae98e 100644 --- a/SVUI_Chat/SVUI_Chat.lua +++ b/SVUI_Chat/SVUI_Chat.lua @@ -332,7 +332,8 @@ do message = message:gsub(PLAYER_PATTERN, PLAYER_LINK:format(playerData, playerName)) else playerName = playerName:match("[^%-]+") - message = message:gsub(PLAYER_PATTERN, PLAYER_LINK:format(playerData, playerName .. " ")) + local strName = "[" .. playerName .. "]" + message = message:gsub(PLAYER_PATTERN, PLAYER_LINK:format(playerData, strName)) end else local parsedName = playerData:match(GENERAL_LINK_PATTERN) diff --git a/SVUI_NamePlates/SVUI_NamePlates.lua b/SVUI_NamePlates/SVUI_NamePlates.lua index a6c6617..3901cd5 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.lua +++ b/SVUI_NamePlates/SVUI_NamePlates.lua @@ -1405,7 +1405,7 @@ do if guid then plate = ParseByGUID(guid) end if (not plate) and name then plate = ParseByName(name) end if (not plate) and raidIcon then plate = ParseByIconName(raidIcon) end - if(plate) then + if(plate and callbackFunc and MOD[callbackFunc]) then MOD[callbackFunc](MOD, plate, ...) end end diff --git a/SVUI_QuestTracker/components/active.lua b/SVUI_QuestTracker/components/active.lua index 61ef591..cc56602 100644 --- a/SVUI_QuestTracker/components/active.lua +++ b/SVUI_QuestTracker/components/active.lua @@ -230,7 +230,7 @@ local SetActiveData = function(self, title, level, icon, questID, questLogIndex, local objective_block = block.Objectives; objective_block:Reset(); for i = 1, numObjectives do - local description, category, completed = GetQuestObjectiveInfo(questID, i, true); + local description, category, completed = GetQuestObjectiveInfo(questID, i, false); if(not completed) then isComplete = false end if(duration and elapsed and (elapsed < duration)) then objective_rows = objective_block:SetTimer(objective_rows, duration, elapsed); diff --git a/SVUI_Skins/components/atlas/garrison.lua b/SVUI_Skins/components/atlas/garrison.lua index 60141db..59abeda 100644 --- a/SVUI_Skins/components/atlas/garrison.lua +++ b/SVUI_Skins/components/atlas/garrison.lua @@ -53,3 +53,5 @@ SV:SetAtlasFilter("GarrLanding-MinimapIcon-Horde-Up"); SV:SetAtlasFilter("GarrLanding-MinimapIcon-Horde-Down"); SV:SetAtlasFilter("GarrLanding-MinimapIcon-Alliance-Up"); SV:SetAtlasFilter("GarrLanding-MinimapIcon-Alliance-Down"); + +SV:SetAtlasFilter("Garr_FollowerToast-Rare"); diff --git a/SVUI_Skins/components/blizzard/garrison.lua b/SVUI_Skins/components/blizzard/garrison.lua index 92ece3c..69c132a 100644 --- a/SVUI_Skins/components/blizzard/garrison.lua +++ b/SVUI_Skins/components/blizzard/garrison.lua @@ -214,6 +214,7 @@ local _hook_GarrisonRecruitSelectFrame_UpdateRecruits = function() end local _hook_GarrisonMissionComplete_SetFollowerLevel = function(followerFrame, level, quality) + if(not followerFrame or (not followerFrame.PortraitFrame)) then return end local color = ITEM_QUALITY_COLORS[quality]; followerFrame.PortraitFrame.PortraitRing:SetVertexColor(color.r, color.g, color.b) end @@ -413,6 +414,9 @@ local function LoadGarrisonStyle() GarrisonLandingPageReport.InProgress:SetStyle("Button") GarrisonLandingPageReport.InProgress:GetNormalTexture().SetAtlas = function() return end + GarrisonLandingPageShipFollowerList:RemoveTextures() + GarrisonLandingPageShipFollowerList:SetStyle("Frame", 'Inset', false, 4, 0, 0) + for i = 1, GarrisonLandingPageReportListListScrollFrameScrollChild:GetNumChildren() do local child = select(i, GarrisonLandingPageReportListListScrollFrameScrollChild:GetChildren()) for j = 1, child:GetNumChildren() do @@ -426,8 +430,10 @@ local function LoadGarrisonStyle() GarrisonLandingPageTab1:SetPoint(a1, p, a2, x, (y - 15)) SV.API:Set("Tab", GarrisonLandingPageTab1, nil, 10, 4) SV.API:Set("Tab", GarrisonLandingPageTab2, nil, 10, 4) + SV.API:Set("Tab", GarrisonLandingPageTab3, nil, 10, 4) SV.API:Set("ScrollBar", GarrisonLandingPageListScrollFrame) SV.API:Set("ScrollBar", GarrisonLandingPageReportListListScrollFrame) + SV.API:Set("ScrollBar", GarrisonLandingPageShipFollowerListListScrollFrame) SV.API:Set("CloseButton", GarrisonLandingPage.CloseButton) GarrisonLandingPage.CloseButton:SetFrameStrata("HIGH") --[[ @@ -509,11 +515,12 @@ local function LoadGarrisonStyle() hooksecurefunc("GarrisonMissionList_Update", _hook_GarrisonMissionList_Update) hooksecurefunc("GarrisonMissionFrame_SetItemRewardDetails", _hook_GarrisonMissionFrame_SetItemRewardDetails) - hooksecurefunc("GarrisonMissionFrame_SetFollowerPortrait", _hook_GarrisonMissionFrame_SetFollowerPortrait) - hooksecurefunc("GarrisonMissionComplete_SetFollowerLevel", _hook_GarrisonMissionComplete_SetFollowerLevel) - hooksecurefunc("GarrisonMissionPage_UpdateMissionForParty", _hook_GarrisonFollowerPage_UpdateMissionForParty) + hooksecurefunc("GarrisonMissionFrame_SetFollowerPortrait", _hook_GarrisonMissionFrame_SetFollowerPortrait) + hooksecurefunc(GarrisonFollowerMissionComplete, "SetFollowerLevel", _hook_GarrisonMissionComplete_SetFollowerLevel) + + --hooksecurefunc(GarrisonMission, "UpdateMissionParty", _hook_GarrisonFollowerPage_UpdateMissionForParty) hooksecurefunc("GarrisonMissionButton_SetRewards", _hook_GarrisonMissionButton_SetRewards) - hooksecurefunc("GarrisonMissionFrame_CheckRewardButtons", _hook_GarrisonMissionFrame_CheckRewardButtons) + hooksecurefunc("GarrisonMissionFrame_CheckRewardButtons", _hook_GarrisonMissionFrame_CheckRewardButtons) --[[ ############################################################################## CAPACITIVE DISPLAY @@ -599,15 +606,39 @@ local function LoadGarrisonStyle() ############################################################################## --]] SV.API:Set("Window", GarrisonShipyardFrame, true) - + GarrisonShipyardFrame.BorderFrame:RemoveTextures() + SV.API:Set("CloseButton", GarrisonShipyardFrame.BorderFrame.CloseButton2) GarrisonShipyardFrame.FollowerList:RemoveTextures() GarrisonShipyardFrame.FollowerList:SetStyle("Frame", 'Inset', false, 4, 0, 0) + GarrisonShipyardFrame.FollowerList.MaterialFrame:RemoveTextures() + GarrisonShipyardFrame.FollowerList.MaterialFrame:SetStyle("Frame", "Inset", true, 1, -5, -7) GarrisonShipyardFrame.MissionTab:RemoveTextures() GarrisonShipyardFrame.MissionTab.MissionPage:RemoveTextures() GarrisonShipyardFrame.MissionTab.MissionPage:SetStyle("Frame", 'Paper', false, 4, 0, 0) GarrisonShipyardFrame.MissionTab.MissionPage:SetPanelColor("special") + GarrisonShipyardFrame.MissionTab.MissionPage.Panel:ClearAllPoints() + GarrisonShipyardFrame.MissionTab.MissionPage.Panel:SetPoint("TOPLEFT", GarrisonShipyardFrame.MissionTab.MissionPage, "TOPLEFT", 0, 4) + GarrisonShipyardFrame.MissionTab.MissionPage.Panel:SetPoint("BOTTOMRIGHT", GarrisonShipyardFrame.MissionTab.MissionPage, "BOTTOMRIGHT", 0, -20) + + GarrisonShipyardFrame.MissionTab.MissionList.CompleteDialog:DisableDrawLayer("BACKGROUND") + GarrisonShipyardFrame.MissionTab.MissionList.CompleteDialog.BorderFrame:RemoveTextures() + GarrisonShipyardFrame.MissionTab.MissionList.CompleteDialog.BorderFrame:SetStyle("Frame", 'Window', false, 4, 0, 0) + GarrisonShipyardFrame.MissionTab.MissionList.CompleteDialog.BorderFrame.Stage:RemoveTextures() + GarrisonShipyardFrame.MissionTab.MissionList.CompleteDialog.BorderFrame.Stage:SetStyle("!_Frame", "Model") + GarrisonShipyardFrame.MissionTab.MissionList.CompleteDialog.BorderFrame.ViewButton:RemoveTextures(true) + GarrisonShipyardFrame.MissionTab.MissionList.CompleteDialog.BorderFrame.ViewButton:SetStyle("Button") + + SV.API:Set("CloseButton", GarrisonShipyardFrame.MissionTab.MissionPage.CloseButton) + GarrisonShipyardFrame.MissionTab.MissionPage.StartMissionButton:RemoveTextures(true) + GarrisonShipyardFrame.MissionTab.MissionPage.StartMissionButton:SetStyle("Button") + + GarrisonShipyardFrame.MissionTab.MissionList:SetStyle("Frame", 'Paper', false, 4, 0, 0) GarrisonShipyardFrame.FollowerTab:RemoveTextures() + + SV.API:Set("ScrollBar", GarrisonShipyardFrameFollowersListScrollFrame) SV.API:Set("Skin", GarrisonShipyardFrame.FollowerTab, 12, 0, -2, 30) + SV.API:Set("EditBox", GarrisonShipyardFrameFollowers.SearchBox) + StyleMissionComplete(GarrisonShipyardFrame) SV.API:Set("Tab",GarrisonShipyardFrameTab1) SV.API:Set("Tab",GarrisonShipyardFrameTab2) @@ -616,11 +647,12 @@ local function LoadGarrisonStyle() FOLLOWER HOOKS ############################################################################## --]] - hooksecurefunc("GarrisonFollowerList_Update", _hook_GarrisonFollowerList_Update) - hooksecurefunc("GarrisonFollowerPage_ShowFollower", _hook_GarrisonFollowerPage_ShowFollower) - hooksecurefunc("GarrisonFollowerButton_AddAbility", _hook_GarrisonFollowerButton_AddAbility) - hooksecurefunc("GarrisonFollowerButton_SetCounterButton", _hook_GarrisonFollowerButton_SetCounterButton) - hooksecurefunc("GarrisonFollowerTooltipTemplate_SetGarrisonFollower", _hook_GarrisonFollowerTooltipTemplate_SetGarrisonFollower) + --hooksecurefunc("GarrisonFollowerList_Update", _hook_GarrisonFollowerList_Update) + --hooksecurefunc("GarrisonFollowerPage_ShowFollower", _hook_GarrisonFollowerPage_ShowFollower) + --hooksecurefunc("GarrisonFollowerButton_AddAbility", _hook_GarrisonFollowerButton_AddAbility) + --hooksecurefunc("GarrisonFollowerButton_SetCounterButton", _hook_GarrisonFollowerButton_SetCounterButton) + --hooksecurefunc("GarrisonFollowerTooltipTemplate_SetGarrisonFollower", _hook_GarrisonFollowerTooltipTemplate_SetGarrisonFollower) + --print('GARRISON DONE') end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index 7b962c0..83cebba 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -546,8 +546,8 @@ local function MiscStyles() MerchantRepairAllIcon:InsetPoints() SV.API:Set("CloseButton", MerchantFrameCloseButton, MerchantFrame.Panel) - SV.API:Set("PageButton", MerchantNextPageButton) - SV.API:Set("PageButton", MerchantPrevPageButton) + SV.API:Set("!_PageButton", MerchantNextPageButton) + SV.API:Set("!_PageButton", MerchantPrevPageButton) end if(SV.db.Skins.blizzard.petition) then