Changed timing and life difficulty text to position value after label. Changed all AllowRepeatingInput metrics in _fallback to true.
This commit is contained in:
@@ -16,6 +16,10 @@ Example:
|
|||||||
This means that three strings were added to the "ScreenDebugOverlay" section,
|
This means that three strings were added to the "ScreenDebugOverlay" section,
|
||||||
"Mute actions", "Mute actions on", and "Mute actions off".
|
"Mute actions", "Mute actions on", and "Mute actions off".
|
||||||
|
|
||||||
|
2015/06/14
|
||||||
|
----------
|
||||||
|
* [ScreenTitleMenu] Hardest Timing
|
||||||
|
|
||||||
2015/06/06
|
2015/06/06
|
||||||
----------
|
----------
|
||||||
* [ScreenInitialScreenIsInvalid] InvalidScreenExplanation
|
* [ScreenInitialScreenIsInvalid] InvalidScreenExplanation
|
||||||
|
|||||||
@@ -2032,6 +2032,8 @@ Play Online=Network Play
|
|||||||
Edit/Share=Edit/Share
|
Edit/Share=Edit/Share
|
||||||
Exit=Exit
|
Exit=Exit
|
||||||
Game Start=Game Start
|
Game Start=Game Start
|
||||||
|
# The "Hardest Timing" text is displayed when the Timing Difficulty is at the hardest setting.
|
||||||
|
Hardest Timing=Justice
|
||||||
Jukebox=Jukebox
|
Jukebox=Jukebox
|
||||||
Report Bug=Report A Bug!
|
Report Bug=Report A Bug!
|
||||||
Chat on IRC=Chat on IRC!
|
Chat on IRC=Chat on IRC!
|
||||||
|
|||||||
@@ -160,14 +160,12 @@ Branch = {
|
|||||||
end,
|
end,
|
||||||
PlayerOptions = function()
|
PlayerOptions = function()
|
||||||
local pm = GAMESTATE:GetPlayMode()
|
local pm = GAMESTATE:GetPlayMode()
|
||||||
local restricted = { "PlayMode_Oni", "PlayMode_Rave",
|
local restricted = { PlayMode_Oni= true, PlayMode_Rave= true,
|
||||||
--"PlayMode_Battle" -- ??
|
--"PlayMode_Battle" -- ??
|
||||||
}
|
}
|
||||||
local optionsScreen = "ScreenPlayerOptions"
|
local optionsScreen = "ScreenPlayerOptions"
|
||||||
for i=1,#restricted do
|
if restricted[pm] then
|
||||||
if restricted[i] == pm then
|
optionsScreen = "ScreenPlayerOptionsRestricted"
|
||||||
optionsScreen = "ScreenPlayerOptionsRestricted"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
if SCREENMAN:GetTopScreen():GetGoToOptions() then
|
if SCREENMAN:GetTopScreen():GetGoToOptions() then
|
||||||
return optionsScreen
|
return optionsScreen
|
||||||
|
|||||||
@@ -1686,7 +1686,7 @@ Fallback="ScreenWithMenuElements"
|
|||||||
#
|
#
|
||||||
DoSwitchAnyways=false
|
DoSwitchAnyways=false
|
||||||
WrapCursor=false
|
WrapCursor=false
|
||||||
AllowRepeatingInput=false
|
AllowRepeatingInput=true
|
||||||
PreSwitchPageSeconds=0
|
PreSwitchPageSeconds=0
|
||||||
PostSwitchPageSeconds=0
|
PostSwitchPageSeconds=0
|
||||||
ScrollerSecondsPerItem=0
|
ScrollerSecondsPerItem=0
|
||||||
@@ -2340,7 +2340,7 @@ MoreExitSelectedP2Command=
|
|||||||
MoreExitUnselectedP1Command=
|
MoreExitUnselectedP1Command=
|
||||||
MoreExitUnselectedP2Command=
|
MoreExitUnselectedP2Command=
|
||||||
#
|
#
|
||||||
AllowRepeatingChangeValueInput=false
|
AllowRepeatingChangeValueInput=true
|
||||||
WrapValueInRow=true
|
WrapValueInRow=true
|
||||||
|
|
||||||
[ScreenOptionsMaster]
|
[ScreenOptionsMaster]
|
||||||
|
|||||||
@@ -1,17 +1,21 @@
|
|||||||
|
local label_text= false
|
||||||
|
|
||||||
return Def.ActorFrame {
|
return Def.ActorFrame {
|
||||||
LoadFont("Common Normal") .. {
|
LoadFont("Common Normal") .. {
|
||||||
Text=GetLifeDifficulty();
|
Text=GetLifeDifficulty();
|
||||||
AltText="";
|
AltText="";
|
||||||
InitCommand=cmd(horizalign,left;zoom,0.675);
|
InitCommand=cmd(horizalign,left;zoom,0.675);
|
||||||
OnCommand=cmd(shadowlength,1);
|
OnCommand= function(self)
|
||||||
BeginCommand=function(self)
|
label_text= self
|
||||||
self:settextf( Screen.String("LifeDifficulty"), "" );
|
self:shadowlength(1):settextf(Screen.String("LifeDifficulty"), "");
|
||||||
end
|
end,
|
||||||
};
|
};
|
||||||
LoadFont("Common Normal") .. {
|
LoadFont("Common Normal") .. {
|
||||||
Text=GetLifeDifficulty();
|
Text=GetLifeDifficulty();
|
||||||
AltText="";
|
AltText="";
|
||||||
InitCommand=cmd(x,136;zoom,0.675;halign,0);
|
InitCommand=cmd(zoom,0.675;halign,0);
|
||||||
OnCommand=cmd(shadowlength,1;skewx,-0.125);
|
OnCommand= function(self)
|
||||||
|
self:shadowlength(1):skewx(-0.125):x(label_text:GetZoomedWidth()+8)
|
||||||
|
end,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -3,19 +3,19 @@ return Def.ActorFrame {
|
|||||||
Text=GetTimingDifficulty();
|
Text=GetTimingDifficulty();
|
||||||
AltText="";
|
AltText="";
|
||||||
InitCommand=cmd(horizalign,left;zoom,0.675);
|
InitCommand=cmd(horizalign,left;zoom,0.675);
|
||||||
OnCommand=cmd(shadowlength,1);
|
OnCommand= function(self)
|
||||||
BeginCommand=function(self)
|
label_text= self
|
||||||
self:settextf( Screen.String("TimingDifficulty"), "" );
|
self:shadowlength(1):settextf(Screen.String("TimingDifficulty"), "");
|
||||||
end
|
end,
|
||||||
};
|
};
|
||||||
LoadFont("Common Normal") .. {
|
LoadFont("Common Normal") .. {
|
||||||
Text=GetTimingDifficulty();
|
Text=GetTimingDifficulty();
|
||||||
AltText="";
|
AltText="";
|
||||||
InitCommand=cmd(x,136;zoom,0.675;halign,0);
|
InitCommand=cmd(x,136;zoom,0.675;halign,0);
|
||||||
OnCommand=function(self)
|
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
|
if GetTimingDifficulty() == 9 then
|
||||||
self:settext("Justice");
|
self:settext(Screen.String("Hardest Timing"));
|
||||||
(cmd(zoom,0.5;diffuse,ColorLightTone( Color("Orange")) ))(self);
|
(cmd(zoom,0.5;diffuse,ColorLightTone( Color("Orange")) ))(self);
|
||||||
else
|
else
|
||||||
self:settext( GetTimingDifficulty() );
|
self:settext( GetTimingDifficulty() );
|
||||||
|
|||||||
Reference in New Issue
Block a user