Update /rsr slightly.
This commit is contained in:
committed by
Devin J. Pohly
parent
90fe50a064
commit
db4acae2c5
@@ -21,7 +21,7 @@ t[#t+1] = Def.ActorFrame {
|
|||||||
-- Scanline
|
-- Scanline
|
||||||
LoadActor("_texture scanline") .. {
|
LoadActor("_texture scanline") .. {
|
||||||
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;
|
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;
|
diffuse,Color.Black;
|
||||||
diffusealpha,0.25;
|
diffusealpha,0.25;
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,11 +1,22 @@
|
|||||||
local gc = Var("GameCommand");
|
local gc = Var("GameCommand");
|
||||||
|
local colors = {
|
||||||
|
Exit = Color.Red;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
local t = Def.ActorFrame {};
|
local t = Def.ActorFrame {};
|
||||||
|
|
||||||
t[#t+1] = LoadFont("Common Normal") .. {
|
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;
|
return t;
|
||||||
@@ -2,8 +2,8 @@ local t = Def.ActorFrame {};
|
|||||||
t[#t+1] = Def.ActorFrame {
|
t[#t+1] = Def.ActorFrame {
|
||||||
InitCommand=cmd(y,-64);
|
InitCommand=cmd(y,-64);
|
||||||
Def.Quad {
|
Def.Quad {
|
||||||
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH-32,2);
|
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,64);
|
||||||
OnCommand=cmd(diffusealpha,0.5);
|
OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
return t
|
return t
|
||||||
@@ -2,12 +2,12 @@ local t = Def.ActorFrame {};
|
|||||||
t[#t+1] = Def.ActorFrame {
|
t[#t+1] = Def.ActorFrame {
|
||||||
InitCommand=cmd(y,48);
|
InitCommand=cmd(y,48);
|
||||||
Def.Quad {
|
Def.Quad {
|
||||||
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH-32,2);
|
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,48);
|
||||||
OnCommand=cmd(diffusealpha,0.5);
|
OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration";
|
t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration";
|
||||||
InitCommand=cmd(y,48);
|
InitCommand=cmd(y,40;visible,false);
|
||||||
LoadFont("Common Normal") .. {
|
LoadFont("Common Normal") .. {
|
||||||
Text="TIME";
|
Text="TIME";
|
||||||
InitCommand=cmd(vertalign,bottom;horizalign,right;x,SCREEN_CENTER_X-16;y,-4.5);
|
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";
|
t[#t+1] = Def.ActorFrame { Name="HeaderTextDecoration";
|
||||||
InitCommand=cmd(y,48);
|
InitCommand=cmd(y,40);
|
||||||
LoadFont("Common Normal") .. {
|
|
||||||
Text="SELECT";
|
|
||||||
InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+16;y,-4.5);
|
|
||||||
OnCommand=cmd(zoom,0.5);
|
|
||||||
};
|
|
||||||
LoadFont("Common Normal") .. {
|
LoadFont("Common Normal") .. {
|
||||||
Text="OPTIONS";
|
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();
|
OnCommand=cmd();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
+14
-3
@@ -1,22 +1,26 @@
|
|||||||
[Global]
|
[Global]
|
||||||
FallbackTheme=_fallback
|
FallbackTheme=_fallback
|
||||||
|
|
||||||
[ScreenWithMenuElements]
|
[ScreenWithMenuElements]
|
||||||
ShowHeader=true
|
ShowHeader=true
|
||||||
HeaderX=SCREEN_CENTER_X
|
HeaderX=SCREEN_CENTER_X
|
||||||
HeaderY=SCREEN_TOP
|
HeaderY=SCREEN_TOP
|
||||||
HeaderOnCommand=
|
HeaderOnCommand=
|
||||||
HeaderOffCommand=
|
HeaderOffCommand=
|
||||||
|
|
||||||
#
|
#
|
||||||
ShowFooter=true
|
ShowFooter=true
|
||||||
FooterX=SCREEN_CENTER_X
|
FooterX=SCREEN_CENTER_X
|
||||||
FooterY=SCREEN_BOTTOM
|
FooterY=SCREEN_BOTTOM
|
||||||
FooterOnCommand=
|
FooterOnCommand=
|
||||||
FooterOffCommand=
|
FooterOffCommand=
|
||||||
|
|
||||||
#
|
#
|
||||||
TimerX=SCREEN_WIDTH-64
|
TimerX=SCREEN_RIGHT-16
|
||||||
TimerY=SCREEN_TOP+48-4.5
|
TimerY=SCREEN_TOP+40-4.5
|
||||||
TimerOnCommand=
|
TimerOnCommand=draworder,105
|
||||||
TimerOffCommand=
|
TimerOffCommand=
|
||||||
|
|
||||||
[MenuTimer]
|
[MenuTimer]
|
||||||
Text1OnCommand=stopeffect;stoptweening;vertalign,bottom;horizalign,right
|
Text1OnCommand=stopeffect;stoptweening;vertalign,bottom;horizalign,right
|
||||||
Text1FormatFunction=function(fSeconds) \
|
Text1FormatFunction=function(fSeconds) \
|
||||||
@@ -28,9 +32,16 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol
|
|||||||
#~ MESSAGEMAN:Broadcast("TimerWarning"); \
|
#~ MESSAGEMAN:Broadcast("TimerWarning"); \
|
||||||
#~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \
|
#~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \
|
||||||
#~ end;
|
#~ end;
|
||||||
|
|
||||||
[ScreenTitleMenu]
|
[ScreenTitleMenu]
|
||||||
ShowHeader=true
|
ShowHeader=true
|
||||||
ShowFooter=true
|
ShowFooter=true
|
||||||
|
|
||||||
|
ScrollerX=SCREEN_RIGHT-16
|
||||||
|
ScrollerY=SCREEN_CENTER_Y
|
||||||
|
|
||||||
|
ScrollerColors="Exit:#ff0000"
|
||||||
|
|
||||||
[ScreenSelectMusic]
|
[ScreenSelectMusic]
|
||||||
MusicWheelX=SCREEN_RIGHT-128-18
|
MusicWheelX=SCREEN_RIGHT-128-18
|
||||||
MusicWheelOnCommand=draworder,-1
|
MusicWheelOnCommand=draworder,-1
|
||||||
|
|||||||
Reference in New Issue
Block a user