actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'changes-beta4' of https://github.com/Midiman/stepmania

Browse Source
This commit is contained in:
Colby Klein
2014-09-01 09:28:57 -07:00
parent d1cdd04099 d9d735e44a
commit c31ef08aeb
4 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Scripts/02 Branches.lua
+1 -1
View File
@@ -232,7 +232,7 @@ Branch = {
end
if STATSMAN:GetStagesPlayed() == 0 then
return "ScreenSelectPlayMode"
return "ScreenSelectStyle"
end
return "ScreenProfileLoad"
Themes/_fallback/Scripts/02 Colors.lua
+14 -5
View File
@@ -47,9 +47,13 @@ setmetatable(Color, { __call = function(self, c) return self[c] end })
GameColor = {
PlayerColors = {
PLAYER_1 = color("#ff4444"),
PLAYER_1 = color("#ed5565"),
PLAYER_2 = color("#5d9cec"),
},
PlayerDarkColors = {
PLAYER_1 = color("#da4453"),
PLAYER_2 = color("#4a89dc"),
},
Difficulty = {
--[[ These are for 'Custom' Difficulty Ranks. It can be very useful
in some cases, especially to apply new colors for stuff you
@@ -126,13 +130,18 @@ function ColorDarkTone(c)
end
function PlayerColor( pn )
if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end
if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end
return color("1,1,1,1")
end
function PlayerScoreColor( pn )
if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
return PlayerColor( pn );
end
function PlayerDarkColor( pn )
if pn == PLAYER_1 then return GameColor.PlayerDarkColors["PLAYER_1"] end
if pn == PLAYER_2 then return GameColor.PlayerDarkColors["PLAYER_2"] end
return color("1,1,1,1")
end