From e9bfb25a97f2ba73adf2518b77f7a5ad6b419861 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 27 Mar 2010 18:30:50 -0500 Subject: [PATCH] smaller difficultylist [Midiman] --- .../Graphics/StepsDisplay StepsType.lua | 26 +++++++++++++ .../Graphics/StepsDisplay StepsType.redir | 1 - Themes/default/Languages/en.ini | 35 +++++++++++++++++- Themes/default/metrics.ini | 33 +++++++++-------- .../default/~res/StepsDisplayMusic frame.psd | Bin 61675 -> 84918 bytes 5 files changed, 78 insertions(+), 17 deletions(-) create mode 100644 Themes/default/Graphics/StepsDisplay StepsType.lua delete mode 100644 Themes/default/Graphics/StepsDisplay StepsType.redir diff --git a/Themes/default/Graphics/StepsDisplay StepsType.lua b/Themes/default/Graphics/StepsDisplay StepsType.lua new file mode 100644 index 0000000000..7886496693 --- /dev/null +++ b/Themes/default/Graphics/StepsDisplay StepsType.lua @@ -0,0 +1,26 @@ +local sString; +local t = Def.ActorFrame{ + LoadFont("Common normal")..{ + InitCommand=cmd(shadowlength,1); + SetMessageCommand=function(self,param) + sString = THEME:GetString("StepsDisplay StepsType",ToEnumShortString(param.StepsType)); + if param.Steps and param.Steps:IsAutogen() then + self:diffusebottomedge(color("0.75,0.75,0.75,1")); + else + self:diffuse(Color("White")); + end; + self:settext( sString ); + end; + }; + -- argh this isn't working as nicely as I would've hoped... + --[[ + Def.Sprite{ + SetMessageCommand=function(self,param) + self:Load( THEME:GetPathG("","_StepsType/"..ToEnumShortString(param.StepsType)) ); + self:diffusealpha(0.5); + end; + }; + --]] +}; + +return t; \ No newline at end of file diff --git a/Themes/default/Graphics/StepsDisplay StepsType.redir b/Themes/default/Graphics/StepsDisplay StepsType.redir deleted file mode 100644 index 04b2ead777..0000000000 --- a/Themes/default/Graphics/StepsDisplay StepsType.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 997c973e93..b54e695a29 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -46,4 +46,37 @@ UserPrefGameplayShowScore=Show or Hide the score display in gameplay. UserPrefGameplayShowStepsDisplay=Show or Hide the step information display in gameplay. UserPrefShowLotsaOptions=Choose how many lines/rows of options to choose from. &oq;Few&cq; keeps the list to a minimum. &oq;Many&cq; adds various show-off mods. UserPrefAutoSetStyle=Allow the game to list all one player and two player modes at once instead of one style only. This might require a restart of StepMania\n( or alternatively hit F2! ) -UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short). \ No newline at end of file +UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short). +[StepsListDisplayRow StepsType] +Dance_Single=DS +Dance_Double=DB +Dance_Couple=DC +Dance_Solo=DX +Dance_Routine=DR +Pump_Single=PS +Pump_Double=PD +Pump_Halfdouble=HD +Pump_Couple=PC +Pump_Routine=PR +Kb7_Single=KB7 +Ez2_Single=ES +Ez2_Double=ED +Ez2_Real=ER +Para_Single=PS +Ds3ddx_Single=XS +Bm_Single5=5K +Bm_Double5=10K +Bm_Single7=7K +Bm_Double7=14K +Maniax_Single=MS +Maniax_Double=MD +Techno_Single4=S4 +Techno_Single5=S5 +Techno_Single8=S8 +Techno_Double4=D4 +Techno_Double5=D5 +Pnm_Five=5B +Pnm_Nine=9B +Guitar_Five=5F +Karaoke=KA +Lights_Cabinet=! \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index fdfab76370..22794ad06f 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -28,6 +28,10 @@ ShowQMarksInRandomCycle=true # - = In Conjuction With / Then # ~ = Released # + = At The Same Time +[DifficultyList] +CapitalizeDifficultyNames=false +ItemsSpacingY=24 +NumShownItems=8 [HelpDisplay] TipShowTime=7 [Combo] @@ -357,7 +361,7 @@ end; # ShowDescription=true DescriptionX=-20 -DescriptionY=0 +DescriptionY=-5 DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8 DescriptionSetCommand=%function(self,param) \ if self:GetText() == "" then \ @@ -375,10 +379,10 @@ AutogenY=0 AutogenOnCommand= AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end # -ShowStepsType=false -StepsTypeX=0 -StepsTypeY=0 -StepsTypeOnCommand=zoom,0.5 +ShowStepsType=true +StepsTypeX=-20 +StepsTypeY=7 +StepsTypeOnCommand=zoom,0.45 [StepsDisplayEdit] Fallback="StepsDisplay" @@ -397,7 +401,7 @@ Fallback="StepsDisplay" [StepsDisplayListRow] # -ItemsSpacingY=30 +ItemsSpacingY=24 NumShownItems=5 # MoveCommand=decelerate,0.3 @@ -408,8 +412,7 @@ FrameOnCommand= FrameOffCommand= FrameSetCommand=%function(self,param) \ if param.CustomDifficulty then \ - self:diffuse(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ - self:diffusetopedge(CustomDifficultyToColor(param.CustomDifficulty)); \ + self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ else \ self:diffuse(color('1,1,1,1')); \ end; \ @@ -424,7 +427,7 @@ ShowMeter=true ZeroMeterString="0" MeterX=56 MeterY=0 -MeterOnCommand=shadowlength,1; +MeterOnCommand=shadowlength,1;zoom,0.65 MeterOffCommand= MeterSetCommand=%function(self,param) \ if param.CustomDifficulty then \ @@ -441,9 +444,9 @@ MeterSetCommand=%function(self,param) \ end; # ShowDescription=true -DescriptionX=-64-8 -DescriptionY=-5 -DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8;uppercase,true; +DescriptionX=-64-8+20 +DescriptionY=0 +DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8-20;uppercase,true; DescriptionOffCommand= DescriptionSetCommand=%function(self,param) \ if self:GetText() == "" then \ @@ -458,13 +461,13 @@ end; ShowAutogen=true AutogenX=0 AutogenY=0 -AutogenOnCommand=diffuseshift;effectcolor1,color("0,0.5,1,0.85");effectcolor2,BoostColor(color("0,0.5,1,1"),1.5); +AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); AutogenSetCommand= # #ShowStepsType=GetUserPref("UserPrefAutoSetStyle") ShowStepsType=true StepsTypeX=-64-8 -StepsTypeY=7 +StepsTypeY=0 StepsTypeOnCommand=zoom,0.45;skewx,-0.125 StepsTypeSetCommand= @@ -960,7 +963,7 @@ BPMLabelOffCommand=bouncebegin,0.15;zoomx,0; # ShowDifficultyList=not GAMESTATE:IsCourseMode(); DifficultyListX=SCREEN_CENTER_X-160 -DifficultyListY=SCREEN_TOP+216+6 +DifficultyListY=SCREEN_TOP+216 DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X; DifficultyListOffCommand=bouncebegin,0.15;zoomx,0; # diff --git a/Themes/default/~res/StepsDisplayMusic frame.psd b/Themes/default/~res/StepsDisplayMusic frame.psd index 85d6fd12a6da8f324f1c15fcc7d56e6179c02281..04c2d45c04dc4feb732d11fbbcb87d6ae57e86f1 100644 GIT binary patch delta 9635 zcmeHLeNaOJ7NJ{}cwhPvQ7s=38p;!mliy}W9 zXZm}@_inBM)I5e*oqW;h`0BzV&iUY7q?c=44-t@eH#aV__}xFx^}D_44?Gx zMgFRI3|UBPE> z>t3mEzx?VEb>Ydapuy+--h36+)}7o^Dl9?KKItSw7cWjzU>rBwzc)!D~FnU zUgn_p<*I?TPrj0UI!)EE-*X znDId7>h(e?9*v)ljxLa!qzjkunJ`n)qBdtnYD&wzPDEU8ftWTDh2TaCQ|}s;h(3$W zv{UwmV`3p$*KmwHM>uP8mlOnPvX)^BiCq7dAq%S>xHy9ba$yM+KoHilU>U71$XbHy z1h}}Pd*6eF!3+OWgpSEuS(wj&!s#PZ7;fP9H+e#7=1EjlfW*!~ZRx;Ezv5*jmBq0$A z=x~Z3BSl+F(<^J-hl>(NQ5toCpyVXbL`N+^6}cNtpMB`<^sE5JIvOw=E|TL!fEgGK zQLtbD2ffI1R(u{REzQEnDhc;UA?vT7fA_Esa0Ew4?u36w`uT^E#S7<<@W0Ksd5(n- zUCi-uC%l`u@&x6dRiaHrzoPc`En(Ddl_=eyVqQST(!58+FfMnd>;F53-xR5sNmdM1 z!{;HUr88OKWXtvuBKhxh|AT-cROG23WF-6aK*<9_M^ZCDqN#=nXl`jRGvTq|6-ST_ z)ReuUVay1;HZW6oHB~C+MJv44l*7-GC!EBnDQA)_Au(sMUT>Qvki*->CQC?!99Rr` z&=1(9$Ju2H-j9+gSk6EfAXDffB4?m?Ms8jK+M2t8=hTF@vR)|YKnN1;%t7XNLQwZc zSJNju*Ydn@gt7V2`uI1qGq6gI0DKV(nzVC@ATcA~fYxqGCGGuQH`7XTi`KuLwAAoc z4$(DplI9SZn5mhIUM&lhM3UsldL=GjG7oKA>46&4{H4qEZzuNmij7XpCv6h*Gv=U# zU4IortRXKy*|0jwFCjl8G8RqSJrB7Rx`~$Z<42@?Tt6%LGP#^GA)y!BNG zHEW)Q+-SLD&nmmLlMqVOf7Byc?emPUJtqU1R>FV;aZJ{-<$7FJTUbd6XGvWr<1xe# zLlRb4j>%||t8o&0pPp8q4^r8HeuA1tSBEo}Bs-7p7Vp*^^nc;bgM5Lc&b*2EMo1te z1;sRnNn9VqLvv}N1FPXm~`&3By0DEKn99p^oVUa50IPMt5ZE-(fJ zYoQ(IE9%eJbDbRTb2SFOYaMr)W4dtj-*X)#xqd>@i-8X6ssjfQ(?tX5iUAxDQhXH< zO#*X3d1l9AI(`x zw%P4PL$LOd+KudO*1e5mdIC&n8 zKS%{@xhotg9LJbLi=i8Mp=SI5()Dl+7%5iQ!BzU-gJb2~;S7u;;gg^uXi#dbGF|z_ zncbPZ{Hr8-bfZ&&?wlO!G!`T<7Nxg%S+&TM{ts#MW8J_FCg7ix7EiGKNwJmKCAiIl z%#dnpxeGXip-V5vocf@YZD*MePW5tq9M8O~qm*mscpbaUefXIvzgfa^mpJBTIe7%O zm}|rLr>e6xvN-7jc^yhF|p@^csT zvA_Xe=(BiDsj=PYv}Umn{x6P$QJ&cqhmP*6ttqeWsutDM?mK#@BHNSJ1R5Lnm*%9V zl7dlH`eH6;*D?_Mu}y*n)}vj8*8;gtmOSI?j+Qm z#Ma#o9Gt}}Pu+1p=6b!_TT&+O6gx}2)%tp?U1n@5)~T&;uhtbeS>9e4z&17%>r=~g zojT`KeQ`r08$eO6X#zZE6MOGd#8KRg+D#)O`MGCE_j NKu=-ckn>CC{y!-D<5vIx delta 4282 zcmc(i4^&iD9>;%g-Wz5x{-{9$5`zj67&4DPGQ*)Wp@>UGY$B^h#;&;*ZYzOuBs|+4 zDnd{)8InNJJ%XXMi8{h)MUscDP1*w(n&n}a5oXB2NkA|O=H0#T4$Rg$?NOIF-goZ1 z_xE}C{_cIh-}l`)(^xL;H?nX0OIAO3e7;fQp;U+R;h{?P%5Y^&lqx2Y4^^skbJ*}- ze4t;;vW)+-$b>jjq9awyqT-kFyjqnIm7t7PMJN}mR4TPfujTrfz=+65l{!9tSwz&* zgam#`c*K(Eh=|BIo?p5+AzaPJ#fELk*r3aDPS^K4xkjwu!ayvKW6Z#BNJp%brCkE> z7^#!Riv?IO+DtR)9pgv`+=Cd{4C^O{5TqYgk20<OGoRXR3PMG8|dj-(%jGc9V;A}d?g**gl3%QBY{z~cs((ML_BYo*% z{n_LI2^xNK-@eQGwfS0$B`3A<%N^E?+!tTjmhs0e4Hq&u+ZIN@svF*@S>ONf(dUze zvj=RJmi^Xm_FTaTn!x1KOqPw(H4q0e*I<*NHhn0REhU>M2> z{QVb(jNSx;*=ZAl(K_IC`1 z_c44?H`4obXUxS%Z)MKuC`|fiqj}r=U0JnXeXz&y&GR?UV@P@7Mg|JT9V2rwRBmm@ zaP%(iNV$9Rx-1c>KHyeMyd9n zJoWUKQ=J)Z^{vn1bl?5%ReNXSs^7}rDg$`yMSMelc2y9g!)tiPN6$Y~!7?%W*0n}C zu|C*f6`Q@8uedw;kni6)Qs=)$sec@)oT=^JOzl(KTikU%Yj*3d_7srenZ4$~Agg$U zY|703GX^g*QzG6xNR>@gKho~Ua^3HH7RhDHvomvE_UCoJ)k)>D`x4VjPw zFM~hu0J@!P6oz0I<~ymOBbITI83MhTVP}K)Y{pGyNK!L1WaV8;8JF_F1&nX`8Ba!z zoM8sI0GE#~Sc01uzX4W|EN;dO_Ie$z0po=MzXtsP)6~Y_nPajOmh35(?ny&-+L!&t z2I~e%wgr=&mwy}2@W=yZ!vmzw1h+fBW|GnNSsuVmT>qyZ^lLf#AATMnBJl!mm_s!3 zOBZ?n$;*=r@}_RYc+fY?$6X{+UD$@X@u4dhJBr)PZCuC2D?{TpEMRujSXa0m^&+;g z&NwPyjHTn)M}fs+NQxm)8X_ke4^XF)6Zfd=|nafIKdt%63BjP_uJ#h4jir- zr=cFNv4>hr$-9;@nvyZgyEG+Y>bmO+#MB|Spst(bPR#J2@xnxgFBk_&h9|Q>*-nQF zkX;7%Oa;>@tvgZyqN>0B(CJbEvdiF}setJJzlXs+P=WaUG1Ga#+$ObT{kvHH*H;0e z=lH~7a3?B&F32a<1{~}9VDO@1rCG@>3VzU)wSfSvlV57?c5Sbg%}w=l63DN#lvQlX zZ|o_unQXG2#{5kR^52V4x763JR;3haOh_Y3sk-|5Dt8e(De@Y2@j-#b0pXg(>k>jK3+1{T z?2^D!#&ee(tW$`hEQ;%Nur@(WnVM^JuvS5XDAaJR4*0o{Kv@F!xr4O`Nt7jVEe_T! ztfXuu*X&?TLK1 zWzvJ`74{TM-B+Rd+Nz>TQ>Cn`wjS99A*u&e9xXDM46>t@h^j|anIbihsw^*6K~yGc T(akSpLW?1OZbXZsM#cIc)L&#Y