actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

SelectStyle, SelectMode improvements

Browse Source
This commit is contained in:
Jonathan Payne
2014-09-17 11:13:10 -07:00
parent b7e8b5efbf
commit 97c8e2d23c
4 changed files with 77 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Languages/en.ini
+6
View File
@@ -1985,6 +1985,12 @@ Guitar_Five=5 Frets
Karaoke=Karaoke Karaoke=Karaoke
Lights_Cabinet=Lights Lights_Cabinet=Lights
[StyleType]
StyleType_OnePlayerOneSide=1 Player
StyleType_TwoPlayersTwoSides=2 Players - Versus
StyleType_OnePlayerTwoSides=1 Player
StyleType_TwoPlayersSharedSides=2 Players - Cooperative
[TapNoteScore] [TapNoteScore]
AvoidMine=Avoid Mine AvoidMine=Avoid Mine
HitMine=Hit Mine HitMine=Hit Mine
Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua
+13 -15
View File
@@ -1,11 +1,16 @@
local gc = Var("GameCommand"); 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 {}; local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
GainFocusCommand=cmd(stoptweening;bob;effectmagnitude,0,6,0;decelerate,0.05;zoom,1); GainFocusCommand=cmd(stoptweening;bob;effectmagnitude,0,6,0;decelerate,0.05;zoom,1);
LoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.1;zoom,0.6); LoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.1;zoom,0.6);
LoadActor("_background base")..{ LoadActor("_background base")..{
InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()]); InitCommand=cmd(diffuse,icon_color);
}; };
LoadActor("_background effect"); LoadActor("_background effect");
LoadActor("_gloss"); LoadActor("_gloss");
@@ -13,25 +18,18 @@ t[#t+1] = Def.ActorFrame {
LoadActor("_cutout"); LoadActor("_cutout");
-- todo: generate a better font for these. -- todo: generate a better font for these.
LoadFont("_helveticaneuelt std extblk cn 42px")..{ LoadFont("Common Large")..{
InitCommand=cmd(y,-12;zoom,1.1;diffuse,color("#000000");uppercase,true;settext,gc:GetText();); Text=string.upper(string_name);
GainFocusCommand=cmd(diffuse,Color.Black;stopeffect); InitCommand=cmd(y,-12;maxwidth,232);
LoseFocusCommand=cmd(diffuse,Color.Black;stopeffect); OnCommand=cmd(diffuse,Color.Black;shadowlength,1;shadowcolor,color("#ffffff77");skewx,-0.125);
}; };
LoadFont("_helveticaneuelt std extblk cn 42px")..{ LoadFont("Common Normal")..{
InitCommand=cmd(y,27.5;zoom,0.45;maxwidth,320*1.6;uppercase,true;settext,THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation")); Text=string.upper(string_expl);
GainFocusCommand=cmd(diffuse,Color.White;stopeffect); InitCommand=cmd(y,27.5;maxwidth,232);
LoseFocusCommand=cmd(diffuse,Color.White;stopeffect);
}; };
LoadActor("_background base") .. { LoadActor("_background base") .. {
DisabledCommand=cmd(diffuse,color("0,0,0,0.5")); DisabledCommand=cmd(diffuse,color("0,0,0,0.5"));
EnabledCommand=cmd(diffuse,color("1,1,1,0")); 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 return t
Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua
+28 -17
View File
@@ -8,23 +8,28 @@ local colors = {
Oni = color("#d70b8c"), Oni = color("#d70b8c"),
Endless = color("#b4c3d2"), 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 {}; local t = Def.ActorFrame {};
-- Background! -- Background!
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
-- GainFocusCommand=cmd(visible,true);
-- LoseFocusCommand=cmd(visible,false);
LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. { LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. {
InitCommand=cmd(diffuse,Color("Black");diffusealpha,0.45); InitCommand=cmd(diffuse,Color("Black");diffusealpha,0.45);
GainFocusCommand=cmd(visible,true); GainFocusCommand=cmd(visible,true);
LoseFocusCommand=cmd(visible,false); LoseFocusCommand=cmd(visible,false);
}; };
LoadActor("_HighlightFrame") .. { LoadActor("_HighlightFrame") .. {
InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()];diffusealpha,0); InitCommand=cmd(diffuse,icon_color;diffusealpha,0);
GainFocusCommand=cmd(finishtweening;diffuse,ColorLightTone(ModeIconColors[gc:GetName()]);linear,1;diffuse,ModeIconColors[gc:GetName()]); GainFocusCommand=cmd(finishtweening;diffuse,ColorLightTone(icon_color);linear,1;diffuse,icon_color);
LoseFocusCommand=cmd(finishtweening;diffusealpha,0); LoseFocusCommand=cmd(finishtweening;diffusealpha,0);
OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1;glow,Color("Invisible")); OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1;glow,Color("Invisible"));
}; };
}; };
-- Emblem Frame -- Emblem Frame
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
FOV=90; FOV=90;
@@ -34,30 +39,36 @@ t[#t+1] = Def.ActorFrame {
InitCommand=cmd(diffusealpha,0;zoom,0.75); 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;); 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")); 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 -- Text Frame
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,-192/2;y,-10); InitCommand=cmd(x,-192/2;y,-10);
Def.Quad { LoadFont("Common Large") .. {
InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,ModeIconColors[gc:GetName()];diffusealpha,0;fadeleft,0.35;faderight,0.35); Text=string_name;
GainFocusCommand=cmd(stoptweening;linear,0.5;diffusealpha,1); InitCommand=cmd(y,-2;horizalign,left;diffuse,icon_color;strokecolor,ColorDarkTone(icon_color);shadowlength,2;diffusealpha,0;skewx,-0.125);
LoseFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,0); OnCommand=cmd(glowshift;textglowmode,'TextGlowMode_Inner';
}; effectcolor1,color("1,1,1,0.5");effectcolor2,color("1,1,1,0")
LoadFont("_helveticaneuelt std extblk cn 42px") .. { );
Text=gc:GetText(); GainFocusCommand=cmd(finishtweening;x,-16;diffuse,ColorLightTone(icon_color);decelerate,0.45;diffusealpha,1;x,0;diffuse,icon_color);
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()]);
LoseFocusCommand=cmd(finishtweening;x,0;accelerate,0.4;diffusealpha,0;x,32;diffusealpha,0); LoseFocusCommand=cmd(finishtweening;x,0;accelerate,0.4;diffusealpha,0;x,32;diffusealpha,0);
}; };
LoadFont("_helveticaneuelt std extblk cn 42px") .. { LoadFont("Common Normal") .. {
Text=THEME:GetString(Var "LoadingScreen", gc:GetName() .. "Explanation"); Text=string_expl;
InitCommand=cmd(horizalign,right;x,320;y,30;shadowlength,1;diffusealpha,0;skewx,-0.125;zoom,0.5); 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); 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); 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.GainFocusCommand=cmd(finishtweening;visible,true;zoom,1.1;decelerate,0.25;zoom,1);
t.LoseFocusCommand=cmd(finishtweening;visible,false;zoom,1); t.LoseFocusCommand=cmd(finishtweening;visible,false;zoom,1);
return t return t
Themes/default/Graphics/ScreenSelectStyle Icon.lua
+30 -5
View File
@@ -1,11 +1,36 @@
local gc = Var("GameCommand"); 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 {}; local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconGainFocusCommand"); GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconGainFocusCommand");
LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand"); LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand");
LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. {
DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background base"))..{
EnabledCommand=cmd(diffuse,color("1,1,1,1")); 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 return t