ScreenNameEntry Done

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
index 6572aa8..ff20ffe 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
@@ -6,14 +6,24 @@ if GAMESTATE:GetEnv('Wag') == 'On' then
 end"> <children>
        <Layer Type="Quad" InitCommand="diffusealpha,0;sleep,24;queuecommand,ScreenChange;" ScreenChangeCommand="%function(self) SCREENMAN:SetNewScreen('ScreenCompany'); end" />
        <Layer
-               File="player pane"
-               OnCommand="x,SCREEN_CENTER_X-320+74;y,SCREEN_CENTER_Y+2"
+               File="player pane B"
+               OnCommand="@'x,SCREEN_CENTER_X-320+74;y,SCREEN_CENTER_Y+2;diffuse,'..BackgroundColor()..';'"
+               Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
+       />      
+       <Layer
+               File="player pane F"
+               OnCommand="@'x,SCREEN_CENTER_X-320+74;y,SCREEN_CENTER_Y+2;diffuse,'..FrameColor()..';'"
                Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
        />
        
        <Layer
-               File="player pane"
-               OnCommand="x,SCREEN_CENTER_X+320-74;y,SCREEN_CENTER_Y+2"
+               File="player pane B"
+               OnCommand="@'x,SCREEN_CENTER_X+320-74;y,SCREEN_CENTER_Y+2;diffuse,'..BackgroundColor()..';'"
+               Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
+       />
+       <Layer
+               File="player pane F"
+               OnCommand="@'x,SCREEN_CENTER_X+320-74;y,SCREEN_CENTER_Y+2;diffuse,'..FrameColor()..';'"
                Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
        />
        

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane.png b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane B.png
similarity index 51%
rename from Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane.png
rename to Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane B.png
index 364291c..0bb4885 100644 (file)
Binary files a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane.png and b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane B.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane F.png b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane F.png
new file mode 100644 (file)
index 0000000..d00f097
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/player pane F.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 92001b4..a3b6fc1 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -446,7 +446,7 @@ end">
 <!--Step Artists P1-->
                <BitmapText
                        Text=""
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
+                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and not GAMESTATE:IsCourseMode()"
                        File="_eurostile blue glow"
                        OnCommand="horizalign,center;maxwidth,200;shadowlength,0;zoom,0.5;queuecommand,Update;"
                        
@@ -460,7 +460,7 @@ end">
 <!--Step Artists P2-->
                <BitmapText
                        Text=""
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
+                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and not GAMESTATE:IsCourseMode()"
                        File="_eurostile blue glow"
                        OnCommand="horizalign,center;maxwidth,200;shadowlength,0;zoom,0.5;queuecommand,Update;"
                        
@@ -518,7 +518,7 @@ end">
                
                <ActorFrame
                        Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsCourseMode()"
-                       OnCommand="x,SCREEN_CENTER_X-250;y,SCREEN_CENTER_Y-95;difficultyoffset;queuecommand,Go"
+                       OnCommand="x,SCREEN_CENTER_X-250-4;y,SCREEN_CENTER_Y-95+32;difficultyoffset;queuecommand,Go"
                        GoCommand="%function(self)
                        if GAMESTATE:PlayerUsingBothSides(PLAYER_1) then
                                self:addx(-75);
@@ -527,14 +527,19 @@ end">
                        end"
                > <children>
                        <Actor
-                               File="@THEME:GetPath(EC_GRAPHICS,'','_difficulty icons')"
+                               File="@THEME:GetPath(EC_GRAPHICS,'','_difficulty cpips B')"
                                OnCommand="animate,0;playcommand,Update"
                                UpdateCommand="%function(self,parent) SetDifficultyFrameFromGameState(self, PLAYER_1) end"
                        />
+                       <Actor
+                               File="@THEME:GetPath(EC_GRAPHICS,'','_difficulty cpips F')"
+                               OnCommand="@'animate,0;diffuse,'..FrameColor()..';playcommand,Update'"
+                               UpdateCommand="%function(self,parent) SetDifficultyFrameFromGameState(self, PLAYER_1) end"
+                       />
                                        <Actor
                                Class="DifficultyMeter"
                                Type="ScreenGameplay DifficultyMeterP1"
-                               OnCommand="playcommand,Update"
+                               OnCommand="x,90-92;y,-1;playcommand,Update"
                                UpdateCommand="%function(self) 
                                                if GAMESTATE:GetCurrentTrail(PLAYER_1) then 
                                                        self:SetFromTrail(GAMESTATE:GetCurrentTrail(PLAYER_1)) 
@@ -592,7 +597,7 @@ end">
                
                <ActorFrame
                        Condition="GAMESTATE:IsPlayerEnabled(PLAYER_2) and GAMESTATE:IsCourseMode()"
-                       OnCommand="x,SCREEN_CENTER_X+248;y,SCREEN_CENTER_Y-95;difficultyoffset;queuecommand,Go"
+                       OnCommand="x,SCREEN_CENTER_X+248-192;y,SCREEN_CENTER_Y-95+32;difficultyoffset;queuecommand,Go"
                        GoCommand="%function(self)
                        if GAMESTATE:PlayerUsingBothSides(PLAYER_2) then
                                self:addx(75);
@@ -601,14 +606,19 @@ end">
                        end"
                > <children>
                        <Actor
-                               File="@THEME:GetPath(EC_GRAPHICS,'','_difficulty icons')"
-                               OnCommand="animate,0;rotationy,180;playcommand,Update"
+                               File="@THEME:GetPath(EC_GRAPHICS,'','_difficulty cpips B')"
+                               OnCommand="animate,0;playcommand,Update"
+                               UpdateCommand="%function(self,parent) SetDifficultyFrameFromGameState(self, PLAYER_2) end"
+                       />
+                       <Actor
+                               File="@THEME:GetPath(EC_GRAPHICS,'','_difficulty cpips F')"
+                               OnCommand="@'animate,0;diffuse,'..FrameColor()..';playcommand,Update'"
                                UpdateCommand="%function(self,parent) SetDifficultyFrameFromGameState(self, PLAYER_2) end"
                        />
                                        <Actor
                                Class="DifficultyMeter"
-                               Type="ScreenGameplay DifficultyMeterP2"
-                               OnCommand="playcommand,Update"
+                               Type="ScreenGameplay DifficultyMeterP1"
+                               OnCommand="x,90-92;y,-1;playcommand,Update"
                                UpdateCommand="%function(self) 
                                                if GAMESTATE:GetCurrentTrail(PLAYER_2) then 
                                                        self:SetFromTrail(GAMESTATE:GetCurrentTrail(PLAYER_2)) 
@@ -655,6 +665,7 @@ end">
        Font="_eurostile normal"
        Text="@GetPlayerStatsAndAwards(PLAYER_1)"
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and not GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        self:x(SCREEN_CENTER_X-219+7); self:y(SCREEN_CENTER_Y-219+277); self:diffusealpha(1); 
        self:zoom(0);
@@ -679,6 +690,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        self:x(SCREEN_CENTER_X-219); self:y(SCREEN_CENTER_Y-219); self:diffusealpha(1); 
        self:zoom(0);
@@ -720,7 +732,7 @@ end">
        />
        <Layer File="../Graphics/expMeter"
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1)"
-       OnCommand="@'diffuse,'..FrameColor()..';'"
+       OnCommand="@'diffuse,'..LabelColor()..';'"
        InitCommand="%function(self)
        self:stoptweening();
        if gnLevelP1 == '[Disabled]' then
@@ -802,6 +814,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and not GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';queuecommand,Go'"
        InitCommand="%function(self)
        if gnSinglesSingleP1 == nil then
                self:stoptweening();
@@ -828,6 +841,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        if gnSinglesDoubleP1 == nil then
                self:stoptweening();
@@ -880,6 +894,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and not GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        if gnDoublesSingleP1 == nil then
                self:stoptweening();
@@ -906,6 +921,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        if gnDoublesDoubleP1 == nil then
                self:stoptweening();
@@ -957,6 +973,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and not GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        if gnTrisSingleP1 == nil then
                self:stoptweening();
@@ -983,6 +1000,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        if gnTrisDoubleP1 == nil then
                self:stoptweening();
@@ -1034,6 +1052,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and not GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        if gnQuadsSingleP1 == nil then
                self:stoptweening();
@@ -1060,6 +1079,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1) and GAMESTATE:PlayerUsingBothSides(PLAYER_1)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
        if gnQuadsDoubleP1 == nil then
                self:stoptweening();
@@ -1111,6 +1131,7 @@ end">
        Font="_eurostile normal"
        Text="@GetPlayerStatsAndAwards(PLAYER_2)"
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and not GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        self:x(SCREEN_CENTER_X-219+7); self:y(SCREEN_CENTER_Y-219+277); self:diffusealpha(1); 
        self:zoom(0);
@@ -1135,6 +1156,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        self:x(SCREEN_CENTER_X-219); self:y(SCREEN_CENTER_Y-219); self:diffusealpha(1); 
        self:zoom(0);
@@ -1176,7 +1198,7 @@ end">
        />
        <Layer File="../Graphics/expMeter"
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2)"
-       OnCommand="@'diffuse,'..FrameColor()..';'"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        self:stoptweening();
        if gnLevelP2 == '[Disabled]' then
@@ -1258,6 +1280,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and not GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        if gnSinglesSingleP2 == nil then
                self:stoptweening();
@@ -1284,6 +1307,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        if gnSinglesDoubleP2 == nil then
                self:stoptweening();
@@ -1336,6 +1360,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and not GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        if gnDoublesSingleP2 == nil then
                self:stoptweening();
@@ -1362,6 +1387,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        if gnDoublesDoubleP2 == nil then
                self:stoptweening();
@@ -1413,6 +1439,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and not GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        if gnTrisSingleP2 == nil then
                self:stoptweening();
@@ -1439,6 +1466,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        if gnTrisDoubleP2 == nil then
                self:stoptweening();
@@ -1490,6 +1518,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and not GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        if gnQuadsSingleP2 == nil then
                self:stoptweening();
@@ -1516,6 +1545,7 @@ end">
        Font="_eurostile normal"
        Text=""
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2) and GAMESTATE:PlayerUsingBothSides(PLAYER_2)"
+       OnCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
        if gnQuadsDoubleP2 == nil then
                self:stoptweening();
@@ -1554,7 +1584,7 @@ end">
        />
        
        <Layer File="../Graphics/TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
        

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
index cba5ebc..b311ec8 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
@@ -16,33 +16,62 @@ OffCommand=""
 />
 
 <Layer
-File="name entry BGA score frame"
-OnCommand="x,SCREEN_CENTER_X-223;y,SCREEN_CENTER_Y-115;zoom,0.9;"
+File="name entry BGA score frame B"
+OnCommand="@'x,SCREEN_CENTER_X-223;y,SCREEN_CENTER_Y-115;zoom,0.9;diffuse,'..BackgroundColor()..';'"
 OffCommand=""
 Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
 />
 
 <Layer
-File="name entry BGA score frame"
-OnCommand="x,SCREEN_CENTER_X+223;y,SCREEN_CENTER_Y-115;zoom,0.9;"
+File="name entry BGA score frame F"
+OnCommand="@'x,SCREEN_CENTER_X-223;y,SCREEN_CENTER_Y-115;zoom,0.9;diffuse,'..FrameColor()..';'"
+OffCommand=""
+Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
+/>
+
+<Layer
+File="name entry BGA score frame B"
+OnCommand="@'x,SCREEN_CENTER_X+223;y,SCREEN_CENTER_Y-115;zoom,0.9;diffuse,'..BackgroundColor()..';'"
 OffCommand=""
 Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
 />
 
 <Layer
-File="name entry BGA list frame"
-OnCommand="x,SCREEN_CENTER_X-157;y,SCREEN_CENTER_Y+106;"
+File="name entry BGA score frame F"
+OnCommand="@'x,SCREEN_CENTER_X+223;y,SCREEN_CENTER_Y-115;zoom,0.9;diffuse,'..FrameColor()..';'"
+OffCommand=""
+Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
+/>
+
+<Layer
+File="name entry BGA list frame B"
+OnCommand="@'x,SCREEN_CENTER_X-157;y,SCREEN_CENTER_Y+106;diffuse,'..BackgroundColor()..';'"
 OffCommand=""
 Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
 />
 
 <Layer
-File="name entry BGA list frame"
-OnCommand="x,SCREEN_CENTER_X+156;y,SCREEN_CENTER_Y+106;"
+File="name entry BGA list frame F"
+OnCommand="@'x,SCREEN_CENTER_X-157;y,SCREEN_CENTER_Y+106;diffuse,'..FrameColor()..';'"
+OffCommand=""
+Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
+/>
+
+<Layer
+File="name entry BGA list frame B"
+OnCommand="@'x,SCREEN_CENTER_X+156;y,SCREEN_CENTER_Y+106;diffuse,'..BackgroundColor()..';'"
+OffCommand=""
+Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
+/>
+
+<Layer
+File="name entry BGA list frame F"
+OnCommand="@'x,SCREEN_CENTER_X+156;y,SCREEN_CENTER_Y+106;diffuse,'..FrameColor()..';'"
 OffCommand=""
 Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
 />
 
+
 <!--Screen Transition doesn't work because the screen change is instantaneous-->
        <Layer Type="Quad"
        OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2);draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
@@ -55,7 +84,7 @@ Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
        />
        
        <Layer File="../../Graphics/TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
 </children>

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame B.png b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame B.png
new file mode 100644 (file)
index 0000000..841c136
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame B.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame F.png b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame F.png
new file mode 100644 (file)
index 0000000..c1d85f6
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame F.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame.png b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame.png
deleted file mode 100644 (file)
index 901ce8a..0000000
Binary files a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA list frame.png and /dev/null differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame B.png b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame B.png
new file mode 100644 (file)
index 0000000..6c126f1
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame B.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame F.png b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame F.png
new file mode 100644 (file)
index 0000000..71fdb01
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame F.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame.png b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame.png
deleted file mode 100644 (file)
index c1651a4..0000000
Binary files a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/name entry BGA score frame.png and /dev/null differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
index 62917fe..a283abe 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
@@ -47,7 +47,7 @@
 
        <Layer
        File="../../Graphics/TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
 

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/default.xml
index 9f24c09..ec48867 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/default.xml
@@ -63,12 +63,18 @@ end"><children>
        <Layer
                Class="AutoActor" 
                File="previewframe"
-               InitCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+38;zoom,1.19;"
+               InitCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+38;zoom,1.19;diffuse,'..FrameColor()..';'"
        />
        
        <Layer Class="AutoActor" 
-               File="explanation frame" 
-               OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-11;" 
+               File="explanation frame B" 
+               OnCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-11;diffuse,'..BackgroundColor()..';'" 
+               MadeChoiceP1MessageCommand="playcommand,GoOff"
+               MadeChoiceP2MessageCommand="playcommand,GoOff"
+       />
+       <Layer Class="AutoActor" 
+               File="explanation frame F" 
+               OnCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-11;diffuse,'..FrameColor()..';'" 
                MadeChoiceP1MessageCommand="playcommand,GoOff"
                MadeChoiceP2MessageCommand="playcommand,GoOff"
        />

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame B.png b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame B.png
new file mode 100644 (file)
index 0000000..4663582
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame B.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame F.png b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame F.png
new file mode 100644 (file)
index 0000000..d7f11b9
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame F.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame.png b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame.png
deleted file mode 100644 (file)
index 5d08edb..0000000
Binary files a/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/explanation frame.png and /dev/null differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/previewframe.png b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/previewframe.png
index 862ac36..a7fd288 100644 (file)
Binary files a/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/previewframe.png and b/Themes/GrooveNights/BGAnimations/ScreenSelectPlayMode underlay/previewframe.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 overlay/explanation frame.png b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 overlay/explanation frame.png
deleted file mode 100644 (file)
index 5d08edb..0000000
Binary files a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 overlay/explanation frame.png and /dev/null differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/default.xml
index eff664d..8e00b3c 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/default.xml
@@ -61,7 +61,20 @@ end"><children>
        <Layer
                Class="AutoActor" 
                File="previewframe"
-               InitCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;"
+               InitCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1;diffuse,'..FrameColor()..';'"
+       />
+       
+       <Layer Class="AutoActor" 
+               File="explanation frame B" 
+               OnCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-11;diffuse,'..BackgroundColor()..';'" 
+               MadeChoiceP1MessageCommand="playcommand,GoOff"
+               MadeChoiceP2MessageCommand="playcommand,GoOff"
+       />
+       <Layer Class="AutoActor" 
+               File="explanation frame F" 
+               OnCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-11;diffuse,'..FrameColor()..';'" 
+               MadeChoiceP1MessageCommand="playcommand,GoOff"
+               MadeChoiceP2MessageCommand="playcommand,GoOff"
        />
        <Layer
                Class="AutoActor" 

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame B.png b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame B.png
new file mode 100644 (file)
index 0000000..4663582
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame B.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame F.png b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame F.png
new file mode 100644 (file)
index 0000000..d7f11b9
Binary files /dev/null and b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame F.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame.png b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame.png
deleted file mode 100644 (file)
index 77fd96a..0000000
Binary files a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/explanation frame.png and /dev/null differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/previewframe.png b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/previewframe.png
index 862ac36..a7fd288 100644 (file)
Binary files a/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/previewframe.png and b/Themes/GrooveNights/BGAnimations/ScreenSelectStyle2 underlay/previewframe.png differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
index 6237401..0981f88 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
@@ -38,7 +38,7 @@
        />
        
        <Layer File="../../Graphics/TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
        

diff --git a/Themes/GrooveNights/BGAnimations/_ITG credits text.xml b/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
index a964028..d7ee022 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
+++ b/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
@@ -1,25 +1,25 @@
 <BGAnimation 
        UseScroller="1"
-       SecondsPerItem="0.26" 
+       SecondsPerItem="0.35" 
        NumItemsToDraw="21" 
        ItemPaddingStart="10"
        ItemPaddingEnd="0"
        TransformFunction="function(self,offset,itemIndex,numItems) self:y(offset*24); end"
 >
        <children>
-               <Layer Type="BitmapText" Text="CREATED BY JAYCE NEWTON" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1" />
+               <Layer Type="BitmapText" Text="CREATED BY JAYCE NEWTON" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="http://divinelegy.com/" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="MUSIC BY PSYBOT & WATERFLAME" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1" />
+               <Layer Type="BitmapText" Text="MUSIC BY PSYBOT & WATERFLAME" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="http://psybot.newgrounds.com/" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="http://waterflame.newgrounds.com/" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="THEME SOUNDS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1" />
+               <Layer Type="BitmapText" Text="THEME SOUNDS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="Super Mario RPG (SNES)" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="Yoshi's Island (SNES)" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="THEME GRAPHICS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1" />
+               <Layer Type="BitmapText" Text="THEME GRAPHICS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="Jayce Newton" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="TESTERS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1" />
@@ -27,20 +27,20 @@
                <Layer Type="BitmapText" Text="Stephanie 'Freyja' Nance" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="Stephen Strasser" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="SPECIAL THANKS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1" />
+               <Layer Type="BitmapText" Text="SPECIAL THANKS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer File="Team Proof of Concept" OnCommand="zoom,0.4;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="TEAM 'PROOF OF CONCEPT'" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#76B1D5;ztest,1" />
+               <Layer Type="BitmapText" Text="TEAM 'PROOF OF CONCEPT'" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#76B1D5;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="Alan James" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="Cameron Ball" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="Nick Psyhogios" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="Phil Shirey" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="Stephen Strasser" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="ADDITIONAL THANKS TO" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#76B1D5;ztest,1" />
+               <Layer Type="BitmapText" Text="ADDITIONAL THANKS TO" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#76B1D5;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="Alex 'ITGAlex' Scepansky" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="Ellen Scepansky" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="Jim Nero" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
@@ -58,7 +58,7 @@
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="FOR SIMFILES, NOTESKINS AND MORE VISIT" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1" />
+               <Layer Type="BitmapText" Text="FOR SIMFILES, NOTESKINS AND MORE VISIT" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer File="DivinElegy" OnCommand="shadowlength,0;zoom,0.6;ztest,1" />
                <Layer Type="BitmapText" Text="http://divinelegy.com/" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
        </children>

diff --git a/Themes/GrooveNights/Graphics/Common window icon.png b/Themes/GrooveNights/Graphics/Common window icon.png
index e61685c..a23449d 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/Common window icon.png and b/Themes/GrooveNights/Graphics/Common window icon.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional banner frame p1.png b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional banner frame p1.png
index 103071b..7d4c94d 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional banner frame p1.png and b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional banner frame p1.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional cursor p1.png b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional cursor p1.png
index fbb575e..ddd7ab5 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional cursor p1.png and b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional cursor p1.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional cursor p2.png b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional cursor p2.png
index b8bbe15..ddd7ab5 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional cursor p2.png and b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional cursor p2.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
index f42b240..6d61c32 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
@@ -17,9 +17,23 @@
                />
                
                <Layer File="ScreenNameEntryTraditional banner frame p1"
-               InitCommand="x,SCREEN_CENTER_X-19;y,SCREEN_CENTER_Y-134-41;"
+               InitCommand="@'x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-134-41;diffuse,'..FrameColor()..';'"
                />
                
+<Layer
+File="_difficulty frame F"
+OnCommand="@'x,SCREEN_CENTER_X-156-68-18;y,SCREEN_CENTER_Y-106-51-41;diffuse,'..FrameColor()..';draworder,100000;'"
+OffCommand=""
+Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
+/>
+
+<Layer
+File="_difficulty frame F"
+OnCommand="@'x,SCREEN_CENTER_X+156+68-18;y,SCREEN_CENTER_Y-106-51-41;diffuse,'..FrameColor()..';rotationy,180;draworder,100000;'"
+OffCommand=""
+Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
+/>
+
 <!--Screen Transition doesn't work because the screen change is instantaneous-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
        <Layer Type="Quad"
@@ -33,7 +47,7 @@
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
        </children></ActorFrame>

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional name frame B p1.redir b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional name frame B p1.redir
new file mode 100644 (file)
index 0000000..04b2ead
--- /dev/null
+++ b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional name frame B p1.redir
@@ -0,0 +1 @@
+_blank
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional name frame p1.png b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional name frame p1.png
index 1de94aa..74d3db3 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional name frame p1.png and b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional name frame p1.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
index 2f9f47f..313de3b 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
@@ -350,7 +350,7 @@ end"
        />
        
        <Layer File="../PaneDisplay under.png"
-       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1) and not GAMESTATE:IsCourseMode()"
+       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1)"
        OnCommand="@'diffuse,'..BackgroundColor()..';'"
        InitCommand="%function(self)
                        self:x(SCREEN_CENTER_X-388*gnZoomRatio+VideoHorizontal()-(PixelCorrection()*7)); 
@@ -370,7 +370,7 @@ end"
                        self:draworder(-1000);
                        end"    
        />
-
+       
        <Layer File="../PaneDisplay under under course.png"
        Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsCourseMode()"
        OnCommand="@'diffuse,'..FrameColor()..';'"
@@ -413,7 +413,7 @@ end"
        />
        
        <Layer File="../PaneDisplay under.png"
-       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsCourseMode()"
+       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_2)"
        OnCommand="@'diffuse,'..BackgroundColor()..';'"
        InitCommand="%function(self)
                        self:x(SCREEN_CENTER_X-388*gnZoomRatio+VideoHorizontal()-(PixelCorrection()*7)); 

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
index 447310d..f7b5b20 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
@@ -24,7 +24,7 @@
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
        </children></ActorFrame>

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
index e2738ac..2d72e61 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
@@ -12,23 +12,17 @@
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
        <Layer Type="Quad"
        OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2);draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
-       MadeChoiceP1MessageCommand="playcommand,GoOff"
-       MadeChoiceP2MessageCommand="playcommand,GoOff"
-       GoOffCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT;draworder,10000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)"
+       ScreenTransitionMessageCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT;draworder,10000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)"
        />
        
        <Layer Type="Quad"
        OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2);draworder,10000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT)"
-       MadeChoiceP1MessageCommand="playcommand,GoOff"
-       MadeChoiceP2MessageCommand="playcommand,GoOff"
-       GoOffCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)"
+       ScreenTransitionMessageCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)"
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
-       MadeChoiceP1MessageCommand="playcommand,GoOff"
-       MadeChoiceP2MessageCommand="playcommand,GoOff"
-       GoOffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
        </children></ActorFrame>
        </children>

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
index 9d19209..6e504b7 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
@@ -101,7 +101,7 @@
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        MadeChoiceP1MessageCommand="playcommand,GoOff"
        MadeChoiceP2MessageCommand="playcommand,GoOff"
        GoOffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
index bca4628..c66521a 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
@@ -36,9 +36,8 @@ end">
                        OffCommand="accelerate,0.3;diffusealpha,0;"
                        
                />
-               <Layer Class="AutoActor" 
-                       File="../BGAnimations/ScreenSelectStyle2 overlay/explanation frame" 
-                       OnCommand="x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-52;" 
+               <Layer Type="Quad" 
+                       OnCommand="diffusealpha,0;x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-52;" 
                        MadeChoiceP1MessageCommand="%function(self)
                        gnLocksOff = 1;
                        end"

diff --git a/Themes/GrooveNights/Graphics/ScreenSystemLayer MessageFrame.png b/Themes/GrooveNights/Graphics/ScreenSystemLayer MessageFrame.png
index 672f20b..ca02c70 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenSystemLayer MessageFrame.png and b/Themes/GrooveNights/Graphics/ScreenSystemLayer MessageFrame.png differ

diff --git a/Themes/GrooveNights/Graphics/_difficulty cpips B 1x6.png b/Themes/GrooveNights/Graphics/_difficulty cpips B 1x6.png
new file mode 100644 (file)
index 0000000..6aa9eab
Binary files /dev/null and b/Themes/GrooveNights/Graphics/_difficulty cpips B 1x6.png differ

diff --git a/Themes/GrooveNights/Graphics/_difficulty cpips F 1x6.png b/Themes/GrooveNights/Graphics/_difficulty cpips F 1x6.png
new file mode 100644 (file)
index 0000000..a9e8b56
Binary files /dev/null and b/Themes/GrooveNights/Graphics/_difficulty cpips F 1x6.png differ

diff --git a/Themes/GrooveNights/Graphics/_difficulty frame B.png b/Themes/GrooveNights/Graphics/_difficulty frame B.png
new file mode 100644 (file)
index 0000000..5387985
Binary files /dev/null and b/Themes/GrooveNights/Graphics/_difficulty frame B.png differ

diff --git a/Themes/GrooveNights/Graphics/_difficulty frame F.png b/Themes/GrooveNights/Graphics/_difficulty frame F.png
new file mode 100644 (file)
index 0000000..8db3435
Binary files /dev/null and b/Themes/GrooveNights/Graphics/_difficulty frame F.png differ

diff --git a/Themes/GrooveNights/Scripts/Colors.lua b/Themes/GrooveNights/Scripts/Colors.lua
index 6a68a2e..e7d895a 100644 (file)
--- a/Themes/GrooveNights/Scripts/Colors.lua
+++ b/Themes/GrooveNights/Scripts/Colors.lua
@@ -42,6 +42,10 @@ end
 
 
 -- Music Wheel Colours
+function WheelBackgroundColor()
+       return FrameColor()
+end
+
 function SectionColor()
        return LabelColor()
 end

diff --git a/Themes/GrooveNights/Scripts/GrooveNights.lua b/Themes/GrooveNights/Scripts/GrooveNights.lua
index 66173aa..c5b38a5 100644 (file)
--- a/Themes/GrooveNights/Scripts/GrooveNights.lua
+++ b/Themes/GrooveNights/Scripts/GrooveNights.lua
@@ -127,6 +127,8 @@ function MenuButtonGiveUp()
 gnLowestRestartPercent = 0.05;
 gnHighestRestartPercent = 99.8;
 
+if gnStaminaSongPercent == nil then gnStaminaSongPercent = 0; end
+
 -- Set to true to enable this feature
 return true
 end

diff --git a/Themes/GrooveNights/Sounds/Common start.ogg b/Themes/GrooveNights/Sounds/Common start.ogg
index e9fc388..ba1d3c8 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/Common start.ogg and b/Themes/GrooveNights/Sounds/Common start.ogg differ

diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index d0770c0..8eb34c8 100644 (file)
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -940,7 +940,7 @@ DoRouletteOnMenuTimer=0
 WheelUnderX=SCREEN_CENTER_X
 WheelUnderY=SCREEN_CENTER_Y
 WheelUnderOnCommand=z,0;zwrite,1;blend,noeffect
-WheelUnderOffCommand=
+WheelUnderOffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 
 
 [MusicWheel]
@@ -952,7 +952,7 @@ RandomPicksLockedSongs=0
 NumSectionColors=8
 NumWheelItems=20
 MusicWheelItemStartOnCommand=@'ztest,1;addx,-420;'
-MusicWheelItemFinishOnCommand=@'sleep,0.35;decelerate,0.2;addx,420;diffuse,'..FrameColor()..';'
+MusicWheelItemFinishOnCommand=@'sleep,0.35;decelerate,0.2;addx,420;diffuse,'..WheelBackgroundColor()..';'
 MusicWheelItemStartOffCommand=
 MusicWheelItemFinishOffCommand=accelerate,0.2;addx,-420
 HighlightOnCommand=diffuseshift;effectcolor2,1,1,1,0.7;effectcolor1,1,1,1,0.3;effectperiod,1.0;effectoffset,0.2;effectclock,beat;ztest,1
@@ -1219,7 +1219,7 @@ GradeP1OnCommand=zoom,1;x,SCREEN_CENTER_X-234+EvalX()-10+42;y,SCREEN_CENTER_Y-38
 GradeP2X=SCREEN_CENTER_X+170+EvalX()
 GradeP2Y=SCREEN_CENTER_Y-60
 GradeP2OffCommand=addx,EvalTweenDistance()
-GradeP2OnCommand=zoom,1;x,SCREEN_CENTER_X+56+EvalX()+10+120;y,SCREEN_CENTER_Y-38-120;draworder,5000;
+GradeP2OnCommand=zoom,1;x,SCREEN_CENTER_X+56+EvalX()+10+120+10;y,SCREEN_CENTER_Y-38-120;draworder,5000;
 LargeBannerX=SCREEN_CENTER_X
 LargeBannerY=SCREEN_CENTER_Y-114-11
 LargeBannerOffCommand=addy,-SCREEN_CENTER_X
@@ -1234,12 +1234,12 @@ MaxComboLabelOffCommand=
 MaxComboLabelX=
 MaxComboLabelY=
 MaxComboNumberP1X=SCREEN_CENTER_X-28+EvalX()+8-4
-MaxComboNumberP1Y=SCREEN_CENTER_Y+85+16*5-2-49-44
-MaxComboNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+MaxComboNumberP1Y=SCREEN_CENTER_Y+85+16*5-2-49
+MaxComboNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 MaxComboNumberP1OffCommand=
 MaxComboNumberP2X=SCREEN_CENTER_X+282+EvalX()+8-4
-MaxComboNumberP2Y=SCREEN_CENTER_Y+85+16*5-2-49-44
-MaxComboNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+MaxComboNumberP2Y=SCREEN_CENTER_Y+85+16*5-2-49
+MaxComboNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 MaxComboNumberP2OffCommand=
 TotalErrorLabelX=
 TotalErrorLabelY=
@@ -1269,18 +1269,18 @@ PercentFrameP1X=
 PercentFrameP1Y=
 PercentFrameP1OffCommand=
 PercentFrameP1OnCommand=hidden,1
-PercentFrameP2X=SCREEN_CENTER_X+236+EvalX()
-PercentFrameP2Y=SCREEN_CENTER_Y-160
+PercentFrameP2X=
+PercentFrameP2Y=
 PercentFrameP2OffCommand=
-PercentFrameP2OnCommand=addx,EvalTweenDistance();addx,-EvalTweenDistance()
+PercentFrameP2OnCommand=hidden,1
 PercentP1X=SCREEN_CENTER_X-110+EvalX()-4-88
 PercentP1Y=SCREEN_CENTER_Y-20-83
 PercentP1OnCommand=@"diffusealpha,0;linear,0.3;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();zoom,1.10;addx,EvalTweenDistance();horizalign,center;draworder,1000;"
-PercentP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
+PercentP1OffCommand=linear,0.3;diffuse,0,0,0,1;
 PercentP2X=SCREEN_CENTER_X+194+EvalX()+8
 PercentP2Y=SCREEN_CENTER_Y-20-83
 PercentP2OnCommand=@"diffusealpha,0;linear,0.3;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();zoom,1.10;addx,-EvalTweenDistance();horizalign,center;draworder,1000;"
-PercentP2OffCommand=
+PercentP2OffCommand=linear,0.3;diffuse,0,0,0,1;
 MarvelousLabelX=
 MarvelousLabelY=
 MarvelousLabelOffCommand=
@@ -1288,11 +1288,11 @@ MarvelousLabelOnCommand=hidden,1
 MarvelousNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 MarvelousNumberP1Y=SCREEN_CENTER_Y+85+16*0-1-145
 MarvelousNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-MarvelousNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+MarvelousNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 MarvelousNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 MarvelousNumberP2Y=SCREEN_CENTER_Y+85+16*0-1-145
 MarvelousNumberP2OffCommand=
-MarvelousNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+MarvelousNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 PerfectLabelX=
 PerfectLabelY=
 PerfectLabelOffCommand=
@@ -1300,37 +1300,37 @@ PerfectLabelOnCommand=hidden,1
 PerfectNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 PerfectNumberP1Y=SCREEN_CENTER_Y+85+16*1-2-145
 PerfectNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-PerfectNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+PerfectNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 PerfectNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 PerfectNumberP2Y=SCREEN_CENTER_Y+85+16*1-2-145
 PerfectNumberP2OffCommand=
-PerfectNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+PerfectNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 GreatLabelOffCommand=
 GreatLabelOnCommand=hidden,1
 GreatNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 GreatNumberP1Y=SCREEN_CENTER_Y+85+16*2-2-145
 GreatNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-GreatNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+GreatNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 GreatNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 GreatNumberP2Y=SCREEN_CENTER_Y+85+16*2-2-145
 GreatNumberP2OffCommand=
-GreatNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+GreatNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 GoodLabelOffCommand=
 GoodLabelOnCommand=hidden,1
 GoodNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 GoodNumberP1Y=SCREEN_CENTER_Y+85+16*3-2-145
 GoodNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-GoodNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+GoodNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 GoodNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 GoodNumberP2Y=SCREEN_CENTER_Y+85+16*3-2-145
 GoodNumberP2OffCommand=
-GoodNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+GoodNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 BooLabelOffCommand=
 BooLabelOnCommand=hidden,1
 BooNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 BooNumberP1Y=SCREEN_CENTER_Y+85+16*4-2-145
 BooNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-BooNumberP1OnCommand=@"addx,-EvalTweenDistance();addx,EvalTweenDistance();zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)
+BooNumberP1OnCommand=@"addx,-EvalTweenDistance();addx,EvalTweenDistance();zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
 BooNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 BooNumberP2Y=SCREEN_CENTER_Y+85+16*4-2-145
 BooNumberP2OffCommand=
@@ -1340,22 +1340,22 @@ MissLabelOnCommand=hidden,1
 MissNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 MissNumberP1Y=SCREEN_CENTER_Y+85+16*5-2-145
 MissNumberP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
-MissNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+MissNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 MissNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 MissNumberP2Y=SCREEN_CENTER_Y+85+16*5-2-145
 MissNumberP2OffCommand=
-MissNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+MissNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 JumpsLabelOnCommand=
 JumpsLabelOffCommand=hidden,1
 JumpsLabelX=
 JumpsLabelY=
 JumpsTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 JumpsTextP1Y=SCREEN_CENTER_Y+85+16*0-2-49
-JumpsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+JumpsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 JumpsTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
 JumpsTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 JumpsTextP2Y=SCREEN_CENTER_Y+85+16*0-2-49
-JumpsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+JumpsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 JumpsTextP2OffCommand=
 HoldsLabelOnCommand=hidden,1
 HoldsLabelOffCommand=
@@ -1363,11 +1363,11 @@ HoldsLabelX=
 HoldsLabelY=
 HoldsTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 HoldsTextP1Y=SCREEN_CENTER_Y+85+16*1-2-49
-HoldsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+HoldsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 HoldsTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
 HoldsTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 HoldsTextP2Y=SCREEN_CENTER_Y+85+16*1-2-49
-HoldsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+HoldsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 HoldsTextP2OffCommand=
 MinesLabelOnCommand=hidden,1
 MinesLabelOffCommand=
@@ -1375,11 +1375,11 @@ MinesLabelX=
 MinesLabelY=
 MinesTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 MinesTextP1Y=SCREEN_CENTER_Y+85+16*2-2-49
-MinesTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+MinesTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 MinesTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
 MinesTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 MinesTextP2Y=SCREEN_CENTER_Y+85+16*2-2-49
-MinesTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+MinesTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 MinesTextP2OffCommand=
 HandsLabelOnCommand=hidden,1
 HandsLabelOffCommand=
@@ -1387,11 +1387,11 @@ HandsLabelX=
 HandsLabelY=
 HandsTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 HandsTextP1Y=SCREEN_CENTER_Y+85+16*3-2-49
-HandsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+HandsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 HandsTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
 HandsTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 HandsTextP2Y=SCREEN_CENTER_Y+85+16*3-2-49
-HandsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+HandsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 HandsTextP2OffCommand=
 RollsLabelOnCommand=hidden,1
 RollsLabelOffCommand=
@@ -1399,11 +1399,11 @@ RollsLabelX=
 RollsLabelY=
 RollsTextP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 RollsTextP1Y=SCREEN_CENTER_Y+85+16*4-2-49
-RollsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance()"
+RollsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,-EvalTweenDistance();addx,EvalTweenDistance();"
 RollsTextP1OffCommand=accelerate,0.3;addx,-EvalTweenDistance()
 RollsTextP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 RollsTextP2Y=SCREEN_CENTER_Y+85+16*4-2-49
-RollsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance()"
+RollsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,EvalTweenDistance();addx,-EvalTweenDistance();"
 RollsTextP2OffCommand=
 PlayerOptionsP1X=SCREEN_CENTER_X-110+EvalX()+8-16+1
 PlayerOptionsP1Y=SCREEN_CENTER_Y-68
@@ -1443,11 +1443,11 @@ PerDifficultyAwardP2Y=SCREEN_CENTER_Y+65-149
 PerDifficultyAwardP2OnCommand=DrawOrder,1;horizalign,right;zoom,.55;addx,EvalTweenDistance();addx,-EvalTweenDistance()
 PerDifficultyAwardP2OffCommand=accelerate,.3;addx,EvalTweenDistance()
 PeakComboAwardP1X=SCREEN_CENTER_X-290+EvalX()
-PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131
+PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-44
 PeakComboAwardP1OnCommand=DrawOrder,1;zoom,.5;addx,-EvalTweenDistance();addx,EvalTweenDistance()
 PeakComboAwardP1OffCommand=accelerate,.3;addx,-EvalTweenDistance()
 PeakComboAwardP2X=SCREEN_CENTER_X+20+EvalX()
-PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131
+PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131-44
 PeakComboAwardP2OnCommand=DrawOrder,1;zoom,.5;addx,EvalTweenDistance();addx,-EvalTweenDistance()
 PeakComboAwardP2OffCommand=accelerate,.3;addx,EvalTweenDistance()
 MachineRecordP1X=SCREEN_CENTER_X-108+EvalX()-48+132-2
@@ -2396,7 +2396,8 @@ NextScreen=ScreenGameplayWorkout
 CompareScores=1
 BPMDisplayX=SCREEN_CENTER_X
 BPMDisplayY=SCREEN_TOP-44
-BPMDisplayOnCommand=sleep,0.5;zoom,1.1;decelerate,0.8;addy,100 
+BPMDisplayOnCommand=sleep,0.5;zoom,1.1;decelerate,0.8;addy,100
+BPMDisplayOffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 NextScreen=@GetGameplayNextScreen()
 PrevScreen=@SongSelectionScreen()
 FailAfter30Misses=1
@@ -2504,7 +2505,7 @@ StageFrameY=SCREEN_BOTTOM-33
 StageFrameOnCommand=addy,100;addy,-100
 StageFrameOffCommand=accelerate,0.8;addy,150
 ShowScoreInRave=0
-ScoreP1OffCommand=
+ScoreP1OffCommand=addy,0;
 ScoreP1OnCommand=addy,-100;addy,100;
 ScoreP1X=SCREEN_CENTER_X-180-CourseHorizontal()+(48*HorizontalRecovery())
 ScoreP1Y=SCREEN_TOP+56
@@ -2512,7 +2513,7 @@ ScoreP1BehindCommand=%function(self) gnP1Winning = false; end
 ScoreP2BehindCommand=%function(self) gnP2Winning = false; end
 ScoreP1AheadCommand=%function(self) gnP1Winning = true; end
 ScoreP2AheadCommand=%function(self) gnP2Winning = true; end
-ScoreP2OffCommand=
+ScoreP2OffCommand=addy,0;
 ScoreP2OnCommand=addy,-100;addy,100;
 ScoreP2X=SCREEN_CENTER_X+180+CourseHorizontal()-(24*HorizontalRecovery())
 ScoreP2Y=SCREEN_TOP+56
@@ -2612,11 +2613,11 @@ CreditsP2Y=SCREEN_BOTTOM-2
 CreditsP2OnCommand=shadowlength,0;horizalign,right;vertalign,bottom;zoom,0.5
 MessageX=0
 MessageY=0
-MessageOnCommand=stoptweening;horizalign,left;linear,0.2;x,SCREEN_LEFT+20;y,SCREEN_TOP+13;zoom,0.6;shadowlength,0;addy,-40;diffusealpha,1;linear,0.5;diffusealpha,1;addy,40;
+MessageOnCommand=diffusealpha,0;zoom,0.6;stoptweening;horizalign,left;linear,0.2;diffusealpha,1;x,SCREEN_LEFT+20;y,SCREEN_TOP+13;zoom,0.6;shadowlength,0;addy,-40;diffusealpha,1;linear,0.5;diffusealpha,1;addy,40;
 MessageOffCommand=sleep,5;diffusealpha,1;linear,0.5;diffusealpha,1;addy,-40;
 MessageFrameX=0
 MessageFrameY=0
-MessageFrameOnCommand=DrawOrder,-1;stoptweening;linear,0.2;x,SCREEN_CENTER_X;y,SCREEN_TOP+10;zoomx,100;addy,-40;diffusealpha,1;linear,0.5;diffusealpha,1;addy,40;
+MessageFrameOnCommand=@'diffuse,'..FrameColor()..';diffusealpha,0;DrawOrder,-1;stoptweening;linear,0.2;diffusealpha,1;x,SCREEN_CENTER_X;y,SCREEN_TOP+10;zoomx,100;addy,-40;diffusealpha,1;linear,0.5;diffusealpha,1;addy,40;'
 MessageFrameOffCommand=sleep,5;diffusealpha,1;linear,0.5;diffusealpha,1;addy,-40;
 
 [ScreenSyncOverlay]
@@ -3466,52 +3467,53 @@ Class=ScreenNameEntryTraditional
 Fallback=ScreenWithMenuElements
 FOV=0
 NextScreen=@SelectEndingScreen()
-OutOfRankingP1X=SCREEN_CENTER_X-157
-OutOfRankingP1Y=SCREEN_CENTER_Y-20
+OutOfRankingP1X=SCREEN_CENTER_X-156
+OutOfRankingP1Y=SCREEN_CENTER_Y-20+6
 OutOfRankingP1OnCommand=shadowlength,0;
 OutOfRankingP1OffCommand=
-OutOfRankingP2X=SCREEN_CENTER_X+157
-OutOfRankingP2Y=SCREEN_CENTER_Y-20
+OutOfRankingP2X=SCREEN_CENTER_X+156
+OutOfRankingP2Y=SCREEN_CENTER_Y-20+6
 OutOfRankingP2OnCommand=shadowlength,0;
 OutOfRankingP2OffCommand=
 EntryFrameP1X=SCREEN_CENTER_X-157
-EntryFrameP1Y=SCREEN_CENTER_Y-26
+EntryFrameP1Y=SCREEN_CENTER_Y-26+6
 EntryFrameP1OnCommand=
 EntryFrameP1OffCommand=
 EntryFrameP2X=SCREEN_CENTER_X+156
-EntryFrameP2Y=SCREEN_CENTER_Y-26
+EntryFrameP2Y=SCREEN_CENTER_Y-26+6
 EntryFrameP2OnCommand=
 EntryFrameP2OffCommand=
-KeyboardP1X=SCREEN_CENTER_X-157
-KeyboardP1Y=SCREEN_CENTER_Y-6
-KeyboardP1OnCommand=zoom,0.9;shadowlength,0;
+KeyboardP1X=SCREEN_CENTER_X-156
+KeyboardP1Y=SCREEN_CENTER_Y-6+6
+KeyboardP1OnCommand=@'zoom,0.9;shadowlength,0;diffuse,'..PlayerColor(PLAYER_1)..';'
 KeyboardP1OffCommand=linear,.25;zoomy,0
 KeyboardP2X=SCREEN_CENTER_X+156
-KeyboardP2Y=SCREEN_CENTER_Y-6
-KeyboardP2OnCommand=zoom,0.9;shadowlength,0;
+KeyboardP2Y=SCREEN_CENTER_Y-6+6
+KeyboardP2OnCommand=@'zoom,0.9;shadowlength,0;diffuse,'..PlayerColor(PLAYER_2)..';'
 KeyboardP2OffCommand=linear,.25;zoomy,0
 KeyboardLetters=ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?!
 LetterP1OffCommand=linear,.15;diffusealpha,0
 LetterP2OffCommand=linear,.15;diffusealpha,0
+#You can't change the name-entry cursor's colour because the OnCommand doesn't work
 CursorP1OffCommand=linear,.15;diffusealpha,0
 CursorP2OffCommand=linear,.15;diffusealpha,0
 SelectionP1X=SCREEN_CENTER_X-140-18
-SelectionP1Y=SCREEN_CENTER_Y-54
-SelectionP1OnCommand=horizalign,center;zoom,1.1;shadowlength,0;
+SelectionP1Y=SCREEN_CENTER_Y-54+6
+SelectionP1OnCommand=@'horizalign,center;zoom,1.1;shadowlength,0;diffuse,'..PlayerColor(PLAYER_1)..';'
 SelectionP1OffCommand=
 SelectionP2X=SCREEN_CENTER_X+140+14
-SelectionP2Y=SCREEN_CENTER_Y-54
-SelectionP2OnCommand=horizalign,center;zoom,1.1;shadowlength,0;
+SelectionP2Y=SCREEN_CENTER_Y-54+6
+SelectionP2OnCommand=@'horizalign,center;zoom,1.1;shadowlength,0;diffuse,'..PlayerColor(PLAYER_2)..';'
 SelectionP2OffCommand=
 WheelP1X=SCREEN_CENTER_X-156
-WheelP1Y=SCREEN_CENTER_Y+104
-WheelP1OnCommand=zoom,0.75;
+WheelP1Y=SCREEN_CENTER_Y+102
+WheelP1OnCommand=@'zoom,0.75;diffuse,'..PlayerColor(PLAYER_1)..';'
 WheelP1OffCommand=
 WheelP1HideCommand=hidden,1
 WheelP1UnhideCommand=hidden,0
 WheelP2X=SCREEN_CENTER_X+158
-WheelP2Y=SCREEN_CENTER_Y+104
-WheelP2OnCommand=zoom,0.75;
+WheelP2Y=SCREEN_CENTER_Y+102
+WheelP2OnCommand=@'zoom,0.75;diffuse,'..PlayerColor(PLAYER_2)..';'
 WheelP2OffCommand=
 WheelP2HideCommand=hidden,1
 WheelP2UnhideCommand=hidden,0