and now for the rest of the work on the new combo/miss labels.

This commit is contained in:
AJ Kelly
2012-02-19 11:27:40 -06:00
parent 9e3ef7acb7
commit 49ea2575ed
4 changed files with 29 additions and 20 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

@@ -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)