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

Added SetLife and ChangeLife lua functions to Player. Updated changelog.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2015-12-16 15:08:36 -07:00
parent 536be1f64c
commit 4e0fa012c1
15 changed files with 153 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+63
View File
@@ -235,6 +235,7 @@ Player::Player( NoteData &nd, bool bVisibleParts ) : m_NoteData(nd)
{
m_drawing_notefield_board= false;
m_bLoaded = false;
m_inside_lua_set_life= false;
m_pPlayerState = NULL;
m_pPlayerStageStats = NULL;
@@ -1684,6 +1685,44 @@ void Player::ChangeLife( HoldNoteScore hns, TapNoteScore tns )
ChangeLifeRecord();
}
void Player::ChangeLife(float delta)
{
// If ChangeLifeRecord is not called before the change, then the life graph
// will show a gradual change from the time of the previous step (or
// change) to the time of this change, instead of the sharp change that
// actually occurred. -Kyz
ChangeLifeRecord();
PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
if(m_pLifeMeter)
{
m_pLifeMeter->ChangeLife(delta);
}
if(m_pCombinedLifeMeter)
{
m_pCombinedLifeMeter->ChangeLife(pn, delta);
}
ChangeLifeRecord();
}
void Player::SetLife(float value)
{
// If ChangeLifeRecord is not called before the change, then the life graph
// will show a gradual change from the time of the previous step (or
// change) to the time of this change, instead of the sharp change that
// actually occurred. -Kyz
ChangeLifeRecord();
PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
if(m_pLifeMeter)
{
m_pLifeMeter->SetLife(value);
}
if(m_pCombinedLifeMeter)
{
m_pCombinedLifeMeter->SetLife(pn, value);
}
ChangeLifeRecord();
}
void Player::ChangeLifeRecord()
{
PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
@@ -3238,6 +3277,28 @@ RString Player::ApplyRandomAttack()
class LunaPlayer: public Luna<Player>
{
public:
static int SetLife(T* p, lua_State* L)
{
if(p->m_inside_lua_set_life)
{
luaL_error(L, "Do not call SetLife from inside LifeChangedMessageCommand because SetLife causes a LifeChangedMessageCommand.");
}
p->m_inside_lua_set_life= true;
p->SetLife(FArg(1));
p->m_inside_lua_set_life= false;
COMMON_RETURN_SELF;
}
static int ChangeLife(T* p, lua_State* L)
{
if(p->m_inside_lua_set_life)
{
luaL_error(L, "Do not call ChangeLife from inside LifeChangedMessageCommand because ChangeLife causes a LifeChangedMessageCommand.");
}
p->m_inside_lua_set_life= true;
p->ChangeLife(FArg(1));
p->m_inside_lua_set_life= false;
COMMON_RETURN_SELF;
}
static int SetActorWithJudgmentPosition( T* p, lua_State *L )
{
Actor *pActor = Luna<Actor>::check(L, 1);
@@ -3258,6 +3319,8 @@ public:
LunaPlayer()
{
ADD_METHOD(SetLife);
ADD_METHOD(ChangeLife);
ADD_METHOD( SetActorWithJudgmentPosition );
ADD_METHOD( SetActorWithComboPosition );
ADD_METHOD( GetPlayerTimingData );