From b0da1de6db6cb1349b00bf2c79243b5e24b2e67c Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Tue, 8 Jun 2010 13:28:20 -0500
Subject: [PATCH] Difficultydisplay v2, more blankies [Midiman]

---
 Themes/_fallback/metrics.ini                  |  12 ++++-
 .../ScreenSelectMusic decorations/default.lua |   1 +
 .../_background.png                           | Bin 0 -> 3072 bytes
 .../_barpeice Beginner.png                    | Bin 0 -> 3057 bytes
 .../_barpeice Challenge.png}                  | Bin 2798 -> 2999 bytes
 .../_barpeice Easy.png}                       | Bin 2798 -> 3001 bytes
 .../_barpeice Edit.png                        | Bin 0 -> 3044 bytes
 .../_barpeice Hard.png}                       | Bin 2798 -> 3001 bytes
 .../_barpeice Medium.png}                     | Bin 2798 -> 3002 bytes
 .../default.lua                               |  48 ++++++++++++++++++
 Themes/default/Scripts/02 TextBanner.lua      |   2 +-
 Themes/default/metrics.ini                    |  14 +++--
 12 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_background.png
 create mode 100644 Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Beginner.png
 rename Themes/default/{BGAnimations/_blank.png => Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Challenge.png} (89%)
 rename Themes/default/{BGAnimations/_missing.png => Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Easy.png} (89%)
 create mode 100644 Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Edit.png
 rename Themes/default/Graphics/{_blank.png => ScreenSelectMusic DifficultyDisplay/_barpeice Hard.png} (89%)
 rename Themes/default/Graphics/{_missing.png => ScreenSelectMusic DifficultyDisplay/_barpeice Medium.png} (89%)
 create mode 100644 Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 1146a36589..dfa4c55a55 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -46,7 +46,7 @@ FirstAttractScreen="ScreenInit"
 InitialScreen="ScreenInit"
 # Screens that show over everything else. you shouldn't worry bout this, since
 # it wont matter much.
-OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDebugOverlay"
+OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDebugOverlay,ScreenConsoleOverlay"
 # Legacy metric: Percentage Scoring shows this many decimals ( 00.00% ).
 PercentScoreDecimalPlaces=2
 
@@ -1132,7 +1132,15 @@ Class="ScreenSystemLayer"
 Fallback="Screen"
 #
 CreditsJoinOnly=false
-
+[ScreenConsoleOverlay]
+Class="ScreenSystemLayer"
+Fallback="ScreenSystemLayer"
+#
+CreditsInitCommand=visible,false;zoom,0
+CreditsP1X=-9999
+CreditsP2X=-9999
+CreditsP1Y=-9999
+CreditsP2Y=-9999
 [ScreenSyncOverlay]
 Class="ScreenSyncOverlay"
 Fallback="Screen"
diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
index bf27b93c7a..93e6e94d5c 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
@@ -133,6 +133,7 @@ if GAMESTATE:IsCourseMode() then
 		CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
 	};
 end
+	t[#t+1] = StandardDecorationFromFileOptional("DifficultyDisplay","DifficultyDisplay");
 t[#t+1] = StandardDecorationFromFileOptional("SortOrder","SortOrderText") .. {
 	BeginCommand=cmd(playcommand,"Set");
 	SortOrderChangedMessageCommand=cmd(playcommand,"Set";);
diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_background.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..857eba483491e69e044e93e2f62c9d1ebd987432
GIT binary patch
literal 3072
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
O0000<MNUMnLSTaU2eF+1

literal 0
HcmV?d00001

diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Beginner.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Beginner.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8a4ae21ffcac7f02625081da33cbc58c010ed94
GIT binary patch
literal 3057
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

literal 0
HcmV?d00001

diff --git a/Themes/default/BGAnimations/_blank.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Challenge.png
similarity index 89%
rename from Themes/default/BGAnimations/_blank.png
rename to Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Challenge.png
index 413f06280abbfcc377cee1c61cf05aa80dcf6d8c..c886a81e5d7dced0d6a8cd0847c3e90f19e8d6ff 100644
GIT binary patch
delta 312
zcmaDSx?S9?Gr-TCmrII^fq{Y7)59eQNOu6S3<n#K+~xb79Y}E&ctjR6FmMZlFeAgP
zIT9Pqy142edAc};RNQ)V+n4K*fk4|s{jHDg3+|c3{w+vPG%NaXTA5obr|X$L`a9;F
z{V-wKBF*PIi^@yaG%z?ZEKGeBdC*(fn)QUag1Y(?V|5Q61#!>o@^kDMehMozFOha&
z2zsTLnJa%@$3ZH84TBMr$}!GM#Z3$??mP}LyrK?l4M!|09L>)CW>NQ;;Qh+)(iv4z
zg{5kq(dq*G*g2U};tjb48W>cHHs5vJvzZ}tPdlUMxyS~V7Ydn2r5J*=Zb$nRonu<^
zaguG4)pH#OCI-t*Y|(80yBGR@TwTV*!Pp}9ij#ri|9@r%Gh=;MRx@^4U??zny85}S
Ib4q9e0Ac`XI{*Lx

delta 110
zcmdlk{!Y}aGr-TCmrII^fq{Y7)59eQNV5Pj69*HJ{BY`(36SC}@Q5sCVBq=y!i-L9
zOlE8}>*CUr^mK6yskoK&=l_3uW*!4W1xBD+hX4PW89dmS8TWe~Sp?#Hy85}Sb4q9e
E0KlRh9{>OV

diff --git a/Themes/default/BGAnimations/_missing.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Easy.png
similarity index 89%
rename from Themes/default/BGAnimations/_missing.png
rename to Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Easy.png
index 413f06280abbfcc377cee1c61cf05aa80dcf6d8c..c971e4a931513e9dfa389cedd84cb1bb962f5b0a 100644
GIT binary patch
delta 314
zcmV-A0mc6A6}cBSiBL{Q4GJ0x0000DNk~Le0001p0000S2nGNE0J=^02LJ#732;bR
za{vGf6951U69E94oEWh-iVA<^Nkl<Zc-rinO%8%E5JtZu#=j$YB@gVSTxwDQ>!!=<
zVwy(myqB>28Zv#E4g^9<NdTW1C;=b{APBT!Y_R6M!h3?1334%ta%D?=2y&Bj|3UYG
zKM^EKdLRgblz2+o=F5_W&IOq&1ew?pA01?*gCGb;41$=56@o;z#7BAu*%{{vI*5}Y
z^&n|sNJWqmv!uOI5Z;405#(5r1q4A5&w?y@2C-(Lb3tBNkYLP0=YmMmNz#V$B1nmp
zpJIYB3!MuR@)0u_v*19GGo|f=z<)9D4Zdmz1OWtrM!W$40RR630O<8EML&oU5&!@I
M07*qoM6N<$g8Kk-7ytkO

delta 110
zcmdlf{!Y}aGr-TCmrII^fq{Y7)59eQNV5Pj69*HJ{BY`(36SC}@Q5sCVBq=y!i-L9
zOlE8}>*CUr^mK6yskoK&=l_3uW*!4W1xBD+hX4PW89dmS8TWe~Sp?#Hy85}Sb4q9e
E0KtA8ApigX

diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Edit.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..88a6ad80714c4b931c79135906de6e63b656ab7a
GIT binary patch
literal 3044
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

literal 0
HcmV?d00001

diff --git a/Themes/default/Graphics/_blank.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Hard.png
similarity index 89%
rename from Themes/default/Graphics/_blank.png
rename to Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Hard.png
index af1d438da26b0d81117382116b1a2250d8a60a7f..0669646de641913d90f9bf99bf6b9f3032c37ccd 100644
GIT binary patch
delta 314
zcmaDSx>MY&Gr-TCmrII^fq{Y7)59eQNOu6S3<n#K+~xb79Y}E&ctjR6FmMZlFeAgP
zIT9Pqy143}c)B=-RNQ)V+nei<fr#5f`>l(vs_sw~f3r+RYYG2jmBT9vk_C&;H}btd
z@I|@T)!EC_W&NuNCMFKXmTN2XKNz1~!|7nhXeqrgM&TjziO@@L*?03h{A2N$Qo_#R
z;MF^6+s{pBf*w08<5Cb-sd=MdYt7+MafIPW$QlMA#fQo4RW~Ki3%^nD<6GIhq}5r=
z!Rzd#Z*B^E*bAAS1Q>cVFm|LXc-u8cq^~Sg=;u+90MV05rfhlmjcG~9sryMyh0~<i
zg+3`SGd?$oSwTJT?R2rp|BqhS{Ug+xv4z1&`zs3r!~g%x42384UAMMQmIsCdgQu&X
J%Q~loCIDCvbRYl#

delta 110
zcmdlf{!Y}aGr-TCmrII^fq{Y7)59eQNV5Pj69*fRtY1-^45T;<JR*x37`Q%wFr(8N
zlNlS$y14WtJzX3_DsCnH`TyUZ*(f2&ff=Zl;s1YTh6FZdMoG0CeGuQ%)z4*}Q$iB}
DgsmHZ

diff --git a/Themes/default/Graphics/_missing.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Medium.png
similarity index 89%
rename from Themes/default/Graphics/_missing.png
rename to Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Medium.png
index af1d438da26b0d81117382116b1a2250d8a60a7f..f6c242b8c059ae3c854a1fe075c39ccbc53bb1af 100644
GIT binary patch
delta 315
zcmaDSx=Y-wGr-TCmrII^fq{Y7)59eQNOu6S3<n#K+~xb79Y}E&ctjR6FmMZlFeAgP
zIT9Pqy143}db&7<RNQ(q+n2A&K)`Lk(y{%@6{`Gimc}FnF}_}Q`c;yap!Ivz*g8%F
z{mYt-6M}>eSX;?4DsU)p=s52`ls!vok2=fGO$y?RHNw4KIZv3q<RSZA_J1xDG+y>8
za0ES4%$z-4mAjYQD2&4>C`ev*$?|3ej%c2y86BccE?%#y7dOA@`OG4F<m7~^2`0u%
zlsq~;FWuANc<(reqiD?urY41sbjN2l%@La~>`*wb<6)4tu+UNErAnrArN9!GQ_E*0
zoN;>G)UxMj$uS)ZfhRthVL?3qx*PpJgj$20c!ZmQ;s1YThPCnfu5PXBt-yd_@O1Ta
JS?83{1OUL4awh-)

delta 110
zcmdlb{!Y}aGr-TCmrII^fq{Y7)59eQNV5Pj69*fRtY1-^45T;<JR*x37`Q%wFr(8N
zlNlS$y14WtJzX3_DsCnH`TyUZ*(f2&ff=Zl;s1YTh6FZdMoG0CeGuQ%)z4*}Q$iB}
Dg&P}z

diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua
new file mode 100644
index 0000000000..4c917a270b
--- /dev/null
+++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua	
@@ -0,0 +1,48 @@
+local t = Def.ActorFrame {};
+t[#t+1] = Def.ActorFrame {
+	LoadActor("_Background");
+};
+--
+for idx,diff in pairs(Difficulty) do
+	local sDifficulty = ToEnumShortString( diff );
+	local tLocation = {
+		Beginner	= 16,
+		Easy 		= 16*2,
+		Medium		= 16*3,
+		Hard		= 16*4,
+		Challenge	= 16*5,
+		Edit 		= 16*7,
+	};
+	t[#t+1] = Def.ActorFrame {
+		SetCommand=function(self)
+			local c = self:GetChildren();
+-- 			local Bar = self:GetChild("Bar");
+-- 			local Meter = self:GetChild("Meter"
+			local song = GAMESTATE:GetCurrentSong()
+			local st = GAMESTATE:GetCurrentStyle():GetStepsType()
+			local steps = song:GetOneSteps( st, diff );
+-- 			local meter = steps:GetMeter();
+			local bHasStepsTypeAndDifficulty =
+				song and song:HasStepsTypeAndDifficulty( st, diff );
+-- 			c.Meter:settext( meter );
+			
+			self:playcommand( bHasStepsTypeAndDifficulty and "Show" or "Hide" );
+		end;
+		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+		--
+		LoadActor("_barpeice " .. sDifficulty ) .. {
+			Name="BarPeice";
+			ShowCommand=cmd(stoptweening;linear,0.1;diffuse,CustomDifficultyToColor( sDifficulty ));
+			HideCommand=cmd(stoptweening;decelerate,0.2;diffuse,CustomDifficultyToDarkColor( sDifficulty ));
+			InitCommand=cmd(diffuse,CustomDifficultyToColor( sDifficulty ));
+		};
+		LoadFont("StepsDisplay","Meter") .. {
+			Name="Meter";
+			Text=(sDifficulty == "Edit") and "0 Edits" or "0";
+			ShowCommand=cmd(stoptweening;linear,0.1;diffuse,CustomDifficultyToColor( sDifficulty ));
+			HideCommand=cmd(stoptweening;decelerate,0.2;diffuse,CustomDifficultyToDarkColor( sDifficulty ));
+			InitCommand=cmd(x,-64-8+tLocation[sDifficulty];zoom,0.5;diffuse,CustomDifficultyToColor( sDifficulty ));
+		};
+	};
+end
+return t
\ No newline at end of file
diff --git a/Themes/default/Scripts/02 TextBanner.lua b/Themes/default/Scripts/02 TextBanner.lua
index 3456099bfe..84dc6900f4 100644
--- a/Themes/default/Scripts/02 TextBanner.lua	
+++ b/Themes/default/Scripts/02 TextBanner.lua	
@@ -1,6 +1,6 @@
 local mainMaxWidth = 228; -- zoom w/subtitle is 0.75 (multiply by 1.25)
 local subMaxWidth = 420; -- zoom is 0.6 (multiply zoom,1 value by 1.4)
-local artistMaxWidth = 300;
+local artistMaxWidth = 300/0.8;
 
 function TextBannerAfterSet(self,param) 
 	local Title=self:GetChild("Title"); 
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 21dd6ce18e..97cbfd6e16 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -417,8 +417,10 @@ MeterSetCommand=%function(self,param) \
 			self:zoom(0.8); \
 			self:glowshift(); \
 		elseif param.Meter >= 10 then \
+			self:zoom(1); \
 			self:glowshift(); \
 		else \
+			self:zoom(1); \
 			self:stopeffect(); \
 		end; \
 	end; \
@@ -550,7 +552,7 @@ PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 end
 TextureCoordScaleX=1
 NumPills=1
-AlwaysBounceNormalBar=false
+AlwaysBounceNormalBar=true
 
 [TextBanner]
 TitleOnCommand=horizalign,left;shadowlength,1;
@@ -864,7 +866,7 @@ IconChoiceOniOffCommand=linear,0.1175;zoomx,0
 [ScreenSelectMusic]
 UsePlayerSelectMenu=false
 # OptionsMenuAvailable=(getenv(sMode) ~= Oni)
-# SelectMenuAvailable=(getenv(sMode) == Normal)
+SelectMenuAvailable=false
 # ModeMenuAvailable=(getenv(sMode) == Normal)
 # HelpDisplay has things added here to make sure it disappears for another 
 # actor, which we defined in this screens decorations.
@@ -920,7 +922,13 @@ ShowStageDisplay=true
 StageDisplayX=SCREEN_CENTER_X-160-64
 StageDisplayY=SCREEN_TOP+160-96+4
 StageDisplayOnCommand=draworder,105;fov,90;zoom,0.75;zoomy,0;sleep,0.35;smooth,0.35;zoomy,0.75
-StageDisplayOffCommand=linear,0.25;diffusealpha,0;
+StageDisplayOffCommand=linear,0.25;zoomy,0;
+#
+ShowDifficultyDisplay=true
+DifficultyDisplayX=SCREEN_CENTER_X-160+64
+DifficultyDisplayY=SCREEN_TOP+160-96+4
+DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1
+DifficultyDisplayOffCommand=linear,0.25;zoomy,0;
 #
 BannerX=SCREEN_CENTER_X-160
 BannerY=SCREEN_TOP+160-36