diff --git a/Themes/default/Graphics/Player combo/_combo.png b/Themes/default/Graphics/Player combo/_combo.png index 8669fa8c0d..0cfe4098b2 100644 Binary files a/Themes/default/Graphics/Player combo/_combo.png and b/Themes/default/Graphics/Player combo/_combo.png differ diff --git a/Themes/default/Graphics/Player combo/_misses.png b/Themes/default/Graphics/Player combo/_misses.png index ba6fbbc688..32fe625735 100644 Binary files a/Themes/default/Graphics/Player combo/_misses.png and b/Themes/default/Graphics/Player combo/_misses.png differ diff --git a/Themes/default/Graphics/Player combo/default.lua b/Themes/default/Graphics/Player combo/default.lua index 7156080a26..4f74ee6438 100644 --- a/Themes/default/Graphics/Player combo/default.lua +++ b/Themes/default/Graphics/Player combo/default.lua @@ -34,16 +34,21 @@ local t = Def.ActorFrame { Name="Number"; OnCommand = THEME:GetMetric("Combo", "NumberOnCommand"); }; - LoadFont("Common Normal") .. { - Name="Label"; - OnCommand = THEME:GetMetric("Combo", "LabelOnCommand"); + LoadActor("_combo")..{ + Name="ComboLabel"; + OnCommand = THEME:GetMetric("Combo", "ComboLabelOnCommand"); + }; + LoadActor("_misses")..{ + Name="MissLabel"; + OnCommand = THEME:GetMetric("Combo", "MissLabelOnCommand"); }; }; InitCommand = function(self) c = self:GetChildren(); cf = c.ComboFrame:GetChildren(); cf.Number:visible(false); - cf.Label:visible(false); + cf.ComboLabel:visible(false) + cf.MissLabel:visible(false) end; -- Milestones: -- 25,50,100,250,600 Multiples; @@ -77,20 +82,13 @@ local t = Def.ActorFrame { local iCombo = param.Misses or param.Combo; if not iCombo or iCombo < ShowComboAt then cf.Number:visible(false); - cf.Label:visible(false); + cf.ComboLabel:visible(false) + cf.MissLabel:visible(false) return; end - local labeltext = ""; - if param.Combo then - labeltext = "COMBO"; --- c.Number:playcommand("Reset"); - else - labeltext = "MISSES"; --- c.Number:playcommand("Miss"); - end - cf.Label:settext( labeltext ); - cf.Label:visible(false); + cf.ComboLabel:visible(false) + cf.MissLabel:visible(false) param.Zoom = scale( iCombo, 0, NumberMaxZoomAt, NumberMinZoom, NumberMaxZoom ); param.Zoom = clamp( param.Zoom, NumberMinZoom, NumberMaxZoom ); @@ -98,8 +96,15 @@ local t = Def.ActorFrame { param.LabelZoom = scale( iCombo, 0, NumberMaxZoomAt, LabelMinZoom, LabelMaxZoom ); param.LabelZoom = clamp( param.LabelZoom, LabelMinZoom, LabelMaxZoom ); + if param.Combo then + cf.ComboLabel:visible(true) + cf.MissLabel:visible(false) + else + cf.ComboLabel:visible(false) + cf.MissLabel:visible(true) + end + cf.Number:visible(true); - cf.Label:visible(true); cf.Number:settext( string.format("%i", iCombo) ); cf.Number:textglowmode("TextGlowMode_Stroke"); -- FullCombo Rewards @@ -125,15 +130,17 @@ local t = Def.ActorFrame { cf.Number:diffuse(Color("White")); cf.Number:strokecolor(Color("Stealth")); cf.Number:stopeffect(); - (cmd(diffuse,Color("White");diffusebottomedge,color("0.5,0.5,0.5,1")))(cf.Label); else cf.Number:diffuse(color("#ff0000")); cf.Number:stopeffect(); - (cmd(diffuse,Color("Red");diffusebottomedge,color("0.5,0,0,1")))(cf.Label); end -- Pulse Pulse( cf.Number, param ); - PulseLabel( cf.Label, param ); + if param.Combo then + PulseLabel( cf.ComboLabel, param ); + else + PulseLabel( cf.MissLabel, param ); + end -- Milestone Logic end; --[[ ScoreChangedMessageCommand=function(self,param) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 4ce911f027..7169294b0e 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -68,7 +68,9 @@ LabelMaxZoom=0.875*1 PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; PulseLabelCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.075*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;skewx,-0.125; -LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom + +ComboLabelOnCommand=x,0;y,23;shadowlength,1;zoom,0.75;align,0,1 +MissLabelOnCommand=x,0;y,23;shadowlength,1;zoom,0.75;align,0,1 [HoldJudgment] HoldJudgmentLetGoCommand=finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1;linear,0.8;zoom,0.75;sleep,0.5;linear,0.1;diffusealpha,0