idk

Docs/credits.txt

@@ -132,4 +132,4 @@ NitroX72
 Wanny
 Tio
 Cerbo
-Daisuke Master
+Daisuke Master

Themes/_fallback/Scripts/03 ProductivityHelpers.lua

@@ -31,6 +31,28 @@ function Center1Player()
 	GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_OnePlayerOneSide";
 end
 
+--[[ 3.9 Conditionals ]]
+Condition = {
+	Hour = function()
+		return Hour()
+	end,
+	IsDemonstration = function()
+		return GAMESTATE:IsDemonstration()
+	end,
+	CurSong = function(sSongName)
+		return GAMESTATE:GetCurrentSong():GetDisplayMainTitle() == sSongName
+	end,
+	DayOfMonth = function()
+		return DayOfMonth()
+	end,
+	MonthOfYear = function()
+		return MonthOfYear()
+	end,
+	UsingModifier = function(pnPlayer, sModifier)
+		return GAMESTATE:PlayerIsUsingModifier( pnPlayer, sModifier );
+	end,
+}
+
 --[[ Aliases ]]
 
 -- Blend Modes

Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua

@@ -114,6 +114,8 @@ t[#t+1] = StandardDecorationFromFileOptional("DifficultyList","DifficultyList");
 t[#t+1] = StandardDecorationFromFileOptional("CourseContentsList","CourseContentsList");
 t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay");
 t[#t+1] = StandardDecorationFromFileOptional("BPMLabel","BPMLabel");
+--[[ t[#t+1] = StandardDecorationFromFileOptional("NegativeDisplay","NegativeDisplay") .. {
+}; --]]
 
 t[#t+1] = StandardDecorationFromFileOptional("SongTime","SongTime") .. {
 	SetCommand=function(self)

Themes/default/Graphics/ScreenGameplay SongTitle.lua

@@ -11,5 +11,6 @@ return LoadFont("ScreenGameplay","SongTitle") .. {
 			sText = vCourse:GetDisplayFullTitle() .. " - " .. vSong:GetDisplayFullTitle();
 		end
 		self:settext( sText );
+		self:playcommand( "On" );
 	end;
 };

Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua

@@ -21,6 +21,10 @@ t[#t+1] = Def.ActorFrame {
 	LoadFont("_helveticaneuelt std extblk cn 42px")..{
 		InitCommand=cmd(y,27.5;zoom,0.45;maxwidth,320*1.6;uppercase,true;settext,THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation"));
 	};
+	LoadActor("_background base") .. {
+		DisabledCommand=cmd(diffuse,color("0,0,0,0.5"));
+		EnabledCommand=cmd(diffuse,color("1,1,1,0"));
+	};
 	--[[
 	LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. {
 		DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1"));

Themes/default/metrics.ini

@@ -1200,9 +1200,9 @@ SongOptionsFrameHideCommand=linear,0.3;diffusealpha,0
 #
 CDTitleX=SCREEN_CENTER_X-160+90
 CDTitleY=SCREEN_TOP+160+(36/2)+8
-CDTitleFrontCommand=visible,false
-CDTitleBackCommand=
-CDTitleOnCommand=draworder,106;zoom,0.75;diffusealpha,0.7;zoom,0;bounceend,0.35;zoom,0.75
+CDTitleFrontCommand=diffuse,color('0.5,0.5,0.5,1');cullmode,'CullMode_Front'
+CDTitleBackCommand=cullmode,'CullMode_Back'
+CDTitleOnCommand=draworder,106;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0;fov,90
 CDTitleOffCommand=bouncebegin,0.15;zoomx,0;
 #
 ScoreFrameP1X=
@@ -1333,9 +1333,6 @@ TimerSeconds=3
 #
 WaitForChildrenBeforeTweening=true
 [ScreenGameplay]
-ScreenInitCommand=%function(self) \
-	SCREENMAN:SystemMessage( tostring( self:Center1Player() ) ); \
-end;
 ShowLifeMeterForDisabledPlayers=false
 #
 SongMeterDisplayX=SCREEN_CENTER_X
@@ -1346,7 +1343,7 @@ SongMeterDisplayOffCommand=
 ShowSongTitle=true
 SongTitleX=SCREEN_CENTER_X
 SongTitleY=SCREEN_TOP+50+12
-SongTitleOnCommand=draworder,55;shadowlength,1;zoom,0.5;
+SongTitleOnCommand=draworder,55;shadowlength,1;basezoom,0.5;zoomy,0;sleep,1.5+0.5;smooth,0.5;zoom,1
 SongTitleOffCommand=
 #
 SongMeterDisplayP1X=SCREEN_LEFT+16

src/LifeMeterBattery.cpp

@@ -192,7 +192,13 @@ float LifeMeterBattery::GetLife() const
 
 	return float(m_iLivesLeft) / GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives;
 }
+int LifeMeterBattery::GetRemainingLives() const
+{
+	if( !GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives )
+		return 1;
 
+	return m_iLivesLeft;
+}
 void LifeMeterBattery::Refresh()
 {
 	// todo: make this restraint metricable + handle non-sprites -aj
@@ -239,12 +245,12 @@ class LunaLifeMeterBattery: public Luna<LifeMeterBattery>
 public:
 	static int GetLivesLeft( T* p, lua_State *L )	{ lua_pushnumber( L, p->GetLivesLeft() ); return 1; }
 	// is this right? wtf -q2x
-	//static int GetTotalLives( T* p, lua_State *L )	{ lua_pushnumber( L, GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives ); return 1; }
+	static int GetTotalLives( T* p, lua_State *L )	{ lua_pushnumber( L, GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives ); return 1; }
 
 	LunaLifeMeterBattery()
 	{
 		ADD_METHOD( GetLivesLeft );
-		//ADD_METHOD( GetTotalLives );
+		ADD_METHOD( GetTotalLives );
 	}
 };
 

src/LifeMeterBattery.h

@@ -29,6 +29,7 @@ public:
 	virtual bool IsHot() const;
 	virtual bool IsFailing() const;
 	virtual float GetLife() const;
+	virtual int GetRemainingLives() const;
 
 	void Refresh();
 	int GetLivesLeft() { return m_iLivesLeft; }