From ce817d5a76c9bb0b9fd3fac775f8066c822b8774 Mon Sep 17 00:00:00 2001
From: Cameron Ball <c.ball1729@gmail.com>
Date: Wed, 22 Jan 2014 23:41:41 +0800
Subject: [PATCH] Added more layers to the player pane.

---
 Themes/GrooveNights/BGAnimations/_player pane.xml  |  84 +++++++++++++++++++--
 .../{BGAnimations => Graphics}/AvatarFrame B.png   | Bin
 .../{BGAnimations => Graphics}/AvatarFrame.png     | Bin
 Themes/GrooveNights/Scripts/gnSystem.lua           |  34 ++++-----
 4 files changed, 95 insertions(+), 23 deletions(-)
 rename Themes/GrooveNights/{BGAnimations => Graphics}/AvatarFrame B.png (100%)
 rename Themes/GrooveNights/{BGAnimations => Graphics}/AvatarFrame.png (100%)

diff --git a/Themes/GrooveNights/BGAnimations/_player pane.xml b/Themes/GrooveNights/BGAnimations/_player pane.xml
index 9392a35..6c45400 100644
--- a/Themes/GrooveNights/BGAnimations/_player pane.xml	
+++ b/Themes/GrooveNights/BGAnimations/_player pane.xml	
@@ -15,11 +15,83 @@
 		File="../Graphics/PaneDisplay p1 F.png"
 		OnCommand="@'diffuse,'..FrameColor()..';horizalign,left;vertalign,bottom;'"
 	/>
-	
+
 	<!--Avatar-->
- 	<Layer
- 		File="@'../Graphics/NoAvatar/'..getNoAvatar(PLAYER_1)"
- 		InitCommand="@'horizalign,left;vertalign,bottom;diffuse,'..PlayerColor(PLAYER_1)..';x,-5;y,-5;diffusealpha,0'"
- 		OnScreenPlayerOptionsMessageCommand="diffusealpha,1"
- 	/>
+    <ActorFrame InitCommand="x,5;y,5;draworder,100"><children>       
+        <Layer File="../Graphics/AvatarFrame B.png"
+            Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
+            InitCommand="@'horizalign,left;vertalign,bottom;draworder,3;diffuse,'..BackgroundColor()..';zoomx,1.01;zoomy,0.975;'"
+        />
+        
+        <Layer File="../Graphics/AvatarFrame.png"
+            Condition="GAMESTATE:IsHumanPlayer(PLAYER_1)"
+            InitCommand="@'horizalign,left;vertalign,bottom;draworder,3;diffuse,'..FrameColor()..';zoomx,0.95;zoomy,0.95;'"
+        />
+        
+     	<Layer
+     		File="@'../Graphics/NoAvatar/'..getNoAvatar(PLAYER_1)"
+     		InitCommand="@'horizalign,left;vertalign,bottom;diffuse,'..PlayerColor(PLAYER_1)..';'"
+     	/>
+    </children></ActorFrame>
+	
+    <!-- ScreenPlayerOptions stuff -->
+	<ActorFrame InitCommand="diffusealpha,0" OnScreenPlayerOptionsMessageCommand="diffusealpha,1"><children>
+        <!-- BPM  -->
+        <ActorFrame InitCommand="x,1;y,1;zoom,0.5"><children>
+            <!-- BPM label -->
+            <BitmapText
+    	        Text="BPM:"
+    			File="_eurostile blue glow"
+                InitCommand="@'horizalign,left;shadowlength,0;diffuse,'..LabelColor()..';'"
+            />
+            
+            <!-- BPM display -->
+            <BitmapText
+                Text=""
+                File="_eurostile blue glow"
+                InitCommand="shadowlength,0;maxwidth,140;horizalign,left"
+                RateModChangedMessageCommand="%function(self) self:settext(DisplayBPM(PLAYER_1)) end"
+            />
+        </children></ActorFrame>
+        
+        <!-- Speed -->
+        <ActorFrame InitCommand="x,10;y,10;zoom,0.5"><children>
+            <!-- Speed label -->
+            <BitmapText
+                    Text="Speed:"
+                    File="_eurostile blue glow"
+                    InitCommand="@'horizalign,left;shadowlength,0;diffuse,'..LabelColor()..';'"
+            />
+                
+            <!-- Speed display -->
+            <BitmapText
+                    Text=""
+                    File="_eurostile blue glow"
+                    InitCommand="x,80;horizalign,left;shadowlength,0;"
+                    SpeedModChangedP1MessageCommand="queuecommand,Update"
+                    RateModChangedMessageCommand="queuecommand,Update"
+                    UpdateCommand="%function(self) self:settext(DisplayScrollSpeed(PLAYER_1)) end"
+            />
+                
+            <!--Blaze It P1 -->
+            <BitmapText
+                    File="_eurostile blue glow"
+                    InitCommand="x,80"
+                    OnCommand="horizalign,left;rainbow;shadowlength,0;"
+                    SpeedModChangedP1MessageCommand="queuecommand,Update"
+                    RateModChangedMessageCommand="queuecommand,Update"
+                    UpdateCommand="%function(self) DoEasterEgg('BlazeIt', { pn = PLAYER_1, Actor = self }) end"
+            />
+                
+            <!--No Scope P1 -->                
+            <BitmapText
+                    File="_eurostile blue glow"
+                    InitCommand="x,80"
+                    OnCommand="horizalign,left;rainbow;shadowlength,0;"
+                    SpeedModChangedP1MessageCommand="queuecommand,Update"
+                    RateModChangedMessageCommand="queuecommand,Update"
+                    UpdateCommand="%function(self) DoEasterEgg('NoScope', { pn = PLAYER_1, Actor = self }) end"
+            />
+        </children></ActorFrame>
+ 	</children></ActorFrame>
 </children></ActorFrame>
\ No newline at end of file
diff --git a/Themes/GrooveNights/BGAnimations/AvatarFrame B.png b/Themes/GrooveNights/Graphics/AvatarFrame B.png
similarity index 100%
rename from Themes/GrooveNights/BGAnimations/AvatarFrame B.png
rename to Themes/GrooveNights/Graphics/AvatarFrame B.png
diff --git a/Themes/GrooveNights/BGAnimations/AvatarFrame.png b/Themes/GrooveNights/Graphics/AvatarFrame.png
similarity index 100%
rename from Themes/GrooveNights/BGAnimations/AvatarFrame.png
rename to Themes/GrooveNights/Graphics/AvatarFrame.png
diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index f4e1906..435d434 100644
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -475,26 +475,26 @@ local function QuadAwardEasterEgg(Params)
     local ScoreP2
     local AwardFile
 
-	--[[
-	I don't even understand this. When this function is called from a queued command you have to get the score like this:
-		SCREENMAN:GetTopScreen():GetChild('PercentP1'):GetChild('PercentP1'):GetText() end
-		
-	But if it's in an initcommand or oncommand you have to do it like this:
-		SCREENMAN:GetTopScreen():GetChild('ScoreP1'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP1'):GetText()
-		
-	I think some children must get renamed/added between the commands or something, I don't know.
-	]]--
-	if Params.Layer == 'Silence' then
-		if GAMESTATE:IsPlayerEnabled(PLAYER_1) then ScoreP1 = SCREENMAN:GetTopScreen():GetChild('PercentP1'):GetChild('PercentP1'):GetText() end
-		if GAMESTATE:IsPlayerEnabled(PLAYER_2) then ScoreP2 = SCREENMAN:GetTopScreen():GetChild('PercentP2'):GetChild('PercentP2'):GetText() end
-	else
-		if GAMESTATE:IsPlayerEnabled(PLAYER_1) then ScoreP1 = SCREENMAN:GetTopScreen():GetChild('ScoreP1'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP1'):GetText() end
-		if GAMESTATE:IsPlayerEnabled(PLAYER_2) then ScoreP2 = SCREENMAN:GetTopScreen():GetChild('ScoreP2'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP2'):GetText() end
-	end
+  	--[[
+  	I don't even understand this. When this function is called from a queued command you have to get the score like this:
+        SCREENMAN:GetTopScreen():GetChild('PercentP1'):GetChild('PercentP1'):GetText() end
+  		
+  	But if it's in an initcommand or oncommand you have to do it like this:
+  	   SCREENMAN:GetTopScreen():GetChild('ScoreP1'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP1'):GetText()
+  		
+  	I think some children must get renamed/added between the commands or something, I don't know.
+  	]]--
+    if Params.Layer == 'Silence' then
+        if GAMESTATE:IsPlayerEnabled(PLAYER_1) then ScoreP1 = SCREENMAN:GetTopScreen():GetChild('PercentP1'):GetChild('PercentP1'):GetText() end
+        if GAMESTATE:IsPlayerEnabled(PLAYER_2) then ScoreP2 = SCREENMAN:GetTopScreen():GetChild('PercentP2'):GetChild('PercentP2'):GetText() end
+    else
+    if GAMESTATE:IsPlayerEnabled(PLAYER_1) then ScoreP1 = SCREENMAN:GetTopScreen():GetChild('ScoreP1'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP1'):GetText() end
+        if GAMESTATE:IsPlayerEnabled(PLAYER_2) then ScoreP2 = SCREENMAN:GetTopScreen():GetChild('ScoreP2'):GetChild('ScoreDisplayPercentage Percent'):GetChild('PercentP2'):GetText() end
+    end
     
     if ScoreP1 == "100.00%" and ScoreP2 == "100.00%" then
         --choose p1 or p2 randomly
-		local seconds = gnPlaySec -- TODO: This is temporary until the time tracker is reimplemented
+        local seconds = gnPlaySec -- TODO: This is temporary until the time tracker is reimplemented
         local pn = math.mod(seconds, 2)
         AwardFile = GetQuadAwardFile(pn)
     elseif ScoreP1 == "100.00%" then
-- 
2.11.0