diff --git a/Themes/_fallback/BGAnimations/ScreenGameplay background.lua b/Themes/_fallback/BGAnimations/ScreenGameplay background.lua new file mode 100644 index 0000000000..989e15f73d --- /dev/null +++ b/Themes/_fallback/BGAnimations/ScreenGameplay background.lua @@ -0,0 +1 @@ +return Def.ActorFrame { Name="YOU_WISH_YOU_WERE_PLAYING_BEATMANIA_RIGHT_NOW" }; \ No newline at end of file diff --git a/Themes/_fallback/BGAnimations/ScreenGameplay background.redir b/Themes/_fallback/BGAnimations/ScreenGameplay background.redir deleted file mode 100644 index 04b2ead777..0000000000 --- a/Themes/_fallback/BGAnimations/ScreenGameplay background.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/default.lua b/Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/default.lua index 994e3caf01..66e7d7daa7 100644 --- a/Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/default.lua +++ b/Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/default.lua @@ -46,26 +46,30 @@ function MakeScoreList(StagesAgo) OffCommand=cmd(linear,0.3;addx,150;diffusealpha,0); }; - LoadFont( "_regra bold 30px" ) .. { + LoadFont( "Common Normal" ) .. { +-- LoadFont( "_regra bold 30px" ) .. { Name="PlayerScoreP1"; InitCommand=cmd(x,-135;diffuse,color("#fdf991");shadowlength,0;zoom,0.6); OnCommand=cmd(x,-135;addx,50;zoom,0;diffusealpha,0;sleep,0.1;accelerate,0.3;addx,-50;diffusealpha,1;zoom,0.6); OffCommand=cmd(linear,0.3;diffusealpha,0); }; - LoadFont( "_regra bold 30px" ) .. { + LoadFont( "Common Normal" ) .. { +-- LoadFont( "_regra bold 30px" ) .. { Name="PlayerScoreP2"; InitCommand=cmd(x,135;diffuse,color("#abfe8e");shadowlength,0;zoom,0.6); OnCommand=cmd(x,135;addx,-50;zoom,0;diffusealpha,0;sleep,0.1;accelerate,0.3;addx,50;diffusealpha,1;zoom,0.6); OffCommand=cmd(linear,0.3;diffusealpha,0); }; - LoadFont( "_regra bold 30px" ) .. { + LoadFont( "Common Normal" ) .. { +-- LoadFont( "_regra bold 30px" ) .. { Name="MachineBestP1"; InitCommand=cmd(diffuse,color("#ffffff");shadowlength,0;zoom,0.5); OnCommand=cmd(x,-250;addx,-250;diffusealpha,1;decelerate,0.3;addx,250); OffCommand=cmd(linear,0.3;addx,-150;diffusealpha,0); }; - LoadFont( "_regra bold 30px" ) .. { + LoadFont( "Common Normal" ) .. { +-- LoadFont( "_regra bold 30px" ) .. { Name="MachineBestP2"; InitCommand=cmd(diffuse,color("#ffffff");shadowlength,0;zoom,0.5); OnCommand=cmd(x,250;addx,250;diffusealpha,1;decelerate,0.3;addx,-250); @@ -130,7 +134,7 @@ function MakeScoreList(StagesAgo) if visible then assert(CurrentPart[pn]); - c.Difficulty[pn]:SetDifficultyAndStepsTypeFrame( CurrentPart[pn] ); +-- c.Difficulty[pn]:SetDifficultyAndStepsTypeFrame( CurrentPart[pn] ); local hsl = MachineProfile:GetHighScoreList( Current, CurrentPart[pn] ); assert( hsl ); @@ -198,8 +202,8 @@ for i = 1,5 do }; end -children[#children+1] = - LoadActor( THEME:GetPathB("","_shared underlay") ) .. { OnCommand=cmd(); }; +--[[ children[#children+1] = + LoadActor( THEME:GetPathB("","_shared underlay") ) .. { OnCommand=cmd(); }; --]] children[#children+1] = LoadActor( "keyboard" ) .. { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+80); @@ -217,7 +221,8 @@ for pn in ivalues(PlayerNumber) do OffCommand=cmd(stoptweening;bouncebegin,0.3;zoom,0;addx,-200*P1); }; - children[#children+1] = LoadFont( "_regra bold 30px" ) .. { + children[#children+1] = LoadFont( "Common Normal" ) .. { +-- children[#children+1] = LoadFont( "_regra bold 30px" ) .. { Name="PlayerText"; InitCommand=cmd(x,pn == PLAYER_1 and (SCREEN_CENTER_X-WideScale(310,330)) or (SCREEN_CENTER_X+WideScale(198,204)); halign,0; diff --git a/Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/keyboard.lua b/Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/keyboard.lua index 052c378720..08852dbaba 100644 --- a/Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/keyboard.lua +++ b/Themes/_fallback/BGAnimations/ScreenNameEntryTraditional underlay/keyboard.lua @@ -19,7 +19,8 @@ end local MapNameToLetter = {}; local MapLetterToName = {}; -local letter = LoadFont( "_regra bold 30px" ) .. { +local letter = LoadFont( "Common Normal" ) .. { +-- local letter = LoadFont( "_regra bold 30px" ) .. { InitCommand=cmd(zoom,0.8;shadowlength,0); PulseCommand = function(self) self:finishtweening(); @@ -37,13 +38,18 @@ for l in ivalues(Letters) do Text = l; }; if l == "BACK" or l == "ENTER" then - children[#children].File = THEME:GetPathF("", "_venacti 26px normal"); + children[#children].File = THEME:GetPathF("", "Common Normal"); +-- children[#children].File = THEME:GetPathF("", "_venacti 26px normal"); end; end; -children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "type key") ) .. { Name = "Type"; SupportPan = true; } +--[[ children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "type key") ) .. { Name = "Type"; SupportPan = true; } children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "back") ) .. { Name = "Back"; SupportPan = true; } children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "enter") ) .. { Name = "Enter"; SupportPan = true; } -children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "move cursor") ) .. { Name = "Move"; SupportPan = true; } +children[#children+1] = LoadActor( THEME:GetPathS(Var "LoadingScreen", "move cursor") ) .. { Name = "Move"; SupportPan = true; } --]] +children[#children+1] = LoadActor( THEME:GetPathS("Common", "value") ) .. { Name = "Type"; SupportPan = true; } +children[#children+1] = LoadActor( THEME:GetPathS("Common", "cancel") ) .. { Name = "Back"; SupportPan = true; } +children[#children+1] = LoadActor( THEME:GetPathS("Common", "start") ).. { Name = "Enter"; SupportPan = true; } +children[#children+1] = LoadActor( THEME:GetPathS("MusicWheel", "change") ) .. { Name = "Move"; SupportPan = true; } local CursorFiles = { [PLAYER_1] = "Cursor P1", diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua index 9cfe09c54c..4e4a852f60 100644 --- a/Themes/_fallback/Scripts/02 Colors.lua +++ b/Themes/_fallback/Scripts/02 Colors.lua @@ -6,6 +6,7 @@ Color = { -- These colors are pure swatch colors and are here purely to be used -- on demand without having to type color("stuff") or dig through -- a palette to get the color you want. + __call(_color) = function(self, _color) return self[_color] end, Black = color("0,0,0,1"), White = color("1,1,1,1"), Red = color("#ed1c24"), @@ -31,7 +32,7 @@ Color = { end } -- Remapped Color Module, since some themes are crazy -Colors = Color; +-- Colors = Color; GameColor = { PlayerColors = { @@ -95,9 +96,9 @@ GameColor.Difficulty["Nightmare"] = GameColor.Difficulty["Challenge"]; GameColor.Difficulty["HalfDouble"] = GameColor.Difficulty["Medium"]; --[[ Fallbacks ]] -function Color(c) - return Colors[c] -end +function Color( in_c ) + return __call(in_c) +end --]] function BoostColor( cColor, fBoost ) local c = cColor diff --git a/Themes/default-dev-midi/metrics.ini b/Themes/default-dev-midi/metrics.ini index 72b1cbe014..2f0e2571a5 100644 --- a/Themes/default-dev-midi/metrics.ini +++ b/Themes/default-dev-midi/metrics.ini @@ -1,5 +1,8 @@ [Global] FallbackTheme=default +[ScreenTitleMenu] +ChoiceNames="1,4,5,6,PopScreen,7" +ChoicePopScreen="name,Boobs;text,Boobs"; [ScreenGameplay] # LifeP1OnCommand=visible,false -# LifeP2OnCommand=visible,false \ No newline at end of file +# LifeP2OnCommand=visible,false diff --git a/Themes/default/BGAnimations/ScreenCredits background/default.lua b/Themes/default/BGAnimations/ScreenCredits background/default.lua index 47e9237339..8cd4a8ea35 100644 --- a/Themes/default/BGAnimations/ScreenCredits background/default.lua +++ b/Themes/default/BGAnimations/ScreenCredits background/default.lua @@ -13,7 +13,7 @@ local t = Def.ActorFrame { LoadActor("_grid")..{ InitCommand=cmd(customtexturerect,0,0,(SCREEN_WIDTH+1)/4,SCREEN_HEIGHT/4;SetTextureFiltering,true); OnCommand=cmd(zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT;diffuse,Color("Black");diffuseshift;effecttiming,(1/8)*4,0,(7/8)*4,0;effectclock,'beatnooffset'; - effectcolor2,Color("Black");effectcolor1,Colors.Alpha(Color("Black"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;diffusealpha,0.345); + effectcolor2,Color("Black");effectcolor1,Color.Alpha(Color("Black"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;diffusealpha,0.345); }; }; diff --git a/Themes/default/BGAnimations/ScreenGameplay background.lua b/Themes/default/BGAnimations/ScreenGameplay background.lua new file mode 100644 index 0000000000..989e15f73d --- /dev/null +++ b/Themes/default/BGAnimations/ScreenGameplay background.lua @@ -0,0 +1 @@ +return Def.ActorFrame { Name="YOU_WISH_YOU_WERE_PLAYING_BEATMANIA_RIGHT_NOW" }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenGameplay next course song/default.lua b/Themes/default/BGAnimations/ScreenGameplay next course song/default.lua index de7cf0b949..732b6a912d 100644 --- a/Themes/default/BGAnimations/ScreenGameplay next course song/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay next course song/default.lua @@ -7,7 +7,7 @@ t[#t+1] = Def.Sprite { BeforeLoadingNextCourseSongMessageCommand=function(self) self:LoadFromSongBackground( SCREENMAN:GetTopScreen():GetNextCourseSong() ) end; ChangeCourseSongInMessageCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT); StartCommand=cmd(diffusealpha,0;decelerate,0.5;diffusealpha,1;); - FinishCommand=cmd(linear,0.1;glow,Colors.Alpha(Color("White"),0.5);decelerate,0.4;glow,Color("Invisible");diffusealpha,0); + FinishCommand=cmd(linear,0.1;glow,Color.Alpha(Color("White"),0.5);decelerate,0.4;glow,Color("Invisible");diffusealpha,0); }; t[#t+1] = Def.ActorFrame { diff --git a/Themes/default/BGAnimations/ScreenPlayerOptions background.lua b/Themes/default/BGAnimations/ScreenPlayerOptions background.lua index e7cafc1283..f06580a070 100644 --- a/Themes/default/BGAnimations/ScreenPlayerOptions background.lua +++ b/Themes/default/BGAnimations/ScreenPlayerOptions background.lua @@ -24,7 +24,7 @@ t[#t+1] = Def.ActorFrame { --[[ LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_grid")).. { InitCommand=cmd(customtexturerect,0,0,(SCREEN_WIDTH+1)/4,SCREEN_HEIGHT/4;SetTextureFiltering,true); OnCommand=cmd(zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT;diffuse,Color("Black");diffuseshift;effecttiming,(1/8)*4,0,(7/8)*4,0;effectclock,'beatnooffset'; - effectcolor2,Color("Black");effectcolor1,Colors.Alpha(Color("Black"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;diffusealpha,0.345); + effectcolor2,Color("Black");effectcolor1,Color.Alpha(Color("Black"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;diffusealpha,0.345); }; --]] LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_bg top")) .. { InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT); diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua index 2a5ef20e90..73c5519edb 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua @@ -33,7 +33,7 @@ t[#t+1] = Def.ActorFrame { --[[ LoadActor("_grid") .. { InitCommand=cmd(customtexturerect,0,0,(SCREEN_WIDTH+1)/4,SCREEN_HEIGHT/4;SetTextureFiltering,true); OnCommand=cmd(zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT;diffuse,Color("Orange");diffuseshift;effecttiming,(1/8)*2,0,(7/8)*2,0;effectclock,'beatnooffset'; - effectcolor2,Color("Orange");effectcolor1,Colors.Alpha(Color("Orange"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480); + effectcolor2,Color("Orange");effectcolor1,Color.Alpha(Color("Orange"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480); }; --]] LoadActor("_bg top") .. { InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT); diff --git a/Themes/default/Graphics/Player toasty/default.lua b/Themes/default/Graphics/Player toasty/default.lua index bbc4c72c04..206e223510 100644 --- a/Themes/default/Graphics/Player toasty/default.lua +++ b/Themes/default/Graphics/Player toasty/default.lua @@ -13,7 +13,7 @@ return Def.ActorFrame { InitCommand=cmd(zoomto,fWidth,SCREEN_HEIGHT;diffuse,PlayerColor(Player);diffusealpha,0;fadeleft,32/(256+16);faderight,32/(256+16)); ToastyAchievedMessageCommand=function(self,params) if params.PlayerNumber == Player then - (cmd(stoptweening;linear,2.125;diffuse,Colors.Alpha( PlayerColor(Player), 0.345 );glow,color("1,1,1,0.5");decelerate,3;glow,Colors.Alpha( ColorDarkTone( PlayerColor(Player) ), 0 );diffuseramp; + (cmd(stoptweening;linear,2.125;diffuse,Color.Alpha( PlayerColor(Player), 0.345 );glow,color("1,1,1,0.5");decelerate,3;glow,Color.Alpha( ColorDarkTone( PlayerColor(Player) ), 0 );diffuseramp; effectcolor1,ColorLightTone( PlayerColor(Player) );effectcolor2,PlayerColor(Player); effectclock,'beat';effectperiod,2; ))(self); @@ -23,7 +23,7 @@ return Def.ActorFrame { ToastyDroppedMessageCommand=function(self,params) if params.PlayerNumber == Player then if HasToasty then - (cmd(finishtweening;stopeffect;glow,color("1,1,1,0.5");decelerate,0.35;diffuse,Colors.Alpha( Color("Black"), 0.25 );glow,color("1,1,1,0");linear,0.35*0.25;diffusealpha,0))(self); + (cmd(finishtweening;stopeffect;glow,color("1,1,1,0.5");decelerate,0.35;diffuse,Color.Alpha( Color("Black"), 0.25 );glow,color("1,1,1,0");linear,0.35*0.25;diffusealpha,0))(self); HasToasty = false; else return diff --git a/Themes/default/Graphics/ScreenGameplay StageDisplay.lua b/Themes/default/Graphics/ScreenGameplay StageDisplay.lua index a20a1c542f..81761ccc77 100644 --- a/Themes/default/Graphics/ScreenGameplay StageDisplay.lua +++ b/Themes/default/Graphics/ScreenGameplay StageDisplay.lua @@ -13,6 +13,7 @@ end for s in ivalues(Stage) do stages[#stages+1] = MakeBitmapTest() .. { + InitCommand=cmd(shadowlength,2); SetCommand=function(self, params) local Stage = GAMESTATE:GetCurrentStage(); local StageIndex = GAMESTATE:GetCurrentStageIndex(); diff --git a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua index 0437d83b4d..1be2c9961f 100644 --- a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua +++ b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua @@ -2,7 +2,7 @@ return Def.ActorFrame { --[[ LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. { OnCommand=function(self) if GetTimingDifficulty() == 7 then - (cmd(glowshift;diffuse,Color("Yellow");diffuserightedge,Color("Red");effectcolor1,Colors.Alpha( Color("Red"), 0.5 );effectcolor2,Color("Invisible");effectperiod,1.25/2))(self); + (cmd(glowshift;diffuse,Color("Yellow");diffuserightedge,Color("Red");effectcolor1,Color.Alpha( Color("Red"), 0.5 );effectcolor2,Color("Invisible");effectperiod,1.25/2))(self); elseif GetTimingDifficulty() < 4 then (cmd(diffuseshift;effectcolor1,Color("Blue");effectcolor2,ColorDarkTone(Color("Blue"));effectperiod,1.25))(self); elseif GetTimingDifficulty() > 4 and GetTimingDifficulty < 6 then diff --git a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua index abc1409fa6..9853636553 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua @@ -69,7 +69,7 @@ else self:settextf( "Stage %03i", RealStage); self:diffuse( StageToColor('Stage_1st') ); self:diffusebottomedge( ColorMidTone(StageToColor('Stage_1st')) ); - self:strokecolor( Colors.Alpha( ColorDarkTone(StageToColor('Stage_1st')), 0.75) ); + self:strokecolor( Color.Alpha( ColorDarkTone(StageToColor('Stage_1st')), 0.75) ); end; end; } diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 5b83cf0ef7..11e368b4e4 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -110,7 +110,7 @@ ItemsSpacingY=24 NumShownItems=8 [FadingBanner] -BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Colors.Alpha( Color("White"), 0.45 );decelerate,0.175;diffusealpha,0;glow,Color("Invisible"); +BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Color.Alpha( Color("White"), 0.45 );decelerate,0.175;diffusealpha,0;glow,Color("Invisible"); [Gameplay] @@ -422,7 +422,7 @@ end; ShowAutogen=true AutogenX=0 AutogenY=0 -#AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); +#AutogenOnCommand=diffuseshift;effectcolor1,Color.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088"); # ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle") @@ -479,6 +479,7 @@ Fallback="StepsDisplay" # end; PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ local fItemWidth = ( 256 / numItems ) \ + self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \ self:zoomtowidth(fItemWidth); \ end; # PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ @@ -489,8 +490,8 @@ end; # self:effecttiming(1,0.01875*itemIndex,1,1-(0.01875*itemIndex)); \ # self:effectclock('beatnooffset'); \ # end; -TextureCoordScaleX=1 -NumPills=1 +TextureCoordScaleX=256/16 +NumPills=16 [TextBanner] TitleOnCommand=horizalign,left;shadowlength,1; @@ -1333,10 +1334,10 @@ BPMDisplayY=SCREEN_BOTTOM-16 BPMDisplayOnCommand=draworder,101 BPMDisplayOffCommand=bounceend,0.25;zoom,0 # -ShowStageDisplay=false +ShowStageDisplay=true StageDisplayX=SCREEN_CENTER_X StageDisplayY=SCREEN_TOP+24 -StageDisplayOnCommand=zoom,0.5; +StageDisplayOnCommand=zoom,0.675; StageDisplayOffCommand=bounceend,0.25;zoom,0 # ShowScoreFrame=GetUserPrefB("GameplayFooter");