fix gameplay UI for dance solo

...mostly by removing features.
Simply-Love · May 31, 2018 · b84b1c2 · b84b1c2
1 parent 6483d6e
commit b84b1c2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/BGAnimations/ScreenGameplay underlay/PerPlayer/StepStatistics/default.lua b/BGAnimations/ScreenGameplay underlay/PerPlayer/StepStatistics/default.lua
@@ -5,6 +5,7 @@ local pn = ToEnumShortString(player)
 if SL[pn].ActiveModifiers.TargetStatus ~= "Step Statistics"
 or SL.Global.Gamestate.Style ~= "single"
 or SL.Global.GameMode == "Casual"
+or GAMESTATE:GetCurrentStyle():GetStepsType() == "StepsType_Dance_Solo"
 or (PREFSMAN:GetPreference("Center1Player") and not IsUsingWideScreen())
 then
 	return

diff --git a/BGAnimations/ScreenGameplay underlay/PerPlayer/TargetScore/default.lua b/BGAnimations/ScreenGameplay underlay/PerPlayer/TargetScore/default.lua
@@ -1,6 +1,8 @@
 local player = ...
 local pn = ToEnumShortString(player)
 
+local IsPlayingDanceSolo = (GAMESTATE:GetCurrentStyle():GetStepsType() == "StepsType_Dance_Solo")
+
 -- if nobody wants us, we won't appear
 if (SL[pn].ActiveModifiers.TargetStatus == "Disabled"
 or SL[pn].ActiveModifiers.TargetStatus == "Step Statistics"

diff --git a/BGAnimations/ScreenSelectStyle overlay/choice.lua b/BGAnimations/ScreenSelectStyle overlay/choice.lua
@@ -21,7 +21,7 @@ local drawNinePanelPad = function(color, xoffset)
 				self:x(zoomFactor * self:GetWidth())
 				self:y(zoomFactor * self:GetHeight())
 
-				if gameName == "pump" or gameName == "techno" or gameName == "dance" and choiceName == "Solo" then
+				if gameName == "pump" or gameName == "techno" or gameName == "dance" and choiceName == "solo" then
 					self:diffuse(DifficultyIndexColor(color))
 				else
 					self:diffuse(0.2,0.2,0.2,1)
@@ -49,7 +49,7 @@ local drawNinePanelPad = function(color, xoffset)
 				self:x(zoomFactor * self:GetWidth() * 3)
 				self:y(zoomFactor * self:GetHeight())
 
-				if gameName == "pump" or gameName == "techno" or gameName == "dance" and choiceName == "Solo" then
+				if gameName == "pump" or gameName == "techno" or gameName == "dance" and choiceName == "solo" then
 					self:diffuse(DifficultyIndexColor(color))
 				else
 					self:diffuse(0.2,0.2,0.2,1)

diff --git a/Scripts/SL-Helpers.lua b/Scripts/SL-Helpers.lua
@@ -58,10 +58,10 @@ end
 function GetNotefieldX( player )
 	local p = ToEnumShortString(player)
 
-	local IsUsingSoloSingles = PREFSMAN:GetPreference('Center1Player')
+	local IsPlayingDanceSolo = (GAMESTATE:GetCurrentStyle():GetStepsType() == "StepsType_Dance_Solo")
+	local IsUsingSoloSingles = PREFSMAN:GetPreference('Center1Player') or IsPlayingDanceSolo
 	local NumPlayersEnabled = GAMESTATE:GetNumPlayersEnabled()
 	local NumSidesJoined = GAMESTATE:GetNumSidesJoined()
-	local IsPlayingDanceSolo = (GAMESTATE:GetCurrentStyle():GetStepsType() == "StepsType_Dance_Solo")
 
 	if IsUsingSoloSingles and NumPlayersEnabled == 1 and NumSidesJoined == 1 then return _screen.cx end
 	if GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_OnePlayerTwoSides" then return _screen.cx end

diff --git a/Scripts/SL-PlayerOptions.lua b/Scripts/SL-PlayerOptions.lua
@@ -252,7 +252,12 @@ local Overrides = {
 	-------------------------------------------------------------------------
 	TargetStatus = {
 		Values = function()
-			local choices = { "Disabled", "Target Score Graph" }
+			local choices = { "Disabled" }
+
+			if not GAMESTATE:GetCurrentStyle():GetStepsType() == "StepsType_Dance_Solo" then
+				choice[#choices+1] = "Target Score Graph"
+			end
+
 			if GAMESTATE:GetCurrentStyle():GetName() == "single" and not (PREFSMAN:GetPreference("Center1Player") and not IsUsingWideScreen()) then
 				choices[#choices+1] = "Step Statistics"
 			end