diff --git a/NoteSkins/dance/midi/Down Hold Body Active.png b/NoteSkins/dance/midi-note/Down Hold Body Active.png similarity index 100% rename from NoteSkins/dance/midi/Down Hold Body Active.png rename to NoteSkins/dance/midi-note/Down Hold Body Active.png diff --git a/NoteSkins/dance/midi/Down Hold Body Inactive.png b/NoteSkins/dance/midi-note/Down Hold Body Inactive.png similarity index 100% rename from NoteSkins/dance/midi/Down Hold Body Inactive.png rename to NoteSkins/dance/midi-note/Down Hold Body Inactive.png diff --git a/NoteSkins/dance/midi/Down Hold BottomCap Active.png b/NoteSkins/dance/midi-note/Down Hold BottomCap Active.png similarity index 100% rename from NoteSkins/dance/midi/Down Hold BottomCap Active.png rename to NoteSkins/dance/midi-note/Down Hold BottomCap Active.png diff --git a/NoteSkins/dance/midi/Down Hold BottomCap Inactive.png b/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive.png similarity index 100% rename from NoteSkins/dance/midi/Down Hold BottomCap Inactive.png rename to NoteSkins/dance/midi-note/Down Hold BottomCap Inactive.png diff --git a/NoteSkins/dance/midi/Down Hold Explosion.redir b/NoteSkins/dance/midi-note/Down Hold Explosion.redir similarity index 100% rename from NoteSkins/dance/midi/Down Hold Explosion.redir rename to NoteSkins/dance/midi-note/Down Hold Explosion.redir diff --git a/NoteSkins/dance/midi/Down Hold TopCap Active.png b/NoteSkins/dance/midi-note/Down Hold TopCap Active.png similarity index 100% rename from NoteSkins/dance/midi/Down Hold TopCap Active.png rename to NoteSkins/dance/midi-note/Down Hold TopCap Active.png diff --git a/NoteSkins/dance/midi/Down Hold TopCap Inactive.png b/NoteSkins/dance/midi-note/Down Hold TopCap Inactive.png similarity index 100% rename from NoteSkins/dance/midi/Down Hold TopCap Inactive.png rename to NoteSkins/dance/midi-note/Down Hold TopCap Inactive.png diff --git a/NoteSkins/dance/midi/Down Receptor.lua b/NoteSkins/dance/midi-note/Down Receptor.lua similarity index 100% rename from NoteSkins/dance/midi/Down Receptor.lua rename to NoteSkins/dance/midi-note/Down Receptor.lua diff --git a/NoteSkins/dance/midi/Down Roll Body Active.png b/NoteSkins/dance/midi-note/Down Roll Body Active.png similarity index 100% rename from NoteSkins/dance/midi/Down Roll Body Active.png rename to NoteSkins/dance/midi-note/Down Roll Body Active.png diff --git a/NoteSkins/dance/midi/Down Roll Body Inactive.png b/NoteSkins/dance/midi-note/Down Roll Body Inactive.png similarity index 100% rename from NoteSkins/dance/midi/Down Roll Body Inactive.png rename to NoteSkins/dance/midi-note/Down Roll Body Inactive.png diff --git a/NoteSkins/dance/midi/Down Roll BottomCap Active.png b/NoteSkins/dance/midi-note/Down Roll BottomCap Active.png similarity index 100% rename from NoteSkins/dance/midi/Down Roll BottomCap Active.png rename to NoteSkins/dance/midi-note/Down Roll BottomCap Active.png diff --git a/NoteSkins/dance/midi/Down Roll BottomCap Inactive.png b/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive.png similarity index 100% rename from NoteSkins/dance/midi/Down Roll BottomCap Inactive.png rename to NoteSkins/dance/midi-note/Down Roll BottomCap Inactive.png diff --git a/NoteSkins/dance/midi/Down Roll Explosion.redir b/NoteSkins/dance/midi-note/Down Roll Explosion.redir similarity index 100% rename from NoteSkins/dance/midi/Down Roll Explosion.redir rename to NoteSkins/dance/midi-note/Down Roll Explosion.redir diff --git a/NoteSkins/dance/midi/Down Roll TopCap Active.png b/NoteSkins/dance/midi-note/Down Roll TopCap Active.png similarity index 100% rename from NoteSkins/dance/midi/Down Roll TopCap Active.png rename to NoteSkins/dance/midi-note/Down Roll TopCap Active.png diff --git a/NoteSkins/dance/midi/Down Roll TopCap Inactive.png b/NoteSkins/dance/midi-note/Down Roll TopCap Inactive.png similarity index 100% rename from NoteSkins/dance/midi/Down Roll TopCap Inactive.png rename to NoteSkins/dance/midi-note/Down Roll TopCap Inactive.png diff --git a/NoteSkins/dance/midi/Down Tap Explosion Bright.png b/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png similarity index 100% rename from NoteSkins/dance/midi/Down Tap Explosion Bright.png rename to NoteSkins/dance/midi-note/Down Tap Explosion Bright.png diff --git a/NoteSkins/dance/midi/Down Tap Explosion Dim.redir b/NoteSkins/dance/midi-note/Down Tap Explosion Dim.redir similarity index 100% rename from NoteSkins/dance/midi/Down Tap Explosion Dim.redir rename to NoteSkins/dance/midi-note/Down Tap Explosion Dim.redir diff --git a/NoteSkins/dance/midi-note/Down Tap Fake.png b/NoteSkins/dance/midi-note/Down Tap Fake.png new file mode 100644 index 0000000000..1954aa2d53 Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Tap Fake.png differ diff --git a/NoteSkins/dance/midi/Down Tap Mine.lua b/NoteSkins/dance/midi-note/Down Tap Mine.lua similarity index 100% rename from NoteSkins/dance/midi/Down Tap Mine.lua rename to NoteSkins/dance/midi-note/Down Tap Mine.lua diff --git a/NoteSkins/dance/midi/Down Tap Note.lua b/NoteSkins/dance/midi-note/Down Tap Note.lua similarity index 62% rename from NoteSkins/dance/midi/Down Tap Note.lua rename to NoteSkins/dance/midi-note/Down Tap Note.lua index 7b9802d6db..aced2df5cd 100644 --- a/NoteSkins/dance/midi/Down Tap Note.lua +++ b/NoteSkins/dance/midi-note/Down Tap Note.lua @@ -2,4 +2,7 @@ return Def.Sprite { Texture=NOTESKIN:GetPath( '_down', 'tap note' ); Frames = Sprite.LinearFrames( 8, 1 ); InitCommand=cmd(setstate,2); -}; \ No newline at end of file + DrawTapNoteMessageCommand=function(self,parent) + parent:spin(); + end; +}; diff --git a/NoteSkins/dance/midi/NoteSkin.lua b/NoteSkins/dance/midi-note/NoteSkin.lua similarity index 100% rename from NoteSkins/dance/midi/NoteSkin.lua rename to NoteSkins/dance/midi-note/NoteSkin.lua diff --git a/NoteSkins/dance/midi/_Down Tap Flash.png b/NoteSkins/dance/midi-note/_Down Tap Flash.png similarity index 100% rename from NoteSkins/dance/midi/_Down Tap Flash.png rename to NoteSkins/dance/midi-note/_Down Tap Flash.png diff --git a/NoteSkins/dance/midi-note/_Down Tap Mine.png b/NoteSkins/dance/midi-note/_Down Tap Mine.png new file mode 100644 index 0000000000..53e4a6d966 Binary files /dev/null and b/NoteSkins/dance/midi-note/_Down Tap Mine.png differ diff --git a/NoteSkins/dance/midi/_Down Tap Note 8x8.png b/NoteSkins/dance/midi-note/_Down Tap Note 8x8.png similarity index 100% rename from NoteSkins/dance/midi/_Down Tap Note 8x8.png rename to NoteSkins/dance/midi-note/_Down Tap Note 8x8.png diff --git a/NoteSkins/dance/midi/_Down Tap Receptor.png b/NoteSkins/dance/midi-note/_Down Tap Receptor.png similarity index 100% rename from NoteSkins/dance/midi/_Down Tap Receptor.png rename to NoteSkins/dance/midi-note/_Down Tap Receptor.png diff --git a/NoteSkins/dance/midi/metrics.ini b/NoteSkins/dance/midi-note/metrics.ini similarity index 100% rename from NoteSkins/dance/midi/metrics.ini rename to NoteSkins/dance/midi-note/metrics.ini diff --git a/NoteSkins/dance/midi/res/Resource.psd b/NoteSkins/dance/midi-note/res/Resource.psd similarity index 94% rename from NoteSkins/dance/midi/res/Resource.psd rename to NoteSkins/dance/midi-note/res/Resource.psd index 2b77c509d6..5c15ec54ea 100644 Binary files a/NoteSkins/dance/midi/res/Resource.psd and b/NoteSkins/dance/midi-note/res/Resource.psd differ diff --git a/NoteSkins/dance/midi-solo/Down Hold Body Active.png b/NoteSkins/dance/midi-solo/Down Hold Body Active.png new file mode 100644 index 0000000000..38793b8da3 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Hold Body Active.png differ diff --git a/NoteSkins/dance/midi-solo/Down Hold Body Inactive.png b/NoteSkins/dance/midi-solo/Down Hold Body Inactive.png new file mode 100644 index 0000000000..cce26e910a Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Hold Body Inactive.png differ diff --git a/NoteSkins/dance/midi-solo/Down Hold BottomCap Active.png b/NoteSkins/dance/midi-solo/Down Hold BottomCap Active.png new file mode 100644 index 0000000000..1d0dcb50c8 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Hold BottomCap Active.png differ diff --git a/NoteSkins/dance/midi-solo/Down Hold BottomCap Inactive.png b/NoteSkins/dance/midi-solo/Down Hold BottomCap Inactive.png new file mode 100644 index 0000000000..180ef7c680 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Hold BottomCap Inactive.png differ diff --git a/NoteSkins/dance/midi-solo/Down Hold Explosion.redir b/NoteSkins/dance/midi-solo/Down Hold Explosion.redir new file mode 100644 index 0000000000..9bef57edb4 --- /dev/null +++ b/NoteSkins/dance/midi-solo/Down Hold Explosion.redir @@ -0,0 +1 @@ +Down Tap Explosion Bright \ No newline at end of file diff --git a/NoteSkins/dance/midi-solo/Down Hold TopCap Active.png b/NoteSkins/dance/midi-solo/Down Hold TopCap Active.png new file mode 100644 index 0000000000..100c9b54f3 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Hold TopCap Active.png differ diff --git a/NoteSkins/dance/midi-solo/Down Hold TopCap Inactive.png b/NoteSkins/dance/midi-solo/Down Hold TopCap Inactive.png new file mode 100644 index 0000000000..4a6c422286 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Hold TopCap Inactive.png differ diff --git a/NoteSkins/dance/midi-solo/Down Receptor.lua b/NoteSkins/dance/midi-solo/Down Receptor.lua new file mode 100644 index 0000000000..5b0a792aaf --- /dev/null +++ b/NoteSkins/dance/midi-solo/Down Receptor.lua @@ -0,0 +1,26 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap Receptor' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap Receptor' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrowOverlay', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrowOverlay', 'NoneCommand'); + }; + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap Flash' ); + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); + LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; +}; +return t; diff --git a/NoteSkins/dance/midi-solo/Down Roll Body Active.png b/NoteSkins/dance/midi-solo/Down Roll Body Active.png new file mode 100644 index 0000000000..b0d3e27413 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Roll Body Active.png differ diff --git a/NoteSkins/dance/midi-solo/Down Roll Body Inactive.png b/NoteSkins/dance/midi-solo/Down Roll Body Inactive.png new file mode 100644 index 0000000000..9d6eec3daf Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Roll Body Inactive.png differ diff --git a/NoteSkins/dance/midi-solo/Down Roll BottomCap Active.png b/NoteSkins/dance/midi-solo/Down Roll BottomCap Active.png new file mode 100644 index 0000000000..5d75ddc51a Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Roll BottomCap Active.png differ diff --git a/NoteSkins/dance/midi-solo/Down Roll BottomCap Inactive.png b/NoteSkins/dance/midi-solo/Down Roll BottomCap Inactive.png new file mode 100644 index 0000000000..74eb3dce64 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Roll BottomCap Inactive.png differ diff --git a/NoteSkins/dance/midi-solo/Down Roll Explosion.redir b/NoteSkins/dance/midi-solo/Down Roll Explosion.redir new file mode 100644 index 0000000000..9bef57edb4 --- /dev/null +++ b/NoteSkins/dance/midi-solo/Down Roll Explosion.redir @@ -0,0 +1 @@ +Down Tap Explosion Bright \ No newline at end of file diff --git a/NoteSkins/dance/midi-solo/Down Roll TopCap Active.png b/NoteSkins/dance/midi-solo/Down Roll TopCap Active.png new file mode 100644 index 0000000000..bdc2656ec9 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Roll TopCap Active.png differ diff --git a/NoteSkins/dance/midi-solo/Down Roll TopCap Inactive.png b/NoteSkins/dance/midi-solo/Down Roll TopCap Inactive.png new file mode 100644 index 0000000000..16f422ba08 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Roll TopCap Inactive.png differ diff --git a/NoteSkins/dance/midi-solo/Down Tap Explosion Bright.png b/NoteSkins/dance/midi-solo/Down Tap Explosion Bright.png new file mode 100644 index 0000000000..bd54411afb Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Tap Explosion Bright.png differ diff --git a/NoteSkins/dance/midi-solo/Down Tap Explosion Dim.redir b/NoteSkins/dance/midi-solo/Down Tap Explosion Dim.redir new file mode 100644 index 0000000000..9bef57edb4 --- /dev/null +++ b/NoteSkins/dance/midi-solo/Down Tap Explosion Dim.redir @@ -0,0 +1 @@ +Down Tap Explosion Bright \ No newline at end of file diff --git a/NoteSkins/dance/midi-solo/Down Tap Fake.png b/NoteSkins/dance/midi-solo/Down Tap Fake.png new file mode 100644 index 0000000000..1954aa2d53 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Tap Fake.png differ diff --git a/NoteSkins/dance/midi-solo/Down Tap Lift.png b/NoteSkins/dance/midi-solo/Down Tap Lift.png new file mode 100644 index 0000000000..8919b8a664 Binary files /dev/null and b/NoteSkins/dance/midi-solo/Down Tap Lift.png differ diff --git a/NoteSkins/dance/midi-solo/Down Tap Mine.lua b/NoteSkins/dance/midi-solo/Down Tap Mine.lua new file mode 100644 index 0000000000..d6845c11d4 --- /dev/null +++ b/NoteSkins/dance/midi-solo/Down Tap Mine.lua @@ -0,0 +1,9 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap mine' ); + Frame0000=0; + Delay0000=1; + InitCommand=cmd(spin;effectclock,'beat';effectmagnitude,0,0,-180); + }; +}; +return t; diff --git a/NoteSkins/dance/midi-solo/Down Tap Note.lua b/NoteSkins/dance/midi-solo/Down Tap Note.lua new file mode 100644 index 0000000000..aced2df5cd --- /dev/null +++ b/NoteSkins/dance/midi-solo/Down Tap Note.lua @@ -0,0 +1,8 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap note' ); + Frames = Sprite.LinearFrames( 8, 1 ); + InitCommand=cmd(setstate,2); + DrawTapNoteMessageCommand=function(self,parent) + parent:spin(); + end; +}; diff --git a/NoteSkins/dance/midi-solo/NoteSkin.lua b/NoteSkins/dance/midi-solo/NoteSkin.lua new file mode 100644 index 0000000000..d9bf269462 --- /dev/null +++ b/NoteSkins/dance/midi-solo/NoteSkin.lua @@ -0,0 +1,106 @@ +-- Haggen Daze + +local ret = ... or {}; + +ret.RedirTable = +{ + Up = "Down", + Down = "Down", + Left = "Down", + Right = "Down", + UpLeft = "Down", + UpRight = "Down", +}; + +local OldRedir = ret.Redir; +ret.Redir = function(sButton, sElement) + sButton, sElement = OldRedir(sButton, sElement); + + -- Instead of separate hold heads, use the tap note graphics. + if sElement == "Hold Head Inactive" or + sElement == "Hold Head Active" or + sElement == "Roll Head Inactive" or + sElement == "Roll Head Active" + then + sElement = "Tap Note"; + end + + sButton = ret.RedirTable[sButton]; + + return sButton, sElement; +end + +-- To have separate graphics for each hold part: +--[[ +local OldRedir = ret.Redir; +ret.Redir = function(sButton, sElement) + -- Redirect non-hold, non-roll parts. + if string.find(sElement, "hold") then + return sButton, sElement; + end + return OldRedir(sButton, sElement); +end +]] + +local OldFunc = ret.Load; +function ret.Load() + local t = OldFunc(); + + -- The main "Explosion" part just loads other actors; don't rotate + -- it. The "Hold Explosion" part should not be rotated. + if Var "Element" == "Explosion" or + Var "Element" == "Roll Explosion" then + t.BaseRotationZ = nil; + end + return t; +end + +ret.PartsToRotate = +{ + ["Receptor"] = true, + ["Go Receptor"] = true, + ["Ready Receptor"] = true, + ["Tap Explosion Bright"] = true, + ["Tap Explosion Dim"] = true, + ["Tap Note"] = true, + ["Tap Lift"] = true, + ["Hold Head Active"] = true, + ["Hold Head Inactive"] = true, + ["Roll Head Active"] = true, + ["Roll Head Inactive"] = true, + ["Hold Explosion"] = true, + ["Roll Explosion"] = true, +}; +ret.Rotate = +{ + Up = 180, + Down = 0, + Left = 90, + Right = -90, + UpLeft = 135, + UpRight = 225, +}; + +-- +-- If a derived skin wants to have separate UpLeft graphics, +-- use this: +-- +-- ret.RedirTable.UpLeft = "UpLeft"; +-- ret.RedirTable.UpRight = "UpLeft"; +-- ret.Rotate.UpLeft = 0; +-- ret.Rotate.UpRight = 90; +-- +ret.Blank = +{ + ["Hold Topcap Active"] = true, + ["Hold Topcap Inactive"] = true, + ["Roll Topcap Active"] = true, + ["Roll Topcap Inactive"] = true, + ["Hold Tail Active"] = true, + ["Hold Tail Inactive"] = true, + ["Roll Tail Active"] = true, + ["Roll Tail Inactive"] = true, + ["Roll Explosion"] = true, +}; + +return ret; diff --git a/NoteSkins/dance/midi-solo/_Down Tap Flash.png b/NoteSkins/dance/midi-solo/_Down Tap Flash.png new file mode 100644 index 0000000000..5055d59771 Binary files /dev/null and b/NoteSkins/dance/midi-solo/_Down Tap Flash.png differ diff --git a/NoteSkins/dance/midi-solo/_Down Tap Mine.png b/NoteSkins/dance/midi-solo/_Down Tap Mine.png new file mode 100644 index 0000000000..53e4a6d966 Binary files /dev/null and b/NoteSkins/dance/midi-solo/_Down Tap Mine.png differ diff --git a/NoteSkins/dance/midi-solo/_Down Tap Note 8x8.png b/NoteSkins/dance/midi-solo/_Down Tap Note 8x8.png new file mode 100644 index 0000000000..353a9ebdd8 Binary files /dev/null and b/NoteSkins/dance/midi-solo/_Down Tap Note 8x8.png differ diff --git a/NoteSkins/dance/midi-solo/_Down Tap Receptor.png b/NoteSkins/dance/midi-solo/_Down Tap Receptor.png new file mode 100644 index 0000000000..4b1c2df488 Binary files /dev/null and b/NoteSkins/dance/midi-solo/_Down Tap Receptor.png differ diff --git a/NoteSkins/dance/midi-solo/metrics.ini b/NoteSkins/dance/midi-solo/metrics.ini new file mode 100644 index 0000000000..e5fb0bbbc6 --- /dev/null +++ b/NoteSkins/dance/midi-solo/metrics.ini @@ -0,0 +1,81 @@ +[Global] +FallbackNoteSkin=default + +[NoteDisplay] +TapNoteAnimationIsVivid=0 +DrawHoldHeadForTapsOnSameRow=1 +TapNoteAnimationLengthInBeats=4 +TapAdditionAnimationLengthInBeats=4 +TapMineAnimationLengthInBeats=1 +TapLiftAnimationLengthInBeats=4 +HoldHeadAnimationLengthInBeats=4 // doesn't matter. Only 1 frame anyway. +HoldTopCapAnimationLengthInBeats=4 // doesn't matter. Only 1 frame anyway. +HoldBottomCapAnimationLengthInBeats=4 // doesn't matter. Only 1 frame anyway. +HoldBodyAnimationLengthInBeats=4 // doesn't matter. Only 1 frame anyway. +HoldTailAnimationLengthInBeats=4 // doesn't matter. Only 1 frame anyway. + +StartDrawingHoldBodyOffsetFromHead=0 +StopDrawingHoldBodyOffsetFromTail=0 + +HoldLetGoGrayPercent=0.125 + +ReverseDrawOrder=1101 +HoldHeadIsAboveWavyParts=1 +HoldTailIsAboveWavyParts=1 +TapNoteAdditionTextureCoordOffsetX=0 +TapNoteAdditionTextureCoordOffsetY=0 +FlipHeadAndTailWhenReverse=1 +FlipHoldBodyWhenReverse=1 +TopHoldAnchorWhenReverse=1 + +TapNoteNoteColorTextureCoordSpacingX=0 +TapNoteNoteColorTextureCoordSpacingY=0.125 + +TapFakeNoteColorTextureCoordSpacingX=0 +TapFakeNoteColorTextureCoordSpacingY=0.125 + +HoldHeadNoteColorTextureCoordSpacingX=0 +HoldHeadNoteColorTextureCoordSpacingY=0.125 + +[GhostArrowDim] +NoneCommand= +HitMineCommand=blend,'BlendMode_Add';diffuse,1,1,1,0.875;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +MissCommand=blend,'BlendMode_Add'; +W5Command=blend,'BlendMode_Add';diffuse,0.8,0.0,0.6,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W4Command=blend,'BlendMode_Add';diffuse,0.3,0.8,1.0,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W3Command=blend,'BlendMode_Add';diffuse,0.0,1.0,0.4,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W2Command=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W1Command=blend,'BlendMode_Add';diffuse,1.0,1.0,1.0,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +LetGoCommand=blend,'BlendMode_Add'; +HeldCommand=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 + +[GhostArrowBright] +NoneCommand=blend,'BlendMode_Add'; +HitMineCommand=blend,'BlendMode_Add';diffuse,1,1,1,0.875;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +MissCommand=blend,'BlendMode_Add'; +W5Command=blend,'BlendMode_Add';diffuse,0.8,0.0,0.6,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W4Command=blend,'BlendMode_Add';diffuse,0.3,0.8,1.0,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W3Command=blend,'BlendMode_Add';diffuse,0.0,1.0,0.4,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W2Command=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W1Command=blend,'BlendMode_Add';diffuse,1.0,1.0,1.0,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +LetGoCommand=blend,'BlendMode_Add'; +HeldCommand=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 + +[ReceptorArrow] +W3Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 +W2Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 +W1Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 +InitCommand= +NoneCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 +PressCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 +[ReceptorArrowOverlay] +W3Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 +W2Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 +W1Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 +InitCommand=blend,"BlendMode_Add";effectclock,"beat";diffuseramp;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,1");effecttiming,.2,0,.8,0;effectoffset,.05 +NoneCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 +PressCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 +[ReceptorOverlay] +InitCommand=diffusealpha,0;blend,"BlendMode_Add" +PressCommand=finishtweening;zoom,1.1;decelerate,0.12;zoom,1;diffusealpha,0.6; +LiftCommand=finishtweening;accelerate,0.12;diffusealpha,0;zoom,1.2 \ No newline at end of file diff --git a/NoteSkins/dance/midi-solo/original.Down Tap Lift.lua b/NoteSkins/dance/midi-solo/original.Down Tap Lift.lua new file mode 100644 index 0000000000..e02b61c4b0 --- /dev/null +++ b/NoteSkins/dance/midi-solo/original.Down Tap Lift.lua @@ -0,0 +1,16 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap lift' ); + InitCommand=cmd(diffusealpha,0.5); + }; + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap lift' ); + InitCommand=cmd(pulse;effectclock,"beat";effecttiming,0,0,0.75/2,0.25/2;effectmagnitude,1,1,1;effectcolor1,color("1,1,1,1");effectcolor2,color("1,1.25,1,1")); + }; + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'lift fill' ); + Frames = Sprite.LinearFrames( 4, 1 ); + InitCommand=cmd(pulse;effectclock,"beat";effecttiming,0,0,0.75/4,0.25/4;effectmagnitude,1,1,1;effectcolor1,color("1,1,1,1");effectcolor2,color("1,1,1,1")); + }; +}; +return t; diff --git a/NoteSkins/dance/midi-solo/res/Resource.psd b/NoteSkins/dance/midi-solo/res/Resource.psd new file mode 100644 index 0000000000..b154a62dd5 Binary files /dev/null and b/NoteSkins/dance/midi-solo/res/Resource.psd differ diff --git a/NoteSkins/dance/midi/_Down Tap Mine.png b/NoteSkins/dance/midi/_Down Tap Mine.png deleted file mode 100644 index f5bdbf998f..0000000000 Binary files a/NoteSkins/dance/midi/_Down Tap Mine.png and /dev/null differ