From 882f4ea123243d29c497c1865ffd7271b8382e84 Mon Sep 17 00:00:00 2001
From: Jayce Newton <accounts@divinelegy.com>
Date: Mon, 30 Dec 2013 22:36:51 +0800
Subject: [PATCH] Look at this fuck, you wouldn't eat shit off this cunt

---
 .../BGAnimations/ScreenEvaluation overlay.xml      |  31 +++++++++++++++--
 .../ScreenGameplay overlay/default.xml             |   6 ++--
 .../BGAnimations/ScreenStage overlay/default.xml   |   2 +-
 ...eenEvaluation LifeGraph FEC p1 (res 270x40).png | Bin 123 -> 122 bytes
 ...eenEvaluation LifeGraph FEC p2 (res 270x40).png | Bin 132 -> 123 bytes
 ...eenEvaluation LifeGraph FFC p1 (res 270x40).png | Bin 122 -> 119 bytes
 ...eenEvaluation LifeGraph FFC p2 (res 270x40).png | Bin 129 -> 122 bytes
 ...eenEvaluation LifeGraph FGC p1 (res 270x40).png | Bin 121 -> 120 bytes
 ...eenEvaluation LifeGraph FGC p2 (res 270x40).png | Bin 131 -> 121 bytes
 .../ScreenEvaluation grade frame p1/default.xml    |  12 +++++++
 .../Graphics/ScreenEvaluationRave LifeGraph p1.png | Bin 290 -> 564 bytes
 ...luationStage ComboGraph p1 max (res 271x18).png | Bin 2808 -> 157 bytes
 ...tionStage ComboGraph p1 normal (res 271x18).png | Bin 2808 -> 146 bytes
 ...tionStage ComboGraph p2 normal (res 271x18).png | Bin 2808 -> 146 bytes
 .../ScreenSelectMusic banner frame/default.xml     |   7 ++--
 Themes/GrooveNights/Scripts/GrooveNights.lua       |   2 +-
 Themes/GrooveNights/Scripts/gnSystem.lua           |  37 +++++++++++++++++----
 17 files changed, 82 insertions(+), 15 deletions(-)

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 3dbc991f6e7adbe9e97ca0d381c373e98a7f6229..a0753fb9f2fbbfd4db6358ef7f3f4794146cc0cb 100644
GIT binary patch
delta 91
zcmb=fnxGQq=;`7Z64Cnhx+5=xf&lYDxr6F$7aK(QBu^)2FPQx0>Z`eYGaRRJ3n(}=
tFfcN)aDW&M`V3PyJTJMo`9xh^6Z_#9HrH(xL0cJsz|+;wWt~$(696IVA+G=c

delta 92
zcmb=bo}d!$<muuV64Cnhx*;!vf(Y})x+XuK#SN^Q4L!*_q+WPiZGCr!Ylho2ZUF^{
u1_nkZ77h@jL7!pjhUZ)6+n%VaYho9bXZ^mVvfGgX2s~Z=T-G@yGywntejr}}

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 c927e5480f8ba511d8b9a36e2630a624e5d65dc2..0014921d6dae4e0aabc495ce4ec9f493f2976ebc 100644
GIT binary patch
delta 93
zcmZo+te&6}?&Rs>7!uL?_PV1Wg8>hd<D_fpTd#R6F`4Kn-_BUpCcZImTaRbDB?Aih
l!6Yzg&GVA|R_E&evoHtUV0CcI;hF<d;_2$=vd$@?2>`IR9oYZ?

delta 102
zcmb<!VVt0n;O*(+7!uL?_PQZ2gMxtbMLEktjf5lS+-x2kTnv)2b-Z7AW2N3+RZQ;M
uEW>~TJc8D3UfVDs#ddjRdil5C<{ubu&E=R{Rkmy;NSUXrpUXO@geCx6*dZtY

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 020f0f08df559041ffe77051f8eb5e3249b09127..ae4c8bc9c4cbff02486e8fbb2cd6e3d56aa8b8a0 100644
GIT binary patch
delta 88
zcmb;_pP&+K=jq}Y64Cnh`bJ&`1qLPqlYjevPqu$4X)%R8<Is^E>gGq!q**c`fdk?V
j6HCs&JY{$G-#-@q*N<59gQLPEK?*!w{an^LB{Ts5zr!FH

delta 91
zcmXS~nxGQq=;`7Z64Cnhx*_iY0|91-`p|#X2CR-3ml(`>=yO25^3$BT`bTZf7BL`!
m25pAPCFftx-a7m5U(Pz)rL2kzzj^HjDe!dlb6Mw<&;$TLZ6X)|

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 33f656f3effc64b40dcaba80ecb4cc8afed3d90e..4ddc870e1bf2432b65b56fdba456a0e93d8eda83 100644
GIT binary patch
delta 92
zcmZo<teT(_=IH6-7!uL?_WDLa1_c2o$A4S@-zhrt*7LMQ^J2!bwhpP?`3FoQ^&A=)
t7@1f&1QfuGeGDN&U*?=!<NWQjuuXLwOIE5mLpK8uc)I$ztaD0e0swp8A$kA+

delta 99
zcmb<wWSpQ9>*49*7!uK%%=7zw;p9XH#>);-cCQ)&*?X)Kt}rg<lPEo~g4s>h09i<c
tFF|CR$PbGJd;u{#zF&8+N;t5XfkE{)Tb0$Ca}yYVz|+;wWt~$(697Y$B%uHR

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 f5f7616507ba7361162c5f908289ba9b6cd5c6c3..637eda7bd497cfbe3243009a403833ed36898d15 100644
GIT binary patch
delta 89
zcmb=dn4l73@9E+g64Cnh`bJ&`1s>)NA|L;s^Z&z=zNPuIgHEc~-r3WStvOf3fCL%@
k8@#H{zdZMHjl97@c7=5;i#Pv}JpoeS>FVdQ&MBb@05uCD1poj5

delta 90
zcmb=ZoS+iw;OXKR64Cnhx*;!vf&lXYrw{uVbF!{rl>C4As)PQ^D<A#xxQw+=Gcq87
jC<eEnYQONZ)Y@iFyW&KaFvS#`<sf-aS3j3^P6<r_Y|k6>

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 f65e0977e0cd0f1616d3939493ac334f74a88858..067a3fb6df577d3a7c4b727ed8bf26d16ea0cd61 100644
GIT binary patch
delta 91
zcmZo>tel_{>fq_(7!uL?_WDL%1_d7GgZ>Hs=M~Q2Iabj1oyqRx)a<);ESFCfF*31m
s2q-u-Fn}2bOaTsG=H&Tpsyo0Uzd@RLUVCJg5Caf+y85}Sb4q9e00DC!KL7v#

delta 101
zcmb<yW}KiB@8#*@7!uL?_PQf4gQ5uY#m1V#)eQL_&di*V?7NLlC1x#nf5H3qk9n>J
zwvl=c4GfG-EF1y~U<O0hes!)4hc9!)j3et0vej9<WBc-KlEiWbAn<hcb6Mw<&;$Sn
CG9t|Y

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 b4686857bd561101ec44861e80548c471c173003..3f78ced25b4d23040c8cc699c4f687bc74c128ef 100644
GIT binary patch
literal 564
zcmeAS@N?(olHy`uVBq!ia0vp^&w$vCgAGXDD0>kKq!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7BevL9RXp+soH$fKn*87T^vIy;@(~k<YiFcadteg-^8YuMfCmS
zWeaw$tA01@DTjau=bR9!L=J%;Ol>a(IapYEj3c@{Sa>e;3vh5rq-_wH$RV*zUO_;_
z;7o$1lAwW)y@P^A!i<AKE=mbA>KYsZ4j42q?Ql6@@Ry-+K|>;&w_s;O;x9%fN5;cE
w)0Bi54}W21X<}-V)Nxe-TEISP0eL}WlX#yw%&O2W6&TYDp00i_>zopr0An$zbpQYW

literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^&w$vCgAGXDD0>kKq+WWuIEGZrd3)KBkwJjrfWw#m
zWx|Xs8;-{|)ta4`OJ~r0UC!{qNR35OxT%NJ@mPyOveN`Z#S=3GQhYdulJElV#QV%)
UYmO{z1A3al)78&qol`;+003xMtN;K2

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 42ba89f1823b4318f8f365fe93065ee425c44bcc..70f9d7cba8c916b393b7d241fa019962365c8e58 100644
GIT binary patch
delta 103
zcmew%I+t;RiZNqxkh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382FBWFymBh
zK53w!(d6A+avB^Gd_5J1xmGabdju=0IPx9HW@k9q#<JqqdpQH3A_h-aKbLh*2~7aO
CyBx>>

delta 2754
zcmV;z3O)6m0r(Y=B!2{FK}|sb0I`mI`%#ks001CkNK#Dz0EZ6%0E`a+0R2(`0D(XN
z0DXA?0O^YW06gUY02$14JcV}v017#2LqkwdXm50Hb7*gHAW1_*AaHVTW@&6?002nG
zotAf0RM!@V&%Jkgq0KM?Qik5UzyQ*FlU_w(m>FOw0}eAZv40_=0ue<-nj%P0#DLLI
zBvwSR5EN9f2P6n6F&ITuEN@2Ei>|D^_ww@l<E(G(v-i3C?7h!g7XXr{FPE1FO97C|
z6YzsPoaqsfQFQD8fB_z0fGGe>Rz|vCuzLs)$;-`!o*{AqUjza0dRV*yaMRE;fKCVh
zpQKsoe1Yhg0DlpivpE?o5f_L!B}<Slw$F-~8ka0)7$s)DC_xd+i8*1B4L<uUvZI*U
zsXVrb#W|<5Q`utf74f!AAxFfBuZRmXxtuH!-x9G#iZGQc;y2>hR1Px(02E1V7jRgK
zA~q2*i60W=BI4x$;7AEyaokrd;A9KLmvTu<&*5_u5`P7B9hNTL)Y_Us_vB=ya0CLw
z046J$$!F7D(o)lzyc_@)@BCRZ;@Z+hMYc4xwzM=fGcx_EQ2%xFZ%W+TMS2<dxn~fq
z|BLOf{L&f#V9beXv-68Bt_pz8Eda>f`(o2L0Dz>ZZyndax(`h}FNp#{x{a}MR#uh~
zm%}m=7k~5*{ZEI#p|8GYBtGts^3Yv5@l0WgfG(~ZD=j5W$fswdGg%zE;h%^29|!(*
z9tJ_2cn+V#6GeoHri{x=5Vf1f<_frJJUW;6pPKj&!~UejxfY4i_z_TJjDXa2DnNei
z2Pg^=Akq89UH_wRzW6X8etF?4lZ$iz?>GHt!GERVC4-yrInE_0gw7K3GZ**7&k~>k
z0Z0NWkO#^@9q0f<U<Ry!EpP;Gz#I635D*Dg0~SaGseli%Kpxlx3PCa03HE?$PzM@8
zGiU|JK_@r`&Vx(f8n^*&gZp3<On_%#7Q6-v5CmZ%GDLyoAr(jy(ud3-24oMpLB3EB
z6n_cDLJ1HL5<+><W~dk{gQ}r=s2TbmItiVJu0Vs(U1$uNhJJ_M!3a!(sjw2P1slT*
z*a`N5L*P|#0=x#!g$v*va3$OTAB8*M^YAtJHarSHgXa){5D^-piWnjc#0Bw3qL6rm
zkE}<EkP4&$X+^q`KIA4cip(HyQ5X~jMSn*bqHIx~s8AFOwFb2wRf4KU9Y%GadQmq~
zW2jlwM>H9&h}K8jpuNx$=mc~Yx)5D~ZbG-CFQRXwC(y4k7z_=gjj_UbVj?j~n6;P^
z%sxyT<{V}aGme?VVzKgAeXJeUAIroFu!Yzv>{0Al>=1SW`vynEso>0T?zku%4}X`B
ztH2$>oxu&^CUFaRDZD1$2Jeq&<8$z(_(ps;{yKgFzd(>CXcO!RA%rBtCPF2lm2i>p
zfbfz?B&rduiGf5eaU-#kc#L?NI7WO+k|F7lTu9L*A!!Hc5a}H0F6kwiOx7YhlB381
z@(yw{`2zV7`Hcic!brkPf-SK@qJKuBLt;qcxg=gvQ_@LtwPdbjh2#mz>yk54cquI@
z7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U?gEALn#wiFzo#H}a
zQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^OEt(fCg@0B`J5C#>
zy<4KR#Ayj<$@V3!ONN%r%Pp02l;g-1$+gMdmU|~pmv@s-mft1cDgRIbrJ$z}sF0<w
zU*V#{%u?!7+oi0fMN5w_y{8B(>L~^(u2np!*snOJq^#tjl&(~zbU|rGnWpThoTOZ?
zd`5X%g`#4w!c{3(Iji!NE`LjRqNmU+>Amz>RYg@#RiSFV>VWEknzmY~TE1GF+Cz1M
zIzv5Py<ELVeO5z7!%rhmqebJMCSH@FnW(u}vrltgOIs^kYpYhL)|9rKwwHFUc8m4{
z9kPyt&KjKtom;vXU50M5?mpccda#~_UZP%&-gSLg-%_8ezfXVA0Do;@ZNM{VFc>i;
z89Ete8nzgY8PSY<jq;5;jh-887)KfJGVU|}XkuZKV$x`G-&Drb+ce*_+w^xcJu{YB
zjoB@8vbnqY2J<fS7t8dQahC00cE^HZ;b*bcqQ~NcrIjV$vek0hO2aDFs@7_RL1hFm
zN*I@|(bmq^8>~-Rzkju{v=P`GxB1Q1&^Foji0#yJ?d6>1jmyXF)a;mc^>(B7bo*HQ
z1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD49<D{M18y>I
zp>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TYq`4^X~N_`2_n^`#kp5
z^X2<?`@w$Re!Kl1tk7J+ThZwc{Js2l`#%iO4p<ZLV<09lAh0IzNswt!UQk~!B{(Md
zNbu_r=aABn`=L6a!qA>D$*}0K=CJv2*YL9N(Fo&+brIJh6(YHjT~XMmu&Ab}xs`4!
z_pF?Vwuml_9)Dh?y()XvmDLKXQ&yjjk&I!+oQOrohQ}U>eb4k~HZbSnyy9x(W?3$*
zy{u<!M|L@Tnq$W)<4nfe#h1lTCD<kGPMA(~NUTVl;kt0Exi6ADlj@S@ll_wqC4Wi@
zPiafVrN*Y7<jL@odA(`MY1wIm>H6t~>7#3G*6dj`%YXObH)TK>t1`L-RMF2=zfecG
zML3pepIMXnCMzuKM7DG`FS|cSFK2tsWUhPew`);rS!;XpRP#3FjjeN9SHB)wAGf||
zgZhSo4HFwZHXhzY*p$5Kr+kzAviw(@!#8&qC>3lh7~kTtrKM1!kY6~m)pl#$Hq<um
zwt?;D+kdOJe=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{94wp%n
z<(7@__S@Z2PA@Mif3+uO&y|X06?J<Fdxd*PD}5`wsx+#0R=uxItiE02T+>#oSi8M;
zejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh<`bldGJYNSYzL}jBlHp6q<^gJ{;m5
z8a*6zxVPD=x%r6Vk<u2pMc6WZH2Ua`?_9s@YBg-FZ=<yp9|OmP$DV#4`~C27pW{6z
z7$;hP(EOpcozh;^0d?eb%yuSrj&?<M4W9Hq+0$*?-TtG|kB3gFo~k)5d%E-t;Y`7q
zPk(1~&(57oKR0te;rw_{Owaub5f^Ut2KEkI^tpKXlKZ6#eNKI6FWX%{b;ah&$*YX3
zo!2a{b@W^GxBq1EQ~QABK*x2f>s>djZ*&hXA3QVUFm(Q=>&;8Iyl!2)z2f%ZaOm)z
zk?4`pJM24CcT?`ZxR-fv;r_-4=m$j)rGFk)JW_nr@U!mEZKIZ>r^j5!`X2{BzCX?y
zfA&kpFYhM`o{*nZOsY&aPnk`fns%SQ@pR?WiD&807G?^6mHxH%xz6(+eslb-e>P%v
z;syW3r{7Cn%D+7HYT2uvxq!JxuTx(y%on|pe{=XP<89x&@OP67S?{s$D?jLd=o9|v
z^YOu_)K8!O1p}D#{JO;G(~&+H0V$DJ9v_Gf;lM~JHVL``0AV8os8TU0RsaA107*qo
IM6N<$f=Jmr6#xJL

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 661fc91e520d88c86dad16e02492612cbb1a3863..b50e72aa419414563799b10d06ab550075d02e38 100644
GIT binary patch
delta 92
zcmew%I*D<DiZNqxkh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382FBWFymBh
rK53w!`sCeQa<U5#3h?!`ERtrpB*#)Qe|GH@pbUejtDnm{r-UW|tCt!I

delta 2754
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
IM6N<$g75%64FCWD

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 b20ddc684892c183e6f4555e1d73980fb77c0a33..3f0f776041b5446daa02ac0de71615d3ba6dfe61 100644
GIT binary patch
delta 92
zcmew%I*D<DiZNqxkh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382FBWFymBh
rK53w!`sCeQa<Ul)EzHUbU$8M~E@7T?bAPxUP=>+N)z4*}Q$iB}o3R;i

delta 2754
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
IM6N<$g4<6!jsO4v

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
 
-- 
2.11.0