almost done with gameplay

stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/default.lua

@@ -8,6 +8,10 @@ local t = Def.ActorFrame {
 		ShowDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,1);
 		HideDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0);
 	};
+	LoadActor( THEME:GetPathB('','_standard decoration'), "LifeFrame", "LifeFrame" );
+	LoadActor( THEME:GetPathB('','_standard decoration'), "ScoreFrame", "ScoreFrame" );
+	LoadActor( THEME:GetPathB('','_standard decoration'), "StageFrame", "StageFrame" );
+
 };
 
 return t;

stepmania/Themes/default/Fonts/Combo numbers.ini

@@ -1 +0,0 @@
-[main]

stepmania/Themes/default/Fonts/Combo numbers.redir

@@ -0,0 +1 @@
+_venacti 100

stepmania/Themes/default/Fonts/ScoreDisplayNormal Text.redir

@@ -0,0 +1 @@
+_terminator two 54 score

stepmania/Themes/default/Fonts/ScoreDisplayNormal numbers.ini

@@ -1 +0,0 @@
-[main]

stepmania/Themes/default/Fonts/_terminator two 54 score.ini

@@ -0,0 +1,25 @@
+[main]
+Baseline=46
+Top=0
+LineSpacing=54
+DrawExtraPixelsLeft=4
+DrawExtraPixelsRight=4
+AdvanceExtraPixels=0
+
+[numbers]
+0=36
+1=36
+2=36
+3=36
+4=36
+5=36
+6=36
+7=36
+8=36
+9=36
+10=36
+11=36
+12=36
+13=36
+14=36
+15=36

stepmania/Themes/default/Fonts/_venacti 100 combo.ini

@@ -0,0 +1,24 @@
+[main]
+Baseline=64
+Top=20
+LineSpacing=120
+DrawExtraPixelsLeft=8
+DrawExtraPixelsRight=8
+AdvanceExtraPixels=0
+
+[numbers]
+0=67
+1=30
+2=63
+3=57
+4=57
+5=61
+6=69
+7=54
+8=67
+9=66
+10=77
+11=29
+12=26
+13=29
+14=58

stepmania/Themes/default/Graphics/LifeMeterBar Danger.lua

@@ -0,0 +1,3 @@
+return Def.Quad {
+	InitCommand=cmd(zoomtowidth,232;zoomtoheight,24;diffuseshift;effectcolor1,color("1,0,0,0.8");effectcolor2,color("1,0,0,0");effectclock,"music";);
+};

stepmania/Themes/default/Graphics/LifeMeterBar Under.lua

@@ -0,0 +1,3 @@
+return Def.Quad {
+	InitCommand=cmd(zoomtowidth,232;zoomtoheight,24;diffuse,color("0.2,0.2,0.2,1");diffusetopedge,color("0.5,0.5,0.5,1"););
+};

stepmania/Themes/default/Graphics/LifeMeterBar background.lua

@@ -1,3 +0,0 @@
-return Def.Quad {
-	InitCommand=cmd(diffuse,color("#000000");diffusetopedge,0.5,0.5,0.5,1);
-};

stepmania/Themes/default/metrics.ini

@@ -928,14 +928,14 @@ OniGameOverP2OnCommand=diffusealpha,0
 OniGameOverP2OffCommand=
 OniGameOverP2DieCommand=diffusealpha,1;bounceend,0.5;y,SCREEN_CENTER_Y;bob;effectperiod,4;effectmagnitude,0,6,0
 LifeFrameX=SCREEN_CENTER_X+0
-LifeFrameY=SCREEN_CENTER_Y-204
-LifeFrameOnCommand=addy,-100;linear,0.5;addy,100
+LifeFrameY=SCREEN_TOP
+LifeFrameOnCommand=vertalign,top;addy,-100;linear,0.5;addy,100
 LifeFrameOffCommand=linear,0.5;addy,-100
-LifeP1X=SCREEN_CENTER_X-180
+LifeP1X=SCREEN_CENTER_X-184
 LifeP1Y=SCREEN_CENTER_Y-212
 LifeP1OnCommand=addy,-100;linear,0.5;addy,100
 LifeP1OffCommand=linear,0.5;addy,-100
-LifeP2X=SCREEN_CENTER_X+180
+LifeP2X=SCREEN_CENTER_X+184
 LifeP2Y=SCREEN_CENTER_Y-212
 LifeP2OnCommand=rotationy,180;addy,-100;linear,0.5;addy,100
 LifeP2OffCommand=linear,1;addy,-100
@@ -961,6 +961,10 @@ SongNumberP2Y=SCREEN_CENTER_Y-206
 SongNumberP2OnCommand=addy,-100;linear,0.5;addy,100
 SongNumberP2OffCommand=linear,0.5;addy,-100
 ShowScoreInRave=true
+ScoreFrameX=SCREEN_CENTER_X
+ScoreFrameY=SCREEN_BOTTOM
+ScoreFrameOnCommand=vertalign,bottom;addy,100;linear,0.5;addy,-100
+ScoreFrameOffCommand=linear,0.5;addy,100
 ScoreP1X=SCREEN_CENTER_X-208
 ScoreP1Y=SCREEN_CENTER_Y+202
 ScoreP1OnCommand=addy,100;linear,1;addy,-100;draworder,109;
@@ -1929,8 +1933,6 @@ DescOnCommand=zoom,0.5
 DescWidth=400
 
 [LifeMeterBar]
-MeterWidth=232
-MeterHeight=24
 DangerThreshold=0.2
 InitialValue=0.5
 MinStayAlive="TapNoteScore_W3"
@@ -1945,8 +1947,18 @@ LifePercentChangeHeld=0.008
 LifePercentChangeLetGo=-0.080
 LifePercentChangeCheckpointMiss=-0.002
 LifePercentChangeCheckpointHit=0.002
+UnderX=0
+UnderY=0
+DangerX=0
+DangerY=0
+StreamX=0
+StreamY=0
+OverX=0
+OverY=0
 
 [LifeMeterTime]
+MeterWidth=232
+MeterHeight=24
 Fallback="LifeMeterBar"
 
 [DifficultyDisplay]
@@ -2342,9 +2354,9 @@ HoldJudgmentHeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx
 ShowComboAt=2
 LabelOnCommand=x,SCREEN_CENTER_X-314;y,SCREEN_CENTER_Y-220;shadowlength,0;HorizAlign,left;VertAlign,bottom
 NumberOnCommand=y,SCREEN_CENTER_Y-216;shadowlength,0;HorizAlign,right;VertAlign,bottom
-NumberMinZoom=1
-NumberMaxZoom=1
-NumberMaxZoomAt=2
+NumberMinZoom=0.5
+NumberMaxZoom=0.8
+NumberMaxZoomAt=200
 PulseCommand=%function(self,param) self:stoptweening(); self:zoom(1.2*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); end
 
 [Player]
@@ -4407,8 +4419,10 @@ MeterSetCommand=%function(self,param) self:diffuse(DifficultyAndStepsTypeToColor
 PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 	local native_width=32; \
 	local native_height=32; \
-	local zoomed_height=10; \
+	local zoomed_width=28; \
+	local zoomed_height=9; \
 	local spacing_x=11.3; \
+	self:zoomx(zoomed_width/native_width); \
 	self:zoomy(zoomed_height/native_height); \
 	self:x((itemIndex-(numItems/2))*spacing_x); \
 	local zoomed_width=0; \
@@ -4417,7 +4431,7 @@ PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 		self:rotationz(90); \
 	else \
 		zoomed_width=31; \
-		self:rotationz(-60); \
+		self:rotationz(-58); \
 	end; \
 	self:zoomx(zoomed_width/native_width); \
 end
@@ -4426,3 +4440,10 @@ NumPills=20
 
 [StreamDisplayExtra]
 Fallback="StreamDisplay"
+
+[ScoreDisplayNormal]
+FrameX=0
+FrameY=0
+TextX=
+TextY=
+TextOnCommand=zoom,0.5