Improved Screen Transitions, a few gameplay graphics, hey can you put your dick away...

diff --git a/Themes/GrooveNights/BGAnimations/Screen cancel/cancel.ogg b/Themes/GrooveNights/BGAnimations/Screen cancel/cancel.ogg
index c2c4aaf..2baa5f5 100644 (file)
Binary files a/Themes/GrooveNights/BGAnimations/Screen cancel/cancel.ogg and b/Themes/GrooveNights/BGAnimations/Screen cancel/cancel.ogg differ

diff --git a/Themes/GrooveNights/BGAnimations/Screen cancel/default.xml b/Themes/GrooveNights/BGAnimations/Screen cancel/default.xml
index 695e731..c82845d 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/Screen cancel/default.xml
+++ b/Themes/GrooveNights/BGAnimations/Screen cancel/default.xml
@@ -1,5 +1,4 @@
-<ActorFrame
-> <children>
+<ActorFrame StartTransitioningCommand="%function(self) MESSAGEMAN:Broadcast('MenuBack'); end"> <children>
        <Actor
                Type="Quad"
                StartTransitioningCommand="%function(self) SCREENMAN:GetTopScreen():playcommand('Off') self:sleep(0.6); end"

diff --git a/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml b/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
index 2d65df0..4f51f87 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
@@ -1,6 +1,10 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenCompany'); end">
+<ActorFrame>
 <children>
 <Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenCompany'); end"
+/>
+
+<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;'"
 />
 

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEnding in/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/ScreenEnding in/BGAnimation.ini
index 5300252..1a1689c 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEnding in/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/ScreenEnding in/BGAnimation.ini
@@ -5,6 +5,7 @@ Import=../_fade in normal
 
 [Layer11]
 File=../_saving
-OnCommand=%function(self) gnCardSaved = 1; self:x(SCREEN_CENTER_X); self:y(SCREEN_CENTER_Y); self:linear(0.3); self:diffusealpha(0); end
+OnCommand=%function(self) gnCardSaved = 1; self:x(SCREEN_CENTER_X); self:y(SCREEN_CENTER_Y+65); self:linear(0.3); self:diffusealpha(0); end
+InitCommand=@'diffuse,'..LabelColor()..';'
 Condition=IsAnyPlayerUsingMemoryCard()
 

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
index 07b2507..ec8d0e8 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
@@ -1,9 +1,20 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenEnding');
+<ActorFrame InitCommand="%function(self) 
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end
 end"> <children>
-       <Layer Type="Quad" InitCommand="diffusealpha,0;sleep,24;queuecommand,ScreenChange;" ScreenChangeCommand="%function(self) SCREENMAN:SetNewScreen('ScreenCompany'); end" />
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEnding'); end"
+/>
+
+<Layer Type="Quad" InitCommand="diffuse,0,0,0,0;sleep,26;zoom,SCREEN_WIDTH*2;linear,3;diffuse,0,0,0,1;draworder,10000;" />
+
+<!--Menu Timer makes countdown noises so it has been disabled and a sleep command waits before forcing the next screen-->
+<Layer Type="Quad" InitCommand="diffusealpha,0;sleep,30;queuecommand,ScreenChange;" ScreenChangeCommand="%function(self) SCREENMAN:SetNewScreen('ScreenCompany'); end" />
+
+
+<ActorFrame><children>
+
        <Layer
                File="player pane B"
                OnCommand="@'x,SCREEN_CENTER_X-320+74;y,SCREEN_CENTER_Y+2;diffuse,'..BackgroundColor()..';'"
@@ -26,6 +37,8 @@ end"> <children>
                Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
        />
        
+</children></ActorFrame>
+       
 <ActorFrame InitCommand="y,-32;"> <children>
        
        <Layer File="../_scrolling ITG credits" InitCommand="y,24;zoomy,0.975;" />
@@ -1486,6 +1499,33 @@ Condition="GAMESTATE:IsHumanPlayer(PLAYER_2) and PROFILEMAN:IsPersistentProfile(
 
 
 
-<!--Screen transition is instantaneous from NameEntry Screen so there's no point in having it-->
-
+<!--Screen Transition-->
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" ScreenTransitionMessageCommand="%function(self) ScreenTransitionWhoosh('in'); end" />
+       
+       <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;"
+       />
+       
+       <Layer Type="Quad"
+       OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)-50;draworder,10000;decelerate,0.3;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
+       ScreenTransitionMessageCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT;draworder,10000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)"
+       />
+       
+       <Layer Type="Quad"
+       OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2);draworder,10000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT)"
+       ScreenTransitionMessageCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)"
+       />
+       
+       <Layer File="../../Graphics/TransitionArrow"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       MenuBackMessageCommand="hidden,1;"
+       />
+       
 </children> </ActorFrame>

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 14a882a..34bf67a 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -1,9 +1,13 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenEvaluation');
+<ActorFrame InitCommand="%function(self) 
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end
 end">
        <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation'); end"
+/>
+
        <!--Restart the song on event mode if you pressed the menu button-->
                <BitmapText
                Text=""
@@ -1518,8 +1522,15 @@ end"><children>
        />
        
        <Layer File="../Graphics/TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       MenuBackMessageCommand="hidden,1;"
+       />
+       
+       <Layer File="../Graphics/Loading" Condition="not (AllFailed() or IsFinalStage())"
+       OnCommand="hidden,0;diffusealpha,0;draworder,10000;x,SCREEN_CENTER_X-1;y,SCREEN_CENTER_Y+65+SCREEN_HEIGHT;"
+       ScreenTransitionMessageCommand="accelerate,0.2;diffusealpha,1;y,SCREEN_CENTER_Y+65;"
+       MenuBackMessageCommand="hidden,1;"
        />
        
        </children>

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameOptions cancel.xml b/Themes/GrooveNights/BGAnimations/ScreenGameOptions cancel.xml
index fdd531f..2b62be6 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameOptions cancel.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameOptions cancel.xml
@@ -17,5 +17,9 @@
        <Layer File="../Graphics/TransitionArrow"\r
        StartTransitioningCommand="rotationz,-90;x,SCREEN_CENTER_X+SCREEN_WIDTH+50;y,SCREEN_CENTER_Y;draworder,10000;linear,0.2;x,SCREEN_CENTER_X;linear,0.1;zoomx,0.9;linear,0.1;zoomx,1;linear,0.2;rotationz,0;"\r
        />\r
+       \r
+       <Layer File="../Graphics/Loading" \r
+       StartTransitioningCommand="draworder,10000;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+65+SCREEN_HEIGHT/2;diffusealpha,0;sleep,0.4;linear,0.2;diffusealpha,1;y,SCREEN_CENTER_Y+65;"\r
+       />\r
 </children> </ActorFrame>\r
 \r

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay cancel.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay cancel.xml
index 614c2b1..a89e9ce 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay cancel.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay cancel.xml
@@ -1,8 +1,21 @@
-<ActorFrame> <children>
-       <Layer
-               Type="Quad"
-               InitCommand="diffuse,#000000;stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM"
-               OnCommand="cropleft,1;fadeleft,.5;linear,0.5;cropleft,-0.5"
+<ActorFrame
+       Sound="Screen cancel/cancel.ogg"
+> <children>
+       
+       <Layer Type="Quad"
+       StartTransitioningCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X+SCREEN_WIDTH;y,SCREEN_CENTER_Y;draworder,10000;linear,0.3;diffuse,0,0,0,1;x,SCREEN_CENTER_X"
+       />
+       
+       <Layer Type="Quad"
+       StartTransitioningCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X-SCREEN_WIDTH;y,SCREEN_CENTER_Y;draworder,10000;linear,0.3;diffuse,0,0,0,1;x,SCREEN_CENTER_X"
+       />
+       
+       <Layer File="../Graphics/TransitionArrow"
+       StartTransitioningCommand="rotationz,-90;x,SCREEN_CENTER_X+SCREEN_WIDTH+50;y,SCREEN_CENTER_Y;draworder,10000;linear,0.2;x,SCREEN_CENTER_X;linear,0.1;zoomx,0.9;linear,0.1;zoomx,1;linear,0.2;rotationz,0;"
+       />
+       
+       <Layer File="../Graphics/Loading" 
+       StartTransitioningCommand="draworder,10000;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+65+SCREEN_HEIGHT/2;diffusealpha,0;sleep,0.4;linear,0.2;diffusealpha,1;y,SCREEN_CENTER_Y+65;"
        />
-       <Layer File="_menu out" OnCommand="hibernate,0.10" />
 </children> </ActorFrame>
+

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
index f25d3a5..2f491f8 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
@@ -1,4 +1,4 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenGameplay');
+<ActorFrame InitCommand="%function(self) 
 self:queuecommand('KillBPM');
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
@@ -19,6 +19,10 @@ SCREENMAN:GetTopScreen():GetChild('BPMDisplay'):addy(-10000);
                                        end
                                end
 end"> <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenGameplay'); end"
+/>
+
 
                
                <ActorFrame InitCommand="x,409+CourseHorizontal();y,222;">
@@ -2999,7 +3003,8 @@ StepP2MessageCommand="%function(self)
                self:queuecommand('Blink');
                end
        end" 
-       BlinkCommand="draworder,10000;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+65;diffusealpha,1;sleep,0.195;diffusealpha,0;sleep,0.195;diffusealpha,1;sleep,0.195;diffusealpha,0;sleep,0.195;diffusealpha,1;sleep,0.195;diffusealpha,0;sleep,0.195;diffusealpha,1;sleep,0.195;diffusealpha,0;sleep,0.195;diffusealpha,1;"
+       BlinkCommand="sleep,0.2;diffusealpha,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+65;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y+65;diffusealpha,1;sleep,0.195;diffusealpha,0;sleep,0.195;diffusealpha,1;sleep,0.195;diffusealpha,0;sleep,0.195;diffusealpha,1;sleep,0.195;diffusealpha,0;sleep,0.195;diffusealpha,1;sleep,0.195;diffusealpha,0;sleep,0.195;diffusealpha,1;"
+       MenuBackMessageCommand="hidden,1;"
        />
        
 </children> </ActorFrame>

diff --git a/Themes/GrooveNights/BGAnimations/ScreenLogo background/BGVid.avi b/Themes/GrooveNights/BGAnimations/ScreenLogo background/BGVid.avi
index 69f27d5..a723c9e 100644 (file)
Binary files a/Themes/GrooveNights/BGAnimations/ScreenLogo background/BGVid.avi and b/Themes/GrooveNights/BGAnimations/ScreenLogo background/BGVid.avi differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenLogo background/BGVid2.avi b/Themes/GrooveNights/BGAnimations/ScreenLogo background/BGVid2.avi
deleted file mode 100644 (file)
index a723c9e..0000000
Binary files a/Themes/GrooveNights/BGAnimations/ScreenLogo background/BGVid2.avi and /dev/null differ

diff --git a/Themes/GrooveNights/BGAnimations/ScreenLogo background/default.xml b/Themes/GrooveNights/BGAnimations/ScreenLogo background/default.xml
index d30b481..82f5709 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenLogo background/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenLogo background/default.xml
@@ -5,8 +5,9 @@ InitScreen('ScreenLogo');
 self:sleep(0.1);
 self:queuecommand('loop');
 end"><children>
+
        <Layer
-               File="BGVid2.avi"
+               File="BGVid.avi"
                OnCommand="@'diffusealpha,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.1*gnZoomRatio;diffuse,'..FrameColor()..';queuecommand,Authenticate;'"
                AuthenticateCommand="%function(self)
                GAMESTATE:SetEnv('Santa','Off');
@@ -34,17 +35,12 @@ end"><children>
                end"
        />
        
-               <Layer
-               File="TitleScreen0004.png"
-               OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1*gnZoomRatio;"
-       />
-       
        <!-- Home Mode Interface -->
        <Layer Class="ActorFrame" Condition="GAMESTATE:GetCoinMode()==COIN_MODE_HOME"><children>
        <ActorFrame InitCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;"><children>
                <Layer
                File="TitleScreen0002.png"
-               OnCommand="pulse;EffectMagnitude,1,1.02,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addy,460;diffusealpha,1;zoom,1.7;diffusealpha,1;addy,-510;zoom,0.8;diffusealpha,1;addy,10;zoom,0;linear,0.1;zoom,0.8;"
+               OnCommand="pulse;EffectMagnitude,1,1.02,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addy,460;diffusealpha,1;zoom,1.7;diffusealpha,1;addy,-510;zoom,0.8;diffusealpha,1;addy,10;zoom,0.5;linear,0.1;zoom,0.8;"
        /></children></ActorFrame>
                <Layer
                File="TitleScreen0003.png"
@@ -61,7 +57,7 @@ end"><children>
        <ActorFrame InitCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;"><children>
                <Layer
                File="TitleScreen0002.png"
-               OnCommand="pulse;EffectMagnitude,1,1.02,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addy,460;diffusealpha,1;zoom,1.7;diffusealpha,1;addy,-510;zoom,0.8;diffusealpha,1;addy,10;zoom,0;linear,0.1;zoom,0.8;"
+               OnCommand="pulse;EffectMagnitude,1,1.02,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addy,460;diffusealpha,1;zoom,1.7;diffusealpha,1;addy,-510;zoom,0.8;diffusealpha,1;addy,10;zoom,0.5;linear,0.1;zoom,0.8;"
        /></children></ActorFrame>
                <Layer
                File="TitleScreen0003.png"
@@ -73,13 +69,9 @@ end"><children>
        />
        </children></Layer>
 
-       <Layer
-               Class="Quad"
-               OnCommand="@'stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM;diffuse,#FFFFFF;diffusealpha,1;linear,0.1;diffuse,'..FrameColor()..';diffusealpha,0;'"
-       />
        
        <Layer
-               File="BGVid2.avi"
+               File="BGVid.avi"
                OnCommand="@'diffusealpha,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.1*gnZoomRatio;diffuse,'..FrameColor()..';blend,add;'"
        />
 </children></ActorFrame>

diff --git a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
index 80ada10..6ea504f 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
@@ -1,5 +1,9 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenOptions') end">
+<ActorFrame>
 <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenOptions') end"
+/>
+
 
        <Layer
        File="ScreenOptions frame"
@@ -61,9 +65,10 @@
 
        <Layer
        File="../../Graphics/TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
-       OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.3;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.3;y,SCREEN_CENTER_Y"
+       MenuBackMessageCommand="hidden,1;"
        />
-
+       
 </children>
 </ActorFrame>
\ No newline at end of file

diff --git a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions cancel.xml b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions cancel.xml
index 6b617ec..d06e90a 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions cancel.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions cancel.xml
@@ -20,5 +20,9 @@
        <Layer File="../Graphics/TransitionArrow"\r
        StartTransitioningCommand="rotationz,-90;x,SCREEN_CENTER_X+SCREEN_WIDTH+50;y,SCREEN_CENTER_Y;draworder,10000;linear,0.2;x,SCREEN_CENTER_X;linear,0.1;zoomx,0.9;linear,0.1;zoomx,1;linear,0.2;rotationz,0;"\r
        />\r
+       \r
+       <Layer File="../Graphics/Loading" \r
+       StartTransitioningCommand="draworder,10000;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+65+SCREEN_HEIGHT/2;diffusealpha,0;sleep,0.4;linear,0.2;diffusealpha,1;y,SCREEN_CENTER_Y+65;"\r
+       />\r
 </children> </ActorFrame>\r
 \r

diff --git a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
index 9979e33..4ca73ca 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
@@ -1,10 +1,12 @@
-<ActorFrame OnCommand="%function(self)
-                       InitScreen('ScreenPlayerOptions');
-                       self:sleep(0.1);
+<ActorFrame InitCommand="%function(self)
                        if GAMESTATE:GetEnv('Vibrate') == 'On' then
                                self:vibrate();
                                end
                        end"> <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenPlayerOptions'); end"
+/>
+
        
 
                <ActorFrame InitCommand="x,409;y,222;">

diff --git a/Themes/GrooveNights/BGAnimations/ScreenSaveCardData out/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/ScreenSaveCardData out/BGAnimation.ini
index 3b4f359..ea76f66 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenSaveCardData out/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/ScreenSaveCardData out/BGAnimation.ini
@@ -5,5 +5,9 @@ Import=../_fade out normal
 
 [Layer11]
 File=../_saving
-OnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0;linear,0.3;diffusealpha,1;
+OnCommand=@'diffuse,'..LabelColor()..';x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+65+SCREEN_HEIGHT;diffusealpha,0;linear,0.2;diffusealpha,1;y,SCREEN_CENTER_Y+65;'
 Condition=IsAnyPlayerUsingMemoryCard()
+
+[Layer12]
+File=../_saving
+OnCommand=diffusealpha,0;sleep,0.3;

diff --git a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
index 0ccfeb3..fa501df 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
@@ -1,6 +1,10 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenStage'); end">
+<ActorFrame>
        <children>
-               <Actor
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenStage'); end"
+/>
+
+       <Actor
                        File="../ScreenWithMenuElements underlay"
                />
                <Actor
@@ -44,7 +48,7 @@
        />
        
        <Layer File="../../Graphics/TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
        
@@ -57,6 +61,7 @@
                end
        end" 
        BlinkCommand="diffusealpha,1;draworder,10000;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+65;sleep,0.2;diffusealpha,0;"
+       MenuBackMessageCommand="hidden,1;"
        />
        </children></ActorFrame>
        </children>

diff --git a/Themes/GrooveNights/BGAnimations/_ITG credits text.xml b/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
index 1985641..19c7bd7 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
+++ b/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
@@ -4,7 +4,7 @@
        NumItemsToDraw="21" 
        ItemPaddingStart="10"
        ItemPaddingEnd="0"
-       TransformFunction="function(self,offset,itemIndex,numItems) self:y(offset*24); end"
+       TransformFunction="function(self,offset,itemIndex,numItems) self:y(offset*24+12); end"
 >
        <children>
                <Layer Type="BitmapText" Text="CREATED BY JAYCE NEWTON" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />

diff --git a/Themes/GrooveNights/BGAnimations/_fade in normal/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/_fade in normal/BGAnimation.ini
index bc8a3c4..f6ed996 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_fade in normal/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/_fade in normal/BGAnimation.ini
@@ -4,4 +4,4 @@ LengthSeconds=0.3
 [Layer1]
 File=../_black
 Type=1         // 0=sprite, 1=stretch, 2=particles, 3=tiles
-Command=diffusealpha,1;linear,0.3;diffusealpha,0
+Command=diffusealpha,0;linear,0.3;diffusealpha,0

diff --git a/Themes/GrooveNights/BGAnimations/_fade in with sound/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/_fade in with sound/BGAnimation.ini
index 333e0d1..030a36d 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_fade in with sound/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/_fade in with sound/BGAnimation.ini
@@ -5,4 +5,4 @@ Sound=../_swoosh.ogg
 [Layer1]
 File=../_black
 Type=1         // 0=sprite, 1=stretch, 2=particles, 3=tiles
-Command=diffusealpha,1;linear,0.3;diffusealpha,0
+Command=diffusealpha,0;linear,0.3;diffusealpha,0

diff --git a/Themes/GrooveNights/BGAnimations/_fade out normal/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/_fade out normal/BGAnimation.ini
index 362ed3c..c656d1d 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_fade out normal/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/_fade out normal/BGAnimation.ini
@@ -4,4 +4,4 @@ LengthSeconds=0.02
 [Layer1]
 File=../_black
 Type=1         // 0=sprite, 1=stretch, 2=particles, 3=tiles
-Command=diffusealpha,0;linear,0.02;diffusealpha,1
+Command=diffusealpha,0;linear,0.02;diffusealpha,0

diff --git a/Themes/GrooveNights/BGAnimations/_fade out to options/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/_fade out to options/BGAnimation.ini
index b5409a1..d111147 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_fade out to options/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/_fade out to options/BGAnimation.ini
@@ -4,4 +4,4 @@ LengthSeconds=1.5
 [Layer1]
 File=../_black
 Type=1         // 0=sprite, 1=stretch, 2=particles, 3=tiles
-Command=diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1
+Command=diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,0

diff --git a/Themes/GrooveNights/BGAnimations/_fade out with sound/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/_fade out with sound/BGAnimation.ini
index 63ebe4d..030a36d 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_fade out with sound/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/_fade out with sound/BGAnimation.ini
@@ -5,4 +5,4 @@ Sound=../_swoosh.ogg
 [Layer1]
 File=../_black
 Type=1         // 0=sprite, 1=stretch, 2=particles, 3=tiles
-Command=diffusealpha,0;linear,0.3;diffusealpha,1
+Command=diffusealpha,0;linear,0.3;diffusealpha,0

diff --git a/Themes/GrooveNights/BGAnimations/_menu in/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/_menu in/BGAnimation.ini
index 0846258..10ff41a 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_menu in/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/_menu in/BGAnimation.ini
@@ -2,4 +2,4 @@
 
 [Layer1]
 File=../_moveon
-Command=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;linear,0.2;diffuse,0,0,0,0
+Command=diffusealpha,0;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;linear,0.2;diffuse,0,0,0,0

diff --git a/Themes/GrooveNights/BGAnimations/_menu out/BGAnimation.ini b/Themes/GrooveNights/BGAnimations/_menu out/BGAnimation.ini
index c3cd1d1..a7abee4 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_menu out/BGAnimation.ini
+++ b/Themes/GrooveNights/BGAnimations/_menu out/BGAnimation.ini
@@ -3,4 +3,4 @@ LengthSeconds=0.5
 
 [Layer1]
 File=../_moveon
-Command=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0;sleep,0.2;linear,0.1;diffusealpha,1
+Command=diffusealpha,0;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0;sleep,0.2;linear,0.1;diffusealpha,1

diff --git a/Themes/GrooveNights/BGAnimations/_saving.png b/Themes/GrooveNights/BGAnimations/_saving.png
index ac69b00..a939de5 100644 (file)
Binary files a/Themes/GrooveNights/BGAnimations/_saving.png and b/Themes/GrooveNights/BGAnimations/_saving.png differ

diff --git a/Themes/GrooveNights/BGAnimations/_shared background no streaks/default.xml b/Themes/GrooveNights/BGAnimations/_shared background no streaks/default.xml
index 1d7133d..d02f3ed 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_shared background no streaks/default.xml
+++ b/Themes/GrooveNights/BGAnimations/_shared background no streaks/default.xml
@@ -5,7 +5,7 @@
                                <ActorFrame FOV="105" OnCommand="zoom,1.3">
                                        <children>
                                                <!-- overlay -->
-                                               <Layer File="../ScreenLogo background/BGVid2.avi" OnCommand="@'zoom,1.1*gnZoomRatio;diffusealpha,1;diffuse,'..FrameColor()..';'" />
+                                               <Layer File="../ScreenLogo background/BGVid.avi" OnCommand="@'zoom,1.1*gnZoomRatio;diffusealpha,1;diffuse,'..FrameColor()..';'" />
                                                
                                        </children>
                                </ActorFrame>

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

diff --git a/Themes/GrooveNights/Graphics/Loading.png b/Themes/GrooveNights/Graphics/Loading.png
new file mode 100644 (file)
index 0000000..5f60c3a
Binary files /dev/null and b/Themes/GrooveNights/Graphics/Loading.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml b/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
index 2a2fcf6..34764b8 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
@@ -33,7 +33,8 @@
 
        <Layer
        File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       MenuBackMessageCommand="hidden,1;"
        />
 </children></ActorFrame>
        </children>

diff --git a/Themes/GrooveNights/Graphics/ScreenGameplay stage event_.png b/Themes/GrooveNights/Graphics/ScreenGameplay stage event_.png
deleted file mode 100644 (file)
index d1b423d..0000000
Binary files a/Themes/GrooveNights/Graphics/ScreenGameplay stage event_.png and /dev/null differ

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
index c926b5c..5c2d74b 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
@@ -1,48 +1,54 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenNameEntry'); end">
+<ActorFrame>
        <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenNameEntry'); end"
+/>
+
                <BitmapText
                        Text="@getTextNameEntryTitle()"
                        File="_eurostile blue glow"
                        InitCommand="%function(self)  self:x(self:GetWidth()/2) self:shadowlength(0) end"
                        
-                       OffCommand=""
+                       OffCommand="linear,0.2;diffuse,0,0,0,1;"
                />
                
                <Layer File="ScreenNameEntryTraditional banner frame p1"
-               InitCommand="@'x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-134-41;diffuse,'..FrameColor()..';'"
+               InitCommand="@'draworder,-1000;x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-134-41;diffuse,'..FrameColor()..';'"
+               OffCommand="linear,0.2;diffuse,0,0,0,1;"
                />
                
 <Layer
 File="_difficulty frame F"
 OnCommand="@'x,SCREEN_CENTER_X-156-68-18;y,SCREEN_CENTER_Y-106-51-41;diffuse,'..FrameColor()..';draworder,100000;'"
-OffCommand=""
+OffCommand="linear,0.2;diffuse,0,0,0,1;"
 Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
 />
 
 <Layer
 File="_difficulty frame F"
 OnCommand="@'x,SCREEN_CENTER_X+156+68-18;y,SCREEN_CENTER_Y-106-51-41;diffuse,'..FrameColor()..';rotationy,180;draworder,100000;'"
-OffCommand=""
+OffCommand="linear,0.2;diffuse,0,0,0,1;"
 Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
 />
 
-<!--Screen Transition doesn't work because the screen change is instantaneous-->
+<!--Screen Transition-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
-       <Layer Type="Quad" InitCommand="diffusealpha,0;" ScreenTransitionMessageCommand="%function(self) ScreenTransitionWhoosh('in'); end" />
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" OffCommand="%function(self) ScreenTransitionWhoosh('in'); end" />
 
        <Layer Type="Quad"
        OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)-50;draworder,10000;decelerate,0.3;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
-       ScreenTransitionMessageCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT;draworder,10000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)"
+       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)"
        />
        
        <Layer Type="Quad"
        OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2);draworder,10000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT)"
-       ScreenTransitionMessageCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)"
+       OffCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)"
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
-       ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       MenuBackMessageCommand="hidden,1;"
        />
        </children></ActorFrame>
 

diff --git a/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml b/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
index 5136b02..2840a5b 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
@@ -1,7 +1,10 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenPlayerOptions');
+<ActorFrame InitCommand="%function(self) 
 if GAMESTATE:GetEnv('Vibrate') == 'On' then    self:vibrate(); end
 end">
        <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenPlayerOptions'); end"
+/>
                <BitmapText
                        Text="@getTextPlayerOptionsTitle()"
                        File="_eurostile blue glow"

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
index 1083072..2b4748c 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
@@ -1,10 +1,13 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenSelectMusic'); self:hibernate(0.02); 
+<ActorFrame InitCommand="%function(self)  
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end
 end"
 >
        <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic'); end"
+/>
                <ActorFrame InitCommand="x,-35;y,0;">
                        <children>
        <!--Total PlayTime-->

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
index 102215a..818e41b 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
@@ -30,8 +30,9 @@
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        OffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       MenuBackMessageCommand="hidden,1;"
        />
        </children></ActorFrame>
        </children>

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
index c0044b6..5720c16 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
@@ -32,8 +32,9 @@
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        ScreenTransitionMessageCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       MenuBackMessageCommand="hidden,1;"
        />
        </children></ActorFrame>
        </children>

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
index 7962c42..e74debf 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
@@ -1,10 +1,13 @@
-<ActorFrame OnCommand="%function(self) InitScreen('ScreenSelectPlayMode'); end">
+<ActorFrame>
        <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectPlayMode'); end"
+/>
                <BitmapText
                        Text="@getTextPlayModeTitle()"
                        File="_eurostile blue glow"
                        InitCommand="%function(self)  self:x(self:GetWidth()/2) gnDummy = ScreenTitleBranch(); end"
-                       OnCommand="shadowlength,0;zoom,1;decelerate,0.3;zoom,1;"
+                       OnCommand="shadowlength,0;diffusealpha,0;sleep,0.6;zoom,1;decelerate,0.3;diffusealpha,1;zoom,1;"
                        OffCommand="accelerate,0.3;diffusealpha,0;"
                        
                />
@@ -105,25 +108,36 @@
        />
        
        <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;sleep,0.2;decelerate,0.3;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
+       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;sleep,0.6;decelerate,0.3;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+SCREEN_HEIGHT"
        MadeChoiceP1MessageCommand="playcommand,GoOff"
        MadeChoiceP2MessageCommand="playcommand,GoOff"
        GoOffCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT;draworder,10000;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)"
        />
        
        <Layer Type="Quad"
-       OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2);draworder,10000;sleep,0.2;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT)"
+       OnCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2);draworder,10000;sleep,0.6;accelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT)"
        MadeChoiceP1MessageCommand="playcommand,GoOff"
        MadeChoiceP2MessageCommand="playcommand,GoOff"
        GoOffCommand="zoomx,SCREEN_WIDTH;zoomy,SCREEN_HEIGHT;diffuse,0,0,0,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;draworder,10000;decelerate,0.2;diffuse,0,0,0,1;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)"
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;zoom,2.4;decelerate,0.2;zoom,1;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;draworder,10000;diffusealpha,0.5;zoom,2;decelerate,0.2;diffusealpha,0.8;zoom,2.6;accelerate,0.2;zoom,2;decelerate,0.2;diffusealpha,1;zoom,1;accelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50"
        MadeChoiceP1MessageCommand="playcommand,GoOff"
        MadeChoiceP2MessageCommand="playcommand,GoOff"
        GoOffCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
+       MenuBackMessageCommand="hidden,1;"
        />
+       
+       <Layer File="GrooveNights"
+       OnCommand="hidden,0;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+6;draworder,10000;zoom,0.85;decelerate,0.3;zoom,1.3;addy,-5;accelerate,0.2;addy,5;zoom,1;decelerate,0.1;zoom,0.85;accelerate,0.2;y,SCREEN_CENTER_Y+(SCREEN_HEIGHT/2)+50"
+       />
+       
+       <Layer
+               File="../BGAnimations/ScreenLogo background/BGVid.avi"
+               OnCommand="@'draworder,10000;diffusealpha,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoom,1.1*gnZoomRatio;diffuse,'..FrameColor()..';blend,add;linear,0.1;linear,0.3;diffusealpha,0;'"
+       />
+       
        </children></ActorFrame>
        </children>
 </ActorFrame>

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
index f6b505a..abcb70f 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
@@ -1,7 +1,8 @@
-<ActorFrame InitCommand="%function(self)
-InitScreen('ScreenSelectStyle2');
-end">
+<ActorFrame>
        <children>
+<Layer Type="Quad"
+OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectStyle2'); end"
+/>
                <BitmapText
                        Text="@getTextPlayersTitle()"
                        File="_eurostile blue glow"
@@ -199,10 +200,18 @@ end">
        />
        
        <Layer File="TransitionArrow"
-       OnCommand="vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-41;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50-41"
+       OnCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y-41;draworder,10000;decelerate,0.2;y,SCREEN_CENTER_Y-(SCREEN_HEIGHT/2)-50-41"
        MadeChoiceP1MessageCommand="playcommand,GoOff"
        MadeChoiceP2MessageCommand="playcommand,GoOff"
        GoOffCommand="x,SCREEN_CENTER_X-18;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50-41;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y-41"
        />
+       
+       <Layer File="Loading" 
+       OnCommand="diffusealpha,0;draworder,10000;x,SCREEN_CENTER_X-19;y,SCREEN_CENTER_Y-41+65+SCREEN_HEIGHT;"
+       MadeChoiceP1MessageCommand="playcommand,GoOff"
+       MadeChoiceP2MessageCommand="playcommand,GoOff"
+       GoOffCommand="sleep,0.2;accelerate,0.2;diffusealpha,1;y,SCREEN_CENTER_Y-41+65;"
+       MenuBackMessageCommand="hidden,1;"
+       />
        </children>
 </ActorFrame>

diff --git a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 1.png b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 1.png
index 519614f..7d48a06 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 1.png and b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 1.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 2.png b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 2.png
index 286f48e..a8a388a 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 2.png and b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 2.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 3.png b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 3.png
index 017e754..e79bbb3 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 3.png and b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 3.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 4.png b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 4.png
index 633e982..71ca763 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 4.png and b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 4.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 5.png b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 5.png
index 88c835e..16d056b 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 5.png and b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 5.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 6.png b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 6.png
index b2b857e..d81292f 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 6.png and b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage 6.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage event.png b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage event.png
index 43c6e02..e4b0914 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage event.png and b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage event.png differ

diff --git a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage final.png b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage final.png
index 568c572..6bcc98b 100644 (file)
Binary files a/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage final.png and b/Themes/GrooveNights/Graphics/ScreenWithMenuElements stage final.png differ

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 47ac400..1459ef8 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -165,6 +165,7 @@ RateRestoreMessage(false);
        gnStatFrequency = gnStatFrequency + 1;
        gnOptionMod = 0;
        gnOptionModType = 0;
+       gnStaminaSongPercent = 0;
 end
 
 
@@ -264,6 +265,7 @@ if scn == 'ScreenGameplay' then
 end
 
 
+
 if scn == 'ScreenEvaluation' then
 ScreenTransitionWhoosh('short');
 gnSongCount = gnSongCount + 1;

diff --git a/Themes/GrooveNights/Sounds/gnScreenTransition whoosh long.ogg b/Themes/GrooveNights/Sounds/gnScreenTransition whoosh long.ogg
index 5ddefc9..f6133ea 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/gnScreenTransition whoosh long.ogg and b/Themes/GrooveNights/Sounds/gnScreenTransition whoosh long.ogg differ