actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added pause menu to ScreenGameplay in default theme. Added SetPrevScreenName lua binding to Screen. Added begin_backing_out lua binding to ScreenGameplay.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2016-01-09 11:40:22 -07:00
parent 14caac26ca
commit 0de66f6e1a
11 changed files with 247 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Luadoc/Lua.xml
+2
View File
@@ -1455,6 +1455,7 @@
<Function name='PostScreenMessage'/>
<Function name='RemoveInputCallback'/>
<Function name='SetNextScreenName'/>
<Function name='SetPrevScreenName'/>
<Function name='String'/>
<Function name='lockinput'/>
</Class>
@@ -1466,6 +1467,7 @@
<Function name='GetStageStats'/>
</Class>
<Class base='ScreenWithMenuElements' name='ScreenGameplay'>
<Function name='begin_backing_out'/>
<Function name='Center1Player'/>
<Function name='GetDummyPlayerInfo'/>
<Function name='GetHasteRate'/>
Docs/Luadoc/LuaDocumentation.xml
+6
View File
@@ -4307,6 +4307,9 @@ save yourself some time, copy this for undocumented things:
<Function name='SetNextScreenName' return='void' arguments='string name'>
Sets the NextScreen value to name.
</Function>
<Function name='SetPrevScreenName' return='void' arguments='string name'>
Sets the PrevScreen value to name.
</Function>
<Function name='String' theme='_fallback' return='string' arguments='string sName'>
[02 Other.lua] Gets a string from the current Screen in the current language.
</Function>
@@ -4322,6 +4325,9 @@ save yourself some time, copy this for undocumented things:
</Function>
</Class>
<Class name='ScreenGameplay'>
<Function name='begin_backing_out' return='' arguments=''>
This should behave identically to the normal back button behavior. This function is for the pause menu to use when the player forfeits or restarts, so that a score isn't saved.
</Function>
<Function name='Center1Player' return='bool' arguments=''>
Returns <code>true</code> if a single <Link class='Player' /> has its NoteField centered.
</Function>
Themes/default/BGAnimations/ScreenEvaluation overlay/default.lua
+11
View File
@@ -65,4 +65,15 @@ t[#t+1] = Def.ActorFrame {
InitCommand=cmd(hide_if,not GAMESTATE:IsPlayerEnabled(PLAYER_2);x,WideScale(math.floor(SCREEN_CENTER_X*1.7)+8,math.floor(SCREEN_CENTER_X*1.5)+8);y,SCREEN_CENTER_Y-20);
CreateStats( PLAYER_2 );
};
if gameplay_pause_count > 0 then
t[#t+1]= Def.BitmapText{
Font= "Common Normal",
Text= THEME:GetString("PauseMenu", "pause_count") .. ": " .. gameplay_pause_count,
InitCommand= function(self)
self:xy(_screen.cx, 375):diffuse(Color.White):zoom(.75)
end
}
end
return t
Themes/default/BGAnimations/ScreenGameplay overlay.lua
+1
View File
@@ -37,4 +37,5 @@ if GAMESTATE:GetCurrentCourse() then
end;
end;
t.InitCommand=cmd(SetUpdateFunction,UpdateTime);
t[#t+1]= LoadActor(THEME:GetPathG("", "pause_menu"))
return t
Themes/default/Graphics/pause_menu.lua
+197
View File
@@ -0,0 +1,197 @@
gameplay_pause_count= 0
local pause_buttons= {Start= true, Select= true, Back= true}
local pause_double_tap_time= .5
local pause_press_times= {}
local screen_gameplay= false
local menu_items= {[PLAYER_1]= {}, [PLAYER_2]= {}}
local menu_frames= {}
local menu_choices= {
"continue_playing",
"restart_song",
"forfeit_song",
}
if GAMESTATE:IsCourseMode() then
menu_choices= {
"continue_playing",
"skip_song",
"forfeit_course",
}
end
local menu_spacing= 32
local menu_bg_width= _screen.w * .4
local menu_text_width= _screen.w * .35
local menu_x= {[PLAYER_1]= _screen.w*.25, [PLAYER_2]= _screen.w*.75}
local menu_y= _screen.cy - (#menu_choices * .5 * menu_spacing)
local current_menu_choice= {}
local menu_is_showing= {}
local enabled_players= {}
local function create_menu_item(pn, x, y, item_name)
return Def.BitmapText{
Font= "Common Normal", Text= THEME:GetString("PauseMenu", item_name),
InitCommand= function(self)
self:xy(x, y)
table.insert(menu_items[pn], self)
self:playcommand("LoseFocus")
end,
LoseFocusCommand= function(self)
self:stopeffect():rotationz(0)
end,
GainFocusCommand= function(self)
self:wag():effectperiod(2):effectmagnitude(0, 0, 5)
end,
}
end
local function create_menu_frame(pn, x, y)
local frame= Def.ActorFrame{
InitCommand= function(self)
self:xy(x, y):playcommand("Hide")
menu_frames[pn]= self
end,
ShowCommand= function(self)
self:visible(true)
end,
HideCommand= function(self)
self:visible(false)
end,
Def.Quad{
InitCommand= function(self)
self:setsize(menu_bg_width, menu_spacing * (#menu_choices + 1))
:y(-menu_spacing):vertalign(top)
:diffuse{0, 0, 0, .25}
:playcommand("Hide")
end,
},
}
for i, choice in ipairs(menu_choices) do
frame[#frame+1]= create_menu_item(pn, 0, (i-1)*menu_spacing, choice)
end
return frame
end
local function backout(screen)
screen_gameplay:SetPrevScreenName(screen):begin_backing_out()
end
local function show_menu(pn)
menu_frames[pn]:playcommand("Show")
for i, item in ipairs(menu_items[pn]) do
item:playcommand("LoseFocus")
end
current_menu_choice[pn]= 1
menu_items[pn][current_menu_choice[pn]]:playcommand("GainFocus")
menu_is_showing[pn]= true
end
local function close_menu(pn)
menu_frames[pn]:playcommand("Hide")
menu_is_showing[pn]= false
local stay_paused= false
for pn, showing in pairs(menu_is_showing) do
if showing then
stay_paused= true
end
end
if not stay_paused then
screen_gameplay:PauseGame(false)
end
end
local choice_actions= {
continue_playing= function(pn)
close_menu(pn)
end,
restart_song= function(pn)
backout("ScreenStageInformation")
end,
forfeit_song= function(pn)
backout(SelectMusicOrCourse())
end,
skip_song= function(pn)
screen_gameplay:PostScreenMessage("SM_NotesEnded", 0)
end,
forfeit_course= function(pn)
backout(SelectMusicOrCourse())
end,
}
local menu_actions= {
Start= function(pn)
local choice_name= menu_choices[current_menu_choice[pn]]
if choice_actions[choice_name] then
choice_actions[choice_name](pn)
end
end,
Left= function(pn)
if current_menu_choice[pn] > 1 then
menu_items[pn][current_menu_choice[pn]]:playcommand("LoseFocus")
current_menu_choice[pn]= current_menu_choice[pn] - 1
menu_items[pn][current_menu_choice[pn]]:playcommand("GainFocus")
end
end,
Right= function(pn)
if current_menu_choice[pn] < #menu_choices then
menu_items[pn][current_menu_choice[pn]]:playcommand("LoseFocus")
current_menu_choice[pn]= current_menu_choice[pn] + 1
menu_items[pn][current_menu_choice[pn]]:playcommand("GainFocus")
end
end,
}
menu_actions.Up= menu_actions.Left
menu_actions.Down= menu_actions.Right
menu_actions.MenuLeft= menu_actions.Left
menu_actions.MenuRight= menu_actions.Right
menu_actions.MenuUp= menu_actions.Up
menu_actions.MenuDown= menu_actions.Down
local function input(event)
local pn= event.PlayerNumber
if not enabled_players[pn] then return end
local button= event.GameButton
if not button then return end
if event.type == "InputEventType_Release" then return end
local is_paused= screen_gameplay:IsPaused()
if is_paused then
if menu_is_showing[pn] then
if menu_actions[button] then
menu_actions[button](pn)
return true
end
else
if pause_buttons[button] then
show_menu(pn)
return true
end
end
else
if event.type ~= "InputEventType_FirstPress" then return end
if pause_buttons[button] then
if pause_press_times[pn] and
GetTimeSinceStart() - pause_press_times[pn] <= pause_double_tap_time then
gameplay_pause_count= gameplay_pause_count + 1
screen_gameplay:PauseGame(true)
show_menu(pn)
else
pause_press_times[pn]= GetTimeSinceStart()
end
else
pause_press_times[pn]= nil
end
end
end
local frame= Def.ActorFrame{
OnCommand= function(self)
screen_gameplay= SCREENMAN:GetTopScreen()
screen_gameplay:AddInputCallback(input)
end,
}
for i, pn in ipairs(GAMESTATE:GetEnabledPlayers()) do
enabled_players[pn]= true
frame[#frame+1]= create_menu_frame(pn, menu_x[pn], menu_y)
end
return frame
Themes/default/Languages/en.ini
+8
View File
@@ -85,6 +85,14 @@ HelpText=
[ScreenGameplay]
HelpText=
[PauseMenu]
continue_playing=Continue Playing
forfeit_course=Forfeit Course
forfeit_song=Forfeit Song
pause_count=Pause Count
restart_song=Restart Song
skip_song=Skip Song
[ScreenHeartEntry]
Enter Heart Rate=Enter Heart Rate
Song Length=Song Length
Themes/default/metrics.ini
+7 -1
View File
@@ -1608,7 +1608,13 @@ ActiveAttackListP2Y=
ActiveAttackListP2OnCommand=visible,false
ActiveAttackListP2OffCommand=
#
# Disable the normal start and select button actions to enable a custom pause
# menu
GivingUpGoesToPrevScreen=false
UnpauseWithStart=false
StartGivesUp=false
BackGivesUp=false
SelectSkipsSong=false
[ScreenGameplayShared]
src/Screen.cpp
+7
View File
@@ -273,6 +273,11 @@ void Screen::SetNextScreenName(RString const& name)
m_sNextScreen= name;
}
void Screen::SetPrevScreenName(RString const& name)
{
m_sPrevScreen= name;
}
RString Screen::GetPrevScreen() const
{
if( !m_sPrevScreen.empty() )
@@ -411,6 +416,7 @@ public:
static int GetNextScreenName( T* p, lua_State *L ) { lua_pushstring(L, p->GetNextScreenName() ); return 1; }
static int SetNextScreenName( T* p, lua_State *L ) { p->SetNextScreenName(SArg(1)); COMMON_RETURN_SELF; }
static int GetPrevScreenName( T* p, lua_State *L ) { lua_pushstring(L, p->GetPrevScreen() ); return 1; }
static int SetPrevScreenName( T* p, lua_State *L ) { p->SetPrevScreenName(SArg(1)); COMMON_RETURN_SELF; }
static int lockinput( T* p, lua_State *L ) { p->SetLockInputSecs(FArg(1)); COMMON_RETURN_SELF; }
DEFINE_METHOD( GetScreenType, GetScreenType() )
@@ -447,6 +453,7 @@ public:
ADD_METHOD( GetNextScreenName );
ADD_METHOD( SetNextScreenName );
ADD_METHOD( GetPrevScreenName );
ADD_METHOD( SetPrevScreenName );
ADD_METHOD( PostScreenMessage );
ADD_METHOD( lockinput );
ADD_METHOD( GetScreenType );
src/Screen.h
+1
View File
@@ -124,6 +124,7 @@ public:
RString GetNextScreenName() const;
RString GetPrevScreen() const;
void SetNextScreenName(RString const& name);
void SetPrevScreenName(RString const& name);
bool PassInputToLua(const InputEventPlus& input);
void AddInputCallbackFromStack(lua_State* L);
src/ScreenGameplay.cpp
+6 -2
View File
@@ -1959,9 +1959,7 @@ void ScreenGameplay::Update( float fDeltaTime )
pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveBigMissCombo;
pi->GetPlayerStageStats()->m_bDisqualified |= bGiveUpTimerFired; // Don't disqualify if failing for miss combo. The player should still be eligable for a high score on courses.
}
ResetGiveUpTimers(false);
if(GIVING_UP_GOES_TO_PREV_SCREEN && !m_skipped_song)
{
BeginBackingOutFromGameplay();
@@ -3267,6 +3265,11 @@ public:
FLOAT_TABLE_INTERFACE(HasteAddAmounts, HasteAddAmounts, AddAmountsValid);
FLOAT_NO_SPEED_INTERFACE(HasteTimeBetweenUpdates, HasteTimeBetweenUpdates, (v > 0));
FLOAT_NO_SPEED_INTERFACE(HasteLifeSwitchPoint, HasteLifeSwitchPoint, (v >= 0 && v <= 1));
static int begin_backing_out(T* p, lua_State* L)
{
p->BeginBackingOutFromGameplay();
COMMON_RETURN_SELF;
}
static int GetTrueBPS(T* p, lua_State* L)
{
PlayerNumber pn= Enum::Check<PlayerNumber>(L, 1);
@@ -3293,6 +3296,7 @@ public:
ADD_METHOD( HasteAddAmounts );
ADD_METHOD( HasteTimeBetweenUpdates );
ADD_METHOD( HasteLifeSwitchPoint );
ADD_METHOD(begin_backing_out);
ADD_METHOD( GetTrueBPS );
}
};
src/ScreenGameplay.h
+1 -1
View File
@@ -176,6 +176,7 @@ public:
void FailFadeRemovePlayer(PlayerInfo* pi);
void FailFadeRemovePlayer(PlayerNumber pn);
void BeginBackingOutFromGameplay();
vector<float> m_HasteTurningPoints; // Values at which the meaning of GAMESTATE->m_fHasteRate changes.
vector<float> m_HasteAddAmounts; // Amounts that are added to speed depending on what turning point has been passed.
@@ -225,7 +226,6 @@ protected:
void PlayAnnouncer( const RString &type, float fSeconds ) { PlayAnnouncer(type, fSeconds, &m_fTimeSinceLastDancingComment); }
void UpdateLights();
void SendCrossedMessages();
void BeginBackingOutFromGameplay();
void PlayTicks();
void UpdateSongPosition( float fDeltaTime );