diff --git a/Themes/default/BGAnimations/ScreenDemonstration decorations.lua b/Themes/default/BGAnimations/ScreenDemonstration decorations.lua new file mode 100644 index 0000000000..bca99f7f6c --- /dev/null +++ b/Themes/default/BGAnimations/ScreenDemonstration decorations.lua @@ -0,0 +1,3 @@ +local t = LoadFallbackB(); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); +return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay decorations.lua b/Themes/default/BGAnimations/ScreenHowToPlay decorations.lua new file mode 100644 index 0000000000..bca99f7f6c --- /dev/null +++ b/Themes/default/BGAnimations/ScreenHowToPlay decorations.lua @@ -0,0 +1,3 @@ +local t = LoadFallbackB(); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); +return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenInit decorations.lua b/Themes/default/BGAnimations/ScreenInit decorations.lua new file mode 100644 index 0000000000..bca99f7f6c --- /dev/null +++ b/Themes/default/BGAnimations/ScreenInit decorations.lua @@ -0,0 +1,3 @@ +local t = LoadFallbackB(); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); +return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenLogo decorations.lua b/Themes/default/BGAnimations/ScreenLogo decorations.lua index b61a5173cb..00228e6624 100644 --- a/Themes/default/BGAnimations/ScreenLogo decorations.lua +++ b/Themes/default/BGAnimations/ScreenLogo decorations.lua @@ -1,5 +1,6 @@ local t = LoadFallbackB(); t[#t+1] = StandardDecorationFromFileOptional("Logo","Logo"); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); return t; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenTitleJoin decorations.lua b/Themes/default/BGAnimations/ScreenTitleJoin decorations.lua new file mode 100644 index 0000000000..bca99f7f6c --- /dev/null +++ b/Themes/default/BGAnimations/ScreenTitleJoin decorations.lua @@ -0,0 +1,3 @@ +local t = LoadFallbackB(); +t[#t+1] = LoadActor( THEME:GetPathB("_Arcade","decorations") ); +return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/_Arcade decorations/default.lua b/Themes/default/BGAnimations/_Arcade decorations/default.lua new file mode 100644 index 0000000000..df1354da80 --- /dev/null +++ b/Themes/default/BGAnimations/_Arcade decorations/default.lua @@ -0,0 +1,31 @@ +local t = Def.ActorFrame {}; +t.InitCommand=function(self) + self:name("ArcadeOverlay") + ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen") +end; +t[#t+1] = Def.ActorFrame { + Name="ArcadeOverlay.Text"; + InitCommand=function(self) + ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen") + end; + LoadActor(THEME:GetPathG("OptionRowExit","Frame")) .. { + InitCommand=cmd(diffuse,Color("Orange");diffusealpha,0.35); + }; + LoadFont("Common Normal") .. { + InitCommand=cmd(zoom,0.75;shadowlength,1;glowshift;strokecolor,Color("Outline");diffuse,Color("Orange");diffusetopedge,Color("Yellow");textglowmode,'TextGlowMode_Inner'); + Text="TESTING"; + OnCommand=cmd(playcommand,"Refresh"); + CoinInsertedMessageCommand=cmd(playcommand,"Refresh"); + CoinModeChangedMessageCommand=cmd(playcommand,"Refresh"); + RefreshCommand=function(self) + local bCanPlay = GAMESTATE:EnoughCreditsToJoin(); + local bReady = GAMESTATE:GetNumSidesJoined() > 0; + if bCanPlay or bReady then + self:settext(THEME:GetString("ScreenTitleJoin","HelpTextJoin")); + else + self:settext(THEME:GetString("ScreenTitleJoin","HelpTextWait")); + end + end; + }; +}; +return t \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index ca4e295b0e..1d6b8f3641 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -719,6 +719,16 @@ TimerOffCommand= StageDisplayNumberOffset=1 +# This is useful +ArcadeOverlayX= +ArcadeOverlayY= +ArcadeOverlayOnCommand=draworder,100 +ArcadeOverlayOffCommand= +# +ArcadeOverlay.TextX=SCREEN_CENTER_X +ArcadeOverlay.TextY=SCREEN_BOTTOM-48 +ArcadeOverlay.TextOnCommand= +ArcadeOverlay.TextOffCommand= [ScreenWithMenuElementsBlank] ShowHeader=false ShowFooter=false @@ -1793,9 +1803,10 @@ LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35; LogoOffCommand=stopeffect;bouncebegin,0.35;zoom,0 # [ScreenTitleJoin] +ShowHelp=false HelpText=Screen.String("HelpTextTitleJoin") HelpY=SCREEN_CENTER_Y+100 -HelpOnCommand=zoom,1;strokecolor,color("0.125,0.125,0.125,0.5");queuecommand,"Refresh" +HelpOnCommand=visible,false;zoom,1;strokecolor,color("0.125,0.125,0.125,0.5");queuecommand,"Refresh" HelpCoinIsertedMessageCommand=playcommand,"Refresh" HelpCoinModeChangedMessageCommand=playcommand,"Refresh" HelpRefreshCommand=%function(self) \ @@ -1819,7 +1830,9 @@ VersionInfoOnCommand=settext,ProductVersion();horizalign,right;vertalign,bottom; ScrollerOnCommand=visible,false; +ArcadeOverlay.TextY=SCREEN_BOTTOM-128 [ScreenDemonstration] +SongMeterDisplayOnCommand=visible,false SongMeterDisplayP1OnCommand=visible,false SongMeterDisplayP2OnCommand=visible,false LifeP1OnCommand=visible,false