diff --git a/Themes/new/BGAnimations/ScreenGameplay decorations.lua b/Themes/new/BGAnimations/ScreenGameplay decorations.lua deleted file mode 100644 index b2a600e16d..0000000000 --- a/Themes/new/BGAnimations/ScreenGameplay decorations.lua +++ /dev/null @@ -1,31 +0,0 @@ -local t = Def.ActorFrame {}; --- Header -t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_TOP;draworder,100); - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - zoomto,SCREEN_WIDTH,64; - diffuse,ThemeColor.Secondary); - }; - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - zoomto,SCREEN_WIDTH,48; - diffuse,ThemeColor.Background); - }; -}; --- Footer -t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_BOTTOM;draworder,100); - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - zoomto,SCREEN_WIDTH,64; - diffuse,ThemeColor.Secondary); - }; - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - zoomto,SCREEN_WIDTH,32; - diffuse,ThemeColor.Background); - }; -}; - -return t; \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenSelectMusic decorations.lua b/Themes/new/BGAnimations/ScreenSelectMusic decorations.lua deleted file mode 100644 index f0ca39bc2a..0000000000 --- a/Themes/new/BGAnimations/ScreenSelectMusic decorations.lua +++ /dev/null @@ -1,60 +0,0 @@ -local t = LoadFallbackB(); --- -t[#t+1] = StandardDecorationFromFileOptional("BannerFrame","BannerFrame"); -t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay"); ---~ t[#t+1] = StandardDecorationFromFileOptional("TimeDisplay","TimeDisplay"); -t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay"); ---~ t[#t+1] = StandardDecorationFromFileOptional("SortDisplay","SortDisplay"); ---~ t[#t+1] = StandardDecorationFromFileOptional("DifficultyList","DifficultyList"); -t[#t+1] = Def.ActorFrame { - Def.Quad { - InitCommand=cmd(x,SCREEN_CENTER_X-320+24;y,SCREEN_CENTER_Y-192+16;zoomto,40-4,20;diffuse,PlayerColor(PLAYER_1)); - }; - LoadFont("Common Normal") .. { - Text=ToEnumShortString(PLAYER_1); - InitCommand=cmd(x,SCREEN_CENTER_X-320+24;y,SCREEN_CENTER_Y-192+16;diffuse,ThemeColor.Secondary); - }; - LoadActor(THEME:GetPathG(Var "LoadingScreen", "OptionRows"),PLAYER_1) .. { - InitCommand=cmd(x,SCREEN_CENTER_X-320+24+40;y,SCREEN_CENTER_Y-192+16); - }; -}; -t[#t+1] = Def.ActorFrame { - Def.Quad { - InitCommand=cmd(x,SCREEN_CENTER_X-320+24;y,SCREEN_CENTER_Y-192+16+22;zoomto,40-4,20;diffuse,PlayerColor(PLAYER_2)); - }; - LoadFont("Common Normal") .. { - Text=ToEnumShortString(PLAYER_1); - InitCommand=cmd(x,SCREEN_CENTER_X-320+24;y,SCREEN_CENTER_Y-192+16+22;diffuse,ThemeColor.Secondary); - }; - LoadActor(THEME:GetPathG(Var "LoadingScreen", "OptionRows"),PLAYER_1) .. { - InitCommand=cmd(x,SCREEN_CENTER_X-320+24+40;y,SCREEN_CENTER_Y-192+16+22); - }; -}; --- StepsDisplay creator -local function CreateStepsDisplay( _pn ) - local function set(self, _pn) - self:SetFromGameState( _pn); - end - - local t = Def.StepsDisplay { - InitCommand=cmd(Load,"StepsDisplay",GAMESTATE:GetPlayerState(_pn);); - }; - - if _pn == PLAYER_1 then - t.CurrentStepsP1ChangedMessageCommand=function(self) set(self, _pn); end; - t.CurrentTrailP1ChangedMessageCommand=function(self) set(self, _pn); end; - else - t.CurrentStepsP2ChangedMessageCommand=function(self) set(self, _pn); end; - t.CurrentTrailP2ChangedMessageCommand=function(self) set(self, _pn); end; - end - - return t; -end --- Create StepsDisplay for each player -for pn in ivalues(PlayerNumber) do - local MetricsName = "StepsDisplay" .. PlayerNumberToString(pn); - t[#t+1] = CreateStepsDisplay(pn) .. { - InitCommand=function(self) self:player(pn); self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end; - }; -end -return t; \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenSystemLayer aux.lua b/Themes/new/BGAnimations/ScreenSystemLayer aux.lua deleted file mode 100644 index 7c0a8d28cf..0000000000 --- a/Themes/new/BGAnimations/ScreenSystemLayer aux.lua +++ /dev/null @@ -1,13 +0,0 @@ -local t = Def.ActorFrame {}; -t[#t+1] = Def.ActorFrame { - Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH-_safe.w,SCREEN_HEIGHT-_safe.h;queuecommand,"On"); - OnCommand=cmd(basealpha,0.4;diffusealpha,0;visible,false); - ToggleConsoleDisplayMessageCommand=function(self) - self:visible(true); - self:diffusealpha( 0.4 - self:GetDiffuseAlpha() ); - end; - }; -}; - -return t; \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenSystemOverlay aux.lua b/Themes/new/BGAnimations/ScreenSystemOverlay aux.lua deleted file mode 100644 index 03ac768649..0000000000 --- a/Themes/new/BGAnimations/ScreenSystemOverlay aux.lua +++ /dev/null @@ -1,14 +0,0 @@ -local t = Def.ActorFrame {}; -t[#t+1] = Def.ActorFrame { - Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH-_safe.w,SCREEN_HEIGHT-_safe.h); - ScreenChangedMessageCommand=cmd(playcommand,"On"); - OnCommand=cmd(basealpha,0.4;diffusealpha,0;visible,false;blend,Blend.Add); - ToggleConsoleDisplayMessageCommand=function(self) - self:visible(true); - self:diffusealpha( 0.4 - self:GetDiffuseAlpha() ); - end; - }; -}; - -return t; \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenTitleMenu background/default.lua b/Themes/new/BGAnimations/ScreenTitleMenu background/default.lua deleted file mode 100644 index 4942e94e9f..0000000000 --- a/Themes/new/BGAnimations/ScreenTitleMenu background/default.lua +++ /dev/null @@ -1,11 +0,0 @@ -local t = Def.ActorFrame {}; --- -t[#t+1] = Def.ActorFrame { - InitCommand=cmd(Center); - Def.Quad { - InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,ThemeColor.Background); - }; -}; --- -return t \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/EV01439N.mpg b/Themes/new/BGAnimations/ScreenWithMenuElements background/EV01439N.mpg deleted file mode 100644 index 848596ce23..0000000000 Binary files a/Themes/new/BGAnimations/ScreenWithMenuElements background/EV01439N.mpg and /dev/null differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_block.png b/Themes/new/BGAnimations/ScreenWithMenuElements background/_block.png deleted file mode 100644 index 46fc65f6a7..0000000000 Binary files a/Themes/new/BGAnimations/ScreenWithMenuElements background/_block.png and /dev/null differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_comet.png b/Themes/new/BGAnimations/ScreenWithMenuElements background/_comet.png deleted file mode 100644 index 22221b1b97..0000000000 Binary files a/Themes/new/BGAnimations/ScreenWithMenuElements background/_comet.png and /dev/null differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_particle-Horiz.lua b/Themes/new/BGAnimations/ScreenWithMenuElements background/_particle-Horiz.lua deleted file mode 100644 index f599d1b949..0000000000 --- a/Themes/new/BGAnimations/ScreenWithMenuElements background/_particle-Horiz.lua +++ /dev/null @@ -1,74 +0,0 @@ -local t = Def.ActorFrame{}; - -local Params = { - NumParticles = 15, - VelocityXMin = 225, - VelocityXMax = 1000, - VelocityYMin = 0, - VelocityYMax = 0, - VelocityZMin = 0, - VelocityZMax = 0, - BobRateZMin = 0.4, - BobRateZMax = 0.7, - ZoomMin = 0.5, - ZoomMax = 1, - SpinZ = 0, - BobZ = 52, - Width = 600, - Height = 8, - File = "_comet", -}; - -local tParticleInfo = {} - -for i=1,Params.NumParticles do - tParticleInfo[i] = { - X = math.random(Params.VelocityXMin, Params.VelocityXMax), - Y = Params.VelocityYMin ~= Params.VelocityYMax and math.random(Params.VelocityYMin, Params.VelocityYMax) or Params.VelocityYMin, - Z = Params.VelocityZMin ~= Params.VelocityZMax and math.random(Params.VelocityZMin, Params.VelocityZMax) or Params.VelocityZMin, - Zoom = math.random(Params.ZoomMin*1000,Params.ZoomMax*1000) / 1000, - BobZRate = math.random(Params.BobRateZMin*1000,Params.BobRateZMax*1000) / 1000, - Age = 0, - }; - t[#t+1] = LoadActor( Params.File )..{ - Name="Particle"..i; - InitCommand=function(self) - self:basezoom(tParticleInfo[i].Zoom); - self:x(math.random(SCREEN_LEFT+(Params.Width/2),SCREEN_RIGHT-(Params.Width/2))); - self:y(math.random(SCREEN_TOP+(Params.Height/2),SCREEN_BOTTOM-(Params.Height/2))); - --self:z(math.random(-64,0)); - end; - OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.5;fadeleft,1); - }; -end - -local function UpdateParticles(self,DeltaTime) - tParticles = self:GetChildren(); - for i=1, Params.NumParticles do - local p = tParticles["Particle"..i]; - local vX = tParticleInfo[i].X; - local vY = tParticleInfo[i].Y; - local vZ = tParticleInfo[i].Z; - tParticleInfo[i].Age = tParticleInfo[i].Age + DeltaTime; - p:x(p:GetX() + (vX * DeltaTime)); - p:y(p:GetY() + (vY * DeltaTime)); - p:z(p:GetZ() + (vZ * DeltaTime)); --- p:zoom( 1 + math.cos( --- (tParticleInfo[i].Age * math.pi*2) --- ) * 0.125 ); - if p:GetX() > SCREEN_RIGHT + (Params.Width/2 - p:GetZ()) then - p:x(SCREEN_LEFT - (Params.Width/2)); - elseif p:GetX() < SCREEN_LEFT - (Params.Width/2 - p:GetZ()) then - p:x(SCREEN_RIGHT + (Params.Width/2)); - end - if p:GetY() > SCREEN_BOTTOM + (Params.Height/2 - p:GetZ()) then - p:y(SCREEN_TOP - (Params.Height/2)); - elseif p:GetY() < SCREEN_TOP - (Params.Height/2 - p:GetZ()) then - p:y(SCREEN_BOTTOM + (Params.Height/2)); - end - end; -end; - -t.InitCommand = cmd(fov,90;SetUpdateFunction,UpdateParticles); - -return t; diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_particle-Vert.lua b/Themes/new/BGAnimations/ScreenWithMenuElements background/_particle-Vert.lua deleted file mode 100644 index 0bf28a036f..0000000000 --- a/Themes/new/BGAnimations/ScreenWithMenuElements background/_particle-Vert.lua +++ /dev/null @@ -1,76 +0,0 @@ -local t = Def.ActorFrame{}; - -local Params = { - NumParticles = 45, - VelocityXMin = -1, - VelocityXMax = 1, - VelocityYMin = -250, - VelocityYMax = -130, - VelocityZMin = 0, - VelocityZMax = 0, - BobRateZMin = 0.4, - BobRateZMax = 0.7, - ZoomMin = 0.5, - ZoomMax = 1, - SpinZ = 0, - BobZ = 52, - Width = 8, - Height = 8, - File = "_block", -}; - -local tParticleInfo = {} - -for i=1,Params.NumParticles do - tParticleInfo[i] = { - X = 0, - Y = Params.VelocityYMin ~= Params.VelocityYMax and math.random(Params.VelocityYMin, Params.VelocityYMax) or Params.VelocityYMin, - Z = Params.VelocityZMin ~= Params.VelocityZMax and math.random(Params.VelocityZMin, Params.VelocityZMax) or Params.VelocityZMin, - Zoom = math.random(Params.ZoomMin*1000,Params.ZoomMax*1000) / 1000, - BobZRate = math.random(Params.BobRateZMin*1000,Params.BobRateZMax*1000) / 1000, - Age = 0, - }; - t[#t+1] = LoadActor( Params.File )..{ - Name="Particle"..i; - InitCommand=function(self) - self:basezoom(tParticleInfo[i].Zoom); - self:x(math.random(SCREEN_LEFT+(Params.Width/2),SCREEN_RIGHT-(Params.Width/2))); - self:y(math.random(SCREEN_TOP+(Params.Height/2),SCREEN_BOTTOM-(Params.Height/2))); - --self:z(math.random(-64,0)); - end; - OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.65); - }; -end - -local function UpdateParticles(self,DeltaTime) - tParticles = self:GetChildren(); - for i=1, Params.NumParticles do - local p = tParticles["Particle"..i]; - local vX = tParticleInfo[i].X; - local vY = tParticleInfo[i].Y; - local vZ = tParticleInfo[i].Z; - local vAlpha = scale(p:GetY(),SCREEN_BOTTOM,SCREEN_CENTER_Y-60,0,1); - tParticleInfo[i].Age = tParticleInfo[i].Age + DeltaTime; - p:x(p:GetX() + (vX * DeltaTime)); - p:y(p:GetY() + (vY * DeltaTime)); - p:z(p:GetZ() + (vZ * DeltaTime)); - p:diffusealpha( 0.45 - (vAlpha*0.45) ); --- p:zoom( 1 + math.cos( --- (tParticleInfo[i].Age * math.pi*2) --- ) * 0.125 ); - if p:GetX() > SCREEN_RIGHT + (Params.Width/2 - p:GetZ()) then - p:x(SCREEN_LEFT - (Params.Width/2)); - elseif p:GetX() < SCREEN_LEFT - (Params.Width/2 - p:GetZ()) then - p:x(SCREEN_RIGHT + (Params.Width/2)); - end - if p:GetY() > SCREEN_BOTTOM + (Params.Height/2 - p:GetZ()) then - p:y(SCREEN_TOP - (Params.Height/2)); - elseif p:GetY() < SCREEN_TOP - (Params.Height/2 - p:GetZ()) then - p:y(SCREEN_BOTTOM + (Params.Height/2)); - end - end; -end; - -t.InitCommand = cmd(fov,90;SetUpdateFunction,UpdateParticles); - -return t; diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_raise C (doubleres).jpg b/Themes/new/BGAnimations/ScreenWithMenuElements background/_raise C (doubleres).jpg deleted file mode 100644 index 150f688b22..0000000000 Binary files a/Themes/new/BGAnimations/ScreenWithMenuElements background/_raise C (doubleres).jpg and /dev/null differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_raise G (doubleres).jpg b/Themes/new/BGAnimations/ScreenWithMenuElements background/_raise G (doubleres).jpg deleted file mode 100644 index 2170b62dbb..0000000000 Binary files a/Themes/new/BGAnimations/ScreenWithMenuElements background/_raise G (doubleres).jpg and /dev/null differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/_wallpaper (doubleres).jpg b/Themes/new/BGAnimations/ScreenWithMenuElements background/_wallpaper (doubleres).jpg deleted file mode 100644 index 19c27b54f6..0000000000 Binary files a/Themes/new/BGAnimations/ScreenWithMenuElements background/_wallpaper (doubleres).jpg and /dev/null differ diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua deleted file mode 100644 index 4075f35a6b..0000000000 --- a/Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua +++ /dev/null @@ -1,39 +0,0 @@ -local t = Def.ActorFrame {}; --- -t[#t+1] = Def.ActorFrame { - InitCommand=cmd(Center); ---[[ LoadActor("_wallpaper") .. { - InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT); - }; - LoadActor("EV01439N") .. { - InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT); - OnCommand=cmd(diffusealpha,0.35); - }; ]] - LoadActor("_raise G") .. { - InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffusealpha,0.35); - }; - LoadActor(THEME:GetPathG("","_textures/paper")) .. { - InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,500/SCREEN_WIDTH,500/SCREEN_HEIGHT); - OnCommand=cmd(diffusealpha,0.35); - }; - LoadActor("_particle-Vert") .. { - InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y); - }; - LoadActor("_particle-Horiz") .. { - InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y); - }; - LoadActor(THEME:GetPathG("","_textures/paper")) .. { - InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,500/SCREEN_WIDTH,500/SCREEN_HEIGHT); - OnCommand=cmd(diffusealpha,0.35;blend,Blend.Add); - }; -}; -t[#t+1] = Def.ActorFrame { - InitCommand=cmd(Center); - Def.Quad { - InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,ThemeColor.Primary - diffusealpha,0.45); - }; -}; --- -return t \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/old_block.lua b/Themes/new/BGAnimations/ScreenWithMenuElements background/old_block.lua deleted file mode 100644 index 5d4c41da34..0000000000 --- a/Themes/new/BGAnimations/ScreenWithMenuElements background/old_block.lua +++ /dev/null @@ -1,4 +0,0 @@ -return Def.Quad { - InitCommand=cmd(zoomto,8,8); - OnCommand=cmd(diffuse,Color.Black); - }; \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements background/old_wave.lua b/Themes/new/BGAnimations/ScreenWithMenuElements background/old_wave.lua deleted file mode 100644 index 5605598ec0..0000000000 --- a/Themes/new/BGAnimations/ScreenWithMenuElements background/old_wave.lua +++ /dev/null @@ -1,5 +0,0 @@ --- return Def.Quad { --- InitCommand=cmd(zoomto,600,8); --- OnCommand=cmd(diffuse,Color.Black;fadeleft,1); --- }; -return LoadActor("_comet"); \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements decorations.lua b/Themes/new/BGAnimations/ScreenWithMenuElements decorations.lua deleted file mode 100644 index 2339719651..0000000000 --- a/Themes/new/BGAnimations/ScreenWithMenuElements decorations.lua +++ /dev/null @@ -1,8 +0,0 @@ --- Loads up a slew of objects to load into the screen, like how 3.9 does. --- I prefer to keep these optional, incase another screen wants to hide --- these elements. -local t = Def.ActorFrame {}; -t[#t+1] = StandardDecorationFromFileOptional("Header","Header"); -t[#t+1] = StandardDecorationFromFileOptional("Footer","Footer"); -t[#t+1] = StandardDecorationFromFileOptional( "Help", "Help" ); -return t \ No newline at end of file diff --git a/Themes/new/BGAnimations/ScreenWithMenuElements overlay.lua b/Themes/new/BGAnimations/ScreenWithMenuElements overlay.lua deleted file mode 100644 index cab043c4c9..0000000000 --- a/Themes/new/BGAnimations/ScreenWithMenuElements overlay.lua +++ /dev/null @@ -1,39 +0,0 @@ -local t = Def.ActorFrame {}; -local function GetTime(self) - local c = self:GetChildren(); - local tTime = { Hour = nil, Minute = nil, Second = nil, Append = nil}; - - if Hour() then tTime.Hour = Hour() else tTime.Hour = 0 end; - if Minute() then tTime.Minute = Minute() else tTime.Minute = 0 end; - if Second() then tTime.Second = Second() else tTime.Second = 0 end; - - if( Hour() < 12 ) then - tTime.Append = "AM" - else - tTime.Append = "PM" - end; - - if( Hour() == 0 ) then - tTime.Hour = 12; - end; - - c.Time:settextf("%02i:%02i:%02i %s",tTime.Hour,tTime.Minute,tTime.Second,tTime.Append); -end; - -t[#t+1] = Def.ActorFrame { - LoadActor(THEME:GetPathB("","_frame 3x3"),"rounded black",108,16) .. { - Name="Background"; - }; - LoadFont("Common Normal") .. { - Text="Test"; - Name="Time"; - InitCommand=cmd(zoom,0.75); - }; - -- - InitCommand=cmd(x,SCREEN_RIGHT-96;y,24;visible,false); - BeginCommand=function(self) - self:SetUpdateFunction( GetTime ); - self:SetUpdateRate( 1/15 ); - end; -}; -return t; \ No newline at end of file diff --git a/Themes/new/BGAnimations/_frame files 3x3/rounded black 3x3.png b/Themes/new/BGAnimations/_frame files 3x3/rounded black 3x3.png deleted file mode 100644 index 2242854f3a..0000000000 Binary files a/Themes/new/BGAnimations/_frame files 3x3/rounded black 3x3.png and /dev/null differ diff --git a/Themes/new/Fonts/Common Normal.redir b/Themes/new/Fonts/Common Normal.redir deleted file mode 100644 index 754b766fb8..0000000000 --- a/Themes/new/Fonts/Common Normal.redir +++ /dev/null @@ -1 +0,0 @@ -_open sans semibold 24px \ No newline at end of file diff --git a/Themes/new/Fonts/StepsDisplay ticks [main-stroke] 2x1.png b/Themes/new/Fonts/StepsDisplay ticks [main-stroke] 2x1.png deleted file mode 100644 index cf9deb60fd..0000000000 Binary files a/Themes/new/Fonts/StepsDisplay ticks [main-stroke] 2x1.png and /dev/null differ diff --git a/Themes/new/Fonts/StepsDisplay ticks [main] 2x1.png b/Themes/new/Fonts/StepsDisplay ticks [main] 2x1.png deleted file mode 100644 index 5c3334fdc8..0000000000 Binary files a/Themes/new/Fonts/StepsDisplay ticks [main] 2x1.png and /dev/null differ diff --git a/Themes/new/Fonts/StepsDisplay ticks.ini b/Themes/new/Fonts/StepsDisplay ticks.ini deleted file mode 100644 index 4f861c7828..0000000000 --- a/Themes/new/Fonts/StepsDisplay ticks.ini +++ /dev/null @@ -1,9 +0,0 @@ -[main] -AdvanceExtraPixels=0 -0=10 -1=10 -2=10 -3=10 -4=10 -5=10 -6=10 diff --git a/Themes/new/Fonts/_open sans semibold 24px [alt-stroke] 10x10.png b/Themes/new/Fonts/_open sans semibold 24px [alt-stroke] 10x10.png deleted file mode 100644 index 2d8a94b651..0000000000 Binary files a/Themes/new/Fonts/_open sans semibold 24px [alt-stroke] 10x10.png and /dev/null differ diff --git a/Themes/new/Fonts/_open sans semibold 24px [alt] 10x10.png b/Themes/new/Fonts/_open sans semibold 24px [alt] 10x10.png deleted file mode 100644 index 856b553a3b..0000000000 Binary files a/Themes/new/Fonts/_open sans semibold 24px [alt] 10x10.png and /dev/null differ diff --git a/Themes/new/Fonts/_open sans semibold 24px [main-stroke] 15x15.png b/Themes/new/Fonts/_open sans semibold 24px [main-stroke] 15x15.png deleted file mode 100644 index f6955e9f03..0000000000 Binary files a/Themes/new/Fonts/_open sans semibold 24px [main-stroke] 15x15.png and /dev/null differ diff --git a/Themes/new/Fonts/_open sans semibold 24px [main] 15x15.png b/Themes/new/Fonts/_open sans semibold 24px [main] 15x15.png deleted file mode 100644 index 4061257eb8..0000000000 Binary files a/Themes/new/Fonts/_open sans semibold 24px [main] 15x15.png and /dev/null differ diff --git a/Themes/new/Fonts/_open sans semibold 24px.ini b/Themes/new/Fonts/_open sans semibold 24px.ini deleted file mode 100644 index 00e94593ba..0000000000 --- a/Themes/new/Fonts/_open sans semibold 24px.ini +++ /dev/null @@ -1,352 +0,0 @@ -[common] -Baseline=27 -Top=10 -LineSpacing=33 -DrawExtraPixelsLeft=4 -DrawExtraPixelsRight=3 -AdvanceExtraPixels=0 - -[main] -Line 0= !"#$%&'()*+,-. -Line 1=/0123456789:;<= -Line 2=>?@ABCDEFGHIJKL -Line 3=MNOPQRSTUVWXYZ[ -Line 4=\]^_`abcdefghij -Line 5=klmnopqrstuvwxy -Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š -Line 7=‹ŒŽ‘’“”•–—˜™š›œ -Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬ -Line 9=­®¯°±²³´µ¶·¸¹º» -Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ -Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ -Line 12=ÚÛÜÝÞßàáâãäåæçè -Line 13=éêëìíîïðñòóôõö÷ -Line 14=øùúûüýþÿ - -0=6 -1=7 -2=10 -3=16 -4=14 -5=21 -6=18 -7=6 -8=8 -9=8 -10=13 -11=14 -12=6 -13=8 -14=7 -15=9 -16=14 -17=14 -18=14 -19=14 -20=14 -21=14 -22=14 -23=14 -24=14 -25=14 -26=7 -27=7 -28=14 -29=14 -30=14 -31=11 -32=22 -33=16 -34=16 -35=15 -36=18 -37=13 -38=13 -39=17 -40=18 -41=7 -42=7 -43=15 -44=13 -45=22 -46=19 -47=19 -48=15 -49=19 -50=15 -51=13 -52=14 -53=18 -54=15 -55=23 -56=15 -57=14 -58=14 -59=8 -60=9 -61=8 -62=13 -63=10 -64=14 -65=14 -66=15 -67=12 -68=15 -69=14 -70=9 -71=13 -72=15 -73=7 -74=7 -75=14 -76=7 -77=23 -78=15 -79=15 -80=15 -81=15 -82=10 -83=12 -84=9 -85=15 -86=13 -87=20 -88=13 -89=13 -90=11 -91=9 -92=13 -93=9 -94=14 -95=14 -96=6 -97=14 -98=11 -99=20 -100=12 -101=12 -102=14 -103=30 -104=13 -105=8 -106=23 -107=14 -108=5 -109=5 -110=10 -111=10 -112=9 -113=12 -114=24 -115=14 -116=18 -117=12 -118=8 -119=23 -120=11 -121=14 -122=6 -123=7 -124=14 -125=14 -126=14 -127=14 -128=13 -129=12 -130=14 -131=20 -132=9 -133=13 -134=14 -135=8 -136=20 -137=12 -138=10 -139=14 -140=9 -141=9 -142=14 -143=15 -144=16 -145=7 -146=5 -147=9 -148=9 -149=13 -150=20 -151=20 -152=20 -153=11 -154=16 -155=16 -156=16 -157=16 -158=16 -159=16 -160=22 -161=15 -162=13 -163=13 -164=13 -165=13 -166=7 -167=7 -168=7 -169=7 -170=18 -171=19 -172=19 -173=19 -174=19 -175=19 -176=19 -177=14 -178=19 -179=18 -180=18 -181=18 -182=18 -183=14 -184=15 -185=16 -186=14 -187=14 -188=14 -189=14 -190=14 -191=14 -192=21 -193=12 -194=14 -195=14 -196=14 -197=14 -198=7 -199=7 -200=7 -201=7 -202=15 -203=15 -204=15 -205=15 -206=15 -207=15 -208=15 -209=14 -210=15 -211=15 -212=15 -213=15 -214=15 -215=13 -216=15 -217=13 - -[alt] -Line 0= Ą˘Ł¤ĽŚ§¨Š -Line 1=ŞŤŹ­ŽŻ°ą˛ł -Line 2=´ľśˇ¸šşťź˝ -Line 3=žżŔÁÂĂÄĹĆÇ -Line 4=ČÉĘËĚÍÎĎĐŃ -Line 5=ŇÓÔŐÖ×ŘŮÚŰ -Line 6=ÜÝŢßŕáâăäĺ -Line 7=ćçčéęëěíîď -Line 8=đńňóôőö÷řů -Line 9=úűüýţ˙ - -0=6 -1=16 -2=14 -3=13 -4=14 -5=13 -6=13 -7=12 -8=14 -9=13 -10=13 -11=14 -12=14 -13=8 -14=14 -15=14 -16=10 -17=14 -18=5 -19=7 -20=14 -21=7 -22=12 -23=14 -24=5 -25=12 -26=12 -27=9 -28=11 -29=14 -30=11 -31=11 -32=15 -33=16 -34=16 -35=16 -36=16 -37=13 -38=15 -39=15 -40=15 -41=13 -42=13 -43=13 -44=13 -45=7 -46=7 -47=18 -48=18 -49=19 -50=19 -51=19 -52=19 -53=19 -54=19 -55=14 -56=15 -57=18 -58=18 -59=18 -60=18 -61=14 -62=14 -63=16 -64=10 -65=14 -66=14 -67=14 -68=14 -69=7 -70=12 -71=12 -72=12 -73=14 -74=14 -75=14 -76=14 -77=7 -78=7 -79=15 -80=15 -81=15 -82=15 -83=15 -84=15 -85=15 -86=15 -87=14 -88=10 -89=15 -90=15 -91=15 -92=15 -93=13 -94=9 -95=7 diff --git a/Themes/new/Graphics/HoldJudgment label 1x2.png b/Themes/new/Graphics/HoldJudgment label 1x2.png deleted file mode 100644 index e035603393..0000000000 Binary files a/Themes/new/Graphics/HoldJudgment label 1x2.png and /dev/null differ diff --git a/Themes/new/Graphics/Judgment Normal 1x6.png b/Themes/new/Graphics/Judgment Normal 1x6.png deleted file mode 100644 index 618665ea89..0000000000 Binary files a/Themes/new/Graphics/Judgment Normal 1x6.png and /dev/null differ diff --git a/Themes/new/Graphics/MusicWheel Highlight.png b/Themes/new/Graphics/MusicWheel Highlight.png deleted file mode 100644 index e10cfa6ee7..0000000000 Binary files a/Themes/new/Graphics/MusicWheel Highlight.png and /dev/null differ diff --git a/Themes/new/Graphics/MusicWheelItem SectionCollapsed ColorPart.png b/Themes/new/Graphics/MusicWheelItem SectionCollapsed ColorPart.png deleted file mode 100644 index 459b9e58bd..0000000000 Binary files a/Themes/new/Graphics/MusicWheelItem SectionCollapsed ColorPart.png and /dev/null differ diff --git a/Themes/new/Graphics/MusicWheelItem SectionExpanded ColorPart.png b/Themes/new/Graphics/MusicWheelItem SectionExpanded ColorPart.png deleted file mode 100644 index 0b8a0c7f95..0000000000 Binary files a/Themes/new/Graphics/MusicWheelItem SectionExpanded ColorPart.png and /dev/null differ diff --git a/Themes/new/Graphics/MusicWheelItem Song NormalPart.png b/Themes/new/Graphics/MusicWheelItem Song NormalPart.png deleted file mode 100644 index cf1d4b2939..0000000000 Binary files a/Themes/new/Graphics/MusicWheelItem Song NormalPart.png and /dev/null differ diff --git a/Themes/new/Graphics/ScreenSelectMusic BPMDisplay.lua b/Themes/new/Graphics/ScreenSelectMusic BPMDisplay.lua deleted file mode 100644 index 605ca7eb18..0000000000 --- a/Themes/new/Graphics/ScreenSelectMusic BPMDisplay.lua +++ /dev/null @@ -1,83 +0,0 @@ -local switchTime = 2; -local bThen, bNow, bMultipleBPMs; -local iCurrent = 0; -local Song, BPMs; -local updateTimer = function(self, fDeltaTime) - local c = self:GetChildren(); - -- use aux as a timer internally. - self:aux( self:getaux() + fDeltaTime ); - -- debug - -- c.BPMText:settextf("d:%0.16f (a:%0.2f)",fDeltaTime,self:getaux()); - bNow = (math.floor( self:getaux() % switchTime ) == 0) and true or false; - local bChanged = (bThen == bNow); - -- Toggle current index - if bChanged then - iCurrent = 1 - iCurrent; - if ( BPMs[1] == BPMs[2] ) then - bMultipleBPMs = false; - c.BPMText:targetnumber(clamp(BPMs[1],0,9999)); - else - bMultipleBPMs = true; - c.BPMText:targetnumber(clamp(BPMs[1+iCurrent],0,9999)); - end; - end; - -- - -- - bThen = (math.floor( self:getaux() % 2 ) ~= 0) and true or false; -end; -return Def.ActorFrame { - BeginCommand=function(self) - self:SetUpdateFunction( updateTimer ); - end; - CurrentSongChangedMessageCommand=function(self) - self:aux(0); - self:playcommand( GAMESTATE:GetCurrentSong():GetTimingData():HasBPMChanges() and "MultipleBPM" or "SingleBPM" ); - end; - -- BPM Label - LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",160,20); - -- BPM Display Low - Def.RollingNumbers { - Name="BPMTextLow"; - File=THEME:GetPathF("Common","Normal"); - InitCommand=cmd(Load,"RollingNumbersBPMDisplay"); - OnCommand=cmd(horizalign,left;x,-64;maxwidth,92/0.75;); - BeginCommand=cmd(playcommand,"Set"); - CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); - SetCommand=function(self); - Song = GAMESTATE:GetCurrentSong(); - BPMs = Song:GetDisplayBpms() or {0,0}; - -- reset numbers - self:targetnumber( clamp(BPMs[1],0,9999) ); - -- (force once) - if (self:getaux() == 0) then - self:settext(clamp(BPMs[1],0,9999)); - self:aux( 1 ); - end; - end; - }; - LoadFont("Common Normal") .. { - Text="-"; - }; - -- BPM Display High - Def.RollingNumbers { - Name="BPMTextHigh"; - File=THEME:GetPathF("Common","Normal"); - InitCommand=cmd(Load,"RollingNumbersBPMDisplay"); - OnCommand=cmd(horizalign,left;x,8;maxwidth,92/0.75;); - BeginCommand=cmd(playcommand,"Set"); - CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); - HideCommand=cmd(finishtweening;linear,0.2;diffusealpha,0); - ShowCommand=cmd(finishtweening;decelerate,0.125;diffusealpha,1); - SetCommand=function(self) - Song = GAMESTATE:GetCurrentSong(); - BPMs = Song:GetDisplayBpms() or {0,0}; - -- reset numbers - self:targetnumber( clamp(BPMs[1],0,9999) ); - -- (force once) - if (self:getaux() == 0) then - self:settext(clamp(BPMs[1],0,9999)); - self:aux( 1 ); - end; - end; - }; -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenSelectMusic BannerFrame.lua b/Themes/new/Graphics/ScreenSelectMusic BannerFrame.lua deleted file mode 100644 index c336ac556f..0000000000 --- a/Themes/new/Graphics/ScreenSelectMusic BannerFrame.lua +++ /dev/null @@ -1,10 +0,0 @@ -return Def.ActorFrame { - Def.Quad { - InitCommand=cmd(zoomto,320+16,80+16); - OnCommand=cmd(diffuse,ThemeColor.Secondary); - }; - Def.Quad { - InitCommand=cmd(zoomto,320+16,24;y,-48-12); - OnCommand=cmd(diffuse,ThemeColor.Primary;diffuserightedge,ColorMidTone(ThemeColor.Primary)); - }; -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenSelectMusic DifficultyList.lua b/Themes/new/Graphics/ScreenSelectMusic DifficultyList.lua deleted file mode 100644 index 2bcb3f567a..0000000000 --- a/Themes/new/Graphics/ScreenSelectMusic DifficultyList.lua +++ /dev/null @@ -1,7 +0,0 @@ -return Def.StepsDisplayList { - Name="StepsDisplayListRow"; - CursorP1 = Def.ActorFrame {}; - CursorP2 = Def.ActorFrame {}; - CursorP1Frame = Def.Actor {}; - CursorP2Frame = Def.Actor {}; -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenSelectMusic PaneDisplay.lua b/Themes/new/Graphics/ScreenSelectMusic PaneDisplay.lua deleted file mode 100644 index 7fd7af834b..0000000000 --- a/Themes/new/Graphics/ScreenSelectMusic PaneDisplay.lua +++ /dev/null @@ -1,125 +0,0 @@ -local t = Def.ActorFrame {}; --- Background -t[#t+1] = Def.ActorFrame { Name="Background"; - Def.Quad { - InitCommand=cmd(zoomto,320+8,96;diffuse,ThemeColor.Secondary); - }; -}; --- Radar Text -local function RadarLabel( rc ) - local t = Def.ActorFrame {}; - -- - t[#t+1] = LoadFont("Common Normal") .. { - Text=string.upper(THEME:GetString("RadarCategoryShort",ToEnumShortString(rc))); - InitCommand=cmd(shadowlength,1;zoom,0.675;horizalign,right); - }; - -- - return t; -end; --- -local function RadarItem( pn, rc ) - local t = Def.ActorFrame {}; - -- - local function GetRadarValue( _rc, _pn ) - if GAMESTATE:GetCurrentSteps( _pn ) then - local Steps = GAMESTATE:GetCurrentSteps( _pn ); - local RadarValues = Steps:GetRadarValues( _pn ); - local ThisValue = RadarValues:GetValue( _rc ); - -- - return tonumber(ThisValue); - else - return 0; - end; - end; - -- - t[#t+1] = LoadFont("Common Normal") .. { - Text=string.format("%04i",GetRadarValue(rc,pn)); - InitCommand=cmd(shadowlength,1;x,128;zoom,0.675;diffuse,PlayerColor(pn);playcommand,"Set"); - SetCommand=function(self,params) - if params.Player == pn then - self:settextf("%04i",GetRadarValue(rc,pn)); - end; - end; - }; - -- - t.CurrentSongChangedMessageCommand=function(self) self:playcommand("Set"); end; - t.CurrentCourseChangedMessageCommand=function(self) self:playcommand("Set"); end; - t.CurrentTrailP1ChangedMessageCommand=function(self) self:playcommand("Set",{ Player = PLAYER_1}); end; - t.CurrentTrailP2ChangedMessageCommand=function(self) self:playcommand("Set",{ Player = PLAYER_2}); end; - t.CurrentStepsP1ChangedMessageCommand=function(self) self:playcommand("Set",{ Player = PLAYER_1}); end; - t.CurrentStepsP2ChangedMessageCommand=function(self) self:playcommand("Set",{ Player = PLAYER_2}); end; - -- - return t; -end; --- -local function RadarPercent( pn, rc ) - local t = Def.ActorFrame {}; - -- - local function GetRadarValue( _rc, _pn ) - if GAMESTATE:GetCurrentSteps( _pn ) then - local Steps = GAMESTATE:GetCurrentSteps( _pn ); - local RadarValues = Steps:GetRadarValues( _pn ); - local ThisValue = RadarValues:GetValue( _rc ); - -- - return tonumber(ThisValue); - else - return 0; - end; - end; - -- - t[#t+1] = LoadFont("Common Normal") .. { - Text=string.format("%03i%%",math.floor(GetRadarValue(rc,pn)*100)); - InitCommand=cmd(shadowlength,1;x,128;zoom,0.675;diffuse,PlayerColor(pn);playcommand,"Set"); - SetCommand=function(self,params) - if params.Player == pn then - self:settextf("%03i%%",math.floor(GetRadarValue(rc,pn)*100)); - end; - end; - }; - -- - t.CurrentSongChangedMessageCommand=function(self) self:playcommand("Set"); end; - t.CurrentCourseChangedMessageCommand=function(self) self:playcommand("Set"); end; - t.CurrentTrailP1ChangedMessageCommand=function(self) self:playcommand("Set",{ Player = PLAYER_1}); end; - t.CurrentTrailP2ChangedMessageCommand=function(self) self:playcommand("Set",{ Player = PLAYER_2}); end; - t.CurrentStepsP1ChangedMessageCommand=function(self) self:playcommand("Set",{ Player = PLAYER_1}); end; - t.CurrentStepsP2ChangedMessageCommand=function(self) self:playcommand("Set",{ Player = PLAYER_2}); end; - -- - return t; -end; --- -for index,rc in ipairs(RadarCategory) do - if index > 5 then - local VisualIndex = index-6 - local VertOffset = ( VisualIndex % 4 ) * 16; - local HorizOffset = math.floor( (VisualIndex)/4 ) * 156; - t[#t+1] = Def.ActorFrame { - Name="RadarCategoryRow" .. tonumber(index-5); - InitCommand=cmd(x,-96+HorizOffset;y,-10+VertOffset); - -- - RadarLabel(rc); - RadarItem(PLAYER_1, rc) .. { InitCommand=cmd(x,-96-8); }; - RadarItem(PLAYER_2, rc) .. { InitCommand=cmd(x,-64+4); }; - }; - end -end; --- -for index,rc in ipairs(RadarCategory) do - if index < 6 then - local HorizOffset = (index-1) * 64; - t[#t+1] = Def.ActorFrame { - Name="RadarCategoryRow" .. tonumber(index-5); - InitCommand=cmd(x,-148+HorizOffset;y,-33); - -- - RadarLabel(rc); - RadarPercent(PLAYER_1, rc) .. { InitCommand=cmd(x,-104;y,-7); }; - RadarPercent(PLAYER_2, rc) .. { InitCommand=cmd(x,-104;y,7); }; - }; - end -end; --- ---[[ for index,rc in ipairs(RadarCategory) do - if index > 5 then - t[#t+1] = LoadFont("Common Normal") .. { Text=ToEnumShortString(rc); InitCommand=cmd(zoom,0.5;shadowlength,1;y,(index-5)*10); }; - end -end; ]] -return t \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenSelectMusic PlayerFrame.png b/Themes/new/Graphics/ScreenSelectMusic PlayerFrame.png deleted file mode 100644 index 05d04a7d09..0000000000 Binary files a/Themes/new/Graphics/ScreenSelectMusic PlayerFrame.png and /dev/null differ diff --git a/Themes/new/Graphics/ScreenSelectMusic SortDisplay.lua b/Themes/new/Graphics/ScreenSelectMusic SortDisplay.lua deleted file mode 100644 index f03bcc4afb..0000000000 --- a/Themes/new/Graphics/ScreenSelectMusic SortDisplay.lua +++ /dev/null @@ -1,25 +0,0 @@ -return Def.ActorFrame { - -- Time Background - Def.Quad { - Name="SortBackground"; - InitCommand=cmd(zoomto,96,32;diffuse,ThemeColor.Secondary;shadowlength,2;shadowcolor,Color.Alpha(ColorDarkTone(ThemeColor.Primary),0.95)); - }; - -- Time Label - LoadFont("Common Normal") .. { - Name="SortLabel"; - Text="SORT"; - InitCommand=cmd(x,-32;y,-8;zoom,0.5); - }; - -- Time Text - LoadFont("Common Normal") .. { - Name="SortText"; - OnCommand=cmd(horizalign,left;x,-46;y,6;zoom,0.75;maxwidth,92/0.75;); - BeginCommand=cmd(playcommand,"Set"); - SortOrderChangedMessageCommand=cmd(playcommand,"Set";); - SetCommand=function(self) - local s = SortOrderToLocalizedString( GAMESTATE:GetSortOrder() ); - -- reset numbers - self:settext(s); - end; - }; -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenSelectMusic TimeDisplay.lua b/Themes/new/Graphics/ScreenSelectMusic TimeDisplay.lua deleted file mode 100644 index 823e5fefac..0000000000 --- a/Themes/new/Graphics/ScreenSelectMusic TimeDisplay.lua +++ /dev/null @@ -1,28 +0,0 @@ -return Def.ActorFrame { - -- Time Background - Def.Quad { - Name="TimeBackground"; - InitCommand=cmd(zoomto,96,32;diffuse,ThemeColor.Secondary;shadowlength,2;shadowcolor,Color.Alpha(ColorDarkTone(ThemeColor.Primary),0.95)); - }; - -- Time Label - LoadFont("Common Normal") .. { - Name="TimeLabel"; - Text="TIME"; - InitCommand=cmd(x,-32;y,-8;zoom,0.5); - }; - -- Time Text - LoadFont("Common Normal") .. { - Name="BPMText"; - OnCommand=cmd(horizalign,left;x,-46;y,6;zoom,0.75;maxwidth,92/0.75;); - BeginCommand=cmd(playcommand,"Set"); - CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); - SetCommand=function(self) - Song = GAMESTATE:GetCurrentSong(); - Time = Song:GetStepsSeconds() or 0; - Minutes = math.floor( Time / 60 ); - Seconds = tonumber(Time) - tonumber(Minutes*60); - -- reset numbers - self:settextf("%02i:%02i",Minutes,Seconds); - end; - }; -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenTitleMenu Footer.lua b/Themes/new/Graphics/ScreenTitleMenu Footer.lua deleted file mode 100644 index 9d63544c77..0000000000 --- a/Themes/new/Graphics/ScreenTitleMenu Footer.lua +++ /dev/null @@ -1,15 +0,0 @@ -return Def.ActorFrame { - -- Base - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - zoomto,SCREEN_WIDTH,80; - diffuse,ThemeColor.Background;diffusealpha,0.5); - }; - -- Inner Shadow - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - y,-80; - zoomto,SCREEN_WIDTH,2; - diffuse,ThemeColor.Primary;diffusealpha,1;); - }; -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenTitleMenu Header.lua b/Themes/new/Graphics/ScreenTitleMenu Header.lua deleted file mode 100644 index e37e1de832..0000000000 --- a/Themes/new/Graphics/ScreenTitleMenu Header.lua +++ /dev/null @@ -1,16 +0,0 @@ -return Def.ActorFrame { - -- Base - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - zoomto,SCREEN_WIDTH,48; - diffuse,ThemeColor.Background;diffusealpha,0.5); - }; - -- Line - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - y,48; - zoomto,SCREEN_WIDTH,2; - diffuse,ThemeColor.Primary;diffusealpha,1; - ); - }; -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenTitleMenu Help.lua b/Themes/new/Graphics/ScreenTitleMenu Help.lua deleted file mode 100644 index a15e19c3fc..0000000000 --- a/Themes/new/Graphics/ScreenTitleMenu Help.lua +++ /dev/null @@ -1,45 +0,0 @@ -return Def.ActorFrame { ---[[ Def.ActorFrame { - InitCommand=cmd(y,-4); - -- 1 1 - Def.ActorFrame { - -- Icon - LoadFont("Common Normal") .. { - Text="&MENULEFT;&MENURIGHT;"; - InitCommand=cmd(x,32;y,-64; - diffuse,ThemeColor.Primary; - zoom,0.675; - ); - }; - -- Text - LoadFont("Common Normal") .. { - Text="LeftHelpDisplayMenuItem1"; - InitCommand=cmd(horizalign,left; - x,64;y,-64; - diffuse,ThemeColor.Primary; - zoom,0.675; - ); - }; - }; - -- 2 1 - Def.ActorFrame { - -- Icon - LoadFont("Common Normal") .. { - Text="&START;"; - InitCommand=cmd(x,32;y,-40; - diffuse,ThemeColor.Primary; - zoom,0.675; - ); - }; - -- Text - LoadFont("Common Normal") .. { - Text="LeftHelpDisplayMenuItem2"; - InitCommand=cmd(horizalign,left; - x,64;y,-40; - diffuse,ThemeColor.Primary; - zoom,0.675; - ); - }; - }; - }; ]] -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenWithMenuElements Footer.lua b/Themes/new/Graphics/ScreenWithMenuElements Footer.lua deleted file mode 100644 index 544c211c86..0000000000 --- a/Themes/new/Graphics/ScreenWithMenuElements Footer.lua +++ /dev/null @@ -1,44 +0,0 @@ -return Def.ActorFrame { - -- Base - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - zoomto,SCREEN_WIDTH,80; - diffuse,ThemeColor.Secondary); - }; - -- System Layer - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - zoomto,SCREEN_WIDTH,32; - diffuse,ThemeColor.Background); - }; - -- Inner Shadow - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - y,-80; - zoomto,SCREEN_WIDTH,5; - diffuse,Color('Black');diffusealpha,0.25; - fadebottom,1); - }; - -- Inner Hard Line - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - y,-80; - zoomto,SCREEN_WIDTH,1; - diffuse,Color('Black');diffusealpha,0.125;); - }; - -- Outer White Fade - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - y,-80; - zoomto,SCREEN_WIDTH,8; - diffuse,Color('White');diffusealpha,0.125; - fadetop,1); - }; - -- Outer White Line - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - y,-80; - zoomto,SCREEN_WIDTH,1; - diffuse,Color('White');diffusealpha,0.125;); - }; -}; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenWithMenuElements Header.lua b/Themes/new/Graphics/ScreenWithMenuElements Header.lua deleted file mode 100644 index 095989bcaa..0000000000 --- a/Themes/new/Graphics/ScreenWithMenuElements Header.lua +++ /dev/null @@ -1,98 +0,0 @@ -local t = Def.ActorFrame {}; -local function UpdateTriangleFrame(self) - local curBPS = GAMESTATE:GetSongBPS() and GAMESTATE:GetSongBPS() or 1; - local c = self:GetChildren(); - local auxRate = 3; - -- - c.TriangleFrame:aux( math.mod( c.TriangleFrame:getaux() + ( curBPS * auxRate ), 360) ); - c.TriangleFrame:rotationz( c.TriangleFrame:GetRotationZ() + ( curBPS * 0.75 ) ); - c.TriangleFrame:zoom( 1.125 - ((c.TriangleFrame:getaux() / 360) * 0.35) ); - -- c.TriangleFrame:x( math.cos( math.rad(c.TriangleFrame:getaux()) ) * 8 ); - -- c.TriangleFrame:y(math.sin( math.rad(c.TriangleFrame:getaux()) ) * 8); -end; -t[#t+1] = Def.ActorFrame { - -- Base - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - zoomto,SCREEN_WIDTH,48; - diffuse,ThemeColor.Secondary); - }; - -- Inner Shadow - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - y,48; - zoomto,SCREEN_WIDTH,5; - diffuse,Color('Black');diffusealpha,0.25; - fadetop,1); - }; - -- Inner Hard Line - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,bottom; - y,48; - zoomto,SCREEN_WIDTH,1; - diffuse,Color('Black');diffusealpha,0.125;); - }; - -- Outer White Fade - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - y,48; - zoomto,SCREEN_WIDTH,8; - diffuse,Color('White');diffusealpha,0.125; - fadebottom,1); - }; - -- Outer White Line - Def.Quad { - InitCommand=cmd(horizalign,left;vertalign,top; - y,48; - zoomto,SCREEN_WIDTH,1; - diffuse,Color('White');diffusealpha,0.125;); - }; -} -t[#t+1] = Def.ActorFrame { Name="TriangleFrame"; - InitCommand=cmd(x,24;y,32); - BeginCommand=function(self) - self:SetUpdateFunction( UpdateTriangleFrame ); - end; - -- Triangle Beaterator - Def.ActorFrame { - Name="TriangleFrame"; ---~ OnCommand=cmd(thump,2;effectclock,'beatnooffset';effectmagnitude,1,1.135,1); - -- - LoadActor(THEME:GetPathG("_primitive","Triangle")) .. { - Name="Triangle"; - OnCommand=cmd(diffuse,ThemeColor.Primary;zoom,0.75); - }; - }; -}; -t[#t+1] = Def.ActorFrame { - -- Text - LoadFont("Common Normal") .. { - Text=string.upper(THEME:GetString( Var "LoadingScreen","HeaderText")); - InitCommand=cmd(horizalign,left; - x,16;y,16; - diffuse,ThemeColor.Primary; - zoom,0.875; - ); - }; - -- // ---[[ LoadFont("Common Normal") .. { - Text="//"; - InitCommand=cmd(horizalign,left; - x,16;y,32; - diffuse,color("0.7,0.7,0.7,1"); - zoom,0.5; - ); - }; ]] - -- Textem - LoadFont("Common Normal") .. { - Text=string.upper("SELECT AND CHOOSE THE BEST ONE"); - InitCommand=cmd(horizalign,left; - x,34;y,32; - diffuse,color("0.7,0.7,0.7,1"); - zoom,0.5; - skewx,-0.125; - ); - }; -}; - -return t \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenWithMenuElements Help.lua b/Themes/new/Graphics/ScreenWithMenuElements Help.lua deleted file mode 100644 index 84b9c24f4f..0000000000 --- a/Themes/new/Graphics/ScreenWithMenuElements Help.lua +++ /dev/null @@ -1,27 +0,0 @@ -local t = Def.ActorFrame {}; -t[#t+1] = Def.ActorFrame { - InitCommand=cmd(y,-56;visible,false); - -- - Def.ActorFrame { - InitCommand=cmd(x,32); - LoadActor(THEME:GetPathB("","_frame 3x3"),"rounded black",32,12) .. { - Name="Background"; - }; - LoadFont("Common Normal") .. { - Text=string.upper("Info"); - InitCommand=cmd(zoom,0.5); - }; - -- - LoadFont("Common Normal") .. { - Text=string.upper("Let's get it on now, select and choose the best ones. Let's get it on now 5 4 3 2 1 .."); - InitCommand=cmd(horizalign,left;x,32;zoom,0.5;shadowlength,1); - }; - -- Fade - Def.Quad { - InitCommand=cmd(horizalign,left;x,32;zoomto,64,32); - OnCommand=cmd(diffuse,ThemeColor.Secondary;faderight,1); - }; - }; - -- -}; -return t; \ No newline at end of file diff --git a/Themes/new/Graphics/ScreenWithMenuElements StageDisplay.lua b/Themes/new/Graphics/ScreenWithMenuElements StageDisplay.lua deleted file mode 100644 index e59353e533..0000000000 --- a/Themes/new/Graphics/ScreenWithMenuElements StageDisplay.lua +++ /dev/null @@ -1,22 +0,0 @@ -local stages = Def.ActorFrame { - BeginCommand=cmd(playcommand,"Set";); - CurrentSongChangedMessageCommand=cmd(finishtweening;playcommand,"Set";); -}; -local curScreen = Var "LoadingScreen"; -local curStage = GAMESTATE:GetCurrentStage(); -local curStageIndex = GAMESTATE:GetCurrentStageIndex(); - -local t = Def.ActorFrame {}; -t[#t+1] = Def.ActorFrame { - LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",160,20); - LoadFont("Common Normal") .. { - Text=StageToLocalizedString( curStage ) .. " Stage"; ---~ Text=StageToLocalizedString( curStage ) .. " Stage (" .. curStageIndex .. ")"; - InitCommand=cmd(shadowlength,1; - diffuse,StageToColor(curStage); - diffusetopedge,ColorLightTone(StageToColor(curStage)); - -- shadowcolor,ColorDarkTone(StageToColor(curStage)); - ); - }; -}; -return t \ No newline at end of file diff --git a/Themes/new/Graphics/StepsDisplayListRow frame.lua b/Themes/new/Graphics/StepsDisplayListRow frame.lua deleted file mode 100644 index 870c71931a..0000000000 --- a/Themes/new/Graphics/StepsDisplayListRow frame.lua +++ /dev/null @@ -1 +0,0 @@ -return Def.Quad {}; \ No newline at end of file diff --git a/Themes/new/Graphics/_primitive Triangle.png b/Themes/new/Graphics/_primitive Triangle.png deleted file mode 100644 index 9c4f6afcec..0000000000 Binary files a/Themes/new/Graphics/_primitive Triangle.png and /dev/null differ diff --git a/Themes/new/Graphics/_textures/leather-c.jpg b/Themes/new/Graphics/_textures/leather-c.jpg deleted file mode 100644 index 09e6d31622..0000000000 Binary files a/Themes/new/Graphics/_textures/leather-c.jpg and /dev/null differ diff --git a/Themes/new/Graphics/_textures/leather-g.jpg b/Themes/new/Graphics/_textures/leather-g.jpg deleted file mode 100644 index 73661aa3d0..0000000000 Binary files a/Themes/new/Graphics/_textures/leather-g.jpg and /dev/null differ diff --git a/Themes/new/Graphics/_textures/leather-sg.jpg b/Themes/new/Graphics/_textures/leather-sg.jpg deleted file mode 100644 index 69bfc1ccda..0000000000 Binary files a/Themes/new/Graphics/_textures/leather-sg.jpg and /dev/null differ diff --git a/Themes/new/Graphics/_textures/paper.png b/Themes/new/Graphics/_textures/paper.png deleted file mode 100644 index dd9436f2b6..0000000000 Binary files a/Themes/new/Graphics/_textures/paper.png and /dev/null differ diff --git a/Themes/new/Languages/en.ini b/Themes/new/Languages/en.ini deleted file mode 100644 index 130b71950f..0000000000 --- a/Themes/new/Languages/en.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ScreenWithMenuElements] -HeaderText=MODE SELECT -HeaderSubText= \ No newline at end of file diff --git a/Themes/new/Scripts/02 Colors.lua b/Themes/new/Scripts/02 Colors.lua deleted file mode 100644 index ae6d1c84d9..0000000000 --- a/Themes/new/Scripts/02 Colors.lua +++ /dev/null @@ -1,9 +0,0 @@ -ThemeColor = { - Primary = color("#ffcb05"); - Secondary = color("#353f38"); - Background = color("#000000"); -} - -ThemeElementColor = { - -} \ No newline at end of file diff --git a/Themes/new/Scripts/02 TextBanner.lua b/Themes/new/Scripts/02 TextBanner.lua deleted file mode 100644 index 41b5c4b9b5..0000000000 --- a/Themes/new/Scripts/02 TextBanner.lua +++ /dev/null @@ -1,40 +0,0 @@ -local TitleMaxWidth = 228; -- zoom w/subtitle is 0.75 (multiply by 1.25) -local SubtitleMaxWidth = 420; -- zoom is 0.6 (multiply zoom,1 value by 1.4) -local ArtistMaxWidth = 300/0.8; - ---[[ --- The old (cmd(blah))(Actor) syntax is hard to read. --- This is longer, but much easier to read. - Colby ---]] -function TextBannerAfterSet(self,param) - local Title = self:GetChild("Title") - local Subtitle = self:GetChild("Subtitle") - local Artist = self:GetChild("Artist") - - if Subtitle:GetText() == "" then - Title:maxwidth(TitleMaxWidth) - Title:y(-11) - Title:zoom(1) - - -- hide so that the game skips drawing. - Subtitle:visible(false) - - Artist:zoom(0.75) - Artist:maxwidth(ArtistMaxWidth) - Artist:y(8) - else - Title:maxwidth(TitleMaxWidth*1.25) - Title:y(-14) - Title:zoom(0.875) - - -- subtitle below title - Subtitle:visible(true) - Subtitle:zoom(0.625) - Subtitle:y(0) - Subtitle:maxwidth(SubtitleMaxWidth) - - Artist:zoom(0.6) - Artist:maxwidth(ArtistMaxWidth) - Artist:y(12) - end -end diff --git a/Themes/new/Sounds/-old/ScreenWithMenuElements music (loop).mp3 b/Themes/new/Sounds/-old/ScreenWithMenuElements music (loop).mp3 deleted file mode 100644 index 0478ea9c2c..0000000000 Binary files a/Themes/new/Sounds/-old/ScreenWithMenuElements music (loop).mp3 and /dev/null differ diff --git a/Themes/new/Sounds/-old/ScreenWithMenuElements music (loop).ogg b/Themes/new/Sounds/-old/ScreenWithMenuElements music (loop).ogg deleted file mode 100644 index 821e46bd90..0000000000 Binary files a/Themes/new/Sounds/-old/ScreenWithMenuElements music (loop).ogg and /dev/null differ diff --git a/Themes/new/Sounds/0 ScreenWithMenuElements music (loop).ogg b/Themes/new/Sounds/0 ScreenWithMenuElements music (loop).ogg deleted file mode 100644 index 45bcd9f179..0000000000 Binary files a/Themes/new/Sounds/0 ScreenWithMenuElements music (loop).ogg and /dev/null differ diff --git a/Themes/new/Sounds/ScreenGameplay music.redir b/Themes/new/Sounds/ScreenGameplay music.redir deleted file mode 100644 index 1f8565ca21..0000000000 --- a/Themes/new/Sounds/ScreenGameplay music.redir +++ /dev/null @@ -1 +0,0 @@ -_silent \ No newline at end of file diff --git a/Themes/new/Sounds/ScreenGameplayNormal music.redir b/Themes/new/Sounds/ScreenGameplayNormal music.redir deleted file mode 100644 index 1f8565ca21..0000000000 --- a/Themes/new/Sounds/ScreenGameplayNormal music.redir +++ /dev/null @@ -1 +0,0 @@ -_silent \ No newline at end of file diff --git a/Themes/new/Sounds/ScreenOptionsService music.redir b/Themes/new/Sounds/ScreenOptionsService music.redir deleted file mode 100644 index 1f8565ca21..0000000000 --- a/Themes/new/Sounds/ScreenOptionsService music.redir +++ /dev/null @@ -1 +0,0 @@ -_silent \ No newline at end of file diff --git a/Themes/new/Sounds/ScreenOptionsServiceChild music.redir b/Themes/new/Sounds/ScreenOptionsServiceChild music.redir deleted file mode 100644 index 1f8565ca21..0000000000 --- a/Themes/new/Sounds/ScreenOptionsServiceChild music.redir +++ /dev/null @@ -1 +0,0 @@ -_silent \ No newline at end of file diff --git a/Themes/new/Sounds/ScreenWithMenuElements music (loop).ogg b/Themes/new/Sounds/ScreenWithMenuElements music (loop).ogg deleted file mode 100644 index b119d02958..0000000000 Binary files a/Themes/new/Sounds/ScreenWithMenuElements music (loop).ogg and /dev/null differ diff --git a/Themes/new/_Resources/Logo.psd b/Themes/new/_Resources/Logo.psd deleted file mode 100644 index a526c42177..0000000000 Binary files a/Themes/new/_Resources/Logo.psd and /dev/null differ diff --git a/Themes/new/_Resources/ScreenSelectMusic MusicWheelItems .psd b/Themes/new/_Resources/ScreenSelectMusic MusicWheelItems .psd deleted file mode 100644 index 2b3aed5866..0000000000 Binary files a/Themes/new/_Resources/ScreenSelectMusic MusicWheelItems .psd and /dev/null differ diff --git a/Themes/new/_Resources/StepsDisplay Frame.psd b/Themes/new/_Resources/StepsDisplay Frame.psd deleted file mode 100644 index d2b454539a..0000000000 Binary files a/Themes/new/_Resources/StepsDisplay Frame.psd and /dev/null differ diff --git a/Themes/new/_Resources/StepsDisplay Ticks.psd b/Themes/new/_Resources/StepsDisplay Ticks.psd deleted file mode 100644 index fa13eefeee..0000000000 Binary files a/Themes/new/_Resources/StepsDisplay Ticks.psd and /dev/null differ diff --git a/Themes/new/_Resources/_bulb.psd b/Themes/new/_Resources/_bulb.psd deleted file mode 100644 index be8f19f273..0000000000 Binary files a/Themes/new/_Resources/_bulb.psd and /dev/null differ diff --git a/Themes/new/_Resources/_frame files 3x3.psd b/Themes/new/_Resources/_frame files 3x3.psd deleted file mode 100644 index 32cfc075b5..0000000000 Binary files a/Themes/new/_Resources/_frame files 3x3.psd and /dev/null differ diff --git a/Themes/new/_Resources/_wave .psd b/Themes/new/_Resources/_wave .psd deleted file mode 100644 index ad2339ceea..0000000000 Binary files a/Themes/new/_Resources/_wave .psd and /dev/null differ diff --git a/Themes/new/_Resources/pallete.psd b/Themes/new/_Resources/pallete.psd deleted file mode 100644 index c6cb72c68d..0000000000 Binary files a/Themes/new/_Resources/pallete.psd and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-03.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-03.png deleted file mode 100644 index 3c3403b108..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-03.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-04.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-04.png deleted file mode 100644 index 50b4281d77..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-04.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-05.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-05.png deleted file mode 100644 index 5687273661..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-05.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-06.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-06.png deleted file mode 100644 index 2119b24d90..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-06.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-07.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-07.png deleted file mode 100644 index 03629cea38..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-07.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-08.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-08.png deleted file mode 100644 index d5718a2c6b..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-08.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-09.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-09.png deleted file mode 100644 index 1bd9346dc2..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-09.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-10.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-10.png deleted file mode 100644 index 0f30ef2a8d..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-10.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-11.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-11.png deleted file mode 100644 index 090c7e329c..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-11.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-12.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-12.png deleted file mode 100644 index 17132d4093..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-12.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-13.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-13.png deleted file mode 100644 index 5112c5b469..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-13.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-14.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-14.png deleted file mode 100644 index bd664db910..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-14.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-15.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-15.png deleted file mode 100644 index 64ccaf6134..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-15.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-16.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-16.png deleted file mode 100644 index 07be18d652..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-16.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-17.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-17.png deleted file mode 100644 index 2f5bf875c8..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-17.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-18.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-18.png deleted file mode 100644 index e14c8153a8..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-18.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-19.png b/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-19.png deleted file mode 100644 index c3bc32b60d..0000000000 Binary files a/Themes/new/_Resources/screen/SMMAX20 screens project ver1_1-19.png and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00014.bmp b/Themes/new/_Resources/screen/screen00014.bmp deleted file mode 100644 index 6deeb3782b..0000000000 Binary files a/Themes/new/_Resources/screen/screen00014.bmp and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00015.jpg b/Themes/new/_Resources/screen/screen00015.jpg deleted file mode 100644 index ba1c0fa550..0000000000 Binary files a/Themes/new/_Resources/screen/screen00015.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00016.jpg b/Themes/new/_Resources/screen/screen00016.jpg deleted file mode 100644 index fd6dd59ee6..0000000000 Binary files a/Themes/new/_Resources/screen/screen00016.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00017.jpg b/Themes/new/_Resources/screen/screen00017.jpg deleted file mode 100644 index 0a35defaf5..0000000000 Binary files a/Themes/new/_Resources/screen/screen00017.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00018.jpg b/Themes/new/_Resources/screen/screen00018.jpg deleted file mode 100644 index fdc151c74a..0000000000 Binary files a/Themes/new/_Resources/screen/screen00018.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00019.jpg b/Themes/new/_Resources/screen/screen00019.jpg deleted file mode 100644 index 00a51b0dd6..0000000000 Binary files a/Themes/new/_Resources/screen/screen00019.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00020.bmp b/Themes/new/_Resources/screen/screen00020.bmp deleted file mode 100644 index 41023e2103..0000000000 Binary files a/Themes/new/_Resources/screen/screen00020.bmp and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00021.jpg b/Themes/new/_Resources/screen/screen00021.jpg deleted file mode 100644 index a5b0e2c02b..0000000000 Binary files a/Themes/new/_Resources/screen/screen00021.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00022.jpg b/Themes/new/_Resources/screen/screen00022.jpg deleted file mode 100644 index 08ade76894..0000000000 Binary files a/Themes/new/_Resources/screen/screen00022.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00023.jpg b/Themes/new/_Resources/screen/screen00023.jpg deleted file mode 100644 index 6a1233a452..0000000000 Binary files a/Themes/new/_Resources/screen/screen00023.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00024.jpg b/Themes/new/_Resources/screen/screen00024.jpg deleted file mode 100644 index f5c165e2e6..0000000000 Binary files a/Themes/new/_Resources/screen/screen00024.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00025.jpg b/Themes/new/_Resources/screen/screen00025.jpg deleted file mode 100644 index 26e0be4014..0000000000 Binary files a/Themes/new/_Resources/screen/screen00025.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00026.jpg b/Themes/new/_Resources/screen/screen00026.jpg deleted file mode 100644 index 4fed4a3b0f..0000000000 Binary files a/Themes/new/_Resources/screen/screen00026.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00027.jpg b/Themes/new/_Resources/screen/screen00027.jpg deleted file mode 100644 index b39a5fc667..0000000000 Binary files a/Themes/new/_Resources/screen/screen00027.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00028.jpg b/Themes/new/_Resources/screen/screen00028.jpg deleted file mode 100644 index 619fe4af2b..0000000000 Binary files a/Themes/new/_Resources/screen/screen00028.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00029.jpg b/Themes/new/_Resources/screen/screen00029.jpg deleted file mode 100644 index 05a57ac583..0000000000 Binary files a/Themes/new/_Resources/screen/screen00029.jpg and /dev/null differ diff --git a/Themes/new/_Resources/screen/screen00030.jpg b/Themes/new/_Resources/screen/screen00030.jpg deleted file mode 100644 index e44dba7338..0000000000 Binary files a/Themes/new/_Resources/screen/screen00030.jpg and /dev/null differ