Fixed StepsDisplay commands to check for CustomDifficulty being an empty string.

This commit is contained in:
Kyzentun
2014-12-24 19:11:45 -07:00
parent 4a4a28878c
commit ee2abfac94
2 changed files with 10 additions and 10 deletions
+5 -5
View File
@@ -1916,7 +1916,7 @@ LoadEdits=true
Fallback="ScreenWithMenuElements" Fallback="ScreenWithMenuElements"
Class="ScreenSelectProfile" Class="ScreenSelectProfile"
# #
ScreenOnCommand=%function(self) self:lockinput(3); end; ScreenOnCommand=%function(self) self:lockinput(1); end;
# #
NextScreen=Branch.AfterSelectProfile() NextScreen=Branch.AfterSelectProfile()
PrevScreen=Branch.TitleMenu() PrevScreen=Branch.TitleMenu()
@@ -2191,13 +2191,13 @@ FrameX=0
FrameY=0 FrameY=0
FrameOnCommand= FrameOnCommand=
FrameLoadCommand=%function(self,param) local bFlip = param.PlayerState and param.PlayerState:GetPlayerNumber() ~= PLAYER_1; self:zoomx(bFlip and -1 or 1); end FrameLoadCommand=%function(self,param) local bFlip = param.PlayerState and param.PlayerState:GetPlayerNumber() ~= PLAYER_1; self:zoomx(bFlip and -1 or 1); end
FrameSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) end end FrameSetCommand=%function(self,param) if param.CustomDifficulty and param.CustomDifficulty ~= "" then self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) end end
NumTicks=10 NumTicks=10
MaxTicks=14 MaxTicks=14
TicksX=0 TicksX=0
TicksY=0 TicksY=0
TicksOnCommand=shadowlength,0; TicksOnCommand=shadowlength,0;
TicksSetCommand=%function(self,param) self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end TicksSetCommand=%function(self,param) if param.CustomDifficulty and param.CustomDifficulty ~= "" then self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end end
ShowTicks=false ShowTicks=false
ShowMeter=true ShowMeter=true
MeterFormatString="%i" MeterFormatString="%i"
@@ -2205,12 +2205,12 @@ ZeroMeterString="?"
MeterX=30 MeterX=30
MeterY=0 MeterY=0
MeterOnCommand=shadowlength,0 MeterOnCommand=shadowlength,0
MeterSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end MeterSetCommand=%function(self,param) if param.CustomDifficulty and param.CustomDifficulty ~= "" then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
ShowDescription=true ShowDescription=true
DescriptionX=-10 DescriptionX=-10
DescriptionY=0 DescriptionY=0
DescriptionOnCommand=shadowlength,0;uppercase,true; DescriptionOnCommand=shadowlength,0;uppercase,true;
DescriptionSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end DescriptionSetCommand=%function(self,param) if param.CustomDifficulty and param.CustomDifficulty ~= "" then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
ShowCredit=false ShowCredit=false
CreditX=0 CreditX=0
CreditY=0 CreditY=0
+5 -5
View File
@@ -422,7 +422,7 @@ MoveCommand=decelerate,0.05
FrameX= FrameX=
FrameSetCommand=%function(self,param) \ FrameSetCommand=%function(self,param) \
if param.CustomDifficulty then \ if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \ self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \
else \ else \
self:diffuse(color('1,1,1,1')); \ self:diffuse(color('1,1,1,1')); \
@@ -436,7 +436,7 @@ ShowMeter=true
MeterX=56 MeterX=56
MeterOnCommand=shadowlength,1;zoom,0.65;textglowmode,'TextGlowMode_Inner'; MeterOnCommand=shadowlength,1;zoom,0.65;textglowmode,'TextGlowMode_Inner';
MeterSetCommand=%function(self,param) \ MeterSetCommand=%function(self,param) \
if param.CustomDifficulty then \ if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
end; \ end; \
@@ -457,7 +457,7 @@ DescriptionSetCommand=%function(self,param) \
if self:GetText() == "" then \ if self:GetText() == "" then \
self:settext("Edit"); \ self:settext("Edit"); \
end; \ end; \
if param.CustomDifficulty then \ if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
end; \ end; \
@@ -1167,7 +1167,7 @@ MeterX=56-32
MeterY=0 MeterY=0
MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner' MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner'
MeterSetCommand=%function(self,param) \ MeterSetCommand=%function(self,param) \
if param.CustomDifficulty then \ if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
end; \ end; \
@@ -1193,7 +1193,7 @@ DescriptionSetCommand=%function(self,param) \
if self:GetText() == "" then \ if self:GetText() == "" then \
self:settext("Edit"); \ self:settext("Edit"); \
end; \ end; \
if param.CustomDifficulty then \ if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
end; \ end; \