From 8d0f86d2402372c6b8f14d82b3238bd166dec24e Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Tue, 16 Sep 2014 17:05:19 -0700 Subject: [PATCH] SelectStyle, SelectMode improvements --- Themes/_fallback/Languages/en.ini | 6 +++ .../ScreenSelectPlayMode Icon/default.lua | 28 ++++++------ .../ScreenSelectPlayMode scroller/default.lua | 45 ++++++++++++------- .../Graphics/ScreenSelectStyle Icon.lua | 35 ++++++++++++--- 4 files changed, 77 insertions(+), 37 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index fa6dd33c83..c87a54ffbd 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1985,6 +1985,12 @@ Guitar_Five=5 Frets Karaoke=Karaoke Lights_Cabinet=Lights +[StyleType] +StyleType_OnePlayerOneSide=1 Player +StyleType_TwoPlayersTwoSides=2 Players - Versus +StyleType_OnePlayerTwoSides=1 Player +StyleType_TwoPlayersSharedSides=2 Players - Cooperative + [TapNoteScore] AvoidMine=Avoid Mine HitMine=Hit Mine diff --git a/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua index dfd7a92e6c..e2b6cc9619 100644 --- a/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua +++ b/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua @@ -1,11 +1,16 @@ local gc = Var("GameCommand"); + +local string_name = gc:GetText() +local string_expl = THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation") +local icon_color = ModeIconColors[gc:GetName()]; + local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { GainFocusCommand=cmd(stoptweening;bob;effectmagnitude,0,6,0;decelerate,0.05;zoom,1); LoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.1;zoom,0.6); LoadActor("_background base")..{ - InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()]); + InitCommand=cmd(diffuse,icon_color); }; LoadActor("_background effect"); LoadActor("_gloss"); @@ -13,25 +18,18 @@ t[#t+1] = Def.ActorFrame { LoadActor("_cutout"); -- todo: generate a better font for these. - LoadFont("_helveticaneuelt std extblk cn 42px")..{ - InitCommand=cmd(y,-12;zoom,1.1;diffuse,color("#000000");uppercase,true;settext,gc:GetText();); - GainFocusCommand=cmd(diffuse,Color.Black;stopeffect); - LoseFocusCommand=cmd(diffuse,Color.Black;stopeffect); + LoadFont("Common Large")..{ + Text=string.upper(string_name); + InitCommand=cmd(y,-12;maxwidth,232); + OnCommand=cmd(diffuse,Color.Black;shadowlength,1;shadowcolor,color("#ffffff77");skewx,-0.125); }; - LoadFont("_helveticaneuelt std extblk cn 42px")..{ - InitCommand=cmd(y,27.5;zoom,0.45;maxwidth,320*1.6;uppercase,true;settext,THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation")); - GainFocusCommand=cmd(diffuse,Color.White;stopeffect); - LoseFocusCommand=cmd(diffuse,Color.White;stopeffect); + LoadFont("Common Normal")..{ + Text=string.upper(string_expl); + InitCommand=cmd(y,27.5;maxwidth,232); }; LoadActor("_background base") .. { DisabledCommand=cmd(diffuse,color("0,0,0,0.5")); EnabledCommand=cmd(diffuse,color("1,1,1,0")); }; - --[[ - LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. { - DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); - EnabledCommand=cmd(diffuse,color("1,1,1,1")); - }; - --]] }; return t \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua index 7cb7bf5edc..50b27dfda3 100644 --- a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua +++ b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua @@ -8,23 +8,28 @@ local colors = { Oni = color("#d70b8c"), Endless = color("#b4c3d2"), }; + +local icon_color = ModeIconColors[gc:GetName()]; + +local string_name = gc:GetText(); +local string_expl = THEME:GetString(Var "LoadingScreen", gc:GetName() .. "Explanation"); local t = Def.ActorFrame {}; + -- Background! t[#t+1] = Def.ActorFrame { --- GainFocusCommand=cmd(visible,true); --- LoseFocusCommand=cmd(visible,false); LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. { InitCommand=cmd(diffuse,Color("Black");diffusealpha,0.45); GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); }; LoadActor("_HighlightFrame") .. { - InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()];diffusealpha,0); - GainFocusCommand=cmd(finishtweening;diffuse,ColorLightTone(ModeIconColors[gc:GetName()]);linear,1;diffuse,ModeIconColors[gc:GetName()]); + InitCommand=cmd(diffuse,icon_color;diffusealpha,0); + GainFocusCommand=cmd(finishtweening;diffuse,ColorLightTone(icon_color);linear,1;diffuse,icon_color); LoseFocusCommand=cmd(finishtweening;diffusealpha,0); OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1;glow,Color("Invisible")); }; }; + -- Emblem Frame t[#t+1] = Def.ActorFrame { FOV=90; @@ -34,30 +39,36 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(diffusealpha,0;zoom,0.75); GainFocusCommand=cmd(finishtweening;stopeffect;diffusealpha,1;zoom,1;glow,Color("White");decelerate,0.5;glow,Color("Invisible");pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;); LoseFocusCommand=cmd(finishtweening;stopeffect;smooth,0.4;diffusealpha,0;zoom,0.75;glow,Color("Invisible")); - OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,0.5;rotationy,360;glow,Color("Invisible")); + OffFocusedCommand=cmd(finishtweening;stopeffect;glow,icon_color;decelerate,0.5;rotationy,360;glow,Color("Invisible")); }; }; + -- Text Frame t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,-192/2;y,-10); - Def.Quad { - InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,ModeIconColors[gc:GetName()];diffusealpha,0;fadeleft,0.35;faderight,0.35); - GainFocusCommand=cmd(stoptweening;linear,0.5;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,0); - }; - LoadFont("_helveticaneuelt std extblk cn 42px") .. { - Text=gc:GetText(); - InitCommand=cmd(horizalign,left;diffuse,ModeIconColors[gc:GetName()];shadowcolor,ColorDarkTone(ModeIconColors[gc:GetName()]);shadowlength,2;diffusealpha,0;skewx,-0.125); - GainFocusCommand=cmd(finishtweening;x,-16;diffuse,ColorLightTone(ModeIconColors[gc:GetName()]);decelerate,0.45;diffusealpha,1;x,0;diffuse,ModeIconColors[gc:GetName()]); + LoadFont("Common Large") .. { + Text=string_name; + InitCommand=cmd(y,-2;horizalign,left;diffuse,icon_color;strokecolor,ColorDarkTone(icon_color);shadowlength,2;diffusealpha,0;skewx,-0.125); + OnCommand=cmd(glowshift;textglowmode,'TextGlowMode_Inner'; + effectcolor1,color("1,1,1,0.5");effectcolor2,color("1,1,1,0") + ); + GainFocusCommand=cmd(finishtweening;x,-16;diffuse,ColorLightTone(icon_color);decelerate,0.45;diffusealpha,1;x,0;diffuse,icon_color); LoseFocusCommand=cmd(finishtweening;x,0;accelerate,0.4;diffusealpha,0;x,32;diffusealpha,0); }; - LoadFont("_helveticaneuelt std extblk cn 42px") .. { - Text=THEME:GetString(Var "LoadingScreen", gc:GetName() .. "Explanation"); - InitCommand=cmd(horizalign,right;x,320;y,30;shadowlength,1;diffusealpha,0;skewx,-0.125;zoom,0.5); + LoadFont("Common Normal") .. { + Text=string_expl; + InitCommand=cmd(horizalign,right;x,320;y,30;shadowlength,1;diffusealpha,0;skewx,-0.125;zoom,0.75); GainFocusCommand=cmd(finishtweening;x,320+16;decelerate,0.45;diffusealpha,1;x,320); LoseFocusCommand=cmd(finishtweening;x,320;accelerate,0.4;diffusealpha,0;x,320-32;diffusealpha,0); }; + Def.Quad { + InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,icon_color;diffusealpha,0;fadeleft,0.35;faderight,0.35); + GainFocusCommand=cmd(stoptweening;linear,0.5;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,0); + }; }; + t.GainFocusCommand=cmd(finishtweening;visible,true;zoom,1.1;decelerate,0.25;zoom,1); t.LoseFocusCommand=cmd(finishtweening;visible,false;zoom,1); + return t \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectStyle Icon.lua b/Themes/default/Graphics/ScreenSelectStyle Icon.lua index 2c206d90f3..5c4c8d4e2e 100644 --- a/Themes/default/Graphics/ScreenSelectStyle Icon.lua +++ b/Themes/default/Graphics/ScreenSelectStyle Icon.lua @@ -1,11 +1,36 @@ local gc = Var("GameCommand"); + +local string_name = gc:GetText(); +local string_expl = THEME:GetString("StyleType", gc:GetStyle():GetStyleType()); +local icon_color = color("#FFCB05"); +local icon_color2 = color("#F0BA00"); + local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { - GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconGainFocusCommand"); - LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand"); - LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. { - DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); - EnabledCommand=cmd(diffuse,color("1,1,1,1")); + GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconGainFocusCommand"); + LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand"); + + LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background base"))..{ + InitCommand=cmd(diffuse,icon_color;diffusebottomedge,icon_color2); + }; + LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background effect")); + LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_gloss")); + LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_stroke")); + LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_cutout")); + + LoadFont("Common Large")..{ + Text=string.upper(string_name); + InitCommand=cmd(y,-12;maxwidth,232); + OnCommand=cmd(diffuse,Color.Black;shadowlength,1;shadowcolor,color("#ffffff77");skewx,-0.125); + }; + LoadFont("Common Normal")..{ + Text=string.upper(string_expl); + InitCommand=cmd(y,27.5;maxwidth,232); + }; + + LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background base"))..{ + DisabledCommand=cmd(diffuse,color("0,0,0,0.5")); + EnabledCommand=cmd(diffuse,color("1,1,1,0")); }; }; return t \ No newline at end of file