From 9c1da9cfd4e43eb6816f0ef29ff004662bca2e49 Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Fri, 19 Jul 2013 11:25:36 -0400 Subject: [PATCH] finish backouts that didn't complete because of merge conflicts --- .../ScreenSelectProfile overlay.lua | 7 +- Themes/default/Graphics/PaneDisplay text.lua | 72 +++++-------------- .../Graphics/Player judgment/default.lua | 38 +++------- 3 files changed, 32 insertions(+), 85 deletions(-) diff --git a/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua b/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua index cfb0b93c71..deb078f929 100644 --- a/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua +++ b/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua @@ -74,7 +74,10 @@ function LoadPlayerStuff(Player) }; --]] t = Def.ActorFrame { Name = 'SmallFrame'; - +--[[ Def.Quad { + InitCommand=cmd(zoomto,170+4,32+4); + OnCommand=cmd(shadowlength,1); + }; --]] InitCommand=cmd(y,-2); Def.Quad { InitCommand=cmd(zoomto,200-10,40+2); @@ -98,6 +101,7 @@ function LoadPlayerStuff(Player) t = Def.ActorScroller{ Name = 'ProfileScroller'; NumItemsToDraw=6; +-- InitCommand=cmd(y,-230/2+20;); OnCommand=cmd(y,1;SetFastCatchup,true;SetMask,200,58;SetSecondsPerItem,0.15); TransformFunction=function(self, offset, itemIndex, numItems) local focus = scale(math.abs(offset),0,2,1,0); @@ -131,6 +135,7 @@ function LoadPlayerStuff(Player) }; --]] t = LoadFont("Common Normal") .. { Name = 'SelectedProfileText'; + --InitCommand=cmd(y,160;shadowlength,1;diffuse,PlayerColor(Player)); InitCommand=cmd(y,160;shadowlength,1;); }; table.insert( ret, t ); diff --git a/Themes/default/Graphics/PaneDisplay text.lua b/Themes/default/Graphics/PaneDisplay text.lua index d928285b84..1090ca80bc 100644 --- a/Themes/default/Graphics/PaneDisplay text.lua +++ b/Themes/default/Graphics/PaneDisplay text.lua @@ -29,24 +29,12 @@ local function CreatePaneDisplayItem( _pnPlayer, _sLabel, _rcRadarCategory ) Text=string.format("%04i", 0); InitCommand=cmd(x,96;horizalign,right); OnCommand=cmd(zoom,0.5875;shadowlength,1); - CurrentSongChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentStepsP1ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentStepsP2ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentTrailP1ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentTrailP2ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentCourseChangedMessageCommand=function(self) - self:playcommand("Set"); - end; + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) local song = GAMESTATE:GetCurrentSong() local course = GAMESTATE:GetCurrentCourse() @@ -74,24 +62,12 @@ local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory ) Def.Quad { InitCommand=cmd(x,12;zoomto,50,10;horizalign,left); OnCommand=cmd(shadowlength,0;diffuse,Color("Green");diffusebottomedge,ColorLightTone(Color("Green"))); - CurrentSongChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentStepsP1ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentStepsP2ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentTrailP1ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentTrailP2ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentCourseChangedMessageCommand=function(self) - self:playcommand("Set"); - end; + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) local song = GAMESTATE:GetCurrentSong() local course = GAMESTATE:GetCurrentCourse() @@ -109,24 +85,12 @@ local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory ) LoadFont("Common Normal") .. { InitCommand=cmd(x,14;zoom,0.5;halign,0;); OnCommand=cmd(shadowlength,1;strokecolor,color("0.15,0.15,0.15,0.625")); - CurrentSongChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentStepsP1ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentStepsP2ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentTrailP1ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentTrailP2ChangedMessageCommand=function(self) - self:playcommand("Set"); - end; - CurrentCourseChangedMessageCommand=function(self) - self:playcommand("Set"); - end; + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) local song = GAMESTATE:GetCurrentSong() local course = GAMESTATE:GetCurrentCourse() diff --git a/Themes/default/Graphics/Player judgment/default.lua b/Themes/default/Graphics/Player judgment/default.lua index 75ab3e75ab..7e691b53ad 100644 --- a/Themes/default/Graphics/Player judgment/default.lua +++ b/Themes/default/Graphics/Player judgment/default.lua @@ -90,66 +90,43 @@ t[#t+1] = Def.ActorFrame { Def.Quad { Name="ProtimingGraphWindowW3"; InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth-4,16-4); - ResetCommand=function(self) - self:finishtweening(); - self:diffusealpha(1); - self:visible(false); - end; + 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,ProtimingWidth-4),16-4); - ResetCommand=function(self) - self:finishtweening(); - self:diffusealpha(1); - self:visible(false); - end; + 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,ProtimingWidth-4),16-4); - ResetCommand=function(self) - self:finishtweening(); - self:diffusealpha(1); - self:visible(false); - end; + 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,ProtimingWidth-4,16-4); - ResetCommand=function(self) - self:finishtweening(); - self:diffusealpha(0.25); - self:visible(false); - end; + ResetCommand=cmd(finishtweening;diffusealpha,0.25;visible,false); OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25); }; Def.Quad { Name="ProtimingGraphFill"; InitCommand=cmd(visible,false;y,32;zoomto,0,16-4;horizalign,left;); - ResetCommand=function(self) - self:finishtweening(); - self:diffusealpha(1); - self:visible(false); - end; + ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); OnCommand=cmd(diffuse,Color("Red");); }; Def.Quad { Name="ProtimingGraphAverage"; InitCommand=cmd(visible,false;y,32;zoomto,2,7;); - ResetCommand=function(self) - self:finishtweening(); - self:diffusealpha(0.85); - self:visible(false); - end; + ResetCommand=cmd(finishtweening;diffusealpha,0.85;visible,false); OnCommand=cmd(diffuse,Color("Orange");diffusealpha,0.85); }; Def.Quad { Name="ProtimingGraphCenter"; InitCommand=cmd(visible,false;y,32;zoomto,2,16-4;); + ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); OnCommand=cmd(diffuse,Color("White");diffusealpha,1); }; InitCommand = function(self) @@ -222,6 +199,7 @@ t[#t+1] = Def.ActorFrame { c.ProtimingGraphFill:visible( bShowProtiming ); c.ProtimingGraphFill:finishtweening(); c.ProtimingGraphFill:decelerate(1/60); +-- c.ProtimingGraphFill:zoomtowidth( clamp(fTapNoteOffset * 188,-188/2,188/2) ); c.ProtimingGraphFill:zoomtowidth( clamp( scale( fTapNoteOffset,