fallback changes from midi; default next

This commit is contained in:
AJ Kelly
2010-08-03 18:07:54 -05:00
parent b5a7c11b4f
commit 5337914b8b
4 changed files with 50 additions and 142 deletions
@@ -0,0 +1 @@
Common Normal
+2 -131
View File
@@ -2,135 +2,6 @@
local nilColor = color("0,0,0,0")
-- Original Color Module.
Color = {
-- UI Colors
-- These colors are common to the theme interface and should be used
-- often to make use of these efficiently.
Enabled = nilColor,
Disabled = nilColor,
Focused = nilColor,
Outline = nilColor,
Shadow = nilColor,
Important = nilColor,
Reward = nilColor,
Special = color("#f7941d"),
-- Global Colors
-- These colors are usually tied to colors that shouldn't change that
-- much throughout themes, but should be easily accessible.
-- ( Do note that I want to remove '*Color' entirely, it'll look neater )
Player = {
P1 = color("#ef403d"),
P2 = 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("0.0,0.9,1.0,1"), -- purple
Difficulty_Easy = color("0.9,0.9,0.0,1"), -- green
Difficulty_Medium = color("1.0,0.1,0.1,1"), -- yellow
Difficulty_Hard = color("0.2,1.0,0.2,1"), -- red
Difficulty_Challenge = color("0.2,0.6,1.0,1"), -- light blue
Difficulty_Edit = color("0.8,0.8,0.8,1"), -- gray
Difficulty_Couple = color("#ed0972"), -- hot pink
Difficulty_Routine = color("#ff9a00") -- orange
},
Course = {
Beginner = color("0.0,0.9,1.0,1"), -- purple
Easy = color("0.9,0.9,0.0,1"), -- green
Medium = color("1.0,0.1,0.1,1"), -- yellow
Hard = color("0.2,1.0,0.2,1"), -- red
Challenge = color("0.2,0.6,1.0,1"), -- light blue
--[[ Repeated just in case ]]
Edit = color("0.8,0.8,0.8,1"), -- gray
Couple = color("#ed0972"), -- hot pink
Routine = color("#ff9a00"), -- orange
--[[ Repeated as per Difficulty, since 'Custom' difficulty ranks
can probably repeat these! ]]
Difficulty_Beginner = color("0.0,0.9,1.0,1"), -- purple
Difficulty_Easy = color("0.9,0.9,0.0,1"), -- green
Difficulty_Medium = color("1.0,0.1,0.1,1"), -- yellow
Difficulty_Hard = color("0.2,1.0,0.2,1"), -- red
Difficulty_Challenge = color("0.2,0.6,1.0,1") -- light blue
},
CourseDifficultyColors = {
Beginner = color("0.0,0.9,1.0,1"), -- purple
Easy = color("0.9,0.9,0.0,1"), -- green
Medium = color("1.0,0.1,0.1,1"), -- yellow
Hard = color("0.2,1.0,0.2,1"), -- red
Challenge = color("0.2,0.6,1.0,1"), -- light blue
--[[ Repeated just in case ]]
Edit = color("0.8,0.8,0.8,1"), -- gray
Couple = color("#ed0972"), -- hot pink
Routine = color("#ff9a00"), -- orange
--[[ Repeated as per Difficulty, since 'Custom' difficulty ranks
can probably repeat these! ]]
Difficulty_Beginner = color("0.0,0.9,1.0,1"), -- purple
Difficulty_Easy = color("0.9,0.9,0.0,1"), -- green
Difficulty_Medium = color("1.0,0.1,0.1,1"), -- yellow
Difficulty_Hard = color("0.2,1.0,0.2,1"), -- red
Difficulty_Challenge = color("0.2,0.6,1.0,1") -- light blue
},
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("#00aeef"),
JudgmentLine_W2 = color("#fff568"),
JudgmentLine_W3 = color("#a4ff00"),
JudgmentLine_W4 = color("#34bfff"),
JudgmentLine_W5 = color("#e44dff"),
JudgmentLine_Held = color("#FFFFFF"),
JudgmentLine_Miss = color("#ff3c3c"),
JudgmentLine_MaxCombo = color("#ffc600")
},
JudgmentLine = {
JudgmentLine_W1 = color("#00aeef"),
JudgmentLine_W2 = color("#fff568"),
JudgmentLine_W3 = color("#a4ff00"),
JudgmentLine_W4 = color("#34bfff"),
JudgmentLine_W5 = color("#e44dff"),
JudgmentLine_Held = color("#FFFFFF"),
JudgmentLine_Miss = color("#ff3c3c"),
JudgmentLine_MaxCombo = color("#ffc600")
},
Grade = {},
Menu = {},
StepsType = {},
Combo = {
Normal = nilColor,
StreakW1 = nilColor,
StreakW2 = nilColor,
StreakW3 = nilColor,
Misses = nilColor
},
Song = {
Extra = nilColor,
Unlock = nilColor
},
-- Color Library
-- These colors are pure swatch colors and are here purely to be used
-- on demand without having to type color("stuff") or dig through
@@ -160,7 +31,7 @@ Color = {
end
}
-- Remapped Color Module, since some themes are crazy
Colors = Color
Colors = Color;
GameColor = {
PlayerColors = {
@@ -208,7 +79,7 @@ GameColor = {
Stage_Demo = color("#FFFFFF")
},
Judgment = {
JudgmentLine_W1 = color("#00aeef"),
JudgmentLine_W1 = color("#bfeaff"),
JudgmentLine_W2 = color("#fff568"),
JudgmentLine_W3 = color("#a4ff00"),
JudgmentLine_W4 = color("#34bfff"),
@@ -0,0 +1 @@
_silent
+46 -11
View File
@@ -2733,17 +2733,23 @@ ResetGameState=true
BackGoesToStartScreen=true
#
AttractVolume=true
#
TimerMetricsGroup="MenuTimerNoSound"
[ScreenRanking]
Class="ScreenRanking"
Fallback="ScreenAttract"
#
TimerSeconds=-1
#
ResetGameState=true
StepsTypesToHide="dance-couple,dance-solo,dance-routine,pump-halfdouble,pump-couple"
PageFadeSeconds=1.0
CoursesToShow=GetCoursesToShowRanking()
SecondsPerPage=5
#
RankingType="Category"
#
RowSpacingX=0
RowSpacingY=60
ColSpacingX=0
@@ -2847,15 +2853,6 @@ ScoreOffsetStartX=-154
ScoreOffsetY=0
ScoreOnCommand=zoom,0.7;ztest,1
ScoreOffCommand=
[ScreenHowToPlay]
UsePlayer=false
UsePad=false
UseCharacter=false
#
NumW2s=0
NumMisses=0
# 05 # B
# 05 # C
@@ -3780,8 +3777,7 @@ UserOffCommand=
Fallback="ScreenAttract"
#
PrevScreen=Branch.Init()
NextScreen="ScreenDemonstration"
NextScreen="ScreenDemonstration"
NextScreen="ScreenHowToPlay"
StartScreen=Branch.TitleMenu()
#
ForceTimer=true
@@ -3789,6 +3785,45 @@ TimerSeconds=5
#
TimerMetricsGroup="MenuTimerNoSound"
TimerOnCommand=visible,false
[ScreenHowToPlay]
Class="ScreenHowToPlay"
Fallback="ScreenAttract"
#
ForceTimer=true
TimerSeconds=25
#
PrevScreen="ScreenLogo"
NextScreen="ScreenDemonstration"
StartScreen=Branch.TitleMenu()
#
ResetGameState=false
SecondsToShow=25
#
UseLifeMeterBar=true
LifeMeterBarX=SCREEN_CENTER_X+160
LifeMeterBarY=SCREEN_TOP+40
LifeMeterBarOnCommand=addy,-60;sleep,2.4;linear,0.2;addy,60
#
UseCharacter=true
CharacterX=SCREEN_CENTER_X-200
CharacterY=SCREEN_CENTER_Y+160
CharacterOnCommand=zoom,20;addy,-SCREEN_WIDTH;sleep,3.0;decelerate,0.4;addy,SCREEN_WIDTH
#
UsePad=true
PadX=SCREEN_CENTER_X-280
PadY=SCREEN_CENTER_Y+70
PadOnCommand=zoom,15;rotationy,180;sleep,2.0;linear,1.0;rotationy,360;zoom,20;addx,190;addy,80
#
UsePlayer=true
PlayerX=SCREEN_CENTER_X+160
PlayerY=SCREEN_CENTER_Y
PlayerOnCommand=
#
SongBPM=100
NumW2s=4
NumMisses=6
[ScreenTitleJoin]
Fallback="ScreenTitleMenu"
ChoiceNames="1"