kill everything else until the game doesnt crash or throw a million l…

…ua errors

Themes/Til Death/BGAnimations/ScreenEvaluation overlay/default.lua

@@ -1,12 +1,12 @@
 local t = Def.ActorFrame{}
-t[#t+1] = LoadActor("../_frame");
-t[#t+1] = LoadActor("../_PlayerInfo");
-t[#t+1] = LoadActor("currenttime");
+t[#t+1] = LoadActor("../_frame")
+t[#t+1] = LoadActor("../_PlayerInfo")
+t[#t+1] = LoadActor("currenttime")
 
 
 --what the settext says
 t[#t+1] = LoadFont("Common Large")..{
-	InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('positive');settext,"Results:";);
+	InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('positive');settext,"Results:")
 }
 
 --Group folder name
@@ -16,19 +16,15 @@ local frameX = SCREEN_WIDTH-5
 local frameY = 15
 
 t[#t+1] = LoadFont("Common Large") .. {
-	InitCommand=cmd(xy,frameX,frameY+5;halign,1;zoom,0.55;maxwidth,(frameWidth-40)/0.35);
-	BeginCommand=cmd(queuecommand,"Set";diffuse,getMainColor('positive'));
+	InitCommand=cmd(xy,frameX,frameY+5;halign,1;zoom,0.55;maxwidth,(frameWidth-40)/0.35),
+	BeginCommand=cmd(queuecommand,"Set";diffuse,getMainColor('positive')),
 	SetCommand=function(self)
 		local song = GAMESTATE:GetCurrentSong()
-		local course = GAMESTATE:GetCurrentCourse()
-		if song ~= nil and (not GAMESTATE:IsCourseMode()) then
+		if song ~= nil then
 			self:settext(song:GetGroupName())
-		end;
-		if course ~= nil and GAMESTATE:IsCourseMode() then
-			self:settext(course:GetGroupName())
-		end;
-	end;
-};
+		end
+	end
+}
 
 t[#t+1] = LoadActor("../_cursor");
 

Themes/Til Death/BGAnimations/ScreenEvaluation underlay.lua

@@ -1,15 +1,14 @@
-local enabled = themeConfig:get_data().global.SongBGEnabled and not(GAMESTATE:IsCourseMode())
+local enabled = themeConfig:get_data().global.SongBGEnabled
 local brightness = 0.4
 local t = Def.ActorFrame{}
 
 if enabled then
 	t[#t+1] = LoadSongBackground()..{
 		BeginCommand=function(self)
 			self:scaletocover(0,0,SCREEN_WIDTH,SCREEN_BOTTOM)
-			self:diffusealpha(brightness);
-		end;
+			self:diffusealpha(brightness)
+		end
 	}
 end
 
-
 return t

Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songinfo.lua

@@ -1,44 +1,40 @@
 local update = false
 local t = Def.ActorFrame{
-	BeginCommand=cmd(queuecommand,"Set");
-	OffCommand=cmd(bouncebegin,0.2;xy,-500,0;); -- visible(false) doesn't seem to work with sleep
-	OnCommand=cmd(bouncebegin,0.2;xy,0,0;);
+	BeginCommand=cmd(queuecommand,"Set"),
+	OffCommand=cmd(bouncebegin,0.2;xy,-500,0), -- visible(false) doesn't seem to work with sleep
+	OnCommand=cmd(bouncebegin,0.2;xy,0,0),
 	SetCommand=function(self)
 		self:finishtweening()
 		if getTabIndex() == 0 then
-			self:queuecommand("On");
+			self:queuecommand("On")
 			update = true
 		else 
-			self:queuecommand("Off");
+			self:queuecommand("Off")
 			update = false
-		end;
-	end;
-	TabChangedMessageCommand=cmd(queuecommand,"Set");
-	PlayerJoinedMessageCommand=cmd(queuecommand,"Set");
-};
-
+		end
+	end,
+	TabChangedMessageCommand=cmd(queuecommand,"Set"),
+	PlayerJoinedMessageCommand=cmd(queuecommand,"Set")
+}
 
 t[#t+1] = Def.Banner{
-	InitCommand=cmd(x,10;y,61;halign,0;valign,0);
+	InitCommand=cmd(x,10;y,61;halign,0;valign,0),
 	SetMessageCommand=function(self)
 		if update then
 			local top = SCREENMAN:GetTopScreen()
 			if top:GetName() == "ScreenSelectMusic" or top:GetName() == "ScreenNetSelectMusic" then
 				local song = GAMESTATE:GetCurrentSong()
-				local course = GAMESTATE:GetCurrentCourse()
 				local group = top:GetMusicWheel():GetSelectedSection()
 				if song then
 					self:LoadFromSong(song)
-				elseif course then
-					self:LoadFromCourse(song)
 				elseif group then
 					self:LoadFromSongGroup(group)
-				end;
-			end;
-		end;
+				end
+			end
+		end
 		self:scaletoclipped(capWideScale(get43size(384),384),capWideScale(get43size(120),120))
-	end;
-	CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
-};
+	end,
+	CurrentSongChangedMessageCommand=cmd(queuecommand,"Set")
+}
 
 return t

Themes/Til Death/BGAnimations/_songbg.lua

@@ -2,7 +2,7 @@ local magnitude = 0.03
 local maxDistX = SCREEN_WIDTH*magnitude
 local maxDistY = SCREEN_HEIGHT*magnitude
 
-local enabled = themeConfig:get_data().global.SongBGEnabled and not(GAMESTATE:IsCourseMode())
+local enabled = themeConfig:get_data().global.SongBGEnabled
 local brightness = 0.3
 
 local t = Def.ActorFrame{}

Themes/Til Death/Languages/en.ini

@@ -17,14 +17,6 @@ Crazy=Crazy
 Nightmare=Nightmare
 HalfDouble=Half-Double
 
-[CourseDifficulty]
-Beginner=Beginner
-Challenge=Insane
-Hard=Hard
-Easy=Easy
-Edit=Edit
-Medium=Normal
-
 [ScreenTitleMenu]
 Engage=Engage
 ColorChange=Color Config

Themes/Til Death/Scripts/02 Branches.lua

@@ -19,8 +19,6 @@ end
 function SelectMusicOrCourse()
 	if IsNetSMOnline() then
 		return "ScreenNetSelectMusic"
-	elseif GAMESTATE:IsCourseMode() then
-		return "ScreenSelectCourse"
 	else
 		return "ScreenSelectMusic"
 	end
@@ -131,12 +129,6 @@ Branch = {
 			return SelectMusicOrCourse()
 		elseif STATSMAN:GetCurStageStats():AllFailed() then
 			return GameOverOrContinue()
-		elseif GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer() == 0 then
-			if not GAMESTATE:IsCourseMode() then
-				return "ScreenEvaluationSummary"
-			else
-				return GameOverOrContinue()
-			end
 		else
 			return SelectMusicOrCourse()
 		end
@@ -216,9 +208,6 @@ Branch = {
 		return Branch.EvaluationScreen()
 	end,
 	AfterEvaluation = function()
-		if GAMESTATE:IsCourseMode() then
-			return "ScreenProfileSave"
-		else
 			local maxStages = PREFSMAN:GetPreference("SongsPerPlay")
 			local stagesLeft = GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer()
 			local allFailed = STATSMAN:GetCurStageStats():AllFailed()
@@ -237,7 +226,6 @@ Branch = {
 			else
 				return "ScreenProfileSave"
 			end
-		end
 	end,
 	AfterSummary = function()
 		return "ScreenProfileSaveSummary"

Themes/Til Death/metrics.ini

@@ -168,7 +168,6 @@ ExtraColor=getMainColor('positive')
 [BPMDisplay]
 ShowQMarksInRandomCycle=false
 RandomCycleSpeed=0.01
-CourseCycleSpeed=0.02
 
 
 [ScreenTitleMenu]
@@ -301,14 +300,9 @@ NumWheelItems=15
 
 ShowRoulette=false
 
-
 [MusicWheelItem]
-
 SongNameX=30
 SongNameOnCommand=
-CourseX=30
-CourseY=-3
-CourseOnCommand=zoom,0.875;halign,0;maxwidth,290/0.875;
 
 SectionExpandedX=10
 SectionExpandedY=-6
@@ -328,8 +322,7 @@ SortOnCommand=zoom,0.875;halign,0;stopeffect;maxwidth,capWideScale(get43size(290
 WheelNotifyIconX=215
 WheelNotifyIconY=-7
 WheelNotifyIconOnCommand=zoom,0.40;diffusealpha,0.4;
-
-
+
 [TextBanner]
 TitleOnCommand=halign,0;zoom,0.55;y,-10;maxwidth,((capWideScale(get43size(350),350))-50)/0.55;
 SubtitleOnCommand=halign,0;zoom,0.35;maxwidth,((capWideScale(get43size(350),350))-50)/0.35;y,1;