coming close to a point where working on this will be a breeze IMO.

This commit is contained in:
Jonathan Payne
2011-05-11 14:34:02 -07:00
parent 90469f0f25
commit da8017f91e
15 changed files with 115 additions and 35 deletions
@@ -3,7 +3,7 @@
-- these elements. -- these elements.
local t = LoadFallbackB(); local t = LoadFallbackB();
-- Legacy StepMania 4 Function --
local function CreateStepDisplay(pn) local function CreateStepDisplay(pn)
local function set(self, player) local function set(self, player)
self:SetFromGameState( player ); self:SetFromGameState( player );
@@ -23,9 +23,7 @@ local function CreateStepDisplay(pn)
return t; return t;
end end
-- Create StepsDisplay for each Player.
for pn in ivalues(PlayerNumber) do for pn in ivalues(PlayerNumber) do
local MetricsName = "StepsDisplay" .. PlayerNumberToString(pn); local MetricsName = "StepsDisplay" .. PlayerNumberToString(pn);
t[#t+1] = CreateStepDisplay(pn) .. { t[#t+1] = CreateStepDisplay(pn) .. {
@@ -44,4 +42,5 @@ for pn in ivalues(PlayerNumber) do
end; end;
}; };
end end
return t return t
@@ -24,4 +24,13 @@ t[#t+1] = StandardDecorationFromFileOptional("TextHeader","TextHeader") .. {
}; };
-- Image displayed on the bottom of the screen -- Image displayed on the bottom of the screen
t[#t+1] = StandardDecorationFromFileOptional("Footer","Footer"); t[#t+1] = StandardDecorationFromFileOptional("Footer","Footer");
t[#t+1] = StandardDecorationFromFileOptional( "HelpDisplay", "HelpDisplay" ) .. {
InitCommand=function(self)
local s = THEME:GetString(Var "LoadingScreen","HelpText");
self:SetTipsColonSeparated(s);
end;
SetHelpTextCommand=function(self, params)
self:SetTipsColonSeparated( params.Text );
end;
};
return t return t
@@ -0,0 +1,14 @@
local t = Def.ActorFrame {
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
};
--
t[#t+1] = LoadActor("grid") .. {
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/16);
OnCommand=cmd(diffuse,color("0,0,0,0.125"));
};
t[#t+1] = LoadActor("grid") .. {
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/32,SCREEN_HEIGHT/32);
OnCommand=cmd(diffuse,color("0,0,0,0.25"));
};
--
return t
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 408 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 713 B

@@ -1,14 +0,0 @@
return Def.ActorFrame {
Def.Quad {
InitCommand=cmd(x,-128+4;zoomto,4,46);
-- OnCommand=cmd(diffuse,color("0,0,0,0.5"));
};
--[[ Def.Quad {
InitCommand=cmd(x,-128+16+6;zoomto,32,46);
-- OnCommand=cmd(faderight,1;diffusealpha,0.5);
}; --]]
--[[ Def.Quad {
InitCommand=cmd(x,2;y,23;zoomto,320,1);
-- OnCommand=cmd(diffuse,color("0,0,0,0.5"));
}; --]]
};
@@ -1,6 +0,0 @@
return Def.ActorFrame {
Def.Quad {
InitCommand=cmd(x,4;zoomto,256-4,46);
OnCommand=cmd(diffuse,color("0,0,0,0.5"));
};
};
@@ -0,0 +1,3 @@
return Def.HelpDisplay {
File = THEME:GetPathF("HelpDisplay", "text");
};
+56
View File
@@ -0,0 +1,56 @@
[Screen]
HelpText=&BACK; Exit &START; Select &SELECT; Options &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move
[ScreenWithMenuElements]
HelpText=&BACK; Exit &START; Select &MENULEFT;&MENURIGHT; Move
[ScreenTitleMenu]
HelpText=&BACK; Exit &START; Select &MENUUP;&MENUDOWN; Move
[ScreenTitleJoin]
HelpText=Press &START; to Play
HelpTextJoin=Press &START; to Play
HelpTextWait=Insert Credits...
[ScreenProfileLoad]
HelpText=... Loading profiles, please wait ...
[ScreenSelectProfile]
HelpText=&MENUUP;&MENUDOWN; Switch Profile &START; Choose/Join &BACK; Unselect
[ScreenSelectMaster]
HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move
[ScreenSelectPlayMode]
HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move
[ScreenSelectPlayStyle]
HelpText=&BACK; Exit &START; Select &MENULEFT;&MENURIGHT; Move
[ScreenGameInformation]
HelpText=&BACK; Exit &START; Skip
[ScreenSelectMusic]
HelpText=&BACK; Exit &START; Select / Join &SELECT; Magic Codes &MENULEFT;&MENURIGHT; Move::&AUXWHITE;+[KEY] Sort To [KEY]
AlternateHelpText=&SELECT;+&MENULEFT;&MENURIGHT; Change Difficulties &SELECT;+&START; Quick Sort
[ScreenSelectCourse]
HelpText=&BACK; Exit &START; Select / Join &SELECT; Magic Codes &MENULEFT;&MENURIGHT; Move::&UP;&DOWN;&UP;&DOWN; for other course types
[ScreenOptions]
HelpText=&BACK; Exit &START; Choose &SELECT; Go Up &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move
[ScreenStageInformation]
HelpText=
[ScreenGameplay]
HelpText=
[ScreenEvaluation]
HelpText=&BACK; Exit &START; Move On &MENULEFT;+&MENURIGHT; or &SELECT; Snapshot
[OptionNames]
Custom=Special
[ScreenTestInput]
HelpText=Hold &BACK; or &START; to exit.
+30 -11
View File
@@ -12,29 +12,39 @@ CreditsP2Y=SCREEN_BOTTOM-4
CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,Color("Black"); CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,Color("Black");
[ScreenWithMenuElements] [ScreenWithMenuElements]
# Header ( Top of Screen ) # Header ( Top of Screen )
# Header 'Height' is 48px
ShowHeader=true ShowHeader=true
HeaderX=SCREEN_CENTER_X HeaderX=SCREEN_CENTER_X
HeaderY=SCREEN_TOP HeaderY=SCREEN_TOP+4
HeaderOnCommand=vertalign,top;addy,-64;decelerate,0.35;addy,64; HeaderOnCommand=vertalign,top;addy,-64;decelerate,0.35;addy,64;
HeaderOffCommand= HeaderOffCommand=
# Text Header ( Text displayed at top of screen on top of header ) # Text Header ( Text displayed at top of screen on top of header )
ShowTextHeader=true ShowTextHeader=true
TextHeaderX=SCREEN_CENTER_X-256-32 TextHeaderX=SCREEN_CENTER_X-256-32
TextHeaderY=SCREEN_TOP+32+8-1.5 TextHeaderY=SCREEN_TOP+32+8+4-1.5
TextHeaderOnCommand=horizalign,left;vertalign,bottom;skewx,-0.125;shadowlength,1;diffusealpha,0;addx,-16;sleep,0.35;decelerate,0.125;diffusealpha,1;addx,16; TextHeaderOnCommand=horizalign,left;vertalign,bottom;skewx,-0.125;shadowlength,1;diffusealpha,0;addx,-16;sleep,0.35;decelerate,0.125;diffusealpha,1;addx,16;
TextHeaderOffCommand= TextHeaderOffCommand=
# Footer ( Bottom Of Screen ) # Footer ( Bottom Of Screen )
# Footer 'Height' is 64px
ShowFooter=true ShowFooter=true
FooterX=SCREEN_CENTER_X FooterX=SCREEN_CENTER_X
FooterY=SCREEN_BOTTOM FooterY=SCREEN_BOTTOM-32
FooterOnCommand=vertalign,bottom;addy,48;decelerate,0.35;addy,-48 FooterOnCommand=vertalign,bottom;addy,48;decelerate,0.35;addy,-48
FooterOffCommand= FooterOffCommand=
# Menu Timer # Menu Timer
TimerX=SCREEN_CENTER_X+256+32 TimerX=SCREEN_CENTER_X+256+32
TimerY=SCREEN_TOP+32+8-1.5 TimerY=SCREEN_TOP+32+8+4-1.5
# We animate the timer in [MenuTimer], since diffusion doesn't work here. # We animate the timer in [MenuTimer], since diffusion doesn't work here.
TimerOnCommand= TimerOnCommand=
TimerOffCommand= TimerOffCommand=
# Help Text
ShowHelpDisplay=true
HelpDisplayX=SCREEN_CENTER_X
HelpDisplayY=SCREEN_BOTTOM-32-16
HelpDisplayOnCommand=SetSecsBetweenSwitches,4;shadowlength,1;draworder,105;zoom,0.675;maxwidth,640/0.675;
HelpDisplayOffCommand=linear,0.175;zoomy,0
[HelpDisplay]
TipShowTime=4
[MenuTimer] [MenuTimer]
# Text associated with the menutimer # Text associated with the menutimer
Text1OnCommand=stopeffect;stoptweening;horizalign,right;vertalign,bottom;shadowlength,1;diffusealpha,0;x,16;sleep,0.35;decelerate,0.125;diffusealpha,1;x,0; Text1OnCommand=stopeffect;stoptweening;horizalign,right;vertalign,bottom;shadowlength,1;diffusealpha,0;x,16;sleep,0.35;decelerate,0.125;diffusealpha,1;x,0;
@@ -279,20 +289,29 @@ IconChoiceEndlessDisabledCommand=diffuse,color("1,0,0,0.5");
IconChoiceEndlessOffUnfocusedCommand=linear,0.1175;zoomx,0 IconChoiceEndlessOffUnfocusedCommand=linear,0.1175;zoomx,0
IconChoiceEndlessOffFocusedCommand=stopeffect;sleep,0 IconChoiceEndlessOffFocusedCommand=stopeffect;sleep,0
[ScreenSelectMusic] [ScreenSelectMusic]
BannerX=SCREEN_CENTER_X-128-32
BannerY=SCREEN_TOP+128-8
BannerOnCommand=scaletoclipped,256,80
BannerOffCommand=
#
MusicWheelX=SCREEN_CENTER_X+128+64
MusicWheelY=SCREEN_CENTER_Y
MusicWheelOnCommand=draworder,-1
MusicWheelOffCommand=
#
#
ShowStepsDisplayP1=true ShowStepsDisplayP1=true
StepsDisplayP1X=SCREEN_CENTER_X-192 StepsDisplayP1X=SCREEN_CENTER_X-128-32
StepsDisplayP1Y=SCREEN_BOTTOM-64 StepsDisplayP1Y=SCREEN_BOTTOM-64-16
StepsDisplayP1OnCommand= StepsDisplayP1OnCommand=
StepsDisplayP1OffCommand= StepsDisplayP1OffCommand=
# #
ShowStepsDisplayP2=true ShowStepsDisplayP2=true
StepsDisplayP2X=SCREEN_CENTER_X-192 StepsDisplayP2X=SCREEN_CENTER_X+128+32
StepsDisplayP2Y=SCREEN_BOTTOM-64 StepsDisplayP2Y=SCREEN_BOTTOM-64-16
StepsDisplayP2OnCommand= StepsDisplayP2OnCommand=
StepsDisplayP2OffCommand= StepsDisplayP2OffCommand=
#
MusicWheelX=SCREEN_RIGHT-128-18
MusicWheelOnCommand=draworder,-1
[MusicWheel] [MusicWheel]
HighlightOnCommand=blend,Blend.Add;diffuseramp;effectclock,'beatnooffset' HighlightOnCommand=blend,Blend.Add;diffuseramp;effectclock,'beatnooffset'
# #