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

Themes/_fallback/Scripts/02 Other.lua

@@ -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
 

Themes/_fallback/Scripts/02 Utilities.lua

@@ -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())

Themes/_fallback/metrics.ini

@@ -1159,7 +1159,6 @@ RequireStepOnMines=false
 InitialHoldLife=IsGame("pump") and 0.05 or 1
 MaxHoldLife=1
 RollBodyIncrementsCombo=false
-#ScoreMissedHoldsAndRolls=not IsGame("pump")
 ScoreMissedHoldsAndRolls=not IsGame("pump") and not IsGame("dance")
 PercentUntilColorCombo=0.25
 ComboStoppedAt=50
@@ -1816,7 +1815,7 @@ UpdateOnMessage=""
 #
 NumChoicesOnPage1=100
 DefaultChoice="GameStart"
-ChoiceNames="GameStart,Options,Edit,Jukebox,ReportBug,IRC,Exit"
+ChoiceNames="GameStart,Options,Edit,Jukebox,GameSelect,Exit"
 ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame()
 #ChoiceQuickPlay="applydefaultoptions;text,Quick Play;"
 ChoiceOptions="screen,ScreenOptionsService;text,Options"
@@ -2085,8 +2084,8 @@ ChangeGroupsWithGameButtons=false
 PreviousGroupButton="MenuUp"
 NextGroupButton="MenuDown"
 #
-TwoPartSelection=IsGame("pump")
-TwoPartConfirmsOnly=IsGame("pump")
+TwoPartSelection=false
+TwoPartConfirmsOnly=false
 TwoPartTimerSeconds=30
 #
 SampleMusicDelay=0.25