From 1210dd7c42a18a7b692b75016c2e0b33641e4a94 Mon Sep 17 00:00:00 2001 From: ListenerJubatus Date: Sat, 12 Aug 2017 18:45:03 -0600 Subject: [PATCH] Resolve visibility/contrast issues in Lambda theme --- .../ScreenEvaluation underlay/default.lua | 4 ++-- .../default.lua | 4 ++-- .../OptionsUnderline Left (doubleres).png | Bin 740 -> 916 bytes .../OptionsUnderline Middle (doubleres).png | Bin 899 -> 810 bytes .../OptionsUnderline Right (doubleres).png | Bin 1026 -> 907 bytes .../OptionsUnderlineP1 Left (doubleres).png | Bin 740 -> 916 bytes .../OptionsUnderlineP1 Middle (doubleres).png | Bin 899 -> 810 bytes .../OptionsUnderlineP1 Right (doubleres).png | Bin 1026 -> 907 bytes .../ScreenOptions LineHighlight P1.lua | 2 -- .../ScreenOptions LineHighlight P1.png | Bin 0 -> 4553 bytes .../ScreenOptions LineHighlight P2.png | Bin 0 -> 4512 bytes .../ScreenOptions LineHighlight P2.redir | 1 - .../Graphics/ScreenOptions line highlight.png | Bin 1012 -> 0 bytes .../Graphics/ScreenSelectMusic info pane.png | Bin 9428 -> 10821 bytes .../ScreenNetEvaluation icon.redir | 1 + Themes/default/Scripts/02 Colors.lua | 8 ++++---- Themes/default/metrics.ini | 16 ++++++++-------- 17 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 Themes/default/Graphics/ScreenOptions LineHighlight P1.lua create mode 100644 Themes/default/Graphics/ScreenOptions LineHighlight P1.png create mode 100644 Themes/default/Graphics/ScreenOptions LineHighlight P2.png delete mode 100644 Themes/default/Graphics/ScreenOptions LineHighlight P2.redir delete mode 100644 Themes/default/Graphics/ScreenOptions line highlight.png create mode 100644 Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua index 30577c802a..410b5af955 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua @@ -126,7 +126,7 @@ local eval_parts = Def.ActorFrame {} for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Some things to help positioning - local step_count_offs = string.find(p, "P1") and -150 or 150 + local step_count_offs = string.find(p, "P1") and -140 or 140 local grade_parts_offs = string.find(p, "P1") and -320 or 320 local p_grade = STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetGrade() @@ -201,7 +201,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Primary score. eval_parts[#eval_parts+1] = Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1), + InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180), OnCommand=function(self) self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1) end; diff --git a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua index 0e15cf9b80..bcccee6c51 100644 --- a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua @@ -80,7 +80,7 @@ local eval_parts = Def.ActorFrame {} for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Some things to help positioning - local step_count_offs = string.find(p, "P1") and -150 or 150 + local step_count_offs = string.find(p, "P1") and -140 or 140 local grade_parts_offs = string.find(p, "P1") and -320 or 320 local p_grade = STATSMAN:GetAccumPlayedStageStats():GetPlayerStageStats(p):GetGrade() @@ -137,7 +137,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Primary score. eval_parts[#eval_parts+1] = Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1), + InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180), OnCommand=function(self) self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1) end; diff --git a/Themes/default/Graphics/OptionsUnderline Left (doubleres).png b/Themes/default/Graphics/OptionsUnderline Left (doubleres).png index 300f259692466a735e3ce04754d1a5c305116e84..882d9222de0aa52d13fa03320bbfbe1f46050940 100644 GIT binary patch delta 805 zcmaFDI)#0LO1*SuNJL45ua8x7ey(0(N`6wRUPW#J0|?mIR}>^BXQ!4ZB&DWj=GiK} z-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakZd%cjB#Xh3diNuokUZcbjY zRfVk**jy_h8zii+qySb@l5MLLQSTd|;GAESs$i;Ts%M~N$E9FXl#*r@ zWt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)S^`fSBQuTAW;z zSx}OhpQivaGchT@w8U0PNgrg1KGYU9po8_{E(UVoeooB;db9}WBPp-duO=$0D%mfd zl%OOivT*~4(Aq^uI2@(BJKP*~lUU+?iz+!QWy(2~CT6JD3;AhF?mfvpGbfIlm3dw3 zQPt^RMWxHE3LkZ9?6NX87hJZk*7icevE6l>!~PckpJgj{T{L3@XTR2}Y2x!l=Ea>} zt@fU)Tw|q&&yScJi%+t)zW23_dS*U(a_T?BNbdGy2QI0-@w!&9rEThzX@b+HKR&mF z+v};_GjExXZ~n|VBKNUAuf&Ok^FdNq;js_KCpym5{rYIAp#ADewfE1>PgKGuMyAU4 zhE7^?;<4aXg{zN+gclu8T@q>j`~UX!RY@np*S+I#_}raX^QEbjz3X<{$J!i;qrw?A zZL4!k?aNsX&tH@uZu(u(!u;W*U8`KbKPckfHSbD?n5Jj%qiHTo_s%aU6;!;Hzc6*@ zoz180miG(Xo3MUY<6q_%lRuxE8lQ3@{b}if^0ku>FiO-<@^o|;uTLUE+a(X@!j^JNWMX-n@19^0%xE z0)mQ*DqW0TD=BdsYn;Dq@^|W)=Y~ov<7O1^lTPm2`;K$Bl2%mjg7$n+()V=rb6Mw< G&;$U0NK7~Y delta 651 zcmV;60(AY92jm5iB$G=4A|k&;#h{T0T39FqQL99vLeRz{;tSLwiD1+wxx9otj=Ka2 zlaB!>e;Q0FX}!?{=}b=ZPy3upp=D?DD>ho`pa*wY(bf6DRFJy%^?=2UcW$#*{d50X zYc!@SV6h30E2@?go)Ml~Nw3U?~Wa8&qQ*rmw@h3`#0Qsy_46J`D}Squ6nz}hbC zOw@3shLxn27M7ROmrmuC%6-h2*khT+fW%($e{OXAOyk4JER#&&Wr#7Ey|@`>P*&8* z_muJ%$V#pvvq}MtH4-Gr;Sx13)ngLlqQ_*UD46~K+gCk4GF+~1_d(N(VSMyM^9~fZ z4deURFp4M8@C;X(YJT#7#ngUc=GdQ!t$xFj`*TjOzfKZCXq ze{|eJ%SyRtm3>YhA-Ex5bp!hcFd*k0tG|CNXYtugmz4kj00v@9M??Vs0RI60puMM) z00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-&s3ltzSu))yD0002wNklZt~5JhLm8nB5FLP8Wk0S%(008zQwe-8SAn(IY502H|em*52HoMw~QW}9_mY34uA z|05$jIYbmSP4k%~NoefIx=AT}*L49A4ZyHPMDKANf31Jm05j>h#cdp37RxvfP(t>Fl-sLT`HUIF9cu%RbKYybr^Wg<%Ms la}Yv+5CVcA0DSdp`~W23SUNm{8CU=S002ovPDHLkV1i7&FjfEn diff --git a/Themes/default/Graphics/OptionsUnderline Middle (doubleres).png b/Themes/default/Graphics/OptionsUnderline Middle (doubleres).png index 6a50b69803d638cf7fc3a8bda5d28154dd25034b..0d03b3de228e6d9bfc7c33e171a7e40da6934ac3 100644 GIT binary patch delta 421 zcmV;W0b2fp2dW0JZ2=-bqmp1E5frho2okNL#0Wtfi-<-+En);;O>%h&c^r2MB9o5+ zCw~%7D;d4X3z=+Q3k3tNg~cV8^%Wa-I&tEOD7rc`HxZ_;eLc`%#=CyAR{eATnmrcR z6=<*tk1DE`7oHTJUdyW{?+SM)sYp!tT-c+@1%>ZTJzC~BlaposF`K;f zw1$UAl2g%6Qajuq**un|F^GtV#rsn?g&8hi(!29f^`Rq+lKLd zY#7B8XncmNY&Ac31jC=AZ&x+d zp=G(;v&ufFj}YFFueyQ#1L%|U&Xr$e&}Zd!pm(hR000SaNLh0L01FcU01FcV0GgZ_ z0000eNklRXCB}D@OK#~b*w3QhA P00000NkvXXu0mjf93Z`N delta 511 zcmV7WO9Skcw_z*LaB_Vs|pjCXFcR{eATT5B|> zD`2q+k1MK{6P^*CThFN`?+SM+$#7KoT-c?_1%>ZTJyPa3lM`kBF`c^f zq=uEGmKK(m)0a-=mCAk0m)K*O#el?K@qcb~{7mD+$t;sh;AMz0nZ39fW>8kt$@i4< z7syJkBC|>XjWrS^$>9<;FV$lbzzXhv3+Ri|eWu*@Me1=z3DaTDT-Nh+E@vct3--5Px*s zLd#0IXO(?UA0fCQUv&ff2QVP#9jm{8ENAiAOqZ1a000SaNLh0L01FcU01FcV0GgZ_ z0001iNklI7~T`uWbtG56E002ovPDHLkV1nmI B@f`pF diff --git a/Themes/default/Graphics/OptionsUnderline Right (doubleres).png b/Themes/default/Graphics/OptionsUnderline Right (doubleres).png index a214c793630859dd9b6e078cc4575bac53a02972..e5914089a829fdd7efbbcac5ec67cda10fdf8f65 100644 GIT binary patch delta 519 zcmV+i0{H!c2#W`>Z2=-bqmp1E5frho2okNL#0Wtfi-<-+En);;O>%h&c^r2MB9o5+ zCw~%7D;d4X3z=+Q3k3tNg~cV8^%Wa-I&tEOD7rc`HxZ_;eLc`%#=CyAR{eATnmrcR z6=<*tk1DE`7oHTJUdyW{?+SM)sYp!tT-c+@1%>ZTJzC~BlaposF`K;f zw1$UAl2g%6Qajuq**un|F^GtV#rsn?g&8hi(!29f^`Rq+lKLd zY#7B8XncmNY&Ac31jC=AZ&x+LLID delta 639 zcmV-_0)YLC2Z9K&Z2=;`M8%+y2wGSu1W~I*qC(KdBH|0wB8gzsCb_(XJdV2r36qZj zCx04DDQUgY1L;go^H2MnOQB_F^D8!5>7WO9Skcw_z*LaB_Vs|pjCXFcR{eATT5B|> zD`2q+k1MK{6P^*CThFN`?+SM+$#7KoT-c?_1%>ZTJyPa3lM`kBF`c^f zq=uEGmKK(m)0a-=mCAk0m)K*O#el?K@qcb~{7mD+$t;sh;AMz0nZ39fW>8kt$@i4< z7syJkBC|>XjWrS^$>9<;FV$lbzzXhv3+Ri|eWu*@Me1=z3DaTDT-Nh+E@vct3--5Px*s zLd#0IXO(?UA0fCQUv&ff2QVP#9jm{8ENAiAOqZ1a000SaNLh0L01FcU01FcV0GgZ_ z00031Nklj1rqMGOVf^eFqU~X3c0HEVI5T&$Q*Y!aN zdEzLF006E5J*$vXqNZtT&iUtuGOT9>>2(#B>$*2NIwYk;l+v1W?h`_OEKu9FZ@P8U zd7jtny86nr^BXQ!4ZB&DWj=GiK} z-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakZd%cjB#Xh3diNuokUZcbjY zRfVk**jy_h8zii+qySb@l5MLLQSTd|;GAESs$i;Ts%M~N$E9FXl#*r@ zWt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)S^`fSBQuTAW;z zSx}OhpQivaGchT@w8U0PNgrg1KGYU9po8_{E(UVoeooB;db9}WBPp-duO=$0D%mfd zl%OOivT*~4(Aq^uI2@(BJKP*~lUU+?iz+!QWy(2~CT6JD3;AhF?mfvpGbfIlm3dw3 zQPt^RMWxHE3LkZ9?6NX87hJZk*7icevE6l>!~PckpJgj{T{L3@XTR2}Y2x!l=Ea>} zt@fU)Tw|q&&yScJi%+t)zW23_dS*U(a_T?BNbdGy2QI0-@w!&9rEThzX@b+HKR&mF z+v};_GjExXZ~n|VBKNUAuf&Ok^FdNq;js_KCpym5{rYIAp#ADewfE1>PgKGuMyAU4 zhE7^?;<4aXg{zN+gclu8T@q>j`~UX!RY@np*S+I#_}raX^QEbjz3X<{$J!i;qrw?A zZL4!k?aNsX&tH@uZu(u(!u;W*U8`KbKPckfHSbD?n5Jj%qiHTo_s%aU6;!;Hzc6*@ zoz180miG(Xo3MUY<6q_%lRuxE8lQ3@{b}if^0ku>FiO-<@^o|;uTLUE+a(X@!j^JNWMX-n@19^0%xE z0)mQ*DqW0TD=BdsYn;Dq@^|W)=Y~ov<7O1^lTPm2`;K$Bl2%mjg7$n+()V=rb6Mw< G&;$U0NK7~Y delta 651 zcmV;60(AY92jm5iB$G=4A|k&;#h{T0T39FqQL99vLeRz{;tSLwiD1+wxx9otj=Ka2 zlaB!>e;Q0FX}!?{=}b=ZPy3upp=D?DD>ho`pa*wY(bf6DRFJy%^?=2UcW$#*{d50X zYc!@SV6h30E2@?go)Ml~Nw3U?~Wa8&qQ*rmw@h3`#0Qsy_46J`D}Squ6nz}hbC zOw@3shLxn27M7ROmrmuC%6-h2*khT+fW%($e{OXAOyk4JER#&&Wr#7Ey|@`>P*&8* z_muJ%$V#pvvq}MtH4-Gr;Sx13)ngLlqQ_*UD46~K+gCk4GF+~1_d(N(VSMyM^9~fZ z4deURFp4M8@C;X(YJT#7#ngUc=GdQ!t$xFj`*TjOzfKZCXq ze{|eJ%SyRtm3>YhA-Ex5bp!hcFd*k0tG|CNXYtugmz4kj00v@9M??Vs0RI60puMM) z00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-&s3lt#%77Bo#0002wNklZt~5JhLm8nB5FLP8Wk0S%(008zQwe-8SAn(IY502H|em*52HoMw~QW}9_mY34uA z|05$jIYbmSP4k%~NoefIx=AT}*L49A4ZyHPMDKANf31Jm05j>h#cdp37RxvfP(t>Fl-sLT`HUIF9cu%RbKYybr^Wg<%Ms la}Yv+5CVcA0DSdp`~W23SUNm{8CU=S002ovPDHLkV1iCiE?NKp diff --git a/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png b/Themes/default/Graphics/OptionsUnderlineP1 Middle (doubleres).png index 6a50b69803d638cf7fc3a8bda5d28154dd25034b..0d03b3de228e6d9bfc7c33e171a7e40da6934ac3 100644 GIT binary patch delta 421 zcmV;W0b2fp2dW0JZ2=-bqmp1E5frho2okNL#0Wtfi-<-+En);;O>%h&c^r2MB9o5+ zCw~%7D;d4X3z=+Q3k3tNg~cV8^%Wa-I&tEOD7rc`HxZ_;eLc`%#=CyAR{eATnmrcR z6=<*tk1DE`7oHTJUdyW{?+SM)sYp!tT-c+@1%>ZTJzC~BlaposF`K;f zw1$UAl2g%6Qajuq**un|F^GtV#rsn?g&8hi(!29f^`Rq+lKLd zY#7B8XncmNY&Ac31jC=AZ&x+d zp=G(;v&ufFj}YFFueyQ#1L%|U&Xr$e&}Zd!pm(hR000SaNLh0L01FcU01FcV0GgZ_ z0000eNklRXCB}D@OK#~b*w3QhA P00000NkvXXu0mjf93Z`N delta 511 zcmV7WO9Skcw_z*LaB_Vs|pjCXFcR{eATT5B|> zD`2q+k1MK{6P^*CThFN`?+SM+$#7KoT-c?_1%>ZTJyPa3lM`kBF`c^f zq=uEGmKK(m)0a-=mCAk0m)K*O#el?K@qcb~{7mD+$t;sh;AMz0nZ39fW>8kt$@i4< z7syJkBC|>XjWrS^$>9<;FV$lbzzXhv3+Ri|eWu*@Me1=z3DaTDT-Nh+E@vct3--5Px*s zLd#0IXO(?UA0fCQUv&ff2QVP#9jm{8ENAiAOqZ1a000SaNLh0L01FcU01FcV0GgZ_ z0001iNklI7~T`uWbtG56E002ovPDHLkV1nmI B@f`pF diff --git a/Themes/default/Graphics/OptionsUnderlineP1 Right (doubleres).png b/Themes/default/Graphics/OptionsUnderlineP1 Right (doubleres).png index a214c793630859dd9b6e078cc4575bac53a02972..e5914089a829fdd7efbbcac5ec67cda10fdf8f65 100644 GIT binary patch delta 519 zcmV+i0{H!c2#W`>Z2=-bqmp1E5frho2okNL#0Wtfi-<-+En);;O>%h&c^r2MB9o5+ zCw~%7D;d4X3z=+Q3k3tNg~cV8^%Wa-I&tEOD7rc`HxZ_;eLc`%#=CyAR{eATnmrcR z6=<*tk1DE`7oHTJUdyW{?+SM)sYp!tT-c+@1%>ZTJzC~BlaposF`K;f zw1$UAl2g%6Qajuq**un|F^GtV#rsn?g&8hi(!29f^`Rq+lKLd zY#7B8XncmNY&Ac31jC=AZ&x+LLID delta 639 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 W>$=WH`)7XkWG6cp+uF0gU;jUeLcu5i literal 0 HcmV?d00001 diff --git a/Themes/default/Graphics/ScreenOptions LineHighlight P2.redir b/Themes/default/Graphics/ScreenOptions LineHighlight P2.redir deleted file mode 100644 index 998ddd6029..0000000000 --- a/Themes/default/Graphics/ScreenOptions LineHighlight P2.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenOptions LineHighlight P1 \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenOptions line highlight.png b/Themes/default/Graphics/ScreenOptions line highlight.png deleted file mode 100644 index e51c150fc9c6fc1455b0b35d872301222281a2ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1012 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 M$3(kE(=q1%15^Z=QUCw| diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir new file mode 100644 index 0000000000..d1b031d997 --- /dev/null +++ b/Themes/default/Graphics/ScreenWithMenuElements header/ScreenNetEvaluation icon.redir @@ -0,0 +1 @@ +ScreenEvaluationNormal icon \ No newline at end of file diff --git a/Themes/default/Scripts/02 Colors.lua b/Themes/default/Scripts/02 Colors.lua index 6848ace561..9c653f07dc 100644 --- a/Themes/default/Scripts/02 Colors.lua +++ b/Themes/default/Scripts/02 Colors.lua @@ -49,13 +49,13 @@ ModeIconColors = { GameColor = { PlayerColors = { - PLAYER_1 = color("#437CE7"), - PLAYER_2 = color("#EB3F8C"), + PLAYER_1 = color("#3982FF"), + PLAYER_2 = color("#FF4596"), both = color("#FFFFFF"), }, PlayerDarkColors = { PLAYER_1 = color("#EB3F8C"), - PLAYER_2 = color("#89385A"), + PLAYER_2 = color("#7F083C"), both = color("#F5E1E1"), }, Difficulty = { @@ -105,7 +105,7 @@ GameColor = { JudgmentLine_W4 = color("#86ACD6"), JudgmentLine_W5 = color("#958CD6"), JudgmentLine_Held = color("#FFFFFF"), - JudgmentLine_Miss = color("#ff3c3c"), + JudgmentLine_Miss = color("#F97E7E"), JudgmentLine_MaxCombo = color("#ffc600") }, } diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 6c11b1d680..97881b179c 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -305,11 +305,11 @@ LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effect LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;effectcolor2,color("1,0,0,0.5");effectcolor1,color("1,0,0,0.25") # -LineHighlightP1OnCommand=diffuse,ColorLightTone(PlayerColor(PLAYER_1));diffusealpha,0.65;zoomtowidth,720;fadeleft,0.35;faderight,0.35; -LineHighlightP1ChangeCommand=finishtweening;diffusealpha,0.65; +LineHighlightP1OnCommand=diffuse,PlayerColor(PLAYER_1);zoomtowidth,720; +LineHighlightP1ChangeCommand=finishtweening;diffusealpha,1; LineHighlightP1ChangeToExitCommand=finishtweening;diffusealpha,0.15; -LineHighlightP2OnCommand=diffuse,ColorLightTone(PlayerColor(PLAYER_2));diffusealpha,0.65;zoomtowidth,720;fadeleft,0.35;faderight,0.35; -LineHighlightP2ChangeCommand=finishtweening;diffusealpha,0.65; +LineHighlightP2OnCommand=diffuse,PlayerColor(PLAYER_2);zoomtowidth,720; +LineHighlightP2ChangeCommand=finishtweening;diffusealpha,1; LineHighlightP2ChangeToExitCommand=finishtweening;diffusealpha,0.15; # RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-213+50*offsetFromCenter) end @@ -393,7 +393,7 @@ TitleLoseFocusCommand=diffuse,color("#512232"); TitleOnCommand=maxwidth,600;zoom,0.6 [OptionRowExit] -FrameOnCommand=visible,true;diffusealpha,0.45; +FrameOnCommand=visible,true;diffusealpha,0.2; FrameX=SCREEN_CENTER_X; ItemsMinBaseZoom=1 @@ -402,7 +402,7 @@ ItemGainFocusCommand=stoptweening;linear,0.1;diffuse,color("#A61C17"); ItemLoseFocusCommand=stoptweening;decelerate,0.05;diffuse,color("#A61C17"); FrameGainFocusCommand=stoptweening;linear,0.1;diffusealpha,1; -FrameLoseFocusCommand=stoptweening;decelerate,0.05;diffusealpha,0.45; +FrameLoseFocusCommand=stoptweening;decelerate,0.05;diffusealpha,0.2; ColorSelected=color("#A61C17") ColorNotSelected=color("#A61C17") @@ -422,9 +422,9 @@ ExplanationTogetherOnCommand=stoptweening;zoom,0.75;diffuse,color("#512232");wra [OptionRow] TitleX=SCREEN_CENTER_X-440 TitleGainFocusCommand=diffuse,color("#9d324e"); -TitleLoseFocusCommand=diffuse,color("#512232"); +TitleLoseFocusCommand=diffuse,color("#320E1B"); TitleOnCommand=shadowlength,0;wrapwidthpixels,SCREEN_WIDTH*0.4;vertspacing,-6;zoom,0.5;horizalign,left; -ColorSelected=color("#512232") +ColorSelected=color("#320E1B") ColorNotSelected=color("#9d324e") ColorDisabled=color("0.37,0.16,0.29,0.5") ItemsStartX=SCREEN_CENTER_X-190