From 484820424bfbcf44829c61c968f4bc33beb31bd9 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 11 Feb 2010 23:27:17 -0600
Subject: [PATCH] CourseType is optional for GetCustomDifficulty(). Sync up
 Midi's theme changes.

---
 Themes/_fallback/Scripts/02 Actor.lua            | 12 ++++++++++++
 Themes/default/Graphics/Player combo/default.lua |  4 ++--
 src/Difficulty.cpp                               |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Themes/_fallback/Scripts/02 Actor.lua b/Themes/_fallback/Scripts/02 Actor.lua
index dc14a8f5e0..f8d7c42b43 100644
--- a/Themes/_fallback/Scripts/02 Actor.lua	
+++ b/Themes/_fallback/Scripts/02 Actor.lua	
@@ -135,6 +135,18 @@ function Actor:Center()
     self:y(SCREEN_CENTER_Y);
 end;
 
+-- SSC Additions
+local DropBezier =
+{
+	0		,	0,
+	8/16	,	1,
+	12/16	,	0.5,
+	16/16	,	1,
+}
+function Actor:drop(t)
+	self:tween( t, "TweenType_Bezier", DropBezier );
+end
+
 -- (c) 2006 Glenn Maynard
 -- All rights reserved.
 --
diff --git a/Themes/default/Graphics/Player combo/default.lua b/Themes/default/Graphics/Player combo/default.lua
index ab83f074c5..0de48e19fc 100644
--- a/Themes/default/Graphics/Player combo/default.lua	
+++ b/Themes/default/Graphics/Player combo/default.lua	
@@ -40,10 +40,10 @@ local t = Def.ActorFrame {
 			return
 		end; --]]
 	TwentyFiveMilestoneCommand=function(self,parent)
-		(cmd(rotationz,125;decelerate,0.125;rotationz,0))(self);
+		(cmd(zoom,1.25;drop,0.325;zoom,1))(self);
 	end;
 	ToastyAchievedMessageCommand=function(self,parent)
-		(cmd(stopeffect;spin;effectperiod,1))(self);
+		(cmd(pulse;effectperiod,1))(self);
 	end;
 	ComboCommand=function(self, param)
 		local iCombo = param.Misses or param.Combo;
diff --git a/src/Difficulty.cpp b/src/Difficulty.cpp
index fd58d728bf..0a4cf2d244 100644
--- a/src/Difficulty.cpp
+++ b/src/Difficulty.cpp
@@ -141,7 +141,7 @@ RString GetCustomDifficulty( StepsType st, Difficulty dc, CourseType ct )
 	}
 }
 
-LuaFunction( GetCustomDifficulty, GetCustomDifficulty(Enum::Check<StepsType>(L,1), Enum::Check<Difficulty>(L, 2), Enum::Check<CourseType>(L, 3)) );
+LuaFunction( GetCustomDifficulty, GetCustomDifficulty(Enum::Check<StepsType>(L,1), Enum::Check<Difficulty>(L, 2), Enum::Check<CourseType>(L, 3, true)) );
 
 RString CustomDifficultyToLocalizedString( const RString &sCustomDifficulty )
 {