diff --git a/NoteSkins/pump/default/Center Hold Body active (res 64x4).png b/NoteSkins/pump/default/Center Hold Body active (res 64x4).png deleted file mode 100644 index 224363c518..0000000000 Binary files a/NoteSkins/pump/default/Center Hold Body active (res 64x4).png and /dev/null differ diff --git a/NoteSkins/pump/default/Center Hold BottomCap active (res 64x64).png b/NoteSkins/pump/default/Center Hold BottomCap active (res 64x64).png deleted file mode 100644 index f264e1c1ec..0000000000 Binary files a/NoteSkins/pump/default/Center Hold BottomCap active (res 64x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/Center Ready Receptor 3x1 (res 192x64).png b/NoteSkins/pump/default/Center Ready Receptor 3x1 (res 192x64).png deleted file mode 100644 index 8bccb6a173..0000000000 Binary files a/NoteSkins/pump/default/Center Ready Receptor 3x1 (res 192x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/Center Tap Note 5x1 (res 320x64).png b/NoteSkins/pump/default/Center Tap Note 5x1 (res 320x64).png deleted file mode 100644 index cc570a8a7c..0000000000 Binary files a/NoteSkins/pump/default/Center Tap Note 5x1 (res 320x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/DownLeft Hold Body active (res 64x4).png b/NoteSkins/pump/default/DownLeft Hold Body active (res 64x4).png deleted file mode 100644 index 4e06598aed..0000000000 Binary files a/NoteSkins/pump/default/DownLeft Hold Body active (res 64x4).png and /dev/null differ diff --git a/NoteSkins/pump/default/DownLeft Hold BottomCap active (res 64x64).png b/NoteSkins/pump/default/DownLeft Hold BottomCap active (res 64x64).png deleted file mode 100644 index 185632489a..0000000000 Binary files a/NoteSkins/pump/default/DownLeft Hold BottomCap active (res 64x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/DownLeft Ready Receptor 3x1 (res 192x64).png b/NoteSkins/pump/default/DownLeft Ready Receptor 3x1 (res 192x64).png deleted file mode 100644 index 83bf9eb887..0000000000 Binary files a/NoteSkins/pump/default/DownLeft Ready Receptor 3x1 (res 192x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/DownLeft Tap Note 6x1 (res 384x64).png b/NoteSkins/pump/default/DownLeft Tap Note 6x1 (res 384x64).png deleted file mode 100644 index 831d04daf0..0000000000 Binary files a/NoteSkins/pump/default/DownLeft Tap Note 6x1 (res 384x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/DownRight Hold Body active (res 64x4).png b/NoteSkins/pump/default/DownRight Hold Body active (res 64x4).png deleted file mode 100644 index 3ebefa3bb6..0000000000 Binary files a/NoteSkins/pump/default/DownRight Hold Body active (res 64x4).png and /dev/null differ diff --git a/NoteSkins/pump/default/DownRight Hold BottomCap active (res 64x64).png b/NoteSkins/pump/default/DownRight Hold BottomCap active (res 64x64).png deleted file mode 100644 index 614a7f87b7..0000000000 Binary files a/NoteSkins/pump/default/DownRight Hold BottomCap active (res 64x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/DownRight Tap Note.lua b/NoteSkins/pump/default/DownRight Tap Note.lua deleted file mode 100644 index bb9a4f77f7..0000000000 --- a/NoteSkins/pump/default/DownRight Tap Note.lua +++ /dev/null @@ -1 +0,0 @@ -return NOTESKIN:LoadActor("DownLeft","Tap Note"); \ No newline at end of file diff --git a/NoteSkins/pump/default/NoteSkin.lua b/NoteSkins/pump/default/NoteSkin.lua deleted file mode 100644 index 39a83ab332..0000000000 --- a/NoteSkins/pump/default/NoteSkin.lua +++ /dev/null @@ -1,107 +0,0 @@ -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 deleted file mode 100644 index bd00c8aa6c..0000000000 --- a/NoteSkins/pump/default/UpLeft Explosion.lua +++ /dev/null @@ -1,53 +0,0 @@ -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 (res 64x4).png b/NoteSkins/pump/default/UpLeft Hold Body active (res 64x4).png deleted file mode 100644 index 88bc41af90..0000000000 Binary files a/NoteSkins/pump/default/UpLeft Hold Body active (res 64x4).png and /dev/null differ diff --git a/NoteSkins/pump/default/UpLeft Hold BottomCap active (res 64x64).png b/NoteSkins/pump/default/UpLeft Hold BottomCap active (res 64x64).png deleted file mode 100644 index b5a849a4f7..0000000000 Binary files a/NoteSkins/pump/default/UpLeft Hold BottomCap active (res 64x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/UpLeft Ready Receptor 3x1 (res 192x64).png b/NoteSkins/pump/default/UpLeft Ready Receptor 3x1 (res 192x64).png deleted file mode 100644 index 296c09e1d7..0000000000 Binary files a/NoteSkins/pump/default/UpLeft Ready Receptor 3x1 (res 192x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/UpLeft Receptor.lua b/NoteSkins/pump/default/UpLeft Receptor.lua deleted file mode 100644 index a5d1e7e0f7..0000000000 --- a/NoteSkins/pump/default/UpLeft Receptor.lua +++ /dev/null @@ -1,49 +0,0 @@ -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 6x1 (res 384x64).png b/NoteSkins/pump/default/UpLeft Tap Note 6x1 (res 384x64).png deleted file mode 100644 index 9206df3234..0000000000 Binary files a/NoteSkins/pump/default/UpLeft Tap Note 6x1 (res 384x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/UpRight Hold Body active (res 64x4).png b/NoteSkins/pump/default/UpRight Hold Body active (res 64x4).png deleted file mode 100644 index 77e7742235..0000000000 Binary files a/NoteSkins/pump/default/UpRight Hold Body active (res 64x4).png and /dev/null differ diff --git a/NoteSkins/pump/default/UpRight Hold BottomCap active (res 64x64).png b/NoteSkins/pump/default/UpRight Hold BottomCap active (res 64x64).png deleted file mode 100644 index 6718c26686..0000000000 Binary files a/NoteSkins/pump/default/UpRight Hold BottomCap active (res 64x64).png and /dev/null differ diff --git a/NoteSkins/pump/default/UpRight Tap Note.lua b/NoteSkins/pump/default/UpRight Tap Note.lua deleted file mode 100644 index e3518c5f6f..0000000000 --- a/NoteSkins/pump/default/UpRight Tap Note.lua +++ /dev/null @@ -1 +0,0 @@ -return NOTESKIN:LoadActor("UpLeft","Tap Note"); \ No newline at end of file diff --git a/NoteSkins/pump/default/metrics.ini b/NoteSkins/pump/default/metrics.ini deleted file mode 100644 index b501c85aca..0000000000 --- a/NoteSkins/pump/default/metrics.ini +++ /dev/null @@ -1,30 +0,0 @@ -[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 -ReverseDrawOrder=1111 - -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 deleted file mode 100644 index 49960efd27..0000000000 Binary files a/NoteSkins/pump/simple/Center Hold Body active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/Center Hold BottomCap active.png b/NoteSkins/pump/simple/Center Hold BottomCap active.png deleted file mode 100644 index 67927611f9..0000000000 Binary files a/NoteSkins/pump/simple/Center Hold BottomCap active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/Center Ready Receptor 3x1.png b/NoteSkins/pump/simple/Center Ready Receptor 3x1.png deleted file mode 100644 index 259f0d080f..0000000000 Binary files a/NoteSkins/pump/simple/Center Ready Receptor 3x1.png and /dev/null differ diff --git a/NoteSkins/pump/simple/Center Tap Note 8x1.png b/NoteSkins/pump/simple/Center Tap Note 8x1.png deleted file mode 100644 index df3fd04a1c..0000000000 Binary files a/NoteSkins/pump/simple/Center Tap Note 8x1.png and /dev/null differ diff --git a/NoteSkins/pump/simple/DownLeft Hold Body active.png b/NoteSkins/pump/simple/DownLeft Hold Body active.png deleted file mode 100644 index d8fb9b4804..0000000000 Binary files a/NoteSkins/pump/simple/DownLeft Hold Body active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/DownLeft Hold BottomCap active.png b/NoteSkins/pump/simple/DownLeft Hold BottomCap active.png deleted file mode 100644 index dd0af57702..0000000000 Binary files a/NoteSkins/pump/simple/DownLeft Hold BottomCap active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/DownLeft Ready Receptor 3x1.png b/NoteSkins/pump/simple/DownLeft Ready Receptor 3x1.png deleted file mode 100644 index 65106525ec..0000000000 Binary files a/NoteSkins/pump/simple/DownLeft Ready Receptor 3x1.png and /dev/null differ diff --git a/NoteSkins/pump/simple/DownLeft Tap Note 8x1.png b/NoteSkins/pump/simple/DownLeft Tap Note 8x1.png deleted file mode 100644 index 0f90359328..0000000000 Binary files a/NoteSkins/pump/simple/DownLeft Tap Note 8x1.png and /dev/null differ diff --git a/NoteSkins/pump/simple/DownRight Hold Body active.png b/NoteSkins/pump/simple/DownRight Hold Body active.png deleted file mode 100644 index 3732ea1ebf..0000000000 Binary files a/NoteSkins/pump/simple/DownRight Hold Body active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/DownRight Hold BottomCap active.png b/NoteSkins/pump/simple/DownRight Hold BottomCap active.png deleted file mode 100644 index 8480dbaf54..0000000000 Binary files a/NoteSkins/pump/simple/DownRight Hold BottomCap active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/UpLeft Hold Body active.png b/NoteSkins/pump/simple/UpLeft Hold Body active.png deleted file mode 100644 index e88439bec7..0000000000 Binary files a/NoteSkins/pump/simple/UpLeft Hold Body active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/UpLeft Hold BottomCap active.png b/NoteSkins/pump/simple/UpLeft Hold BottomCap active.png deleted file mode 100644 index 91460c8aa7..0000000000 Binary files a/NoteSkins/pump/simple/UpLeft Hold BottomCap active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/UpLeft Ready Receptor 3x1.png b/NoteSkins/pump/simple/UpLeft Ready Receptor 3x1.png deleted file mode 100644 index 95ed2f386e..0000000000 Binary files a/NoteSkins/pump/simple/UpLeft Ready Receptor 3x1.png and /dev/null differ diff --git a/NoteSkins/pump/simple/UpLeft Tap Note 8x1.png b/NoteSkins/pump/simple/UpLeft Tap Note 8x1.png deleted file mode 100644 index 7735936848..0000000000 Binary files a/NoteSkins/pump/simple/UpLeft Tap Note 8x1.png and /dev/null differ diff --git a/NoteSkins/pump/simple/UpRight Hold Body active.png b/NoteSkins/pump/simple/UpRight Hold Body active.png deleted file mode 100644 index 7c89dbb588..0000000000 Binary files a/NoteSkins/pump/simple/UpRight Hold Body active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/UpRight Hold BottomCap active.png b/NoteSkins/pump/simple/UpRight Hold BottomCap active.png deleted file mode 100644 index 84a8d90efd..0000000000 Binary files a/NoteSkins/pump/simple/UpRight Hold BottomCap active.png and /dev/null differ diff --git a/NoteSkins/pump/simple/metrics.ini b/NoteSkins/pump/simple/metrics.ini deleted file mode 100644 index 58fbe1d1d9..0000000000 --- a/NoteSkins/pump/simple/metrics.ini +++ /dev/null @@ -1,10 +0,0 @@ -[NoteDisplay] -TapNoteAnimationLength=1.66 -TapMineAnimationLength=1.66 -TapLiftAnimationLength=1.66 - -HoldHeadAnimationLength=1.66 -HoldTopCapAnimationLength=1.66 -HoldBottomCapAnimationLength=1.66 -HoldBodyAnimationLength=1.66 -HoldTailAnimationLength=1.66