diff --git a/Interface/AddOns/SVUI/framework/framework.lua b/Interface/AddOns/SVUI/framework/framework.lua index 9238308..d1b1eaf 100644 --- a/Interface/AddOns/SVUI/framework/framework.lua +++ b/Interface/AddOns/SVUI/framework/framework.lua @@ -32,5 +32,5 @@ function SV:LoadFramework() self.Dock:Initialize(); self.Mentalo:Initialize(); self.Comix:Initialize() - self.Ego:Initialize() + self.GameMenu:Initialize() end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/framework/widgets/widget_ego.lua b/Interface/AddOns/SVUI/framework/widgets/widget_ego.lua index 6a2eeb3..4b3a531 100644 --- a/Interface/AddOns/SVUI/framework/widgets/widget_ego.lua +++ b/Interface/AddOns/SVUI/framework/widgets/widget_ego.lua @@ -31,7 +31,7 @@ GET ADDON DATA ]]-- local SV = select(2, ...); -SV.Ego = _G["SVUI_EgoFrame"]; +SV.GameMenu = _G["SVUI_EgoFrame"]; local Sequences = { --{65, 1000}, --shrug @@ -66,7 +66,7 @@ local Activate = function(self) self.ModelRight:SetAnimation(emote) end -function SV.Ego:Initialize() +function SV.GameMenu:Initialize() self:SetFrameLevel(0) self:SetAllPoints(SV.Screen) @@ -89,7 +89,7 @@ function SV.Ego:Initialize() self:SetScript("OnShow", Activate) end -function SV.Ego:Toggle() +function SV.GameMenu:Toggle() if(SV.db.general.ego) then self:Show() self:SetScript("OnShow", Activate) diff --git a/Interface/AddOns/SVUI/framework/widgets/widget_gamemenu.lua b/Interface/AddOns/SVUI/framework/widgets/widget_gamemenu.lua new file mode 100644 index 0000000..3436789 --- /dev/null +++ b/Interface/AddOns/SVUI/framework/widgets/widget_gamemenu.lua @@ -0,0 +1,100 @@ +--[[ +############################################################################## +_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # + ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # + __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # + ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# +############################################################################## +S U P E R - V I L L A I N - U I By: Munglunch # +############################################################################## +########################################################## +LOCALIZED LUA FUNCTIONS +########################################################## +]]-- +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local math = _G.math; +--[[ MATH METHODS ]]-- +local random = math.random; +local GameMenuFrame = _G.GameMenuFrame +--[[ +########################################################## +GET ADDON DATA +########################################################## +]]-- +local SV = select(2, ...); + +SV.GameMenu = _G["SVUI_GameMenuFrame"]; + +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 + {5, 1000}, --run + {69, 1000}, --dance +}; + +local function rng() + return random(1, #Sequences) +end + +local Activate = function(self) + if(not SV.db.general.ego) then + self:Toggle() + return + end + + local key = rng() + local emote = Sequences[key][1] + self:SetAlpha(1) + self.ModelLeft:SetAnimation(emote) + self.ModelRight:SetAnimation(emote) +end + +function SV.GameMenu:Initialize() + self:SetFrameLevel(0) + self:SetAllPoints(SV.Screen) + + self.ModelLeft:SetUnit("player") + self.ModelLeft:SetRotation(1) + self.ModelLeft:SetPortraitZoom(0.05) + self.ModelLeft:SetPosition(0,0,-0.25) + + self.ModelRight:SetUnit("player") + self.ModelRight:SetRotation(-1) + self.ModelRight:SetPortraitZoom(0.05) + self.ModelRight:SetPosition(0,0,-0.25) + + -- local splash = self:CreateTexture(nil, "OVERLAY") + -- splash:SetSize(600, 300) + -- splash:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\SPLASH-BLACK") + -- splash:SetBlendMode("ADD") + -- splash:SetPoint("TOP", 0, 0) + + self:SetScript("OnShow", Activate) +end + +function SV.GameMenu:Toggle() + if(SV.db.general.ego) then + self:Show() + self:SetScript("OnShow", Activate) + else + self:Hide() + self:SetScript("OnShow", nil) + end +end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/framework/widgets/widgets.xml b/Interface/AddOns/SVUI/framework/widgets/widgets.xml index b8cbf51..d2e7fa8 100644 --- a/Interface/AddOns/SVUI/framework/widgets/widgets.xml +++ b/Interface/AddOns/SVUI/framework/widgets/widgets.xml @@ -95,6 +95,44 @@ </Frame> <Frame name="SVUI_DropdownFrame" frameStrata="DIALOG" hidden="true" /> + + <Frame name="SVUI_GameMenuFrame" parent="GameMenuFrame"> + <Layers> + <Layer level="BACKGROUND" textureSubLevel="-7"> + <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="-300" /> + </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="300" /> + </Anchors> + <Color r="0" g="0" b="0" a="0.8" /> + </Texture> + </Layer> + </Layers> + <Frames> + <PlayerModel name="$parentModelLeft" parentKey="ModelLeft" frameStrata="BACKGROUND"> + <Size y="1"/> + <Anchors> + <Anchor point="TOPLEFT" relativePoint="TOPLEFT" x="-250" y="-300" /> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOM" x="0" y="300" /> + </Anchors> + </PlayerModel> + <PlayerModel name="$parentModelRight" parentKey="ModelRight" frameStrata="BACKGROUND"> + <Size y="1"/> + <Anchors> + <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" x="250" y="-300" /> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOM" x="0" y="300" /> + </Anchors> + </PlayerModel> + </Frames> + </Frame> + <Frame name="SVUI_EgoFrame" parent="GameMenuFrame"> <Layers> <Layer level="BACKGROUND" textureSubLevel="-7"> diff --git a/Interface/AddOns/SVUI/packages/tools/SVTools.xml b/Interface/AddOns/SVUI/packages/tools/SVTools.xml index 74c4b63..6172c7d 100644 --- a/Interface/AddOns/SVUI/packages/tools/SVTools.xml +++ b/Interface/AddOns/SVUI/packages/tools/SVTools.xml @@ -2,5 +2,6 @@ <Script file='SVTools.lua'/> <Script file="components\questwatch.lua"/> <Script file="components\profession.lua"/> + <Script file="components\garrison.lua"/> <Script file="components\raidleader.lua"/> </Ui> \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/tools/components/garrison.lua b/Interface/AddOns/SVUI/packages/tools/components/garrison.lua index a6f1e2a..7740834 100644 --- a/Interface/AddOns/SVUI/packages/tools/components/garrison.lua +++ b/Interface/AddOns/SVUI/packages/tools/components/garrison.lua @@ -135,6 +135,7 @@ local function getColoredString(text, color) end local function GetActiveMissions() + local hasMission = false GameTooltip:AddLine(" ", 1, 1, 1) for key,data in pairs(C_Garrison.GetInProgressMissions()) do local mission = ("%s - %s"):format(data.level, data.name); @@ -149,6 +150,11 @@ local function GetActiveMissions() end GameTooltip:AddDoubleLine(mission, remaining, 0, 1, 0, 1, 1, 1) + hasMission = true + end + + if(not hasMission) then + GameTooltip:AddLine("No Active Missions", 1, 1, 1) end -- for key,garrisonMission in pairs(C_Garrison.GetCompleteMissions()) do diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua index da8a8d2..988a57e 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua @@ -378,7 +378,7 @@ SV.Options.args.common = { type = 'toggle', name = L["Awesome Game Menu"], get = function(j)return SV.db.general.ego end, - set = function(j,value) SV.db.general.ego = value; SV.Ego:Toggle() end + set = function(j,value) SV.db.general.ego = value; SV.GameMenu:Toggle() end }, } }, diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua new file mode 100644 index 0000000..1e94919 --- /dev/null +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua @@ -0,0 +1,51 @@ +--[[ +############################################################################## +_____/\\\\\\\\\\\____/\\\________/\\\__/\\\________/\\\__/\\\\\\\\\\\_ # + ___/\\\/////////\\\_\/\\\_______\/\\\_\/\\\_______\/\\\_\/////\\\///__ # + __\//\\\______\///__\//\\\______/\\\__\/\\\_______\/\\\_____\/\\\_____ # + ___\////\\\__________\//\\\____/\\\___\/\\\_______\/\\\_____\/\\\_____ # + ______\////\\\________\//\\\__/\\\____\/\\\_______\/\\\_____\/\\\_____ # + _________\////\\\______\//\\\/\\\_____\/\\\_______\/\\\_____\/\\\_____ # + __/\\\______\//\\\______\//\\\\\______\//\\\______/\\\______\/\\\_____ # + _\///\\\\\\\\\\\/________\//\\\________\///\\\\\\\\\/____/\\\\\\\\\\\_# + ___\///////////___________\///___________\/////////_____\///////////_# +############################################################################## +S U P E R - V I L L A I N - U I By: Munglunch # +############################################################################## +--]] +--[[ GLOBALS ]]-- +local _G = _G; +local unpack = _G.unpack; +local select = _G.select; +local ipairs = _G.ipairs; +local pairs = _G.pairs; +--[[ ADDON ]]-- +local SV = _G.SVUI; +local L = SV.L; +local PLUGIN = select(2, ...); +local Schema = PLUGIN.Schema; + + +local function LoadGarrisonStyle() + if PLUGIN.db.blizzard.enable ~= true then + return + end + + PLUGIN:ApplyScrollFrameStyle(GarrisonLandingPageListListScrollFrameScrollBar) + PLUGIN:ApplyCloseButtonStyle(GarrisonLandingPage.CloseButton) + GarrisonLandingPage.CloseButton:SetFrameStrata("HIGH") + + for i = 1, GarrisonLandingPageListListScrollFrameScrollChild:GetNumChildren() do + local child = select(i, GarrisonLandingPageListListScrollFrameScrollChild:GetChildren()) + for j = 1, child:GetNumChildren() do + local childC = select(j, child:GetChildren()) + childC.Icon:SetTexCoord(0.1,0.9,0.1,0.9) + end + end +end +--[[ +########################################################## +PLUGIN LOADING +########################################################## +]]-- +PLUGIN:SaveBlizzardStyle("Blizzard_GarrisonUI", LoadGarrisonStyle) \ No newline at end of file