Update /rsr slightly.

This commit is contained in:
Jonathan Payne
2013-09-22 13:38:25 -04:00
committed by Devin J. Pohly
parent 90fe50a064
commit db4acae2c5
5 changed files with 36 additions and 19 deletions
@@ -21,7 +21,7 @@ t[#t+1] = Def.ActorFrame {
-- Scanline
LoadActor("_texture scanline") .. {
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;
customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/32;
customtexturerect,0,0,SCREEN_WIDTH/16,(SCREEN_HEIGHT/16)/2;
diffuse,Color.Black;
diffusealpha,0.25;
);
+14 -3
View File
@@ -1,11 +1,22 @@
local gc = Var("GameCommand");
local colors = {
Exit = Color.Red;
}
local t = Def.ActorFrame {};
t[#t+1] = LoadFont("Common Normal") .. {
Text=gc:GetText();
Text=gc:GetName();
InitCommand=cmd(horizalign,right;playcommand,"Set");
SetCommand=function(self)
if colors[gc:GetName()] ~= nil then
self:diffuse(colors[gc:GetName()]);
end
end;
GainFocusCommand=cmd(diffusealpha,1);
LoseFocusCommand=cmd(diffusealpha,0.5);
};
t.GainFocusCommand=cmd(diffusealpha,1);
t.LoseFocusCommand=cmd(diffusealpha,0.5);
return t;
@@ -2,8 +2,8 @@ local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(y,-64);
Def.Quad {
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH-32,2);
OnCommand=cmd(diffusealpha,0.5);
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,64);
OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75);
};
};
return t
@@ -2,12 +2,12 @@ local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(y,48);
Def.Quad {
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH-32,2);
OnCommand=cmd(diffusealpha,0.5);
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,48);
OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75);
};
};
t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration";
InitCommand=cmd(y,48);
InitCommand=cmd(y,40;visible,false);
LoadFont("Common Normal") .. {
Text="TIME";
InitCommand=cmd(vertalign,bottom;horizalign,right;x,SCREEN_CENTER_X-16;y,-4.5);
@@ -20,15 +20,10 @@ t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration";
}; --]]
};
t[#t+1] = Def.ActorFrame { Name="HeaderTextDecoration";
InitCommand=cmd(y,48);
LoadFont("Common Normal") .. {
Text="SELECT";
InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+16;y,-4.5);
OnCommand=cmd(zoom,0.5);
};
InitCommand=cmd(y,40);
LoadFont("Common Normal") .. {
Text="OPTIONS";
InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+64;y,-4.5);
InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+16;y,-4.5);
OnCommand=cmd();
};
};
+14 -3
View File
@@ -1,22 +1,26 @@
[Global]
FallbackTheme=_fallback
[ScreenWithMenuElements]
ShowHeader=true
HeaderX=SCREEN_CENTER_X
HeaderY=SCREEN_TOP
HeaderOnCommand=
HeaderOffCommand=
#
ShowFooter=true
FooterX=SCREEN_CENTER_X
FooterY=SCREEN_BOTTOM
FooterOnCommand=
FooterOffCommand=
#
TimerX=SCREEN_WIDTH-64
TimerY=SCREEN_TOP+48-4.5
TimerOnCommand=
TimerX=SCREEN_RIGHT-16
TimerY=SCREEN_TOP+40-4.5
TimerOnCommand=draworder,105
TimerOffCommand=
[MenuTimer]
Text1OnCommand=stopeffect;stoptweening;vertalign,bottom;horizalign,right
Text1FormatFunction=function(fSeconds) \
@@ -28,9 +32,16 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol
#~ MESSAGEMAN:Broadcast("TimerWarning"); \
#~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \
#~ end;
[ScreenTitleMenu]
ShowHeader=true
ShowFooter=true
ScrollerX=SCREEN_RIGHT-16
ScrollerY=SCREEN_CENTER_Y
ScrollerColors="Exit:#ff0000"
[ScreenSelectMusic]
MusicWheelX=SCREEN_RIGHT-128-18
MusicWheelOnCommand=draworder,-1