From 7f2330d8d57767426dba9116454ac36b5b1c01f7 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Fri, 29 Jan 2010 21:16:55 -0600
Subject: [PATCH] Theme changes to make other gametypes play nice

---
 .../Scripts/03 ProductivityHelpers.lua        | 28 +++++++++++++++++--
 Themes/_fallback/metrics.ini                  | 14 +++++-----
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua
index 86e174023a..b831602232 100644
--- a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua	
+++ b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua	
@@ -124,7 +124,7 @@ function pname(pn) return ToEnumShortString(pn); end;
 --[[ end helper functions ]]
 -- this code is in the public domain.
 
---[[ Lists & Functions ]]
+--[[ Lists & Functions (sm-ssc specific code) ]]
 
 function GameCompatibleModes()
 	sGame = GAMESTATE:GetCurrentGame():GetName();
@@ -137,4 +137,28 @@ function GameCompatibleModes()
 		lights = "Single", -- lights shouldn't be playable
 	};
 	return Modes[sGame];
-end
\ No newline at end of file
+end
+
+function ComboContinue()
+	sGame = GAMESTATE:GetCurrentGame():GetName();
+	local Continue = {
+		dance = GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "TapNoteScore_W2" or "TapNoteScore_W3",
+		pump = "TapNoteScore_W4",
+		beat = "TapNoteScore_W3",
+		kb7 = "TapNoteScore_W3",
+		para = "TapNoteScore_W4",
+	};
+	return Continue[sGame]
+end;
+
+function ComboMaintain()
+	sGame = GAMESTATE:GetCurrentGame():GetName();
+	local Maintain = {
+		dance = "TapNoteScore_W3",
+		pump = "TapNoteScore_W4",
+		beat = "TapNoteScore_W3",
+		kb7 = "TapNoteScore_W3",
+		para = "TapNoteScore_W4",
+	};
+	return Maintain[sGame]
+end;
\ No newline at end of file
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 96b2d30c7e..67d5ca310c 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -267,8 +267,8 @@ BannerResetFadeCommand=diffusealpha,1
 [Gameplay]
 # todo: make some of these play nice with other gametypes
 ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni"
-MinScoreToContinueCombo=GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "TapNoteScore_W2" or "TapNoteScore_W3"
-MinScoreToMaintainCombo="TapNoteScore_W3"
+MinScoreToContinueCombo=ComboContinue()
+MinScoreToMaintainCombo=ComboMaintain()
 ToastyTriggersAt=250
 
 [GameState]
@@ -377,9 +377,9 @@ DancePointsP2OffCommand=
 [LifeMeterTime]
 DangerThreshold=0.3
 InitialValue=0.5
+#
 MeterWidth=0.0
 MeterHeight=0.0
-MinLifeTime=1.0
 
 [LyricDisplay]
 LyricFrontChangedCommand=LyricCommand,"Front"
@@ -703,13 +703,13 @@ ComboUnderField=true
 PenalizeTapScoreNone=false
 JudgeHoldNotesOnSameRowTogether=false
 HoldCheckpoints=(GAMESTATE:GetCurrentGame():GetName() == "pump")
-ImmediateHoldLetGo=true
+ImmediateHoldLetGo=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
 RequireStepOnHoldHeads=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
 CheckpointsUseTimeSignatures=false
 InitialHoldLife=1
 RollBodyIncrementsCombo=true
 CheckpointsTapsSeparateJudgment=true
-ScoreMissedHoldsAndRolls=true
+ScoreMissedHoldsAndRolls=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
 
 [Profile]
 ShowCoinData=true
@@ -2491,8 +2491,8 @@ GivingUpGoesToNextScreen=false
 MinSecondsToStep=6.0
 MinSecondsToMusic=2.0
 MinSecondsToStepNextSong=2.0
-MusicFadeOutSeconds=0
-OutTransitionLength=1.5
+MusicFadeOutSeconds=0.5
+OutTransitionLength=2
 CourseTransitionLength=0.5
 BeginFailedDelay=1.0
 #