Fix routine theme errors; do not force typical pump options behavior

This commit is contained in:
Jonathan Payne
2013-10-17 19:27:42 -07:00
parent fb77dd8317
commit 7f9972ea74
7 changed files with 109 additions and 40 deletions
+3 -7
View File
@@ -43,26 +43,22 @@ function FormatNumSongsPlayed( num )
end
function JudgmentTransformCommand( self, params )
local x = 0
local y = -30
if params.bReverse then y = y * -1 end
-- This makes no sense and wasn't even being used due to misspelling.
-- if bCentered then y = y * 2 end
self:x( x )
self:x( 0 )
self:y( y )
end
function JudgmentTransformSharedCommand( self, params )
local x = -120
local y = -30
if params.bReverse then y = 30 end
if params.Player == PLAYER_1 then x = 120 end
self:x( x )
self:x( 0 )
self:y( y )
end
function ComboTransformCommand( self, params )
local x = 0
local y = 30
if params.bReverse then y = y * -1 end
@@ -73,7 +69,7 @@ function ComboTransformCommand( self, params )
y = y + 40
end
end
self:x( x )
self:x( 0 )
self:y( y )
end
+12 -2
View File
@@ -218,8 +218,8 @@ end
function Center1Player()
local styleType = GAMESTATE:GetCurrentStyle():GetStyleType()
-- always center in OnePlayerTwoSides.
if styleType == "StyleType_OnePlayerTwoSides" then
-- always center in OnePlayerTwoSides ( Doubles ) or TwoPlayersSharedSides ( Couples )
if styleType == "StyleType_OnePlayerTwoSides" or "StyleType_TwoPlayersSharedSides" then
return true
-- only Center1P if Pref enabled and OnePlayerOneSide.
-- (implicitly excludes Rave, Battle, Versus, Routine)
@@ -230,6 +230,16 @@ function Center1Player()
end
end
function IsRoutine()
local styleType = GAMESTATE:GetCurrentStyle():GetStyleType()
if styleType == "StyleType_TwoPlayersSharedSides" then
return true
end
return false
end
Date = {
Today = function()
return string.format("%i%02i%02i", Year(), (MonthOfYear()+1), DayOfMonth())