[Player combo] Diffuse to White instead of player color. P1's color is Red, conflicting with misses (which are also Red).

[03 Gameplay] Renamed HoldJudgment commands to match the metrics names. Turned off fail combo in dance mode.
[metrics] re-hooked up HoldJudgment commands in Lua

Themes/_fallback/Scripts/03 Gameplay.lua

@@ -100,8 +100,8 @@ end;
 function FailCombo()
 	sGame = GAMESTATE:GetCurrentGame():GetName();
 	local Combo = {
-		dance = 30, -- ITG/Pump Pro does it this way.
-		pump = 51,
+		dance = -1, -- ITG uses 30
+		pump = 51, -- Pump Pro uses 30, real Pump uses 51
 		beat = -1,
 		kb7 = -1,
 		para = -1,
@@ -118,16 +118,16 @@ function HoldTiming()
 	end;
 end;
 
-function HoldJudgmentFail()
+function HoldJudgmentLetGo()
 	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
-		return cmd();
+		return cmd(visible,false);
 	else return cmd(finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0);
 	end;
 end;
 
-function HoldJudgmentPass()
+function HoldJudgmentHeld()
 	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
-		return cmd();
+		return cmd(visible,false);
 	else return cmd(finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0);
 	end;
 end;

Themes/_fallback/metrics.ini

@@ -244,8 +244,8 @@ LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75
 
 [HoldJudgment]
 # System Direction
-HoldJudgmentLetGoCommand=HoldJudgmentFail()
-HoldJudgmentHeldCommand=HoldJudgmentPass()
+HoldJudgmentLetGoCommand=HoldJudgmentLetGo()
+HoldJudgmentHeldCommand=HoldJudgmentHeld()
 
 [HelpDisplay]
 # The help display on the menus, and what it does.

Themes/default/Graphics/Player combo/default.lua

@@ -75,10 +75,10 @@ local t = Def.ActorFrame {
 
 		param.Zoom = scale( iCombo, 0, NumberMaxZoomAt, NumberMinZoom, NumberMaxZoom );
 		param.Zoom = clamp( param.Zoom, NumberMinZoom, NumberMaxZoom );
-		
+
 		param.LabelZoom = scale( iCombo, 0, NumberMaxZoomAt, LabelMinZoom, LabelMaxZoom );
 		param.LabelZoom = clamp( param.LabelZoom, LabelMinZoom, LabelMaxZoom );
-		
+
 		c.Number:visible(true);
 		c.Label:visible(true);
 		c.Number:settext( string.format("%i", iCombo) );
@@ -93,7 +93,10 @@ local t = Def.ActorFrame {
 			c.Number:diffuse(color("#a4ff00"));
 			c.Number:stopeffect();
 		elseif param.Combo then
-			c.Number:diffuse(PlayerColor(player));
+			-- Player 1's color is Red, which conflicts with the miss combo.
+			-- instead, just diffuse to white for now. -aj
+			--c.Number:diffuse(PlayerColor(player));
+			c.Number:diffuse(Color("White"));
 			c.Number:stopeffect();
 			(cmd(diffuse,Color("White");diffusebottomedge,color("0.5,0.5,0.5,1")))(c.Label);
 		else

Themes/default/metrics.ini

@@ -56,8 +56,8 @@ BannerResetFadeCommand=diffusealpha,1
 
 [HoldJudgment]
 # !!! #
-HoldJudgmentLetGoCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
-HoldJudgmentHeldCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
+HoldJudgmentLetGoCommand=HoldJudgmentLetGo()
+HoldJudgmentHeldCommand=HoldJudgmentHeld()
 
 [Judgment]
 # New #