Fixed pump noteskins due to some weird error related to twirl and roll mods
Added tap none command into noteskin explosions.
This commit is contained in:
@@ -4,5 +4,5 @@ return NOTESKIN:LoadActor("DownLeft", "Ready Receptor")..{
|
|||||||
{ Frame = 1 };
|
{ Frame = 1 };
|
||||||
{ Frame = 2 };
|
{ Frame = 2 };
|
||||||
};
|
};
|
||||||
InitCommand=cmd(rotationy,180);
|
--InitCommand=cmd(rotationy,180);
|
||||||
};
|
};
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
return NOTESKIN:LoadActor("DownLeft","Tap Note")..{
|
return NOTESKIN:LoadActor("DownLeft","Tap Note")..{
|
||||||
InitCommand=cmd(rotationy,180);
|
--InitCommand=cmd(rotationy,180);
|
||||||
};
|
};
|
||||||
@@ -48,9 +48,9 @@ Noteskin.BaseRotX = {
|
|||||||
Noteskin.BaseRotY = {
|
Noteskin.BaseRotY = {
|
||||||
Center = 0;
|
Center = 0;
|
||||||
UpLeft = 0;
|
UpLeft = 0;
|
||||||
UpRight = 0;
|
UpRight = 180;
|
||||||
DownLeft = 0;
|
DownLeft = 0;
|
||||||
DownRight = 0;
|
DownRight = 180;
|
||||||
}
|
}
|
||||||
|
|
||||||
local function func()
|
local function func()
|
||||||
|
|||||||
@@ -18,20 +18,20 @@ return Def.ActorFrame {
|
|||||||
InitCommand=cmd(zoom,1;diffusealpha,0);
|
InitCommand=cmd(zoom,1;diffusealpha,0);
|
||||||
TapCommand=cmd(finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2);
|
TapCommand=cmd(finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2);
|
||||||
|
|
||||||
W1Command=cmd(playcommand,"Tap");
|
--W1Command=cmd(playcommand,"Tap");
|
||||||
W2Command=cmd(playcommand,"Tap");
|
--W2Command=cmd(playcommand,"Tap");
|
||||||
W3Command=cmd(playcommand,"Tap");
|
--W3Command=cmd(playcommand,"Tap");
|
||||||
W4Command=cmd(playcommand,"Tap");
|
--W4Command=cmd(playcommand,"Tap");
|
||||||
W5Command=cmd(playcommand,"Tap");
|
--W5Command=cmd(playcommand,"Tap");
|
||||||
|
|
||||||
HitMineCommand=cmd(playcommand,"Tap");
|
--HitMineCommand=cmd(playcommand,"Tap");
|
||||||
HeldCommand=cmd(playcommand,"Tap");
|
HeldCommand=cmd(playcommand,"Tap");
|
||||||
|
ColumnJudgmentMessageCommand=cmd(playcommand,"Tap");
|
||||||
|
TapNoneCommand=cmd(playcommand,"Tap");
|
||||||
|
|
||||||
--NONECommand=cmd(playcommand,"Tap");
|
--NONECommand=cmd(playcommand,"Tap");
|
||||||
|
|
||||||
--HeldCommand=NOTESKIN:GetMetricA(Var "Button", "TapHeldCommand");
|
--HeldCommand=NOTESKIN:GetMetricA(Var "Button", "TapHeldCommand");
|
||||||
--NOT WORKING!!
|
|
||||||
NoneCommand=cmd(linear,0.1;zoom,2);
|
|
||||||
};
|
};
|
||||||
--explosion
|
--explosion
|
||||||
LoadActor("_flash")..{
|
LoadActor("_flash")..{
|
||||||
|
|||||||
@@ -4,5 +4,5 @@ return NOTESKIN:LoadActor("UpLeft", "Ready Receptor")..{
|
|||||||
{ Frame = 1 };
|
{ Frame = 1 };
|
||||||
{ Frame = 2 };
|
{ Frame = 2 };
|
||||||
};
|
};
|
||||||
InitCommand=cmd(rotationy,180);
|
--InitCommand=cmd(rotationy,180);
|
||||||
};
|
};
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
return NOTESKIN:LoadActor("UpLeft","Tap Note")..{
|
return NOTESKIN:LoadActor("UpLeft","Tap Note")..{
|
||||||
InitCommand=cmd(rotationy,180);
|
--InitCommand=cmd(rotationy,180);
|
||||||
|
--BaseRotationY=180;
|
||||||
};
|
};
|
||||||
@@ -91,6 +91,11 @@ void GhostArrowRow::DrawPrimitives()
|
|||||||
m_Ghost[c]->Draw();
|
m_Ghost[c]->Draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GhostArrowRow::DidStep( int iCol )
|
||||||
|
{
|
||||||
|
ASSERT_M( iCol >= 0 && iCol < (int) m_Ghost.size(), ssprintf("assert(iCol %i >= 0 && iCol %i < (int)m_Ghost.size() %i) failed",iCol,iCol,(int)m_Ghost.size()) );
|
||||||
|
m_Ghost[iCol]->PlayCommand("TapNone");
|
||||||
|
}
|
||||||
|
|
||||||
void GhostArrowRow::DidTapNote( int iCol, TapNoteScore tns, bool bBright )
|
void GhostArrowRow::DidTapNote( int iCol, TapNoteScore tns, bool bBright )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ public:
|
|||||||
|
|
||||||
void Load( const PlayerState* pPlayerState, float fYReverseOffset );
|
void Load( const PlayerState* pPlayerState, float fYReverseOffset );
|
||||||
|
|
||||||
|
void DidStep( int iCol );
|
||||||
void DidTapNote( int iCol, TapNoteScore tns, bool bBright );
|
void DidTapNote( int iCol, TapNoteScore tns, bool bBright );
|
||||||
void DidHoldNote( int iCol, HoldNoteScore hns, bool bBright );
|
void DidHoldNote( int iCol, HoldNoteScore hns, bool bBright );
|
||||||
void SetHoldShowing( int iCol, const TapNote &tn );
|
void SetHoldShowing( int iCol, const TapNote &tn );
|
||||||
|
|||||||
+4
-1
@@ -942,7 +942,10 @@ void NoteField::FadeToFail()
|
|||||||
// don't fade all over again if this is called twice
|
// don't fade all over again if this is called twice
|
||||||
}
|
}
|
||||||
void NoteField::Step( int iCol, TapNoteScore score ) { m_pCurDisplay->m_ReceptorArrowRow.Step( iCol, score ); }
|
void NoteField::Step( int iCol, TapNoteScore score ) { m_pCurDisplay->m_ReceptorArrowRow.Step( iCol, score ); }
|
||||||
void NoteField::SetPressed( int iCol ) { m_pCurDisplay->m_ReceptorArrowRow.SetPressed( iCol ); }
|
void NoteField::SetPressed( int iCol ) {
|
||||||
|
m_pCurDisplay->m_ReceptorArrowRow.SetPressed( iCol );
|
||||||
|
m_pCurDisplay->m_GhostArrowRow.DidStep( iCol );
|
||||||
|
}
|
||||||
void NoteField::DidTapNote( int iCol, TapNoteScore score, bool bBright ) { m_pCurDisplay->m_GhostArrowRow.DidTapNote( iCol, score, bBright ); }
|
void NoteField::DidTapNote( int iCol, TapNoteScore score, bool bBright ) { m_pCurDisplay->m_GhostArrowRow.DidTapNote( iCol, score, bBright ); }
|
||||||
void NoteField::DidHoldNote( int iCol, HoldNoteScore score, bool bBright ) { m_pCurDisplay->m_GhostArrowRow.DidHoldNote( iCol, score, bBright ); }
|
void NoteField::DidHoldNote( int iCol, HoldNoteScore score, bool bBright ) { m_pCurDisplay->m_GhostArrowRow.DidHoldNote( iCol, score, bBright ); }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user