diff --git a/stepmania/Themes/default/BGAnimations/ScreenCaution background/caution (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenCaution background/caution (doubleres).png new file mode 100644 index 0000000000..81c171bf10 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenCaution background/caution (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenCaution background/caution.png b/stepmania/Themes/default/BGAnimations/ScreenCaution background/caution.png deleted file mode 100644 index 4a3f1b2af6..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenCaution background/caution.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua index 4d601978e5..cb5c8f3d19 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCaution background/default.lua @@ -1,3 +1,3 @@ -return LoadActor( "caution.png" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT); +return LoadActor( "caution" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;); } \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua index 3aef203c9d..59f82ed431 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua @@ -1,12 +1,8 @@ local t = Def.ActorFrame { - LoadFont("blaster") .. { - Text=THEME:GetString( "ScreenCaution", "Caution" ); - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP+60;diffuse,1,0,0,1;zoom,1.5;diffusebottomedge,0.25,0,0,1;shadowlength,0); - }; - LoadFont("_zeroesthree") .. { + LoadFont("_venacti bold 50") .. { Text=THEME:GetString( "ScreenCaution", "CautionText" ); - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;horizalign,center;shadowlength,0;wrapwidthpixels,SCREEN_WIDTH-80); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;horizalign,center;shadowlength,0;wrapwidthpixels,640;strokecolor,color("#a200ff");); }; }; diff --git a/stepmania/Themes/default/Fonts/_venacti bold 50 [main-stroke] 16x16.png b/stepmania/Themes/default/Fonts/_venacti bold 50 [main-stroke] 16x16.png new file mode 100644 index 0000000000..fb97d6313d Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti bold 50 [main-stroke] 16x16.png differ diff --git a/stepmania/Themes/default/Fonts/_venacti bold 50 [main] 16x16.png b/stepmania/Themes/default/Fonts/_venacti bold 50 [main] 16x16.png new file mode 100644 index 0000000000..bc33635043 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti bold 50 [main] 16x16.png differ diff --git a/stepmania/Themes/default/Fonts/_venacti bold 50.ini b/stepmania/Themes/default/Fonts/_venacti bold 50.ini new file mode 100644 index 0000000000..84c6515010 --- /dev/null +++ b/stepmania/Themes/default/Fonts/_venacti bold 50.ini @@ -0,0 +1,409 @@ +[main] +Baseline=50 +Top=10 +LineSpacing=60 +DrawExtraPixelsLeft=5 +DrawExtraPixelsRight=0 +AdvanceExtraPixels=0 +FontBaseZoom=0.5 +0=0 +1=0 +2=0 +3=0 +4=0 +5=0 +6=0 +7=0 +8=0 +9=0 +10=0 +11=0 +12=0 +13=0 +14=0 +15=0 +16=0 +17=0 +18=0 +19=0 +20=0 +21=0 +22=0 +23=0 +24=0 +25=0 +26=0 +27=0 +28=0 +29=0 +30=0 +31=0 +32=13 +33=15 +34=20 +35=31 +36=26 +37=38 +38=39 +39=13 +40=22 +41=22 +42=24 +43=31 +44=14 +45=21 +46=15 +47=22 +48=33 +49=15 +50=31 +51=28 +52=28 +53=31 +54=34 +55=27 +56=33 +57=33 +58=14 +59=14 +60=31 +61=29 +62=31 +63=27 +64=38 +65=32 +66=33 +67=31 +68=33 +69=31 +70=30 +71=34 +72=33 +73=14 +74=25 +75=34 +76=29 +77=44 +78=34 +79=34 +80=31 +81=34 +82=34 +83=31 +84=28 +85=34 +86=32 +87=45 +88=35 +89=31 +90=31 +91=22 +92=21 +93=22 +94=29 +95=29 +96=16 +97=28 +98=28 +99=26 +100=28 +101=28 +102=17 +103=28 +104=29 +105=12 +106=12 +107=28 +108=13 +109=43 +110=29 +111=29 +112=28 +113=28 +114=19 +115=27 +116=16 +117=29 +118=25 +119=36 +120=29 +121=28 +122=27 +123=22 +124=13 +125=22 +126=31 +127=0 +128=29 +129=0 +130=11 +131=10 +132=22 +133=46 +134=31 +135=31 +136=24 +137=55 +138=31 +139=31 +140=52 +141=0 +142=31 +143=0 +144=0 +145=11 +146=11 +147=22 +148=22 +149=23 +150=31 +151=40 +152=17 +153=51 +154=27 +155=31 +156=45 +157=27 +158=0 +159=31 +160=33 +161=14 +162=26 +163=28 +164=10 +165=31 +166=13 +167=10 +168=20 +169=44 +170=20 +171=28 +172=10 +173=4 +174=34 +175=10 +176=25 +177=10 +178=21 +179=19 +180=16 +181=10 +182=33 +183=15 +184=17 +185=14 +186=21 +187=28 +188=17 +189=17 +190=17 +191=27 +192=32 +193=32 +194=32 +195=32 +196=32 +197=32 +198=44 +199=31 +200=31 +201=31 +202=31 +203=31 +204=12 +205=12 +206=13 +207=12 +208=33 +209=34 +210=34 +211=34 +212=34 +213=34 +214=34 +215=28 +216=34 +217=34 +218=34 +219=34 +220=34 +221=31 +222=30 +223=29 +224=28 +225=28 +226=28 +227=28 +228=28 +229=28 +230=44 +231=26 +232=28 +233=28 +234=28 +235=28 +236=13 +237=13 +238=14 +239=13 +240=28 +241=29 +242=29 +243=29 +244=29 +245=29 +246=29 +247=26 +248=29 +249=29 +250=29 +251=29 +252=29 +253=28 +254=28 +255=28 +[alt] +0=0 +1=0 +2=0 +3=0 +4=0 +5=0 +6=0 +7=0 +8=0 +9=0 +10=0 +11=0 +12=0 +13=0 +14=0 +15=0 +16=0 +17=0 +18=0 +19=0 +20=0 +21=0 +22=0 +23=0 +24=0 +25=0 +26=0 +27=0 +28=0 +29=0 +30=0 +31=0 +32=33 +33=12 +34=12 +35=29 +36=10 +37=12 +38=12 +39=10 +40=20 +41=31 +42=12 +43=12 +44=12 +45=4 +46=31 +47=12 +48=25 +49=12 +50=12 +51=14 +52=16 +53=12 +54=12 +55=23 +56=17 +57=27 +58=12 +59=12 +60=12 +61=12 +62=27 +63=12 +64=12 +65=32 +66=32 +67=12 +68=32 +69=12 +70=12 +71=31 +72=12 +73=31 +74=12 +75=31 +76=12 +77=12 +78=13 +79=12 +80=12 +81=12 +82=12 +83=34 +84=34 +85=12 +86=34 +87=28 +88=12 +89=12 +90=34 +91=12 +92=34 +93=31 +94=12 +95=29 +96=12 +97=28 +98=28 +99=12 +100=28 +101=12 +102=12 +103=26 +104=12 +105=28 +106=12 +107=28 +108=12 +109=13 +110=14 +111=12 +112=12 +113=12 +114=12 +115=29 +116=29 +117=12 +118=29 +119=26 +120=12 +121=12 +122=29 +123=12 +124=29 +125=28 +126=12 +127=12 +[numbers] +0=33 +1=15 +2=31 +3=28 +4=28 +5=31 +6=34 +7=27 +8=33 +9=33 +10=38 +11=15 +12=13 +13=14 +14=29 diff --git a/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir index fb010348ff..0ae1623859 100644 --- a/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir +++ b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir @@ -1 +1 @@ -ModIcon Filled \ No newline at end of file +ModIcon Empty \ No newline at end of file diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 266b6dc71e..d622969172 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2636,18 +2636,18 @@ Fallback="ModIcon" [ModIconRow] NumModIcons=6 ModIconOnCommand= -SpacingX=46 -SpacingY=0 +SpacingX=0 +SpacingY=46 ModIconMetricsGroup="ModIcon" [ModIconRowSelectMusic] Fallback="ModIconRow" +SpacingX=46 +SpacingY=0 ModIconMetricsGroup="ModIconSelectMusic" [ModIconRowGameplay] Fallback="ModIconRow" -SpacingX=0 -SpacingY=46 [ModIconRowGameplayP1] Fallback="ModIconRowGameplay"