From b5a7c11b4fc6c765feccbdfdc9e664232eccff3d Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 2 Aug 2010 01:18:32 -0500 Subject: [PATCH] various theme changes from midi; shortens the main options menu a bit --- Themes/_fallback/Languages/en.ini | 2 ++ Themes/_fallback/metrics.ini | 26 ++++++++++++++---- .../default.lua | 4 ++- .../_CombinedLifeMeterTug stream p1.png | Bin 2136 -> 0 bytes .../_CombinedLifeMeterTug stream p2.png | Bin 2888 -> 0 bytes Themes/default/metrics.ini | 19 +++++++------ 6 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 Themes/default/Graphics/_CombinedLifeMeterTug stream p1.png delete mode 100644 Themes/default/Graphics/_CombinedLifeMeterTug stream p2.png diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 7e3c456453..fdb14076e7 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -397,6 +397,7 @@ ProgressiveNonstopLifebar=Determine whether the lifebar gets harsher as a nonsto ProgressiveStageLifebar=Determine whether the lifebar gets harsher on later stages. LifeDifficulty + this = LifeDifficulty on a final stage. (No effect if Event Mode). ProTiming=ProTiming RandomBackgroundMode=Choose background style. &oq;Animations&cq; uses random items in the BGAnimations folder; &oq;Random Movies&cq; cycles through movies in the RandomMovies folder. +More Options=Access more advanced options here. RandomModifiers= Rate=Rate RefreshRate=Controls how many times per second the screen will refresh. Only has an effect when Display Mode is set to &oq;Full Screen&cq;. @@ -885,6 +886,7 @@ MenuTimer=Menu Timer Meter=Meter Mines=Mines MoveRandomToEnd=Random At End +More Options=More Options MovieColorDepth=Movie Color MusicWheelSwitchSpeed=Wheel Speed MusicWheelUsesSections=Wheel Sections diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 25dfa87205..358f666bc8 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -720,14 +720,13 @@ FadeSeconds=1 SwitchSeconds=0.10 RandomPicksLockedSongs=true UseSectionsWithPreferredGroup=false +OnlyShowActiveSection=false +RemindWheelPositions=false # RouletteSwitchSeconds=0.05 RouletteSlowDownSwitches=5 LockedInitialVelocity=15 -# -OnlyShowActiveSection=false -RemindWheelPositions=false -# + ScrollBarHeight=300 ScrollBarOnCommand=visible,false # @@ -2310,7 +2309,8 @@ Fallback="ScreenOptionsSimpleService" NextScreen=Branch.Init() PrevScreen=Branch.Init() -LineNames="SD,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9" +LineNames="SystemDirection,KeyConfig,GameType,Reload,MoreOptions" +# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9" Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" Line2="gamecommand;screen,ScreenTestInput;name,Test Input" Line13="gamecommand;screen,ScreenSelectGame;name,Select Game" @@ -2325,8 +2325,20 @@ Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" Line9="gamecommand;screen,ScreenReloadSongs;name,Reload Songs" LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" -LineSD="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction" +LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction" +LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" +LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game" LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" +LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs" +LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options" + +[ScreenOptionsExtended] +Fallback="ScreenOptionsService" +# +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" +# +LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9" [ScreenOptionsServiceChild] Fallback="ScreenOptionsMaster" @@ -2351,6 +2363,8 @@ ExplanationTogetherY=SCREEN_CENTER_Y+174 ExplanationTogetherOnCommand=zoom,0.625;shadowlength,0;wrapwidthpixels,600/0.665;cropright,1;linear,0.5;cropright,0 ExplanationTogetherOffCommand= +[ScreenOptionsServiceExtendedChild] +Fallback="ScreenOptionsServiceChild" [ScreenMiniMenu] Class="ScreenMiniMenu" Fallback="ScreenOptions" diff --git a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua index a2c2a7ee15..154527c91d 100644 --- a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua @@ -11,11 +11,13 @@ local tRemap = { Stage_5th = 5, Stage_6th = 6, }; + if tRemap[sStage] == PREFSMAN:GetPreference("SongsPerPlay") then sStage = "Stage_Final"; else - return + sStage = sStage; end; + local t = Def.ActorFrame {}; t[#t+1] = Def.Quad { InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color("Black")); diff --git a/Themes/default/Graphics/_CombinedLifeMeterTug stream p1.png b/Themes/default/Graphics/_CombinedLifeMeterTug stream p1.png deleted file mode 100644 index 15f18ebfa689a6580e72f73ed3451413af21ddc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2136 zcmeHH`BT#e7XK!E6G$Qwxdn=;OYY=LsuYWL6e6^Vf*Sjm2!S_fZT*LBq0#)#0C;jOgIXS|3qgxvv1yepPA1u?=zn_@8$50 zd}@#NzybhZ&*cP1SW###f}M@E&#w#JtY9nPhK1Ow&|A<5Pp0#!1uKQ&b533b0Ica< zA=uyh-LaD3`Jk{M0H`j&t;eGPzy{!jMuk}U&CN~b(inZV-*1{t#h z^qGG8bRT_6PM_?hPxR2nI%%3Nnx=y`+D=uyq^jDe%2w(~3suodRmdp)&6IvIr4J^{ z8_Dt}a&Hs4r;*&*^GfEgBg|I{rhb?))6bahV@$~zRt?&2`gj*j-9}Trq$yiz*3rXK>X3{& zD5efdsRI&#!ExGLlsr4sP%X5;fhGdl?wq_L( zenxD5#+c}(DOzcY7D{J5rSlh(q?#nICc)3Fep+4qfBY#Ncr{KPw+g)?h&U2yUECiV zK#HPMXFbf*+~A<7B-Q-!#8V!}ou_XVBZshAK*y677w6l6q~GVWB*)l%;UPRvByqho zkg&P=T~B~{Ay*$xF*|e_lmWZ1h8Daj>P&OZi_mkU=aRCF4)@X5k$OR$d3n{&w@Kjvv!#G)fGZ&{Www zx0v?!Ivpy$n4Fw^@$=86dO=a=xf{|iUX*|$l&Lf-EP7}%#s4qsk*qs6$#5EBy>Gsq z&vLJb(8ty(>Pg7&y5PkbdoO zxJP*4WU0q^X|E=qB@F!=KNK`Qy)4{h_MuYm+8J^XoORZOZBF2OV2Yn`PwcZNll$io z_@W!a30 zJ}?Ge^V=)Nns(?i#NEq%@s9o#0+l2)RXK%_mESr>AKg;2J(UbwqMJ)&>>vu}(gw#V zE@=_BVFrr|aASzDmaWcbx7wj{z0z?(fK*(~f1eXL&3hsBxcPc(74CFQ97xjy zmal7Ah^TF=8>O{5+5pf-?J(?M3@h*h?4j>naH!vGL*LN8$*>>T(N>80(gnE@ztmgN zKXCwtYRy@g;PPz&Ku^%of9)F$iCMS#*=M7}0S1RbS0a`@4Rq+zjuCFSxZiK+w!^$# zD}=lICWiJT6)sig=Moaiar|k zfdj|EPjovo!%vNnF(%h*&LMTYm^ygJ70kh)MoblMCDsQ(-j?0AIlmK~4S(#UO*^jl zrtCt*Bd2osW&2b*ejC{D9E>dejPrM6vo_N65ftnVgUI#Ye1i6JXb19=1HHjj;L@;p z_@AyjdF4brw^kLBgnFFE@qA@o-sO|{k@uM&q_;Edzbu5a5=6B0!bG0ngRctZSiajN z;soO&(sf|BCi7~ns6=)ivtf@JJD5@Xsg^CcbqGbc!7qHSrYGLH@*u>Vy${o#m2%Vg m?Kz$UdoB-|iB3E1WO2*C8?ao@c$o9`#;p#AIFE$m^tT6hP6?o=(5%BDn*475)l!KtyVNQG?TET zl&gV-0S=cH3s;;r;Ba`HmAUOHEWf_KKE{RZ!JsV&v<88eK+qBdni-%u5R`e7O1(%W zUZi4AQn44Q$dgn^B^7#-W~0$;4Ehp{#C#-*ISg1D~^)it#9QA~uo^aG1hPpyg zXDDh7f~~=@B@ng*!RA1W2sQ=6Mh0vMfDH`zIRMuC!}#@q=}ASmy_8>9B?l zt9@Y=4OaQWN*`EBgB3oomDFg$u&e%G0{7ZIV?Pc@XfQQ0uw}GQ+#_E~2#_z$d))j6-*2UA*-2<)j zKl`t5TUOM&BGel`wy>DIY`Hw;AaZaWUVvMnK$xq=(kd$2pi+CIwoWK~q`QBruHe6G zYipZJlH1bv296D+*fck&QR7dSmQ8dk#nlhfDU~vrEMh5sc@?PuebLUbvTDVRpv3U%j;W!2O)y_0F*sUHOal zZZZ#L9>_@XI(Ww)6q)S;pNayA8>;roXLjRhc@1r&3k&)^t_mF`-N*Bqvv!~9H_HyZ zUlgC*)wC<DVpl@hCj{T z&)H!T2Dpa%i;8;m!XJp9gx5OBG=0?ddbDkW@}KA5UZySH?$jRn0UvjI-mu#}d*}g# z*_So;9~!2+x=zVm>*K5?2I)OqNOBFzIllTu{)vWmI#?a^dlwzOY?L38_?J0%&Dpu` zM9f@`wS?x;m*0s6^TJ~qjuP>9`5H+lME*7ekuGs@1W$X`xp;ZEd){E8=2UKns#k6% z$hJ4Gz8<+FQV}P9$&8a()KPH_-lA;38Yjx0yTjK>R#zb~?6OT$_o<4NHqC9mnJVeF z&MUlOL?W^F)ERrR>l@>b+@;IU3o+L_mGr4f$Ve1cfLYh$EjLPgbWAL_*xiZ$K z_IbSlvGfai1cTyH^IWYFeXCb9DXOxBj0pT2TPtK`gU7KCFs~9g=ggsBL?K5Y458rN zf_-y`M=1p6%*k+1q44Houb?IU7rqsFJyQ?k%y#L`98C?+ESJ0f9}i7knsV2#1JW+n z{?z{P70=jx*5aatnOSbVo1*T@4Mm-0(p<><CmlYdXXGHHh8#6woi~i!d~Dbr3k8d~TNFyp(sZ0SV9-(T zmX*p6ZBEq&po!8K^EuD1}SW&Wm3k~r80Vu?at@N8PuQos#1j~KdE}IFj=hk z;i}Sk@(t<-6vfY5nVYU;4?Jxd${jkKthB?9qNG36vrET!EApghHh$5-C636J8$3(+ zJE3)HVa`PY=cLt!yE7^`>ukF5YF2d2=K9%Bg=wjhRt3K=>KjNDCZ65? z$#V9OvJd_*nyyo~Tyo0FP(1$r<^V-jTk;onvZS2Um^lNb^sb+fibzngJwGbf_hTPx z`)?Oh)%U9EzExG{<;9<>@ur`1v30U-JlFoaz7j!Sn?kG#cz@!UrndsJ#u-Mb)~rUU zzPfvN=#T366NkshqJE+*L5=4!wKR9IW`Dtk{r|oTxir-;#%X-~wN33|Je02KP@Q+ss1n>BrM@QDT#2WN`bvR~BWgwpH zs+}oA!St~!MM~-G%GOvXCSC62qkOW-o|)rjVKK(P{g|@v$u0d(e$sFD5}W#;h#o(7 jj_1mn#AaUF=h(GQyYb`nm=9V1+n>Pn)LElULr3<%6|tDN diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 7e967a8766..0d88d55eea 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -86,12 +86,12 @@ JudgmentOnCommand= # !!! # -JudgmentW1Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 -JudgmentW2Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 -JudgmentW3Command=shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; -JudgmentW4Command=shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; -JudgmentW5Command=shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,1,2,2;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 -JudgmentMissCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +JudgmentW1Command=finishtweening;shadowlength,0;y,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 +JudgmentW2Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +JudgmentW3Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; +JudgmentW4Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; +JudgmentW5Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,1,2,2;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +JudgmentMissCommand=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 [LifeMeterBar] OverOnCommand=diffuse,Color("Orange");diffuserightedge,BoostColor(Color("Orange"),1.5) @@ -764,7 +764,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X [ScreenOptionsTheme] Fallback="ScreenOptionsServiceChild" -LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail," +LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,FlashyCombo" #,gAuto LinegNotePos="lua,UserPrefNotePosition()" LinegScore="lua,UserPrefGameplayShowScore()" @@ -772,13 +772,16 @@ LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()" LinegOpts="lua,UserPrefShowLotsaOptions()" LinegAuto="lua,UserPrefAutoSetStyle()" LinegLongFail="lua,UserPrefLongFail()" +LineFlashyCombo="lua,UserPrefFlashyCombo()" [ScreenOptionsSystemDirection] LineNames="1,2,3,4,5,6,7,8,9,FlashyCombo,RollCombo,10,11,12,13,14,15,16,LF,17,18,19,20,21,22" LineLF="lua,UserPrefLongFail()" LineRollCombo="lua,UserPrefComboOnRolls()" LineFlashyCombo="lua,UserPrefFlashyCombo()" - +[ScreenOptionsAdvanced] +LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo" +LineRollCombo="lua,UserPrefComboOnRolls()" [ScreenOptionsService] ShowHeader=false