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

theme changes from midi; fixes percent position in selmusic + new color setup (interesting to themers only, really)

Browse Source
This commit is contained in:
AJ Kelly
2010-07-05 02:01:25 -05:00
parent a7da3658d1
commit 00b2c53057
2 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Scripts/02 Colors.lua
+65 -66
View File
@@ -162,66 +162,65 @@ Color = {
-- Remapped Color Module, since some themes are crazy
Colors = Color
local PlayerColors = {
PLAYER_1 = color("#ef403d"),
PLAYER_2 = color("#0089cf")
}
local DifficultyColors = {
--[[ These are for 'Custom' Difficulty Ranks. It can be very useful
in some cases, especially to apply new colors for stuff you
couldn't before. (huh? -aj) ]]
Beginner = color("#ff32f8"), -- light cyan
Easy = color("#2cff00"), -- green
Medium = color("#fee600"), -- yellow
Hard = color("#ff2f39"), -- red
Challenge = color("#1cd8ff"), -- light blue
Edit = color("0.8,0.8,0.8,1"), -- gray
Couple = color("#ed0972"), -- hot pink
Routine = color("#ff9a00"), -- orange
--[[ These are for courses, so let's slap them here in case someone
wanted to use Difficulty in Course and Step regions. ]]
Difficulty_Beginner = color("#ff32f8"), -- purple
Difficulty_Easy = color("#2cff00"), -- green
Difficulty_Medium = color("#fee600"), -- yellow
Difficulty_Hard = color("#ff2f39"), -- red
Difficulty_Challenge = color("#1cd8ff"), -- light blue
Difficulty_Edit = color("0.8,0.8,0.8,1"), -- gray
Difficulty_Couple = color("#ed0972"), -- hot pink
Difficulty_Routine = color("#ff9a00") -- orange
}
DifficultyColors["Crazy"] = DifficultyColors["Hard"];
GameColor = {
PlayerColors = {
PLAYER_1 = color("#ef403d"),
PLAYER_2 = color("#0089cf"),
},
Difficulty = {
--[[ These are for 'Custom' Difficulty Ranks. It can be very useful
in some cases, especially to apply new colors for stuff you
couldn't before. (huh? -aj) ]]
Beginner = color("#ff32f8"), -- light cyan
Easy = color("#2cff00"), -- green
Medium = color("#fee600"), -- yellow
Hard = color("#ff2f39"), -- red
Challenge = color("#1cd8ff"), -- light blue
Edit = color("0.8,0.8,0.8,1"), -- gray
Couple = color("#ed0972"), -- hot pink
Routine = color("#ff9a00"), -- orange
--[[ These are for courses, so let's slap them here in case someone
wanted to use Difficulty in Course and Step regions. ]]
Difficulty_Beginner = color("#ff32f8"), -- purple
Difficulty_Easy = color("#2cff00"), -- green
Difficulty_Medium = color("#fee600"), -- yellow
Difficulty_Hard = color("#ff2f39"), -- red
Difficulty_Challenge = color("#1cd8ff"), -- light blue
Difficulty_Edit = color("0.8,0.8,0.8,1"), -- gray
Difficulty_Couple = color("#ed0972"), -- hot pink
Difficulty_Routine = color("#ff9a00") -- orange
},
Stage = {
Stage_1st = color("#00ffc7"),
Stage_2nd = color("#58ff00"),
Stage_3rd = color("#f400ff"),
Stage_4th = color("#00ffda"),
Stage_5th = color("#ed00ff"),
Stage_6th = color("#73ff00"),
Stage_Next = color("#73ff00"),
Stage_Final = color("#ff0707"),
Stage_Extra1 = color("#fafa00"),
Stage_Extra2 = color("#ff0707"),
Stage_Nonstop = color("#FFFFFF"),
Stage_Oni = color("#FFFFFF"),
Stage_Endless = color("#FFFFFF"),
Stage_Event = color("#FFFFFF"),
Stage_Demo = color("#FFFFFF")
},
Judgment = {
JudgmentLine_W1 = color("#00ffc7"),
JudgmentLine_W2 = color("#f6ff00"),
JudgmentLine_W3 = color("#00ff78"),
JudgmentLine_W4 = color("#34bfff"),
JudgmentLine_W5 = color("#e44dff"),
JudgmentLine_Held = color("#FFFFFF"),
JudgmentLine_Miss = color("#ff3c3c"),
JudgmentLine_MaxCombo = color("#ffc600")
},
};
GameColor.Difficulty["Crazy"] = GameColor.Difficulty["Hard"];
-- DifficultyColors["Freestyle"] = Color["Purple"];
DifficultyColors["Nightmare"] = DifficultyColors["Challenge"];
local StageColors = {
Stage_1st = color("#00ffc7"),
Stage_2nd = color("#58ff00"),
Stage_3rd = color("#f400ff"),
Stage_4th = color("#00ffda"),
Stage_5th = color("#ed00ff"),
Stage_6th = color("#73ff00"),
Stage_Next = color("#73ff00"),
Stage_Final = color("#ff0707"),
Stage_Extra1 = color("#fafa00"),
Stage_Extra2 = color("#ff0707"),
Stage_Nonstop = color("#FFFFFF"),
Stage_Oni = color("#FFFFFF"),
Stage_Endless = color("#FFFFFF"),
Stage_Event = color("#FFFFFF"),
Stage_Demo = color("#FFFFFF")
}
local JudgmentColors = {
JudgmentLine_W1 = color("#00ffc7"),
JudgmentLine_W2 = color("#f6ff00"),
JudgmentLine_W3 = color("#00ff78"),
JudgmentLine_W4 = color("#34bfff"),
JudgmentLine_W5 = color("#e44dff"),
JudgmentLine_Held = color("#FFFFFF"),
JudgmentLine_Miss = color("#ff3c3c"),
JudgmentLine_MaxCombo = color("#ffc600")
}
GameColor.Difficulty["Nightmare"] = GameColor.Difficulty["Challenge"];
--[[ Fallbacks ]]
function Color(c)
@@ -265,16 +264,16 @@ function PlayerScoreColor( pn )
end
function CustomDifficultyToColor( sCustomDifficulty )
return DifficultyColors[sCustomDifficulty]
return GameColor.Difficulty[sCustomDifficulty]
end
function CustomDifficultyToDarkColor( sCustomDifficulty )
local c = DifficultyColors[sCustomDifficulty]
local c = GameColor.Difficulty[sCustomDifficulty]
return { c[1]/2, c[2]/2, c[3]/2, c[4] }
end
function CustomDifficultyToLightColor( sCustomDifficulty )
local c = DifficultyColors[sCustomDifficulty]
local c = GameColor.Difficulty[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] }
end
@@ -283,7 +282,7 @@ function StepsOrTrailToColor(StepsOrTrail)
end
function StageToColor( stage )
local c = Colors.Stage[stage]
local c = GameColor.Stage[stage]
if c then
return c
end
@@ -291,12 +290,12 @@ function StageToColor( stage )
end
function StageToStrokeColor( stage )
local c = StageColors[stage]
local c = GameColor.Stage[stage]
return { c[1]/2, c[2]/2, c[3]/2, c[4] }
end
function JudgmentLineToColor( i )
local c = JudgmentColors[i]
local c = GameColor.Judgment[i]
if c then
return c
end
@@ -304,6 +303,6 @@ function JudgmentLineToColor( i )
end
function JudgmentLineToStrokeColor( i )
local c = JudgmentColors[i]
local c = GameColor.Judgment[i]
return { c[1]/2, c[2]/2, c[3]/2, c[4] }
end
Themes/default/metrics.ini
+2 -2
View File
@@ -1196,13 +1196,13 @@ StepsDisplayP2OffCommand=bouncebegin,0.15;zoomx,0;
# StepsDisplayP2CurrentStepsP2ChangedMessageCommand=stoptweening;zoom,1.2;decelerate,0.1;zoom,1
#
ShowPercentScoreP1=GAMESTATE:IsHumanPlayer(PLAYER_1)
PercentScoreP1X=SCREEN_CENTER_X-80
PercentScoreP1X=SCREEN_CENTER_X-80-1
PercentScoreP1Y=SCREEN_BOTTOM-60
PercentScoreP1OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowPercentScoreP1");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y
PercentScoreP1OffCommand=bouncebegin,0.15;zoomx,0;
#
ShowPercentScoreP2=GAMESTATE:IsHumanPlayer(PLAYER_2)
PercentScoreP2X=SCREEN_CENTER_X+160
PercentScoreP2X=SCREEN_CENTER_X+160-1
PercentScoreP2Y=SCREEN_BOTTOM-60
PercentScoreP2OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowPercentScoreP2");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y
PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0;