Changed timing and life difficulty text to position value after label. Changed all AllowRepeatingInput metrics in _fallback to true.

This commit is contained in:
Kyzentun Keeslala
2015-06-14 08:55:42 -06:00
parent 829e861192
commit c78950aaeb
6 changed files with 29 additions and 21 deletions
+4
View File
@@ -16,6 +16,10 @@ Example:
This means that three strings were added to the "ScreenDebugOverlay" section,
"Mute actions", "Mute actions on", and "Mute actions off".
2015/06/14
----------
* [ScreenTitleMenu] Hardest Timing
2015/06/06
----------
* [ScreenInitialScreenIsInvalid] InvalidScreenExplanation
+2
View File
@@ -2032,6 +2032,8 @@ Play Online=Network Play
Edit/Share=Edit/Share
Exit=Exit
Game Start=Game Start
# The "Hardest Timing" text is displayed when the Timing Difficulty is at the hardest setting.
Hardest Timing=Justice
Jukebox=Jukebox
Report Bug=Report A Bug!
Chat on IRC=Chat on IRC!
+3 -5
View File
@@ -160,14 +160,12 @@ Branch = {
end,
PlayerOptions = function()
local pm = GAMESTATE:GetPlayMode()
local restricted = { "PlayMode_Oni", "PlayMode_Rave",
local restricted = { PlayMode_Oni= true, PlayMode_Rave= true,
--"PlayMode_Battle" -- ??
}
local optionsScreen = "ScreenPlayerOptions"
for i=1,#restricted do
if restricted[i] == pm then
optionsScreen = "ScreenPlayerOptionsRestricted"
end
if restricted[pm] then
optionsScreen = "ScreenPlayerOptionsRestricted"
end
if SCREENMAN:GetTopScreen():GetGoToOptions() then
return optionsScreen
+2 -2
View File
@@ -1686,7 +1686,7 @@ Fallback="ScreenWithMenuElements"
#
DoSwitchAnyways=false
WrapCursor=false
AllowRepeatingInput=false
AllowRepeatingInput=true
PreSwitchPageSeconds=0
PostSwitchPageSeconds=0
ScrollerSecondsPerItem=0
@@ -2340,7 +2340,7 @@ MoreExitSelectedP2Command=
MoreExitUnselectedP1Command=
MoreExitUnselectedP2Command=
#
AllowRepeatingChangeValueInput=false
AllowRepeatingChangeValueInput=true
WrapValueInRow=true
[ScreenOptionsMaster]
@@ -1,17 +1,21 @@
local label_text= false
return Def.ActorFrame {
LoadFont("Common Normal") .. {
Text=GetLifeDifficulty();
AltText="";
InitCommand=cmd(horizalign,left;zoom,0.675);
OnCommand=cmd(shadowlength,1);
BeginCommand=function(self)
self:settextf( Screen.String("LifeDifficulty"), "" );
end
OnCommand= function(self)
label_text= self
self:shadowlength(1):settextf(Screen.String("LifeDifficulty"), "");
end,
};
LoadFont("Common Normal") .. {
Text=GetLifeDifficulty();
AltText="";
InitCommand=cmd(x,136;zoom,0.675;halign,0);
OnCommand=cmd(shadowlength,1;skewx,-0.125);
InitCommand=cmd(zoom,0.675;halign,0);
OnCommand= function(self)
self:shadowlength(1):skewx(-0.125):x(label_text:GetZoomedWidth()+8)
end,
};
};
};
@@ -3,23 +3,23 @@ return Def.ActorFrame {
Text=GetTimingDifficulty();
AltText="";
InitCommand=cmd(horizalign,left;zoom,0.675);
OnCommand=cmd(shadowlength,1);
BeginCommand=function(self)
self:settextf( Screen.String("TimingDifficulty"), "" );
end
OnCommand= function(self)
label_text= self
self:shadowlength(1):settextf(Screen.String("TimingDifficulty"), "");
end,
};
LoadFont("Common Normal") .. {
Text=GetTimingDifficulty();
AltText="";
InitCommand=cmd(x,136;zoom,0.675;halign,0);
OnCommand=function(self)
(cmd(shadowlength,1;skewx,-0.125))(self);
self:shadowlength(1):skewx(-0.125):x(label_text:GetZoomedWidth()+8)
if GetTimingDifficulty() == 9 then
self:settext("Justice");
self:settext(Screen.String("Hardest Timing"));
(cmd(zoom,0.5;diffuse,ColorLightTone( Color("Orange")) ))(self);
else
self:settext( GetTimingDifficulty() );
end
end;
};
};
};