Custom LifeGraph by Devon
authorJayce Newton <accounts@divinelegy.com>
Sat, 11 Jan 2014 11:25:37 +0000 (19:25 +0800)
committerJayce Newton <accounts@divinelegy.com>
Sat, 11 Jan 2014 11:25:37 +0000 (19:25 +0800)
13 files changed:
Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
Themes/GrooveNights/Graphics/NoAvatar/ROFLavatar.png [new file with mode: 0644]
Themes/GrooveNights/Graphics/ScreenEvaluationStage JustBarely/arrow.png
Themes/GrooveNights/Graphics/ScreenEvaluationStage JustBarely/default.xml
Themes/GrooveNights/Graphics/ScreenEvaluationStage LifeGraph p1 (res 270x40).png
Themes/GrooveNights/Graphics/ScreenEvaluationStage header.xml
Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
Themes/GrooveNights/Important Shit.txt [new file with mode: 0644]
Themes/GrooveNights/Scripts/GrooveNights.lua
Themes/GrooveNights/Scripts/gnSystem.lua
Themes/GrooveNights/metrics.ini

index 297847a..a4ba448 100644 (file)
@@ -8,6 +8,43 @@ end">
 OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation'); end"
 />
 
+<!--Mask the LifeGraph so you can change its colour-->
+<Layer
+       Type="Quad"
+       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1)"
+       OnCommand="@'x,SCREEN_CENTER_X-155;y,SCREEN_CENTER_Y+151;zoomx,272.5;zoomy,40;diffuse,'..PlayerColor(PLAYER_1)..';'"
+/>
+<Layer
+       Type="Quad"
+       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1)"
+       OnCommand="x,SCREEN_CENTER_X-155;y,SCREEN_CENTER_Y+151;zoomx,272.5;zoomy,41;ztest,1;diffuse,0,0,0,1;"
+/>
+
+<Layer
+       Type="Quad"
+       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_2)"
+       OnCommand="@'x,SCREEN_CENTER_X+155;y,SCREEN_CENTER_Y+151;zoomx,272.5;zoomy,40;diffuse,'..PlayerColor(PLAYER_2)..';'"
+/>
+<Layer
+       Type="Quad"
+       Condition="GAMESTATE:IsPlayerEnabled(PLAYER_2)"
+       OnCommand="x,SCREEN_CENTER_X+155;y,SCREEN_CENTER_Y+151;zoomx,272.5;zoomy,41;ztest,1;diffuse,0,0,0,1;"
+/>
+
+<!--Overlay the lifegraph with a dark quad for text messages-->
+<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X-156;y,SCREEN_CENTER_Y+161;diffuse,0,0,0,0;zoomx,274;zoomy,15;"
+GraphAwardP1MessageCommand="%function(self) self:diffusealpha(0.75); self:draworder(0); if GAMESTATE:PlayerUsingBothSides(PLAYER_1) then self:addx(-12); end end"
+/>
+<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X-156;y,SCREEN_CENTER_Y+168;diffuse,0,0,0,1;zoomx,274;zoomy,2;"/>
+<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X-156;y,SCREEN_CENTER_Y+172;diffuse,0,0,0,1;zoomx,274;zoomy,2;"/>
+
+<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X+154;y,SCREEN_CENTER_Y+161;diffuse,0,0,0,0;zoomx,274;zoomy,15;"
+GraphAwardP2MessageCommand="%function(self) self:diffusealpha(0.75); self:draworder(0); if GAMESTATE:PlayerUsingBothSides(PLAYER_2) then self:addx(8); end end"
+/>
+<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X+154;y,SCREEN_CENTER_Y+168;diffuse,0,0,0,1;zoomx,274;zoomy,2;"/>
+<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X+154;y,SCREEN_CENTER_Y+172;diffuse,0,0,0,1;zoomx,274;zoomy,2;"
+
+
 <!--Move P2's PerDifficulty Award since it's shared between players and aligns left for both-->
        <BitmapText
        Text=""
index 7b1a9db..66f3784 100644 (file)
@@ -26,27 +26,25 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenGameplay'); e
                
        <!--Scrape the Player's Score-->
                <BitmapText
+               Condition="GAMESTATE:GetPlayMode() ~= PLAY_MODE_ONI"
                Text=""
                File="_eurostile blue glow"
                InitCommand="%function(self)
-               self:x(SCREEN_CENTER_X-2000);
-               self:y(SCREEN_CENTER_Y-2000);
+               self:x(SCREEN_CENTER_X);
+               self:y(SCREEN_CENTER_Y);
                end"
                StepP1MessageCommand="%function(self)
-               self:diffusealpha(1);
                gnScoreP1 = SCREENMAN:GetTopScreen():GetChild('ScoreP1'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP1'):GetText();
                gnScoreP1 = string.gsub(gnScoreP1,'%%','');
                gnScoreP1 = tonumber(gnScoreP1);
                end"
                StepP2MessageCommand="%function(self)
-               self:diffusealpha(1);
                gnScoreP2 = SCREENMAN:GetTopScreen():GetChild('ScoreP2'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP2'):GetText();
                gnScoreP2 = string.gsub(gnScoreP2,'%%','');
                gnScoreP2 = tonumber(gnScoreP2);
                end"
                
                ScreenTransitionMessageCommand="%function(self)
-               self:diffusealpha(1);
                        if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
                        gnScoreP1 = SCREENMAN:GetTopScreen():GetChild('ScoreP1'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP1'):GetText();
                        gnScoreP1 = string.gsub(gnScoreP1,'%%','');
index 4ca73ca..8cf2b49 100644 (file)
@@ -469,13 +469,13 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenPlayerOptions
                <!-- Speed -->
                <ActorFrame
                        InitCommand="x,SCREEN_CENTER_X-240; y,SCREEN_CENTER_Y+134"
-                       OnCommand="zoom,0.5; ShadowLength,0"
+                       OnCommand="zoom,0.5;"
                ><children>
                        <!-- Speed label -->
                        <BitmapText
                                Text="Speed:"
                                Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1)"
-                               InitCommand="horizalign,left"
+                               InitCommand="horizalign,left;shadowlength,0;"
                                OnCommand="@'diffuse,' .. LabelColor() .. ';'"
                                File="_eurostile blue glow"
                        />
@@ -485,7 +485,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenPlayerOptions
                                Text=""
                                Condition="GAMESTATE:IsPlayerEnabled(PLAYER_1)"
                                File="_eurostile blue glow"
-                               InitCommand="x,80;horizalign,left"
+                               InitCommand="x,80;horizalign,left;shadowlength,0;"
                                SpeedModChangedP1MessageCommand="queuecommand,Update"
                                RateModChangedMessageCommand="queuecommand,Update"
                                UpdateCommand="%function(self) self:settext(DisplayScrollSpeed(PLAYER_1)) end"
@@ -495,7 +495,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenPlayerOptions
                        <BitmapText
                                File="_eurostile blue glow"
                                InitCommand="x,80"
-                               OnCommand="horizalign,left;rainbow;"
+                               OnCommand="horizalign,left;rainbow;shadowlength,0;"
                                SpeedModChangedP1MessageCommand="queuecommand,Update"
                                RateModChangedMessageCommand="queuecommand,Update"
                                UpdateCommand="%function(self) DoEasterEgg('BlazeIt', { pn = PLAYER_1, Actor = self }) end"
@@ -505,7 +505,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenPlayerOptions
                        <BitmapText
                                File="_eurostile blue glow"
                                InitCommand="x,80"
-                               OnCommand="horizalign,left;rainbow;"
+                               OnCommand="horizalign,left;rainbow;shadowlength,0;"
                                SpeedModChangedP1MessageCommand="queuecommand,Update"
                                RateModChangedMessageCommand="queuecommand,Update"
                                UpdateCommand="%function(self) DoEasterEgg('NoScope', { pn = PLAYER_1, Actor = self }) end"
diff --git a/Themes/GrooveNights/Graphics/NoAvatar/ROFLavatar.png b/Themes/GrooveNights/Graphics/NoAvatar/ROFLavatar.png
new file mode 100644 (file)
index 0000000..0e35600
Binary files /dev/null and b/Themes/GrooveNights/Graphics/NoAvatar/ROFLavatar.png differ
index 38ed1de..144c8f1 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluationStage JustBarely/arrow.png and b/Themes/GrooveNights/Graphics/ScreenEvaluationStage JustBarely/arrow.png differ
index 796d68e..eb38b2f 100644 (file)
@@ -3,6 +3,5 @@ if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end
 end"><children>
-       <BitmapText Font="_eurostile normal" Text="@getTextBarely()" OnCommand="horizalign,center;addx,3;shadowlength,0;zoom,0.5;y,-12;diffusealpha,0;addy,-20;sleep,0.75;accelerate,.2;diffusealpha,1;addy,+20;" />
-       <AutoActor File="arrow" OnCommand="y,+6;diffuseshift;effectoffset,.5;diffusealpha,0;sleep,0.5;addy,-20;accelerate,.3;diffusealpha,1;addy,+20;decelerate,.3;addy,-10;accelerate,.3;addy,+10" />
+       <AutoActor File="arrow" OnCommand="y,28;x,1;zoom,0;sleep,0.5;addy,20;accelerate,.3;zoom,1;addy,-20;decelerate,.3;addy,10;accelerate,.3;addy,-10;" />
 </children></ActorFrame>
index 50dab2f..63d3b62 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluationStage LifeGraph p1 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluationStage LifeGraph p1 (res 270x40).png differ
index 00f0778..e6c39b5 100644 (file)
                                        InitCommand="x,SCREEN_CENTER_X-13;y,SCREEN_CENTER_Y-41;"
                                />
 
-<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X-173;y,SCREEN_CENTER_Y+120;diffuse,0,0,0,0;zoomx,274;zoomy,15;"
-GraphAwardP1MessageCommand="%function(self) self:diffusealpha(0.75); self:draworder(0); if GAMESTATE:PlayerUsingBothSides(PLAYER_1) then self:addx(-12); end end"
-/>
-
-<Layer Type="Quad" OnCommand="x,SCREEN_CENTER_X+137;y,SCREEN_CENTER_Y+120;diffuse,0,0,0,0;zoomx,274;zoomy,15;"
-GraphAwardP2MessageCommand="%function(self) self:diffusealpha(0.75); self:draworder(0); if GAMESTATE:PlayerUsingBothSides(PLAYER_2) then self:addx(8); end end"
-/>
-
-
        </children>
 </ActorFrame>
index 1be28e4..f307f5e 100644 (file)
@@ -12,7 +12,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                        <children>
                        
                <!-- Remove the Addx to test the star count thing -->           
-               <ActorFrame InitCommand="addx,2000;">
+               <ActorFrame InitCommand="addx,20000;">
                <children>
                        <BitmapText
                                Text="TEST"
@@ -21,7 +21,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-150);
+                               self:x(-200);
                                self:y(-147);
                                self:shadowlength(0);
                                local txt = getStats(0,1,1)
@@ -36,7 +36,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-150);
+                               self:x(-180);
                                self:y(-147);
                                self:shadowlength(0);
                                local txt = getStats(0,1,2)
@@ -51,7 +51,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-140);
+                               self:x(-160);
                                self:y(-147);
                                self:shadowlength(0);
                                local txt = getStats(0,1,3)
@@ -66,7 +66,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-130);
+                               self:x(-140);
                                self:y(-147);
                                self:shadowlength(0);
                                local txt = getStats(0,1,4)
@@ -96,8 +96,8 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-110);
-                               self:y(-147);
+                               self:x(-100);
+                               self:y(-127);
                                self:shadowlength(0);
                                local txt = getStats(0,1,6)
                                self:settext(txt);
@@ -111,8 +111,8 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-100);
-                               self:y(-147);
+                               self:x(-80);
+                               self:y(-107);
                                self:shadowlength(0);
                                local txt = getStats(0,1,7)
                                self:settext(txt);
@@ -126,8 +126,8 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-90);
-                               self:y(-147);
+                               self:x(-60);
+                               self:y(-107);
                                self:shadowlength(0);
                                local txt = getStats(0,1,8)
                                self:settext(txt);
@@ -141,8 +141,8 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-80);
-                               self:y(-147);
+                               self:x(-40);
+                               self:y(-107);
                                self:shadowlength(0);
                                local txt = getStats(0,1,9)
                                self:settext(txt);
@@ -156,8 +156,8 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
                                OnCommand="%function(self)
                                self:horizalign('left');
                                self:zoom(0.55);
-                               self:x(-70);
-                               self:y(-147);
+                               self:x(-20);
+                               self:y(-107);
                                self:shadowlength(0);
                                local txt = getStats(0,1,10)
                                self:settext(txt);
diff --git a/Themes/GrooveNights/Important Shit.txt b/Themes/GrooveNights/Important Shit.txt
new file mode 100644 (file)
index 0000000..73ae9c6
--- /dev/null
@@ -0,0 +1,4 @@
+Change the Lock graphic\r
+Change the Player-Select-Arrow graphic\r
+Get JustBarely arrow appearing above the combo graph\r
+Increase subtitle width on screenplayeroptions
\ No newline at end of file
index d7efe07..db05077 100644 (file)
@@ -2862,6 +2862,10 @@ if CheckSinglePlayerName('(-[Jayce]-)',pn) or CheckSinglePlayerName('JCE',pn) th
        gnCustomBG = 'No';
        return 'JayceAvatar.png'
        end
+if CheckSinglePlayerName('ROFLSTOMPZ',pn) or CheckSinglePlayerName('ROFL',pn) then
+       gnCustomBG = 'No';
+       return 'ROFLAvatar.png'
+       end
 if CheckSinglePlayerName('Cameron',pn) or CheckSinglePlayerName('CAM',pn) then
        gnCustomBG = 'No';
        return 'CameronAvatar.png'
index 7058070..55c4a15 100644 (file)
@@ -727,7 +727,9 @@ if gnScoreP2 == nil then gnScoreP2 = 0 end
 
 -- Retrieve an image/sprite/video file based on a player's name.
 for pn = 0, 1 do
-       gnPlayerNames[pn+1] = GetSinglePlayerName(pn)
+       if PROFILEMAN:IsPersistentProfile(pn) then
+               gnPlayerNames[pn+1] = GetSinglePlayerName(pn)
+               end
        -- Plays P1's award if P1 & P2 quad
        if gnScoreP1 == 100 and gnScoreP2 == 100 and pn == 0 then
                local i = math.random(1,2)
@@ -757,7 +759,7 @@ function getQuadAwardFile( name )
 -- Example of how to do this:
 -- if name == 'PLAYER NAME' then
 -- getQuadAwardEffects(DimBGMSeconds,OnScreenSeconds,DisplayedFileOpacity,BackgroundDarkness);
--- local path = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'SOUND TO PLAY'); SOUND:PlayOnce(path); return 'VIDEO TO PLAY.avi'
+-- gnSound = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'SOUND TO PLAY'); return 'VIDEO TO PLAY.avi'
 -- end
 
 
@@ -792,12 +794,3 @@ function getQuadAwardEffects ( a, b, c, d )
        gnBackgroundDarkness = d/100; -- where 100 is 100% black
 end
 
-
-
-
--- ===SET METRIC VALUE====
--- For instances where you want to set a metric value running through @'' and therefore can't make it a %function()
-function setMetricValue( val )
-return val;
-end
-
index e5be5ea..c591f54 100644 (file)
@@ -1163,17 +1163,17 @@ GraphFrameP2OffCommand=
 LifeGraphStartHeight=0
 LifeGraphP1X=SCREEN_CENTER_X-155+EvalX()
 LifeGraphP1Y=SCREEN_CENTER_Y+18
-LifeGraphP1OnCommand=@'stretchto,SCREEN_CENTER_X-291+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X-20+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addy,133;addx,'..ScreenEvaluationDoubleShift(PLAYER_1)..';'
+LifeGraphP1OnCommand=@'stretchto,SCREEN_CENTER_X-291+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X-20+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addy,133;addx,'..ScreenEvaluationDoubleShift(PLAYER_1)..';zwrite,1;blend,noeffect;'
 LifeGraphP1OffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 LifeGraphP2X=SCREEN_CENTER_X+155+EvalX()
 LifeGraphP2Y=SCREEN_CENTER_Y+18
-LifeGraphP2OnCommand=@'stretchto,SCREEN_CENTER_X+19+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X+290+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addy,133;addx,'..ScreenEvaluationDoubleShift(PLAYER_2)..';'
+LifeGraphP2OnCommand=@'stretchto,SCREEN_CENTER_X+19+EvalX(),SCREEN_CENTER_Y-2,SCREEN_CENTER_X+290+EvalX(),SCREEN_CENTER_Y+38;DrawOrder,1;addy,133;addx,'..ScreenEvaluationDoubleShift(PLAYER_2)..';zwrite,1;blend,noeffect;'
 LifeGraphP2OffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 
 # The graphic has an odd width, and stretchto doesn't work with ComboGraph.
 ComboGraphP1X=SCREEN_CENTER_X-155.5+EvalX()
 ComboGraphP1Y=SCREEN_CENTER_Y+47+134
-ComboGraphP1OnCommand=@'DrawOrder,1;addx,'..ScreenEvaluationDoubleShift(PLAYER_2)..';'
+ComboGraphP1OnCommand=@'DrawOrder,1;addx,'..ScreenEvaluationDoubleShift(PLAYER_1)..';'
 ComboGraphP1OffCommand=
 ComboGraphP2X=SCREEN_CENTER_X+154.5+EvalX()
 ComboGraphP2Y=SCREEN_CENTER_Y+47+134
@@ -1281,11 +1281,11 @@ PercentFrameP2OffCommand=
 PercentFrameP2OnCommand=hidden,1
 PercentP1X=SCREEN_CENTER_X-110+EvalX()-4-88
 PercentP1Y=SCREEN_CENTER_Y-20-83
-PercentP1OnCommand=@"diffusealpha,0;hibernate,0.01;addx,-20000;sleep,"..setMetricValue(gnOnScreenSeconds+0.05)..";addx,20000;diffusealpha,0;zoom,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";linear,0.2;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_1)..";zoom,1.10;horizalign,center;draworder,100000;"
+PercentP1OnCommand=@"diffusealpha,0;hibernate,0.01;addx,-20000;sleep,"..gnOnScreenSeconds+0.05..";addx,20000;diffusealpha,0;zoom,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_1)..";linear,0.2;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_1)..";zoom,1.10;horizalign,center;draworder,100000;"
 PercentP1OffCommand=linear,0.3;diffuse,0,0,0,1;
 PercentP2X=SCREEN_CENTER_X+194+EvalX()+8
 PercentP2Y=SCREEN_CENTER_Y-20-83
-PercentP2OnCommand=@"diffusealpha,0;hibernate,0.01;addx,-20000;sleep,"..setMetricValue(gnOnScreenSeconds+0.05)..";addx,20000;diffusealpha,0;zoom,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";linear,0.2;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_2)..";zoom,1.10;horizalign,center;draworder,100000;"
+PercentP2OnCommand=@"diffusealpha,0;hibernate,0.01;addx,-20000;sleep,"..gnOnScreenSeconds+0.05..";addx,20000;diffusealpha,0;zoom,0;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";linear,0.2;diffusealpha,1;diffuse,"..PlayerColor(PLAYER_2)..";zoom,1.10;horizalign,center;draworder,100000;"
 PercentP2OffCommand=linear,0.3;diffuse,0,0,0,1;
 MarvelousLabelX=
 MarvelousLabelY=
@@ -1421,13 +1421,13 @@ PlayerOptionsP2OnCommand=hidden,1;vertalign,top;DrawOrder,1;zoom,0.5;WrapWidthPi
 PlayerOptionsP2OffCommand=
 PlayerOptionsSeparator=, 
 DisqualifiedP1X=SCREEN_CENTER_X-108+EvalX()-42-4
-DisqualifiedP1Y=SCREEN_CENTER_Y+18+140
+DisqualifiedP1Y=SCREEN_CENTER_Y+18+141
 DisqualifiedP1OffCommand=
-DisqualifiedP1OnCommand=@"DrawOrder,1;zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";draworder,1000;shadowlength,0;"
+DisqualifiedP1OnCommand=@"DrawOrder,1;zoom,0.5;diffuse,"..PlayerColor(PLAYER_1)..";draworder,2;shadowlength,0;"
 DisqualifiedP2X=SCREEN_CENTER_X+196+EvalX()-38-4
-DisqualifiedP2Y=SCREEN_CENTER_Y+18+140
+DisqualifiedP2Y=SCREEN_CENTER_Y+18+141
 DisqualifiedP2OffCommand=
-DisqualifiedP2OnCommand=@"DrawOrder,1;zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";;draworder,1000;shadowlength,0;"
+DisqualifiedP2OnCommand=@"DrawOrder,1;zoom,0.5;diffuse,"..PlayerColor(PLAYER_2)..";draworder,2;shadowlength,0;"
 ScoreLabelOffCommand=
 ScoreLabelOnCommand=hidden,1
 ScoreNumberP1X=SCREEN_CENTER_X-143+EvalX()+8
@@ -1450,11 +1450,11 @@ PerDifficultyAwardP2OnCommand=%function(self) self:zoom(0.55);self:draworder(1);
 PerDifficultyAwardP2OffCommand=
 PeakComboAwardP1X=SCREEN_CENTER_X-290+EvalX()+2
 PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-35
-PeakComboAwardP1OnCommand=%function(self) MESSAGEMAN:Broadcast('GraphAwardP1'); self:draworder(10000); self:hibernate(0.01); self:addx(-20000); self:sleep(setMetricValue(gnOnScreenSeconds+0.05)); self:addx(20000); self:zoom(0.5); self:diffusealpha(0); self:addx(ScreenEvaluationDoubleShift(PLAYER_1)); self:linear(0.2) self:diffusealpha(1); self:shadowlength(0); end
+PeakComboAwardP1OnCommand=%function(self) MESSAGEMAN:Broadcast('GraphAwardP1'); self:draworder(10000); self:hibernate(0.01); self:addx(-20000); self:sleep(gnOnScreenSeconds+0.05); self:addx(20000); self:zoom(0.5); self:diffusealpha(0); self:addx(ScreenEvaluationDoubleShift(PLAYER_1)); self:linear(0.2) self:diffusealpha(1); self:shadowlength(0); end
 PeakComboAwardP1OffCommand=linear,0.1;diffusealpha,0;
 PeakComboAwardP2X=SCREEN_CENTER_X+20+EvalX()+2
 PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131-35
-PeakComboAwardP2OnCommand=%function(self) MESSAGEMAN:Broadcast('GraphAwardP2'); self:draworder(10000); self:hibernate(0.01); self:addx(-20000); self:sleep(setMetricValue(gnOnScreenSeconds+0.05)); self:addx(20000); self:zoom(0.5); self:diffusealpha(0); self:addx(ScreenEvaluationDoubleShift(PLAYER_2)); self:linear(0.2) self:diffusealpha(1); self:shadowlength(0); end
+PeakComboAwardP2OnCommand=%function(self) MESSAGEMAN:Broadcast('GraphAwardP2'); self:draworder(10000); self:hibernate(0.01); self:addx(-20000); self:sleep(gnOnScreenSeconds+0.05); self:addx(20000); self:zoom(0.5); self:diffusealpha(0); self:addx(ScreenEvaluationDoubleShift(PLAYER_2)); self:linear(0.2) self:diffusealpha(1); self:shadowlength(0); end
 PeakComboAwardP2OffCommand=linear,0.1;diffusealpha,0;
 MachineRecordP1X=SCREEN_CENTER_X-108+EvalX()-48+132-2
 MachineRecordP1Y=SCREEN_CENTER_Y+65+131-35
@@ -2511,17 +2511,17 @@ StageFrameY=SCREEN_BOTTOM-33
 StageFrameOnCommand=addy,100;addy,-100
 StageFrameOffCommand=
 ShowScoreInRave=0
-ScoreP1OffCommand=addy,0;
-ScoreP1OnCommand=addy,-100;addy,100;
+ScoreP1OffCommand=
+ScoreP1OnCommand=
 ScoreP1X=SCREEN_CENTER_X-180-CourseHorizontal()+(48*HorizontalRecovery())
 ScoreP1Y=SCREEN_TOP+56
-#Rebroadcast these bad boys so we can use them on other actors
-ScoreP1BehindCommand=%function(self) MESSAGEMAN:Broadcast('P1Behind') end
-ScoreP2BehindCommand=%function(self) MESSAGEMAN:Broadcast('P2Behind') end
-ScoreP1AheadCommand=%function(self) MESSAGEMAN:Broadcast('P1Ahead') end
-ScoreP2AheadCommand=%function(self) MESSAGEMAN:Broadcast('P2Ahead') end
-ScoreP2OffCommand=addy,0;
-ScoreP2OnCommand=addy,-100;addy,100;
+#These need to stay blank, they pulse the score display if you delete them
+ScoreP1BehindCommand=
+ScoreP2BehindCommand=
+ScoreP1AheadCommand=
+ScoreP2AheadCommand=
+ScoreP2OffCommand=
+ScoreP2OnCommand=
 ScoreP2X=SCREEN_CENTER_X+180+CourseHorizontal()-(24*HorizontalRecovery())
 ScoreP2Y=SCREEN_TOP+56
 SecondaryScoreP1X=SCREEN_CENTER_X-14-CourseHorizontal()
@@ -2922,11 +2922,11 @@ ShowScrollBar=0
 PageX=SCREEN_CENTER_X
 PageY=SCREEN_CENTER_Y+12
 PageOnCommand=@'diffuse,'..BackgroundColor()..';'
-PageOffCommand=accelerate,0.3;addx,-SCREEN_WIDTH;
+PageOffCommand=
 LineHighlightOnCommand=ztest,1;addx,-10;diffusealpha,0.5;
 LineHighlightChangeCommand=stoptweening;linear,0.15;zoomy,1;zoomx,1.26;
 LineHighlightChangeToExitCommand=zoomy,1
-LineHighlightOffCommand=accelerate,0.3;addx,-SCREEN_WIDTH;
+LineHighlightOffCommand=
 ScrollBarX=SCREEN_CENTER_X-151
 ScrollBarY=SCREEN_CENTER_Y+14-28-16+12
 ScrollBarHeight=296-52