Arrow Whooshes Okay Now, Knowing Your Code'll Unite Nations Tonight! (AWONKYCUNT)

diff --git a/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml b/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
index 5b98399..2d65df0 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenCompany background/default.xml
@@ -1,6 +1,4 @@
-<ActorFrame InitCommand="%function(self)
-InitScreen('ScreenCompany');
-end">
+<ActorFrame OnCommand="%function(self) InitScreen('ScreenCompany'); end">
 <children>
 <Layer Type="Quad"
 InitCommand="@'x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomx,SCREEN_WIDTH*2;zoomy,SCREEN_HEIGHT*2;diffuse,'..FrameColor()..';diffusealpha,0.2;'"

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
index c2e629f..07b2507 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEndingNormal overlay/default.xml
@@ -1,5 +1,4 @@
-<ActorFrame InitCommand="%function(self)
-InitScreen('ScreenEnding');
+<ActorFrame OnCommand="%function(self) 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 7e59d7d..14a882a 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
@@ -1,8 +1,7 @@
-<ActorFrame InitCommand="%function(self)
+<ActorFrame OnCommand="%function(self) InitScreen('ScreenEvaluation');
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end
-InitScreen('ScreenEvaluation');
 end">
        <children>
        <!--Restart the song on event mode if you pressed the menu button-->

diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
index bb2e8f7..f25d3a5 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
@@ -1,7 +1,4 @@
-<ActorFrame InitCommand="%function(self)
-self:sleep(0.01);
-InitScreen('ScreenGameplay');
-self:sleep(0.01);
+<ActorFrame OnCommand="%function(self) InitScreen('ScreenGameplay');
 self:queuecommand('KillBPM');
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();

diff --git a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
index 047d9ab..80ada10 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenOptions overlay/default.xml
@@ -1,4 +1,4 @@
-<ActorFrame InitCommand="">
+<ActorFrame OnCommand="%function(self) InitScreen('ScreenOptions') end">
 <children>
 
        <Layer

diff --git a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
index 7e6f0e3..823b321 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenPlayerOptions overlay/default.xml
@@ -1,4 +1,4 @@
-<ActorFrame InitCommand="%function(self)
+<ActorFrame OnCommand="%function(self)
                        InitScreen('ScreenPlayerOptions');
                        self:sleep(0.1);
                        if GAMESTATE:GetEnv('Vibrate') == 'On' then
@@ -613,8 +613,8 @@
 <!--Easter Eggs P2 - ActorFrame positions all at once-->               
 <ActorFrame Condition="GAMESTATE:IsPlayerEnabled(PLAYER_2)"
                        InitCommand="x,SCREEN_CENTER_X+119;y,SCREEN_CENTER_Y+134;zoom,0.5;"
-                       SpeedModChangedMessageCommand="sleep,0.01;queuecommand,Update"
-                       RateModChangedMessageCommand="sleep,0.01;queuecommand,Update"
+                       SpeedModChangedMessageCommand="sleep,0.05;queuecommand,Update"
+                       RateModChangedMessageCommand="sleep,0.05;queuecommand,Update"
                        UpdateCommand="%function(self) self:x(SCREEN_CENTER_X+119+u-10); end"
 ><children>    
 <!--Blaze It P2 -->

diff --git a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
index 288eb2f..0ccfeb3 100644 (file)
--- a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
+++ b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
@@ -1,4 +1,4 @@
-<ActorFrame InitCommand="%function(self) InitScreen('ScreenStage'); end">
+<ActorFrame OnCommand="%function(self) InitScreen('ScreenStage'); end">
        <children>
                <Actor
                        File="../ScreenWithMenuElements underlay"

diff --git a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
index 76e5804..c926b5c 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenNameEntryTraditional header.xml
@@ -1,6 +1,4 @@
-<ActorFrame InitCommand="%function(self)
-InitScreen('ScreenNameEntry');
-end">
+<ActorFrame OnCommand="%function(self) InitScreen('ScreenNameEntry'); end">
        <children>
                <BitmapText
                        Text="@getTextNameEntryTitle()"

diff --git a/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml b/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
index 59be836..5136b02 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenPlayerOptions header.xml
@@ -1,5 +1,4 @@
-<ActorFrame InitCommand="%function(self)
-InitScreen('ScreenPlayerOptions');
+<ActorFrame OnCommand="%function(self) 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 1d1f731..1083072 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
@@ -1,8 +1,7 @@
-<ActorFrame InitCommand="%function(self) self:hibernate(0.02)
+<ActorFrame OnCommand="%function(self) InitScreen('ScreenSelectMusic'); self:hibernate(0.02); 
 if GAMESTATE:GetEnv('Vibrate') == 'On' then
        self:vibrate();
        end
-InitScreen('ScreenSelectMusic');
 end"
 >
        <children>

diff --git a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
index ae7582b..7962c42 100644 (file)
--- a/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
+++ b/Themes/GrooveNights/Graphics/ScreenSelectPlayMode header.xml
@@ -1,6 +1,4 @@
-<ActorFrame InitCommand="%function(self)
-InitScreen('ScreenSelectPlayMode');
-end">
+<ActorFrame OnCommand="%function(self) InitScreen('ScreenSelectPlayMode'); end">
        <children>
                <BitmapText
                        Text="@getTextPlayModeTitle()"

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 504649a..da7321f 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -64,8 +64,13 @@ end
 
 -- ===SET SCREEN SPECIFIC VARIABLES===
 function InitScreen(scn)
+if scn == 'ScreenOptions' then
+ScreenTransitionWhoosh('short');
+end
+
+
 if scn == 'ScreenCompany' then
-return 0;
+
 end
 
 
@@ -378,30 +383,34 @@ RegisterEasterEgg("NoScope", NoScope)
 
 --global variable callbacks
 local function LowBPM( BPMDisplay )
-        BPMDisplay = BPMDisplay:GetText()
-
+       BPMDisplay = BPMDisplay:GetText()
+       
        local pos = string.find(BPMDisplay, "-")
        if pos ~= nil then return string.sub(BPMDisplay,1,pos-1) else return BPMDisplay end
 end
 
 local function HighBPM( BPMDisplay )
-        BPMDisplay = BPMDisplay:GetText()
+       BPMDisplay = BPMDisplay:GetText()
 
        local pos = string.find(BPMDisplay, "-")
        if pos ~= nil then return string.sub(BPMDisplay,pos+1) else return BPMDisplay end
 end
 
 local function TotalTimeMinutes( TimeDisplay ) 
-        TimeDisplay = TimeDisplay:GetText()
-
+       TimeDisplay = TimeDisplay:GetText()
+       
        local pos = string.find(TimeDisplay, ':')
+       if not pos then return 0 end
+       
        return string.sub(TimeDisplay, 1, pos-1) 
 end
 
 local function TotalTimeSeconds( TimeDisplay )
-        TimeDisplay = TimeDisplay:GetText()
-
+       TimeDisplay = TimeDisplay:GetText()
+       
        local pos = string.find(TimeDisplay, ':')
+       if not pos then return 0 end
+       
        return string.sub(TimeDisplay, pos+1)
 end
 

diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index 6eaaf6c..6060d63 100644 (file)
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -1448,12 +1448,12 @@ PerDifficultyAwardP2X=SCREEN_CENTER_X+290+EvalX()-2-261+257
 PerDifficultyAwardP2Y=SCREEN_CENTER_Y+65-149
 PerDifficultyAwardP2OnCommand=@"DrawOrder,1;horizalign,right;zoom,.55;addx,"..ScreenEvaluationDoubleShift(PLAYER_2)..";"
 PerDifficultyAwardP2OffCommand=accelerate,.3;addx,EvalTweenDistance()
-PeakComboAwardP1X=SCREEN_CENTER_X-290+EvalX()
-PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-40
+PeakComboAwardP1X=SCREEN_CENTER_X-290+EvalX()+2
+PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-38
 PeakComboAwardP1OnCommand=DrawOrder,1;zoom,.5;addx,-EvalTweenDistance();addx,EvalTweenDistance()
 PeakComboAwardP1OffCommand=accelerate,.3;addx,-EvalTweenDistance()
-PeakComboAwardP2X=SCREEN_CENTER_X+20+EvalX()
-PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131-40
+PeakComboAwardP2X=SCREEN_CENTER_X+20+EvalX()+2
+PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131-38
 PeakComboAwardP2OnCommand=DrawOrder,1;zoom,.5;addx,EvalTweenDistance();addx,-EvalTweenDistance()
 PeakComboAwardP2OffCommand=accelerate,.3;addx,EvalTweenDistance()
 MachineRecordP1X=SCREEN_CENTER_X-108+EvalX()-48+132-2