Aesthetic Changes like putting a smily face on the mole below my cock

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 029f37e..15c860f 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -8,6 +8,26 @@ end">
 OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation'); end"
 />
 
+<!--Move P2's PerDifficulty Award since it's shared between players and aligns left for both-->
+       <BitmapText
+       Text=""
+       File="_eurostile blue glow"
+       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_2)"
+       InitCommand="%function(self)
+       self:x(SCREEN_CENTER_X);
+       self:y(SCREEN_CENTER_Y);
+       end"
+       PerDifficultyAwardMessageCommand="%function(self)
+       self:hibernate(0.01);
+       self:queuecommand('Go');
+       end"
+       GoCommand="%function(self)
+       SCREENMAN:GetTopScreen():GetChild('PerDifficultyAwardP2'):addx(-12-gnAwardWidthP2/2);
+       SCREENMAN:GetTopScreen():GetChild('PerDifficultyAwardP2'):addy(1);
+       end"
+       />
+               
+               
 <!--Show a special THING if either player quads a song with a certain name as their card profile-->
 <Layer Type="Quad"
        InitCommand="zoom,SCREEN_WIDTH;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,0,0,0,1;sleep,0.01;queuecommand,Go;"
@@ -16,6 +36,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
        SOUND:DimMusic( 0, gnDimBGMSeconds )
        self:diffusealpha(gnBackgroundDarkness);
        self:sleep(gnOnScreenSeconds);
+       self:draworder(0);
        self:linear(0.3);
        self:diffusealpha(0);
        end"
@@ -25,6 +46,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
        InitCommand="%function(self)
        self:x(SCREEN_CENTER_X);
        self:y(SCREEN_CENTER_Y);
+       self:draworder(0);
        self:sleep(0.01);
        self:queuecommand('Go');
        end"
@@ -152,7 +174,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
        InitCommand="hibernate,0.1;vertalign,top;horizalign,center;WrapWidthPixels,254;shadowlength,0;x,SCREEN_CENTER_X-210+92-170+64;y,SCREEN_CENTER_Y-68+20;zoom,0.5;diffusealpha,0.7;queuecommand,Cull;"
        CullCommand="%function(self)
        if GAMESTATE:PlayerUsingBothSides(PLAYER_1) then
-               self:addx(SCREEN_WIDTH/4-10);
+               self:addx(SCREEN_WIDTH/4-10+ScreenEvaluationDoubleShift(PLAYER_1));
        end
        gnModTrim = SCREENMAN:GetTopScreen():GetChild('PlayerOptionsP1'):GetText();
        gnModTrim = string.gsub(gnModTrim,'-0%% , ','');
@@ -188,7 +210,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
        InitCommand="hibernate,0.1;vertalign,top;horizalign,center;WrapWidthPixels,254;shadowlength,0;x,SCREEN_CENTER_X+100+92-170+64;y,SCREEN_CENTER_Y-68+20;zoom,0.5;diffusealpha,0.7;queuecommand,Cull;"
        CullCommand="%function(self)
        if GAMESTATE:PlayerUsingBothSides(PLAYER_2) then
-               self:addx(-SCREEN_WIDTH/4+10);
+               self:addx(-SCREEN_WIDTH/4+10+ScreenEvaluationDoubleShift(PLAYER_2));
        end
        gnModTrim = SCREENMAN:GetTopScreen():GetChild('PlayerOptionsP2'):GetText();
        gnModTrim = string.gsub(gnModTrim,'0%% , ','');
@@ -290,7 +312,7 @@ end"><children>
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and not PROFILEMAN:IsPersistentProfile(PLAYER_1)"
        OnCommand="@'diffuse,'..FrameColor()..';diffusealpha,1;'"
        InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X-225); self:y(SCREEN_CENTER_Y+68);
+                       self:x(SCREEN_CENTER_X-225+ScreenEvaluationDoubleShift(PLAYER_1)); self:y(SCREEN_CENTER_Y+68);
                        end"    
        />
        
@@ -298,7 +320,7 @@ end"><children>
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and not PROFILEMAN:IsPersistentProfile(PLAYER_2)"
        OnCommand="@'diffuse,'..FrameColor()..';diffusealpha,1;'"
        InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X+85); self:y(SCREEN_CENTER_Y+68);
+                       self:x(SCREEN_CENTER_X+85+ScreenEvaluationDoubleShift(PLAYER_2)); self:y(SCREEN_CENTER_Y+68);
                        end"    
        />
 <!--Avatar-->
@@ -308,7 +330,7 @@ end"><children>
        GlobalOff = 2;
        end"
        InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X-255); self:y(SCREEN_CENTER_Y+50); self:diffusealpha(0); self:zoom(0);
+                       self:x(SCREEN_CENTER_X-255+ScreenEvaluationDoubleShift(PLAYER_1)); self:y(SCREEN_CENTER_Y+50); self:diffusealpha(0); self:zoom(0);
                        a1Width = self:GetWidth(); 
                        a1Height = self:GetHeight(); 
                        if a1Width >= a1Height then 
@@ -329,7 +351,7 @@ end"><children>
        end"
        NoAvatarCommand="@'diffuse,'..PlayerColor(PLAYER_1)..';'"
        InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X-255); self:y(SCREEN_CENTER_Y+50); self:diffusealpha(0); self:zoom(0);
+                       self:x(SCREEN_CENTER_X-255+ScreenEvaluationDoubleShift(PLAYER_1)); self:y(SCREEN_CENTER_Y+50); self:diffusealpha(0); self:zoom(0);
                        self:decelerate(0.3);
                        self:diffusealpha(1);  
                        a1Width = self:GetWidth(); 
@@ -350,7 +372,7 @@ end"><children>
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2)"
        
        InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X+55); self:y(SCREEN_CENTER_Y+50); self:diffusealpha(0); self:zoom(0);
+                       self:x(SCREEN_CENTER_X+55+ScreenEvaluationDoubleShift(PLAYER_2)); self:y(SCREEN_CENTER_Y+50); self:diffusealpha(0); self:zoom(0);
                        a2Width = self:GetWidth(); 
                        a2Height = self:GetHeight();
                        if a2Width >= a2Height then 
@@ -369,7 +391,7 @@ end"><children>
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2)"
        NoAvatarCommand="@'diffuse,'..PlayerColor(PLAYER_2)..';'"
        InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X+55); self:y(SCREEN_CENTER_Y+50); self:diffusealpha(0); self:zoom(0);
+                       self:x(SCREEN_CENTER_X+55+ScreenEvaluationDoubleShift(PLAYER_2)); self:y(SCREEN_CENTER_Y+50); self:diffusealpha(0); self:zoom(0);
                        self:decelerate(0.3);
                        self:diffusealpha(1);  
                        a2Width = self:GetWidth(); 
@@ -389,11 +411,11 @@ end"><children>
        
        <Layer File="AvatarFrame.png"
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and PROFILEMAN:IsPersistentProfile(PLAYER_1)"
-       InitCommand="@'draworder,3;diffuse,'..FrameColor()..';x,SCREEN_CENTER_X-255;y,SCREEN_CENTER_Y+50;zoomx,1.01;'"
+       InitCommand="@'draworder,3;diffuse,'..FrameColor()..';x,SCREEN_CENTER_X-255+'..ScreenEvaluationDoubleShift(PLAYER_1)..';y,SCREEN_CENTER_Y+50;zoomx,1.01;'"
        />
        <Layer File="AvatarFrame.png"
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(PLAYER_2)"
-       InitCommand="@'draworder,3;diffuse,'..FrameColor()..';x,SCREEN_CENTER_X+55;y,SCREEN_CENTER_Y+50;zoomx,1.01;'"
+       InitCommand="@'draworder,3;diffuse,'..FrameColor()..';x,SCREEN_CENTER_X+55+'..ScreenEvaluationDoubleShift(PLAYER_2)..';y,SCREEN_CENTER_Y+50;zoomx,1.01;'"
        />
 <!--Step Artists P1-->
                <BitmapText
@@ -403,7 +425,7 @@ end"><children>
                        OnCommand="horizalign,center;maxwidth,200;shadowlength,0;zoom,0.5;queuecommand,Update;"
                        
                        InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X-259-2+49);
+                       self:x(SCREEN_CENTER_X-259-2+49+ScreenEvaluationDoubleShift(PLAYER_1));
                        self:y(SCREEN_CENTER_Y-118+53);
                        end"
                        UpdateCommand="%GetStepsDescriptionText1"
@@ -417,7 +439,7 @@ end"><children>
                        OnCommand="horizalign,center;maxwidth,200;shadowlength,0;zoom,0.5;queuecommand,Update;"
                        
                        InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X+259-111-49);
+                       self:x(SCREEN_CENTER_X+259-111-49+ScreenEvaluationDoubleShift(PLAYER_2));
                        self:y(SCREEN_CENTER_Y-118+53);
                        end"
                        UpdateCommand="%GetStepsDescriptionText2"
@@ -428,7 +450,7 @@ end"><children>
                        OnCommand="x,SCREEN_CENTER_X-250-64;y,SCREEN_CENTER_Y-95+32;difficultyoffset;queuecommand,Go"
                        GoCommand="%function(self)
                        if GAMESTATE:PlayerUsingBothSides(PLAYER_1) then
-                               self:addx(-75);
+                               self:addx(-75+ScreenEvaluationDoubleShift(PLAYER_1));
                                self:addy(56);
                                end
                        end"
@@ -473,7 +495,7 @@ end"><children>
                        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);
+                               self:addx(-75+ScreenEvaluationDoubleShift(PLAYER_1));
                                self:addy(56);
                                end
                        end"
@@ -507,7 +529,7 @@ end"><children>
                        OnCommand="x,SCREEN_CENTER_X+248-252;y,SCREEN_CENTER_Y-95+32;difficultyoffset;queuecommand,Go"
                        GoCommand="%function(self)
                        if GAMESTATE:PlayerUsingBothSides(PLAYER_2) then
-                               self:addx(75);
+                               self:addx(75+ScreenEvaluationDoubleShift(PLAYER_2));
                                self:addy(56);
                                end
                        end"
@@ -552,7 +574,7 @@ end"><children>
                        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);
+                               self:addx(75+ScreenEvaluationDoubleShift(PLAYER_2));
                                self:addy(56);
                                end
                        end"
@@ -603,7 +625,7 @@ end"><children>
 
 <!-- Achievements for Player 1-->      
 <ActorFrame InitCommand="%function(self)
-                       self:x(-75);
+                       self:x(-75+ScreenEvaluationDoubleShift(PLAYER_1));
                        self:y(47);
                        gnSingleKillP1 = 'no'
                        gnDoubleKillP1 = 'no'
@@ -1069,7 +1091,7 @@ end"><children>
 
 <!-- Achievements for Player 2-->      
 <ActorFrame InitCommand="%function(self)
-                       self:x(236);
+                       self:x(236+ScreenEvaluationDoubleShift(PLAYER_2));
                        self:y(47);
                        gnSingleKillP2 = 'no'
                        gnDoubleKillP2 = 'no'
@@ -1538,23 +1560,23 @@ end"><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)-50;draworder,10000;decelerate,0.3;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
-       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)"
+       OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)-50;draworder,30000;decelerate,0.3;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
+       ScreenTransitionMessageCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT;draworder,30000;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)"
-       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)"
+       OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2);draworder,30000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT)"
+       ScreenTransitionMessageCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;draworder,30000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)"
        />
        
        <Layer File="../Graphics/TransitionArrow"
-       OnCommand="hidden,0;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"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,30000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,30000;accelerate,0.2;y,SCREEN_CENTER_Y"
        MenuBackMessageCommand="hidden,1;"
        />
        
        <Layer File="../Graphics/Loading" Condition="not (AllFailed() or IsFinalStage())"
-       OnCommand="hidden,0;diffusealpha,0;draworder,10000;x,SCREEN_CENTER_X-1;y,SCREEN_CENTER_Y+65+SCREEN_HEIGHT;"
+       OnCommand="hidden,0;diffusealpha,0;draworder,30000;x,SCREEN_CENTER_X-1;y,SCREEN_CENTER_Y+65+SCREEN_HEIGHT;"
        ScreenTransitionMessageCommand="accelerate,0.2;diffusealpha,1;y,SCREEN_CENTER_Y+65;"
        MenuBackMessageCommand="hidden,1;"
        />

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
index 3ec6771..7b1a9db 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
@@ -23,15 +23,28 @@ end"> <children>
 <Layer Type="Quad"
 OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenGameplay'); end"
 />
-
+               
        <!--Scrape the Player's Score-->
                <BitmapText
                Text=""
                File="_eurostile blue glow"
                InitCommand="%function(self)
-               self:x(SCREEN_CENTER_X);
-               self:y(SCREEN_CENTER_Y);
+               self:x(SCREEN_CENTER_X-2000);
+               self:y(SCREEN_CENTER_Y-2000);
+               end"
+               StepP1MessageCommand="%function(self)
+               self:diffusealpha(1);
+               gnScoreP1 = SCREENMAN:GetTopScreen():GetChild('ScoreP1'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP1'):GetText();
+               gnScoreP1 = string.gsub(gnScoreP1,'%%','');
+               gnScoreP1 = tonumber(gnScoreP1);
                end"
+               StepP2MessageCommand="%function(self)
+               self:diffusealpha(1);
+               gnScoreP2 = SCREENMAN:GetTopScreen():GetChild('ScoreP2'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP2'):GetText();
+               gnScoreP2 = string.gsub(gnScoreP2,'%%','');
+               gnScoreP2 = tonumber(gnScoreP2);
+               end"
+               
                ScreenTransitionMessageCommand="%function(self)
                self:diffusealpha(1);
                        if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
@@ -137,17 +150,20 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenGameplay'); e
 <children>
 <Layer File="winning"
 InitCommand="diffusealpha,0;"
-OnCommand="x,SCREEN_LEFT+23-9+(13*HorizontalRecovery());y,SCREEN_TOP+55+76;zoom,0.5;rotationz,-30;queuecommand,Go"
-GoCommand="%function(self) DoEasterEgg('GoodLuckCameron', { Actor = self }) end"
-P1AheadMessageCommand="linear,0.2;diffusealpha,1;"
-P1BehindMessageCommand="linear,0.2;diffusealpha,0;"
+OnCommand="x,SCREEN_LEFT+23-9+(13*HorizontalRecovery());y,SCREEN_TOP+55+74;zoom,0.5;rotationz,-30;queuecommand,Go"
+GoCommand="%function(self) DoEasterEgg('GoodLuckCameron', { Actor = self }) self:queuecommand('Update'); end"
+StepP1MessageCommand="%function(self) self:stoptweening(); self:queuecommand('Update'); end"
+StepP2MessageCommand="%function(self) self:stoptweening(); self:queuecommand('Update'); end"
+UpdateCommand="%function(self) if gnScoreP1 >= gnScoreP2 then self:linear(0.2); self:diffusealpha(1); else self:linear(0.2); self:diffusealpha(0); end end"
+
 />
 <Layer File="winning"
 InitCommand="diffusealpha,0;"
-OnCommand="x,SCREEN_RIGHT-23+9-(13*HorizontalRecovery());y,SCREEN_TOP+55+76;zoom,0.5;rotationz,30;queuecommand,Go"
-GoCommand="%function(self) DoEasterEgg('GoodLuckCameron', { Actor = self }) end"
-P2AheadMessageCommand="linear,0.2;diffusealpha,1;"
-P2BehindMessageCommand="linear,0.2;diffusealpha,0;"
+OnCommand="x,SCREEN_RIGHT-23+9-(13*HorizontalRecovery());y,SCREEN_TOP+55+74;zoom,0.5;rotationz,30;queuecommand,Go"
+GoCommand="%function(self) DoEasterEgg('GoodLuckCameron', { Actor = self }) self:queuecommand('Update'); end"
+StepP1MessageCommand="%function(self) self:stoptweening(); self:queuecommand('Update'); end"
+StepP2MessageCommand="%function(self) self:stoptweening(); self:queuecommand('Update'); end"
+UpdateCommand="%function(self) if gnScoreP2 >= gnScoreP1 then self:linear(0.2); self:diffusealpha(1); else self:linear(0.2); self:diffusealpha(0); end end"
 />
 </children>
 </ActorFrame>

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay underlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay underlay/default.xml
index 53b2b17..e88344a 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay underlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay underlay/default.xml
@@ -4,6 +4,20 @@ if GAMESTATE:GetEnv('Vibrate') == 'On' then
        end
 end"> <children>
 
+<!--Common Fallback Background-->
+       <Layer File="../ScreenLogo background/BGVid.avi"
+       InitCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;hidden,1"
+       NoBackgroundMessageCommand="@'hidden,0;diffuse,'..FrameColor()..';diffusealpha,1;'"
+       />
+       
+       <Layer File="../ScreenLogo background/TitleScreen0002.png"
+       InitCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+16;diffuse,0.15,0.15,0.15,0.5;zoom,0.8;hidden,1"
+       NoBackgroundMessageCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;"
+       />
+
+
+       
+
 <!--Background Easter Eggs-->
        <Layer File="@'../../Graphics/NoBackground/'..getNoBackground()..'Background.png'"
        InitCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,0.6,0.6,0.6,1;queuecommand,Grandpa;"

diff --git a/Themes/GrooveNights/Graphics/Common fallback background.png b/Themes/GrooveNights/Graphics/Common fallback background.png
deleted file mode 100644 (file)
index 72f4c88..0000000
Binary files a/Themes/GrooveNights/Graphics/Common fallback background.png and /dev/null differ

diff --git a/Themes/GrooveNights/Graphics/Common fallback background.xml b/Themes/GrooveNights/Graphics/Common fallback background.xml
new file mode 100644 (file)
index 0000000..d13286b
--- /dev/null
+++ b/Themes/GrooveNights/Graphics/Common fallback background.xml
@@ -0,0 +1 @@
+<layer File="_blank" InitCommand="%function(self) MESSAGEMAN:Broadcast('NoBackground'); end" />
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboGreats/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboGreats/BGAnimation.ini
index be849de..35a4346 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboGreats/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboGreats/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextFullCombo()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboMarvelouses/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboMarvelouses/BGAnimation.ini
index 6d40b80..fef91d5 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboMarvelouses/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboMarvelouses/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextFullFantastic()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboPerfects/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboPerfects/BGAnimation.ini
index 4d322ce..cb3b78a 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboPerfects/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward FullComboPerfects/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextFullExcellent()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats100Percent/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats100Percent/BGAnimation.ini
index 9fc1932..e554051 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats100Percent/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats100Percent/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextFullGreats()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats80Percent/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats80Percent/BGAnimation.ini
index 11f2026..912b338 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats80Percent/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats80Percent/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextEightyGreats()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats90Percent/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats90Percent/BGAnimation.ini
index 6773494..b533002 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats90Percent/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward Greats90Percent/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextNinetyGreats()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward OneGreat/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward OneGreat/BGAnimation.ini
index 6ef7ecf..1c52d16 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward OneGreat/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward OneGreat/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextOneGreat()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward OnePerfect/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward OnePerfect/BGAnimation.ini
index 19b5d42..51eced1 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward OnePerfect/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward OnePerfect/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextOneExcellent()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward SingleDigitGreats/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward SingleDigitGreats/BGAnimation.ini
index 1ee2e56..1538c77 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward SingleDigitGreats/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward SingleDigitGreats/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextSDG()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward SingleDigitPerfects/BGAnimation.ini b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward SingleDigitPerfects/BGAnimation.ini
index be4c724..da30ed6 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward SingleDigitPerfects/BGAnimation.ini
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation PerDifficultyAward SingleDigitPerfects/BGAnimation.ini
@@ -6,4 +6,4 @@ OnCommand=Zoom,0.7;x,-60;y,-80;RotationY,15
 Text=@getTextSDE()
 File=_eurostile normal
 OnCommand=HorizAlign,left;maxwidth,250;shadowlength,0;addy,1;queuecommand,PlayerCheck;
-PlayerCheckCommand=%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:horizalign('right'); end if GAMESTATE:IsPlayerEnabled(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then gnAward = gnAward + 1;    if gnAward == 2 then self:horizalign('right'); end end end
\ No newline at end of file
+PlayerCheckCommand=%function(self) gnAwardWidthP2 = self:GetWidth(); end
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
index 9975375..d35197b 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
@@ -59,8 +59,8 @@ i = string.find(gnRollsTotal,'/');
 gnRollsTotal = string.gsub(string.sub(gnRollsTotal,i+1),'%s','');
 gnRollsTotal = tonumber(gnRollsTotal);
 
-gnPath = getSystemSound('gnJudgeBar', '0');
-SOUND:PlayOnce(gnPath);
+local Path = getSystemSound('gnJudgeBar', '0');
+SOUND:PlayOnce(Path);
 end"> <children>
        <Layer File="base frame B" InitCommand="@'diffuse,'..BackgroundColor()..';'"/>
        <Layer File="base frame F" InitCommand="@'diffuse,'..FrameColor()..';'"/>
@@ -210,8 +210,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '1');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '1');
+               SOUND:PlayOnce(Path);
                end"/>
                
                <Layer File="Judgment0002"      OnCommand="y,16*1;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -227,8 +227,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '2');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '2');
+               SOUND:PlayOnce(Path);
                end"/>
                
                <Layer File="Judgment0003"              OnCommand="y,16*2;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -244,8 +244,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '3');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '3');
+               SOUND:PlayOnce(Path);
                end"/>
                
                <Layer File="Judgment0004"              OnCommand="y,16*3;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -261,8 +261,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '4');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '4');
+               SOUND:PlayOnce(Path);
                end"/>
                
                <Layer File="Judgment0005"      OnCommand="y,16*4;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -278,8 +278,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '5');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '5');
+               SOUND:PlayOnce(Path);
                end"/>
                
                <Layer File="Judgment0006"              OnCommand="y,16*5;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -295,8 +295,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '6');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '6');
+               SOUND:PlayOnce(Path);
                end"/>
                
        </children> </Layer>
@@ -314,8 +314,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '7');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '7');
+               SOUND:PlayOnce(Path);
                end"/>
 
                <Layer File="Judgment0008"              OnCommand="y,16*1;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -331,8 +331,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '8');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '8');
+               SOUND:PlayOnce(Path);
                end"/>
 
                <Layer File="Judgment0009"              OnCommand="y,16*2;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -348,8 +348,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '9');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '9');
+               SOUND:PlayOnce(Path);
                end"/>
 
                <Layer File="Judgment0010"              OnCommand="y,16*3;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -365,8 +365,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '10');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '10');
+               SOUND:PlayOnce(Path);
                end"/>
 
                <Layer File="Judgment0011"              OnCommand="y,16*4;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -379,11 +379,11 @@ end"> <children>
                if gnJudgeText >= 121 then gnJudgeText = 121; end
                if math.floor(gnRollsNumber / gnRollsTotal) == 0 then gnJudgeText = 0 end
                self:zoomx(gnJudgeText);
-               end"
                self:queuecommand('SFX');
+               end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '11');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '11');
+               SOUND:PlayOnce(Path);
                end"/>
 
                <Layer File="Judgment0012"              OnCommand="y,16*5;zoom,0.65;horizalign,left;shadowlength,0;" />
@@ -399,8 +399,8 @@ end"> <children>
                self:queuecommand('SFX');
                end"
                SFXCommand="%function(self)
-               gnPath = getSystemSound('gnJudgeBar', '12');
-               SOUND:PlayOnce(gnPath);
+               local Path = getSystemSound('gnJudgeBar', '12');
+               SOUND:PlayOnce(Path);
                end"/>
 
        </children> </Layer>

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluationStage header.xml b/Themes/GrooveNights/Graphics/ScreenEvaluationStage header.xml
index e6c39b5..00f0778 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluationStage header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluationStage header.xml
@@ -20,5 +20,14 @@
                                        InitCommand="x,SCREEN_CENTER_X-13;y,SCREEN_CENTER_Y-41;"
                                />
 
+<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X-173;y,SCREEN_CENTER_Y+120;diffuse,0,0,0,0;zoomx,274;zoomy,15;"
+GraphAwardP1MessageCommand="%function(self) self:diffusealpha(0.75); self:draworder(0); if GAMESTATE:PlayerUsingBothSides(PLAYER_1) then self:addx(-12); end end"
+/>
+
+<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X+137;y,SCREEN_CENTER_Y+120;diffuse,0,0,0,0;zoomx,274;zoomy,15;"
+GraphAwardP2MessageCommand="%function(self) self:diffusealpha(0.75); self:draworder(0); if GAMESTATE:PlayerUsingBothSides(PLAYER_2) then self:addx(8); end end"
+/>
+
+
        </children>
 </ActorFrame>

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
index 5c2d74b..b6a4be7 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
@@ -13,7 +13,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenNameEntry');
                />
                
                <Layer File="ScreenNameEntryTraditional banner frame p1"
-               InitCommand="@'draworder,-1000;x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-134-41;diffuse,'..FrameColor()..';'"
+               InitCommand="@'draworder,-1000;x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-134-39;diffuse,'..FrameColor()..';'"
                OffCommand="linear,0.2;diffuse,0,0,0,1;"
                />
                

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
index a6121ee..1be28e4 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
@@ -318,12 +318,14 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                        InitCommand="@'diffuse,'..BackgroundColor()..';diffusealpha,0.7;x,SCREEN_CENTER_X-542-CourseHorizontal();y,SCREEN_CENTER_Y-407;zoomx,312;zoomy,109;draworder,1000;horizalign,left;vertalign,top;'"
                        />
                <Layer Type="Quad"
-                       Condition="GAMESTATE:IsCourseMode() and GAMESTATE:IsPlayerEnabled(PLAYER_1)"
-                       InitCommand="@'diffuse,'..FrameColor()..';diffusealpha,0.6;x,SCREEN_CENTER_X-541-CourseHorizontal();y,SCREEN_CENTER_Y-407;zoomx,20;zoomy,109;draworder,1000;horizalign,left;vertalign,top;'"
+                       Condition="GAMESTATE:IsCourseMode()"
+                       InitCommand="@'diffuse,'..FrameColor()..';diffusealpha,0.6;x,SCREEN_CENTER_X-541-CourseHorizontal();y,SCREEN_CENTER_Y-407;zoomx,20;zoomy,109;draworder,1000;horizalign,left;vertalign,top;queuecommand,Go;'"
+                       GoCommand="%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_1) then self:diffusealpha(0.6); else self:diffusealpha(0.2); end end"
                        />
                <Layer Type="Quad"
-                       Condition="GAMESTATE:IsCourseMode() and GAMESTATE:IsPlayerEnabled(PLAYER_2)"
-                       InitCommand="@'diffuse,'..FrameColor()..';diffusealpha,0.6;x,SCREEN_CENTER_X-249-CourseHorizontal();y,SCREEN_CENTER_Y-407;zoomx,20;zoomy,109;draworder,1000;horizalign,left;vertalign,top;'"
+                       Condition="GAMESTATE:IsCourseMode()"
+                       InitCommand="@'diffuse,'..FrameColor()..';diffusealpha,0.6;x,SCREEN_CENTER_X-249-CourseHorizontal();y,SCREEN_CENTER_Y-407;zoomx,20;zoomy,109;draworder,1000;horizalign,left;vertalign,top;queuecommand,Go;'"
+                       GoCommand="%function(self) if GAMESTATE:IsPlayerEnabled(PLAYER_2) then self:diffusealpha(0.6); else self:diffusealpha(0.2); end end"
                        />
                </children></ActorFrame>        
 

diff --git a/Themes/GrooveNights/Scripts/02 SpeedMods.lua b/Themes/GrooveNights/Scripts/02 SpeedMods.lua
index 44111b6..f2a91b1 100644 (file)
--- a/Themes/GrooveNights/Scripts/02 SpeedMods.lua
+++ b/Themes/GrooveNights/Scripts/02 SpeedMods.lua
@@ -31,7 +31,7 @@ function GetSpeedModRowType()
 end\r
 \r
 function GetRateMods()\r
-    return { "1.0x", "1.1x", "1.2x", "1.3x", "1.4x", "1.5x", "1.6x", "1.7x", "2.0x"}\r
+    return { "0.5x", "0.6x", "0.7x", "0.8x", "0.9x", "1.0x", "1.1x", "1.2x", "1.3x", "1.4x", "1.5x", "2.0x"}\r
 end\r
 \r
 function GetBaseSpeeds()\r

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 475216a..b510f1a 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -281,7 +281,6 @@ if scn == 'ScreenGameplay' then
        gnP1Restarter = 0;
        gnP2Restarter = 0;
        gnSameGrade = 0;
-       gnAward = 0;
        gnOptionCheck = false;
        
        -- Each 0 represents 1% of the song (0% inclusive), there are 202 in total, 101 per player.
@@ -305,7 +304,7 @@ if scn == 'ScreenGameplay' then
        gnOnScreenSeconds = 0
        gnDisplayedFileOpacity = 0
        gnBackgroundDarkness = 0
-       
+       gnAwardWidthP2 = 0;
 end
 
 

diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index 4caf117..63f98f1 100644 (file)
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -1163,21 +1163,21 @@ GraphFrameP2OffCommand=
 LifeGraphStartHeight=0
 LifeGraphP1X=SCREEN_CENTER_X-155+EvalX()
 LifeGraphP1Y=SCREEN_CENTER_Y+18
-LifeGraphP1OnCommand=stretchto,SCREEN_CENTER_X-291+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X-20+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addy,133;
+LifeGraphP1OnCommand=@'stretchto,SCREEN_CENTER_X-291+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X-20+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addy,133;addx,'..ScreenEvaluationDoubleShift(PLAYER_1)..';'
 LifeGraphP1OffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 LifeGraphP2X=SCREEN_CENTER_X+155+EvalX()
 LifeGraphP2Y=SCREEN_CENTER_Y+18
-LifeGraphP2OnCommand=stretchto,SCREEN_CENTER_X+19+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X+290+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;;addy,133;
+LifeGraphP2OnCommand=@'stretchto,SCREEN_CENTER_X+19+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X+290+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addy,133;addx,'..ScreenEvaluationDoubleShift(PLAYER_2)..';'
 LifeGraphP2OffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 
 # The graphic has an odd width, and stretchto doesn't work with ComboGraph.
 ComboGraphP1X=SCREEN_CENTER_X-155.5+EvalX()
 ComboGraphP1Y=SCREEN_CENTER_Y+47+134
-ComboGraphP1OnCommand=DrawOrder,1;
+ComboGraphP1OnCommand=@'DrawOrder,1;addx,'..ScreenEvaluationDoubleShift(PLAYER_2)..';'
 ComboGraphP1OffCommand=
 ComboGraphP2X=SCREEN_CENTER_X+154.5+EvalX()
 ComboGraphP2Y=SCREEN_CENTER_Y+47+134
-ComboGraphP2OnCommand=DrawOrder,1;;
+ComboGraphP2OnCommand=@'DrawOrder,1;addx,'..ScreenEvaluationDoubleShift(PLAYER_2)..';'
 ComboGraphP2OffCommand=
 ComboBarOnCommand=
 ComboBarOffCommand=
@@ -1212,11 +1212,11 @@ DifficultyMeterP2OnCommand=hidden,1
 GradeFrameP1X=SCREEN_CENTER_X-155+EvalX()
 GradeFrameP1Y=SCREEN_CENTER_Y+54
 GradeFrameP1OffCommand=
-GradeFrameP1OnCommand=
+GradeFrameP1OnCommand=@"addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 GradeFrameP2X=SCREEN_CENTER_X+155+EvalX()
 GradeFrameP2Y=SCREEN_CENTER_Y+54
 GradeFrameP2OffCommand=
-GradeFrameP2OnCommand=
+GradeFrameP2OnCommand=@"addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 # Draw the grade over the overlay, since it overlaps the overlay difficulty/name frame.
 GradeP1X=SCREEN_CENTER_X-170+EvalX()
 GradeP1Y=SCREEN_CENTER_Y-60
@@ -1241,11 +1241,11 @@ MaxComboLabelX=
 MaxComboLabelY=
 MaxComboNumberP1X=SCREEN_CENTER_X-28+EvalX()+8-4
 MaxComboNumberP1Y=SCREEN_CENTER_Y+85+16*5-2-49
-MaxComboNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;"
+MaxComboNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 MaxComboNumberP1OffCommand=
 MaxComboNumberP2X=SCREEN_CENTER_X+282+EvalX()+8-4
 MaxComboNumberP2Y=SCREEN_CENTER_Y+85+16*5-2-49
-MaxComboNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;;"
+MaxComboNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 MaxComboNumberP2OffCommand=
 TotalErrorLabelX=
 TotalErrorLabelY=
@@ -1294,11 +1294,11 @@ MarvelousLabelOnCommand=hidden,1
 MarvelousNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 MarvelousNumberP1Y=SCREEN_CENTER_Y+85+16*0-1-145
 MarvelousNumberP1OffCommand=
-MarvelousNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
+MarvelousNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 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)..";;"
+MarvelousNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 PerfectLabelX=
 PerfectLabelY=
 PerfectLabelOffCommand=
@@ -1306,62 +1306,62 @@ PerfectLabelOnCommand=hidden,1
 PerfectNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 PerfectNumberP1Y=SCREEN_CENTER_Y+85+16*1-2-145
 PerfectNumberP1OffCommand=
-PerfectNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
+PerfectNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 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)..";;"
+PerfectNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 GreatLabelOffCommand=
 GreatLabelOnCommand=hidden,1
 GreatNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 GreatNumberP1Y=SCREEN_CENTER_Y+85+16*2-2-145
 GreatNumberP1OffCommand=
-GreatNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
+GreatNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 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)..";;"
+GreatNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 GoodLabelOffCommand=
 GoodLabelOnCommand=hidden,1
 GoodNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 GoodNumberP1Y=SCREEN_CENTER_Y+85+16*3-2-145
 GoodNumberP1OffCommand=
-GoodNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
+GoodNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 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)..";;"
+GoodNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 BooLabelOffCommand=
 BooLabelOnCommand=hidden,1
 BooNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 BooNumberP1Y=SCREEN_CENTER_Y+85+16*4-2-145
 BooNumberP1OffCommand=
-BooNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
+BooNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 BooNumberP2X=SCREEN_CENTER_X+118+EvalX()+8+139
 BooNumberP2Y=SCREEN_CENTER_Y+85+16*4-2-145
 BooNumberP2OffCommand=
-BooNumberP2OnCommand=@";zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)
+BooNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 MissLabelOffCommand=
 MissLabelOnCommand=hidden,1
 MissNumberP1X=SCREEN_CENTER_X-194+EvalX()+8+141
 MissNumberP1Y=SCREEN_CENTER_Y+85+16*5-2-145
 MissNumberP1OffCommand=
-MissNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";"
+MissNumberP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 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)..";;"
+MissNumberP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 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;"
+JumpsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 JumpsTextP1OffCommand=
 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;;"
+JumpsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 JumpsTextP2OffCommand=
 HoldsLabelOnCommand=hidden,1
 HoldsLabelOffCommand=
@@ -1369,11 +1369,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;"
+HoldsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 HoldsTextP1OffCommand=
 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;;"
+HoldsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 HoldsTextP2OffCommand=
 MinesLabelOnCommand=hidden,1
 MinesLabelOffCommand=
@@ -1381,11 +1381,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;"
+MinesTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 MinesTextP1OffCommand=
 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;;"
+MinesTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 MinesTextP2OffCommand=
 HandsLabelOnCommand=hidden,1
 HandsLabelOffCommand=
@@ -1393,11 +1393,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;"
+HandsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 HandsTextP1OffCommand=
 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;;"
+HandsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 HandsTextP2OffCommand=
 RollsLabelOnCommand=hidden,1
 RollsLabelOffCommand=
@@ -1405,11 +1405,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;"
+RollsTextP1OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 RollsTextP1OffCommand=
 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;;"
+RollsTextP2OnCommand=@"zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";shadowlength,0;horizalign,right;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 RollsTextP2OffCommand=
 PlayerOptionsP1X=SCREEN_CENTER_X-110+EvalX()+8-16+1
 PlayerOptionsP1Y=SCREEN_CENTER_Y-68
@@ -1442,28 +1442,28 @@ SpinGrades=0
 
 PerDifficultyAwardP1X=SCREEN_CENTER_X-20+EvalX()-2-261
 PerDifficultyAwardP1Y=SCREEN_CENTER_Y+65-149
-PerDifficultyAwardP1OnCommand=@"zoom,0.55;draworder,1;horizalign,left;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
+PerDifficultyAwardP1OnCommand=%function(self) self:zoom(0.55);self:draworder(1); self:horizalign('left'); self:addx(ScreenEvaluationDoubleShift(PLAYER_1)); end
 PerDifficultyAwardP1OffCommand=
 PerDifficultyAwardP2X=SCREEN_CENTER_X+290+EvalX()-2-261+257
 PerDifficultyAwardP2Y=SCREEN_CENTER_Y+65-149
-PerDifficultyAwardP2OnCommand=@"DrawOrder,1;horizalign,right;zoom,.55;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
+PerDifficultyAwardP2OnCommand=%function(self) self:zoom(0.55);self:draworder(1); self:horizalign('left'); self:addx(ScreenEvaluationDoubleShift(PLAYER_2)); MESSAGEMAN:Broadcast('PerDifficultyAward'); end
 PerDifficultyAwardP2OffCommand=
 PeakComboAwardP1X=SCREEN_CENTER_X-290+EvalX()+2
-PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-37
-PeakComboAwardP1OnCommand=DrawOrder,1;zoom,.5;
-PeakComboAwardP1OffCommand=
+PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-35
+PeakComboAwardP1OnCommand=%function(self) MESSAGEMAN:Broadcast('GraphAwardP1'); self:draworder(10000); self:hibernate(0.01); self:addx(-20000); self:sleep(setMetricValue(gnOnScreenSeconds+0.05)); self:addx(20000); self:zoom(0.5); self:diffusealpha(0); self:addx(ScreenEvaluationDoubleShift(PLAYER_1)); self:linear(0.2) self:diffusealpha(1); self:shadowlength(0); end
+PeakComboAwardP1OffCommand=linear,0.1;diffusealpha,0;
 PeakComboAwardP2X=SCREEN_CENTER_X+20+EvalX()+2
-PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131-37
-PeakComboAwardP2OnCommand=DrawOrder,1;zoom,.5;
-PeakComboAwardP2OffCommand=
+PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131-35
+PeakComboAwardP2OnCommand=%function(self) MESSAGEMAN:Broadcast('GraphAwardP2'); self:draworder(10000); self:hibernate(0.01); self:addx(-20000); self:sleep(setMetricValue(gnOnScreenSeconds+0.05)); self:addx(20000); self:zoom(0.5); self:diffusealpha(0); self:addx(ScreenEvaluationDoubleShift(PLAYER_2)); self:linear(0.2) self:diffusealpha(1); self:shadowlength(0); end
+PeakComboAwardP2OffCommand=linear,0.1;diffusealpha,0;
 MachineRecordP1X=SCREEN_CENTER_X-108+EvalX()-48+132-2
-MachineRecordP1Y=SCREEN_CENTER_Y-13-80+120+131
-MachineRecordP1OnCommand=horizalign,right;zoom,.5;shadowlength,0;cropright,1;cropright,0;DiffuseShift;EffectColor1,0.7,0.8,0.9,1;draworder,5;
-MachineRecordP1OffCommand=
+MachineRecordP1Y=SCREEN_CENTER_Y+65+131-35
+MachineRecordP1OnCommand=%function(self) MESSAGEMAN:Broadcast('GraphAwardP1'); self:horizalign('right') self:draworder(10000); self:hibernate(0.01); self:addx(-20000); self:sleep(gnOnScreenSeconds+0.05); self:addx(20000); self:diffusealpha(0); self:zoom(0.5); self:addx(ScreenEvaluationDoubleShift(PLAYER_1)); self:linear(0.2) self:diffusealpha(1); self:shadowlength(0); end
+MachineRecordP1OffCommand=linear,0.1;diffusealpha,0;
 MachineRecordP2X=SCREEN_CENTER_X+196+EvalX()-42+132-2
-MachineRecordP2Y=SCREEN_CENTER_Y-13-80+120+131
-MachineRecordP2OnCommand=horizalign,right;zoom,.5;shadowlength,0;cropleft,1;cropleft,0;DiffuseShift;EffectColor1,0.7,0.8,0.9,1;draworder,5;
-MachineRecordP2OffCommand=
+MachineRecordP2Y=SCREEN_CENTER_Y+65+131-35
+MachineRecordP2OnCommand=%function(self) MESSAGEMAN:Broadcast('GraphAwardP2'); self:horizalign('right') self:draworder(10000); self:hibernate(0.01); self:addx(-20000); self:sleep(gnOnScreenSeconds+0.05); self:addx(20000); self:diffusealpha(0); self:zoom(0.5); self:addx(ScreenEvaluationDoubleShift(PLAYER_2)); self:linear(0.2) self:diffusealpha(1); self:shadowlength(0); end
+MachineRecordP2OffCommand=linear,0.1;diffusealpha,0;
 PersonalRecordP1X=
 PersonalRecordP1Y=
 PersonalRecordP1OnCommand=hidden,1
@@ -3060,7 +3060,7 @@ NumberOnCommand=shadowlength,0;HorizAlign,center;VertAlign,bottom
 NumberMaxZoom=400
 NumberMaxZoomAt=400
 NumberMinZoom=0
-NumberX=0
+NumberX=4
 NumberY=20
 PulseCommand=%function(self) if ToggleComboSizeIncrease() then local combo=self:GetZoom(); local newZoom=scale(combo,0,500,0.9,1.4); if ToggleComboBounce() then self:zoom(1.05*newZoom); else self:zoom(newZoom); end self:linear(0.05); self:zoom(newZoom); else if ToggleComboBounce() then self:zoom(1.05*DefaultComboSize()); else self:zoom(1*DefaultComboSize()); end self:linear(0.05); self:zoom(1*DefaultComboSize()); end end
 FullComboGreatsCommand=diffuseshift;EffectColor1,#9BE999;EffectColor2,#42E93D;EffectClock,bgm;
@@ -3533,21 +3533,21 @@ WheelP2UnhideCommand=hidden,0
 # Hack: the banners are the same, and we need to display just one, or the transparency
 # will be wrong.
 BannerFrameP1X=SCREEN_CENTER_X
-BannerFrameP1Y=SCREEN_CENTER_Y-134
+BannerFrameP1Y=SCREEN_CENTER_Y-132
 BannerFrameP1OnCommand=
 BannerFrameP1OffCommand=
 BannerFrameP2X=SCREEN_CENTER_X
-BannerFrameP2Y=SCREEN_CENTER_Y-134
+BannerFrameP2Y=SCREEN_CENTER_Y-132
 BannerFrameP2OnCommand=
 BannerFrameP2OffCommand=
 BannerP1X=SCREEN_CENTER_X
-BannerP1Y=SCREEN_CENTER_Y-136
+BannerP1Y=SCREEN_CENTER_Y-134
 BannerP1OnCommand=scaletoclipped,210,66;ztest,1;
 BannerP1OffCommand=
 BannerP1HideCommand=stoptweening;linear,.5;diffusealpha,0
 BannerP1UnhideCommand=stoptweening;linear,.5;diffusealpha,1
 BannerP2X=SCREEN_CENTER_X
-BannerP2Y=SCREEN_CENTER_Y-136
+BannerP2Y=SCREEN_CENTER_Y-134
 BannerP2OnCommand=scaletoclipped,210,66;ztest,1;
 BannerP2OffCommand=
 BannerP2HideCommand=stoptweening;linear,.5;diffusealpha,0