Wrapped CustomDifficulty color functions to report a nice error when a color doesn't exist.

This commit is contained in:
Kyzentun
2014-12-22 00:10:34 -07:00
parent 06c78cd59f
commit 7ee2938917
+8 -3
View File
@@ -145,17 +145,22 @@ function PlayerDarkColor( pn )
return color("1,1,1,1") return color("1,1,1,1")
end end
local function GameColorDifficultyWrapper(diff)
assert(GameColor.Difficulty[diff], "GameColor: There is no entry in GameColor.Difficulty for CustomDifficulty '" .. tostring(diff) .. "'.")
return GameColor.Difficulty[diff]
end
function CustomDifficultyToColor( sCustomDifficulty ) function CustomDifficultyToColor( sCustomDifficulty )
return GameColor.Difficulty[sCustomDifficulty] return GameColorDifficultyWrapper(sCustomDifficulty)
end end
function CustomDifficultyToDarkColor( sCustomDifficulty ) function CustomDifficultyToDarkColor( sCustomDifficulty )
local c = GameColor.Difficulty[sCustomDifficulty] local c = GameColorDifficultyWrapper(sCustomDifficulty)
return { c[1]/2, c[2]/2, c[3]/2, c[4] } return { c[1]/2, c[2]/2, c[3]/2, c[4] }
end end
function CustomDifficultyToLightColor( sCustomDifficulty ) function CustomDifficultyToLightColor( sCustomDifficulty )
local c = GameColor.Difficulty[sCustomDifficulty] local c = GameColorDifficultyWrapper(sCustomDifficulty)
return { scale(c[1],0,1,0.5,1), scale(c[2],0,1,0.5,1), scale(c[3],0,1,0.5,1), c[4] } return { scale(c[1],0,1,0.5,1), scale(c[2],0,1,0.5,1), scale(c[3],0,1,0.5,1), c[4] }
end end