diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index 2d16231..81301cc 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -1100,7 +1100,7 @@ do self.BagFrame = frame end - function MOD:MakeBank(isReagent) + function MOD:MakeBankOrReagent(isReagent) local bagName = isReagent and "SVUI_ReagentContainerFrame" or "SVUI_BankContainerFrame" local otherName = isReagent and "SVUI_BankContainerFrame" or "SVUI_ReagentContainerFrame" local uisCount = #UISpecialFrames + 1; diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 10a6081..2e19e19 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -407,8 +407,10 @@ local function UpdateWorldMapConfig() if(not MOD.WorldMapHooked) then NewHook("WorldMap_ToggleSizeUp", AdjustMapSize) NewHook("WorldMap_ToggleSizeDown", SetSmallWorldMap) - NewHook("WorldMapFrame_SetFullMapView", SetLargeWorldMap) - NewHook("WorldMapFrame_SetQuestMapView", SetQuestWorldMap) + if(SV.___interface < 60000) then + NewHook("WorldMapFrame_SetFullMapView", SetLargeWorldMap) + NewHook("WorldMapFrame_SetQuestMapView", SetQuestWorldMap) + end MOD.WorldMapHooked = true end @@ -809,10 +811,13 @@ end local function LoadWorldMap() setfenv(WorldMapFrame_OnShow, setmetatable({ UpdateMicroButtons = SV.fubar }, { __index = _G })) - WorldMapShowDropDown:Point('BOTTOMRIGHT',WorldMapPositioningGuide,'BOTTOMRIGHT',-2,-4) - WorldMapZoomOutButton:Point("LEFT",WorldMapZoneDropDown,"RIGHT",0,4) - WorldMapLevelUpButton:Point("TOPLEFT",WorldMapLevelDropDown,"TOPRIGHT",-2,8) - WorldMapLevelDownButton:Point("BOTTOMLEFT",WorldMapLevelDropDown,"BOTTOMRIGHT",-2,2) + if(SV.___interface < 60000) then + WorldMapShowDropDown:Point('BOTTOMRIGHT',WorldMapPositioningGuide,'BOTTOMRIGHT',-2,-4) + WorldMapZoomOutButton:Point("LEFT",WorldMapZoneDropDown,"RIGHT",0,4) + WorldMapLevelUpButton:Point("TOPLEFT",WorldMapLevelDropDown,"TOPRIGHT",-2,8) + WorldMapLevelDownButton:Point("BOTTOMLEFT",WorldMapLevelDropDown,"BOTTOMRIGHT",-2,2) + WorldMapZoneDropDownButton:HookScript('OnClick', ResetDropDownList_Hook) + end WorldMapFrame:SetParent(SV.UIParent) WorldMapFrame:SetFrameLevel(4) @@ -821,7 +826,6 @@ local function LoadWorldMap() WorldMapFrame:HookScript('OnShow', WorldMapFrameOnShow_Hook) WorldMapFrame:HookScript('OnHide', WorldMapFrameOnHide_Hook) - WorldMapZoneDropDownButton:HookScript('OnClick', ResetDropDownList_Hook) local CoordsHolder = CreateFrame('Frame', 'SVUI_WorldMapCoords', WorldMapFrame) CoordsHolder:SetFrameLevel(WorldMapDetailFrame:GetFrameLevel()+1) diff --git a/Interface/AddOns/SVUI/scripts/questwatch.lua b/Interface/AddOns/SVUI/scripts/questwatch.lua index c4d3515..9b1904c 100644 --- a/Interface/AddOns/SVUI/scripts/questwatch.lua +++ b/Interface/AddOns/SVUI/scripts/questwatch.lua @@ -16,6 +16,7 @@ S U P E R - V I L L A I N - U I By: Munglunch # LOCALIZED LUA FUNCTIONS ########################################################## ]]-- +if(select(4, GetBuildInfo()) >= 60000) then return end; --[[ GLOBALS ]]-- local _G = _G; local unpack = _G.unpack; diff --git a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua index 66caa21..ef130ef 100644 --- a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua +++ b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua @@ -323,7 +323,7 @@ function PLUGIN:Load() local BAGS = SV.SVBag; if BAGS.BagFrame then BAGS.BagFrame.RefreshBagsSlots = RefreshLoggedBagsSlots; - NewHook(BAGS, "MakeBank", self.AppendBankFunctions); + NewHook(BAGS, "MakeBankOrReagent", self.AppendBankFunctions); RefreshLoggedBagsSlots(BAGS.BagFrame) end end diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua index bbbc016..df785f8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua @@ -29,7 +29,9 @@ local function PVPFrameStyle() STYLE:ApplyWindowHolder(PVPUIFrame, true) - PVPUIFrame.Shadows:RemoveTextures() + if(SV.___interface < 60000) then + PVPUIFrame.Shadows:RemoveTextures() + end STYLE:ApplyCloseButtonStyle(PVPUIFrameCloseButton) @@ -65,11 +67,23 @@ local function PVPFrameStyle() HonorFrame.BonusFrame.RandomBGButton:SetButtonTemplate() HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:FillInner() HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:SetTexture(1, 1, 0, 0.1) - HonorFrame.BonusFrame.CallToArmsButton:RemoveTextures() - HonorFrame.BonusFrame.CallToArmsButton:SetFixedPanelTemplate("Button") - HonorFrame.BonusFrame.CallToArmsButton:SetButtonTemplate() - HonorFrame.BonusFrame.CallToArmsButton.SelectedTexture:FillInner() - HonorFrame.BonusFrame.CallToArmsButton.SelectedTexture:SetTexture(1, 1, 0, 0.1) + if(SV.___interface < 60000) then + HonorFrame.BonusFrame.CallToArmsButton:RemoveTextures() + HonorFrame.BonusFrame.CallToArmsButton:SetFixedPanelTemplate("Button") + HonorFrame.BonusFrame.CallToArmsButton:SetButtonTemplate() + HonorFrame.BonusFrame.CallToArmsButton.SelectedTexture:FillInner() + HonorFrame.BonusFrame.CallToArmsButton.SelectedTexture:SetTexture(1, 1, 0, 0.1) + for g = 1, 2 do + local I = HonorFrame.BonusFrame["WorldPVP"..g.."Button"] + I:RemoveTextures() + I:SetFixedPanelTemplate("Button", true) + I:SetButtonTemplate() + I.SelectedTexture:FillInner() + I.SelectedTexture:SetTexture(1, 1, 0, 0.1) + end + PVPUIFrame.LeftInset:RemoveTextures() + end + HonorFrame.BonusFrame.DiceButton:DisableDrawLayer("ARTWORK") HonorFrame.BonusFrame.DiceButton:SetHighlightTexture("") HonorFrame.RoleInset:RemoveTextures() @@ -87,14 +101,7 @@ local function PVPFrameStyle() n.bg:SetDesaturated(true) end end) - for g = 1, 2 do - local I = HonorFrame.BonusFrame["WorldPVP"..g.."Button"] - I:RemoveTextures() - I:SetFixedPanelTemplate("Button", true) - I:SetButtonTemplate() - I.SelectedTexture:FillInner() - I.SelectedTexture:SetTexture(1, 1, 0, 0.1) - end + ConquestFrame.Inset:RemoveTextures() ConquestPointsBarLeft:Die() ConquestPointsBarRight:Die() @@ -122,7 +129,7 @@ local function PVPFrameStyle() STYLE:ApplyScrollFrameStyle(WarGamesFrameScrollFrameScrollBar) STYLE:ApplyScrollFrameStyle(WarGamesFrameInfoScrollFrameScrollBar) WarGamesFrame.HorizontalBar:RemoveTextures() - PVPUIFrame.LeftInset:RemoveTextures() + PVPReadyDialog:RemoveTextures() PVPReadyDialog:SetPanelTemplate("Pattern") PVPReadyDialogEnterBattleButton:SetButtonTemplate() diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua index 9d9fcca..6c07211 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua @@ -568,21 +568,23 @@ local function SystemPanelQue() end end) - GuildInviteFrame:RemoveTextures() - GuildInviteFrame:SetFixedPanelTemplate('Transparent') - GuildInviteFrameLevel:RemoveTextures() - GuildInviteFrameLevel:ClearAllPoints() - GuildInviteFrameLevel:SetPoint('TOP', GuildInviteFrame, 'CENTER', -15, -25) - GuildInviteFrameJoinButton:SetButtonTemplate() - GuildInviteFrameDeclineButton:SetButtonTemplate() - GuildInviteFrame:Height(225) - GuildInviteFrame:HookScript("OnEvent", function() + if(SV.___interface < 60000) then + GuildInviteFrame:RemoveTextures() + GuildInviteFrame:SetFixedPanelTemplate('Transparent') + GuildInviteFrameLevel:RemoveTextures() + GuildInviteFrameLevel:ClearAllPoints() + GuildInviteFrameLevel:SetPoint('TOP', GuildInviteFrame, 'CENTER', -15, -25) + GuildInviteFrameJoinButton:SetButtonTemplate() + GuildInviteFrameDeclineButton:SetButtonTemplate() GuildInviteFrame:Height(225) - end) + GuildInviteFrame:HookScript("OnEvent", function() + GuildInviteFrame:Height(225) + end) - GuildInviteFrameWarningText:Die() - BattleTagInviteFrame:RemoveTextures() - BattleTagInviteFrame:SetFixedPanelTemplate('Transparent') + GuildInviteFrameWarningText:Die() + BattleTagInviteFrame:RemoveTextures() + BattleTagInviteFrame:SetFixedPanelTemplate('Transparent') + end --BattleTagInviteFrameScrollFrame:SetEditboxTemplate() for i=1, BattleTagInviteFrame:GetNumChildren() do diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua index e9f259a..dc102b0 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua @@ -88,6 +88,8 @@ local function WorldMap_OnShow() end if(SV.___interface >= 60000) then + WorldMapFrame:RemoveTextures() + QuestMapFrame:RemoveTextures() if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then WorldMap_FullView() elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then @@ -127,6 +129,7 @@ WORLDMAP STYLER local function WorldMapStyle() if SV.db.SVStyle.blizzard.enable ~= true or SV.db.SVStyle.blizzard.worldmap ~= true then return end + WorldMapFrame:RemoveTextures() WorldMapFrame:SetFrameLevel(2) STYLE:ApplyScrollFrameStyle(WorldMapQuestScrollFrameScrollBar) @@ -165,6 +168,9 @@ local function WorldMapStyle() WorldMapTrackQuest:SetCheckboxTemplate(true) hooksecurefunc("WorldMapFrame_SetFullMapView", WorldMap_FullView) hooksecurefunc("WorldMapFrame_SetQuestMapView", WorldMap_QuestView) + else + QuestMapFrame:RemoveTextures() + WorldMapFrameNavBar:RemoveTextures() end WorldMapFrame:HookScript("OnShow", WorldMap_OnShow)