diff --git a/Themes/default/BGAnimations/ScreenGameplay danger all/default.lua b/Themes/default/BGAnimations/ScreenGameplay danger all/default.lua new file mode 100644 index 0000000000..f69c902ce0 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenGameplay danger all/default.lua @@ -0,0 +1,6 @@ +return Def.ActorFrame { + Def.Quad{ + InitCommand=cmd(FullScreen;diffuse,color("1,0,0,0");blend,Blend.Multiply); + OnCommand=cmd(smooth,1;diffuse,color("0.75,0,0,0.75");decelerate,2;diffuse,color("0,0,0,1")); + }; +}; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenGameplay danger p1/BGAnimation.ini b/Themes/default/BGAnimations/ScreenGameplay danger p1/BGAnimation.ini new file mode 100644 index 0000000000..3f9cc440c9 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenGameplay danger p1/BGAnimation.ini @@ -0,0 +1 @@ +[BGAnimation] diff --git a/Themes/default/BGAnimations/ScreenGameplay danger p2/BGAnimation.ini b/Themes/default/BGAnimations/ScreenGameplay danger p2/BGAnimation.ini new file mode 100644 index 0000000000..3f9cc440c9 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenGameplay danger p2/BGAnimation.ini @@ -0,0 +1 @@ +[BGAnimation] diff --git a/Themes/default/BGAnimations/ScreenGameplay dead p1/BGAnimation.ini b/Themes/default/BGAnimations/ScreenGameplay dead p1/BGAnimation.ini new file mode 100644 index 0000000000..3f9cc440c9 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenGameplay dead p1/BGAnimation.ini @@ -0,0 +1 @@ +[BGAnimation] diff --git a/Themes/default/BGAnimations/ScreenGameplay dead p2/BGAnimation.ini b/Themes/default/BGAnimations/ScreenGameplay dead p2/BGAnimation.ini new file mode 100644 index 0000000000..3f9cc440c9 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenGameplay dead p2/BGAnimation.ini @@ -0,0 +1 @@ +[BGAnimation] diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index d24bea4de3..cd35ac278c 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -111,6 +111,10 @@ for pn in ivalues(PlayerNumber) do end t[#t+1] = StandardDecorationFromFileOptional("BannerFrame","BannerFrame"); +t[#t+1] = StandardDecorationFromFileOptional("PaneDisplayFrameP1","PaneDisplayFrame"); +t[#t+1] = StandardDecorationFromFileOptional("PaneDisplayFrameP2","PaneDisplayFrame"); +t[#t+1] = StandardDecorationFromFileOptional("PaneDisplayTextP1","PaneDisplayTextP1"); +t[#t+1] = StandardDecorationFromFileOptional("PaneDisplayTextP2","PaneDisplayTextP2"); t[#t+1] = StandardDecorationFromFileOptional("DifficultyList","DifficultyList"); t[#t+1] = StandardDecorationFromFileOptional("CourseContentsList","CourseContentsList"); t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay"); diff --git a/Themes/default/Graphics/PaneDisplay text.lua b/Themes/default/Graphics/PaneDisplay text.lua new file mode 100644 index 0000000000..3d6b80400e --- /dev/null +++ b/Themes/default/Graphics/PaneDisplay text.lua @@ -0,0 +1,130 @@ +local iPN = ...; +assert(iPN,"[Graphics/PaneDisplay text.lua] No PlayerNumber Provided."); + +local t = Def.ActorFrame {}; +local function GetRadarData( pnPlayer, rcRadarCategory ) + local tRadarValues; + local StepsOrTrail; + local fDesiredValue = 0; + if GAMESTATE:GetCurrentSteps( pnPlayer ) then + StepsOrTrail = GAMESTATE:GetCurrentSteps( pnPlayer ); + fDesiredValue = StepsOrTrail:GetRadarValues( pnPlayer ):GetValue( rcRadarCategory ); + elseif GAMESTATE:GetCurrentTrail( pnPlayer ) then + StepsOrTrail = GAMESTATE:GetCurrentTrail( pnPlayer ); + fDesiredValue = StepsOrTrail:GetRadarValues( pnPlayer ):GetValue( rcRadarCategory ); + else + StepsOrTrail = nil; + end; + return fDesiredValue; +end; + +local function CreatePaneDisplayItem( _pnPlayer, _sLabel, _rcRadarCategory ) + return Def.ActorFrame { + LoadFont("Common Normal") .. { + Text=_sLabel; + InitCommand=cmd(horizalign,left); + OnCommand=cmd(zoom,0.5;diffuse,color("0.9,0.9,0.9");shadowlength,1); + }; + LoadFont("Common Normal") .. { + Text="000"; + InitCommand=cmd(x,32+8+4;horizalign,left); + OnCommand=cmd(zoom,0.5;shadowlength,1); + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + SetCommand=function(self) + self:settextf("%03i", GetRadarData( _pnPlayer, _rcRadarCategory ) ); + end; + }; + }; +end; + +local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory ) + return Def.ActorFrame { + LoadFont("Common Normal") .. { + Text=_sLabel; + InitCommand=cmd(horizalign,left); + OnCommand=cmd(zoom,0.5;shadowlength,1); + }; + Def.Quad { + InitCommand=cmd(x,12;zoomto,50,10;horizalign,left); + OnCommand=cmd(diffuse,Color("Black");shadowlength,1;diffusealpha,0.5); + }; + Def.Quad { + InitCommand=cmd(x,12;zoomto,50,10;horizalign,left); + OnCommand=cmd(shadowlength,0;diffuse,Color("Green");diffusebottomedge,ColorLightTone(Color("Green"))); + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + SetCommand=function(self) + self:zoomtowidth( GetRadarData( _pnPlayer, _rcRadarCategory ) * 50 ); + end; + }; + LoadFont("Common Normal") .. { + InitCommand=cmd(x,40;zoom,0.5;); + OnCommand=cmd(shadowlength,1;); + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + SetCommand=function(self) + self:settextf("%i%%", GetRadarData( _pnPlayer, _rcRadarCategory ) * 100 ); + end; + }; + }; +end; + +--[[ Numbers ]] +t[#t+1] = Def.ActorFrame { + -- Left + CreatePaneDisplayItem( iPN, "TAPS", 'RadarCategory_TapsAndHolds' ) .. { + InitCommand=cmd(x,-128+16+8;y,-14); + }; + CreatePaneDisplayItem( iPN, "JUMPS", 'RadarCategory_Jumps' ) .. { + InitCommand=cmd(x,-128+16+8;y,-14+16); + }; + CreatePaneDisplayItem( iPN, "HOLDS", 'RadarCategory_Holds' ) .. { + InitCommand=cmd(x,-128+16+8;y,-14+16*2); + }; + CreatePaneDisplayItem( iPN, "MINES", 'RadarCategory_Mines' ) .. { + InitCommand=cmd(x,-128+16+8;y,-14+16*3); + }; + -- Center + CreatePaneDisplayItem( iPN, "MINES", 'RadarCategory_Mines' ) .. { + InitCommand=cmd(x,-128+16+8+74;y,-14); + }; + CreatePaneDisplayItem( iPN, "HANDS", 'RadarCategory_Hands' ) .. { + InitCommand=cmd(x,-128+16+8+74;y,-14+16); + }; + CreatePaneDisplayItem( iPN, "ROLLS", 'RadarCategory_Rolls' ) .. { + InitCommand=cmd(x,-128+16+8+74;y,-14+16*2); + }; + CreatePaneDisplayItem( iPN, "LIFTS", 'RadarCategory_Lifts' ) .. { + InitCommand=cmd(x,-128+16+8+74;y,-14+16*3); + }; + -- Right + CreatePaneDisplayGraph( iPN, "S", 'RadarCategory_Stream' ) .. { + InitCommand=cmd(x,-128+16+8+74*2;y,-14); + }; + CreatePaneDisplayGraph( iPN, "V", 'RadarCategory_Voltage' ) .. { + InitCommand=cmd(x,-128+16+8+74*2;y,-14+12); + }; + CreatePaneDisplayGraph( iPN, "A", 'RadarCategory_Air' ) .. { + InitCommand=cmd(x,-128+16+8+74*2;y,-14+12*2); + }; + CreatePaneDisplayGraph( iPN, "F", 'RadarCategory_Freeze' ) .. { + InitCommand=cmd(x,-128+16+8+74*2;y,-14+12*3); + }; + CreatePaneDisplayGraph( iPN, "C", 'RadarCategory_Chaos' ) .. { + InitCommand=cmd(x,-128+16+8+74*2;y,-14+12*4); + }; +}; +return t; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectMusic CourseType.lua b/Themes/default/Graphics/ScreenSelectMusic CourseType.lua new file mode 100644 index 0000000000..93e17dacca --- /dev/null +++ b/Themes/default/Graphics/ScreenSelectMusic CourseType.lua @@ -0,0 +1,2 @@ +return LoadFont("Common Normal") .. { +}; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectMusic PaneDisplayFrame.png b/Themes/default/Graphics/ScreenSelectMusic PaneDisplayFrame.png new file mode 100644 index 0000000000..e2e7f90497 Binary files /dev/null and b/Themes/default/Graphics/ScreenSelectMusic PaneDisplayFrame.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic PaneDisplayTextP1.lua b/Themes/default/Graphics/ScreenSelectMusic PaneDisplayTextP1.lua new file mode 100644 index 0000000000..8ca7f6ac39 --- /dev/null +++ b/Themes/default/Graphics/ScreenSelectMusic PaneDisplayTextP1.lua @@ -0,0 +1 @@ +return LoadActor(THEME:GetPathG("PaneDisplay","Text"),PLAYER_1); \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectMusic PaneDisplayTextP2.lua b/Themes/default/Graphics/ScreenSelectMusic PaneDisplayTextP2.lua new file mode 100644 index 0000000000..e85dd5eedd --- /dev/null +++ b/Themes/default/Graphics/ScreenSelectMusic PaneDisplayTextP2.lua @@ -0,0 +1 @@ +return LoadActor(THEME:GetPathG("PaneDisplay","Text"),PLAYER_2); \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 57452b452d..617aff15bb 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1197,6 +1197,30 @@ DifficultyListTweenOffCommand=stoptweening;bouncebegin,0.135;zoomx,0 # DifficultyListSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.125;zoom,0.5; # DifficultyListSelectMenuClosedMessageCommand=stoptweening;accelerate,0.0725;zoom,1; # +ShowPaneDisplayFrameP1=true +PaneDisplayFrameP1X=SCREEN_CENTER_X-160 +PaneDisplayFrameP1Y=SCREEN_BOTTOM-112-2 +PaneDisplayFrameP1OnCommand=player,PLAYER_1;diffuse,Color("Orange");zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1 +PaneDisplayFrameP1OffCommand=bouncebegin,0.15;zoomx,0; +# +ShowPaneDisplayTextP1=true +PaneDisplayTextP1X=SCREEN_CENTER_X-160 +PaneDisplayTextP1Y=SCREEN_BOTTOM-122-2 +PaneDisplayTextP1OnCommand=player,PLAYER_1;zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1 +PaneDisplayTextP1OffCommand=bouncebegin,0.15;zoomx,0; +# +ShowPaneDisplayFrameP2=true +PaneDisplayFrameP2X=SCREEN_CENTER_X+160 +PaneDisplayFrameP2Y=SCREEN_BOTTOM-112-2 +PaneDisplayFrameP2OnCommand=player,PLAYER_2;diffuse,Color("Orange");zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1 +PaneDisplayFrameP2OffCommand=bouncebegin,0.15;zoomx,0; +# +ShowPaneDisplayTextP2=true +PaneDisplayTextP2X=SCREEN_CENTER_X+160 +PaneDisplayTextP2Y=SCREEN_BOTTOM-122-2 +PaneDisplayTextP2OnCommand=player,PLAYER_2;zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1 +PaneDisplayTextP2OffCommand=bouncebegin,0.15;zoomx,0; +# ShowCourseContentsList=false CourseContentsListX=SCREEN_CENTER_X-160 CourseContentsListY=SCREEN_TOP+216+6 @@ -1233,7 +1257,7 @@ CDTitleX=SCREEN_CENTER_X-160+90 CDTitleY=SCREEN_TOP+160+(36/2)+8 CDTitleFrontCommand=diffuse,color('0.5,0.5,0.5,1');cullmode,'CullMode_Front' CDTitleBackCommand=cullmode,'CullMode_Back' -CDTitleOnCommand=draworder,106;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0; +CDTitleOnCommand=draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0; CDTitleOffCommand=bouncebegin,0.15;zoomx,0; # ScoreFrameP1X= @@ -1273,16 +1297,16 @@ StepsDisplayP2OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDi StepsDisplayP2OffCommand=bouncebegin,0.15;zoomx,0; # StepsDisplayP2CurrentStepsP2ChangedMessageCommand=stoptweening;zoom,1.2;decelerate,0.1;zoom,1 # -ShowPercentScoreP1=GAMESTATE:IsHumanPlayer(PLAYER_1) +ShowPercentScoreP1=true PercentScoreP1X=SCREEN_CENTER_X-80-1 PercentScoreP1Y=SCREEN_BOTTOM-60 -PercentScoreP1OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowPercentScoreP1");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y +PercentScoreP1OnCommand=player,PLAYER_1;addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y PercentScoreP1OffCommand=bouncebegin,0.15;zoomx,0; # -ShowPercentScoreP2=GAMESTATE:IsHumanPlayer(PLAYER_2) +ShowPercentScoreP2=true PercentScoreP2X=SCREEN_CENTER_X+240-1 PercentScoreP2Y=SCREEN_BOTTOM-60 -PercentScoreP2OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowPercentScoreP2");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y +PercentScoreP2OnCommand=player,PLAYER_2;addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0; [ScreenSelectCourse] #~ ScreenInitCommand=%function(self) \ diff --git a/Themes/default/~res/Common fallback banners.psd b/Themes/default/~res/Common fallback banners.psd new file mode 100644 index 0000000000..5a994d2824 Binary files /dev/null and b/Themes/default/~res/Common fallback banners.psd differ diff --git a/Themes/default/~res/Judgments.psd b/Themes/default/~res/Judgments.psd new file mode 100644 index 0000000000..e982f9be71 Binary files /dev/null and b/Themes/default/~res/Judgments.psd differ diff --git a/Themes/default/~res/PaneDisplay frame.psd b/Themes/default/~res/PaneDisplay frame.psd new file mode 100644 index 0000000000..048b2dfcd7 Binary files /dev/null and b/Themes/default/~res/PaneDisplay frame.psd differ diff --git a/Themes/default/~res/ScreenGameplay ready.psd b/Themes/default/~res/ScreenGameplay ready.psd new file mode 100644 index 0000000000..f1a2725bc6 Binary files /dev/null and b/Themes/default/~res/ScreenGameplay ready.psd differ