diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/AFK-BG.blp b/Interface/AddOns/SVUI/assets/artwork/Template/AFK-BG.blp new file mode 100644 index 0000000..56a8990 Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Template/AFK-BG.blp differ diff --git a/Interface/AddOns/SVUI/framework/framework.lua b/Interface/AddOns/SVUI/framework/framework.lua index e06c4fc..54c5088 100644 --- a/Interface/AddOns/SVUI/framework/framework.lua +++ b/Interface/AddOns/SVUI/framework/framework.lua @@ -33,5 +33,5 @@ function SV:LoadFramework() self.Mentalo:Initialize(); self.Comix:Initialize(); self.GameMenu:Initialize(); - -- self.AFK:Initialize(); + self.AFK:Initialize(); end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/framework/widgets/widget_afk.lua b/Interface/AddOns/SVUI/framework/widgets/widget_afk.lua index 16435a7..f93ed7e 100644 --- a/Interface/AddOns/SVUI/framework/widgets/widget_afk.lua +++ b/Interface/AddOns/SVUI/framework/widgets/widget_afk.lua @@ -32,27 +32,6 @@ local SV = select(2, ...); SV.AFK = _G["SVUI_AFKFrame"]; -local Sequences = { - --{65, 1000}, --shrug - {70, 1000}, --laugh - --{74, 1000}, --roar - --{82, 1000}, --flex - {5, 1000}, --run - {125, 1000}, --spell2 - {125, 1000}, --spell2 - {26, 1000}, --attack - {26, 1000}, --attack - {26, 1000}, --attack - {26, 1000}, --attack - {4, 1000}, --walk - {5, 1000}, --run - {69, 1000}, --dance -}; - -local function rng() - return random(1, #Sequences) -end - local function WatchAFKTime() local time = GetTime() - self.startTime self.time:SetText(("%02d:%02d"):format(floor(time/60), time % 60)) @@ -61,13 +40,14 @@ end function SV.AFK:Toggle(enabled) if(InCombatLockdown()) then return end if(enabled) then - MoveViewLeftStart(CAMERA_SPEED); + MoveViewLeftStart(0.05); self:Show(); - --UIParent:Hide(); + UIParent:Hide(); self:SetAlpha(1); - self.Model:SetAnimation(4) + self.Model:SetAnimation(119) + DoEmote("READ") else - --UIParent:Show(); + UIParent:Show(); self:SetAlpha(0); self:Hide(); MoveViewLeftStop(); @@ -76,7 +56,7 @@ end local Activate = function(self) self:SetAlpha(1) - self.Model:SetAnimation(4) + self.Model:SetAnimation(119) end local AFK_OnEvent = function(self, event) @@ -93,20 +73,31 @@ local AFK_OnEvent = function(self, event) end function SV.AFK:Initialize() + local classToken = select(2,UnitClass("player")) + local color = SVUI_CLASS_COLORS[classToken] + self.BG:SetVertexColor(color.r, color.g, color.b) + self.BG:ClearAllPoints() + self.BG:Size(500,600) + self.BG:Point("BOTTOMRIGHT", self, "BOTTOMRIGHT", 0, 0) + self:SetFrameLevel(0) self:SetAllPoints(SV.Screen) + self.Model:ClearAllPoints() + self.Model:Size(600,600) + self.Model:Point("BOTTOMRIGHT", self, "BOTTOMRIGHT", 64, -64) self.Model:SetUnit("player") self.Model:SetCamDistanceScale(1.15) self.Model:SetFacing(6) - local splash = self:CreateTexture(nil, "OVERLAY") - splash:SetSize(256,256) + local splash = self.Model:CreateTexture(nil, "OVERLAY") + splash:Size(256,256) splash:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\PLAYER-AFK") - splash:SetBlendMode("ADD") - splash:SetPoint("CENTER", self.Model, "TOPRIGHT", 64, 0) + splash:Point("TOPRIGHT", self, "TOPRIGHT", 0, -64) self:SetScript("OnShow", Activate) - self:RegisterEvent("PLAYER_FLAGS_CHANGED", AFK_OnEvent) - self:RegisterEvent("PLAYER_REGEN_DISABLED", AFK_OnEvent) + self:Hide() + self:RegisterEvent("PLAYER_FLAGS_CHANGED") + self:RegisterEvent("PLAYER_REGEN_DISABLED") + self:SetScript("OnEvent", AFK_OnEvent) end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/framework/widgets/widget_gamemenu.lua b/Interface/AddOns/SVUI/framework/widgets/widget_gamemenu.lua index 3436789..f7b65db 100644 --- a/Interface/AddOns/SVUI/framework/widgets/widget_gamemenu.lua +++ b/Interface/AddOns/SVUI/framework/widgets/widget_gamemenu.lua @@ -33,19 +33,32 @@ local SV = select(2, ...); SV.GameMenu = _G["SVUI_GameMenuFrame"]; +--[[ +141 - kneel loop +138 - craft loop +120 - half-crouch loop +119 - stealth walk +111 - attack ready +55 - roar pose (paused) +40 - falling loop +203 - cannibalize +225 - cower loop + +]]-- local Sequences = { --{65, 1000}, --shrug - {70, 1000}, --laugh + --{120, 1000}, --stealth --{74, 1000}, --roar - --{82, 1000}, --flex - {5, 1000}, --run - {125, 1000}, --spell2 - {125, 1000}, --spell2 - {26, 1000}, --attack - {26, 1000}, --attack - {26, 1000}, --attack + --{203, 1000}, --cannibalize + --{119, 1000}, --stealth walk + --{125, 1000}, --spell2 + --{225, 1000}, --cower {26, 1000}, --attack - {5, 1000}, --run + {52, 1000}, --attack + --{138, 1000}, --craft + {111, 1000}, --attack ready + --{4, 1000}, --walk + --{5, 1000}, --run {69, 1000}, --dance }; @@ -63,7 +76,7 @@ local Activate = function(self) local emote = Sequences[key][1] self:SetAlpha(1) self.ModelLeft:SetAnimation(emote) - self.ModelRight:SetAnimation(emote) + self.ModelRight:SetAnimation(69) end function SV.GameMenu:Initialize() @@ -75,10 +88,11 @@ function SV.GameMenu:Initialize() self.ModelLeft:SetPortraitZoom(0.05) self.ModelLeft:SetPosition(0,0,-0.25) - self.ModelRight:SetUnit("player") + self.ModelRight:SetDisplayInfo(49084) self.ModelRight:SetRotation(-1) - self.ModelRight:SetPortraitZoom(0.05) - self.ModelRight:SetPosition(0,0,-0.25) + self.ModelRight:SetCamDistanceScale(1.9) + self.ModelRight:SetFacing(6) + self.ModelRight:SetPosition(0,0,-0.3) -- local splash = self:CreateTexture(nil, "OVERLAY") -- splash:SetSize(600, 300) diff --git a/Interface/AddOns/SVUI/framework/widgets/widgets.xml b/Interface/AddOns/SVUI/framework/widgets/widgets.xml index a3b7410..8abfa7a 100644 --- a/Interface/AddOns/SVUI/framework/widgets/widgets.xml +++ b/Interface/AddOns/SVUI/framework/widgets/widgets.xml @@ -139,22 +139,31 @@ <Texture file="Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT"> <Anchors> <Anchor point="TOPLEFT" relativePoint="TOPLEFT" x="0" y="0" /> - <Anchor point="BOTTOMRIGHT" relativePoint="TOPRIGHT" x="0" y="-100" /> + <Anchor point="BOTTOMRIGHT" relativePoint="TOPRIGHT" x="0" y="-64" /> </Anchors> <Color r="0" g="0" b="0" a="0.8" /> </Texture> <Texture file="Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT"> <Anchors> <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" x="0" y="0" /> - <Anchor point="TOPRIGHT" relativePoint="BOTTOMRIGHT" x="0" y="100" /> + <Anchor point="TOPRIGHT" relativePoint="BOTTOMRIGHT" x="0" y="90" /> </Anchors> <Color r="0" g="0" b="0" a="0.8" /> </Texture> </Layer> + <Layer level="BACKGROUND"> + <Texture parentKey="BG" file="Interface\AddOns\SVUI\assets\artwork\Template\AFK-BG"> + <Size x="600" y="600"/> + <Anchors> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" x="0" y="0" /> + </Anchors> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + </Layer> </Layers> <Frames> - <PlayerModel name="$parentModel" parentKey="Model" frameStrata="BACKGROUND"> - <Size x="800" y="800"/> + <PlayerModel name="$parentModel" parentKey="Model" frameStrata="HIGH"> + <Size x="600" y="600"/> <Anchors> <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" /> </Anchors> @@ -213,5 +222,6 @@ <Script file="widget_dropdown.lua"/> <Script file="widget_gamemenu.lua"/> + <Script file="widget_afk.lua"/> <Script file="widget_comix.lua"/> </Ui> \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua b/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua index 05beef0..db26bed 100644 --- a/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua +++ b/Interface/AddOns/SVUI/packages/stats/stats/tokens.lua @@ -111,6 +111,9 @@ function MOD:CacheTokenData() AddToTokenMenu(401) AddToTokenMenu(385) AddToTokenMenu(399) + AddToTokenMenu(821) + AddToTokenMenu(829) + AddToTokenMenu(944) end if cooking then AddToTokenMenu(81) @@ -120,6 +123,12 @@ function MOD:CacheTokenData() AddToTokenMenu(61) AddToTokenMenu(361) AddToTokenMenu(698) + + AddToTokenMenu(910) + AddToTokenMenu(999) + AddToTokenMenu(1020) + AddToTokenMenu(1008) + AddToTokenMenu(1017) end AddToTokenMenu(697, false, true) AddToTokenMenu(738) @@ -136,6 +145,8 @@ function MOD:CacheTokenData() AddToTokenMenu(776) AddToTokenMenu(777) AddToTokenMenu(789) + AddToTokenMenu(823) + AddToTokenMenu(824) end local function Tokens_OnEnter(self) @@ -151,6 +162,16 @@ local function Tokens_OnEnter(self) TokenInquiry(777) TokenInquiry(789) + MOD.tooltip:AddLine(" ") + MOD.tooltip:AddLine("Garrison") + TokenInquiry(823) + TokenInquiry(824) + TokenInquiry(910) + TokenInquiry(999) + TokenInquiry(1020) + TokenInquiry(1008) + TokenInquiry(1017) + MOD.tooltip:AddLine(" ") MOD.tooltip:AddLine("Raiding and Dungeons") TokenInquiry(697, false, true) @@ -181,6 +202,9 @@ local function Tokens_OnEnter(self) TokenInquiry(698) end if archaeology then + TokenInquiry(821) + TokenInquiry(829) + TokenInquiry(944) TokenInquiry(398) TokenInquiry(384) TokenInquiry(393) diff --git a/Interface/AddOns/SVUI/packages/tools/components/garrison.lua b/Interface/AddOns/SVUI/packages/tools/components/garrison.lua index 7740834..bbfb8f3 100644 --- a/Interface/AddOns/SVUI/packages/tools/components/garrison.lua +++ b/Interface/AddOns/SVUI/packages/tools/components/garrison.lua @@ -136,17 +136,16 @@ end local function GetActiveMissions() local hasMission = false + GameTooltip:AddLine(" ", 1, 1, 1) + GameTooltip:AddLine("Missions", 1, 1, 0) for key,data in pairs(C_Garrison.GetInProgressMissions()) do - local mission = ("%s - %s"):format(data.level, data.name); - + local mission = ("%s|cff888888 - |r|cffFF5500%s|r"):format(data.level, data.name); local remaining - if (data.start == -1) then - remaining = ("~%s %s"):format(data.timeLeft, getColoredString("("..SV:ParseSeconds(data.duration)..")", "lightgrey")) - elseif (data.start == 0 or timeLeft < 0) then + if (data.timeLeft == '0') then remaining = L["Complete!"] else - remaining = ("%s %s"):format(SV:ParseSeconds(timeLeft), getColoredString("("..SV:ParseSeconds(data.duration)..")", "lightgrey")) + remaining = ("%s %s"):format(data.timeLeft, getColoredString(" ("..SV:ParseSeconds(data.durationSeconds)..")", "lightgrey")) end GameTooltip:AddDoubleLine(mission, remaining, 0, 1, 0, 1, 1, 1) @@ -173,7 +172,7 @@ local SetGarrisonTooltip = function(self) GameTooltip:AddDoubleLine("[Right Click]", text2, 0, 1, 0, 1, 1, 1) GameTooltip:AddDoubleLine(L["Time Remaining"], remaining, 1, 1, 1, 0, 1, 1) end - --GetActiveMissions() + GetActiveMissions() end local function LoadToolBarGarrison() diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua index 1e94919..c2dbdcb 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua @@ -24,8 +24,19 @@ local SV = _G.SVUI; local L = SV.L; local PLUGIN = select(2, ...); local Schema = PLUGIN.Schema; - - +--[[ +########################################################## +HELPERS +########################################################## +]]-- +local GarrisonButtonList = { + "StartWorkOrderButton" +}; +--[[ +########################################################## +STYLE +########################################################## +]]-- local function LoadGarrisonStyle() if PLUGIN.db.blizzard.enable ~= true then return @@ -42,6 +53,29 @@ local function LoadGarrisonStyle() childC.Icon:SetTexCoord(0.1,0.9,0.1,0.9) end end + + local display = GarrisonCapacitiveDisplayFrame + display:RemoveTextures(true) + GarrisonCapacitiveDisplayFrameInset:RemoveTextures(true) + display.CapacitiveDisplay:RemoveTextures(true) + display.CapacitiveDisplay:SetPanelTemplate('Transparent') + display.CapacitiveDisplay.ShipmentIconFrame:SetSlotTemplate(true, 2, 0, 0, true) + display.CapacitiveDisplay.ShipmentIconFrame.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + display:SetPanelTemplate('Action') + + local reagents = display.Reagents; + for i = 1, C_Garrison.GetNumShipmentReagents() do + reagents[i]:SetSlotTemplate(true, 2, 0, 0, true) + reagents[i].Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + end + + for i = 1, #GarrisonButtonList do + local button = GarrisonCapacitiveDisplayFrame[GarrisonButtonList[i]] + if(button) then + button:RemoveTextures(true) + button:SetButtonTemplate() + end + end end --[[ ########################################################## diff --git a/Interface/BUTTONS/Thumbs.db b/Interface/BUTTONS/Thumbs.db new file mode 100644 index 0000000..9a524d6 Binary files /dev/null and b/Interface/BUTTONS/Thumbs.db differ diff --git a/Interface/Characterframe/Thumbs.db b/Interface/Characterframe/Thumbs.db deleted file mode 100644 index e66b1c5..0000000 Binary files a/Interface/Characterframe/Thumbs.db and /dev/null differ