diff --git a/NoteSkins/pump/cmd/Center Hold Body active (doubleres) 6x1.png b/NoteSkins/pump/cmd/Center Hold Body active (doubleres) 6x1.png new file mode 100644 index 0000000000..a5fb2c6529 Binary files /dev/null and b/NoteSkins/pump/cmd/Center Hold Body active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/Center Hold BottomCap active (doubleres) 6x1.png b/NoteSkins/pump/cmd/Center Hold BottomCap active (doubleres) 6x1.png new file mode 100644 index 0000000000..7269033a26 Binary files /dev/null and b/NoteSkins/pump/cmd/Center Hold BottomCap active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/Center Outline (doubleres).png b/NoteSkins/pump/cmd/Center Outline (doubleres).png new file mode 100644 index 0000000000..2b82c81503 Binary files /dev/null and b/NoteSkins/pump/cmd/Center Outline (doubleres).png differ diff --git a/NoteSkins/pump/cmd/Center Ready Receptor (doubleres) 1x3.png b/NoteSkins/pump/cmd/Center Ready Receptor (doubleres) 1x3.png new file mode 100644 index 0000000000..12ae09dfb5 Binary files /dev/null and b/NoteSkins/pump/cmd/Center Ready Receptor (doubleres) 1x3.png differ diff --git a/NoteSkins/pump/cmd/Center Roll Head Active (doubleres) 3x2.png b/NoteSkins/pump/cmd/Center Roll Head Active (doubleres) 3x2.png new file mode 100644 index 0000000000..596e706af5 Binary files /dev/null and b/NoteSkins/pump/cmd/Center Roll Head Active (doubleres) 3x2.png differ diff --git a/NoteSkins/pump/cmd/Center Tap Note (doubleres) 3x2.png b/NoteSkins/pump/cmd/Center Tap Note (doubleres) 3x2.png new file mode 100644 index 0000000000..e637a644d0 Binary files /dev/null and b/NoteSkins/pump/cmd/Center Tap Note (doubleres) 3x2.png differ diff --git a/NoteSkins/pump/cmd/DownLeft Hold Body active (doubleres) 6x1.png b/NoteSkins/pump/cmd/DownLeft Hold Body active (doubleres) 6x1.png new file mode 100644 index 0000000000..dec008a0ba Binary files /dev/null and b/NoteSkins/pump/cmd/DownLeft Hold Body active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/DownLeft Hold BottomCap active (doubleres) 6x1.png b/NoteSkins/pump/cmd/DownLeft Hold BottomCap active (doubleres) 6x1.png new file mode 100644 index 0000000000..c285faa23a Binary files /dev/null and b/NoteSkins/pump/cmd/DownLeft Hold BottomCap active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/DownLeft Ready Receptor (doubleres) 1x3.png b/NoteSkins/pump/cmd/DownLeft Ready Receptor (doubleres) 1x3.png new file mode 100644 index 0000000000..1f0442a029 Binary files /dev/null and b/NoteSkins/pump/cmd/DownLeft Ready Receptor (doubleres) 1x3.png differ diff --git a/NoteSkins/pump/cmd/DownLeft Roll Head Active (doubleres) 3x2.png b/NoteSkins/pump/cmd/DownLeft Roll Head Active (doubleres) 3x2.png new file mode 100644 index 0000000000..65877b8a66 Binary files /dev/null and b/NoteSkins/pump/cmd/DownLeft Roll Head Active (doubleres) 3x2.png differ diff --git a/NoteSkins/pump/cmd/DownLeft Tap Note (doubleres) 3x2.png b/NoteSkins/pump/cmd/DownLeft Tap Note (doubleres) 3x2.png new file mode 100644 index 0000000000..e521910087 Binary files /dev/null and b/NoteSkins/pump/cmd/DownLeft Tap Note (doubleres) 3x2.png differ diff --git a/NoteSkins/pump/cmd/DownRight Hold Body active (doubleres) 6x1.png b/NoteSkins/pump/cmd/DownRight Hold Body active (doubleres) 6x1.png new file mode 100644 index 0000000000..37d6bb73f8 Binary files /dev/null and b/NoteSkins/pump/cmd/DownRight Hold Body active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/DownRight Hold BottomCap active (doubleres) 6x1.png b/NoteSkins/pump/cmd/DownRight Hold BottomCap active (doubleres) 6x1.png new file mode 100644 index 0000000000..9b4f33fc8f Binary files /dev/null and b/NoteSkins/pump/cmd/DownRight Hold BottomCap active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/DownRight Roll Head Active (doubleres) 3x2.png b/NoteSkins/pump/cmd/DownRight Roll Head Active (doubleres) 3x2.png new file mode 100644 index 0000000000..d5b1921504 Binary files /dev/null and b/NoteSkins/pump/cmd/DownRight Roll Head Active (doubleres) 3x2.png differ diff --git a/NoteSkins/pump/cmd/UpLeft Hold Body active (doubleres) 6x1.png b/NoteSkins/pump/cmd/UpLeft Hold Body active (doubleres) 6x1.png new file mode 100644 index 0000000000..268e2a4f88 Binary files /dev/null and b/NoteSkins/pump/cmd/UpLeft Hold Body active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/UpLeft Hold BottomCap active (doubleres) 6x1.png b/NoteSkins/pump/cmd/UpLeft Hold BottomCap active (doubleres) 6x1.png new file mode 100644 index 0000000000..d2dc4c2710 Binary files /dev/null and b/NoteSkins/pump/cmd/UpLeft Hold BottomCap active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/UpLeft Ready Receptor (doubleres) 1x3.png b/NoteSkins/pump/cmd/UpLeft Ready Receptor (doubleres) 1x3.png new file mode 100644 index 0000000000..8955ecc973 Binary files /dev/null and b/NoteSkins/pump/cmd/UpLeft Ready Receptor (doubleres) 1x3.png differ diff --git a/NoteSkins/pump/cmd/UpLeft Roll Head Active (doubleres) 3x2.png b/NoteSkins/pump/cmd/UpLeft Roll Head Active (doubleres) 3x2.png new file mode 100644 index 0000000000..e08b7b8c40 Binary files /dev/null and b/NoteSkins/pump/cmd/UpLeft Roll Head Active (doubleres) 3x2.png differ diff --git a/NoteSkins/pump/cmd/UpLeft Tap Note (doubleres) 3x2.png b/NoteSkins/pump/cmd/UpLeft Tap Note (doubleres) 3x2.png new file mode 100644 index 0000000000..0bb3cf9339 Binary files /dev/null and b/NoteSkins/pump/cmd/UpLeft Tap Note (doubleres) 3x2.png differ diff --git a/NoteSkins/pump/cmd/UpRight Hold Body active (doubleres) 6x1.png b/NoteSkins/pump/cmd/UpRight Hold Body active (doubleres) 6x1.png new file mode 100644 index 0000000000..d612eec8f8 Binary files /dev/null and b/NoteSkins/pump/cmd/UpRight Hold Body active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/UpRight Hold BottomCap active (doubleres) 6x1.png b/NoteSkins/pump/cmd/UpRight Hold BottomCap active (doubleres) 6x1.png new file mode 100644 index 0000000000..71cb3a3606 Binary files /dev/null and b/NoteSkins/pump/cmd/UpRight Hold BottomCap active (doubleres) 6x1.png differ diff --git a/NoteSkins/pump/cmd/UpRight Roll Head Active (doubleres) 3x2.png b/NoteSkins/pump/cmd/UpRight Roll Head Active (doubleres) 3x2.png new file mode 100644 index 0000000000..e6661d8558 Binary files /dev/null and b/NoteSkins/pump/cmd/UpRight Roll Head Active (doubleres) 3x2.png differ diff --git a/NoteSkins/pump/cmd/metrics.ini b/NoteSkins/pump/cmd/metrics.ini new file mode 100644 index 0000000000..7fbb6e9abf --- /dev/null +++ b/NoteSkins/pump/cmd/metrics.ini @@ -0,0 +1,5 @@ +[UpLeft] +StartDrawingHoldBodyOffsetFromHead=-22 + +[UpRight] +StartDrawingHoldBodyOffsetFromHead=-22 \ No newline at end of file diff --git a/NoteSkins/pump/complex/Center Hold Body active (doubleres).png b/NoteSkins/pump/complex/Center Hold Body active (doubleres).png new file mode 100644 index 0000000000..224363c518 Binary files /dev/null and b/NoteSkins/pump/complex/Center Hold Body active (doubleres).png differ diff --git a/NoteSkins/pump/complex/Center Hold BottomCap active (doubleres).png b/NoteSkins/pump/complex/Center Hold BottomCap active (doubleres).png new file mode 100644 index 0000000000..f264e1c1ec Binary files /dev/null and b/NoteSkins/pump/complex/Center Hold BottomCap active (doubleres).png differ diff --git a/NoteSkins/pump/complex/Center Outline Receptor.redir b/NoteSkins/pump/complex/Center Outline Receptor.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/NoteSkins/pump/complex/Center Outline Receptor.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/NoteSkins/pump/complex/Center Ready Receptor 3x1 (doubleres).png b/NoteSkins/pump/complex/Center Ready Receptor 3x1 (doubleres).png new file mode 100644 index 0000000000..8bccb6a173 Binary files /dev/null and b/NoteSkins/pump/complex/Center Ready Receptor 3x1 (doubleres).png differ diff --git a/NoteSkins/pump/complex/Center Tap Note 5x1 (doubleres).png b/NoteSkins/pump/complex/Center Tap Note 5x1 (doubleres).png new file mode 100644 index 0000000000..cc570a8a7c Binary files /dev/null and b/NoteSkins/pump/complex/Center Tap Note 5x1 (doubleres).png differ diff --git a/NoteSkins/pump/complex/DownLeft Hold Body active (doubleres).png b/NoteSkins/pump/complex/DownLeft Hold Body active (doubleres).png new file mode 100644 index 0000000000..4e06598aed Binary files /dev/null and b/NoteSkins/pump/complex/DownLeft Hold Body active (doubleres).png differ diff --git a/NoteSkins/pump/complex/DownLeft Hold BottomCap active (doubleres).png b/NoteSkins/pump/complex/DownLeft Hold BottomCap active (doubleres).png new file mode 100644 index 0000000000..185632489a Binary files /dev/null and b/NoteSkins/pump/complex/DownLeft Hold BottomCap active (doubleres).png differ diff --git a/NoteSkins/pump/complex/DownLeft Ready Receptor 3x1 (doubleres).png b/NoteSkins/pump/complex/DownLeft Ready Receptor 3x1 (doubleres).png new file mode 100644 index 0000000000..83bf9eb887 Binary files /dev/null and b/NoteSkins/pump/complex/DownLeft Ready Receptor 3x1 (doubleres).png differ diff --git a/NoteSkins/pump/complex/DownLeft Tap Note 6x1 (doubleres).png b/NoteSkins/pump/complex/DownLeft Tap Note 6x1 (doubleres).png new file mode 100644 index 0000000000..831d04daf0 Binary files /dev/null and b/NoteSkins/pump/complex/DownLeft Tap Note 6x1 (doubleres).png differ diff --git a/NoteSkins/pump/complex/DownRight Hold Body active (doubleres).png b/NoteSkins/pump/complex/DownRight Hold Body active (doubleres).png new file mode 100644 index 0000000000..3ebefa3bb6 Binary files /dev/null and b/NoteSkins/pump/complex/DownRight Hold Body active (doubleres).png differ diff --git a/NoteSkins/pump/complex/DownRight Hold BottomCap active (doubleres).png b/NoteSkins/pump/complex/DownRight Hold BottomCap active (doubleres).png new file mode 100644 index 0000000000..614a7f87b7 Binary files /dev/null and b/NoteSkins/pump/complex/DownRight Hold BottomCap active (doubleres).png differ diff --git a/NoteSkins/pump/complex/UpLeft Hold Body active (doubleres).png b/NoteSkins/pump/complex/UpLeft Hold Body active (doubleres).png new file mode 100644 index 0000000000..88bc41af90 Binary files /dev/null and b/NoteSkins/pump/complex/UpLeft Hold Body active (doubleres).png differ diff --git a/NoteSkins/pump/complex/UpLeft Hold BottomCap active (doubleres).png b/NoteSkins/pump/complex/UpLeft Hold BottomCap active (doubleres).png new file mode 100644 index 0000000000..b5a849a4f7 Binary files /dev/null and b/NoteSkins/pump/complex/UpLeft Hold BottomCap active (doubleres).png differ diff --git a/NoteSkins/pump/complex/UpLeft Ready Receptor 3x1 (doubleres).png b/NoteSkins/pump/complex/UpLeft Ready Receptor 3x1 (doubleres).png new file mode 100644 index 0000000000..296c09e1d7 Binary files /dev/null and b/NoteSkins/pump/complex/UpLeft Ready Receptor 3x1 (doubleres).png differ diff --git a/NoteSkins/pump/complex/UpLeft Tap Note 6x1 (doubleres).png b/NoteSkins/pump/complex/UpLeft Tap Note 6x1 (doubleres).png new file mode 100644 index 0000000000..9206df3234 Binary files /dev/null and b/NoteSkins/pump/complex/UpLeft Tap Note 6x1 (doubleres).png differ diff --git a/NoteSkins/pump/complex/UpRight Hold Body active (doubleres).png b/NoteSkins/pump/complex/UpRight Hold Body active (doubleres).png new file mode 100644 index 0000000000..77e7742235 Binary files /dev/null and b/NoteSkins/pump/complex/UpRight Hold Body active (doubleres).png differ diff --git a/NoteSkins/pump/complex/UpRight Hold BottomCap active (doubleres).png b/NoteSkins/pump/complex/UpRight Hold BottomCap active (doubleres).png new file mode 100644 index 0000000000..6718c26686 Binary files /dev/null and b/NoteSkins/pump/complex/UpRight Hold BottomCap active (doubleres).png differ diff --git a/NoteSkins/pump/default/Center Hold Body Active 6x1.png b/NoteSkins/pump/default/Center Hold Body Active 6x1.png new file mode 100644 index 0000000000..105f5569b9 Binary files /dev/null and b/NoteSkins/pump/default/Center Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/default/Center Hold BottomCap Active 6x1.png b/NoteSkins/pump/default/Center Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..ae7bc1e0ed Binary files /dev/null and b/NoteSkins/pump/default/Center Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/default/Center Outline Receptor.png b/NoteSkins/pump/default/Center Outline Receptor.png new file mode 100644 index 0000000000..40539372b5 Binary files /dev/null and b/NoteSkins/pump/default/Center Outline Receptor.png differ diff --git a/NoteSkins/pump/default/Center Ready Receptor 1x3.png b/NoteSkins/pump/default/Center Ready Receptor 1x3.png new file mode 100644 index 0000000000..337bdb0cdf Binary files /dev/null and b/NoteSkins/pump/default/Center Ready Receptor 1x3.png differ diff --git a/NoteSkins/pump/default/Center Tap Note 3x2.png b/NoteSkins/pump/default/Center Tap Note 3x2.png new file mode 100644 index 0000000000..5449e06dc9 Binary files /dev/null and b/NoteSkins/pump/default/Center Tap Note 3x2.png differ diff --git a/NoteSkins/pump/default/DownLeft Hold Body Active 6x1.png b/NoteSkins/pump/default/DownLeft Hold Body Active 6x1.png new file mode 100644 index 0000000000..89fa1da974 Binary files /dev/null and b/NoteSkins/pump/default/DownLeft Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/default/DownLeft Hold BottomCap Active 6x1.png b/NoteSkins/pump/default/DownLeft Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..28c0a7a5ad Binary files /dev/null and b/NoteSkins/pump/default/DownLeft Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/default/DownLeft Ready Receptor 1x3.png b/NoteSkins/pump/default/DownLeft Ready Receptor 1x3.png new file mode 100644 index 0000000000..42b6234d0e Binary files /dev/null and b/NoteSkins/pump/default/DownLeft Ready Receptor 1x3.png differ diff --git a/NoteSkins/pump/default/DownLeft Tap Note 3x2.png b/NoteSkins/pump/default/DownLeft Tap Note 3x2.png new file mode 100644 index 0000000000..e482eccacd Binary files /dev/null and b/NoteSkins/pump/default/DownLeft Tap Note 3x2.png differ diff --git a/NoteSkins/pump/default/DownRight Hold Body Active 6x1.png b/NoteSkins/pump/default/DownRight Hold Body Active 6x1.png new file mode 100644 index 0000000000..c8528f25fa Binary files /dev/null and b/NoteSkins/pump/default/DownRight Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/default/DownRight Hold BottomCap Active 6x1.png b/NoteSkins/pump/default/DownRight Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..bb1dfc4998 Binary files /dev/null and b/NoteSkins/pump/default/DownRight Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/default/DownRight Ready Receptor.lua b/NoteSkins/pump/default/DownRight Ready Receptor.lua new file mode 100644 index 0000000000..7e9e6392dd --- /dev/null +++ b/NoteSkins/pump/default/DownRight Ready Receptor.lua @@ -0,0 +1,8 @@ +return NOTESKIN:LoadActor("DownLeft", "Ready Receptor")..{ + Frames = { + { Frame = 0 }; + { Frame = 1 }; + { Frame = 2 }; + }; + 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 new file mode 100644 index 0000000000..04abf29c93 --- /dev/null +++ b/NoteSkins/pump/default/DownRight Tap Note.lua @@ -0,0 +1,3 @@ +return NOTESKIN:LoadActor("DownLeft","Tap Note")..{ + InitCommand=cmd(rotationy,180); +}; \ No newline at end of file diff --git a/NoteSkins/pump/default/NoteSkin.lua b/NoteSkins/pump/default/NoteSkin.lua new file mode 100644 index 0000000000..8483071be0 --- /dev/null +++ b/NoteSkins/pump/default/NoteSkin.lua @@ -0,0 +1,107 @@ +local Noteskin = {} + +--bBlanks: +Noteskin.bBlanks = { + --["element"] = true|false; + ["Hold Tail Active"] = true; + ["Hold Tail Active"] = true; + ["Roll Tail Inactive"] = true; + ["Roll Tail Inactive"] = true; +} +Noteskin.ElementRedirs = { + --["element"] = "redirected_element"; + ["Hold Head Active"] = "Tap Note"; + ["Hold Head Inactive"] = "Tap Note"; + ["Roll Head Active"] = "Roll Head Active"; + ["Roll Head Inactive"] = "Roll Head Active"; + ["Tap Fake"] = "Tap Note"; + -- + ["Hold Topcap Inactive"] = "Hold Topcap Active"; + ["Hold Body Inactive"] = "Hold Body Active"; + ["Hold Bottomcap Inactive"] = "Hold Bottomcap Active"; + ["Hold Tail Inactive"] = "Hold Tail Active"; + -- + ["Roll Topcap Active"] = "Hold Topcap Active"; + ["Roll Body Active"] = "Hold Body Active"; + ["Roll Bottomcap Active"] = "Hold Bottomcap Active"; + ["Roll Tail Active"] = "Hold Tail Active"; + -- + ["Roll Topcap Inactive"] = "Hold Topcap Active"; + ["Roll Body Inactive"] = "Hold Body Active"; + ["Roll Bottomcap Inactive"] = "Hold Bottomcap Active"; + ["Roll Tail Inactive"] = "Hold Tail Active"; +} +Noteskin.ButtonRedirs = { + Center = "Center"; + UpLeft = "UpLeft"; + UpRight = "UpRight"; + DownLeft = "DownLeft"; + DownRight = "DownRight"; +} +Noteskin.BaseRotX = { + Center = 0; + UpLeft = 0; + UpRight = 0; + DownLeft = 0; + DownRight = 0; +} +Noteskin.BaseRotY = { + Center = 0; + UpLeft = 0; + UpRight = 0; + DownLeft = 0; + DownRight = 0; +} + +local function func() + local sButton = Var "Button" + local sElement = Var "Element" + + if Noteskin.bBlanks[sElement] then + return Def.Actor {} + end + + --local ButtonToLoad = Noteskin.ButtonRedirs[sButton] + local ElementToLoad = Noteskin.ElementRedirs[sElement] + if not ElementToLoad then + ElementToLoad = sElement + end + + --update: ahora receptor también + if sElement == "Explosion" + or sElement == "Tap Lift" + or sElement == "Tap Mine" + or sElement == "Receptor" + then + sButton = "UpLeft" + end + local path = NOTESKIN:GetPath(Noteskin.ButtonRedirs[sButton],ElementToLoad) + --Graficos separados para holds y rolls + --if string.find(sElement,"Hold") or string.find(sElement,"Roll") then + if ( string.find(sElement,"Hold") or string.find(sElement,"Roll") ) and not ( string.find(sElement,"Head") or string.find(sElement,"Tail") ) then + --if ( string.find(sElement,"Hold") or string.find(sElement,"Roll") ) and ( string.find(sElement,"Body") ) then + path = NOTESKIN:GetPath(sButton,ElementToLoad) + end + + local t = LoadActor(path) + --Rotaciones independientes por elemento + --[[local dRotationX = Noteskin.BaseRotX[sButton][ElementToLoad] + if not dRotationX then + dRotationX = Noteskin.BaseRotX[sButton]["Common"] + end + + local dRotationY = Noteskin.BaseRotY[sButton][ElementToLoad] + if not dRotationY then + dRotationY = Noteskin.BaseRotY[sButton]["Common"] + end]] + + t.BaseRotationX=Noteskin.BaseRotX[sButton] + t.BaseRotationY=Noteskin.BaseRotY[sButton] + + return t +end + +Noteskin.Load = func +Noteskin.CommonLoad = func + +return Noteskin \ No newline at end of file diff --git a/NoteSkins/pump/default/UpLeft Explosion.lua b/NoteSkins/pump/default/UpLeft Explosion.lua new file mode 100644 index 0000000000..bd00c8aa6c --- /dev/null +++ b/NoteSkins/pump/default/UpLeft Explosion.lua @@ -0,0 +1,53 @@ +return Def.ActorFrame { + --note graphic + NOTESKIN:LoadActor(Var "Button", "Tap Note") .. { + InitCommand=cmd(blend,"BlendMode_Add";playcommand,"Glow"); + W1Command=cmd(playcommand,"Glow"); + W2Command=cmd(playcommand,"Glow"); + 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"); + }; + 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"); + HeldCommand=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")..{ + InitCommand=cmd(blend,"BlendMode_Add";playcommand,"Glow"); + W1Command=cmd(playcommand,"Glow"); + W2Command=cmd(playcommand,"Glow"); + W3Command=cmd(playcommand,"Glow"); + W4Command=cmd(); + W5Command=cmd(); + --HoldingOnCommand=cmd(playcommand,"Glow"); + HitMineCommand=cmd(playcommand,"Glow"); + HeldCommand=cmd(playcommand,"Glow"); + GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2); + }; + Def.Quad { + InitCommand=cmd(diffuse,1,1,1,0;zoomto,SCREEN_WIDTH*100,SCREEN_HEIGHT*100;zoomz,SCREEN_WIDTH*SCREEN_HEIGHT); + HitMineCommand=cmd(finishtweening;diffusealpha,1;linear,0.3;diffusealpha,0); + }; +} \ No newline at end of file diff --git a/NoteSkins/pump/default/UpLeft Hold Body Active 6x1.png b/NoteSkins/pump/default/UpLeft Hold Body Active 6x1.png new file mode 100644 index 0000000000..d3c72f63ae Binary files /dev/null and b/NoteSkins/pump/default/UpLeft Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/default/UpLeft Hold BottomCap Active 6x1.png b/NoteSkins/pump/default/UpLeft Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..71102f3abb Binary files /dev/null and b/NoteSkins/pump/default/UpLeft Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/default/UpLeft Ready Receptor 1x3.png b/NoteSkins/pump/default/UpLeft Ready Receptor 1x3.png new file mode 100644 index 0000000000..6abe706418 Binary files /dev/null and b/NoteSkins/pump/default/UpLeft Ready Receptor 1x3.png differ diff --git a/NoteSkins/pump/default/UpLeft Receptor.lua b/NoteSkins/pump/default/UpLeft Receptor.lua new file mode 100644 index 0000000000..a5d1e7e0f7 --- /dev/null +++ b/NoteSkins/pump/default/UpLeft Receptor.lua @@ -0,0 +1,49 @@ +local function Beat(self) + local this = self:GetChildren() + + local beat = GAMESTATE:GetSongBeat() + + local part = beat%1 + part = clamp(part,0,0.5) + local eff = scale(part,0,0.5,1,0) + if (GAMESTATE:GetSongDelay() or false) and part == 0 then eff = 0 end + if beat < 0 then + eff = 0 + end + this.Glow:diffusealpha(eff); +end + +return Def.ActorFrame { + -- COMMANDS -- + InitCommand=cmd(SetUpdateFunction,Beat); + + -- LAYERS -- + NOTESKIN:LoadActor("Center", "Outline Receptor")..{ + Name="Outline"; + Condition=Var "Button" == "Center"; + --InitCommand=cmd(x,96); + }; + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Base"; + Frames = { { Frame = 0 } }; + --PressCommand=cmd(finishtweening;glow,1,1,1,1;linear,0.1;glow,1,1,1,0); + }; + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Glow"; + Frames = { { Frame = 1 } }; + InitCommand=cmd(blend,'BlendMode_Add'); + --PressCommand=cmd(finishtweening;linear,0.05;zoom,0.9;linear,0.1;zoom,1); + }; + --[[ + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Tap"; + Frames = { { Frame = 2 } }; + InitCommand=cmd(zoom,1;diffusealpha,0;glow,1,1,1,0); + --NOTESKIN:GetMetricA(Var "Button", "TapInitCommand"); + -- + PressCommand=cmd(finishtweening;glow,1,1,1,1;zoom,1;linear,0.2;glow,1,1,1,0;zoom,1.2); + --NOTESKIN:GetMetricA(Var "Button", "TapHeldCommand"); + -- + }; + --]] +} \ No newline at end of file diff --git a/NoteSkins/pump/default/UpLeft Tap Note 3x2.png b/NoteSkins/pump/default/UpLeft Tap Note 3x2.png new file mode 100644 index 0000000000..1facc203f5 Binary files /dev/null and b/NoteSkins/pump/default/UpLeft Tap Note 3x2.png differ diff --git a/NoteSkins/pump/default/UpRight Hold Body Active 6x1.png b/NoteSkins/pump/default/UpRight Hold Body Active 6x1.png new file mode 100644 index 0000000000..4e57f81c18 Binary files /dev/null and b/NoteSkins/pump/default/UpRight Hold Body Active 6x1.png differ diff --git a/NoteSkins/pump/default/UpRight Hold BottomCap Active 6x1.png b/NoteSkins/pump/default/UpRight Hold BottomCap Active 6x1.png new file mode 100644 index 0000000000..004147b3bb Binary files /dev/null and b/NoteSkins/pump/default/UpRight Hold BottomCap Active 6x1.png differ diff --git a/NoteSkins/pump/default/UpRight Ready Receptor.lua b/NoteSkins/pump/default/UpRight Ready Receptor.lua new file mode 100644 index 0000000000..112f2e248b --- /dev/null +++ b/NoteSkins/pump/default/UpRight Ready Receptor.lua @@ -0,0 +1,8 @@ +return NOTESKIN:LoadActor("UpLeft", "Ready Receptor")..{ + Frames = { + { Frame = 0 }; + { Frame = 1 }; + { Frame = 2 }; + }; + 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 new file mode 100644 index 0000000000..a6060b7657 --- /dev/null +++ b/NoteSkins/pump/default/UpRight Tap Note.lua @@ -0,0 +1,3 @@ +return NOTESKIN:LoadActor("UpLeft","Tap Note")..{ + InitCommand=cmd(rotationy,180); +}; \ No newline at end of file diff --git a/NoteSkins/pump/default/_flash (doubleres).png b/NoteSkins/pump/default/_flash (doubleres).png new file mode 100644 index 0000000000..ff8a8974b8 Binary files /dev/null and b/NoteSkins/pump/default/_flash (doubleres).png differ diff --git a/NoteSkins/pump/default/metrics.ini b/NoteSkins/pump/default/metrics.ini new file mode 100644 index 0000000000..b2815efafd --- /dev/null +++ b/NoteSkins/pump/default/metrics.ini @@ -0,0 +1,29 @@ +[NoteDisplay] +AnimationIsBeatBased=0 + +TapNoteAnimationLength=0.25 +TapMineAnimationLength=0.25 +TapLiftAnimationLength=0.25 +TapFakeAnimationLength=0.25 +HoldHeadAnimationLength=0.25 +HoldTopCapAnimationLength=0.25 +HoldBottomCapAnimationLength=0.25 +HoldBodyAnimationLength=0.25 +HoldTailAnimationLength=0.25 + +HoldLetGoGrayPercent=1 + +FlipHeadAndTailWhenReverse=1 +FlipHoldBodyWhenReverse=1 +TopHoldAnchorWhenReverse=0 +HoldActiveIsAddLayer=0 + +[Center] + +[DownLeft] + +[DownRight] + +[UpLeft] + +[UpRight] diff --git a/NoteSkins/pump/simple/Center Hold Body active.png b/NoteSkins/pump/simple/Center Hold Body active.png new file mode 100644 index 0000000000..49960efd27 Binary files /dev/null and b/NoteSkins/pump/simple/Center Hold Body active.png differ diff --git a/NoteSkins/pump/simple/Center Hold BottomCap active.png b/NoteSkins/pump/simple/Center Hold BottomCap active.png new file mode 100644 index 0000000000..67927611f9 Binary files /dev/null and b/NoteSkins/pump/simple/Center Hold BottomCap active.png differ diff --git a/NoteSkins/pump/simple/Center Outline Receptor.redir b/NoteSkins/pump/simple/Center Outline Receptor.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/NoteSkins/pump/simple/Center Outline Receptor.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/NoteSkins/pump/simple/Center Ready Receptor 3x1.png b/NoteSkins/pump/simple/Center Ready Receptor 3x1.png new file mode 100644 index 0000000000..259f0d080f Binary files /dev/null and b/NoteSkins/pump/simple/Center Ready Receptor 3x1.png differ diff --git a/NoteSkins/pump/simple/Center Tap Note 8x1.png b/NoteSkins/pump/simple/Center Tap Note 8x1.png new file mode 100644 index 0000000000..df3fd04a1c Binary files /dev/null and b/NoteSkins/pump/simple/Center Tap Note 8x1.png differ diff --git a/NoteSkins/pump/simple/DownLeft Hold Body active.png b/NoteSkins/pump/simple/DownLeft Hold Body active.png new file mode 100644 index 0000000000..d8fb9b4804 Binary files /dev/null and b/NoteSkins/pump/simple/DownLeft Hold Body active.png differ diff --git a/NoteSkins/pump/simple/DownLeft Hold BottomCap active.png b/NoteSkins/pump/simple/DownLeft Hold BottomCap active.png new file mode 100644 index 0000000000..dd0af57702 Binary files /dev/null and b/NoteSkins/pump/simple/DownLeft Hold BottomCap active.png differ diff --git a/NoteSkins/pump/simple/DownLeft Ready Receptor 3x1.png b/NoteSkins/pump/simple/DownLeft Ready Receptor 3x1.png new file mode 100644 index 0000000000..65106525ec Binary files /dev/null and b/NoteSkins/pump/simple/DownLeft Ready Receptor 3x1.png differ diff --git a/NoteSkins/pump/simple/DownLeft Tap Note 8x1.png b/NoteSkins/pump/simple/DownLeft Tap Note 8x1.png new file mode 100644 index 0000000000..0f90359328 Binary files /dev/null and b/NoteSkins/pump/simple/DownLeft Tap Note 8x1.png differ diff --git a/NoteSkins/pump/simple/DownRight Hold Body active.png b/NoteSkins/pump/simple/DownRight Hold Body active.png new file mode 100644 index 0000000000..3732ea1ebf Binary files /dev/null and b/NoteSkins/pump/simple/DownRight Hold Body active.png differ diff --git a/NoteSkins/pump/simple/DownRight Hold BottomCap active.png b/NoteSkins/pump/simple/DownRight Hold BottomCap active.png new file mode 100644 index 0000000000..8480dbaf54 Binary files /dev/null and b/NoteSkins/pump/simple/DownRight Hold BottomCap active.png differ diff --git a/NoteSkins/pump/simple/UpLeft Hold Body active.png b/NoteSkins/pump/simple/UpLeft Hold Body active.png new file mode 100644 index 0000000000..e88439bec7 Binary files /dev/null and b/NoteSkins/pump/simple/UpLeft Hold Body active.png differ diff --git a/NoteSkins/pump/simple/UpLeft Hold BottomCap active.png b/NoteSkins/pump/simple/UpLeft Hold BottomCap active.png new file mode 100644 index 0000000000..91460c8aa7 Binary files /dev/null and b/NoteSkins/pump/simple/UpLeft Hold BottomCap active.png differ diff --git a/NoteSkins/pump/simple/UpLeft Ready Receptor 3x1.png b/NoteSkins/pump/simple/UpLeft Ready Receptor 3x1.png new file mode 100644 index 0000000000..95ed2f386e Binary files /dev/null and b/NoteSkins/pump/simple/UpLeft Ready Receptor 3x1.png differ diff --git a/NoteSkins/pump/simple/UpLeft Tap Note 8x1.png b/NoteSkins/pump/simple/UpLeft Tap Note 8x1.png new file mode 100644 index 0000000000..7735936848 Binary files /dev/null and b/NoteSkins/pump/simple/UpLeft Tap Note 8x1.png differ diff --git a/NoteSkins/pump/simple/UpRight Hold Body active.png b/NoteSkins/pump/simple/UpRight Hold Body active.png new file mode 100644 index 0000000000..7c89dbb588 Binary files /dev/null and b/NoteSkins/pump/simple/UpRight Hold Body active.png differ diff --git a/NoteSkins/pump/simple/UpRight Hold BottomCap active.png b/NoteSkins/pump/simple/UpRight Hold BottomCap active.png new file mode 100644 index 0000000000..84a8d90efd Binary files /dev/null and b/NoteSkins/pump/simple/UpRight Hold BottomCap active.png differ diff --git a/NoteSkins/pump/simple/metrics.ini b/NoteSkins/pump/simple/metrics.ini new file mode 100644 index 0000000000..d6c1e977d8 --- /dev/null +++ b/NoteSkins/pump/simple/metrics.ini @@ -0,0 +1,10 @@ +[NoteDisplay] +TapNoteAnimationLength=0.166 +TapMineAnimationLength=0.166 +TapLiftAnimationLength=0.166 +TapFakeAnimationLength=0.166 +HoldHeadAnimationLength=0.166 +HoldTopCapAnimationLength=0.166 +HoldBottomCapAnimationLength=0.166 +HoldBodyAnimationLength=0.166 +HoldTailAnimationLength=0.166 diff --git a/src/Player.cpp b/src/Player.cpp index 2e8534ad2a..36d7631ea0 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -2008,7 +2008,7 @@ void Player::StepStrumHopo( int col, int row, const RageTimer &tm, bool bHeld, b //oh wow, this was causing the trigger //before the hold heads -DaisuMaster //(It was >) - if( !REQUIRE_STEP_ON_HOLD_HEADS && fNoteOffset <= 0.f ) + if( !REQUIRE_STEP_ON_HOLD_HEADS && fNoteOffset <= GetWindowSeconds( TW_W5 ) ) { score = TNS_W1; break;