diff --git a/NoteSkins/pump/default/DownRight Ready Receptor.lua b/NoteSkins/pump/default/DownRight Ready Receptor.lua index 7e9e6392dd..d61466c6b6 100644 --- a/NoteSkins/pump/default/DownRight Ready Receptor.lua +++ b/NoteSkins/pump/default/DownRight Ready Receptor.lua @@ -4,5 +4,5 @@ return NOTESKIN:LoadActor("DownLeft", "Ready Receptor")..{ { Frame = 1 }; { Frame = 2 }; }; - InitCommand=cmd(rotationy,180); + --InitCommand=cmd(rotationy,180); }; \ No newline at end of file diff --git a/NoteSkins/pump/default/DownRight Tap Note.lua b/NoteSkins/pump/default/DownRight Tap Note.lua index 04abf29c93..9832f98f23 100644 --- a/NoteSkins/pump/default/DownRight Tap Note.lua +++ b/NoteSkins/pump/default/DownRight Tap Note.lua @@ -1,3 +1,3 @@ return NOTESKIN:LoadActor("DownLeft","Tap Note")..{ - InitCommand=cmd(rotationy,180); + --InitCommand=cmd(rotationy,180); }; \ No newline at end of file diff --git a/NoteSkins/pump/default/NoteSkin.lua b/NoteSkins/pump/default/NoteSkin.lua index 88fe1d4fca..e272ae096a 100644 --- a/NoteSkins/pump/default/NoteSkin.lua +++ b/NoteSkins/pump/default/NoteSkin.lua @@ -48,9 +48,9 @@ Noteskin.BaseRotX = { Noteskin.BaseRotY = { Center = 0; UpLeft = 0; - UpRight = 0; + UpRight = 180; DownLeft = 0; - DownRight = 0; + DownRight = 180; } local function func() diff --git a/NoteSkins/pump/default/UpLeft Explosion.lua b/NoteSkins/pump/default/UpLeft Explosion.lua index 2440f938e2..03a89882b4 100644 --- a/NoteSkins/pump/default/UpLeft Explosion.lua +++ b/NoteSkins/pump/default/UpLeft Explosion.lua @@ -18,20 +18,20 @@ return Def.ActorFrame { InitCommand=cmd(zoom,1;diffusealpha,0); TapCommand=cmd(finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2); - W1Command=cmd(playcommand,"Tap"); - W2Command=cmd(playcommand,"Tap"); - W3Command=cmd(playcommand,"Tap"); - W4Command=cmd(playcommand,"Tap"); - W5Command=cmd(playcommand,"Tap"); + --W1Command=cmd(playcommand,"Tap"); + --W2Command=cmd(playcommand,"Tap"); + --W3Command=cmd(playcommand,"Tap"); + --W4Command=cmd(playcommand,"Tap"); + --W5Command=cmd(playcommand,"Tap"); - HitMineCommand=cmd(playcommand,"Tap"); + --HitMineCommand=cmd(playcommand,"Tap"); HeldCommand=cmd(playcommand,"Tap"); + ColumnJudgmentMessageCommand=cmd(playcommand,"Tap"); + TapNoneCommand=cmd(playcommand,"Tap"); --NONECommand=cmd(playcommand,"Tap"); - --HeldCommand=NOTESKIN:GetMetricA(Var "Button", "TapHeldCommand"); - --NOT WORKING!! - NoneCommand=cmd(linear,0.1;zoom,2); + }; --explosion LoadActor("_flash")..{ diff --git a/NoteSkins/pump/default/UpRight Ready Receptor.lua b/NoteSkins/pump/default/UpRight Ready Receptor.lua index 112f2e248b..cae1506df9 100644 --- a/NoteSkins/pump/default/UpRight Ready Receptor.lua +++ b/NoteSkins/pump/default/UpRight Ready Receptor.lua @@ -4,5 +4,5 @@ return NOTESKIN:LoadActor("UpLeft", "Ready Receptor")..{ { Frame = 1 }; { Frame = 2 }; }; - InitCommand=cmd(rotationy,180); + --InitCommand=cmd(rotationy,180); }; \ No newline at end of file diff --git a/NoteSkins/pump/default/UpRight Tap Note.lua b/NoteSkins/pump/default/UpRight Tap Note.lua index a6060b7657..7b882b751d 100644 --- a/NoteSkins/pump/default/UpRight Tap Note.lua +++ b/NoteSkins/pump/default/UpRight Tap Note.lua @@ -1,3 +1,4 @@ return NOTESKIN:LoadActor("UpLeft","Tap Note")..{ - InitCommand=cmd(rotationy,180); + --InitCommand=cmd(rotationy,180); + --BaseRotationY=180; }; \ No newline at end of file diff --git a/src/GhostArrowRow.cpp b/src/GhostArrowRow.cpp index 7e80021393..7fd7edbf00 100644 --- a/src/GhostArrowRow.cpp +++ b/src/GhostArrowRow.cpp @@ -91,6 +91,11 @@ void GhostArrowRow::DrawPrimitives() 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 ) { diff --git a/src/GhostArrowRow.h b/src/GhostArrowRow.h index 7fdd604343..8425de35ef 100644 --- a/src/GhostArrowRow.h +++ b/src/GhostArrowRow.h @@ -18,6 +18,7 @@ public: void Load( const PlayerState* pPlayerState, float fYReverseOffset ); + void DidStep( int iCol ); void DidTapNote( int iCol, TapNoteScore tns, bool bBright ); void DidHoldNote( int iCol, HoldNoteScore hns, bool bBright ); void SetHoldShowing( int iCol, const TapNote &tn ); diff --git a/src/NoteField.cpp b/src/NoteField.cpp index 06b3f44790..0dc5dc0cb2 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -942,7 +942,10 @@ void NoteField::FadeToFail() // 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::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::DidHoldNote( int iCol, HoldNoteScore score, bool bBright ) { m_pCurDisplay->m_GhostArrowRow.DidHoldNote( iCol, score, bBright ); }