From 554336543e8a2da2fbb70335f5b35c16da66a0a5 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Wed, 24 Mar 2010 18:44:35 -0500 Subject: [PATCH] various theme changes --- .../Graphics/Player combo/default.lua | 68 ++++++++++++------- Themes/_fallback/metrics.ini | 20 ++++-- 2 files changed, 56 insertions(+), 32 deletions(-) diff --git a/Themes/_fallback/Graphics/Player combo/default.lua b/Themes/_fallback/Graphics/Player combo/default.lua index d7142b39e2..45f0e8c751 100644 --- a/Themes/_fallback/Graphics/Player combo/default.lua +++ b/Themes/_fallback/Graphics/Player combo/default.lua @@ -2,18 +2,17 @@ local c; local player = Var "Player"; local ShowComboAt = THEME:GetMetric("Combo", "ShowComboAt"); local Pulse = THEME:GetMetric("Combo", "PulseCommand"); +local PulseLabel = THEME:GetMetric("Combo", "PulseLabelCommand"); local NumberMinZoom = THEME:GetMetric("Combo", "NumberMinZoom"); local NumberMaxZoom = THEME:GetMetric("Combo", "NumberMaxZoom"); local NumberMaxZoomAt = THEME:GetMetric("Combo", "NumberMaxZoomAt"); +local LabelMinZoom = THEME:GetMetric("Combo", "LabelMinZoom"); +local LabelMaxZoom = THEME:GetMetric("Combo", "LabelMaxZoom"); + local t = Def.ActorFrame { ---[[ LoadActor(THEME:GetPathG("Combo","100Milestone")) .. { - Name="OneHundredMilestone"; - }; - LoadActor(THEME:GetPathG("Combo","1000Milestone")) .. { - Name="OneThousandMilestone"; - }; --]] + InitCommand=cmd(vertalign,bottom); LoadFont( "Combo", "numbers" ) .. { Name="Number"; OnCommand = THEME:GetMetric("Combo", "NumberOnCommand"); @@ -28,7 +27,25 @@ local t = Def.ActorFrame { c.Number:visible(false); c.Label:visible(false); end; - + -- Milestones: + -- 25,50,100,250,600 Multiples; +--[[ if (iCombo % 100) == 0 then + c.OneHundredMilestone:playcommand("Milestone"); + elseif (iCombo % 250) == 0 then + -- It should really be 1000 but thats slightly unattainable, since + -- combo doesnt save over now. + c.OneThousandMilestone:playcommand("Milestone"); + else + return + end; --]] + TwentyFiveMilestoneCommand=function(self,parent) + (cmd(skewy,-0.125;decelerate,0.325;skewy,0))(self); + end; + ToastyAchievedMessageCommand=function(self,params) + if params.PlayerNumber == player then + (cmd(thump,2;effectclock,'beat'))(self); + end; + end; ComboCommand=function(self, param) local iCombo = param.Misses or param.Combo; if not iCombo or iCombo < ShowComboAt then @@ -39,16 +56,21 @@ local t = Def.ActorFrame { local labeltext = ""; if param.Combo then - labeltext = "Combo"; + labeltext = "COMBO"; +-- c.Number:playcommand("Reset"); else - labeltext = "Misses"; + labeltext = "MISSES"; +-- c.Number:playcommand("Miss"); end c.Label:settext( labeltext ); c.Label:visible(false); 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) ); @@ -62,25 +84,21 @@ local t = Def.ActorFrame { elseif param.FullComboW3 then c.Number:diffuse(color("#a4ff00")); c.Number:stopeffect(); - else - c.Number:diffuse(color("#ffffff")); + elseif param.Combo then + c.Number:diffuse(PlayerColor(player)); c.Number:stopeffect(); + (cmd(diffuse,Color("White");diffusebottomedge,color("0.5,0.5,0.5,1")))(c.Label); + else + c.Number:diffuse(color("#ff0000")); + c.Number:stopeffect(); + (cmd(diffuse,Color("Red");diffusebottomedge,color("0.5,0,0,1")))(c.Label); end -- Pulse Pulse( c.Number, param ); --- Pulse( c.Label, param ); ---[[ -- Milestone Logic - if (iCombo % 100) == 0 then - c.OneHundredMilestone:playcommand("Milestone"); - elseif (iCombo % 250) == 0 then - -- It should really be 1000 but thats slightly unattainable, since - -- combo doesnt save over now. - c.OneThousandMilestone:playcommand("Milestone"); - else - return - end; --]] + PulseLabel( c.Label, param ); + -- Milestone Logic end; - ScoreChangedMessageCommand=function(self,param) +--[[ ScoreChangedMessageCommand=function(self,param) local iToastyCombo = param.ToastyCombo; if iToastyCombo and (iToastyCombo > 0) then -- (cmd(thump;effectmagnitude,1,1.2,1;effectclock,'beat'))(c.Number) @@ -88,7 +106,7 @@ local t = Def.ActorFrame { else -- c.Number:stopeffect(); end; - end; + end; --]] }; return t; diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 20d70ff439..861982d917 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -231,10 +231,14 @@ ShowMissesAt=MissCombo() NumberMinZoom=0.8 NumberMaxZoom=1 NumberMaxZoomAt=100 +# +LabelMinZoom=0.75*0.75 +LabelMaxZoom=0.75*1 # Things the combo does when you bang on it, and what the text does -PulseCommand=%function(self,param) self:stoptweening(); self:zoom(1.4*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); end -NumberOnCommand=y,240-216-2;shadowlength,1;horizalign,right;vertalign,bottom; -LabelOnCommand=x,6;y,22;shadowlength,1;horizalign,left;vertalign,bottom +PulseCommand=%function(self,param) self:stoptweening(); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); end +PulseLabelCommand=%function(self,param) self:stoptweening(); self:zoom(1.075*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); 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 [HoldJudgment] # System Direction @@ -1550,7 +1554,7 @@ ShowScroller=true WrapScroller=true ShowIcon=false # -ChoiceNormal="applydefaultoptions;name,Normal;playmode,regular;screen,ScreenGameInformation" +ChoiceNormal="applydefaultoptions;name,Normal;playmode,regular;screen,ScreenSelectMusic" ChoiceExtended="applydefaultoptions;name,Extended;playmode,nonstop;screen,ScreenSelectCourse" [ScreenSelectCharacter] @@ -1698,7 +1702,7 @@ NumTicks=10 MaxTicks=14 TicksX=0 TicksY=0 -TicksOnCommand=shadowlength,0;stroke +TicksOnCommand=shadowlength,0; TicksSetCommand=%function(self,param) self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end ShowTicks=false ShowMeter=true @@ -2140,7 +2144,7 @@ Class="ScreenOptionsMaster" Fallback="ScreenOptionsSimpleService" NextScreen="ScreenTitleMenu" PrevScreen="ScreenTitleMenu" -LineNames="1,2,13,3,10,11,4,12,6,5,Theme,8,9" +LineNames="SD,1,2,13,3,10,11,4,12,6,5,Theme,8,9" Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" Line2="gamecommand;screen,ScreenTestInput;name,Test Input" Line13="gamecommand;screen,ScreenSelectGame;name,Select Game" @@ -2152,9 +2156,11 @@ Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options" Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options" Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options" Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" -LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" Line9="gamecommand;screen,ScreenReloadSongs;name,Reload Songs" +LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" +LineSD="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction" + [ScreenOptionsServiceChild] Fallback="ScreenOptionsMaster" LightsMode="LightsMode_MenuStartAndDirections"