From 10955b39cd2a7421833ab7de4578f2a8d96bd0d9 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 16 Aug 2008 10:39:09 +0000 Subject: [PATCH] gameplay score cleanup --- .../Fonts/ScoreDisplayNormal Text.redir | 2 +- .../Fonts/ScreenEvaluation ScoreNumber.redir | 2 +- ...ator two 54 score [numbers-stroke] 4x4.png | Bin 10773 -> 0 bytes ..._terminator two 54 score [numbers] 4x4.png | Bin 6376 -> 0 bytes .../Fonts/_terminator two 54 score.ini | 25 --------------- ... 26px [numbers-stroke] 4x4 (doubleres).png | Bin 0 -> 7290 bytes ...o score 26px [numbers] 4x4 (doubleres).png | Bin 0 -> 7568 bytes .../Fonts/_terminator two score 26px.ini | 30 ++++++++++++++++++ .../Graphics/ScreenSongOptions footer.redir | 1 + stepmania/Themes/default/Scripts/Colors.lua | 6 ++++ stepmania/Themes/default/metrics.ini | 10 +++--- 11 files changed, 44 insertions(+), 32 deletions(-) delete mode 100644 stepmania/Themes/default/Fonts/_terminator two 54 score [numbers-stroke] 4x4.png delete mode 100644 stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4.png delete mode 100644 stepmania/Themes/default/Fonts/_terminator two 54 score.ini create mode 100644 stepmania/Themes/default/Fonts/_terminator two score 26px [numbers-stroke] 4x4 (doubleres).png create mode 100644 stepmania/Themes/default/Fonts/_terminator two score 26px [numbers] 4x4 (doubleres).png create mode 100644 stepmania/Themes/default/Fonts/_terminator two score 26px.ini create mode 100644 stepmania/Themes/default/Graphics/ScreenSongOptions footer.redir 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 6fea9c2a1cf2b5208be3596aac43aa9e131677a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10773 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 g(c94$R}Ub-vgxiOHa1WNoo5G>OV 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 a265515227c728be4822d52b671070f5f96edc60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6376 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 B=3xK; literal 0 HcmV?d00001 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"