From b88db4b6084aaa981f1f7e4268191347bcb06bb0 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 26 Feb 2007 01:36:59 +0000 Subject: [PATCH] add ShowCoinsAndCredits move add Credits* metrics --- .../ScreenSystemLayer overlay.lua | 20 +- .../Fonts/ScreenSystemLayer credits 16x16.png | Bin 0 -> 6596 bytes .../Fonts/ScreenSystemLayer credits.ini | 276 ++++++++++++++++++ stepmania/Themes/default/metrics.ini | 6 + 4 files changed, 298 insertions(+), 4 deletions(-) create mode 100644 stepmania/Themes/default/Fonts/ScreenSystemLayer credits 16x16.png create mode 100644 stepmania/Themes/default/Fonts/ScreenSystemLayer credits.ini diff --git a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua index 623256ce29..bb4b662826 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua @@ -4,11 +4,23 @@ function CreditsText( pn ) self:settext(str); end - local text = LoadFont("ScreenManager","credits") .. { - InitCommand=cmd(shadowlength,0); + function UpdateVisible(self) + local screen = SCREENMAN:GetTopScreen(); + local bShow = true; + if screen then + local sClass = screen:GetName(); + bShow = THEME:GetMetric( sClass, "ShowCoinsAndCredits" ); + end + + self:visible( bShow ); + end + + local text = LoadFont(Var "LoadingScreen","credits") .. { + InitCommand=THEME:GetMetric(Var "LoadingScreen","CreditsInitCommand"); RefreshCreditTextMessageCommand=update; CoinInsertedMessageCommand=update; PlayerJoinedMessageCommand=update; + ScreenChangedMessageCommand=UpdateVisible; }; return text; end @@ -36,10 +48,10 @@ local t = Def.ActorFrame { HideSystemMessageMessageCommand = cmd(finishtweening); }; CreditsText( PLAYER_1 ) .. { - InitCommand=cmd(x,SCREEN_LEFT+120;y,SCREEN_BOTTOM-6); + InitCommand=cmd(x,THEME:GetMetric(Var "LoadingScreen","CreditsP1X");y,THEME:GetMetric(Var "LoadingScreen","CreditsP1Y");); }; CreditsText( PLAYER_2 ) .. { - InitCommand=cmd(x,SCREEN_RIGHT-120;y,SCREEN_BOTTOM-6); + InitCommand=cmd(x,THEME:GetMetric(Var "LoadingScreen","CreditsP2X");y,THEME:GetMetric(Var "LoadingScreen","CreditsP2Y");); }; }; diff --git a/stepmania/Themes/default/Fonts/ScreenSystemLayer credits 16x16.png b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits 16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..3f965793d8da8d666e2c65a8fb4ed42b9303a083 GIT binary patch literal 6596 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 literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.ini b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.ini new file mode 100644 index 0000000000..1227909ad4 --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.ini @@ -0,0 +1,276 @@ +[Char Widths] +AddToAllWidths=2 +AddToAllHeights=2 + +# row 1, dots +0=5 +1=5 +2=5 +3=5 +4=5 +5=5 +6=5 +7=5 +8=5 +9=56 +10=0 +11=5 +12=5 +13=0 +14=5 +15=5 +16=5 +# row 2, more dots +17=5 +18=5 +19=5 +20=5 +21=5 +22=5 +23=5 +24=5 +25=5 +26=5 +27=5 +28=5 +29=5 +30=5 +31=5 +32=3 +# row 3, punctuation +33=3 +34=4 #! +35=5 #" +36=5 +37=8 +38=8 #% +39=3 #heart +40=5 #' +41=5 #( +42=6 #) +43=6 #* +44=4 #+ +45=5 #, +46=3 #- +47=8 #. +48=8 #/ +# row 4, numbers and more punctuation +49=9 #0 +50=8 #1 +51=9 #2 +52=8 #3 +53=8 #4 +54=8 #5 +55=8 #6 +56=8 #7 +57=8 #8 +58=3 #9 +59=4 #: +60=6 #; +61=5 #< +62=6 #= +63=7 #> +64=5 #? +# row 5, space, A-O +65=8 #A +66=8 #B +67=8 #C +68=8 #D +69=8 #E +70=8 #F +71=8 #G +72=8 #H +73=7 #I +74=8 #J +75=8 #K +76=8 #L +77=8 #M +78=8 #N +79=8 #O +80=8 #P +# row 6, P-Z, [ ] _ +81=8 #Q +82=8 #R +83=8 #S +84=8 #T +85=8 #U +86=8 #V +87=8 #W +88=8 #X +89=7 #Y +90=8 #Z +91=5 +92=5 +93=5 +94=5 +95=5 +96=5 +# row 7, space, a-o +97=7 #a +98=7 #b +99=7 #c +100=7 #d +101=7 #e +102=7 #f +103=7 #g +104=7 #h +105=3 #i +106=7 #j +107=7 #k +108=3 #l +109=8 #m +110=7 #n +111=7 #o +112=7 #p +# row 8, p-z +113=7 +114=6 +115=7 +116=7 +117=7 +118=7 +119=8 +120=8 +121=7 +122=7 +123=5 +124=5 +125=5 +126=13 +127=5 +128=5 +#--nothing matters after this point--# +129=5 +130=5 +131=5 +132=5 +133=5 +134=5 +135=5 +136=5 +137=5 +138=5 +139=5 +140=5 +141=5 +142=5 +143=5 +144=5 + +145=5 +146=5 +147=5 +148=5 +149=5 +150=5 +151=5 +152=5 +153=5 +154=5 +155=5 +156=5 +157=5 +158=5 +159=5 +160=5 + +161=5 +162=5 +163=5 +164=5 +165=5 +166=5 +167=5 +168=5 +169=5 +170=5 +171=5 +172=5 +173=5 +174=5 +175=5 +176=5 + +177=5 +178=5 +179=5 +180=5 +181=5 +182=5 +183=5 +184=5 +185=5 +186=5 +187=5 +188=5 +189=5 +190=5 +191=5 +192=5 + +193=5 +194=5 +195=5 +196=5 +197=5 +198=5 +199=5 +200=5 +201=5 +202=5 +203=5 +204=5 +205=5 +206=5 +207=5 +208=5 + +209=5 +210=5 +211=5 +212=5 +213=5 +214=5 +215=5 +216=5 +217=5 +218=5 +219=5 +220=5 +221=5 +222=5 +223=5 +224=5 + +225=5 +226=5 +227=5 +228=5 +229=5 +230=5 +231=5 +232=5 +233=5 +234=5 +235=5 +236=5 +237=5 +238=5 +239=5 +240=5 + +241=5 +242=5 +243=5 +244=5 +245=5 +246=5 +247=5 +248=5 +249=5 +250=5 +251=5 +252=5 +253=5 +254=5 +255=5 diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 78005a83bc..201faffe17 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -31,6 +31,7 @@ PrepareScreens= PersistScreens= GroupedScreens= CancelCancelCommand= +ShowCoinsAndCredits=true [ModeSwitcher] PrevModeX=-200 @@ -1916,6 +1917,11 @@ Line4="list,RandomModifiers" Fallback="Screen" Class="ScreenSystemLayer" CreditsJoinOnly=false +CreditsP1X=SCREEN_LEFT+120 +CreditsP1Y=SCREEN_BOTTOM-6 +CreditsP2X=SCREEN_RIGHT-120 +CreditsP2Y=SCREEN_BOTTOM-6 +CreditsInitCommand=shadowlength,0 [ScreenDebugOverlay] Class="ScreenDebugOverlay"