Song doesn't restart if player fails in event mode now WHAT THIS ISN'T WHAT ISS26...

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 87e1b1f..5cb9af5 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -12,7 +12,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
                <BitmapText
                Text=""
                File="_eurostile blue glow"
-               Condition="GAMESTATE:IsEventMode() and MenuButtonGiveUp() and not GAMESTATE:IsCourseMode()"
+               Condition="GAMESTATE:IsEventMode() and MenuButtonGiveUp() and not gnNoRestart and not GAMESTATE:IsCourseMode()"
                InitCommand="%function(self)
                if gnStaminaSongPercent > gnLowestRestartPercent and gnStaminaSongPercent < gnHighestRestartPercent then
                        SCREENMAN:SetNewScreen('ScreenStage');

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay failed/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay failed/default.xml
index acee784..9bcb02e 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay failed/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay failed/default.xml
@@ -1,8 +1,7 @@
-<ActorFrame InitCommand="%function(self)\r
+<ActorFrame OnCommand="%function(self)\r
 if GAMESTATE:GetEnv('Vibrate') == 'On' then\r
        self:vibrate();\r
        end\r
-self:sleep(3);\r
 end"> <children>\r
        \r
        <Layer Condition="not GAMESTATE:IsEventMode()" Type="Quad" OnCommand="%function(self)\r
@@ -14,12 +13,14 @@ end"> <children>
        SOUND:PlayOnce(gnPath);\r
        end"\r
        />\r
+\r
        \r
        <ActorFrame OnCommand="sleep,0.4;linear,0.2;addx,-75;linear,0.2;addx,-75;">\r
        <children>\r
        <Layer\r
                File="GameOver0001"\r
-               OnCommand="x,SCREEN_CENTER_X+100;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;accelerate,0.4;y,SCREEN_CENTER_Y-60;decelerate,0.2;rotationz,-10;addy,-60;accelerate,0.2;addy,105;linear,0.1;rotationz,0;addy,25;sleep,1.5;accelerate,0.1;addx,20;decelerate,0.1;addx,20;accelerate,0.4;addx,-SCREEN_WIDTH/2-20;"\r
+               OnCommand="queuecommand,Screen;x,SCREEN_CENTER_X+100;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;accelerate,0.4;y,SCREEN_CENTER_Y-50;decelerate,0.2;rotationz,-10;addy,-70;accelerate,0.2;addy,105;linear,0.1;rotationz,0;addy,25;sleep,1.5;accelerate,0.1;addx,20;decelerate,0.1;addx,20;accelerate,0.4;addx,-SCREEN_WIDTH/2-20;"\r
+               ScreenCommand="%function(self) InitScreen('ScreenGameplayFailed'); end"\r
        />\r
        </children>\r
        </ActorFrame>\r
@@ -28,7 +29,7 @@ end"> <children>
        <children>\r
        <Layer\r
                File="GameOver0002"\r
-               OnCommand="hibernate,1;x,SCREEN_CENTER_X-100;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;accelerate,0.4;y,SCREEN_CENTER_Y-60;decelerate,0.2;rotationz,10;addy,-60;accelerate,0.2;addy,105;linear,0.1;rotationz,0;addy,25;sleep,0.5;accelerate,0.1;addx,-20;decelerate,0.1;addx,-20;accelerate,0.4;addx,SCREEN_WIDTH/2+20;"\r
+               OnCommand="hibernate,1;x,SCREEN_CENTER_X-100;y,SCREEN_CENTER_Y-SCREEN_HEIGHT;accelerate,0.4;y,SCREEN_CENTER_Y-50;decelerate,0.2;rotationz,10;addy,-70;accelerate,0.2;addy,105;linear,0.1;rotationz,0;addy,25;sleep,0.5;accelerate,0.1;addx,-20;decelerate,0.1;addx,-20;accelerate,0.4;addx,SCREEN_WIDTH/2+20;"\r
        />\r
        </children>\r
        </ActorFrame>\r

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
index 272e0d5..0173c1e 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
@@ -2960,13 +2960,19 @@ StepP2MessageCommand="%function(self)
        
        <Layer File="../../Graphics/TransitionArrow"
        OnCommand="diffusealpha,0;"
+       NoRestartMessageCommand="diffusealpha,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y;decelerate,0.1;zoomx,1.1;zoomy,0.9;addy,5;accelerate,0.1;zoomx,0.95;zoomy,1.05;addy,-6;linear,0.1;zoomx,1;zoomy,1;addy,1;sleep,0.7;decelerate,0.1;zoomx,1.1;zoomy,0.9;addy,5;accelerate,0.1;zoomx,0.95;zoomy,1.05;addy,-6;linear,0.1;zoomx,1;zoomy,1;addy,1;"
        ScreenTransitionMessageCommand="diffusealpha,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+50;draworder,10000;accelerate,0.2;y,SCREEN_CENTER_Y"
        />
        
        <Layer File="Restarting" 
        Condition="GAMESTATE:IsEventMode() and MenuButtonGiveUp() and not GAMESTATE:IsCourseMode()"
        OnCommand="diffusealpha,0;"
-       ScreenTransitionMessageCommand="%function(self) 
+       NoRestartMessageCommand="hibernate,100;"
+       ScreenTransitionMessageCommand="%function(self)
+       self:sleep(0.1);
+       self:queuecommand('PlaySound');
+       end"
+       PlaySoundCommand="%function(self)
        if gnStaminaSongPercent > gnLowestRestartPercent and gnStaminaSongPercent < gnHighestRestartPercent then
                local Path = THEME:GetPath( EC_SOUNDS, '', '_save');
                SOUND:PlayOnce(Path);
@@ -2974,7 +2980,7 @@ StepP2MessageCommand="%function(self)
                self:queuecommand('Blink');
                end
        end" 
-       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;"
+       BlinkCommand="diffusealpha,1;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT+65;draworder,10000;accelerate,0.1;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;"
        />
        

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index de1d653..129d519 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -176,6 +176,7 @@ RateRestoreMessage(false);
        gnOptionMod = 0;
        gnOptionModType = 0;
        gnStaminaSongPercent = 0;
+       gnNoRestart = false;
 end
 
 
@@ -274,6 +275,13 @@ end
 
 
 
+if scn == 'ScreenGameplayFailed' then
+MESSAGEMAN:Broadcast('NoRestart');
+gnNoRestart = true
+end
+
+
+
 if scn == 'ScreenEvaluation' then
 ScreenTransitionWhoosh('short');
 gnSongCount = gnSongCount + 1;

diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index fc5ad25..95ba94a 100644 (file)
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -2403,7 +2403,7 @@ CompareScores=1
 BPMDisplayX=SCREEN_CENTER_X
 BPMDisplayY=SCREEN_TOP-44
 BPMDisplayOnCommand=sleep,0.5;zoom,1.1;decelerate,0.8;addy,100
-BPMDisplayOffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
+BPMDisplayOffCommand=
 NextScreen=@GetGameplayNextScreen()
 PrevScreen=@SongSelectionScreen()
 FailAfter30Misses=1