Resolve visibility/contrast issues in Lambda theme
@@ -126,7 +126,7 @@ local eval_parts = Def.ActorFrame {}
|
|||||||
|
|
||||||
for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
|
for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
|
||||||
-- Some things to help positioning
|
-- Some things to help positioning
|
||||||
local step_count_offs = string.find(p, "P1") and -150 or 150
|
local step_count_offs = string.find(p, "P1") and -140 or 140
|
||||||
local grade_parts_offs = string.find(p, "P1") and -320 or 320
|
local grade_parts_offs = string.find(p, "P1") and -320 or 320
|
||||||
local p_grade = STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetGrade()
|
local p_grade = STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetGrade()
|
||||||
|
|
||||||
@@ -201,7 +201,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
|
|||||||
-- Primary score.
|
-- Primary score.
|
||||||
eval_parts[#eval_parts+1] = Def.BitmapText {
|
eval_parts[#eval_parts+1] = Def.BitmapText {
|
||||||
Font = "_overpass 36px",
|
Font = "_overpass 36px",
|
||||||
InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1),
|
InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180),
|
||||||
OnCommand=function(self)
|
OnCommand=function(self)
|
||||||
self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1)
|
self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1)
|
||||||
end;
|
end;
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ local eval_parts = Def.ActorFrame {}
|
|||||||
|
|
||||||
for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
|
for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
|
||||||
-- Some things to help positioning
|
-- Some things to help positioning
|
||||||
local step_count_offs = string.find(p, "P1") and -150 or 150
|
local step_count_offs = string.find(p, "P1") and -140 or 140
|
||||||
local grade_parts_offs = string.find(p, "P1") and -320 or 320
|
local grade_parts_offs = string.find(p, "P1") and -320 or 320
|
||||||
local p_grade = STATSMAN:GetAccumPlayedStageStats():GetPlayerStageStats(p):GetGrade()
|
local p_grade = STATSMAN:GetAccumPlayedStageStats():GetPlayerStageStats(p):GetGrade()
|
||||||
|
|
||||||
@@ -137,7 +137,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do
|
|||||||
-- Primary score.
|
-- Primary score.
|
||||||
eval_parts[#eval_parts+1] = Def.BitmapText {
|
eval_parts[#eval_parts+1] = Def.BitmapText {
|
||||||
Font = "_overpass 36px",
|
Font = "_overpass 36px",
|
||||||
InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1),
|
InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65);diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180),
|
||||||
OnCommand=function(self)
|
OnCommand=function(self)
|
||||||
self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1)
|
self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1)
|
||||||
end;
|
end;
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 740 B After Width: | Height: | Size: 916 B |
|
Before Width: | Height: | Size: 899 B After Width: | Height: | Size: 810 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 907 B |
|
Before Width: | Height: | Size: 740 B After Width: | Height: | Size: 916 B |
|
Before Width: | Height: | Size: 899 B After Width: | Height: | Size: 810 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 907 B |
@@ -1,2 +0,0 @@
|
|||||||
return LoadActor(THEME:GetPathG("ScreenOptions", "line highlight")) .. {
|
|
||||||
};
|
|
||||||
|
After Width: | Height: | Size: 4.4 KiB |
|
After Width: | Height: | Size: 4.4 KiB |
@@ -1 +0,0 @@
|
|||||||
ScreenOptions LineHighlight P1
|
|
||||||
|
Before Width: | Height: | Size: 1012 B |
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 11 KiB |
@@ -0,0 +1 @@
|
|||||||
|
ScreenEvaluationNormal icon
|
||||||
@@ -49,13 +49,13 @@ ModeIconColors = {
|
|||||||
|
|
||||||
GameColor = {
|
GameColor = {
|
||||||
PlayerColors = {
|
PlayerColors = {
|
||||||
PLAYER_1 = color("#437CE7"),
|
PLAYER_1 = color("#3982FF"),
|
||||||
PLAYER_2 = color("#EB3F8C"),
|
PLAYER_2 = color("#FF4596"),
|
||||||
both = color("#FFFFFF"),
|
both = color("#FFFFFF"),
|
||||||
},
|
},
|
||||||
PlayerDarkColors = {
|
PlayerDarkColors = {
|
||||||
PLAYER_1 = color("#EB3F8C"),
|
PLAYER_1 = color("#EB3F8C"),
|
||||||
PLAYER_2 = color("#89385A"),
|
PLAYER_2 = color("#7F083C"),
|
||||||
both = color("#F5E1E1"),
|
both = color("#F5E1E1"),
|
||||||
},
|
},
|
||||||
Difficulty = {
|
Difficulty = {
|
||||||
@@ -105,7 +105,7 @@ GameColor = {
|
|||||||
JudgmentLine_W4 = color("#86ACD6"),
|
JudgmentLine_W4 = color("#86ACD6"),
|
||||||
JudgmentLine_W5 = color("#958CD6"),
|
JudgmentLine_W5 = color("#958CD6"),
|
||||||
JudgmentLine_Held = color("#FFFFFF"),
|
JudgmentLine_Held = color("#FFFFFF"),
|
||||||
JudgmentLine_Miss = color("#ff3c3c"),
|
JudgmentLine_Miss = color("#F97E7E"),
|
||||||
JudgmentLine_MaxCombo = color("#ffc600")
|
JudgmentLine_MaxCombo = color("#ffc600")
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -305,11 +305,11 @@ LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effect
|
|||||||
LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25")
|
LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25")
|
||||||
LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;effectcolor2,color("1,0,0,0.5");effectcolor1,color("1,0,0,0.25")
|
LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;effectcolor2,color("1,0,0,0.5");effectcolor1,color("1,0,0,0.25")
|
||||||
#
|
#
|
||||||
LineHighlightP1OnCommand=diffuse,ColorLightTone(PlayerColor(PLAYER_1));diffusealpha,0.65;zoomtowidth,720;fadeleft,0.35;faderight,0.35;
|
LineHighlightP1OnCommand=diffuse,PlayerColor(PLAYER_1);zoomtowidth,720;
|
||||||
LineHighlightP1ChangeCommand=finishtweening;diffusealpha,0.65;
|
LineHighlightP1ChangeCommand=finishtweening;diffusealpha,1;
|
||||||
LineHighlightP1ChangeToExitCommand=finishtweening;diffusealpha,0.15;
|
LineHighlightP1ChangeToExitCommand=finishtweening;diffusealpha,0.15;
|
||||||
LineHighlightP2OnCommand=diffuse,ColorLightTone(PlayerColor(PLAYER_2));diffusealpha,0.65;zoomtowidth,720;fadeleft,0.35;faderight,0.35;
|
LineHighlightP2OnCommand=diffuse,PlayerColor(PLAYER_2);zoomtowidth,720;
|
||||||
LineHighlightP2ChangeCommand=finishtweening;diffusealpha,0.65;
|
LineHighlightP2ChangeCommand=finishtweening;diffusealpha,1;
|
||||||
LineHighlightP2ChangeToExitCommand=finishtweening;diffusealpha,0.15;
|
LineHighlightP2ChangeToExitCommand=finishtweening;diffusealpha,0.15;
|
||||||
#
|
#
|
||||||
RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-213+50*offsetFromCenter) end
|
RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-213+50*offsetFromCenter) end
|
||||||
@@ -393,7 +393,7 @@ TitleLoseFocusCommand=diffuse,color("#512232");
|
|||||||
TitleOnCommand=maxwidth,600;zoom,0.6
|
TitleOnCommand=maxwidth,600;zoom,0.6
|
||||||
|
|
||||||
[OptionRowExit]
|
[OptionRowExit]
|
||||||
FrameOnCommand=visible,true;diffusealpha,0.45;
|
FrameOnCommand=visible,true;diffusealpha,0.2;
|
||||||
FrameX=SCREEN_CENTER_X;
|
FrameX=SCREEN_CENTER_X;
|
||||||
|
|
||||||
ItemsMinBaseZoom=1
|
ItemsMinBaseZoom=1
|
||||||
@@ -402,7 +402,7 @@ ItemGainFocusCommand=stoptweening;linear,0.1;diffuse,color("#A61C17");
|
|||||||
ItemLoseFocusCommand=stoptweening;decelerate,0.05;diffuse,color("#A61C17");
|
ItemLoseFocusCommand=stoptweening;decelerate,0.05;diffuse,color("#A61C17");
|
||||||
|
|
||||||
FrameGainFocusCommand=stoptweening;linear,0.1;diffusealpha,1;
|
FrameGainFocusCommand=stoptweening;linear,0.1;diffusealpha,1;
|
||||||
FrameLoseFocusCommand=stoptweening;decelerate,0.05;diffusealpha,0.45;
|
FrameLoseFocusCommand=stoptweening;decelerate,0.05;diffusealpha,0.2;
|
||||||
|
|
||||||
ColorSelected=color("#A61C17")
|
ColorSelected=color("#A61C17")
|
||||||
ColorNotSelected=color("#A61C17")
|
ColorNotSelected=color("#A61C17")
|
||||||
@@ -422,9 +422,9 @@ ExplanationTogetherOnCommand=stoptweening;zoom,0.75;diffuse,color("#512232");wra
|
|||||||
[OptionRow]
|
[OptionRow]
|
||||||
TitleX=SCREEN_CENTER_X-440
|
TitleX=SCREEN_CENTER_X-440
|
||||||
TitleGainFocusCommand=diffuse,color("#9d324e");
|
TitleGainFocusCommand=diffuse,color("#9d324e");
|
||||||
TitleLoseFocusCommand=diffuse,color("#512232");
|
TitleLoseFocusCommand=diffuse,color("#320E1B");
|
||||||
TitleOnCommand=shadowlength,0;wrapwidthpixels,SCREEN_WIDTH*0.4;vertspacing,-6;zoom,0.5;horizalign,left;
|
TitleOnCommand=shadowlength,0;wrapwidthpixels,SCREEN_WIDTH*0.4;vertspacing,-6;zoom,0.5;horizalign,left;
|
||||||
ColorSelected=color("#512232")
|
ColorSelected=color("#320E1B")
|
||||||
ColorNotSelected=color("#9d324e")
|
ColorNotSelected=color("#9d324e")
|
||||||
ColorDisabled=color("0.37,0.16,0.29,0.5")
|
ColorDisabled=color("0.37,0.16,0.29,0.5")
|
||||||
ItemsStartX=SCREEN_CENTER_X-190
|
ItemsStartX=SCREEN_CENTER_X-190
|
||||||
|
|||||||