diff --git a/NoteSkins/pump/default/UpLeft Explosion.lua b/NoteSkins/pump/default/UpLeft Explosion.lua index 03a89882b4..13dda698b2 100644 --- a/NoteSkins/pump/default/UpLeft Explosion.lua +++ b/NoteSkins/pump/default/UpLeft Explosion.lua @@ -7,31 +7,21 @@ return Def.ActorFrame { W3Command=cmd(playcommand,"Glow"); W4Command=cmd(); W5Command=cmd(); - --HoldingOnCommand=cmd(playcommand,"Glow"); + HitMineCommand=cmd(playcommand,"Glow"); GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,1.0;zoom,1.0;linear,0.15;diffusealpha,0.9;zoom,1.15;linear,0.15;diffusealpha,0.0;zoom,1.3); HeldCommand=cmd(playcommand,"Glow"); }; + --tap NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ Name="Tap"; Frames = { { Frame = 2 } }; - 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"); - - --HitMineCommand=cmd(playcommand,"Tap"); + InitCommand=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"); - + --TapNoneCommand=cmd(playcommand,"Tap"); }; --explosion LoadActor("_flash")..{ @@ -46,8 +36,10 @@ return Def.ActorFrame { HeldCommand=cmd(playcommand,"Glow"); GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2); }; - Def.Actor { - HitMineCommand=function(self) MESSAGEMAN:BroadCast("AMineWasHit"); end; + --thing... + Def.Quad { + InitCommand=cmd(zoomto,60,4800;diffusealpha,0); + HitMineCommand=cmd(finishtweening;diffusealpha,1;linear,0.3;diffusealpha,0); }; --[[Def.Quad { InitCommand=function(self) diff --git a/src/GhostArrowRow.cpp b/src/GhostArrowRow.cpp index 7fd7edbf00..8613be451c 100644 --- a/src/GhostArrowRow.cpp +++ b/src/GhostArrowRow.cpp @@ -94,7 +94,8 @@ void GhostArrowRow::DrawPrimitives() 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"); + //HURR + //m_Ghost[iCol]->PlayCommand("TapNone"); } void GhostArrowRow::DidTapNote( int iCol, TapNoteScore tns, bool bBright )