JonTron based fix

diff --git a/Themes/GrooveNights/BGAnimations/ScreenCompany background/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/ScreenCompany background/BGAnimation.ini
deleted file mode 100644 (file)
index ac7b77f..0000000
--- a/Themes/GrooveNights/BGAnimations/ScreenCompany background/BGAnimation.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-[Layer3]
-Type=Quad
-Command=@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,'..FrameColor()..';diffusealpha,0.2;'
-
-[Layer2]
-File=BGVid.avi
-Command=@'rate,0.5;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.1*gnZoomRatio;diffuse,'..FrameColor()..';'
-
-[Layer8]
-File=BGVid.avi
-Command=@'rate,0.5;blend,add;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.1*gnZoomRatio;diffuse,'..FrameColor()..';'
-
-[Layer5]
-File=DE-Presents0001.png
-Command=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,0,0,0,1;rotationz,-10;addy,-600;sleep,1;zoom,10;accelerate,2;addy,460;diffuse,1,1,1,1;rotationz,0;zoom,1.1;decelerate,0.1;zoom,1;accelerate,0.1;zoom,1.1;diffusealpha,1;linear,3;zoom,1.35;queuecommand,vibrate;
-vibrateCommand=vibrate;EffectMagnitude,0.5,2,0.1;accelerate,2.2;addy,180;zoom,0;rotationz,10;addy,0;diffuse,0,0,0,1;
-
-[Layer7]
-Type=Quad
-Command=@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,'..FrameColor()..';diffusealpha,0;sleep,8.7;linear,0.3;diffuse,1,1,1,1;diffusealpha,1;'
\ No newline at end of file

diff --git a/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml b/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
new file mode 100644 (file)
index 0000000..f64f33e
--- /dev/null
+++ b/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
@@ -0,0 +1,27 @@
+<ActorFrame InitCommand="%function(self)
+gnDummy = SetVariablesFor('ScreenCompany');
+end">
+<children>
+<Layer Type="Quad"
+InitCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,'..FrameColor()..';diffusealpha,0.2;'"
+/>
+
+<Layer File="BGVid.avi"
+InitCommand="@'rate,0.5;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.1*gnZoomRatio;diffuse,'..FrameColor()..';'"
+/>
+
+<Layer File="BGVid.avi"
+InitCommand="@'rate,0.5;blend,add;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.1*gnZoomRatio;diffuse,'..FrameColor()..';'"
+/>
+
+<Layer File="DE-Presents0001.png"
+InitCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,0,0,0,1;rotationz,-10;addy,-600;sleep,1;zoom,10;accelerate,2;addy,460;diffuse,1,1,1,1;rotationz,0;zoom,1.1;decelerate,0.1;zoom,1;accelerate,0.1;zoom,1.1;diffusealpha,1;linear,3;zoom,1.35;queuecommand,vibrate;"
+vibrateCommand="vibrate;EffectMagnitude,0.5,2,0.1;accelerate,2.2;addy,180;zoom,0;rotationz,10;addy,0;diffuse,0,0,0,1;"
+/>
+
+<Layer Type="Quad"
+Command="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,'..FrameColor()..';diffusealpha,0;sleep,8.7;linear,0.3;diffuse,1,1,1,1;diffusealpha,1;'"
+/>
+
+</children>
+</ActorFrame>
\ No newline at end of file

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 4ae1810..327e65f 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -1588,6 +1588,11 @@ end"><children>
 </ActorFrame>
 <!--Screen Transition-->
        <Layer Type="Quad"
+       OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,1,1,1,0;"
+       ScreenTransitionMessageCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.05;linear,0.1;diffusealpha,0;'"
+       />
+       
+       <Layer Type="Quad"
        OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;linear,0.3;diffusealpha,0;"
        ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,0;linear,0.3;diffusealpha,1;"
        />

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
index cfacd52..a6d36ed 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
@@ -74,6 +74,11 @@ Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
 
 <!--Screen Transition doesn't work because the screen change is instantaneous-->
        <Layer Type="Quad"
+       OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,1,1,1,0;"
+       ScreenTransitionMessageCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.05;linear,0.1;diffusealpha,0;'"
+       />
+       
+       <Layer Type="Quad"
        OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;linear,0.3;diffusealpha,0;"
        ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,0;linear,0.3;diffusealpha,1;"
        />

diff --git a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
index de75839..0897e48 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
@@ -35,6 +35,11 @@
 
 <!-- Screen Transition -->
        <Layer Type="Quad"
+       OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,1,1,1,0;"
+       OffCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.05;linear,0.1;diffusealpha,0;'"
+       />
+       
+       <Layer Type="Quad"
        Condition="not GAMESTATE:IsCourseMode();"
        OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;linear,0.3;diffusealpha,0;"
        OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,0;linear,0.3;diffusealpha,1;"

diff --git a/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml b/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
index 7e2bd0c..8602405 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
@@ -11,6 +11,10 @@
 <!-- Screen Transition -->
 <ActorFrame InitCommand="x,-18;y,-41;"><children>
        <Layer Type="Quad"
+       OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,1,1,1,0;"
+       OffCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.05;linear,0.1;diffusealpha,0;'"
+       />
+       <Layer Type="Quad"
        Condition="not GAMESTATE:IsCourseMode();"
        OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;linear,0.3;diffusealpha,0;"
        />

diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
index d0700eb..626d957 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
@@ -1,5 +1,6 @@
 <ActorFrame InitCommand="%function(self)
 self:hibernate(0.1);
+gnDummy = SameThingDifferentPlayer();
 self:queuecommand('Calculate');
 end"
 
@@ -8,72 +9,54 @@ if gnRateRestore == nil then
        gnRateRestore = 0;
        end
 
-if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then
-       if gnJudgeCount == 0 then
-       gnJudgeCount = gnJudgeCount + 2;
-       end
-end
-
-if GAMESTATE:IsPlayerEnabled(PLAYER_2) then
-       if gnJudgeCount == 1 then
-       gnJudgeCount = gnJudgeCount + 1;
-       end
-end
-
-if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
-       if gnJudgeCount == 0 then
-       gnJudgeCount = gnJudgeCount + 1;
-       end
-end
-
-gnJudgeTotal = tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP'..gnJudgeCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP'..gnJudgeCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP'..gnJudgeCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP'..gnJudgeCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP'..gnJudgeCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP'..gnJudgeCount):GetText());
+gnJudgeTotal = tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP'..gnPlayerCount):GetText());
 
-gnJumpsNumber = SCREENMAN:GetTopScreen():GetChild('JumpsTextP'..gnJudgeCount):GetText();
+gnJumpsNumber = SCREENMAN:GetTopScreen():GetChild('JumpsTextP'..gnPlayerCount):GetText();
 i = string.find(gnJumpsNumber,'/');
 gnJumpsNumber = string.gsub(string.sub(gnJumpsNumber,1,i-1),'%s','');
 gnJumpsNumber = tonumber(gnJumpsNumber);
 
-gnJumpsTotal = SCREENMAN:GetTopScreen():GetChild('JumpsTextP'..gnJudgeCount):GetText();
+gnJumpsTotal = SCREENMAN:GetTopScreen():GetChild('JumpsTextP'..gnPlayerCount):GetText();
 i = string.find(gnJumpsTotal,'/');
 gnJumpsTotal = string.gsub(string.sub(gnJumpsTotal,i+1),'%s','');
 gnJumpsTotal = tonumber(gnJumpsTotal);
 
-gnHoldsNumber = SCREENMAN:GetTopScreen():GetChild('HoldsTextP'..gnJudgeCount):GetText();
+gnHoldsNumber = SCREENMAN:GetTopScreen():GetChild('HoldsTextP'..gnPlayerCount):GetText();
 i = string.find(gnHoldsNumber,'/');
 gnHoldsNumber = string.gsub(string.sub(gnHoldsNumber,1,i-1),'%s','');
 gnHoldsNumber = tonumber(gnHoldsNumber);
 
-gnHoldsTotal = SCREENMAN:GetTopScreen():GetChild('HoldsTextP'..gnJudgeCount):GetText();
+gnHoldsTotal = SCREENMAN:GetTopScreen():GetChild('HoldsTextP'..gnPlayerCount):GetText();
 i = string.find(gnHoldsTotal,'/');
 gnHoldsTotal = string.gsub(string.sub(gnHoldsTotal,i+1),'%s','');
 gnHoldsTotal = tonumber(gnHoldsTotal);
 
-gnMinesNumber = SCREENMAN:GetTopScreen():GetChild('MinesTextP'..gnJudgeCount):GetText();
+gnMinesNumber = SCREENMAN:GetTopScreen():GetChild('MinesTextP'..gnPlayerCount):GetText();
 i = string.find(gnMinesNumber,'/');
 gnMinesNumber = string.gsub(string.sub(gnMinesNumber,1,i-1),'%s','');
 gnMinesNumber = tonumber(gnMinesNumber);
 
-gnMinesTotal = SCREENMAN:GetTopScreen():GetChild('MinesTextP'..gnJudgeCount):GetText();
+gnMinesTotal = SCREENMAN:GetTopScreen():GetChild('MinesTextP'..gnPlayerCount):GetText();
 i = string.find(gnMinesTotal,'/');
 gnMinesTotal = string.gsub(string.sub(gnMinesTotal,i+1),'%s','');
 gnMinesTotal = tonumber(gnMinesTotal);
 
-gnHandsNumber = SCREENMAN:GetTopScreen():GetChild('HandsTextP'..gnJudgeCount):GetText();
+gnHandsNumber = SCREENMAN:GetTopScreen():GetChild('HandsTextP'..gnPlayerCount):GetText();
 i = string.find(gnHandsNumber,'/');
 gnHandsNumber = string.gsub(string.sub(gnHandsNumber,1,i-1),'%s','');
 gnHandsNumber = tonumber(gnHandsNumber);
 
-gnHandsTotal = SCREENMAN:GetTopScreen():GetChild('HandsTextP'..gnJudgeCount):GetText();
+gnHandsTotal = SCREENMAN:GetTopScreen():GetChild('HandsTextP'..gnPlayerCount):GetText();
 i = string.find(gnHandsTotal,'/');
 gnHandsTotal = string.gsub(string.sub(gnHandsTotal,i+1),'%s','');
 gnHandsTotal = tonumber(gnHandsTotal);
 
-gnRollsNumber = SCREENMAN:GetTopScreen():GetChild('RollsTextP'..gnJudgeCount):GetText();
+gnRollsNumber = SCREENMAN:GetTopScreen():GetChild('RollsTextP'..gnPlayerCount):GetText();
 i = string.find(gnRollsNumber,'/');
 gnRollsNumber = string.gsub(string.sub(gnRollsNumber,1,i-1),'%s','');
 gnRollsNumber = tonumber(gnRollsNumber);
 
-gnRollsTotal = SCREENMAN:GetTopScreen():GetChild('RollsTextP'..gnJudgeCount):GetText();
+gnRollsTotal = SCREENMAN:GetTopScreen():GetChild('RollsTextP'..gnPlayerCount):GetText();
 i = string.find(gnRollsTotal,'/');
 gnRollsTotal = string.gsub(string.sub(gnRollsTotal,i+1),'%s','');
 gnRollsTotal = tonumber(gnRollsTotal);
@@ -231,7 +214,7 @@ end"> <children>
                calculatecommand="%function(self)
                self:sleep(0.1/2);
                self:accelerate(0.5);
-               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP'..gnJudgeCount):GetText()) / gnJudgeTotal * 121);
+               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
                if gnJudgeText >= 121 then gnJudgeText = 121; end
                self:zoomx(gnJudgeText);
                self:queuecommand('SFX');
@@ -247,7 +230,7 @@ end"> <children>
                calculatecommand="%function(self)
                self:sleep(0.2/2);
                self:accelerate(0.5);
-               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP'..gnJudgeCount):GetText()) / gnJudgeTotal * 121);
+               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
                if gnJudgeText >= 121 then gnJudgeText = 121; end
                self:zoomx(gnJudgeText);
                self:queuecommand('SFX');
@@ -263,7 +246,7 @@ end"> <children>
                calculatecommand="%function(self)
                self:sleep(0.3/2);
                self:accelerate(0.5);
-               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP'..gnJudgeCount):GetText()) / gnJudgeTotal * 121);
+               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
                if gnJudgeText >= 121 then gnJudgeText = 121; end
                self:zoomx(gnJudgeText);
                self:queuecommand('SFX');
@@ -279,7 +262,7 @@ end"> <children>
                calculatecommand="%function(self)
                self:sleep(0.4/2);
                self:accelerate(0.5);
-               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP'..gnJudgeCount):GetText()) / gnJudgeTotal * 121);
+               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
                if gnJudgeText >= 121 then gnJudgeText = 121; end
                self:zoomx(gnJudgeText);
                self:queuecommand('SFX');
@@ -295,7 +278,7 @@ end"> <children>
                calculatecommand="%function(self)
                self:sleep(0.5/2);
                self:accelerate(0.5);
-               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP'..gnJudgeCount):GetText()) / gnJudgeTotal * 121);
+               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
                if gnJudgeText >= 121 then gnJudgeText = 121; end
                self:zoomx(gnJudgeText);
                self:queuecommand('SFX');
@@ -311,7 +294,7 @@ end"> <children>
                calculatecommand="%function(self)
                self:accelerate(0.5);
                self:sleep(0.6/2);
-               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP'..gnJudgeCount):GetText()) / gnJudgeTotal * 121);
+               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
                if gnJudgeText >= 121 then gnJudgeText = 121; end
                self:zoomx(gnJudgeText);
                self:queuecommand('SFX');
@@ -409,7 +392,7 @@ end"> <children>
                calculatecommand="%function(self)
                self:sleep(1.2/2);
                self:accelerate(0.5);
-               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MaxComboNumberP'..gnJudgeCount):GetText()) / 10000 * 121);
+               gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MaxComboNumberP'..gnPlayerCount):GetText()) / 10000 * 121);
                if gnJudgeText >= 121 then gnJudgeText = 121; self:rainbow(); end
                self:zoomx(gnJudgeText);
                self:queuecommand('SFX');

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
index e57f91d..7994218 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
@@ -14,6 +14,10 @@
        <!--Screen Transition-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
        <Layer Type="Quad"
+       OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,1,1,1,0;"
+       OffCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.05;linear,0.1;diffusealpha,0;'"
+       />
+       <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"
        OffCommand="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)"
        />

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
index 627cd74..3ca288b 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
@@ -11,6 +11,10 @@
        <!--Screen Transition-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
        <Layer Type="Quad"
+       OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,1,1,1,0;"
+       ScreenTransitionMessageCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.05;linear,0.1;diffusealpha,0;'"
+       />
+       <Layer Type="Quad"
        OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;linear,0.3;diffusealpha,0;"
        ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,0;linear,0.3;diffusealpha,1;"
        />

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
index 8595ef9..ce41f15 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
@@ -89,6 +89,13 @@ end">
        <!--Screen Transition-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
        <Layer Type="Quad"
+       OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,1,1,1,0;"
+       GoOffCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.05;linear,0.1;diffusealpha,0;'"
+       MadeChoiceP1MessageCommand="playcommand,GoOff"
+       MadeChoiceP2MessageCommand="playcommand,GoOff"
+       />
+       
+       <Layer Type="Quad"
        OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;linear,0.3;diffusealpha,0;"
        GoOffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,0;linear,0.3;diffusealpha,1;"
        MadeChoiceP1MessageCommand="playcommand,GoOff"

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
index e59e2cb..227f5c1 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
@@ -167,6 +167,13 @@ end">
                </ActorFrame>
        <!--Screen Transition-->
        <Layer Type="Quad"
+       OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,1,1,1,0;"
+       GoOffCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.05;linear,0.1;diffusealpha,0;'"
+       MadeChoiceP1MessageCommand="playcommand,GoOff"
+       MadeChoiceP2MessageCommand="playcommand,GoOff"
+       />
+       
+       <Layer Type="Quad"
        OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;linear,0.3;diffusealpha,0;"
        GoOffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,0;linear,0.3;diffusealpha,1;"
        MadeChoiceP1MessageCommand="playcommand,GoOff"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
index 5578549..a90ea4e 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
@@ -1,135 +1,32 @@
+<ActorFrame><children>
+                       
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       if getSpecialUSB() then
-                               if gnDimBGMSeconds == nil then
-                                       gnDimBGMSeconds = 0.1;
-                                       end
-                               if gnDimBGMSeconds == 0 then
-                                       gnDimBGMSeconds = 0.1;
-                                       end
-                               SOUND:DimMusic( 0, gnDimBGMSeconds )
+                       gnDummy = SetVariablesFor('GradeModels');
+                       gnSameGrade = gnSameGrade + 1;
+                       self:queuecommand('SameGradeCheck');
+                       end"
+                       SameGradeCheckCommand="%function(self)
+                       if gnSameGrade == 2 then
+                               self:hibernate(20000);
                                end
                        end">
        <children>
 
-<!-- Did You Get A Green Quad? -->
-       <LayerType="BitmapText"
-               Font="Journey"
-               Text=""
-               Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
-               InitCommand="sleep,0.01;zoom,5;queuecommand,Start"
-               StartCommand="%function(self)
-               gnGreenQuadP1 = false;
-               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP1'):GetText());
-               if gnJudge == 0 then
-                       gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP1'):GetText());
-                       if gnJudge == 0 then
-                               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP1'):GetText());
-                               if gnJudge == 0 then
-                                       gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP1'):GetText());
-                                       if gnJudge == 0 then
-                                               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP1'):GetText());
-                                               if gnJudge == 0 then
-                                                       gnGreenQuadP1 = true;
-                                                       end
-                                               end
-                                       end
-                               end
-                       end
-               end"
-       />
-
-       <LayerType="BitmapText"
-               Font="Journey"
-               Text=""
-               Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
-               InitCommand="sleep,0.01;zoom,5;queuecommand,Start"
-               StartCommand="%function(self)
-               gnGreenQuadP2 = false;
-               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP2'):GetText());
-               if gnJudge == 0 then
-                       gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP2'):GetText());
-                       if gnJudge == 0 then
-                               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP2'):GetText());
-                               if gnJudge == 0 then
-                                       gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP2'):GetText());
-                                       if gnJudge == 0 then
-                                               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP2'):GetText());
-                                               if gnJudge == 0 then
-                                                       gnGreenQuadP2 = true;
-                                                       end
-                                               end
-                                       end
-                               end
-                       end
-               end"
-       />      
-
-<!-- Did You Get A Purple Quad? -->
-       <LayerType="BitmapText"
-               Font="Journey"
-               Text=""
-               Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
-               InitCommand="sleep,0.01;zoom,5;queuecommand,Start"
-               StartCommand="%function(self)
-               gnPurpleQuadP1 = false;
-               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP1'):GetText());
-               if gnJudge == 0 then
-                       gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP1'):GetText());
-                       if gnJudge == 0 then
-                               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP1'):GetText());
-                               if gnJudge == 0 then
-                                       gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP1'):GetText());
-                                       if gnJudge == 0 then
-                                               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP1'):GetText());
-                                               if gnJudge == 0 then
-                                                       gnPurpleQuadP1 = true;
-                                                       gnGreenQuadP1 = false;
-                                                       end
-                                               end
-                                       end
-                               end
-                       end
-               end"
-       />
 
-       <LayerType="BitmapText"
-               Font="Journey"
-               Text=""
-               Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
-               InitCommand="sleep,0.01;zoom,5;queuecommand,Start"
+                               
+                               
+                               
+                               
+<!--Quad Layer to dim the screen while the special result plays-->
+               <ActorFrame
+               InitCommand="queuecommand,Start;"
                StartCommand="%function(self)
-               gnPurpleQuadP2 = false;
-               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP2'):GetText());
-               if gnJudge == 0 then
-                       gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP2'):GetText());
-                       if gnJudge == 0 then
-                               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP2'):GetText());
-                               if gnJudge == 0 then
-                                       gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP2'):GetText());
-                                       if gnJudge == 0 then
-                                               gnJudge = tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP2'):GetText());
-                                               if gnJudge == 0 then
-                                                       gnPurpleQuadP2 = true;
-                                                       gnGreenQuadP2 = false;
-                                                       end
-                                               end
-                                       end
-                               end
+               if not getSpecialUSB() then
+                       self:hibernate(200000);
                        end
-               end"
-       />
-       
-       
-       
-               <ActorFrame     Condition="not (GAMESTATE:IsHumanPlayer(PLAYER_1) and GAMESTATE:IsHumanPlayer(PLAYER_2))"
-               InitCommand="queuecommand,Start;"
-                                       StartCommand="%function(self)
-                                               if not getSpecialUSB() then
-                                                       self:addx(200000);
-                                                       end
-                                       end">
-                       <children>
+               end"><children>
+                       
                        <Layer Type="Quad"
                        InitCommand="%function(self)
                        self:diffusealpha(0);
@@ -155,25 +52,36 @@
                        end"
                        OffCommand="accelerate,0.3;zoom,0;"
                        />
+                       
                </children></ActorFrame>
                
-               
-               <Layer File="@'../../Sounds/'..getCustomNormalImageOrVideo()" 
-               Condition="not (GAMESTATE:IsHumanPlayer(PLAYER_1) and GAMESTATE:IsHumanPlayer(PLAYER_2))"
+<!--Special Video to Play-->
+               <Layer File="@'../../Sounds/'..getCustomTestImageOrVideo()"
                InitCommand="%function(self)
-               if GAMESTATE:IsHumanPlayer(PLAYER_1) then
-                       self:x(244+AddFromCenter('x','Normal',PLAYER_1));
-                       else
-                       self:x(-66+AddFromCenter('x','Normal',PLAYER_2));
-                       end
-               if GAMESTATE:IsHumanPlayer(PLAYER_1) then self:y(40+AddFromCenter('y','Normal',PLAYER_1)); else  self:y(40+AddFromCenter('y','Normal',PLAYER_2)); end
+               
+               if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
+                               self:x(244+AddFromCenter('x','Test',PLAYER_1)-42);
+                               self:y(40+AddFromCenter('y','Test',PLAYER_1)+108);
+                               if GAMESTATE:PlayerUsingBothSides(PLAYER_1) then
+                                       self:addx(29);
+                                       end
+                               else
+                               self:x(-66+AddFromCenter('x','Test',PLAYER_2)-130);
+                               self:y(40+AddFromCenter('y','Test',PLAYER_2)+108);
+                               if GAMESTATE:PlayerUsingBothSides(PLAYER_2) then
+                                       self:addx(-38);
+                                       end
+                               end
                self:diffusealpha(0);
                self:zoom(2);
                self:decelerate(0.5);
                self:diffusealpha(gnDiffusealpha);
                self:zoom(gnZoom);
-               gnPath = getCustomNormalSound();
-               SOUND:PlayOnce(gnPath);
+               if gnSoundCheck == true then
+                       gnPath = getCustomTestSound();
+                       SOUND:PlayOnce(gnPath);
+                       gnSoundCheck = false;
+                       end
                                if gnOnScreenSeconds == nil then
                                        gnOnScreenSeconds = 0.1;
                                        end
@@ -184,776 +92,29 @@
                self:linear(1);
                self:diffusealpha(0)
                end;"
-               OffCommand="accelerate,0.3;zoom,0;"
                />
                
                
-<!-- P1's D -->
-<ActorFrame
-                       OnCommand="x,2000;y,0;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
-                       GoCommand="%function(self)
-                       if gnPurpleQuadP1 == false and gnGreenQuadP1 == false then
-                               self:x(0);
-                               end
-                       end"
-               >
-                       <children>
-               <ActorFrame
-                       OnCommand="zoom,0.30;x,-2;y,6;wag;EffectMagnitude,0,0,2"
-               >
-                       <children>
-                               <Layer
-                                       File="GradeTier0017"
-                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                       OnCommand="sleep,0.2;"
-                                       GradeSoundCommand="%function(self)
-                                       gnSound = GradeSound(1);
-                                       SOUND:PlayOnce( gnSound )
-                                       end"
-                               />
-                       </children>
-               </ActorFrame>
        </children>
 </ActorFrame>
-               
-<!-- P2's D -->
-<ActorFrame
-                       OnCommand="x,2000;y,0;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
-                       GoCommand="%function(self)
-                       if gnPurpleQuadP2 == false and gnGreenQuadP2 == false then
-                               self:x(0);
-                               end
-                       end"
-               >
-                       <children>
-               <ActorFrame
-                       OnCommand="zoom,0.30;x,-2;y,6;wag;EffectMagnitude,0,0,2"
-               >
-                       <children>
-                               <Layer
-                                       File="GradeTier0017"
-                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                       OnCommand="sleep,0.2;"
-                                       GradeSoundCommand="%function(self)
-                                       gnSound = GradeSound(1);
-                                       SOUND:PlayOnce( gnSound )
-                                       end"
-                               />
-                       </children>
-               </ActorFrame>
-       </children>
-</ActorFrame>
-               
-               
-<!-- Player 1's Green Quad --> 
-<ActorFrame
-                       OnCommand="zoom,0.2;x,-2001;y,-1;wag;EffectMagnitude,0,0,2;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
-                       GoCommand="%function(self)
-                       if gnGreenQuadP1 == true and GreenQuadP1Flag == 0 then
-                               GreenQuadP1Flag = 1;
-                               self:x(-1);
-                               end
-                       end"
-               >
-                       <children>
-                               <!--Fireworks-->
-                               <ActorFrame
-                                       OnCommand="hibernate,1.4;zoom,8;draworder,-2000;"
-                               >
-                                       <children>
-                               <ActorFrame
-                                       OnCommand="x,-20;y,20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkgreen1.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.3;x,-20;y,-20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkred1.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.6;x,20;y,-20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkyellow1.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.9;x,20;y,20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkgreen2.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                       </children>
-               </ActorFrame>
-               
-<ActorFrame
-                       OnCommand="x,-2000;y,0;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
-                       GoCommand="%function(self)
-                       if gnGreenQuadP1 == true and GreenQuadP1Flag == 1 then
-                               GreenQuadP1Flag = 2;
-                               gnPurpleQuadP1 = false;
-                               self:x(0);
-                               end
-                       end"
-               >
-                       <children>
-                               <!--Grades-->
-                               <ActorFrame
-                                       OnCommand="x,-90;y,80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Green')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnGreenQuadP1 then
-                                                                       gnSound = GradeSound(3);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.3;x,-90;y,-80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Green')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnGreenQuadP1 then
-                                                                       gnSound = GradeSound(4);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.6;x,85;y,-80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Green')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnGreenQuadP1 then
-                                                                       gnSound = GradeSound(5);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.9;x,85;y,80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Green')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnGreenQuadP1 then
-                                                                       gnSound = GradeSound(6);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                       </children>
-               </ActorFrame>
-       </children>
-</ActorFrame>  
 
 
-               
-<!-- Player 2's Green Quad --> 
-<ActorFrame
-                       OnCommand="zoom,0.2;x,2001;y,-1;wag;EffectMagnitude,0,0,2;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
-                       GoCommand="%function(self)
-                       if GAMESTATE:IsHumanPlayer(PLAYER_1) then
-                               if gnGreenQuadP2 == true and GreenQuadP2Flag == 1 then
-                                       GreenQuadP2Flag = 2;
-                                       self:x(-1);
-                                       else
-                                       GreenQuadP2Flag = 1;
-                                       end
-                               else
-                               if gnGreenQuadP2 == true and GreenQuadP2Flag == 0 then
-                                       GreenQuadP2Flag = 1;
-                                       self:x(-1);
-                                       else
-                                       GreenQuadP2Flag = 0;
-                                       end
-                               end
-                       end"
-               >
-                       <children>
-                               <!--Fireworks-->
-                               <ActorFrame
-                                       OnCommand="hibernate,1.4;zoom,8;draworder,-2000;"
-                               >
-                                       <children>
-                               <ActorFrame
-                                       OnCommand="x,-20;y,20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkgreen3.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.3;x,-20;y,-20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkred2.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.6;x,20;y,-20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkyellow2.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.9;x,20;y,20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkgreen4.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                       </children>
-               </ActorFrame>
-               
-<ActorFrame
-                       OnCommand="x,2000;y,0;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
-                       GoCommand="%function(self)
-                       if GAMESTATE:IsHumanPlayer(PLAYER_1) then
-                               if gnGreenQuadP2 == true and GreenQuadP2Flag == 2 then
-                                       GreenQuadP2Flag = 3;
-                                       self:x(0);
-                                       end
-                               else
-                               if gnGreenQuadP2 == true and GreenQuadP2Flag == 1 then
-                                       GreenQuadP2Flag = 2;
-                                       self:x(0);
-                                       end
-                               end
-                       end"
-               >
-                       <children>
-                               <!--Grades-->
-                               <ActorFrame
-                                       OnCommand="x,-90;y,80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Green')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnGreenQuadP2 then
-                                                                       gnSound = GradeSound(3);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.3;x,-90;y,-80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Green')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnGreenQuadP2 then
-                                                                       gnSound = GradeSound(4);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.6;x,85;y,-80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Green')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnGreenQuadP2 then
-                                                                       gnSound = GradeSound(5);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.9;x,85;y,80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Green')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnGreenQuadP2 then
-                                                                       gnSound = GradeSound(6);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                       </children>
-               </ActorFrame>
-       </children>
-</ActorFrame>
-               
-               
-               
-               
-               
-               
-               
-               
-<!-- Player 1's Purple Quad -->        
-<ActorFrame
-                       OnCommand="zoom,0.2;x,-2001;y,-1;wag;EffectMagnitude,0,0,2;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
-                       GoCommand="%function(self)
-                       if gnPurpleQuadP1 == true and PurpleQuadP1Flag == 0 then
-                               PurpleQuadP1Flag = 1;
-                               self:x(-1);
-                               end
-                       end"
-               >
-                       <children>
-                               <!--Fireworks-->
-                               <ActorFrame
-                                       OnCommand="hibernate,1.4;zoom,8;draworder,-2000;"
-                               >
-                                       <children>
-                               <ActorFrame
-                                       OnCommand="x,-20;y,20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkgreen1.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.3;x,-20;y,-20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkred3.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.6;x,20;y,-20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkyellow3.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.9;x,20;y,20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkgreen2.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                       </children>
-               </ActorFrame>
-               
-<ActorFrame
-                       OnCommand="x,-2000;y,0;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
-                       GoCommand="%function(self)
-                       if gnPurpleQuadP1 == true and PurpleQuadP1Flag == 1 then
-                               PurpleQuadP1Flag = 2;
-                               self:x(0);
-                               end
-                       end"
-               >
-                       <children>
-                               <!--Grades-->
-                               <ActorFrame
-                                       OnCommand="x,-90;y,80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Purple')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnPurpleQuadP1 then
-                                                                       gnSound = GradeSound(3);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.3;x,-90;y,-80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Purple')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnPurpleQuadP1 then
-                                                                       gnSound = GradeSound(4);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.6;x,85;y,-80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Purple')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnPurpleQuadP1 then
-                                                                       gnSound = GradeSound(5);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.9;x,85;y,80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Purple')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnPurpleQuadP1 then
-                                                                       gnSound = GradeSound(6);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                       </children>
-               </ActorFrame>
-       </children>
-</ActorFrame>  
+<ActorFrame OnCommand="zoom,0.30;x,-2;y,6;wag;EffectMagnitude,0,0,2;"><children>
+<!-- Grade -->
+<Layer
+       File="GradeTier0017"
+       InitCommand="%function(self)
+       self:hibernate(gnOnScreenSeconds+0.3);
+       self:queuecommand('Start');
+       end"
+       StartCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
+       GradeSoundCommand="%function(self)
+       gnSound = GradeSound(1);
+       SOUND:PlayOnce( gnSound )
+       end"
+/>
+</children></ActorFrame>
 
 
-               
-<!-- Player 2's Purple Quad -->        
-<ActorFrame
-                       OnCommand="zoom,0.2;x,2001;y,-1;wag;EffectMagnitude,0,0,2;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
-                       GoCommand="%function(self)
-                       if GAMESTATE:IsHumanPlayer(PLAYER_1) then
-                               if gnPurpleQuadP2 == true and PurpleQuadP2Flag == 1 then
-                                       PurpleQuadP2Flag = 2;
-                                       self:x(-1);
-                                       else
-                                       PurpleQuadP2Flag = 1;
-                                       end     
-                               else
-                               if gnPurpleQuadP2 == true and PurpleQuadP2Flag == 0 then
-                                       PurpleQuadP2Flag = 1;
-                                       self:x(-1);
-                                       else
-                                       PurpleQuadP2Flag = 0;
-                                       end     
-                               end
-                       end"
-               >
-                       <children>
-                               <!--Fireworks-->
-                               <ActorFrame
-                                       OnCommand="hibernate,1.4;zoom,8;draworder,-2000;"
-                               >
-                                       <children>
-                               <ActorFrame
-                                       OnCommand="x,-20;y,20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkgreen3.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.3;x,-20;y,-20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkred4.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.6;x,20;y,-20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkyellow4.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.9;x,20;y,20;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="fworkgreen4.sprite"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                       </children>
-               </ActorFrame>
-               
-<ActorFrame
-                       OnCommand="x,2000;y,0;sleep,0.1;queuecommand,Go;"
-                       Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
-                       GoCommand="%function(self)
-                       if GAMESTATE:IsHumanPlayer(PLAYER_1) then
-                               if gnPurpleQuadP2 == true and PurpleQuadP2Flag == 2 then
-                                       PurpleQuadP2Flag = 3;
-                                       self:x(0);
-                                       end
-                               else
-                               if gnPurpleQuadP2 == true and PurpleQuadP2Flag == 1 then
-                                       PurpleQuadP2Flag = 2;
-                                       self:x(0);
-                                       end
-                               end
-                       end"
-               >
-                       <children>
-                               <!--Grades-->
-                               <ActorFrame
-                                       OnCommand="x,-90;y,80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Purple')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnPurpleQuadP2 then
-                                                                       gnSound = GradeSound(3);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.3;x,-90;y,-80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Purple')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnPurpleQuadP2 then
-                                                                       gnSound = GradeSound(4);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.6;x,85;y,-80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Purple')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnPurpleQuadP2 then
-                                                                       gnSound = GradeSound(5);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                               <ActorFrame
-                                       OnCommand="hibernate,0.9;x,85;y,80;sleep,1.4;queuecommand,Update;"
-                                       UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
-                               >
-                                       <children>
-                                               <Layer
-                                                       File="@getResultStars('Purple')"
-                                                       InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                                                       OnCommand="sleep,0.2;"
-                                                       GradeSoundCommand="%function(self)
-                                                       if not getSpecialUSB() then
-                                                               if gnPurpleQuadP2 then
-                                                                       gnSound = GradeSound(6);
-                                                                       SOUND:PlayOnce( gnSound )
-                                                                       end
-                                                               end
-                                                       end"
-                                               />
-                                       </children>
-                               </ActorFrame>
-                       </children>
-               </ActorFrame>
-       </children>
-</ActorFrame>
-               
-       </children>
-</ActorFrame>
\ No newline at end of file
+
+</children></ActorFrame>

diff --git a/Themes/GrooveNights/Scripts/GrooveNights.lua b/Themes/GrooveNights/Scripts/GrooveNights.lua
index d2bfb31..4178888 100644 (file)
--- a/Themes/GrooveNights/Scripts/GrooveNights.lua
+++ b/Themes/GrooveNights/Scripts/GrooveNights.lua
@@ -15,8 +15,8 @@
 -- COPY THE BELOW TERMS AND DO A WORD FIND FOR IT SO THAT YOU CAN EDIT DIFFERENT SETTINGS
 
 -- CHANGE FREQUENCY OF USB STAT LOADS
--- CHANGE SPEED, ADDSPEED & RATE MODS
 -- CHANGE MACHINE LOCATION TEXT
+-- CHANGE THE RATE MODS
 -- SHOW/HIDE ARROW SPEED INDICATORS
 -- SHOW/HIDE "WINNING PLAYER" CROWNS
 -- SHOW/HIDE TOTAL PLAYTIME
@@ -61,7 +61,7 @@ function getMaxStatFrequency()
        return 8
 end
 
-Rate = { "1.0x", "1.1x", "1.2x", "1.3x", "1.4x", "1.5x", "1.6x", "1.7x", "2.0x" }
+
 
 
 -- ===CHANGE MACHINE LOCATION TEXT===
@@ -72,6 +72,10 @@ end
 
 
 
+-- ===CHANGE THE RATE MODS===
+Rate = { "1.0x", "1.1x", "1.2x", "1.3x", "1.4x", "1.5x", "1.6x", "1.7x", "2.0x"}
+
+
 
 
 -- ===SHOW/HIDE ARROW SPEED INDICATORS===
@@ -816,6 +820,10 @@ if tier == 'Normal' then
 if tier == 'Failed' then
        gnDummy = getCustomFailedImageOrVideo()
        end
+       
+if tier == 'Test' then
+       gnDummy = getCustomTestImageOrVideo()
+       end
 
 if gnAddxFromCenterP1 == nil then gnAddxFromCenterP1 = 0; end
 if gnAddyFromCenterP1 == nil then gnAddyFromCenterP1 = 0; end
@@ -1047,7 +1055,6 @@ end
 function getCustomNormalImageOrVideo()
                
        -- Paste and edit here
-
        
        
        -- Ignore this
@@ -1134,6 +1141,37 @@ end
 
 
 
+-------------------------------------------------------------------------
+-------------------------------------------------------------------------
+-------------------------------------------------------------------------
+
+-- TEST
+-- Test environment, won't actually appear anywhere...
+
+function getCustomTestImageOrVideo()
+               
+       -- Paste and edit here
+       gnSpecialUSB = true
+       gnDimBGMSeconds = 15;
+       gnOnScreenSeconds = 15;
+       gnDimBackgroundSeconds = 15;
+       gnAddxFromCenterP1 = 0;
+       gnAddyFromCenterP1 = 0;
+       gnAddxFromCenterP2 = 0;
+       gnAddyFromCenterP2 = 0;
+       gnZoom = 1;
+       gnDiffusealpha = 1;
+       return 'gnJonTronQuad video.avi'
+end
+
+function getCustomTestSound()
+               
+       local Path = THEME:GetPath( EC_SOUNDS, 'gnJonTronQuad', 'sound' )       
+       return Path
+
+end
+
+
 
 -- ===SYSTEM STUFF===
 -- Details from here onwards are system related, but you can change some things here too...

diff --git a/Themes/GrooveNights/Scripts/gnCustomOptions.lua b/Themes/GrooveNights/Scripts/gnCustomOptions.lua
index 99ad754..2f48b94 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnCustomOptions.lua
+++ b/Themes/GrooveNights/Scripts/gnCustomOptions.lua
@@ -6,7 +6,7 @@ if PROFILEMAN ~= nil then
     ProfileTable = PROFILEMAN:GetMachineProfile():GetSaved()
 end
 
--- Valid speed mod row type names.
+       -- Valid speed mod row type names.
 local Names = { "Basic", "Advanced", "Pro" }
 
 function SpeedModTypeRow()

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 6e3fe63..9c71db0 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -17,6 +17,7 @@
 -- SYSTEM SOUNDS
 -- SHIFT SCREEN EVALUATION ELEMENTS IN DOUBLE MODE
 -- SET SCREEN SPECIFIC VARIABLES
+-- DIFFERENTIATE PLAYERS USING SHARED RESOURCES
 
 
 
@@ -63,7 +64,7 @@ end
 -- ===SET SCREEN SPECIFIC VARIABLES===
 function SetVariablesFor(scn)
 if scn == 'ScreenCompany' then
--- nothing to add yet
+return 0;
 end
 
 
@@ -153,7 +154,7 @@ if scn == 'ScreenSelectMusic' then
        gnBlazedP2 = 0;
        gnP1Ready = 0;
        gnP2Ready = 0;
-       gnJudgeCount = 0;
+       gnPlayerCount = 0;
        gnTotalDone = 0;
        gnSpecialUSB = false;
        if gnStatFrequency == nil then gnStatFrequency = 0; end
@@ -248,6 +249,8 @@ if scn == 'ScreenGameplay' then
        gnStaminaStepTarget = 0;
        gnP1Restarter = 0;
        gnP2Restarter = 0;
+       gnSameGrade = 0;
+       gnSoundCheck = true;
 end
 
 
@@ -256,6 +259,21 @@ gnSongCount = gnSongCount + 1;
 end
 
 
+
+if scn == 'GradeModels' then
+if getSpecialUSB() then
+       if gnDimBGMSeconds == nil then
+               gnDimBGMSeconds = 0.1;
+               end
+       if gnDimBGMSeconds == 0 then
+               gnDimBGMSeconds = 0.1;
+               end
+       SOUND:DimMusic( 0, gnDimBGMSeconds )
+       end
+end
+
+
+
 if scn == 'ScreenNameEntry' then
 -- nothing to add yet
 end
@@ -273,10 +291,27 @@ end
 
 
 
+-- ===DIFFERENTIATE PLAYERS USING SHARED RESOURCES===
+function SameThingDifferentPlayer()
+       if GAMESTATE:IsPlayerEnabled(PLAYER_2) and not GAMESTATE:IsPlayerEnabled(PLAYER_1) then
+               if gnPlayerCount == 0 then
+               gnPlayerCount = gnPlayerCount + 2;
+               end
+       end
 
+       if GAMESTATE:IsPlayerEnabled(PLAYER_2) then
+               if gnPlayerCount == 1 then
+               gnPlayerCount = gnPlayerCount + 1;
+               end
+       end
 
-
-
+       if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
+               if gnPlayerCount == 0 then
+               gnPlayerCount = gnPlayerCount + 1;
+               end
+       end
+return gnPlayerCount;
+end
 
 
 

diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index 54ddbd0..72f78a5 100644 (file)
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -1219,7 +1219,7 @@ GradeP1OnCommand=@"zoom,1;x,SCREEN_CENTER_X-234+EvalX()-10+42;y,SCREEN_CENTER_Y-
 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;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
+GradeP2OnCommand=@"zoom,1;x,SCREEN_CENTER_X+56+EvalX()+10+120+10;y,SCREEN_CENTER_Y-38-120+10;draworder,5000;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 LargeBannerX=SCREEN_CENTER_X
 LargeBannerY=SCREEN_CENTER_Y-114-11
 LargeBannerOffCommand=addy,-SCREEN_CENTER_X