From: Jayce Newton <accounts@divinelegy.com>
Date: Sun, 5 Jan 2014 17:44:04 +0000 (+0800)
Subject: Popped a red molly off the bar of soap yo this shit is FUCKED but it's cool I fixed it
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=136e37a56491289997cff33d30fcec2a157d2c33;p=GrooveNights.git

Popped a red molly off the bar of soap yo this shit is FUCKED but it's cool I fixed it
---

diff --git a/Themes/GrooveNights/BGAnimations/Screen cancel/default.xml b/Themes/GrooveNights/BGAnimations/Screen cancel/default.xml
index c82845d..e2b9076 100644
--- a/Themes/GrooveNights/BGAnimations/Screen cancel/default.xml	
+++ b/Themes/GrooveNights/BGAnimations/Screen cancel/default.xml	
@@ -15,4 +15,11 @@
 	<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="../_saving"
+InitCommand="@'diffuse,'..LabelColor()..';'"
+OnCommand="%function(self) self:x(SCREEN_CENTER_X); self:y(SCREEN_CENTER_Y+65); self:diffusealpha(0); end"
+StartTransitioningCommand="%function(self) if gnScreenSelectMusic then self:linear(0.3); self:diffusealpha(1); else self:diffusealpha(0); end end"
+Condition="IsAnyPlayerUsingMemoryCard() and GAMESTATE:IsEventMode()"
+	/>
 </children> </ActorFrame>
\ No newline at end of file
diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 15c860f..297847a 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml	
@@ -30,7 +30,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
 		
 <!--Show a special THING if either player quads a song with a certain name as their card profile-->
 <Layer Type="Quad"
-	InitCommand="zoom,SCREEN_WIDTH;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,0,0,0,1;sleep,0.01;queuecommand,Go;"
+	OnCommand="zoom,SCREEN_WIDTH;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,0,0,0,1;sleep,0.01;queuecommand,Go;"
 	GoCommand="%function(self)
 	if gnDimBGMSeconds == nil then gnDimBGMSeconds = 0.1 end
 	SOUND:DimMusic( 0, gnDimBGMSeconds )
@@ -43,7 +43,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
 />
 
 <Layer File="@'../Sounds/gnCustomAward Graphics/'..getQuadAward()"
-	InitCommand="%function(self)
+	OnCommand="%function(self)
 	self:x(SCREEN_CENTER_X);
 	self:y(SCREEN_CENTER_Y);
 	self:draworder(0);
@@ -51,6 +51,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
 	self:queuecommand('Go');
 	end"
 	GoCommand="%function(self)
+	if gnSound then	SOUND:PlayOnce(gnSound); end
 	self:diffusealpha(gnDisplayedFileOpacity);
 	self:sleep(gnOnScreenSeconds);
 	self:linear(0.3);
diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay underlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay underlay/default.xml
index e88344a..77ef3ce 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay underlay/default.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay underlay/default.xml	
@@ -3,19 +3,6 @@ if GAMESTATE:GetEnv('Vibrate') == 'On' then
 	self:vibrate();
 	end
 end"> <children>
-
-<!--Common Fallback Background-->
-	<Layer File="../ScreenLogo background/BGVid.avi"
-	InitCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;hidden,1"
-	NoBackgroundMessageCommand="@'hidden,0;diffuse,'..FrameColor()..';diffusealpha,1;'"
-	/>
-	
-	<Layer File="../ScreenLogo background/TitleScreen0002.png"
-	InitCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+16;diffuse,0.15,0.15,0.15,0.5;zoom,0.8;hidden,1"
-	NoBackgroundMessageCommand="hidden,0;vibrate;EffectMagnitude,0.5,0.5,0.1;"
-	/>
-
-
 	
 
 <!--Background Easter Eggs-->
diff --git a/Themes/GrooveNights/Graphics/Common fallback background.png b/Themes/GrooveNights/Graphics/Common fallback background.png
new file mode 100644
index 0000000..4da805a
Binary files /dev/null and b/Themes/GrooveNights/Graphics/Common fallback background.png differ
diff --git a/Themes/GrooveNights/Graphics/Common fallback background.xml b/Themes/GrooveNights/Graphics/Common fallback background.xml
deleted file mode 100644
index d13286b..0000000
--- a/Themes/GrooveNights/Graphics/Common fallback background.xml	
+++ /dev/null
@@ -1 +0,0 @@
-<layer File="_blank" InitCommand="%function(self) MESSAGEMAN:Broadcast('NoBackground'); end" />
\ No newline at end of file
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
index d35197b..e71b8e7 100644
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml	
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml	
@@ -1,12 +1,12 @@
 <ActorFrame InitCommand="%function(self)
 self:hibernate(0.01);
-gnDummy = SameThingDifferentPlayer();
 self:queuecommand('Delay');
 end"
 
 DelayCommand="%function(self) self:hibernate(gnOnScreenSeconds); self:queuecommand('Calculate'); end"
 
 CalculateCommand="%function(self)
+gnDummy = SameThingDifferentPlayer();
 gnJudgeTotal = tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP'..gnPlayerCount):GetText()) + tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP'..gnPlayerCount):GetText());
 
 gnJumpsNumber = SCREENMAN:GetTopScreen():GetChild('JumpsTextP'..gnPlayerCount):GetText();
diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index b510f1a..7058070 100644
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -94,6 +94,8 @@ gnStats4StarCount = nil
 gnStatsLevel = nil
 
 gnPlayerNames = {'',''}
+
+gnScreenSelectMusic = false;
 end
 
 
@@ -126,6 +128,7 @@ if GAMESTATE:GetEnv('Konami') == 'Turn' then
 	SCREENMAN:SystemMessage('Konami Code Activated');
 	GAMESTATE:SetEnv('Konami','On');
 	end	
+	gnScreenSelectMusic = false;
 end
 
 
@@ -190,6 +193,7 @@ RateRestoreMessage(true);
 	gnOptionModType = 0;
 	gnSongElapsedPercent = 0;
 	gnNoRestart = false;
+	gnScreenSelectMusic = true;
 end
 
 
@@ -216,11 +220,13 @@ ScreenTransitionWhoosh('short');
 	if gnScreenSelectMusicTimer == nil then gnScreenSelectMusicTimer = gnDefaultSSM; end
 	if gnScreenPlayerOptionsTimer == nil then gnScreenPlayerOptionsTimer = gnDefaultSPO; end
 	RateRestoreMessage(true);
+	gnScreenSelectMusic = false;
 end
 
 
 if scn == 'ScreenStage' then
 ScreenTransitionWhoosh('short');
+gnScreenSelectMusic = false;
 end
 
 
@@ -305,6 +311,7 @@ if scn == 'ScreenGameplay' then
 	gnDisplayedFileOpacity = 0
 	gnBackgroundDarkness = 0
 	gnAwardWidthP2 = 0;
+	gnSound = nil
 end
 
 
@@ -757,18 +764,18 @@ function getQuadAwardFile( name )
 if name == '(-[Jayce]-)' then
 local i = math.random(1,2)
 	if i == 1 then
-	getQuadAwardEffects(18,18,100,90); local path = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'JonTron'); SOUND:PlayOnce(path); return 'JonTron.avi'
+	getQuadAwardEffects(17.6,17.6,100,90); gnSound = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'JonTron'); return 'JonTron.avi'
 	else 
-	getQuadAwardEffects(10,10,100,90); local path = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'YES'); SOUND:PlayOnce(path); return 'YES.avi'
+	getQuadAwardEffects(10,10,100,90); gnSound = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'YES'); return 'YES.avi'
 	end 
 end
 
 if name == 'Cameron' then
 local i = math.random(1,2)
 	if i == 1 then
-	getQuadAwardEffects(23,23,100,90); local path = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'LOTR'); SOUND:PlayOnce(path); return 'LOTR.avi'
+	getQuadAwardEffects(22.7,22.7,100,90); gnSound = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'LOTR'); return 'LOTR.avi'
 	else 
-	getQuadAwardEffects(10,10,100,90); local path = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'YES'); SOUND:PlayOnce(path); return 'YES.avi'
+	getQuadAwardEffects(10,10,100,90); gnSound = THEME:GetPath(EC_SOUNDS, 'gnCustomAward', 'YES'); return 'YES.avi'
 	end 
 end
 
diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index 63f98f1..e5be5ea 100644
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -2538,7 +2538,7 @@ SongNumberP2OnCommand=hidden,1
 CourseSongNumberX=SCREEN_CENTER_X
 CourseSongNumberY=SCREEN_CENTER_Y
 CourseSongNumberOnCommand=DrawOrder,100;zoom,1;linear,0.3;zoom,0.25;y,SCREEN_BOTTOM-33
-CourseSongNumberOffCommand=
+CourseSongNumberOffCommand=%function(self) MESSAGEMAN:Broadcast('ScreenTransition'); end
 CourseSongNumberChangeInCommand=
 CourseSongNumberChangeOutCommand=
 SongOptionsX=-100