From baa7f6d1f192e68f569904eba74f5300df702de0 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 3 Apr 2009 16:22:22 +0000 Subject: [PATCH] theme cleanup --- .../ScreenSelectMusic decorations/default.lua | 2 +- .../default/BGAnimations/_shared edit courses.lua | 4 ++-- .../default/Fonts/MusicWheelItem course.redir | 2 +- .../default/Fonts/ScreenGameplay SongNum.redir | 1 + .../default/Fonts/ScreenGameplay song num.redir | 1 - .../default/Fonts/ScreenNameEntry Letters.redir | 1 + .../Fonts/ScreenSelectGroup num songs.redir | 2 -- stepmania/Themes/default/Languages/en.ini | 15 ++++++++------- .../default/Sounds/ScreenNameEntry music.redir | 1 - stepmania/Themes/default/metrics.ini | 8 ++++---- 10 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 stepmania/Themes/default/Fonts/ScreenGameplay SongNum.redir delete mode 100644 stepmania/Themes/default/Fonts/ScreenGameplay song num.redir create mode 100644 stepmania/Themes/default/Fonts/ScreenNameEntry Letters.redir delete mode 100644 stepmania/Themes/default/Fonts/ScreenSelectGroup num songs.redir delete mode 100644 stepmania/Themes/default/Sounds/ScreenNameEntry music.redir diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index efd7ac83d7..38607949fc 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -246,7 +246,7 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = Def.CourseContentsList { MaxSongs = 5; - InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+91); + InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+91); OnCommand=cmd(zoomy,0;bounceend,0.3;zoom,1); OffCommand=cmd(zoomy,1;bouncebegin,0.3;zoomy,0); ShowCommand=cmd(bouncebegin,0.3;zoomy,1); diff --git a/stepmania/Themes/default/BGAnimations/_shared edit courses.lua b/stepmania/Themes/default/BGAnimations/_shared edit courses.lua index d86b1c87ef..b0c6864386 100644 --- a/stepmania/Themes/default/BGAnimations/_shared edit courses.lua +++ b/stepmania/Themes/default/BGAnimations/_shared edit courses.lua @@ -3,7 +3,7 @@ local frame = Def.ActorFrame OnCommand=cmd(x,SCREEN_CENTER_X+180;y,SCREEN_CENTER_Y);--;addx,SCREEN_WIDTH/2;decelerate,0.5;addx,-SCREEN_WIDTH/2); OffCommand=cmd(accelerate,0.5;addx,SCREEN_WIDTH/2); LoadFont("Common", "normal") .. { - OnCommand=cmd(horizalign,left;x,-80;y,-130;zoom,0.65;playcommand,"CurrentCourseChanged"); + OnCommand=cmd(horizalign,left;x,-80;y,-130;playcommand,"CurrentCourseChanged"); CurrentCourseChangedMessageCommand=function(self) local c = GAMESTATE:GetCurrentCourse() if c then @@ -14,7 +14,7 @@ local frame = Def.ActorFrame end; }; LoadFont("Common", "normal") .. { - OnCommand=cmd(horizalign,left;x,-80;y,-100;zoom,0.65;playcommand,"CurrentTrailP1Changed"); + OnCommand=cmd(horizalign,left;x,-80;y,-100;playcommand,"CurrentTrailP1Changed"); CurrentTrailP1ChangedMessageCommand=function(self) local t = GAMESTATE:GetCurrentTrail( PLAYER_1 ) if t then diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem course.redir b/stepmania/Themes/default/Fonts/MusicWheelItem course.redir index 6272ef61a7..e3efea95aa 100644 --- a/stepmania/Themes/default/Fonts/MusicWheelItem course.redir +++ b/stepmania/Themes/default/Fonts/MusicWheelItem course.redir @@ -1 +1 @@ -common normal \ No newline at end of file +_terminator two 18px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenGameplay SongNum.redir b/stepmania/Themes/default/Fonts/ScreenGameplay SongNum.redir new file mode 100644 index 0000000000..6272ef61a7 --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenGameplay SongNum.redir @@ -0,0 +1 @@ +common normal \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenGameplay song num.redir b/stepmania/Themes/default/Fonts/ScreenGameplay song num.redir deleted file mode 100644 index bed18ba595..0000000000 --- a/stepmania/Themes/default/Fonts/ScreenGameplay song num.redir +++ /dev/null @@ -1 +0,0 @@ -_numbers3 diff --git a/stepmania/Themes/default/Fonts/ScreenNameEntry Letters.redir b/stepmania/Themes/default/Fonts/ScreenNameEntry Letters.redir new file mode 100644 index 0000000000..66030e897a --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenNameEntry Letters.redir @@ -0,0 +1 @@ +_terminator two 40px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenSelectGroup num songs.redir b/stepmania/Themes/default/Fonts/ScreenSelectGroup num songs.redir deleted file mode 100644 index 46c00393be..0000000000 --- a/stepmania/Themes/default/Fonts/ScreenSelectGroup num songs.redir +++ /dev/null @@ -1,2 +0,0 @@ -_numbers2 - \ No newline at end of file diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index c71d12d9c4..06135bb96b 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1738,13 +1738,14 @@ Lay lift=Lay lift Add to/remove from right half=Add to/remove from right half [Grade] -Tier01=AAAA -Tier02=AAA -Tier03=AA -Tier04=A -Tier05=B -Tier06=C -Tier07=D +Tier01=SSS +Tier02=SS +Tier03=S +Tier04=AA +Tier05=A +Tier06=B +Tier07=C +Tier08=D Failed=E NoData=NO DATA diff --git a/stepmania/Themes/default/Sounds/ScreenNameEntry music.redir b/stepmania/Themes/default/Sounds/ScreenNameEntry music.redir deleted file mode 100644 index a46c8b59a0..0000000000 --- a/stepmania/Themes/default/Sounds/ScreenNameEntry music.redir +++ /dev/null @@ -1 +0,0 @@ -_block diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index d3d611c505..420c24e024 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1600,7 +1600,7 @@ Fallback="Screen" [ScreenSyncOverlay] Class="ScreenSyncOverlay" Fallback="Screen" -SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;zoom,0;decelerate,0.5;zoom,0.6 +SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y; [ScreenStatsOverlay] Class="ScreenStatsOverlay" @@ -1635,7 +1635,7 @@ RouletteY=-2 RouletteOnCommand=maxwidth,400;rainbowscroll,true;strokecolor,color("#00000077");shadowlength,0 CourseX=0 CourseY=-2 -CourseOnCommand=shadowlength,0;maxwidth,400 +CourseOnCommand=maxwidth,208;strokecolor,color("#00000077");shadowlength,0 SortX=0 SortY=-2 SortOnCommand=maxwidth,208;strokecolor,color("#00000077");shadowlength,0 @@ -2134,7 +2134,7 @@ MappedToGainFocusCommand=diffuse,#808080;diffuseshift;effectcolor2,#808080;effec MappedToLoseFocusCommand=diffuse,#808080;stopeffect DevicesX=SCREEN_CENTER_X DevicesY=SCREEN_TOP+30 -DevicesOnCommand=zoom,0.6;diffusealpha,0;linear,0.5;diffusealpha,1 +DevicesOnCommand=diffusealpha,0;linear,0.5;diffusealpha,1 DevicesOffCommand=linear,0.5;diffusealpha,0 [ScreenTest] @@ -2204,7 +2204,7 @@ TitleY=140 TitleOnCommand=zoom,0.8 DataX=0 DataY=SCREEN_CENTER_Y+16 -DataOnCommand=zoom,0.6 +DataOnCommand= [ScreenPackages] Class="ScreenPackages"