From f6b692823dbc0879d3628143fa8ca10f11af4f2c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 24 Mar 2008 04:07:46 +0000 Subject: [PATCH] remove DifficultyIcon, use DifficultyDisplay in gameplay, DifficultyListRow -> DifficultyDisplayListRow to make inheritance clear --- .../ScreenGameplay overlay/difficulty bar.png | Bin 2797 -> 0 bytes .../BGAnimations/_standard decoration.lua | 7 ++- ...r => DifficultyDisplayListRow meter.redir} | 0 ...ultyDisplayListRow ticks 2x1 (stroke).png} | Bin ...=> DifficultyDisplayListRow ticks 2x1.png} | Bin ...ini => DifficultyDisplayListRow ticks.ini} | 0 ...cultyDisplayGameplay frame (doubleres).png | Bin 0 -> 2630 bytes ...> DifficultyDisplayListRow difficulty.lua} | 0 ...lua => DifficultyDisplayListRow frame.lua} | 0 .../ScreenGameplay difficulty icons 2x6.png | Bin 3457 -> 0 bytes stepmania/Themes/default/Languages/en.ini | 16 +++--- stepmania/Themes/default/metrics.ini | 52 ++++++++++-------- 12 files changed, 42 insertions(+), 33 deletions(-) delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png rename stepmania/Themes/default/Fonts/{DifficultyListRow meter.redir => DifficultyDisplayListRow meter.redir} (100%) mode change 100755 => 100644 rename stepmania/Themes/default/Fonts/{DifficultyListRow ticks 2x1 (stroke).png => DifficultyDisplayListRow ticks 2x1 (stroke).png} (100%) mode change 100755 => 100644 rename stepmania/Themes/default/Fonts/{DifficultyListRow ticks 2x1.png => DifficultyDisplayListRow ticks 2x1.png} (100%) mode change 100755 => 100644 rename stepmania/Themes/default/Fonts/{DifficultyListRow ticks.ini => DifficultyDisplayListRow ticks.ini} (100%) mode change 100755 => 100644 create mode 100644 stepmania/Themes/default/Graphics/DifficultyDisplayGameplay frame (doubleres).png rename stepmania/Themes/default/Graphics/{DifficultyListRow difficulty.lua => DifficultyDisplayListRow difficulty.lua} (100%) mode change 100755 => 100644 rename stepmania/Themes/default/Graphics/{DifficultyListRow frame.lua => DifficultyDisplayListRow frame.lua} (100%) mode change 100755 => 100644 delete mode 100644 stepmania/Themes/default/Graphics/ScreenGameplay difficulty icons 2x6.png diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png deleted file mode 100644 index dc0f3d0654c2b8879fe95e53e39d0760d05516ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2797 zcmbW3dpy%`8^^zhLJsjD<&?@HMj>-v%b^T&N=`8`hbApFhuBETVF{%q=bTS@D0QF=rf9f*#EPKb&?T#}#;7;WAFn<7wMEm+HS%+K? z^mp>Vj*JfN_cs9mp*U*`=#?nSYJT*i;}i0Iq=lIDRTr(y+ZLZ3l;J0wc*@jFox}s7 z&kSI~#S*{8q!Pngi?2cD;%MpmSx!oILS>0#$^(iHj-^+xSe6xCbUu`udmwDp=+swc zLBW2naW0eMUEfEYiCP=Ew7Z-(`zUaA5v)jx*4^w4^>PIOrd6^s0MHHs@f-liPy~Pt zKHvfl0LWqhz~%vzxI_Mr;yLC?r~D+S;C0 zHOcz`aw+;&JM~z%I}BQm|M5&`q@S&6IYw2i?k*?ZVw}c@gQT5KUl)oVnUBWHOt<)# z+f--Y8v{1;U^_$B+kcDh2(pLTICs&bVCk`+dG-%OS;(*{WQwlB>fm`$gVbjGi}c{T`XDCT|G!nzNMlrfUV2nd8XXT{?Uu zXV2O9FN2f%Q+S&hE_ifvw2gc zPZChwD}Hx}H$9FM&W7h+JHex1rGA1mKfjk*&_sLPF-c`ma@rjKiWFw-tP44uw!6@7 zXCLIpF~UC4?IWN$RY<~1wNo^3CTl;ae`29d6@0fq|AW@Jl}F6k<3Szvo(ne28}Myc z5YB#Ci4@EDtOsK-5If9PRV%MsrI!xP(9!1DPrZ<$Fx~+nk1rTcVQ|> zWd6R#sfffU($nE@w9oTUZI(Z$aBO2;QAly}ImY=QwTROov&xW{3KM;ElFeY%z1K*a zfWiy7^B`j3l7Wqae73BkQACxI`N7aIK9t=00rHu;aLUF$Ejt$wv&1!Pn5`E>H9(?r z!5jT)UZu=p_P+QPpqY4IvADauuX%WTYxM~5)59c@gUW^k(PWSBC2O_3kC$x1d-1NM zEJ>_cf6IzC3DCEB65b@lp75?2A(Z~;Snc?oLOEinQO|d@NGqt#dHU6?gO2K+u}asa z3`AY>y24Cdo{h)F%_h}|d-{#S7fi>un)Dw$J{EoZsx&wUKwIJ(5wX-4v4d|m^YocL zuRnR94;-$BeAcC&bsHj0P2L8nvl6b6*O$)#gs@WnOUrdPyYz0H_h#c zd#SxL0%>a&@B1OUnlPsjGSDvYX<-{#qF|1j;J&ZJjx1icFJ&DWf-fkkyAl%LZ~d)O z-VQRc%ZrVldI=yJ34!lv|)nYJ~wN%R($WY{dW6sJDZOl`l9cpbm-^emh zhChR9?y-?QBD#X1$vEJ!VyFT;&?Nb?CRO&EpX$wmIPaNJ;U@L)MXLryarOxa&9#MN zCF@-mg~}0?=QJ9@z7Y0eWr-n-0!ZguKLdLA3R8_lO#0Upd7Nh2k&uTT^$qQWcyZph z)M&r8$hF1Ar0$m}L1;;wa$8) zC^$}~vnIA1bY}5SaXUrQy)i!XNOZ)h&}4E>F!&YE>zB{{=EdZ0wIqo)lsBCODtYtDKb9y(M9+09L|KFG z$2rlz(@}QlA-S1nc<{R|>`Y7j!6QBs10!gLop({%u{)xp)ZZp+BJyQ3hs1m$#0d_B z&VTn0QRjaDHijMUEbE=ynK;|g`^s6cRb$gFMQQj&1lx{&y?(Y2yuHQBxK`nZJZq`? z`b32bU(WJXrpCE2OuO@Ht%D&O&Od0tGxZ~@!CO_e=5wR(@TtMYjw$t)YwFYLt%Tx_ z7z39LL)gB2*kD`M8<98p%eC1(llgn{8ehOk`*r2m!BX1cxYCECUw>&Oj(hetA4@+| zCid^@J&tYs-zzy-EZ~rR^BiMH!@oOqmtzYbAA)gN37R+Rh01p2UuYb$D4ZR4?_*pR z2UKn{*lA^ZfxdpaSXl8V3~pmw6c-c!^5g;QG0emVkgfkesH7>6L)|POK*B5;f{sXN0VKV># diff --git a/stepmania/Themes/default/BGAnimations/_standard decoration.lua b/stepmania/Themes/default/BGAnimations/_standard decoration.lua index 19760de4c0..99bda8b6f5 100644 --- a/stepmania/Themes/default/BGAnimations/_standard decoration.lua +++ b/stepmania/Themes/default/BGAnimations/_standard decoration.lua @@ -1,6 +1,11 @@ local MetricsName, FileName = ...; return LoadActor( THEME:GetPathG(Var "LoadingScreen",FileName) ) .. { - InitCommand=cmd(x,THEME:GetMetric(Var "LoadingScreen",MetricsName .. "X");y,THEME:GetMetric(Var "LoadingScreen",MetricsName .. "Y");); + InitCommand=function(self) + local x1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "X"); + if x1 then self:x(x1); end + local y1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "Y"); + if y1 then self:y(y1); end + end; OnCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OnCommand"); OffCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OffCommand"); }; \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/DifficultyListRow meter.redir b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow meter.redir old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyListRow meter.redir rename to stepmania/Themes/default/Fonts/DifficultyDisplayListRow meter.redir diff --git a/stepmania/Themes/default/Fonts/DifficultyListRow ticks 2x1 (stroke).png b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks 2x1 (stroke).png old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyListRow ticks 2x1 (stroke).png rename to stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks 2x1 (stroke).png diff --git a/stepmania/Themes/default/Fonts/DifficultyListRow ticks 2x1.png b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks 2x1.png old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyListRow ticks 2x1.png rename to stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks 2x1.png diff --git a/stepmania/Themes/default/Fonts/DifficultyListRow ticks.ini b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks.ini old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyListRow ticks.ini rename to stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks.ini diff --git a/stepmania/Themes/default/Graphics/DifficultyDisplayGameplay frame (doubleres).png b/stepmania/Themes/default/Graphics/DifficultyDisplayGameplay frame (doubleres).png new file mode 100644 index 0000000000000000000000000000000000000000..d4a57d51dadf5d2805b4afc5af4563fe0a6008ee GIT binary patch literal 2630 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 Lb2v)3@=5tGAM?_g diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index ecd6946ca8..5c50129658 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -35,6 +35,14 @@ The following packages were exported to your Desktop:=The following packages wer [CatalogXml] Saving %s ...=Saving %s ... +[Difficulty] +Beginner=Beginner +Challenge=Expert +Easy=Easy +Edit=Edit +Hard=Hard +Medium=Medium + [CourseDifficulty] Beginner=BEGINNER Challenge=CHALLENGE @@ -56,14 +64,6 @@ Nonstop=Nonstop Oni=Oni Survival=Survival -[Difficulty] -Beginner=Beginner -Challenge=Expert -Easy=Easy -Edit=Edit -Hard=Hard -Medium=Medium - [EditInstallations] You must type a program directory before clicking Add.=You must type a program directory before clicking Add. '%s' is not a valid installation directory.='%s' is not a valid installation directory. diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index b8587762b8..db469673b1 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -949,8 +949,8 @@ StageX=SCREEN_CENTER_X+0 StageY=SCREEN_CENTER_Y-206 StageOnCommand=draworder,100;addy,-100;linear,0.5;addy,100 StageOffCommand=linear,0.5;addy,-100 -StageFrameX= -StageFrameY= +StageFrameX=SCREEN_CENTER_X +StageFrameY=SCREEN_CENTER_Y-206 StageFrameOnCommand=visible,false StageFrameOffCommand= SongNumberP1X=SCREEN_CENTER_X-25 @@ -1026,20 +1026,18 @@ SongOptionsX=SCREEN_CENTER_X+0 SongOptionsY=SCREEN_CENTER_Y+230 SongOptionsOnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100 SongOptionsOffCommand=linear,0.5;addy,100 - -DifficultyP1X= -DifficultyP1Y= -DifficultyP1OnCommand= -DifficultyP1OffCommand=linear,0.5;addx,-200 -DifficultyP1SetReverseCommand=x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-196;cropbottom,0;croptop,0.5;addx,-200;linear,0.5;addx,200 -DifficultyP1SetNoReverseCommand=x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+183;cropbottom,0.5;croptop,0;addx,-200;linear,0.5;addx,200 - -DifficultyP2X= -DifficultyP2Y= -DifficultyP2OnCommand= -DifficultyP2OffCommand=linear,0.5;addx,200 -DifficultyP2SetReverseCommand=x,SCREEN_CENTER_X+254;y,SCREEN_CENTER_Y-196;cropbottom,0;croptop,0.5;addx,-200;linear,0.5;addx,200 -DifficultyP2SetNoReverseCommand=x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+183;cropbottom,0.5;croptop,0;addx,-200;linear,0.5;addx,200 +DifficultyDisplayP1X=SCREEN_CENTER_X-254 +DifficultyDisplayP1Y= +DifficultyDisplayP1OnCommand= +DifficultyDisplayP1OffCommand=linear,0.5;addx,-200 +DifficultyDisplayP1SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200 +DifficultyDisplayP1SetNoReverseCommand=y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200 +DifficultyDisplayP2X=SCREEN_CENTER_X+254 +DifficultyDisplayP2Y= +DifficultyDisplayP2OnCommand= +DifficultyDisplayP2OffCommand=linear,0.5;addx,200 +DifficultyDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200 +DifficultyDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200 LyricsSetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160 LyricsSetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140 # This is used if one player is in reverse and the other isn't. @@ -1971,15 +1969,15 @@ MaxTicks=14 TicksX=0 TicksY=0 TicksOnCommand=shadowlength,0;stoke -TicksSetCommand=%function(self,param) self:diffuse(DifficultyColor(param.Difficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end +TicksSetCommand=%function(self,param) self:diffuse(DifficultyToColor(param.Difficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end ShowTicks=false ShowMeter=true -ShowEditDescription=false +ShowDescription=false ZeroMeterString="?" MeterX=10 MeterY=0 MeterOnCommand=shadowlength,0 -MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyColor(param.Difficulty)) end end +MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyToColor(param.Difficulty)) end end [DifficultyDisplayEdit] Fallback="DifficultyDisplay" @@ -1990,6 +1988,12 @@ MeterOnCommand=shadowlength,2;zoom,0.7 MeterOffCommand= ZeroMeterString= +[DifficultyDisplayGameplay] +Fallback="DifficultyDisplay" +MeterOnCommand=shadowlength,0;zoom,0.5 +FrameOnCommand= +MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyToColor(param.Difficulty)) end end + [ScreenWithMenuElements] Fallback="Screen" AllowDisabledPlayerInput=false @@ -4392,7 +4396,7 @@ CursorP1HideCommand=linear,.3;diffusealpha,0 CursorP2HideCommand=linear,.3;diffusealpha,0 [DifficultyListRow] -Fallback=DifficultyDisplay +Fallback="DifficultyDisplay" FrameX=0 FrameY=0 FrameOnCommand= @@ -4407,10 +4411,10 @@ ShowMeter=1 MeterX=92 MeterY=-1 MeterOnCommand=zoom,0.5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077"); -ShowEditDescription=false -EditDescriptionX=-70 -EditDescriptionY=0 -EditDescriptionOnCommand=horizalign,right;zoom,.5;shadowlength,2;maxwidth,150 +ShowDescription=false +DescriptionX=-70 +DescriptionY=0 +DescriptionOnCommand=horizalign,right;zoom,.5;shadowlength,2;maxwidth,150 ZeroMeterString="?" MeterSetCommand=%function(self,param) self:diffuse(DifficultyAndStepsTypeToColor(param.Difficulty,param.StepsType)); end