From: Jayce Newton <accounts@divinelegy.com>
Date: Mon, 9 Dec 2013 12:53:07 +0000 (+0800)
Subject: Daddy don't beat me my ass is bleeding
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=466b6308f6e856848f7a8bb13a08de0107fe95d2;p=GrooveNights.git

Daddy don't beat me my ass is bleeding
---

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 6bd1918..233ed36 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml	
@@ -12,8 +12,6 @@ end">
 		Condition="GAMESTATE:IsEventMode() and MenuButtonGiveUp() and not GAMESTATE:IsCourseMode()"
 		InitCommand="%function(self)
 		if gnStaminaSongPercent > gnLowestRestartPercent and gnStaminaSongPercent < gnHighestRestartPercent then
-			local Path = THEME:GetPath( EC_SOUNDS, '', '_save');
-			SOUND:PlayOnce(Path);
 			SCREENMAN:SetNewScreen('ScreenStage');
 			end
 		end"
diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
index 73bc581..1e1b82d 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml	
@@ -2964,6 +2964,11 @@ StepP2MessageCommand="%function(self)
 
 <!--Screen Transition-->
 	<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;'"
+	/>
+	
+	<Layer Type="Quad"
 	Condition="not GAMESTATE:IsCourseMode();"
 	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;"
@@ -2989,6 +2994,9 @@ StepP2MessageCommand="%function(self)
 	OnCommand="diffusealpha,0;"
 	ScreenTransitionMessageCommand="%function(self) 
 	if gnStaminaSongPercent > gnLowestRestartPercent and gnStaminaSongPercent < gnHighestRestartPercent then
+		local Path = THEME:GetPath( EC_SOUNDS, '', '_save');
+		SOUND:PlayOnce(Path);
+		MESSAGEMAN:Broadcast('QuadFlicker');
 		self:queuecommand('Blink');
 		end
 	end" 
diff --git a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
index 03f9252..9172dc4 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml	
@@ -11,7 +11,7 @@
 					InitCommand="hibernate,0.199;"><children>
 			<Actor
 				File="@'../../Graphics/ScreenGameplay stage '..GetStageText()"
-				OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT;decelerate,0.3;y,SCREEN_CENTER_Y-40;accelerate,0.1;y,SCREEN_CENTER_Y;"
+				OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+SCREEN_HEIGHT;decelerate,0.3;y,SCREEN_CENTER_Y-80;accelerate,0.1;y,SCREEN_CENTER_Y-20;"
 			/>
 		</children></ActorFrame>
 		<ActorFrame Condition="GAMESTATE:IsCourseMode()" 
diff --git a/Themes/GrooveNights/Graphics/PlayerReady.png b/Themes/GrooveNights/Graphics/PlayerReady.png
index a215f54..41678db 100644
Binary files a/Themes/GrooveNights/Graphics/PlayerReady.png and b/Themes/GrooveNights/Graphics/PlayerReady.png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml
index ae2029b..e0a602b 100644
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml	
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml	
@@ -60,9 +60,6 @@ gnRollsTotal = tonumber(gnRollsTotal);
 gnPath = getSystemSound('gnJudgeBar', '0');
 SOUND:PlayOnce(gnPath);
 end"> <children>
-<!--Rate Message-->
-	<Layer Type="Quad" InitCommand="%function(self) if GetRateMod() ~= '1.0x' then GAMESTATE:ApplyGameCommand('mod, 1.0xmusic',1); SCREENMAN:SystemMessage('Rate Modifier has been restored to 1.0x') end end" />
-
 	<Layer File="base frame B" InitCommand="@'diffuse,'..BackgroundColor()..';'"/>
 	<Layer File="base frame F" InitCommand="@'diffuse,'..FrameColor()..';'"/>
 	<!-- +7s are for 4:3, will need to make them +6s if using widescreen -->
diff --git a/Themes/GrooveNights/Scripts/Colors.lua b/Themes/GrooveNights/Scripts/Colors.lua
index 6b3e778..3d1638b 100644
--- a/Themes/GrooveNights/Scripts/Colors.lua
+++ b/Themes/GrooveNights/Scripts/Colors.lua
@@ -8,7 +8,7 @@ end
 -- Alternate (darker) player colours for diffuseshifting
 function PlayerAltColor( pn )
 	if pn == PLAYER_1 then return "#7F5400" end	-- default "#7F5400"
-	if pn == PLAYER_2 then return "#2A7F1F" end	-- default "#2A7F1F"
+	if pn == PLAYER_2 then return "#226919" end	-- default "#226919"
 	return "1,1,1,1"
 end
 
diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 76bc97a..4a57a4e 100644
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -18,6 +18,7 @@
 -- SHIFT SCREEN EVALUATION ELEMENTS IN DOUBLE MODE
 -- SET SCREEN SPECIFIC VARIABLES
 -- DIFFERENTIATE PLAYERS USING SHARED RESOURCES
+-- 'RATE MOD HAS BEEN RESTORED' MESSAGE
 
 
 
@@ -155,6 +156,7 @@ if scn == 'ScreenSelectMusic' then
 	gnStatFrequency = gnStatFrequency + 1;
 	gnOptionMod = 0;
 	gnOptionModType = 0;
+	RateRestoreMessage(false)
 end
 
 
@@ -179,6 +181,7 @@ if scn == 'ScreenPlayerOptions' then
 		end
 	if gnScreenSelectMusicTimer == nil then gnScreenSelectMusicTimer = gnDefaultSSM; end
 	if gnScreenPlayerOptionsTimer == nil then gnScreenPlayerOptionsTimer = gnDefaultSPO; end
+	RateRestoreMessage(true);
 end
 
 
@@ -217,7 +220,6 @@ if scn == 'ScreenGameplay' then
 	gnP1Winning = false;
 	gnP2Winning = false;
 	gnLowHealth = false;
-	gnRateRestore = 0;
 	gnLowHealth = false;
 	gnVoiceTimer = 0;
 	gnStaminaTimer = 0;
@@ -250,6 +252,7 @@ end
 
 if scn == 'ScreenEvaluation' then
 gnSongCount = gnSongCount + 1;
+RateRestoreMessage(false);
 end
 
 
@@ -309,3 +312,15 @@ end
 
 
 
+
+
+-- ==='RATE MOD HAS BEEN RESTORED' MESSAGE===
+-- Call with false to display message, call with true to display the message AND reset the mod
+function RateRestoreMessage(i)
+	if GetRateMod() ~= '1.0x' then 
+		if i then
+		GAMESTATE:ApplyGameCommand('mod, 1.0xmusic',1);
+		end 
+	SCREENMAN:SystemMessage('Rate Modifier has been restored to 1.0x')
+	end
+end
diff --git a/Themes/GrooveNights/Sounds/Common screenshot.ogg b/Themes/GrooveNights/Sounds/Common screenshot.ogg
index 7ac79b2..4ac1319 100644
Binary files a/Themes/GrooveNights/Sounds/Common screenshot.ogg and b/Themes/GrooveNights/Sounds/Common screenshot.ogg differ
diff --git a/Themes/GrooveNights/Sounds/MusicWheel locked.ogg b/Themes/GrooveNights/Sounds/MusicWheel locked.ogg
index e92debf..db41b0d 100644
Binary files a/Themes/GrooveNights/Sounds/MusicWheel locked.ogg and b/Themes/GrooveNights/Sounds/MusicWheel locked.ogg differ
diff --git a/Themes/GrooveNights/Sounds/PlayerBothReady sound.ogg b/Themes/GrooveNights/Sounds/PlayerBothReady sound.ogg
index 63c6ac8..a3231e1 100644
Binary files a/Themes/GrooveNights/Sounds/PlayerBothReady sound.ogg and b/Themes/GrooveNights/Sounds/PlayerBothReady sound.ogg differ
diff --git a/Themes/GrooveNights/Sounds/PlayerNotReady sound.ogg b/Themes/GrooveNights/Sounds/PlayerNotReady sound.ogg
index 2eba065..f834069 100644
Binary files a/Themes/GrooveNights/Sounds/PlayerNotReady sound.ogg and b/Themes/GrooveNights/Sounds/PlayerNotReady sound.ogg differ
diff --git a/Themes/GrooveNights/Sounds/PlayerReady sound.ogg b/Themes/GrooveNights/Sounds/PlayerReady sound.ogg
index ed59724..f950518 100644
Binary files a/Themes/GrooveNights/Sounds/PlayerReady sound.ogg and b/Themes/GrooveNights/Sounds/PlayerReady sound.ogg differ
diff --git a/Themes/GrooveNights/Sounds/ScreenNameEntryTraditional music (loop).ogg b/Themes/GrooveNights/Sounds/ScreenNameEntryTraditional music (loop).ogg
index 4f795a5..a97efe7 100644
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/ScreenSelectMaster change.ogg b/Themes/GrooveNights/Sounds/ScreenSelectMaster change.ogg
index 9dbaf17..def69ad 100644
Binary files a/Themes/GrooveNights/Sounds/ScreenSelectMaster change.ogg and b/Themes/GrooveNights/Sounds/ScreenSelectMaster change.ogg differ
diff --git a/Themes/GrooveNights/Sounds/ScreenTextEntry backspace.ogg b/Themes/GrooveNights/Sounds/ScreenTextEntry backspace.ogg
index 05ff130..5da54c9 100644
Binary files a/Themes/GrooveNights/Sounds/ScreenTextEntry backspace.ogg and b/Themes/GrooveNights/Sounds/ScreenTextEntry backspace.ogg differ
diff --git a/Themes/GrooveNights/Sounds/ScreenTextEntry type.ogg b/Themes/GrooveNights/Sounds/ScreenTextEntry type.ogg
index 0a65e08..43edbcb 100644
Binary files a/Themes/GrooveNights/Sounds/ScreenTextEntry type.ogg and b/Themes/GrooveNights/Sounds/ScreenTextEntry type.ogg differ
diff --git a/Themes/GrooveNights/Sounds/_change value.ogg b/Themes/GrooveNights/Sounds/_change value.ogg
index 8f435e2..4492dd4 100644
Binary files a/Themes/GrooveNights/Sounds/_change value.ogg and b/Themes/GrooveNights/Sounds/_change value.ogg differ
diff --git a/Themes/GrooveNights/Sounds/_easier.ogg b/Themes/GrooveNights/Sounds/_easier.ogg
index df34968..f911ec2 100644
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 66f35b9..67bf5f1 100644
Binary files a/Themes/GrooveNights/Sounds/_harder.ogg and b/Themes/GrooveNights/Sounds/_harder.ogg differ
diff --git a/Themes/GrooveNights/Sounds/_next row.ogg b/Themes/GrooveNights/Sounds/_next row.ogg
index b4e2435..31c54a4 100644
Binary files a/Themes/GrooveNights/Sounds/_next row.ogg and b/Themes/GrooveNights/Sounds/_next row.ogg differ
diff --git a/Themes/GrooveNights/Sounds/_prev row.ogg b/Themes/GrooveNights/Sounds/_prev row.ogg
index 3ebce8b..41a4ae3 100644
Binary files a/Themes/GrooveNights/Sounds/_prev row.ogg and b/Themes/GrooveNights/Sounds/_prev row.ogg differ
diff --git a/Themes/GrooveNights/Sounds/_save.ogg b/Themes/GrooveNights/Sounds/_save.ogg
index 2f7cd29..f116d03 100644
Binary files a/Themes/GrooveNights/Sounds/_save.ogg and b/Themes/GrooveNights/Sounds/_save.ogg differ
diff --git a/Themes/GrooveNights/Sounds/gnSystemMessage sound.ogg b/Themes/GrooveNights/Sounds/gnSystemMessage sound.ogg
new file mode 100644
index 0000000..9ee5606
Binary files /dev/null and b/Themes/GrooveNights/Sounds/gnSystemMessage sound.ogg differ
diff --git a/Themes/GrooveNights/metrics.ini b/Themes/GrooveNights/metrics.ini
index 3815c58..22b11ee 100644
--- a/Themes/GrooveNights/metrics.ini
+++ b/Themes/GrooveNights/metrics.ini
@@ -1443,11 +1443,11 @@ 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-44
+PeakComboAwardP1Y=SCREEN_CENTER_Y+65+131-40
 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-44
+PeakComboAwardP2Y=SCREEN_CENTER_Y+65+131-40
 PeakComboAwardP2OnCommand=DrawOrder,1;zoom,.5;addx,EvalTweenDistance();addx,-EvalTweenDistance()
 PeakComboAwardP2OffCommand=accelerate,.3;addx,EvalTweenDistance()
 MachineRecordP1X=SCREEN_CENTER_X-108+EvalX()-48+132-2
@@ -2613,7 +2613,7 @@ CreditsP2Y=SCREEN_BOTTOM-2
 CreditsP2OnCommand=shadowlength,0;horizalign,right;vertalign,bottom;zoom,0.5
 MessageX=0
 MessageY=0
-MessageOnCommand=diffusealpha,0;zoom,0.6;stoptweening;horizalign,left;linear,0.2;diffusealpha,1;x,SCREEN_LEFT+20;y,SCREEN_TOP+13;zoom,0.6;shadowlength,0;addy,-40;diffusealpha,1;linear,0.5;diffusealpha,1;addy,40;
+MessageOnCommand=%function(self) if SOUND ~= nil then local Path = THEME:GetPath( EC_SOUNDS, 'gnSystemMessage', 'sound' ); SOUND:PlayOnce(Path); end self:diffusealpha(0);self:zoom(0.6);self:stoptweening();self:horizalign('left');self:linear(0.2);self:diffusealpha(1);self:x(SCREEN_LEFT+20);self:y(SCREEN_TOP+13);self:zoom(0.6);self:shadowlength(0);self:addy(-40);self:diffusealpha(1);self:linear(0.5);self:diffusealpha(1);self:addy(40); end
 MessageOffCommand=sleep,5;diffusealpha,1;linear,0.5;diffusealpha,1;addy,-40;
 MessageFrameX=0
 MessageFrameY=0