-<ActorFrame Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1)" InitCommand="x,SCREEN_LEFT-7;y,SCREEN_BOTTOM-26"><children>\r
+<ActorFrame Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1)"><children>\r
\r
- <Layer\r
- File="../Graphics/PaneDisplay under.png"\r
- InitCommand="@'diffuse,'..BackgroundColor()..';horizalign,left;vertalign,bottom'"\r
- />\r
+ <Layer\r
+ File="../Graphics/PaneDisplay Background.png"\r
+ InitCommand="@'diffuse,'..BackgroundColor()..';horizalign,left;vertalign,bottom'"\r
+ />\r
\r
- <!-- Pane BG -->\r
- <Layer\r
- File="../Graphics/PaneDisplay p1 B.png"\r
- InitCommand="@'diffuse,'..BackgroundColor()..';horizalign,left;vertalign,bottom;'"\r
- />\r
- \r
- <Layer\r
- File="../Graphics/PaneDisplay p1 F.png"\r
- OnCommand="@'diffuse,'..FrameColor()..';horizalign,left;vertalign,bottom;'"\r
- />\r
+ <Layer\r
+ File="../Graphics/PaneDisplay Frame.png"\r
+ OnCommand="@'diffuse,'..FrameColor()..';horizalign,left;vertalign,bottom;'"\r
+ />\r
\r
- <!--Avatar-->\r
- <ActorFrame InitCommand="x,5;y,5;draworder,100"><children> \r
- <Layer File="../Graphics/AvatarFrame B.png"\r
- Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"\r
- InitCommand="@'horizalign,left;vertalign,bottom;draworder,3;diffuse,'..BackgroundColor()..';zoomx,1.01;zoomy,0.975;'"\r
- />\r
- \r
- <Layer File="../Graphics/AvatarFrame.png"\r
- Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"\r
- InitCommand="@'horizalign,left;vertalign,bottom;draworder,3;diffuse,'..FrameColor()..';zoomx,0.95;zoomy,0.95;'"\r
- />\r
- \r
+ <!--Avatar-->\r
+ <!-- TODO figure out why this needs to have draworder 100 -->\r
+ <ActorFrame InitCommand="x,8;y,-5;draworder,100;" Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"><children> \r
<Layer\r
- File="@'../Graphics/NoAvatar/'..getNoAvatar(PLAYER_1)"\r
- InitCommand="@'horizalign,left;vertalign,bottom;diffuse,'..PlayerColor(PLAYER_1)..';'"\r
+ File="../Graphics/NoAvatar/TestAvatar.png"\r
+ InitCommand="@'horizalign,left;vertalign,bottom;x,2;y,-2;diffuse,'..PlayerColor(PLAYER_1)..''"\r
/>\r
+ \r
+ <Layer File="../Graphics/Avatar Frame.png"\r
+ InitCommand="@'horizalign,left;vertalign,bottom;draworder,3;diffuse,'..FrameColor()..''"\r
+ />\r
</children></ActorFrame>\r
\r
<!-- ScreenPlayerOptions stuff -->\r
- <ActorFrame InitCommand="diffusealpha,0" OnScreenPlayerOptionsMessageCommand="diffusealpha,1"><children>\r
+ <ActorFrame InitCommand="x,80;y,-60;diffusealpha,0;draworder,100;zoom,0.5" OnScreenPlayerOptionsMessageCommand="diffusealpha,1"><children>\r
<!-- BPM -->\r
- <ActorFrame InitCommand="x,1;y,1;zoom,0.5"><children>\r
+ <ActorFrame><children>\r
<!-- BPM label -->\r
<BitmapText\r
- Text="BPM:"\r
- File="_eurostile blue glow"\r
+ Text="BPM:"\r
+ File="_eurostile blue glow"\r
InitCommand="@'horizalign,left;shadowlength,0;diffuse,'..LabelColor()..';'"\r
/>\r
- \r
+\r
<!-- BPM display -->\r
<BitmapText\r
Text=""\r
File="_eurostile blue glow"\r
- InitCommand="shadowlength,0;maxwidth,140;horizalign,left"\r
+ InitCommand="x,80;horizalign,left;shadowlength,0;"\r
RateModChangedMessageCommand="%function(self) self:settext(DisplayBPM(PLAYER_1)) end"\r
/>\r
</children></ActorFrame>\r
- \r
+\r
<!-- Speed -->\r
- <ActorFrame InitCommand="x,10;y,10;zoom,0.5"><children>\r
+ <ActorFrame InitCommand="y,30"><children>\r
<!-- Speed label -->\r
<BitmapText\r
Text="Speed:"\r
File="_eurostile blue glow"\r
InitCommand="@'horizalign,left;shadowlength,0;diffuse,'..LabelColor()..';'"\r
/>\r
- \r
+\r
<!-- Speed display -->\r
<BitmapText\r
Text=""\r
InitCommand="x,80;horizalign,left;shadowlength,0;"\r
SpeedModChangedP1MessageCommand="queuecommand,Update"\r
RateModChangedMessageCommand="queuecommand,Update"\r
- UpdateCommand="%function(self) self:settext(DisplayScrollSpeed(PLAYER_1)) end"\r
+ UpdateCommand="%function(self) SetFromDisplayScrollSpeed(self, PLAYER_1) end"\r
/>\r
- \r
+\r
<!--Blaze It P1 -->\r
<BitmapText\r
File="_eurostile blue glow"\r
RateModChangedMessageCommand="queuecommand,Update"\r
UpdateCommand="%function(self) DoEasterEgg('BlazeIt', { pn = PLAYER_1, Actor = self }) end"\r
/>\r
- \r
- <!--No Scope P1 --> \r
+\r
+ <!-- No Scope P1 --> \r
<BitmapText\r
File="_eurostile blue glow"\r
InitCommand="x,80"\r
UpdateCommand="%function(self) DoEasterEgg('NoScope', { pn = PLAYER_1, Actor = self }) end"\r
/>\r
</children></ActorFrame>\r
- </children></ActorFrame>\r
+ \r
+ <!-- Step artist -->\r
+ <ActorFrame InitCommand="y,60"><children>\r
+ <!-- Step artist label -->\r
+ <BitmapText\r
+ Text="Steps:"\r
+ File="_eurostile blue glow"\r
+ InitCommand="@'horizalign,left;shadowlength,0;diffuse,'..LabelColor()..';'"\r
+ />\r
+ \r
+ <!-- Step artist display -->\r
+ <BitmapText\r
+ Text="@GAMESTATE:GetCurrentSteps(PLAYER_1):GetDescription()"\r
+ File="_eurostile blue glow"\r
+ InitCommand="x,80;horizalign,left;shadowlength,0;"\r
+ />\r
+ </children></ActorFrame>\r
+ \r
+ <!-- Song length -->\r
+ <ActorFrame InitCommand="y,90"><children>\r
+ <!-- Song length label -->\r
+ <BitmapText\r
+ Text="Length:"\r
+ File="_eurostile blue glow"\r
+ InitCommand="@'horizalign,left;shadowlength,0;diffuse,'..LabelColor()..';'"\r
+ />\r
+ \r
+ <!-- Song length display -->\r
+ <BitmapText\r
+ Text=""\r
+ File="_eurostile blue glow"\r
+ InitCommand="x,80;horizalign,left;shadowlength,0;"\r
+ RateModChangedMessageCommand="%SetFromDisplaySongLength"\r
+ />\r
+ </children></ActorFrame>\r
+ </children></ActorFrame>\r
</children></ActorFrame>
\ No newline at end of file