AIN'T NOTHIN' BUT HIP HOP MUSIC

diff --git a/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml b/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
index b9456d5..5b98399 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
@@ -1,5 +1,5 @@
 <ActorFrame InitCommand="%function(self)
-SetVariablesFor('ScreenCompany');
+InitScreen('ScreenCompany');
 end">
 <children>
 <Layer Type="Quad"

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
index 95912a9..c2e629f 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
@@ -1,5 +1,5 @@
 <ActorFrame InitCommand="%function(self)
-SetVariablesFor('ScreenEnding');
+InitScreen('ScreenEnding');
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 233ed36..bcf4a10 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -2,7 +2,7 @@
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end
-SetVariablesFor('ScreenEvaluation');
+InitScreen('ScreenEvaluation');
 end">
        <children>
        <!--Restart the song on event mode if you pressed the menu button-->
@@ -1530,6 +1530,8 @@ end"><children>
        </children>
 </ActorFrame>
 <!--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;'"

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
index 1e1b82d..bb2e8f7 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
@@ -1,6 +1,6 @@
 <ActorFrame InitCommand="%function(self)
 self:sleep(0.01);
-SetVariablesFor('ScreenGameplay');
+InitScreen('ScreenGameplay');
 self:sleep(0.01);
 self:queuecommand('KillBPM');
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
@@ -2963,6 +2963,8 @@ StepP2MessageCommand="%function(self)
 </children></ActorFrame>
 
 <!--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;"
        QuadFlickerMessageCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,1,1,1,1;diffusealpha,0.1;linear,0.1;diffusealpha,0;'"

diff --git a/Themes/GrooveNights/BGAnimations/ScreenLogo background/default.xml b/Themes/GrooveNights/BGAnimations/ScreenLogo background/default.xml
index 0dd6168..d30b481 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenLogo background/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenLogo background/default.xml
@@ -1,7 +1,7 @@
 <ActorFrame InitCommand="sleep,0.1;queuecommand,loop;"
 loopCommand="%function(self)
 self:stoptweening();
-SetVariablesFor('ScreenLogo');
+InitScreen('ScreenLogo');
 self:sleep(0.1);
 self:queuecommand('loop');
 end"><children>

diff --git a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
index a6d36ed..3b8195a 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenNameEntryTraditional underlay/default.xml
@@ -70,32 +70,5 @@ OnCommand="@'x,SCREEN_CENTER_X+156;y,SCREEN_CENTER_Y+106;diffuse,'..FrameColor()
 OffCommand=""
 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;"
-       />
-       
-       <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="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"
-       />
 </children>
 </ActorFrame>
\ No newline at end of file

diff --git a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
index 0897e48..047d9ab 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
@@ -34,6 +34,8 @@
        />
 
 <!-- Screen Transition -->
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" OffCommand="%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;"
        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;'"

diff --git a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
index 078071a..e5ebf28 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
@@ -1,5 +1,5 @@
 <ActorFrame InitCommand="%function(self)
-                       SetVariablesFor('ScreenPlayerOptions');
+                       InitScreen('ScreenPlayerOptions');
                        self:sleep(0.1);
                        if GAMESTATE:GetEnv('Vibrate') == 'On' then
                                self:vibrate();

diff --git a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
index 9172dc4..288eb2f 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
@@ -1,4 +1,4 @@
-<ActorFrame>
+<ActorFrame InitCommand="%function(self) InitScreen('ScreenStage'); end">
        <children>
                <Actor
                        File="../ScreenWithMenuElements underlay"
@@ -26,6 +26,8 @@
                
        <!--Screen Transition-->
        <ActorFrame InitCommand="x,0;y,0;"><children>
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" OffCommand="%function(self) ScreenTransitionWhoosh('in'); end" />
+
        <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;"
        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/BGAnimations/_ITG credits text.xml b/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
index 162562c..1985641 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
+++ b/Themes/GrooveNights/BGAnimations/_ITG credits text.xml
@@ -11,13 +11,11 @@
                <Layer Type="BitmapText" Text="http://divinelegy.com/" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="MUSIC BY PSYBOT & WATERFLAME" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
+               <Layer Type="BitmapText" Text="MUSIC BY PSYBOT" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="http://psybot.newgrounds.com/" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="http://waterflame.newgrounds.com/" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="THEME SOUNDS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
-               <Layer Type="BitmapText" Text="Super Mario RPG (SNES)" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
-               <Layer Type="BitmapText" Text="Yoshi's Island (SNES)" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
+               <Layer Type="BitmapText" Text="http://pond5.com/" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />
                <Layer Type="BitmapText" Text="THEME GRAPHICS" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#D57676;ztest,1;queuecommand,Diffuser;" DiffuserCommand="@'diffuse,'..LabelColor()..';'" />
                <Layer Type="BitmapText" Text="Jayce Newton" File="_eurostile normal" OnCommand="shadowlength,0;zoom,0.7;diffuse,#FFFFFF;ztest,1" />

diff --git a/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml b/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
index 8602405..2a2fcf6 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenEditMenu header.xml
@@ -10,6 +10,8 @@
 
 <!-- Screen Transition -->
 <ActorFrame InitCommand="x,-18;y,-41;"><children>
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" OffCommand="%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;"
        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;'"

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
index eb64696..76e5804 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
@@ -1,5 +1,5 @@
 <ActorFrame InitCommand="%function(self)
-SetVariablesFor('ScreenNameEntry');
+InitScreen('ScreenNameEntry');
 end">
        <children>
                <BitmapText
@@ -30,6 +30,8 @@ Condition="GAMESTATE:IsHumanPlayer(PLAYER_2)"
 
 <!--Screen Transition doesn't work because the screen change is instantaneous-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" ScreenTransitionMessageCommand="%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)"

diff --git a/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml b/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
index 1c59c95..6ff9192 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
@@ -1,5 +1,5 @@
 <ActorFrame InitCommand="%function(self)
-SetVariablesFor('ScreenPlayerOptions');
+InitScreen('ScreenPlayerOptions');
 if GAMESTATE:GetEnv('Vibrate') == 'On' then    self:vibrate(); end
 end">
        <children>

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
index 33f0913..5571068 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
@@ -2,7 +2,7 @@
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end
-SetVariablesFor('ScreenSelectMusic');
+InitScreen('ScreenSelectMusic');
 end"
 >
        <children>

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
index 7994218..102215a 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic header.xml
@@ -13,6 +13,8 @@
        />
        <!--Screen Transition-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" OffCommand="%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;"
        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;'"

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
index 3ca288b..c0044b6 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusicCourse header.xml
@@ -10,6 +10,8 @@
                />
        <!--Screen Transition-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
+       <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;'"

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
index 874ca0c..ae7582b 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
@@ -1,5 +1,5 @@
 <ActorFrame InitCommand="%function(self)
-SetVariablesFor('ScreenSelectPlayMode');
+InitScreen('ScreenSelectPlayMode');
 end">
        <children>
                <BitmapText
@@ -88,6 +88,10 @@ end">
                </ActorFrame>
        <!--Screen Transition-->
        <ActorFrame InitCommand="x,-18;y,-41;"><children>
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" GoOffCommand="%function(self) ScreenTransitionWhoosh('in'); end"
+       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,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;'"

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
index 9c56dd7..f6b505a 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectStyle2 header.xml
@@ -1,5 +1,5 @@
 <ActorFrame InitCommand="%function(self)
-SetVariablesFor('ScreenSelectStyle2');
+InitScreen('ScreenSelectStyle2');
 end">
        <children>
                <BitmapText
@@ -166,6 +166,10 @@ end">
                        </children>
                </ActorFrame>
        <!--Screen Transition-->
+       <Layer Type="Quad" InitCommand="diffusealpha,0;" GoOffCommand="%function(self) ScreenTransitionWhoosh('in'); end"
+       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,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;'"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Failed.xml b/Themes/GrooveNights/Graphics/_grade models/Failed.xml
index b3991f4..b6dbdb6 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Failed.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Failed.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier01.xml b/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
index 3813615..7572c0f 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier02.xml b/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
index 5d70928..67244c3 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier03.xml b/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
index 506b717..a214174 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier04.xml b/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
index fd3646f..d6aaa9e 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier05.xml b/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
index 89e1b89..fce8758 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier06.xml b/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
index 96451e7..d4414b2 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier07.xml b/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
index f27f87c..c325eaf 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier08.xml b/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
index aa877b3..6a62429 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier09.xml b/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
index 693deae..ebc2f76 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier10.xml b/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
index 49c4439..b0f89ea 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier11.xml b/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
index 0d9fb30..c7d20aa 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier12.xml b/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
index 11b1b77..378d623 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier13.xml b/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
index efa8035..73abd45 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier14.xml b/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
index be46071..05be443 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier15.xml b/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
index 9966143..fa45adc 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier16.xml b/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
index 5e98815..986461a 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
index c6ea53d..3b5fc1e 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
@@ -2,7 +2,7 @@
                        
 <ActorFrame    InitCommand="queuecommand,Start;"
                        StartCommand="%function(self)
-                       SetVariablesFor('GradeModels');
+                       InitScreen('GradeModels');
                        gnSameGrade = gnSameGrade + 1;
                        self:queuecommand('SameGradeCheck');
                        end"

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 4a57a4e..9bd3f8e 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -63,7 +63,7 @@ end
 
 
 -- ===SET SCREEN SPECIFIC VARIABLES===
-function SetVariablesFor(scn)
+function InitScreen(scn)
 if scn == 'ScreenCompany' then
 return 0;
 end
@@ -102,11 +102,13 @@ end
 
 
 if scn == 'ScreenSelectPlayMode' then
+ScreenTransitionWhoosh('long');
 -- nothing to add yet
 end
 
 
 if scn == 'ScreenSelectStyle2' then
+ScreenTransitionWhoosh('short');
        gnSongsP1 = nil;
        gnSongsP1Total = nil;
        gnTotalP1 = nil;
@@ -144,6 +146,8 @@ end
 
 
 if scn == 'ScreenSelectMusic' then
+ScreenTransitionWhoosh('short');
+RateRestoreMessage(false);
        if curRate == nil then curRate = 1 end
        gnBlazedP1 = 0;
        gnBlazedP2 = 0;
@@ -156,11 +160,11 @@ if scn == 'ScreenSelectMusic' then
        gnStatFrequency = gnStatFrequency + 1;
        gnOptionMod = 0;
        gnOptionModType = 0;
-       RateRestoreMessage(false)
 end
 
 
 if scn == 'ScreenPlayerOptions' then
+ScreenTransitionWhoosh('short');
        if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
                gnP1Sound = 0;
                else
@@ -185,6 +189,11 @@ if scn == 'ScreenPlayerOptions' then
 end
 
 
+if scn == 'ScreenStage' then
+ScreenTransitionWhoosh('short');
+end
+
+
 if scn == 'ScreenGameplay' then
        GreenQuadP1Flag = 0;
        GreenQuadP2Flag = 0;
@@ -251,6 +260,7 @@ end
 
 
 if scn == 'ScreenEvaluation' then
+ScreenTransitionWhoosh('short');
 gnSongCount = gnSongCount + 1;
 RateRestoreMessage(false);
 end
@@ -272,6 +282,7 @@ end
 
 
 if scn == 'ScreenNameEntry' then
+ScreenTransitionWhoosh('short');
 -- nothing to add yet
 end
 
@@ -324,3 +335,14 @@ function RateRestoreMessage(i)
        SCREENMAN:SystemMessage('Rate Modifier has been restored to 1.0x')
        end
 end
+
+
+
+
+
+-- ===PLAY SCREEN TRANSITION SOUND===
+-- Makes the arrow go whooshy whoosh
+function ScreenTransitionWhoosh(i)
+       local Path = THEME:GetPath( EC_SOUNDS, 'gnScreenTransition', 'whoosh '..i );
+       SOUND:PlayOnce(Path);
+end

diff --git a/Themes/GrooveNights/Sounds/Common start.ogg b/Themes/GrooveNights/Sounds/Common start.ogg
index 3fd4833..fb9ab69 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/Common start.ogg and b/Themes/GrooveNights/Sounds/Common start.ogg differ

diff --git a/Themes/GrooveNights/Sounds/MenuTimer tick.ogg b/Themes/GrooveNights/Sounds/MenuTimer tick.ogg
index ab4d74c..6840aa4 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/MenuTimer tick.ogg and b/Themes/GrooveNights/Sounds/MenuTimer tick.ogg differ

diff --git a/Themes/GrooveNights/Sounds/ScreenNameEntryTraditional music (loop).ogg b/Themes/GrooveNights/Sounds/ScreenNameEntryTraditional music (loop).ogg
index a97efe7..d39ba12 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/ScreenNameEntryTraditional music (loop).ogg and b/Themes/GrooveNights/Sounds/ScreenNameEntryTraditional music (loop).ogg differ

diff --git a/Themes/GrooveNights/Sounds/ScreenSelectMusic course music.ogg b/Themes/GrooveNights/Sounds/ScreenSelectMusic course music.ogg
index 68941fd..670d33c 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/ScreenSelectMusic course music.ogg and b/Themes/GrooveNights/Sounds/ScreenSelectMusic course music.ogg differ

diff --git a/Themes/GrooveNights/Sounds/ScreenTransition whoosh in.ogg b/Themes/GrooveNights/Sounds/ScreenTransition whoosh in.ogg
new file mode 100644 (file)
index 0000000..2bc911f
Binary files /dev/null and b/Themes/GrooveNights/Sounds/ScreenTransition whoosh in.ogg differ

diff --git a/Themes/GrooveNights/Sounds/_easier.ogg b/Themes/GrooveNights/Sounds/_easier.ogg
index f911ec2..66bcbb9 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/_easier.ogg and b/Themes/GrooveNights/Sounds/_easier.ogg differ

diff --git a/Themes/GrooveNights/Sounds/_harder.ogg b/Themes/GrooveNights/Sounds/_harder.ogg
index 67bf5f1..31e1e28 100644 (file)
Binary files a/Themes/GrooveNights/Sounds/_harder.ogg and b/Themes/GrooveNights/Sounds/_harder.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnScreenTransition whoosh in.ogg b/Themes/GrooveNights/Sounds/gnScreenTransition whoosh in.ogg
new file mode 100644 (file)
index 0000000..f542b5b
Binary files /dev/null and b/Themes/GrooveNights/Sounds/gnScreenTransition whoosh in.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnScreenTransition whoosh long.ogg b/Themes/GrooveNights/Sounds/gnScreenTransition whoosh long.ogg
new file mode 100644 (file)
index 0000000..3683382
Binary files /dev/null and b/Themes/GrooveNights/Sounds/gnScreenTransition whoosh long.ogg differ

diff --git a/Themes/GrooveNights/Sounds/gnScreenTransition whoosh short.ogg b/Themes/GrooveNights/Sounds/gnScreenTransition whoosh short.ogg
new file mode 100644 (file)
index 0000000..383404c
Binary files /dev/null and b/Themes/GrooveNights/Sounds/gnScreenTransition whoosh short.ogg differ