diff --git a/stepmania/Themes/default/Fonts/ScoreDisplayNormal Text.redir b/stepmania/Themes/default/Fonts/ScoreDisplayNormal Text.redir index ab225f65b9..818996dbad 100644 --- a/stepmania/Themes/default/Fonts/ScoreDisplayNormal Text.redir +++ b/stepmania/Themes/default/Fonts/ScoreDisplayNormal Text.redir @@ -1 +1 @@ -_terminator two 54 score \ No newline at end of file +_terminator two score 26px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir index ab225f65b9..818996dbad 100644 --- a/stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir +++ b/stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir @@ -1 +1 @@ -_terminator two 54 score \ No newline at end of file +_terminator two score 26px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers-stroke] 4x4.png b/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers-stroke] 4x4.png deleted file mode 100644 index 6fea9c2a1c..0000000000 Binary files a/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers-stroke] 4x4.png and /dev/null differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4.png b/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4.png deleted file mode 100644 index a265515227..0000000000 Binary files a/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4.png and /dev/null differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 54 score.ini b/stepmania/Themes/default/Fonts/_terminator two 54 score.ini deleted file mode 100644 index 1ed93f307e..0000000000 --- a/stepmania/Themes/default/Fonts/_terminator two 54 score.ini +++ /dev/null @@ -1,25 +0,0 @@ -[main] -Baseline=46 -Top=0 -LineSpacing=54 -DrawExtraPixelsLeft=4 -DrawExtraPixelsRight=4 -AdvanceExtraPixels=0 - -[numbers] -0=36 -1=36 -2=36 -3=36 -4=36 -5=36 -6=36 -7=36 -8=36 -9=36 -10=36 -11=36 -12=36 -13=36 -14=36 -15=36 diff --git a/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers-stroke] 4x4 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers-stroke] 4x4 (doubleres).png new file mode 100644 index 0000000000..a09adef8c2 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers-stroke] 4x4 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers] 4x4 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers] 4x4 (doubleres).png new file mode 100644 index 0000000000..0b923bd981 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers] 4x4 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_terminator two score 26px.ini b/stepmania/Themes/default/Fonts/_terminator two score 26px.ini new file mode 100644 index 0000000000..6afab5d7df --- /dev/null +++ b/stepmania/Themes/default/Fonts/_terminator two score 26px.ini @@ -0,0 +1,30 @@ +[common] +Baseline=23 +Top=1 +LineSpacing=26 +DrawExtraPixelsLeft=1 +DrawExtraPixelsRight=0 +AdvanceExtraPixels=0 +AddToAllWidths=2 + +[numbers] +Line 0=0123 +Line 1=4567 +Line 2=89%. +Line 3= :x + +0=17 +1=17 +2=17 +3=17 +4=17 +5=17 +6=17 +7=17 +8=17 +9=17 +10=22 +11=5 +12=18 +13=5 +14=21 diff --git a/stepmania/Themes/default/Graphics/ScreenSongOptions footer.redir b/stepmania/Themes/default/Graphics/ScreenSongOptions footer.redir new file mode 100644 index 0000000000..ef927067c9 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenSongOptions footer.redir @@ -0,0 +1 @@ +_footer shared \ No newline at end of file diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua index 7b6f3e6de1..45e4185415 100644 --- a/stepmania/Themes/default/Scripts/Colors.lua +++ b/stepmania/Themes/default/Scripts/Colors.lua @@ -4,6 +4,12 @@ function PlayerColor( pn ) return color("1,1,1,1") end +function PlayerScoreColor( pn ) + if pn == PLAYER_1 then return color("#ff6d00") end -- orange + if pn == PLAYER_2 then return color("#00ff7e") end -- sea green + return color("1,1,1,1") +end + local DifficultyDisplayTypeColors = { DifficultyDisplayType_Single_Beginner = color("#ff32f8"), DifficultyDisplayType_Single_Easy = color("#2cff00"), diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index ce9f736898..bb49643493 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -898,12 +898,12 @@ ScoreFrameX=SCREEN_CENTER_X ScoreFrameY=SCREEN_BOTTOM ScoreFrameOnCommand=vertalign,bottom;addy,100;linear,0.5;addy,-100;draworder,2 ScoreFrameOffCommand=linear,0.5;addy,100 -ScoreP1X=SCREEN_CENTER_X-220 -ScoreP1Y=SCREEN_CENTER_Y+214 +ScoreP1X=SCREEN_CENTER_X-226 +ScoreP1Y=SCREEN_CENTER_Y+200 ScoreP1OnCommand=addy,100;linear,1;addy,-100;draworder,109; ScoreP1OffCommand=linear,1;addy,100; -ScoreP2X=SCREEN_CENTER_X+220 -ScoreP2Y=SCREEN_CENTER_Y+214 +ScoreP2X=SCREEN_CENTER_X+226 +ScoreP2Y=SCREEN_CENTER_Y+200 ScoreP2OnCommand=addy,100;linear,1;addy,-100;draworder,109; ScoreP2OffCommand=linear,1;addy,100; SecondaryScoreP1X=SCREEN_CENTER_X-20 @@ -4507,7 +4507,7 @@ FrameY=0 TextX=0 TextY=0 TextOnCommand=shadowlength,0; -TextLoadCommand=%function(self,param) self:diffuse(PlayerColor(param.PlayerState:GetPlayerNumber())) end +TextLoadCommand=%function(self,param) self:diffuse(PlayerScoreColor(param.PlayerState:GetPlayerNumber())); end [RollingNumbers] TextFormat="%9.0f"