From 4c836c48d69d4243fd7a71c8dbacede77950e345 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Sat, 5 Jan 2013 03:03:30 -0800 Subject: [PATCH] Make it bigger captain --- Themes/default/Graphics/PaneDisplay text.lua | 40 ++++++------------- .../Graphics/Player judgment/default.lua | 20 +++++----- 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/Themes/default/Graphics/PaneDisplay text.lua b/Themes/default/Graphics/PaneDisplay text.lua index 8175baeb87..1090ca80bc 100644 --- a/Themes/default/Graphics/PaneDisplay text.lua +++ b/Themes/default/Graphics/PaneDisplay text.lua @@ -20,15 +20,15 @@ end; local function CreatePaneDisplayItem( _pnPlayer, _sLabel, _rcRadarCategory ) return Def.ActorFrame { - LoadFont("Common Normal") .. { + LoadFont("Common SemiBold") .. { Text=string.upper( THEME:GetString("PaneDisplay",_sLabel) ); InitCommand=cmd(horizalign,left); - OnCommand=cmd(zoom,0.5;diffuse,color("0.9,0.9,0.9");shadowlength,1); + OnCommand=cmd(zoom,0.5875;diffuse,color("0.9,0.9,0.9");shadowlength,1); }; LoadFont("Common Normal") .. { - Text="000"; - InitCommand=cmd(x,32+8+8;horizalign,left); - OnCommand=cmd(zoom,0.5;shadowlength,1); + Text=string.format("%04i", 0); + InitCommand=cmd(x,96;horizalign,right); + OnCommand=cmd(zoom,0.5875;shadowlength,1); CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); @@ -39,9 +39,9 @@ local function CreatePaneDisplayItem( _pnPlayer, _sLabel, _rcRadarCategory ) local song = GAMESTATE:GetCurrentSong() local course = GAMESTATE:GetCurrentCourse() if not song and not course then - self:settext("000") + self:settextf("%04i", 0); else - self:settextf("%03i", GetRadarData( _pnPlayer, _rcRadarCategory ) ); + self:settextf("%04i", GetRadarData( _pnPlayer, _rcRadarCategory ) ); end end; }; @@ -83,7 +83,7 @@ local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory ) end; }; LoadFont("Common Normal") .. { - InitCommand=cmd(x,14;zoom,0.45;halign,0;); + InitCommand=cmd(x,14;zoom,0.5;halign,0;); OnCommand=cmd(shadowlength,1;strokecolor,color("0.15,0.15,0.15,0.625")); CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); @@ -121,32 +121,16 @@ t[#t+1] = Def.ActorFrame { }; -- Center CreatePaneDisplayItem( iPN, "Hands", 'RadarCategory_Hands' ) .. { - InitCommand=cmd(x,-128+16+8+74;y,-14); + InitCommand=cmd(x,8;y,-14); }; CreatePaneDisplayItem( iPN, "Rolls", 'RadarCategory_Rolls' ) .. { - InitCommand=cmd(x,-128+16+8+74;y,-14+16); + InitCommand=cmd(x,8;y,-14+16); }; CreatePaneDisplayItem( iPN, "Lifts", 'RadarCategory_Lifts' ) .. { - InitCommand=cmd(x,-128+16+8+74;y,-14+16*2); + InitCommand=cmd(x,8;y,-14+16*2); }; CreatePaneDisplayItem( iPN, "Fakes", 'RadarCategory_Fakes' ) .. { - InitCommand=cmd(x,-128+16+8+74;y,-14+16*3); - }; - -- Right - CreatePaneDisplayGraph( iPN, "S", 'RadarCategory_Stream' ) .. { - InitCommand=cmd(x,-128+16+8+74*2;y,-14); - }; - CreatePaneDisplayGraph( iPN, "V", 'RadarCategory_Voltage' ) .. { - InitCommand=cmd(x,-128+16+8+74*2;y,-14+12); - }; - CreatePaneDisplayGraph( iPN, "A", 'RadarCategory_Air' ) .. { - InitCommand=cmd(x,-128+16+8+74*2;y,-14+12*2); - }; - CreatePaneDisplayGraph( iPN, "F", 'RadarCategory_Freeze' ) .. { - InitCommand=cmd(x,-128+16+8+74*2;y,-14+12*3); - }; - CreatePaneDisplayGraph( iPN, "C", 'RadarCategory_Chaos' ) .. { - InitCommand=cmd(x,-128+16+8+74*2;y,-14+12*4); + InitCommand=cmd(x,8;y,-14+16*3); }; }; return t; \ No newline at end of file diff --git a/Themes/default/Graphics/Player judgment/default.lua b/Themes/default/Graphics/Player judgment/default.lua index 4b59bc7170..7e691b53ad 100644 --- a/Themes/default/Graphics/Player judgment/default.lua +++ b/Themes/default/Graphics/Player judgment/default.lua @@ -8,7 +8,7 @@ local function ShowProtiming() end end; local bShowProtiming = ShowProtiming(); - +local ProtimingWidth = 240; local function MakeAverage( t ) local sum = 0; for i=1,#t do @@ -83,31 +83,31 @@ t[#t+1] = Def.ActorFrame { }; Def.Quad { Name="ProtimingGraphBG"; - InitCommand=cmd(visible,false;y,32;zoomto,192,16); + InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth,16); ResetCommand=cmd(finishtweening;diffusealpha,0.8;visible,false); OnCommand=cmd(diffuse,Color("Black");diffusetopedge,color("0.1,0.1,0.1,1");diffusealpha,0.8;shadowlength,2;); }; Def.Quad { Name="ProtimingGraphWindowW3"; - InitCommand=cmd(visible,false;y,32;zoomto,192-4,16-4); + InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth-4,16-4); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W3"];); }; Def.Quad { Name="ProtimingGraphWindowW2"; - InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW2"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,192-4),16-4); + InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW2"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,ProtimingWidth-4),16-4); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W2"];); }; Def.Quad { Name="ProtimingGraphWindowW1"; - InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW1"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,192-4),16-4); + InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW1"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,ProtimingWidth-4),16-4); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W1"];); }; Def.Quad { Name="ProtimingGraphUnderlay"; - InitCommand=cmd(visible,false;y,32;zoomto,192-4,16-4); + InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth-4,16-4); ResetCommand=cmd(finishtweening;diffusealpha,0.25;visible,false); OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25); }; @@ -204,16 +204,16 @@ t[#t+1] = Def.ActorFrame { scale( fTapNoteOffset, 0,PREFSMAN:GetPreference("TimingWindowSecondsW3"), - 0,188/2), - -188/2,188/2) + 0,(ProtimingWidth-4)/2), + -(ProtimingWidth-4)/2,(ProtimingWidth-4)/2) ); c.ProtimingGraphAverage:visible( bShowProtiming ); c.ProtimingGraphAverage:zoomtowidth( clamp( scale( MakeAverage( tTotalJudgments ), 0,PREFSMAN:GetPreference("TimingWindowSecondsW3"), - 0,188), - 0,188) + 0,ProtimingWidth-4), + 0,ProtimingWidth-4) ); -- c.ProtimingGraphAverage:zoomtowidth( clamp(MakeAverage( tTotalJudgments ) * 1880,0,188) ); c.ProtimingGraphCenter:visible( bShowProtiming );