diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24 [alt] 12x11.png b/stepmania/Themes/default/Fonts/_venacti bold 24 [alt] 12x11.png index 55c6d1b8ce..0012cfc9fa 100755 Binary files a/stepmania/Themes/default/Fonts/_venacti bold 24 [alt] 12x11.png and b/stepmania/Themes/default/Fonts/_venacti bold 24 [alt] 12x11.png differ diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24 [main-stroke] 16x16.png b/stepmania/Themes/default/Fonts/_venacti bold 24 [main-stroke] 16x16.png new file mode 100644 index 0000000000..033105d5bb Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti bold 24 [main-stroke] 16x16.png differ diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24 [main] 16x16.png b/stepmania/Themes/default/Fonts/_venacti bold 24 [main] 16x16.png index 2d108220a1..af1217c342 100755 Binary files a/stepmania/Themes/default/Fonts/_venacti bold 24 [main] 16x16.png and b/stepmania/Themes/default/Fonts/_venacti bold 24 [main] 16x16.png differ diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24.ini b/stepmania/Themes/default/Fonts/_venacti bold 24.ini index b846bd6fa8..e7c5dc1b90 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 24.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 24.ini @@ -5,8 +5,6 @@ LineSpacing=29 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -DefaultStrokeColor=#FFFFFF00 - 0=0 1=0 2=0 @@ -138,7 +136,7 @@ DefaultStrokeColor=#FFFFFF00 128=14 129=0 130=5 -131=19 +131=13 132=10 133=22 134=15 @@ -171,24 +169,24 @@ DefaultStrokeColor=#FFFFFF00 161=7 162=12 163=14 -164=26 +164=13 165=15 166=6 -167=26 +167=13 168=10 169=21 170=10 171=13 -172=37 -173=37 +172=16 +173=9 174=16 -175=37 +175=13 176=12 -177=37 +177=16 178=10 179=9 180=8 -181=35 +181=13 182=16 183=7 184=8 @@ -297,101 +295,101 @@ DefaultStrokeColor=#FFFFFF00 30=0 31=0 32=16 -33=19 -34=19 +33=14 +34=13 35=14 -36=26 -37=19 -38=19 -39=26 +36=13 +37=11 +38=14 +39=13 40=10 41=15 -42=19 -43=19 -44=19 -45=37 +42=14 +43=12 +44=14 +45=9 46=15 -47=19 +47=14 48=12 -49=19 -50=19 +49=12 +50=13 51=7 52=8 -53=19 -54=19 +53=6 +54=10 55=11 56=8 57=13 -58=19 -59=19 -60=19 -61=19 +58=10 +59=8 +60=11 +61=13 62=13 -63=19 -64=19 +63=11 +64=14 65=15 66=15 -67=19 +67=14 68=15 -69=19 -70=19 +69=11 +70=14 71=15 -72=19 +72=14 73=15 -74=19 +74=13 75=15 -76=19 +76=13 77=6 78=6 -79=19 -80=19 -81=19 -82=19 +79=15 +80=16 +81=15 +82=15 83=16 84=16 -85=19 +85=16 86=16 87=14 -88=19 -89=19 +88=14 +89=15 90=16 -91=19 +91=15 92=16 93=15 -94=19 +94=12 95=14 -96=19 +96=9 97=13 98=13 -99=19 +99=12 100=13 -101=19 -102=19 +101=6 +102=10 103=13 -104=19 +104=10 105=13 -106=19 +106=12 107=13 -108=19 +108=12 109=6 110=7 -111=19 -112=19 -113=19 -114=19 +111=13 +112=12 +113=13 +114=13 115=14 116=14 -117=19 +117=12 118=14 119=12 -120=19 -121=19 +120=9 +121=13 122=14 -123=19 +123=13 124=14 125=13 -126=19 -127=19 +126=8 +127=13 [numbers] 0=16 1=7 diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua index 5a20ee5922..9e1617abb6 100644 --- a/stepmania/Themes/default/Scripts/Colors.lua +++ b/stepmania/Themes/default/Scripts/Colors.lua @@ -36,10 +36,7 @@ end function DifficultyDisplayTypeToDarkColor( ddt ) local c = DifficultyDisplayTypeToColor(ddt); - c[1] = c[1]/2; - c[2] = c[2]/2; - c[3] = c[3]/2; - return c; + return { c[1]/2, c[2]/2, c[3]/2, c[4] }; end function CourseDifficutlyToColor( cd ) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index aeef9145f4..6dc1df7b15 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1978,12 +1978,12 @@ ZeroMeterString="?" MeterX=30 MeterY=0 MeterOnCommand=shadowlength,0;zoom,0.5 -MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)) end end +MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end ShowDescription=true DescriptionX=-10 DescriptionY=0 -DescriptionOnCommand=zoom,0.5;shadowlength,0; -DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)) self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)) end end +DescriptionOnCommand=zoom,0.5;shadowlength,0;uppercase,true; +DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end ShowAutogen=true AutogenX=0 AutogenY=0