diff --git a/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua index 59f82ed431..a9e089cce2 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCaution overlay.lua @@ -1,6 +1,6 @@ local t = Def.ActorFrame { - LoadFont("_venacti bold 50") .. { + LoadFont("_venacti bold 24px") .. { Text=THEME:GetString( "ScreenCaution", "CautionText" ); 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/BGAnimations/ScreenLegal decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua index 793053ba2a..23cabd9ae8 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenLegal decorations/default.lua @@ -4,11 +4,11 @@ return Def.ActorFrame { LoadActor("frame") .. { InitCommand=cmd(); }; - LoadFont("_terminator two 60") .. { - InitCommand=cmd(y,-150;settext,ScreenString("Warning");diffuse,color("#fef500");strokecolor,color("#0167d2");shadowlength,0); + LoadFont("_terminator two 40px") .. { + InitCommand=cmd(y,-136;uppercase,true;settext,ScreenString("Warning");diffuse,color("#fef500");strokecolor,color("#0167d2");shadowlength,0;); }; LoadFont("_venacti Bold 15px") .. { - InitCommand=cmd(y,20;settext,ScreenString("BodyText");uppercase,true;wrapwidthpixels,500;strokecolor,color("#0167d2");shadowlength,0); + InitCommand=cmd(y,26;uppercase,true;settext,ScreenString("BodyText");wrapwidthpixels,500;strokecolor,color("#0167d2");shadowlength,0;vertspacing,2;); }; }; }; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua index 27e03b19c6..13dcc00093 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua @@ -40,10 +40,10 @@ local t = Def.ActorFrame { InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+36;horizalign,left;diffuse,0.6,0.6,0.6,1;shadowlength,2); }; Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X-250;y,SCREEN_CENTER_Y+200;); + InitCommand=cmd(x,SCREEN_CENTER_X-210;y,SCREEN_CENTER_Y+200;); LoadActor( "stepmania logo" ) .. { }; - LoadFont( "_venacti bold 24" ) .. { + LoadFont( "common normal" ) .. { InitCommand=cmd(y,-25;settext,ProductVersion() .. " " .. VersionTime();diffuse,color("#000000");shadowlength,0;); }; }; diff --git a/stepmania/Themes/default/Fonts/Common Normal.redir b/stepmania/Themes/default/Fonts/Common Normal.redir index 711e919cf7..fe8018ad24 100644 --- a/stepmania/Themes/default/Fonts/Common Normal.redir +++ b/stepmania/Themes/default/Fonts/Common Normal.redir @@ -1 +1 @@ -_venacti bold 24 \ No newline at end of file +_venacti bold 13px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem SectionCount.redir b/stepmania/Themes/default/Fonts/MusicWheelItem SectionCount.redir index b0d6680822..2bf4aa159a 100755 --- a/stepmania/Themes/default/Fonts/MusicWheelItem SectionCount.redir +++ b/stepmania/Themes/default/Fonts/MusicWheelItem SectionCount.redir @@ -1 +1 @@ -_venacti bold 24 +_venacti bold 12 diff --git a/stepmania/Themes/default/Fonts/ScreenOptions explanation.redir b/stepmania/Themes/default/Fonts/ScreenOptions explanation.redir index 711e919cf7..f764d36eff 100644 --- a/stepmania/Themes/default/Fonts/ScreenOptions explanation.redir +++ b/stepmania/Themes/default/Fonts/ScreenOptions explanation.redir @@ -1 +1 @@ -_venacti bold 24 \ No newline at end of file +_venacti bold 12 \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.redir b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.redir index 1b0b4147d1..6272ef61a7 100755 --- a/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.redir +++ b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.redir @@ -1 +1 @@ -_venacti bold 28 \ No newline at end of file +common normal \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/_terminator two 32 [main-stroke] 16x16.png b/stepmania/Themes/default/Fonts/_terminator two 32 [main-stroke] 16x16.png deleted file mode 100644 index bc61bbb237..0000000000 Binary files a/stepmania/Themes/default/Fonts/_terminator two 32 [main-stroke] 16x16.png and /dev/null differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 32 [main] 16x16.png b/stepmania/Themes/default/Fonts/_terminator two 32 [main] 16x16.png deleted file mode 100755 index 583e4bf608..0000000000 Binary files a/stepmania/Themes/default/Fonts/_terminator two 32 [main] 16x16.png and /dev/null differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 32.ini b/stepmania/Themes/default/Fonts/_terminator two 32.ini deleted file mode 100755 index 3d5e646c49..0000000000 --- a/stepmania/Themes/default/Fonts/_terminator two 32.ini +++ /dev/null @@ -1,409 +0,0 @@ -[main] -Baseline=27 -Top=4 -LineSpacing=32 -DrawExtraPixelsLeft=4 -DrawExtraPixelsRight=4 -AdvanceExtraPixels=0 -DefaultStrokeColor=#00000077 -0=8 -1=8 -2=8 -3=8 -4=8 -5=8 -6=8 -7=8 -8=8 -9=8 -10=8 -11=8 -12=8 -13=8 -14=8 -15=8 -16=8 -17=8 -18=8 -19=8 -20=8 -21=8 -22=8 -23=8 -24=8 -25=8 -26=8 -27=8 -28=8 -29=8 -30=8 -31=8 -32=22 -33=6 -34=10 -35=30 -36=21 -37=27 -38=22 -39=5 -40=10 -41=10 -42=22 -43=22 -44=6 -45=22 -46=6 -47=14 -48=21 -49=11 -50=21 -51=21 -52=20 -53=21 -54=21 -55=21 -56=20 -57=21 -58=6 -59=6 -60=29 -61=22 -62=29 -63=19 -64=16 -65=26 -66=24 -67=21 -68=24 -69=21 -70=21 -71=26 -72=22 -73=6 -74=26 -75=24 -76=21 -77=26 -78=24 -79=26 -80=24 -81=26 -82=24 -83=26 -84=22 -85=24 -86=26 -87=26 -88=26 -89=26 -90=26 -91=10 -92=14 -93=10 -94=16 -95=16 -96=16 -97=29 -98=24 -99=21 -100=24 -101=21 -102=21 -103=26 -104=22 -105=6 -106=26 -107=24 -108=21 -109=26 -110=24 -111=26 -112=24 -113=26 -114=24 -115=26 -116=22 -117=24 -118=29 -119=26 -120=26 -121=26 -122=26 -123=11 -124=6 -125=11 -126=16 -127=8 -128=13 -129=8 -130=22 -131=16 -132=16 -133=16 -134=16 -135=16 -136=16 -137=16 -138=22 -139=16 -140=21 -141=8 -142=22 -143=8 -144=8 -145=6 -146=6 -147=13 -148=13 -149=16 -150=24 -151=26 -152=16 -153=16 -154=22 -155=16 -156=16 -157=22 -158=8 -159=16 -160=22 -161=16 -162=16 -163=16 -164=16 -165=16 -166=22 -167=16 -168=16 -169=16 -170=16 -171=16 -172=22 -173=22 -174=16 -175=22 -176=22 -177=16 -178=22 -179=22 -180=16 -181=16 -182=16 -183=22 -184=16 -185=22 -186=16 -187=16 -188=22 -189=22 -190=22 -191=16 -192=29 -193=29 -194=29 -195=29 -196=29 -197=29 -198=44 -199=21 -200=21 -201=21 -202=16 -203=21 -204=6 -205=6 -206=6 -207=6 -208=22 -209=24 -210=26 -211=26 -212=26 -213=26 -214=26 -215=22 -216=16 -217=24 -218=24 -219=24 -220=24 -221=22 -222=22 -223=16 -224=16 -225=16 -226=16 -227=16 -228=16 -229=16 -230=16 -231=16 -232=16 -233=16 -234=16 -235=16 -236=16 -237=16 -238=16 -239=16 -240=22 -241=16 -242=16 -243=16 -244=16 -245=16 -246=16 -247=22 -248=16 -249=16 -250=16 -251=16 -252=16 -253=22 -254=22 -255=16 -[alt] -0=8 -1=8 -2=8 -3=8 -4=8 -5=8 -6=8 -7=8 -8=8 -9=8 -10=8 -11=8 -12=8 -13=8 -14=8 -15=8 -16=8 -17=8 -18=8 -19=8 -20=8 -21=8 -22=8 -23=8 -24=8 -25=8 -26=8 -27=8 -28=8 -29=8 -30=8 -31=8 -32=22 -33=22 -34=16 -35=22 -36=16 -37=22 -38=22 -39=16 -40=16 -41=22 -42=22 -43=22 -44=22 -45=22 -46=22 -47=22 -48=22 -49=22 -50=16 -51=22 -52=16 -53=22 -54=22 -55=16 -56=16 -57=22 -58=22 -59=22 -60=22 -61=10 -62=22 -63=22 -64=22 -65=29 -66=29 -67=22 -68=29 -69=22 -70=22 -71=21 -72=22 -73=21 -74=22 -75=21 -76=22 -77=6 -78=6 -79=22 -80=22 -81=22 -82=22 -83=26 -84=26 -85=22 -86=26 -87=22 -88=22 -89=22 -90=24 -91=22 -92=24 -93=22 -94=22 -95=16 -96=22 -97=16 -98=16 -99=22 -100=16 -101=22 -102=22 -103=16 -104=22 -105=16 -106=22 -107=16 -108=22 -109=16 -110=16 -111=22 -112=22 -113=22 -114=22 -115=16 -116=16 -117=22 -118=16 -119=22 -120=22 -121=22 -122=16 -123=22 -124=16 -125=22 -126=22 -127=16 -[numbers] -0=21 -1=11 -2=21 -3=21 -4=20 -5=21 -6=21 -7=21 -8=20 -9=21 -10=27 -11=6 -12=22 -13=6 -14=26 diff --git a/stepmania/Themes/default/Fonts/_terminator two 40 [numbers-stroke] 4x4.png b/stepmania/Themes/default/Fonts/_terminator two 40 [numbers-stroke] 4x4.png deleted file mode 100644 index f39a50bb25..0000000000 Binary files a/stepmania/Themes/default/Fonts/_terminator two 40 [numbers-stroke] 4x4.png and /dev/null differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png b/stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png deleted file mode 100644 index 0e6b296a81..0000000000 Binary files a/stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png and /dev/null differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 40.ini b/stepmania/Themes/default/Fonts/_terminator two 40.ini deleted file mode 100644 index 276db95941..0000000000 --- a/stepmania/Themes/default/Fonts/_terminator two 40.ini +++ /dev/null @@ -1,25 +0,0 @@ -[main] -Top=0 -LineSpacing=40 -DrawExtraPixelsLeft=0 -DrawExtraPixelsRight=0 -AdvanceExtraPixels=0 -DefaultStrokeColor=#FFFFFF - -[numbers] -Baseline=34 -0=26 -1=26 -2=26 -3=26 -4=25 -5=26 -6=26 -7=26 -8=24 -9=26 -10=34 -11=8 -12=27 -13=8 -14=32 diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 40px [alt-stroke] 10x10 (doubleres).png new file mode 100644 index 0000000000..718f60e8fc Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 40px [alt-stroke] 10x10 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 40px [alt] 10x10 (doubleres).png new file mode 100644 index 0000000000..1491bdec51 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 40px [alt] 10x10 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 40px [main-stroke] 15x15 (doubleres).png new file mode 100644 index 0000000000..3fc2bc27c9 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 40px [main-stroke] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 40px [main] 15x15 (doubleres).png new file mode 100644 index 0000000000..5c3d5c34cf Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 40px [main] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px.ini b/stepmania/Themes/default/Fonts/_terminator two 40px.ini new file mode 100644 index 0000000000..6946f2a650 --- /dev/null +++ b/stepmania/Themes/default/Fonts/_terminator two 40px.ini @@ -0,0 +1,352 @@ +[common] +Baseline=36 +Top=2 +LineSpacing=40 +DrawExtraPixelsLeft=7 +DrawExtraPixelsRight=6 +AdvanceExtraPixels=0 + +[main] +Line 0= !"#$%&'()*+,-. +Line 1=/0123456789:;<= +Line 2=>?@ABCDEFGHIJKL +Line 3=MNOPQRSTUVWXYZ[ +Line 4=\]^_`abcdefghij +Line 5=klmnopqrstuvwxy +Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š +Line 7=‹ŒŽ‘’“”•–—˜™š›œ +Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬ +Line 9=­®¯°±²³´µ¶·¸¹º» +Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ +Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ +Line 12=ÚÛÜÝÞßàáâãäåæçè +Line 13=éêëìíîïðñòóôõö÷ +Line 14=øùúûüýþÿ + +0=27 +1=8 +2=12 +3=38 +4=26 +5=34 +6=27 +7=6 +8=12 +9=12 +10=28 +11=28 +12=8 +13=28 +14=8 +15=18 +16=26 +17=14 +18=26 +19=26 +20=25 +21=26 +22=26 +23=26 +24=24 +25=26 +26=8 +27=8 +28=37 +29=28 +30=37 +31=24 +32=20 +33=32 +34=30 +35=26 +36=30 +37=26 +38=26 +39=32 +40=28 +41=8 +42=32 +43=30 +44=26 +45=32 +46=30 +47=32 +48=30 +49=32 +50=30 +51=32 +52=28 +53=30 +54=32 +55=32 +56=32 +57=32 +58=32 +59=12 +60=18 +61=12 +62=20 +63=20 +64=20 +65=37 +66=30 +67=26 +68=30 +69=26 +70=26 +71=32 +72=28 +73=8 +74=32 +75=30 +76=26 +77=32 +78=30 +79=32 +80=30 +81=32 +82=30 +83=32 +84=28 +85=30 +86=37 +87=32 +88=32 +89=32 +90=32 +91=14 +92=8 +93=14 +94=20 +95=11 +96=27 +97=20 +98=20 +99=20 +100=20 +101=20 +102=20 +103=20 +104=27 +105=20 +106=26 +107=27 +108=8 +109=8 +110=16 +111=16 +112=20 +113=30 +114=32 +115=20 +116=20 +117=27 +118=20 +119=20 +120=27 +121=20 +122=27 +123=20 +124=20 +125=20 +126=20 +127=20 +128=27 +129=20 +130=20 +131=20 +132=20 +133=20 +134=27 +135=27 +136=20 +137=27 +138=27 +139=20 +140=27 +141=27 +142=20 +143=20 +144=20 +145=27 +146=20 +147=27 +148=20 +149=20 +150=27 +151=27 +152=27 +153=20 +154=37 +155=37 +156=37 +157=37 +158=37 +159=37 +160=55 +161=26 +162=26 +163=26 +164=20 +165=26 +166=8 +167=8 +168=8 +169=8 +170=27 +171=30 +172=32 +173=32 +174=32 +175=32 +176=32 +177=27 +178=20 +179=30 +180=30 +181=30 +182=30 +183=27 +184=27 +185=20 +186=20 +187=20 +188=20 +189=20 +190=20 +191=20 +192=20 +193=20 +194=20 +195=20 +196=20 +197=20 +198=20 +199=20 +200=20 +201=20 +202=27 +203=20 +204=20 +205=20 +206=20 +207=20 +208=20 +209=27 +210=20 +211=20 +212=20 +213=20 +214=20 +215=27 +216=27 +217=20 + +[alt] +Line 0= Ą˘Ł¤ĽŚ§¨Š +Line 1=ŞŤŹ­ŽŻ°ą˛ł +Line 2=´ľśˇ¸šşťź˝ +Line 3=žżŔÁÂĂÄĹĆÇ +Line 4=ČÉĘËĚÍÎĎĐŃ +Line 5=ŇÓÔŐÖ×ŘŮÚŰ +Line 6=ÜÝŢßŕáâăäĺ +Line 7=ćçčéęëěíîď +Line 8=đńňóôőö÷řů +Line 9=úűüýţ˙ + +0=27 +1=27 +2=20 +3=27 +4=20 +5=27 +6=27 +7=20 +8=20 +9=27 +10=27 +11=27 +12=27 +13=27 +14=27 +15=27 +16=27 +17=27 +18=20 +19=27 +20=20 +21=27 +22=27 +23=20 +24=20 +25=27 +26=27 +27=27 +28=27 +29=9 +30=27 +31=27 +32=27 +33=37 +34=37 +35=27 +36=37 +37=27 +38=27 +39=26 +40=27 +41=26 +42=27 +43=26 +44=27 +45=8 +46=8 +47=27 +48=27 +49=27 +50=27 +51=32 +52=32 +53=27 +54=32 +55=27 +56=27 +57=27 +58=30 +59=27 +60=30 +61=27 +62=27 +63=20 +64=27 +65=20 +66=20 +67=27 +68=20 +69=27 +70=27 +71=20 +72=27 +73=20 +74=27 +75=20 +76=27 +77=20 +78=20 +79=27 +80=27 +81=27 +82=27 +83=20 +84=20 +85=27 +86=20 +87=27 +88=27 +89=27 +90=20 +91=27 +92=20 +93=27 +94=27 +95=20 diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 13px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 13px [alt-stroke] 10x10 (doubleres).png new file mode 100644 index 0000000000..1587d410bd Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 13px [alt-stroke] 10x10 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 13px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 13px [alt] 10x10 (doubleres).png new file mode 100644 index 0000000000..b551e5331e Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 13px [alt] 10x10 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 13px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 13px [main-stroke] 15x15 (doubleres).png new file mode 100644 index 0000000000..e1696b5664 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 13px [main-stroke] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 13px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 13px [main] 15x15 (doubleres).png new file mode 100644 index 0000000000..8a43d455b3 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 13px [main] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 13px.ini b/stepmania/Themes/default/Fonts/_venacti Bold 13px.ini new file mode 100644 index 0000000000..b2f890b8d1 --- /dev/null +++ b/stepmania/Themes/default/Fonts/_venacti Bold 13px.ini @@ -0,0 +1,353 @@ +[common] +Baseline=15 +Top=5 +LineSpacing=16 +DrawExtraPixelsLeft=1 +DrawExtraPixelsRight=0 +AdvanceExtraPixels=0 +DefaultStrokeColor=#FFFFFF00 + +[main] +Line 0= !"#$%&'()*+,-. +Line 1=/0123456789:;<= +Line 2=>?@ABCDEFGHIJKL +Line 3=MNOPQRSTUVWXYZ[ +Line 4=\]^_`abcdefghij +Line 5=klmnopqrstuvwxy +Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š +Line 7=‹ŒŽ‘’“”•–—˜™š›œ +Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬ +Line 9=­®¯°±²³´µ¶·¸¹º» +Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ +Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ +Line 12=ÚÛÜÝÞßàáâãäåæçè +Line 13=éêëìíîïðñòóôõö÷ +Line 14=øùúûüýþÿ + +0=3 +1=4 +2=5 +3=8 +4=7 +5=10 +6=10 +7=3 +8=6 +9=6 +10=6 +11=8 +12=4 +13=6 +14=4 +15=6 +16=9 +17=4 +18=8 +19=7 +20=7 +21=8 +22=9 +23=7 +24=9 +25=9 +26=4 +27=4 +28=8 +29=8 +30=8 +31=7 +32=10 +33=8 +34=9 +35=8 +36=9 +37=8 +38=8 +39=9 +40=9 +41=4 +42=7 +43=9 +44=8 +45=11 +46=9 +47=9 +48=8 +49=9 +50=9 +51=8 +52=7 +53=9 +54=8 +55=12 +56=9 +57=8 +58=8 +59=6 +60=6 +61=6 +62=7 +63=8 +64=4 +65=7 +66=7 +67=7 +68=7 +69=7 +70=4 +71=7 +72=8 +73=3 +74=3 +75=7 +76=3 +77=11 +78=8 +79=8 +80=7 +81=7 +82=5 +83=7 +84=4 +85=7 +86=7 +87=9 +88=8 +89=7 +90=7 +91=6 +92=3 +93=6 +94=8 +95=8 +96=3 +97=15 +98=6 +99=12 +100=8 +101=8 +102=6 +103=14 +104=8 +105=8 +106=14 +107=8 +108=3 +109=3 +110=6 +111=6 +112=6 +113=8 +114=10 +115=4 +116=13 +117=7 +118=8 +119=12 +120=7 +121=8 +122=8 +123=4 +124=7 +125=7 +126=15 +127=8 +128=3 +129=15 +130=5 +131=11 +132=5 +133=7 +134=20 +135=20 +136=9 +137=20 +138=7 +139=15 +140=5 +141=5 +142=4 +143=15 +144=9 +145=4 +146=5 +147=4 +148=6 +149=7 +150=4 +151=4 +152=4 +153=7 +154=8 +155=8 +156=8 +157=8 +158=8 +159=8 +160=12 +161=8 +162=8 +163=8 +164=8 +165=8 +166=3 +167=3 +168=3 +169=3 +170=9 +171=9 +172=9 +173=9 +174=9 +175=9 +176=9 +177=7 +178=9 +179=9 +180=9 +181=9 +182=9 +183=8 +184=8 +185=8 +186=7 +187=7 +188=7 +189=7 +190=7 +191=7 +192=12 +193=7 +194=7 +195=7 +196=7 +197=7 +198=3 +199=3 +200=4 +201=3 +202=7 +203=8 +204=8 +205=8 +206=8 +207=8 +208=8 +209=7 +210=8 +211=7 +212=7 +213=7 +214=7 +215=7 +216=7 +217=7 + +[alt] +Line 0= Ą˘Ł¤ĽŚ§¨Š +Line 1=ŞŤŹ­ŽŻ°ą˛ł +Line 2=´ľśˇ¸šşťź˝ +Line 3=žżŔÁÂĂÄĹĆÇ +Line 4=ČÉĘËĚÍÎĎĐŃ +Line 5=ŇÓÔŐÖ×ŘŮÚŰ +Line 6=ÜÝŢßŕáâăäĺ +Line 7=ćçčéęëěíîď +Line 8=đńňóôőö÷řů +Line 9=úűüýţ˙ + +0=8 +1=20 +2=15 +3=8 +4=15 +5=20 +6=20 +7=15 +8=5 +9=8 +10=20 +11=20 +12=20 +13=20 +14=8 +15=20 +16=7 +17=20 +18=15 +19=4 +20=4 +21=20 +22=20 +23=6 +24=5 +25=7 +26=20 +27=20 +28=20 +29=13 +30=7 +31=20 +32=20 +33=8 +34=8 +35=20 +36=8 +37=20 +38=20 +39=8 +40=20 +41=8 +42=20 +43=8 +44=20 +45=3 +46=3 +47=20 +48=20 +49=20 +50=20 +51=9 +52=9 +53=20 +54=9 +55=7 +56=20 +57=20 +58=9 +59=20 +60=9 +61=8 +62=20 +63=8 +64=20 +65=7 +66=7 +67=20 +68=7 +69=20 +70=20 +71=7 +72=20 +73=7 +74=20 +75=7 +76=20 +77=3 +78=4 +79=20 +80=20 +81=20 +82=20 +83=8 +84=8 +85=20 +86=8 +87=7 +88=20 +89=20 +90=7 +91=20 +92=7 +93=7 +94=20 +95=15 diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 15px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 15px [alt-stroke] 10x10 (doubleres).png new file mode 100644 index 0000000000..043d64d4ae Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 15px [alt-stroke] 10x10 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 15px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 15px [alt] 10x10 (doubleres).png new file mode 100644 index 0000000000..cfbc639d91 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 15px [alt] 10x10 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 15px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 15px [main-stroke] 15x15 (doubleres).png new file mode 100644 index 0000000000..fd953e4c2c Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 15px [main-stroke] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 15px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 15px [main] 15x15 (doubleres).png new file mode 100644 index 0000000000..58588c436a Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 15px [main] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 15px.ini b/stepmania/Themes/default/Fonts/_venacti Bold 15px.ini new file mode 100644 index 0000000000..f22a6448db --- /dev/null +++ b/stepmania/Themes/default/Fonts/_venacti Bold 15px.ini @@ -0,0 +1,352 @@ +[common] +Baseline=17 +Top=5 +LineSpacing=18 +DrawExtraPixelsLeft=7 +DrawExtraPixelsRight=6 +AdvanceExtraPixels=0 + +[main] +Line 0= !"#$%&'()*+,-. +Line 1=/0123456789:;<= +Line 2=>?@ABCDEFGHIJKL +Line 3=MNOPQRSTUVWXYZ[ +Line 4=\]^_`abcdefghij +Line 5=klmnopqrstuvwxy +Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š +Line 7=‹ŒŽ‘’“”•–—˜™š›œ +Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬ +Line 9=­®¯°±²³´µ¶·¸¹º» +Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ +Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ +Line 12=ÚÛÜÝÞßàáâãäåæçè +Line 13=éêëìíîïðñòóôõö÷ +Line 14=øùúûüýþÿ + +0=4 +1=4 +2=6 +3=9 +4=8 +5=12 +6=12 +7=4 +8=6 +9=7 +10=7 +11=9 +12=4 +13=6 +14=4 +15=6 +16=10 +17=4 +18=9 +19=9 +20=9 +21=9 +22=10 +23=8 +24=10 +25=10 +26=4 +27=4 +28=9 +29=9 +30=9 +31=8 +32=11 +33=10 +34=10 +35=9 +36=10 +37=9 +38=9 +39=10 +40=10 +41=4 +42=8 +43=10 +44=9 +45=13 +46=10 +47=10 +48=9 +49=10 +50=10 +51=9 +52=9 +53=10 +54=10 +55=13 +56=10 +57=9 +58=9 +59=7 +60=6 +61=7 +62=9 +63=9 +64=5 +65=8 +66=8 +67=8 +68=8 +69=8 +70=5 +71=9 +72=9 +73=4 +74=4 +75=8 +76=4 +77=13 +78=9 +79=9 +80=8 +81=9 +82=6 +83=8 +84=5 +85=9 +86=8 +87=11 +88=9 +89=8 +90=8 +91=6 +92=4 +93=7 +94=9 +95=9 +96=3 +97=15 +98=6 +99=14 +100=9 +101=9 +102=7 +103=16 +104=9 +105=9 +106=16 +107=9 +108=3 +109=3 +110=6 +111=6 +112=7 +113=9 +114=12 +115=5 +116=15 +117=8 +118=9 +119=14 +120=8 +121=9 +122=10 +123=4 +124=8 +125=9 +126=15 +127=9 +128=4 +129=15 +130=6 +131=13 +132=6 +133=8 +134=20 +135=20 +136=10 +137=20 +138=8 +139=15 +140=6 +141=6 +142=5 +143=15 +144=10 +145=4 +146=5 +147=4 +148=6 +149=9 +150=5 +151=5 +152=5 +153=8 +154=10 +155=10 +156=10 +157=10 +158=10 +159=10 +160=13 +161=9 +162=9 +163=9 +164=9 +165=9 +166=4 +167=4 +168=4 +169=3 +170=10 +171=10 +172=10 +173=10 +174=10 +175=10 +176=10 +177=8 +178=10 +179=10 +180=10 +181=10 +182=10 +183=9 +184=9 +185=9 +186=8 +187=8 +188=8 +189=8 +190=8 +191=8 +192=13 +193=8 +194=8 +195=8 +196=8 +197=8 +198=4 +199=4 +200=4 +201=4 +202=8 +203=9 +204=9 +205=9 +206=9 +207=9 +208=9 +209=8 +210=9 +211=9 +212=9 +213=9 +214=9 +215=8 +216=8 +217=8 + +[alt] +Line 0= Ą˘Ł¤ĽŚ§¨Š +Line 1=ŞŤŹ­ŽŻ°ą˛ł +Line 2=´ľśˇ¸šşťź˝ +Line 3=žżŔÁÂĂÄĹĆÇ +Line 4=ČÉĘËĚÍÎĎĐŃ +Line 5=ŇÓÔŐÖ×ŘŮÚŰ +Line 6=ÜÝŢßŕáâăäĺ +Line 7=ćçčéęëěíîď +Line 8=đńňóôőö÷řů +Line 9=úűüýţ˙ + +0=10 +1=20 +2=15 +3=9 +4=15 +5=20 +6=20 +7=15 +8=6 +9=9 +10=20 +11=20 +12=20 +13=20 +14=9 +15=20 +16=8 +17=20 +18=15 +19=4 +20=5 +21=20 +22=20 +23=7 +24=5 +25=8 +26=20 +27=20 +28=20 +29=13 +30=8 +31=20 +32=20 +33=10 +34=10 +35=20 +36=10 +37=20 +38=20 +39=9 +40=20 +41=9 +42=20 +43=9 +44=20 +45=4 +46=4 +47=20 +48=20 +49=20 +50=20 +51=10 +52=10 +53=20 +54=10 +55=8 +56=20 +57=20 +58=10 +59=20 +60=10 +61=9 +62=20 +63=9 +64=20 +65=8 +66=8 +67=20 +68=8 +69=20 +70=20 +71=8 +72=20 +73=8 +74=20 +75=8 +76=20 +77=4 +78=4 +79=20 +80=20 +81=20 +82=20 +83=9 +84=9 +85=20 +86=9 +87=8 +88=20 +89=20 +90=9 +91=20 +92=9 +93=8 +94=20 +95=15 diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 24px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 24px [alt-stroke] 10x10 (doubleres).png new file mode 100644 index 0000000000..1d80e10afa Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 24px [alt-stroke] 10x10 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 24px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 24px [alt] 10x10 (doubleres).png new file mode 100644 index 0000000000..dfc3898388 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 24px [alt] 10x10 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 24px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 24px [main-stroke] 15x15 (doubleres).png new file mode 100644 index 0000000000..fca85bcae3 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 24px [main-stroke] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 24px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_venacti Bold 24px [main] 15x15 (doubleres).png new file mode 100644 index 0000000000..dd1b0bfd4b Binary files /dev/null and b/stepmania/Themes/default/Fonts/_venacti Bold 24px [main] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_venacti Bold 24px.ini b/stepmania/Themes/default/Fonts/_venacti Bold 24px.ini new file mode 100644 index 0000000000..b0886a34fb --- /dev/null +++ b/stepmania/Themes/default/Fonts/_venacti Bold 24px.ini @@ -0,0 +1,353 @@ +[common] +Baseline=26 +Top=7 +LineSpacing=29 +DrawExtraPixelsLeft=2 +DrawExtraPixelsRight=0 +AdvanceExtraPixels=0 +DefaultStrokeColor=#FFFFFF00 + +[main] +Line 0= !"#$%&'()*+,-. +Line 1=/0123456789:;<= +Line 2=>?@ABCDEFGHIJKL +Line 3=MNOPQRSTUVWXYZ[ +Line 4=\]^_`abcdefghij +Line 5=klmnopqrstuvwxy +Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š +Line 7=‹ŒŽ‘’“”•–—˜™š›œ +Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬ +Line 9=­®¯°±²³´µ¶·¸¹º» +Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ +Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ +Line 12=ÚÛÜÝÞßàáâãäåæçè +Line 13=éêëìíîïðñòóôõö÷ +Line 14=øùúûüýþÿ + +0=6 +1=7 +2=9 +3=15 +4=12 +5=18 +6=19 +7=6 +8=10 +9=10 +10=12 +11=15 +12=7 +13=10 +14=7 +15=10 +16=16 +17=7 +18=15 +19=14 +20=14 +21=15 +22=16 +23=13 +24=16 +25=16 +26=7 +27=7 +28=15 +29=14 +30=15 +31=13 +32=18 +33=15 +34=16 +35=15 +36=16 +37=15 +38=14 +39=16 +40=16 +41=7 +42=12 +43=16 +44=14 +45=21 +46=16 +47=16 +48=15 +49=16 +50=16 +51=15 +52=14 +53=16 +54=15 +55=22 +56=17 +57=15 +58=15 +59=11 +60=10 +61=11 +62=14 +63=14 +64=8 +65=13 +66=13 +67=13 +68=13 +69=13 +70=8 +71=14 +72=14 +73=6 +74=6 +75=13 +76=6 +77=21 +78=14 +79=14 +80=14 +81=14 +82=9 +83=13 +84=8 +85=14 +86=12 +87=17 +88=14 +89=13 +90=13 +91=10 +92=6 +93=10 +94=15 +95=14 +96=5 +97=10 +98=10 +99=22 +100=15 +101=15 +102=12 +103=26 +104=15 +105=15 +106=25 +107=15 +108=5 +109=5 +110=10 +111=10 +112=11 +113=15 +114=19 +115=8 +116=24 +117=13 +118=15 +119=22 +120=13 +121=15 +122=16 +123=7 +124=12 +125=14 +126=10 +127=15 +128=6 +129=10 +130=10 +131=21 +132=10 +133=13 +134=10 +135=4 +136=16 +137=10 +138=12 +139=10 +140=10 +141=9 +142=8 +143=10 +144=16 +145=7 +146=8 +147=7 +148=10 +149=14 +150=8 +151=8 +152=8 +153=13 +154=15 +155=15 +156=15 +157=15 +158=15 +159=15 +160=21 +161=15 +162=15 +163=15 +164=15 +165=15 +166=6 +167=6 +168=6 +169=6 +170=16 +171=16 +172=16 +173=16 +174=16 +175=16 +176=16 +177=14 +178=16 +179=16 +180=16 +181=16 +182=16 +183=15 +184=14 +185=14 +186=13 +187=13 +188=13 +189=13 +190=13 +191=13 +192=21 +193=13 +194=13 +195=13 +196=13 +197=13 +198=6 +199=6 +200=7 +201=6 +202=13 +203=14 +204=14 +205=14 +206=14 +207=14 +208=14 +209=12 +210=14 +211=14 +212=14 +213=14 +214=14 +215=13 +216=14 +217=13 + +[alt] +Line 0= Ą˘Ł¤ĽŚ§¨Š +Line 1=ŞŤŹ­ŽŻ°ą˛ł +Line 2=´ľśˇ¸šşťź˝ +Line 3=žżŔÁÂĂÄĹĆÇ +Line 4=ČÉĘËĚÍÎĎĐŃ +Line 5=ŇÓÔŐÖ×ŘŮÚŰ +Line 6=ÜÝŢßŕáâăäĺ +Line 7=ćçčéęëěíîď +Line 8=đńňóôőö÷řů +Line 9=úűüýţ˙ + +0=16 +1=12 +2=12 +3=14 +4=10 +5=12 +6=12 +7=10 +8=10 +9=15 +10=12 +11=12 +12=12 +13=4 +14=15 +15=12 +16=12 +17=12 +18=12 +19=7 +20=8 +21=12 +22=12 +23=11 +24=8 +25=13 +26=12 +27=12 +28=12 +29=12 +30=13 +31=12 +32=12 +33=15 +34=15 +35=12 +36=15 +37=12 +38=12 +39=15 +40=12 +41=15 +42=12 +43=15 +44=12 +45=6 +46=6 +47=12 +48=12 +49=12 +50=12 +51=16 +52=16 +53=12 +54=16 +55=14 +56=12 +57=12 +58=16 +59=12 +60=16 +61=15 +62=12 +63=14 +64=12 +65=13 +66=13 +67=12 +68=13 +69=12 +70=12 +71=13 +72=12 +73=13 +74=12 +75=13 +76=12 +77=6 +78=7 +79=12 +80=12 +81=12 +82=12 +83=14 +84=14 +85=12 +86=14 +87=12 +88=12 +89=12 +90=14 +91=12 +92=14 +93=13 +94=12 +95=12 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24 [alt] 12x11.png b/stepmania/Themes/default/Fonts/_venacti bold 24 [alt] 12x11.png deleted file mode 100755 index 0012cfc9fa..0000000000 Binary files a/stepmania/Themes/default/Fonts/_venacti bold 24 [alt] 12x11.png and /dev/null 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 deleted file mode 100644 index 033105d5bb..0000000000 Binary files a/stepmania/Themes/default/Fonts/_venacti bold 24 [main-stroke] 16x16.png and /dev/null 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 deleted file mode 100755 index af1217c342..0000000000 Binary files a/stepmania/Themes/default/Fonts/_venacti bold 24 [main] 16x16.png and /dev/null differ diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24.ini b/stepmania/Themes/default/Fonts/_venacti bold 24.ini deleted file mode 100755 index 9d95844ab8..0000000000 --- a/stepmania/Themes/default/Fonts/_venacti bold 24.ini +++ /dev/null @@ -1,409 +0,0 @@ -[main] -Baseline=24 -Top=5 -LineSpacing=29 -DrawExtraPixelsLeft=2 -DrawExtraPixelsRight=0 -AdvanceExtraPixels=0 -DefaultStrokeColor=#FFFFFF00 -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=6 -33=7 -34=9 -35=15 -36=12 -37=18 -38=19 -39=6 -40=10 -41=10 -42=12 -43=15 -44=7 -45=10 -46=7 -47=10 -48=16 -49=7 -50=15 -51=14 -52=14 -53=15 -54=16 -55=13 -56=16 -57=16 -58=7 -59=7 -60=15 -61=14 -62=15 -63=13 -64=18 -65=15 -66=16 -67=15 -68=16 -69=15 -70=14 -71=16 -72=16 -73=7 -74=12 -75=16 -76=14 -77=21 -78=16 -79=16 -80=15 -81=16 -82=16 -83=15 -84=14 -85=16 -86=15 -87=22 -88=17 -89=15 -90=15 -91=11 -92=10 -93=11 -94=14 -95=14 -96=8 -97=13 -98=13 -99=13 -100=13 -101=13 -102=8 -103=14 -104=14 -105=6 -106=6 -107=13 -108=6 -109=21 -110=14 -111=14 -112=14 -113=14 -114=9 -115=13 -116=8 -117=14 -118=12 -119=17 -120=14 -121=13 -122=13 -123=10 -124=6 -125=10 -126=15 -127=0 -128=14 -129=0 -130=5 -131=13 -132=10 -133=22 -134=15 -135=15 -136=12 -137=26 -138=15 -139=15 -140=25 -141=0 -142=15 -143=0 -144=0 -145=5 -146=5 -147=10 -148=10 -149=11 -150=15 -151=19 -152=8 -153=24 -154=13 -155=15 -156=22 -157=13 -158=0 -159=15 -160=16 -161=7 -162=12 -163=14 -164=13 -165=15 -166=6 -167=13 -168=10 -169=21 -170=10 -171=13 -172=16 -173=9 -174=16 -175=13 -176=12 -177=16 -178=10 -179=9 -180=8 -181=13 -182=16 -183=7 -184=8 -185=7 -186=10 -187=14 -188=8 -189=8 -190=8 -191=13 -192=15 -193=15 -194=15 -195=15 -196=15 -197=15 -198=21 -199=15 -200=15 -201=15 -202=15 -203=15 -204=6 -205=6 -206=6 -207=6 -208=16 -209=16 -210=16 -211=16 -212=16 -213=16 -214=16 -215=14 -216=16 -217=16 -218=16 -219=16 -220=16 -221=15 -222=14 -223=14 -224=13 -225=13 -226=13 -227=13 -228=13 -229=13 -230=21 -231=13 -232=13 -233=13 -234=13 -235=13 -236=6 -237=6 -238=7 -239=6 -240=13 -241=14 -242=14 -243=14 -244=14 -245=14 -246=14 -247=12 -248=14 -249=14 -250=14 -251=14 -252=14 -253=13 -254=14 -255=13 -[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=16 -33=14 -34=13 -35=14 -36=13 -37=11 -38=14 -39=13 -40=10 -41=15 -42=14 -43=12 -44=14 -45=9 -46=15 -47=14 -48=12 -49=12 -50=13 -51=7 -52=8 -53=6 -54=10 -55=11 -56=8 -57=13 -58=10 -59=8 -60=11 -61=13 -62=13 -63=11 -64=14 -65=15 -66=15 -67=14 -68=15 -69=11 -70=14 -71=15 -72=14 -73=15 -74=13 -75=15 -76=13 -77=6 -78=6 -79=15 -80=16 -81=15 -82=15 -83=16 -84=16 -85=16 -86=16 -87=14 -88=14 -89=15 -90=16 -91=15 -92=16 -93=15 -94=12 -95=14 -96=9 -97=13 -98=13 -99=12 -100=13 -101=6 -102=10 -103=13 -104=10 -105=13 -106=12 -107=13 -108=12 -109=6 -110=7 -111=13 -112=12 -113=13 -114=13 -115=14 -116=14 -117=12 -118=14 -119=12 -120=9 -121=13 -122=14 -123=13 -124=14 -125=13 -126=8 -127=13 -[numbers] -0=16 -1=7 -2=15 -3=14 -4=14 -5=15 -6=16 -7=13 -8=16 -9=16 -10=18 -11=7 -12=6 -13=7 -14=14