combo font tweaks

This commit is contained in:
Jonathan Payne
2012-01-16 22:39:12 -08:00
parent 742b08273c
commit 592f908e55
4 changed files with 12 additions and 4 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 44 KiB

+2 -2
View File
@@ -2,8 +2,8 @@
Baseline=54 Baseline=54
Top=14 Top=14
LineSpacing=66 LineSpacing=66
DrawExtraPixelsLeft=0 DrawExtraPixelsLeft=3
DrawExtraPixelsRight=0 DrawExtraPixelsRight=3
AdvanceExtraPixels=0 AdvanceExtraPixels=0
[numbers] [numbers]
@@ -58,7 +58,7 @@ local t = Def.ActorFrame {
end; --]] end; --]]
TwentyFiveMilestoneCommand=function(self,parent) TwentyFiveMilestoneCommand=function(self,parent)
if ShowFlashyCombo then if ShowFlashyCombo then
(cmd(skewy,-0.125;decelerate,0.325;skewy,0))(self); (cmd(finishtweening;addy,-4;bounceend,0.125;addy,4))(self);
end; end;
end; end;
--]] --]]
@@ -101,21 +101,29 @@ local t = Def.ActorFrame {
cf.Number:visible(true); cf.Number:visible(true);
cf.Label:visible(true); cf.Label:visible(true);
cf.Number:settext( string.format("%i", iCombo) ); cf.Number:settext( string.format("%i", iCombo) );
cf.Number:textglowmode("TextGlowMode_Stroke");
-- FullCombo Rewards -- FullCombo Rewards
if param.FullComboW1 then if param.FullComboW1 then
cf.Number:diffuse( GameColor.Judgment["JudgmentLine_W1"] ); cf.Number:diffuse( GameColor.Judgment["JudgmentLine_W1"] );
cf.Number:strokecolor( GameColor.Judgment["JudgmentLine_W1"] );
cf.Number:textglowmode("TextGlowMode_Stroke");
cf.Number:glowshift(); cf.Number:glowshift();
elseif param.FullComboW2 then elseif param.FullComboW2 then
cf.Number:diffuse( GameColor.Judgment["JudgmentLine_W2"] ); cf.Number:diffuse( GameColor.Judgment["JudgmentLine_W2"] );
cf.Number:strokecolor( GameColor.Judgment["JudgmentLine_W2"] );
cf.Number:textglowmode("TextGlowMode_Stroke");
cf.Number:glowshift(); cf.Number:glowshift();
elseif param.FullComboW3 then elseif param.FullComboW3 then
cf.Number:diffuse( GameColor.Judgment["JudgmentLine_W3"] ); cf.Number:diffuse( GameColor.Judgment["JudgmentLine_W3"] );
cf.Number:stopeffect(); cf.Number:strokecolor( GameColor.Judgment["JudgmentLine_W3"] );
cf.Number:textglowmode("TextGlowMode_Stroke");
cf.Number:glowshift();
elseif param.Combo then elseif param.Combo then
-- Player 1's color is Red, which conflicts with the miss combo. -- Player 1's color is Red, which conflicts with the miss combo.
-- instead, just diffuse to white for now. -aj -- instead, just diffuse to white for now. -aj
--c.Number:diffuse(PlayerColor(player)); --c.Number:diffuse(PlayerColor(player));
cf.Number:diffuse(Color("White")); cf.Number:diffuse(Color("White"));
cf.Number:strokecolor(Color("Stealth"));
cf.Number:stopeffect(); cf.Number:stopeffect();
(cmd(diffuse,Color("White");diffusebottomedge,color("0.5,0.5,0.5,1")))(cf.Label); (cmd(diffuse,Color("White");diffusebottomedge,color("0.5,0.5,0.5,1")))(cf.Label);
else else