Difficultydisplay v2, more blankies [Midiman]

2010-06-08 13:28:20 -05:00
parent 63569ccb29
commit b0da1de6db
12 changed files with 71 additions and 6 deletions
@@ -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"
@@ -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";);
@@ -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
@@ -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"); 
@@ -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