From 2956390080b2014e8fc3a5570ccc7d457682f012 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 11 Aug 2007 23:17:38 +0000 Subject: [PATCH] Unbake text from graphic. Someone else might want to change the text a bit. --- .../ScreenGameplay overlay/_score frame.png | Bin 5936 -> 1803 bytes .../ScreenGameplay overlay/default.lua | 42 ++++++++++-------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png index d1bba7b43933bf73b1876287dbd4cd5f69b6eec2..e115400d89a989abbf357aec0eba9af2624459bd 100644 GIT binary patch literal 1803 zcmV+m2lV)fP)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ?fk{L`RCwC#om+@qR~?7H|5|JBea@LnW+qIcxs=3- zv5nMDqe2@55o)lPfMP)@=AjCK2K7a)Q6Kchf_W$?Nb#XBUhvHes3_E`E%;Cyl!O)u zjj2;Ru`_8Vlao2Oz1I5su+N#vB+acA|w*G6hUy-kXuW`DC4o)9P6$9xHdKOwI6=v*y>F`bG_Jd z_~`f9{hs5vg4`LV>IL=Okz0#3CSB#kt(96p0Ba0|vy2rP6SbU)dO@SRb|q`R{qbj> zJpPCODYhIr_EYBW`7~kyCAWsjT24K4IBPIc{r4miw_0v1vM%u*@6~Xj-NU9@=TU|wrP*suKGF8jj z+Q^x%6UxI zYnzu30?z|j?tl0$4juVCSq^y}mM=sWUd>69#Kh2a>}y3=R27UNUwJDu_Phd7}8~ujnwuYU-s}m;*AhgK+Mi6v5j@>wZoT=7$mKRBt~H>sTv90j)vt6 zKJ40=MFr^xvO^VOglHf}gKA3a#AsBLsHpD|uU?9(JNs)M1F>VgM(n`)?}@|^SCPKi zXo%I%2r7!kO=1U#j%u|3N+gE7iVR%Upr}UBO=5cp9)jCQ>y+4uQAq4q$&7|7oCP2b z#156%-dBUFDX|kHlGwV@Fa~1lK zRL9n8cT^aNy{TjO_lamez{qO6)-u@s;$0V~vEeIt~W?^=wUICq}D^gizIKG1p8UL$6Bgf!JyCm>8+a zW32kM_o$fbI`%+pjS-C|C3a#|5?lIf*&0ezEE)!4mxGS25c}tDG^TT5iP1=GF_4ct z$`VD1>teT?EkbWAL@=gAH76#q6T_d_q7kuHv|hKd>=BKE_r5Ro)vHx%m#}S@;my~i zTK-FJCx$z*jeuAa3Bg1U!GQL<|E$DrHQ&Vd?ji=5en*bWpx3D)K9LyG#1^UcUQ1r@ zs4pAQD!yG}I;}I6*jFz767L@%_)6xi=%QDO!7iypVi*(Kh`~9F*>j+wzQkKFS694r z+O10L;D1l^5){?ZNA@4g`OELpl3!v7!@9b&C;}G27WIxGc_>TM6VS_VpOT;}mDsAQ z{QLED+;Qg|!Gq0UYFmfp#Tx0c!HHoJ8rE-@8&f^U&%JxT7LB1Sdk{*(%Ef11Jo(j& z08W4N?4msQ*^|uf{y|@4VQxN0jAv=VrLLX0-3*T4Zal}&dNVh#aeO-KwOdGD5Ska4 z-KFJMHdahjk^3Ir$=(A$=bd{$NVQs0?e=S~2F{-@>9!rJE?wfpZH#RN@yu*5*?V^* zw}wXUsO1?2k$my&Q)iz&`Hf9t1IVEx-(lbUlT2=1-$;^33^PWAMv+llS$wI!yzr5Q zU;U(YgV+G_;YUv}ch6Jgwe%#Y#3-aVTwGinzj*%s<{y8tuxaRq@1QyK$S2vg|3^%1 ztEZKb#Lx;I0xX_;iKRC_rl+1;x#3T4`mJFPKAy9(bb^VQ$7oD!$J&DQn99U3&}m(v t+xiEq%O~{Z=U)7;?rW+XiT^|XGXNrCJU)Me{h9y(002ovPDHLkV1go)eop`Z literal 5936 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 diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua index dd61a0e166..4ed5e4fd7e 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua @@ -1,19 +1,25 @@ -local t = Def.ActorFrame { +local font = LoadFont( "blaster" ); +local frame = LoadActor( "_score frame" ); +local text = GAMESTATE:GetPlayMode() == 'PlayMode_Oni' and "time" or "score"; +return Def.ActorFrame { + Def.ActorFrame { + frame; + font .. { + Text = "player 1 " .. text; + InitCommand = cmd(addy,14;addx,-20;zoom,0.4;shadowlength,0); + }; + InitCommand = cmd(x,SCREEN_LEFT-100;y,SCREEN_CENTER_Y+202); + OnCommand = cmd(linear,1;x,SCREEN_CENTER_X-208); + OffCommand = cmd(linear,1;x,SCREEN_LEFT-100) + }; + Def.ActorFrame { + frame; + font .. { + Text = "player 2 " .. text; + InitCommand = cmd(addy,14;addx,20;zoom,0.4;shadowlength,0); + }; + InitCommand = cmd(x,SCREEN_RIGHT+100;y,SCREEN_CENTER_Y+202); + OnCommand = cmd(linear,1;x,SCREEN_CENTER_X+210); + OffCommand = cmd(linear,1;x,SCREEN_RIGHT+100) + } }; - -if GAMESTATE:IsExtraStage() then - t[#t+1] = LoadActor("_extra score frame") .. { - InitCommand=cmd(x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-208); - OnCommand=cmd(addy,-100;sleep,0.5;linear,1;addy,100); - OffCommand=cmd(linear,1;addy,-100); - }; -else - local sFile = GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "_oni score frame" or "_score frame"; - t[#t+1] = LoadActor(sFile) .. { - InitCommand=cmd(x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+208); - OnCommand=cmd(addy,100;linear,0.5;addy,-100); - OffCommand=cmd(linear,0.5;addy,100); - }; -end - -return t;