Repositioned Evaluation Elements during Double Mode

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 39465be..d91f788 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -291,7 +291,62 @@ end">
                        self:hidden(0);
                        end"
                />      -->
-<ActorFrame InitCommand="x,0;y,4;"><children>
+               
+       <!--Main BPM Display-->
+               <BitmapText
+                       Text=""
+                       File="_eurostile blue glow"
+                       OnCommand="horizalign,center;shadowlength,0;zoom,0.5;"
+                       
+                       InitCommand="%function(self)
+                       self:x(SCREEN_CENTER_X);
+                       self:y(SCREEN_CENTER_Y-146+60+4);
+                       gnBPMDisplay = 0;
+                       gnHighRoundBPM = 0;
+                       gnLowRoundBPM = 0;
+                       if lowBPM == highBPM then
+                               if highBPM == 0 then
+                                       gnBPMDisplay = '...';
+                                       else
+                                       gnHighRoundBPM = highBPM*curRate;
+                                       gnHighRoundBPM = math.floor(gnHighRoundBPM);
+                                       gnBPMDisplay = gnHighRoundBPM;
+                                       end
+                               else
+                               gnLowRoundBPM = lowBPM*curRate;
+                               gnLowRoundBPM = math.floor(gnLowRoundBPM);
+                               gnHighRoundBPM = highBPM*curRate;
+                               gnHighRoundBPM = math.floor(gnHighRoundBPM);
+                               gnBPMDisplay = gnLowRoundBPM..'-'..gnHighRoundBPM;
+                               end     
+                       if curRate ~= 1 then
+                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
+                       gnSongLengthDisplay = string.gsub(gnSongLength,'Length Length Patched','Length Patched');
+                       self:settext(gnBPMDisplay..' BPM ('..curRate..'x Music Rate) - '..gnSongLengthDisplay);
+                       else
+                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
+                       gnSongLengthDisplay = string.gsub(gnSongLength,'Length Length Patched','Length Patched');
+                       self:settext(gnBPMDisplay..' BPM - '..gnSongLengthDisplay);
+                       end
+                       end"
+               />
+
+<!--For some reason checking which player is using both sides HERE returns true regardless so enabled-checking is required too-->
+<ActorFrame InitCommand="%function(self) self:x(0); self:y(4); 
+
+if GAMESTATE:PlayerUsingBothSides(PLAYER_1) then
+       if not GAMESTATE:IsPlayerEnabled(PLAYER_2) then
+       self:addx(147); self:addy(-1);
+       end
+end 
+
+if GAMESTATE:PlayerUsingBothSides(PLAYER_2) then
+       if not GAMESTATE:IsPlayerEnabled(PLAYER_1) then
+       self:addx(-147); self:addy(-1);
+       end     
+end
+
+end"><children>
 <!--No Card Data-->
        <Layer File="nocard"
        Condition="GAMESTATE:IsHumanPlayer(PLAYER_1) and not PROFILEMAN:IsPersistentProfile(PLAYER_1)"
@@ -406,43 +461,6 @@ end">
        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;'"
        />
-
-       <!--Main BPM Display-->
-               <BitmapText
-                       Text=""
-                       File="_eurostile blue glow"
-                       OnCommand="horizalign,center;shadowlength,0;zoom,0.5;"
-                       
-                       InitCommand="%function(self)
-                       self:x(SCREEN_CENTER_X);
-                       self:y(SCREEN_CENTER_Y-146+60);
-                       gnBPMDisplay = 0;
-                       gnHighRoundBPM = 0;
-                       gnLowRoundBPM = 0;
-                       if lowBPM == highBPM then
-                               if highBPM == 0 then
-                                       gnBPMDisplay = '...';
-                                       else
-                                       gnHighRoundBPM = highBPM*curRate;
-                                       gnHighRoundBPM = math.floor(gnHighRoundBPM);
-                                       gnBPMDisplay = gnHighRoundBPM;
-                                       end
-                               else
-                               gnLowRoundBPM = lowBPM*curRate;
-                               gnLowRoundBPM = math.floor(gnLowRoundBPM);
-                               gnHighRoundBPM = highBPM*curRate;
-                               gnHighRoundBPM = math.floor(gnHighRoundBPM);
-                               gnBPMDisplay = gnLowRoundBPM..'-'..gnHighRoundBPM;
-                               end     
-                       if curRate ~= 1 then
-                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
-                       self:settext(gnBPMDisplay..' BPM ('..curRate..'x Music Rate) - '..gnSongLengthDisplay);
-                       else
-                       gnSongLengthDisplay = string.gsub(gnSongLength,'Patched','Length Patched');
-                       self:settext(gnBPMDisplay..' BPM - '..gnSongLengthDisplay);
-                       end
-                       end"
-               />
 <!--Step Artists P1-->
                <BitmapText
                        Text=""

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
index 4a99275..b2e835e 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
@@ -77,11 +77,14 @@ gnRollsTotal = SCREENMAN:GetTopScreen():GetChild('RollsTextP'..gnJudgeCount):Get
 i = string.find(gnRollsTotal,'/');
 gnRollsTotal = string.gsub(string.sub(gnRollsTotal,i+1),'%s','');
 gnRollsTotal = tonumber(gnRollsTotal);
+
+gnPath = getSystemSound('gnJudgeBar', '0');
+SOUND:PlayOnce(gnPath);
 end"> <children>
 <!--Rate Message-->
        <Layer Type="Quad"
        InitCommand="%function(self)
-       self:diffusealpha(0);
+       self:diffusealpha(1);
        if gnRateRestore == 1 then
                SCREENMAN:SystemMessage('Rate Modifier has been restored to 1.0x'); 
                end
@@ -91,9 +94,140 @@ end"> <children>
        <Layer File="base frame F" InitCommand="@'diffuse,'..FrameColor()..';'"/>
        <!-- +7s are for 4:3, will need to make them +6s if using widescreen -->
        <Layer Type="ActorFrame" OnCommand="x,5;y,-114"> <children>
+               <Layer File="../Combo 1000milestone/arrowswoosh" OnCommand="diffuse,1,1,1,0;x,109;y,0;queuecommand,Bling"
+               BlingCommand="%function(self)
+               self:sleep(0.1/2+0.5);
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:addy(6);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addy(17*3);
+               self:addx(-16);
+               
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addx(-16);
+               self:addy(17*3);
+               
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addx(-16);
+               self:addy(17*3);
+               
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addx(-16);
+               self:addy(17*3);
+               
+               self:diffusealpha(0);
+               end"
+               />
+               <Layer File="../Combo 1000milestone/arrowswoosh" OnCommand="diffuse,1,1,1,0;x,111;y,7;queuecommand,Bling"
+               BlingCommand="%function(self)
+               self:sleep(0.2/2+0.5);
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:addy(6+17);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addy(17*3);
+               self:addx(-16);
+               
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addx(-16);
+               self:addy(17*3);
+               
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addx(-16);
+               self:addy(17*3);
+               
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addx(-16);
+               self:addy(17*3);
+               
+               self:diffusealpha(0);
+               end"
+               />
+               <Layer File="../Combo 1000milestone/arrowswoosh" OnCommand="diffuse,1,1,1,0;x,110;y,7;queuecommand,Bling"
+               BlingCommand="%function(self)
+               self:sleep(0.3/2+0.5);
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:addy(6+34);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addy(17*3);
+               self:addx(-16);
+               
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addx(-16);
+               self:addy(17*3);
+               
+               self:diffusealpha(1);
+               self:zoom(0);
+               self:decelerate(0.049*3);
+               self:addx(16);
+               self:zoom(0.2);
+               self:diffusealpha(0.5);
+               self:sleep(0.001*3);
+               self:addx(-16);
+               self:addy(17*3);
+               
+               self:diffusealpha(0);
+               end"
+               />
                <Layer File="Judgment0001"      OnCommand="y,16*0;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*0+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.1/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*0+7;x,3;horizalign,left;diffuse,51/255,153/255,204/255,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*0+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.1/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*0+7;x,3;horizalign,left;diffuse,51/255,153/255,204/255,1;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:sleep(0.1/2);
                self:accelerate(0.5);
@@ -108,8 +242,8 @@ end"> <children>
                end"/>
                
                <Layer File="Judgment0002"      OnCommand="y,16*1;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*1+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.2/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*1+6;x,3;horizalign,left;diffuse,221/255,166/255,1/255,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*1+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.2/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*1+6;x,3;horizalign,left;diffuse,221/255,166/255,1/255,1;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:sleep(0.2/2);
                self:accelerate(0.5);
@@ -124,8 +258,8 @@ end"> <children>
                end"/>
                
                <Layer File="Judgment0003"              OnCommand="y,16*2;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*2+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.3/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*2+6;x,3;horizalign,left;diffuse,1/255,204/255,51/255,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*2+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.3/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*2+6;x,3;horizalign,left;diffuse,1/255,204/255,51/255,1;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:sleep(0.3/2);
                self:accelerate(0.5);
@@ -140,8 +274,8 @@ end"> <children>
                end"/>
                
                <Layer File="Judgment0004"              OnCommand="y,16*3;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*3+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.4/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*3+7;x,3;horizalign,left;diffuse,127/255,127/255,255/255,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*3+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.4/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*3+7;x,3;horizalign,left;diffuse,127/255,127/255,255/255,1;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:sleep(0.4/2);
                self:accelerate(0.5);
@@ -156,8 +290,8 @@ end"> <children>
                end"/>
                
                <Layer File="Judgment0005"      OnCommand="y,16*4;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*4+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.5/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*4+6;x,3;horizalign,left;diffuse,245/255,147/255,49/255,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*4+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.5/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*4+6;x,3;horizalign,left;diffuse,245/255,147/255,49/255,1;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:sleep(0.5/2);
                self:accelerate(0.5);
@@ -172,8 +306,8 @@ end"> <children>
                end"/>
                
                <Layer File="Judgment0006"              OnCommand="y,16*5;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*5+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.6/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*5+7;x,3;horizalign,left;diffuse,255/255,63/255,63/255,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*5+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.6/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*5+7;x,3;horizalign,left;diffuse,255/255,63/255,63/255,1;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:accelerate(0.5);
                self:sleep(0.6/2);
@@ -190,8 +324,8 @@ end"> <children>
        </children> </Layer>
        <Layer Type="ActorFrame" OnCommand="x,4;y,-18"> <children>
                <Layer File="Judgment0007"              OnCommand="y,16*0;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*0+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.7/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*0+6;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*0+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.7/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*0+6;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:sleep(0.7/2);
                self:accelerate(0.5);
@@ -206,8 +340,8 @@ end"> <children>
                end"/>
 
                <Layer File="Judgment0008"              OnCommand="y,16*1;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*1+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.8/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*1+6;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*1+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.8/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*1+6;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:sleep(0.8/2);
                self:accelerate(0.5);
@@ -222,8 +356,8 @@ end"> <children>
                end"/>
 
                <Layer File="Judgment0009"              OnCommand="y,16*2;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*2+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,0.9/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*2+7;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,1;zoomy,1;queuecommand,calculate;" 
+               <Layer Type="Quad" OnCommand="y,16*2+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,0.9/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*2+7;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,0;zoomy,1;queuecommand,calculate;" 
                calculatecommand="%function(self)
                self:sleep(0.9/2);
                self:accelerate(0.5);
@@ -238,8 +372,8 @@ end"> <children>
                end"/>
 
                <Layer File="Judgment0010"              OnCommand="y,16*3;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*3+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,1/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*3+6;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,1;zoomy,1;queuecommand,calculate;"
+               <Layer Type="Quad" OnCommand="y,16*3+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,1/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*3+6;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,0;zoomy,1;queuecommand,calculate;"
                calculatecommand="%function(self)
                self:sleep(1/2);
                self:accelerate(0.5);
@@ -254,8 +388,8 @@ end"> <children>
                end"/>
 
                <Layer File="Judgment0011"              OnCommand="y,16*4;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*4+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,1.1/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*4+7;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,1;zoomy,1;queuecommand,calculate;" 
+               <Layer Type="Quad" OnCommand="y,16*4+7;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,1.1/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*4+7;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,0;zoomy,1;queuecommand,calculate;" 
                calculatecommand="%function(self)
                self:sleep(1.1/2);
                self:accelerate(0.5);
@@ -270,12 +404,12 @@ end"> <children>
                end"/>
 
                <Layer File="Judgment0012"              OnCommand="y,16*5;zoom,0.65;horizalign,left;shadowlength,0;" />
-               <Layer Type="Quad" OnCommand="y,16*5+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;sleep,1.2/2+0.5;decelerate,0.2;diffusealpha,0.5;accelerate,0.2;diffusealpha,0.1;" />
-               <Layer Type="Quad" OnCommand="y,16*5+6;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,1;zoomy,1;queuecommand,calculate;"  
+               <Layer Type="Quad" OnCommand="y,16*5+6;x,3;horizalign,left;diffusealpha,0.1;zoomx,121;zoomy,1;accelerate,1.2/2+0.1;zoomx,0;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;zoomx,121;decelerate,0.2;diffusealpha,0.3;accelerate,0.2;diffusealpha,0.1;" />
+               <Layer Type="Quad" OnCommand="y,16*5+6;x,3;horizalign,left;diffuse,255/255,255/255,255/255,0.5;zoomx,0;zoomy,1;queuecommand,calculate;"  
                calculatecommand="%function(self)
                self:sleep(1.2/2);
                self:accelerate(0.5);
-               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MaxComboNumberP'..gnJudgeCount):GetText()) / 10 * 121);
+               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MaxComboNumberP'..gnJudgeCount):GetText()) / 10000 * 121);
                if gnJudgeText >= 121 then gnJudgeText = 121; self:rainbow(); end
                self:zoomx(gnJudgeText);
                self:queuecommand('SFX');

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 52ccaff..312b4af 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -42,6 +42,21 @@ end
 
 
 
+-- ===SHIFT SCREENEVALUATION ELEMENTS IN DOUBLE MODE===
+function ScreenEvaluationDoubleShift(pn)
+       if GAMESTATE:PlayerUsingBothSides(pn) then
+               if pn == PLAYER_1 then
+               return -176;
+               else
+               return 185;
+               end
+       end
+return 0
+end
+
+
+
+
 
 
 

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 0.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 0.ogg
new file mode 100644 (file)
index 0000000..c740186
Binary files /dev/null and b/Themes/GrooveNights/Sounds/gnJudgeBar 0.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 1.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 1.ogg
index 85f5aab..517da66 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 1.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 1.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 10.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 10.ogg
index a77731d..e7f48b5 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 10.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 10.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 11.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 11.ogg
index b1cda72..37278d7 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 11.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 11.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 12.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 12.ogg
index 3c48b1c..5abe9f4 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 12.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 12.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 2.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 2.ogg
index 77b5af9..ecefbf1 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 2.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 2.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 3.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 3.ogg
index 11abf80..2039998 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 3.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 3.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 4.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 4.ogg
index 9dec3a0..72fac56 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 4.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 4.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 5.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 5.ogg
index fd5919f..e98873f 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 5.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 5.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 6.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 6.ogg
index 82d63e2..7cb38a2 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 6.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 6.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 7.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 7.ogg
index c19a9ea..c86d2c3 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 7.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 7.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 8.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 8.ogg
index 99d84d3..b5155bd 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 8.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 8.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnJudgeBar 9.ogg b/Themes/GrooveNights/Sounds/gnJudgeBar 9.ogg
index ce03df4..7f0cf18 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnJudgeBar 9.ogg and b/Themes/GrooveNights/Sounds/gnJudgeBar 9.ogg differ

diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index d46221b..48bb5cc 100644 (file)
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -1215,11 +1215,11 @@ GradeFrameP2OnCommand=addx,EvalTweenDistance();addx,-EvalTweenDistance()
 GradeP1X=SCREEN_CENTER_X-170+EvalX()
 GradeP1Y=SCREEN_CENTER_Y-60
 GradeP1OffCommand=addx,-EvalTweenDistance()
-GradeP1OnCommand=zoom,1;x,SCREEN_CENTER_X-234+EvalX()-10+42;y,SCREEN_CENTER_Y-38-120+10;draworder,5000;
+GradeP1OnCommand=@"zoom,1;x,SCREEN_CENTER_X-234+EvalX()-10+42;y,SCREEN_CENTER_Y-38-120+10;draworder,5000;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 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+10;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;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 LargeBannerX=SCREEN_CENTER_X
 LargeBannerY=SCREEN_CENTER_Y-114-11
 LargeBannerOffCommand=addy,-SCREEN_CENTER_X
@@ -1275,11 +1275,11 @@ PercentFrameP2OffCommand=
 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;"
+PercentP1OnCommand=@"diffusealpha,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";linear,0.3;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_1)..";addx,-EvalTweenDistance();zoom,1.10;addx,EvalTweenDistance();horizalign,center;draworder,1000;"
 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;"
+PercentP2OnCommand=@"diffusealpha,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";linear,0.3;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_2)..";addx,EvalTweenDistance();zoom,1.10;addx,-EvalTweenDistance();horizalign,center;draworder,1000;"
 PercentP2OffCommand=linear,0.3;diffuse,0,0,0,1;
 MarvelousLabelX=
 MarvelousLabelY=
@@ -1436,11 +1436,11 @@ SpinGrades=0
 
 PerDifficultyAwardP1X=SCREEN_CENTER_X-20+EvalX()-2-261
 PerDifficultyAwardP1Y=SCREEN_CENTER_Y+65-149
-PerDifficultyAwardP1OnCommand=DrawOrder,1;zoom,.55;addx,-EvalTweenDistance();addx,EvalTweenDistance()
+PerDifficultyAwardP1OnCommand=@"zoom,0.55;draworder,1;horizalign,left;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";"
 PerDifficultyAwardP1OffCommand=accelerate,.3;addx,-EvalTweenDistance()
 PerDifficultyAwardP2X=SCREEN_CENTER_X+290+EvalX()-2-261
 PerDifficultyAwardP2Y=SCREEN_CENTER_Y+65-149
-PerDifficultyAwardP2OnCommand=DrawOrder,1;horizalign,right;zoom,.55;addx,EvalTweenDistance();addx,-EvalTweenDistance()
+PerDifficultyAwardP2OnCommand=@"DrawOrder,1;horizalign,right;zoom,.55;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 PerDifficultyAwardP2OffCommand=accelerate,.3;addx,EvalTweenDistance()
 PeakComboAwardP1X=SCREEN_CENTER_X-290+EvalX()
 PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-44