From: Jayce Newton <accounts@divinelegy.com>
Date: Mon, 30 Dec 2013 14:36:51 +0000 (+0800)
Subject: Look at this fuck, you wouldn't eat shit off this cunt
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=882f4ea123243d29c497c1865ffd7271b8382e84;p=GrooveNights.git

Look at this fuck, you wouldn't eat shit off this cunt
---

diff --git a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml
index 5cb9af5..3bf1cdb 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenEvaluation overlay.xml	
@@ -8,13 +8,40 @@ end">
 OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation'); end"
 />
 
+	<!--Scrape the Player's Score and show something cool-->
+		<BitmapText
+		Text="hello"
+		File="_eurostile blue glow"
+		InitCommand="%function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:hibernate(0.1);
+		self:queuecommand('Go');
+		end"
+		GoCommand="%function(self)
+		self:diffusealpha(0);
+			if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
+			gnScoreP1 = SCREENMAN:GetTopScreen():GetChild('PercentP1'):GetChild('PercentP1'):GetText();
+			gnScoreP1 = string.gsub(gnScoreP1,'%%','');
+			gnScoreP1 = tonumber(gnScoreP1);
+			end
+
+			if GAMESTATE:IsPlayerEnabled(PLAYER_2) then
+			gnScoreP2 = SCREENMAN:GetTopScreen():GetChild('PercentP2'):GetChild('PercentP21'):GetText();
+			gnScoreP2 = string.gsub(gnScoreP1,'%%','');
+			gnScoreP2 = tonumber(gnScoreP2);
+			end
+		self:settext(gnScoreP1);
+		end"
+		/>
+		
 	<!--Restart the song on event mode if you pressed the menu button-->
 		<BitmapText
 		Text=""
 		File="_eurostile blue glow"
 		Condition="GAMESTATE:IsEventMode() and MenuButtonGiveUp() and not gnNoRestart and not GAMESTATE:IsCourseMode()"
 		InitCommand="%function(self)
-		if gnStaminaSongPercent > gnLowestRestartPercent and gnStaminaSongPercent < gnHighestRestartPercent then
+		if gnSongElapsedPercent > gnLowestRestartPercent and gnSongElapsedPercent < gnHighestRestartPercent then
 			SCREENMAN:SetNewScreen('ScreenStage');
 			end
 		end"
@@ -200,7 +227,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenEvaluation');
 			InitCommand="%function(self)
 			self:settext(GAMESTATE:GetCurrentSong():GetDisplayMainTitle());
 			self:x(SCREEN_CENTER_X);
-			self:y(SCREEN_CENTER_Y-173);
+			self:y(SCREEN_CENTER_Y-172);
 			end"
 		/>	
 		<!-- <BitmapText
diff --git a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml
index 0173c1e..43acb9b 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenGameplay overlay/default.xml	
@@ -209,7 +209,9 @@ P2BehindMessageCommand="linear,0.2;diffusealpha,0;"
 			<Tip
 				File="tip"
 				OnCommand="@'diffuse,'..SongMeterColor()..';'"
-				TipXMessageCommand="%function(self) gnStaminaTimer = self:GetX(); gnStaminaSongPercent = math.floor((1-((195-gnStaminaTimer)/389))*100) end"
+				TipXMessageCommand="%function(self) gnSongElapsedPercent = self:GetX(); gnSongElapsedPercent = math.floor((1-((195-gnSongElapsedPercent)/389))*100)
+				gnSongTimeline[gnSongElapsedPercent+1] = 1;
+				end"
 			/>
 		</Layer>
 
@@ -2973,7 +2975,7 @@ StepP2MessageCommand="%function(self)
 	self:queuecommand('PlaySound');
 	end"
 	PlaySoundCommand="%function(self)
-	if gnStaminaSongPercent > gnLowestRestartPercent and gnStaminaSongPercent < gnHighestRestartPercent then
+	if gnSongElapsedPercent > gnLowestRestartPercent and gnSongElapsedPercent < gnHighestRestartPercent then
 		local Path = THEME:GetPath( EC_SOUNDS, '', '_save');
 		SOUND:PlayOnce(Path);
 		MESSAGEMAN:Broadcast('QuadFlicker');
diff --git a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml
index fa501df..ab3f342 100644
--- a/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml	
+++ b/Themes/GrooveNights/BGAnimations/ScreenStage overlay/default.xml	
@@ -56,7 +56,7 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenStage'); end"
 	Condition="GAMESTATE:IsEventMode() and MenuButtonGiveUp() and not GAMESTATE:IsCourseMode()"
 	OnCommand="%function(self) 
 	self:diffusealpha(0);
-	if gnStaminaSongPercent > gnLowestRestartPercent and gnStaminaSongPercent < gnHighestRestartPercent then
+	if gnSongElapsedPercent > gnLowestRestartPercent and gnSongElapsedPercent < gnHighestRestartPercent then
 		self:queuecommand('Blink');
 		end
 	end" 
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p1 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p1 (res 270x40).png
index 3dbc991..a0753fb 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p1 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p1 (res 270x40).png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p2 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p2 (res 270x40).png
index c927e54..0014921 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p2 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FEC p2 (res 270x40).png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p1 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p1 (res 270x40).png
index 020f0f0..ae4c8bc 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p1 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p1 (res 270x40).png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p2 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p2 (res 270x40).png
index 33f656f..4ddc870 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p2 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FFC p2 (res 270x40).png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p1 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p1 (res 270x40).png
index f5f7616..637eda7 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p1 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p1 (res 270x40).png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p2 (res 270x40).png b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p2 (res 270x40).png
index f65e097..067a3fb 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p2 (res 270x40).png and b/Themes/GrooveNights/Graphics/ScreenEvaluation LifeGraph FGC p2 (res 270x40).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 e0a602b..671fbcb 100644
--- a/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml	
+++ b/Themes/GrooveNights/Graphics/ScreenEvaluation grade frame p1/default.xml	
@@ -203,6 +203,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(tonumber(SCREENMAN:GetTopScreen():GetChild('MarvelousNumberP'..gnPlayerCount):GetText())) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -219,6 +220,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(tonumber(SCREENMAN:GetTopScreen():GetChild('PerfectNumberP'..gnPlayerCount):GetText())) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -235,6 +237,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(tonumber(SCREENMAN:GetTopScreen():GetChild('GreatNumberP'..gnPlayerCount):GetText())) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -251,6 +254,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(tonumber(SCREENMAN:GetTopScreen():GetChild('GoodNumberP'..gnPlayerCount):GetText())) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -267,6 +271,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(tonumber(SCREENMAN:GetTopScreen():GetChild('BooNumberP'..gnPlayerCount):GetText())) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -283,6 +288,7 @@ end"> <children>
 		self:sleep(0.6/2);
 		gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP'..gnPlayerCount):GetText()) / gnJudgeTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(tonumber(SCREENMAN:GetTopScreen():GetChild('MissNumberP'..gnPlayerCount):GetText())) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -301,6 +307,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(gnJumpsNumber / gnJumpsTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(gnJumpsNumber / gnJumpsTotal) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -317,6 +324,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(gnHoldsNumber / gnHoldsTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(gnHoldsNumber / gnHoldsTotal) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -333,6 +341,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(gnMinesNumber / gnMinesTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(gnMinesNumber / gnMinesTotal) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -349,6 +358,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(gnHandsNumber / gnHandsTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(gnHandsNumber / gnHandsTotal) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
@@ -365,6 +375,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(gnRollsNumber / gnRollsTotal * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; end
+		if math.floor(gnRollsNumber / gnRollsTotal) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		end"
 		self:queuecommand('SFX');
@@ -381,6 +392,7 @@ end"> <children>
 		self:accelerate(0.5);
 		gnJudgeText = math.ceil(tonumber(SCREENMAN:GetTopScreen():GetChild('MaxComboNumberP'..gnPlayerCount):GetText()) / 10000 * 121);
 		if gnJudgeText >= 121 then gnJudgeText = 121; self:rainbow(); end
+		if math.floor(tonumber(SCREENMAN:GetTopScreen():GetChild('MaxComboNumberP'..gnPlayerCount):GetText())) == 0 then gnJudgeText = 0 end
 		self:zoomx(gnJudgeText);
 		self:queuecommand('SFX');
 		end"
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluationRave LifeGraph p1.png b/Themes/GrooveNights/Graphics/ScreenEvaluationRave LifeGraph p1.png
index b468685..3f78ced 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluationRave LifeGraph p1.png and b/Themes/GrooveNights/Graphics/ScreenEvaluationRave LifeGraph p1.png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p1 max (res 271x18).png b/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p1 max (res 271x18).png
index 42ba89f..70f9d7c 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p1 max (res 271x18).png and b/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p1 max (res 271x18).png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p1 normal (res 271x18).png b/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p1 normal (res 271x18).png
index 661fc91..b50e72a 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p1 normal (res 271x18).png and b/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p1 normal (res 271x18).png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p2 normal (res 271x18).png b/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p2 normal (res 271x18).png
index b20ddc6..3f0f776 100644
Binary files a/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p2 normal (res 271x18).png and b/Themes/GrooveNights/Graphics/ScreenEvaluationStage ComboGraph p2 normal (res 271x18).png differ
diff --git a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml
index bd75028..a6121ee 100644
--- a/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml	
+++ b/Themes/GrooveNights/Graphics/ScreenSelectMusic banner frame/default.xml	
@@ -11,8 +11,9 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 		<ActorFrame InitCommand="x,-35;y,0;">
 			<children>
 			
-				
-			
+		<!-- Remove the Addx to test the star count thing -->		
+		<ActorFrame InitCommand="addx,2000;">
+		<children>
 			<BitmapText
 				Text="TEST"
 				File="_eurostile normal"
@@ -162,6 +163,8 @@ OnCommand="%function(self) self:diffusealpha(0); InitScreen('ScreenSelectMusic')
 				self:settext(txt);
 				end"
 			/>
+		</children>
+		</ActorFrame>
 			
 			
 			
diff --git a/Themes/GrooveNights/Scripts/GrooveNights.lua b/Themes/GrooveNights/Scripts/GrooveNights.lua
index 5493e87..cd22069 100644
--- a/Themes/GrooveNights/Scripts/GrooveNights.lua
+++ b/Themes/GrooveNights/Scripts/GrooveNights.lua
@@ -117,7 +117,7 @@ function MenuButtonGiveUp()
 gnLowestRestartPercent = 0.05;
 gnHighestRestartPercent = 99.8;
 
-if gnStaminaSongPercent == nil then gnStaminaSongPercent = 0; end
+if gnSongElapsedPercent == nil then gnSongElapsedPercent = 0; end
 
 -- Set to true to enable this feature
 return true
diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 129d519..705d756 100644
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -162,7 +162,7 @@ end
 
 if scn == 'ScreenSelectMusic' then
 ScreenTransitionWhoosh('short');
-RateRestoreMessage(false);
+RateRestoreMessage(true);
 	if curRate == nil then curRate = 1 end
 	gnBlazedP1 = 0;
 	gnBlazedP2 = 0;
@@ -175,7 +175,7 @@ RateRestoreMessage(false);
 	gnStatFrequency = gnStatFrequency + 1;
 	gnOptionMod = 0;
 	gnOptionModType = 0;
-	gnStaminaSongPercent = 0;
+	gnSongElapsedPercent = 0;
 	gnNoRestart = false;
 end
 
@@ -246,12 +246,11 @@ if scn == 'ScreenGameplay' then
 	gnLowHealth = false;
 	gnLowHealth = false;
 	gnVoiceTimer = 0;
-	gnStaminaTimer = 0;
 	gnRandomVoice = math.random(1,5); 
 	gnRandomMark1 = math.random(5,92);
 	gnRandomMark2 = math.random(5,92);
 	gnRandomMark3 = math.random(5,92);
-	gnStaminaSongPercent = 0;
+	gnSongElapsedPercent = 0;
 	gnStamina25Window = 0;
 	gnStamina50Window = 0;
 	gnStamina75Window = 0;
@@ -271,6 +270,22 @@ if scn == 'ScreenGameplay' then
 	gnSameGrade = 0;
 	gnSoundCheck = true;
 	gnAward = 0;
+	gnOptionCheck = false;
+	
+	-- Each 0 represents 1% of the song (0% inclusive), there are 202 in total, 101 per player.
+	gnSongTimeline = { 
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	}
 end
 
 
@@ -285,7 +300,9 @@ end
 if scn == 'ScreenEvaluation' then
 ScreenTransitionWhoosh('short');
 gnSongCount = gnSongCount + 1;
-RateRestoreMessage(false);
+if not (GAMESTATE:IsEventMode() and MenuButtonGiveUp() and not gnNoRestart and not GAMESTATE:IsCourseMode()) then
+	RateRestoreMessage(false);
+	end
 end
 
 
@@ -351,11 +368,17 @@ 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 GetRateMod() ~= '1.0x' then
 		if i then
 		GAMESTATE:ApplyGameCommand('mod, 1.0xmusic',1);
+		gnOptionCheck = true;
 		end 
-	SCREENMAN:SystemMessage('Rate Modifier has been restored to 1.0x')
+	SCREENMAN:SystemMessage('Rate Modifier has been restored to 1.0x');
+	else
+	if gnOptionCheck then
+		gnOptionCheck = false;
+		SCREENMAN:SystemMessage('Rate Modifier has been restored to 1.0x');
+		end
 	end
 end