diff --git a/NoteSkins/pump/delta/Center Hold Body Active.png b/NoteSkins/pump/delta/Center Hold Body Active.png new file mode 100644 index 0000000000..e59fcca990 Binary files /dev/null and b/NoteSkins/pump/delta/Center Hold Body Active.png differ diff --git a/NoteSkins/pump/delta/Center Hold BottomCap Active.png b/NoteSkins/pump/delta/Center Hold BottomCap Active.png new file mode 100644 index 0000000000..de9e445f0a Binary files /dev/null and b/NoteSkins/pump/delta/Center Hold BottomCap Active.png differ diff --git a/NoteSkins/pump/delta/Center Hold Head.lua b/NoteSkins/pump/delta/Center Hold Head.lua new file mode 100644 index 0000000000..164be82be6 --- /dev/null +++ b/NoteSkins/pump/delta/Center Hold Head.lua @@ -0,0 +1,24 @@ +local t = Def.ActorFrame{} + + +t[#t+1] = LoadActor("Center_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#9b8737FF");effectcolor2,color("#9b8737FF");fadetop,0.5); +} + +t[#t+1] = LoadActor("Center_blend")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb75233");effectclock,"bgm";effecttiming,1,0,0,0;); +} + +t[#t+1] = LoadActor("Center_fill")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb752FF")); +} + +t[#t+1] = LoadActor("Center_feet")..{ + InitCommand=cmd(blend,Blend.Add;diffusealpha,0.6); +} + + +t[#t+1] = LoadActor("Center border"); + + +return t \ No newline at end of file diff --git a/NoteSkins/pump/delta/Center NoteHit.lua b/NoteSkins/pump/delta/Center NoteHit.lua new file mode 100644 index 0000000000..c4fd53cafb --- /dev/null +++ b/NoteSkins/pump/delta/Center NoteHit.lua @@ -0,0 +1,3 @@ +return LoadActor("_CenterHit")..{ + InitCommand=cmd(x,2;y,2); +} \ No newline at end of file diff --git a/NoteSkins/pump/delta/Center Ready Receptor 3x1.png b/NoteSkins/pump/delta/Center Ready Receptor 3x1.png new file mode 100644 index 0000000000..2e7aa36341 Binary files /dev/null and b/NoteSkins/pump/delta/Center Ready Receptor 3x1.png differ diff --git a/NoteSkins/pump/delta/Center Tap Note.lua b/NoteSkins/pump/delta/Center Tap Note.lua new file mode 100644 index 0000000000..61768e5595 --- /dev/null +++ b/NoteSkins/pump/delta/Center Tap Note.lua @@ -0,0 +1,28 @@ +local t = Def.ActorFrame{} + + +t[#t+1] = LoadActor("Center_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#9b873766");effectcolor2,color("#9b873766")); +} + +t[#t+1] = LoadActor("Center_blend")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb75266");effectclock,"bgm";effecttiming,1,0,0,0;); +} + +t[#t+1] = LoadActor("Center_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb752FF");fadetop,1); +} + +t[#t+1] = LoadActor("Center_fill")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#ccb752FF");effectcolor2,color("#ccb752FF")); +} + +t[#t+1] = LoadActor("Center_feet")..{ + InitCommand=cmd(blend,Blend.Add;diffusealpha,0.6); +} + + +t[#t+1] = LoadActor("Center border"); + + +return t \ No newline at end of file diff --git a/NoteSkins/pump/delta/Center border.png b/NoteSkins/pump/delta/Center border.png new file mode 100644 index 0000000000..cffa5656b0 Binary files /dev/null and b/NoteSkins/pump/delta/Center border.png differ diff --git a/NoteSkins/pump/delta/Center_blend.png b/NoteSkins/pump/delta/Center_blend.png new file mode 100644 index 0000000000..9a8afe67e2 Binary files /dev/null and b/NoteSkins/pump/delta/Center_blend.png differ diff --git a/NoteSkins/pump/delta/Center_feet.png b/NoteSkins/pump/delta/Center_feet.png new file mode 100644 index 0000000000..5ae1a72b49 Binary files /dev/null and b/NoteSkins/pump/delta/Center_feet.png differ diff --git a/NoteSkins/pump/delta/Center_fill.png b/NoteSkins/pump/delta/Center_fill.png new file mode 100644 index 0000000000..b73e9a08e6 Binary files /dev/null and b/NoteSkins/pump/delta/Center_fill.png differ diff --git a/NoteSkins/pump/delta/DownLeft Hold Body Active.png b/NoteSkins/pump/delta/DownLeft Hold Body Active.png new file mode 100644 index 0000000000..7063d7d132 Binary files /dev/null and b/NoteSkins/pump/delta/DownLeft Hold Body Active.png differ diff --git a/NoteSkins/pump/delta/DownLeft Hold BottomCap Active.png b/NoteSkins/pump/delta/DownLeft Hold BottomCap Active.png new file mode 100644 index 0000000000..7c72306ba4 Binary files /dev/null and b/NoteSkins/pump/delta/DownLeft Hold BottomCap Active.png differ diff --git a/NoteSkins/pump/delta/DownLeft Hold Head.lua b/NoteSkins/pump/delta/DownLeft Hold Head.lua new file mode 100644 index 0000000000..35789fa243 --- /dev/null +++ b/NoteSkins/pump/delta/DownLeft Hold Head.lua @@ -0,0 +1,20 @@ +local t = Def.ActorFrame{} + + +t[#t+1] = LoadActor("DownLeft_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#376f9bFF");effectcolor2,color("#376f9bFF");fadetop,0.5); +} + +t[#t+1] = LoadActor("DownLeft_blend")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899cc33");effectclock,"bgm";effecttiming,1,0,0,0;); +} + +t[#t+1] = LoadActor("DownLeft_fill")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899ccFF")); +} + + +t[#t+1] = LoadActor("DownLeft border"); + + +return t \ No newline at end of file diff --git a/NoteSkins/pump/delta/DownLeft NoteHit.lua b/NoteSkins/pump/delta/DownLeft NoteHit.lua new file mode 100644 index 0000000000..c03e1ff9f9 --- /dev/null +++ b/NoteSkins/pump/delta/DownLeft NoteHit.lua @@ -0,0 +1,3 @@ +return LoadActor("_DownLeftHit")..{ + InitCommand=cmd(y,5;x,2); +} \ No newline at end of file diff --git a/NoteSkins/pump/delta/DownLeft Ready Receptor 3x1.png b/NoteSkins/pump/delta/DownLeft Ready Receptor 3x1.png new file mode 100644 index 0000000000..b9bb356e93 Binary files /dev/null and b/NoteSkins/pump/delta/DownLeft Ready Receptor 3x1.png differ diff --git a/NoteSkins/pump/delta/DownLeft Tap Note.lua b/NoteSkins/pump/delta/DownLeft Tap Note.lua new file mode 100644 index 0000000000..a88ff356ea --- /dev/null +++ b/NoteSkins/pump/delta/DownLeft Tap Note.lua @@ -0,0 +1,24 @@ +local t = Def.ActorFrame{} + + +t[#t+1] = LoadActor("DownLeft_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#376f9b66");effectcolor2,color("#376f9b66")); +} + +t[#t+1] = LoadActor("DownLeft_blend")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899cc66");effectclock,"bgm";effecttiming,1,0,0,0;); +} + +t[#t+1] = LoadActor("DownLeft_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899ccFF");fadetop,1); +} + +t[#t+1] = LoadActor("DownLeft_fill")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#5899ccFF");effectcolor2,color("#5899ccFF")); +} + + +t[#t+1] = LoadActor("DownLeft border"); + + +return t \ No newline at end of file diff --git a/NoteSkins/pump/delta/DownLeft border.png b/NoteSkins/pump/delta/DownLeft border.png new file mode 100644 index 0000000000..903b0453fd Binary files /dev/null and b/NoteSkins/pump/delta/DownLeft border.png differ diff --git a/NoteSkins/pump/delta/DownLeft_blend.png b/NoteSkins/pump/delta/DownLeft_blend.png new file mode 100644 index 0000000000..a64c06528c Binary files /dev/null and b/NoteSkins/pump/delta/DownLeft_blend.png differ diff --git a/NoteSkins/pump/delta/DownLeft_fill.png b/NoteSkins/pump/delta/DownLeft_fill.png new file mode 100644 index 0000000000..a953ef7bbd Binary files /dev/null and b/NoteSkins/pump/delta/DownLeft_fill.png differ diff --git a/NoteSkins/pump/delta/DownRight Hold Body Active.png b/NoteSkins/pump/delta/DownRight Hold Body Active.png new file mode 100644 index 0000000000..0548fc6fa9 Binary files /dev/null and b/NoteSkins/pump/delta/DownRight Hold Body Active.png differ diff --git a/NoteSkins/pump/delta/DownRight Hold BottomCap Active.png b/NoteSkins/pump/delta/DownRight Hold BottomCap Active.png new file mode 100644 index 0000000000..eedd1e96a1 Binary files /dev/null and b/NoteSkins/pump/delta/DownRight Hold BottomCap Active.png differ diff --git a/NoteSkins/pump/delta/DownRight Hold Head.lua b/NoteSkins/pump/delta/DownRight Hold Head.lua new file mode 100644 index 0000000000..739618a642 --- /dev/null +++ b/NoteSkins/pump/delta/DownRight Hold Head.lua @@ -0,0 +1,3 @@ +return NOTESKIN:LoadActor("DownLeft","Hold Head")..{ + --InitCommand=cmd(rotationy,180); +}; \ No newline at end of file diff --git a/NoteSkins/pump/delta/DownRight NoteHit.lua b/NoteSkins/pump/delta/DownRight NoteHit.lua new file mode 100644 index 0000000000..fe29b678a3 --- /dev/null +++ b/NoteSkins/pump/delta/DownRight NoteHit.lua @@ -0,0 +1,3 @@ +return NOTESKIN:LoadActor("DownLeft","NoteHit")..{ + OnCommand=cmd(x,-2;zoomx,-1); +} \ No newline at end of file diff --git a/NoteSkins/pump/delta/DownRight Ready Receptor.lua b/NoteSkins/pump/delta/DownRight Ready Receptor.lua new file mode 100644 index 0000000000..56db1e8c9f --- /dev/null +++ b/NoteSkins/pump/delta/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/delta/DownRight Tap Note.lua b/NoteSkins/pump/delta/DownRight Tap Note.lua new file mode 100644 index 0000000000..bb158809a7 --- /dev/null +++ b/NoteSkins/pump/delta/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/delta/DownRight border.redir b/NoteSkins/pump/delta/DownRight border.redir new file mode 100644 index 0000000000..aaa6bffb4e --- /dev/null +++ b/NoteSkins/pump/delta/DownRight border.redir @@ -0,0 +1 @@ +DownLeft border \ No newline at end of file diff --git a/NoteSkins/pump/delta/NoteSkin.lua b/NoteSkins/pump/delta/NoteSkin.lua new file mode 100644 index 0000000000..bdb50a3a2b --- /dev/null +++ b/NoteSkins/pump/delta/NoteSkin.lua @@ -0,0 +1,117 @@ +local Noteskin = {} + +--bBlanks: +Noteskin.bBlanks = { + --["element"] = true|false; + ["Hold Tail Active"] = true; + ["Hold Tail Active"] = true; + -- + --["Hold Head Active"] = "Tap Note"; + --["Hold Head Inactive"] = "Tap Note"; + -- + ["Roll Tail Inactive"] = true; + ["Roll Tail Inactive"] = true; +} +Noteskin.PartsToRotate = { + --["elemenu"] = true|false; + ["Roll Head Active"] = false; + ["Roll Head Inactive"] = false; + ["NoteHit"] = true; +} +Noteskin.ElementRedirs = { + --["element"] = "redirected_element"; + ["Hold Head Active"] = "Hold Head"; + ["Hold Head Inactive"] = "Hold Head"; + ["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 Body Active"] = "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 = 180; + DownLeft = 0; + DownRight = 180; +} + +local function func() + local sButton = Var "Button" + local sElement = Var "Element" + + if Noteskin.bBlanks[sElement] then + local t = Def.Actor {}; + if Var "SpriteOnly" then + t = LoadActor( "_blank" ); + end + return t + 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) + + local bRotate = Noteskin.PartsToRotate[ElementToLoad] + --rotate by default + if bRotate == nil then bRotate = true end + if bRotate then + t.BaseRotationX=Noteskin.BaseRotX[sButton] + t.BaseRotationY=Noteskin.BaseRotY[sButton] + end + + return t +end + +Noteskin.Load = func +Noteskin.CommonLoad = func + +return Noteskin \ No newline at end of file diff --git a/NoteSkins/pump/delta/UpLeft Explosion.lua b/NoteSkins/pump/delta/UpLeft Explosion.lua new file mode 100644 index 0000000000..450bb7daa8 --- /dev/null +++ b/NoteSkins/pump/delta/UpLeft Explosion.lua @@ -0,0 +1,40 @@ +return Def.ActorFrame { + + NOTESKIN:LoadActor(Var "Button","NoteHit") .. { + InitCommand=cmd(animate,0;blend,Blend.Add;diffusealpha,0); + + NoneCommand=cmd(playcommand,"Glow"); + PressCommand=cmd(playcommand,"Glow"); + W1Command=cmd(setstate,0;playcommand,"W2"); + W2Command=cmd(setstate,0;playcommand,"Glow"); + W3Command=cmd(setstate,1;playcommand,"Glow"); + W4Command=cmd(setstate,2;playcommand,"Glow"); + W5Command=cmd(); + HitMineCommand=cmd(playcommand,"Glow"); + HeldCommand=cmd(setstate,0;playcommand,"Glow"); + GlowCommand=cmd(stoptweening,zoom,1.05;diffusealpha,1;linear,0.25;zoom,1.1;diffusealpha,0); + }; + + NOTESKIN:LoadActor(Var "Button","NoteHit") .. { + InitCommand=cmd(animate,0;blend,Blend.Add;diffusealpha,0); + + NoneCommand=cmd(playcommand,"Glow"); + PressCommand=cmd(playcommand,"Glow"); + W1Command=cmd(setstate,0;playcommand,"W2"); + W2Command=cmd(setstate,0;playcommand,"Glow"); + W3Command=cmd(setstate,1;playcommand,"Glow"); + W4Command=cmd(setstate,2;playcommand,"Glow"); + W5Command=cmd(); + HitMineCommand=cmd(playcommand,"Glow"); + HeldCommand=cmd(setstate,0;playcommand,"Glow"); + GlowCommand=cmd(stoptweening,zoom,1;diffusealpha,0.4;linear,0.3;zoom,1.2;diffusealpha,0); + }; + + NOTESKIN:LoadActor(Var "Button","NoteHit") .. { + InitCommand=cmd(animate,0;zoom,1.1;blend,Blend.Add;visible,false); + HoldingOnCommand=cmd(visible,true); + HoldingOffCommand=cmd(visible,false); + }; + + +} \ No newline at end of file diff --git a/NoteSkins/pump/delta/UpLeft Hold Body Active.png b/NoteSkins/pump/delta/UpLeft Hold Body Active.png new file mode 100644 index 0000000000..2cf9f4502a Binary files /dev/null and b/NoteSkins/pump/delta/UpLeft Hold Body Active.png differ diff --git a/NoteSkins/pump/delta/UpLeft Hold BottomCap Active.png b/NoteSkins/pump/delta/UpLeft Hold BottomCap Active.png new file mode 100644 index 0000000000..b659ea3aac Binary files /dev/null and b/NoteSkins/pump/delta/UpLeft Hold BottomCap Active.png differ diff --git a/NoteSkins/pump/delta/UpLeft Hold Head.lua b/NoteSkins/pump/delta/UpLeft Hold Head.lua new file mode 100644 index 0000000000..c395191bd7 --- /dev/null +++ b/NoteSkins/pump/delta/UpLeft Hold Head.lua @@ -0,0 +1,21 @@ + +local t = Def.ActorFrame{} + + +t[#t+1] = LoadActor("UpLeft_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#9b376dFF");effectcolor2,color("#9b376dFF");fadetop,0.5); +} + +t[#t+1] = LoadActor("UpLeft_blend")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc517633");effectclock,"bgm";effecttiming,1,0,0,0;); +} + +t[#t+1] = LoadActor("UpLeft_fill")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc5176FF")); +} + + +t[#t+1] = LoadActor("UpLeft border"); + + +return t \ No newline at end of file diff --git a/NoteSkins/pump/delta/UpLeft NoteHit.lua b/NoteSkins/pump/delta/UpLeft NoteHit.lua new file mode 100644 index 0000000000..9b54b344e9 --- /dev/null +++ b/NoteSkins/pump/delta/UpLeft NoteHit.lua @@ -0,0 +1,3 @@ +return NOTESKIN:LoadActor("DownLeft","NoteHit")..{ + InitCommand=cmd(rotationy,180;rotationz,180;y,-6;x,2); +} diff --git a/NoteSkins/pump/delta/UpLeft Ready Receptor 3x1.png b/NoteSkins/pump/delta/UpLeft Ready Receptor 3x1.png new file mode 100644 index 0000000000..7844a65d6b Binary files /dev/null and b/NoteSkins/pump/delta/UpLeft Ready Receptor 3x1.png differ diff --git a/NoteSkins/pump/delta/UpLeft Receptor.lua b/NoteSkins/pump/delta/UpLeft Receptor.lua new file mode 100644 index 0000000000..778791f7f8 --- /dev/null +++ b/NoteSkins/pump/delta/UpLeft Receptor.lua @@ -0,0 +1,22 @@ +return Def.ActorFrame { + + + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Base"; + InitCommand=cmd(animate,0;setstate,0); + }; + + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Glow"; + InitCommand=cmd(animate,0;setstate,1); + OnCommand=cmd(effectclock,"bgm";diffuseshift;effectcolor1,color("#FFFFFFFF");effectcolor2,color("#FFFFFF00");effecttiming,1,0,0,0); + }; + + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Tap"; + InitCommand=cmd(animate,0;setstate,2;zoom,1;diffusealpha,0;blend,'BlendMode_Add'); + PressCommand=cmd(diffuse,color("#FFFFAA");stoptweening;zoom,1.1;linear,0.1;diffusealpha,0.6;zoom,1); + LiftCommand=cmd(diffuse,color("#FFFFAA");stoptweening;diffusealpha,0.6;zoom,1;linear,0.15;zoom,1.2;diffusealpha,0); + }; + +} diff --git a/NoteSkins/pump/delta/UpLeft Tap Note.lua b/NoteSkins/pump/delta/UpLeft Tap Note.lua new file mode 100644 index 0000000000..2881a56c10 --- /dev/null +++ b/NoteSkins/pump/delta/UpLeft Tap Note.lua @@ -0,0 +1,27 @@ + +local t = Def.ActorFrame{} + + +t[#t+1] = LoadActor("UpLeft_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#9b376d66");effectcolor2,color("#9b376d66")); +} + +t[#t+1] = LoadActor("UpLeft_blend")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc517666");effectclock,"bgm";effecttiming,1,0,0,0;); +} + + +t[#t+1] = LoadActor("UpLeft_blend")..{ + InitCommand=cmd(diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc5176FF");fadetop,1); +} + + +t[#t+1] = LoadActor("UpLeft_fill")..{ + InitCommand=cmd(blend,Blend.Add;diffuseshift;effectcolor1,color("#cc5176FF");effectcolor2,color("#cc5176FF")); +} + + +t[#t+1] = LoadActor("UpLeft border"); + + +return t \ No newline at end of file diff --git a/NoteSkins/pump/delta/UpLeft border.png b/NoteSkins/pump/delta/UpLeft border.png new file mode 100644 index 0000000000..5ac0a95bec Binary files /dev/null and b/NoteSkins/pump/delta/UpLeft border.png differ diff --git a/NoteSkins/pump/delta/UpLeft_blend.png b/NoteSkins/pump/delta/UpLeft_blend.png new file mode 100644 index 0000000000..ccac120a1c Binary files /dev/null and b/NoteSkins/pump/delta/UpLeft_blend.png differ diff --git a/NoteSkins/pump/delta/UpLeft_fill.png b/NoteSkins/pump/delta/UpLeft_fill.png new file mode 100644 index 0000000000..c53bc67691 Binary files /dev/null and b/NoteSkins/pump/delta/UpLeft_fill.png differ diff --git a/NoteSkins/pump/delta/UpRight Hold Body Active.png b/NoteSkins/pump/delta/UpRight Hold Body Active.png new file mode 100644 index 0000000000..948ecd4bd5 Binary files /dev/null and b/NoteSkins/pump/delta/UpRight Hold Body Active.png differ diff --git a/NoteSkins/pump/delta/UpRight Hold BottomCap Active.png b/NoteSkins/pump/delta/UpRight Hold BottomCap Active.png new file mode 100644 index 0000000000..5c69f21af9 Binary files /dev/null and b/NoteSkins/pump/delta/UpRight Hold BottomCap Active.png differ diff --git a/NoteSkins/pump/delta/UpRight Hold Head.lua b/NoteSkins/pump/delta/UpRight Hold Head.lua new file mode 100644 index 0000000000..1671aa2b4a --- /dev/null +++ b/NoteSkins/pump/delta/UpRight Hold Head.lua @@ -0,0 +1,4 @@ +return NOTESKIN:LoadActor("UpLeft","Hold Head")..{ + --InitCommand=cmd(rotationy,180); + --BaseRotationY=180; +}; \ No newline at end of file diff --git a/NoteSkins/pump/delta/UpRight NoteHit.lua b/NoteSkins/pump/delta/UpRight NoteHit.lua new file mode 100644 index 0000000000..d26d55d0d9 --- /dev/null +++ b/NoteSkins/pump/delta/UpRight NoteHit.lua @@ -0,0 +1,3 @@ +return NOTESKIN:LoadActor("DownLeft","NoteHit")..{ + InitCommand=cmd(rotationy,180;rotationz,180;y,-6;x,-2); +} \ No newline at end of file diff --git a/NoteSkins/pump/delta/UpRight Ready Receptor.lua b/NoteSkins/pump/delta/UpRight Ready Receptor.lua new file mode 100644 index 0000000000..38c7312861 --- /dev/null +++ b/NoteSkins/pump/delta/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/delta/UpRight Tap Note.lua b/NoteSkins/pump/delta/UpRight Tap Note.lua new file mode 100644 index 0000000000..384d4e4450 --- /dev/null +++ b/NoteSkins/pump/delta/UpRight Tap Note.lua @@ -0,0 +1,4 @@ +return NOTESKIN:LoadActor("UpLeft","Tap Note")..{ + --InitCommand=cmd(rotationy,180); + --BaseRotationY=180; +}; \ No newline at end of file diff --git a/NoteSkins/pump/delta/UpRight border.redir b/NoteSkins/pump/delta/UpRight border.redir new file mode 100644 index 0000000000..d6cfc16ed2 --- /dev/null +++ b/NoteSkins/pump/delta/UpRight border.redir @@ -0,0 +1 @@ +UpLeft border \ No newline at end of file diff --git a/NoteSkins/pump/delta/_CenterHit 3x1.png b/NoteSkins/pump/delta/_CenterHit 3x1.png new file mode 100644 index 0000000000..d6329d0748 Binary files /dev/null and b/NoteSkins/pump/delta/_CenterHit 3x1.png differ diff --git a/NoteSkins/pump/delta/_DownLeftHit 3x1.png b/NoteSkins/pump/delta/_DownLeftHit 3x1.png new file mode 100644 index 0000000000..ebf4f50b7e Binary files /dev/null and b/NoteSkins/pump/delta/_DownLeftHit 3x1.png differ diff --git a/NoteSkins/pump/delta/_blank.png b/NoteSkins/pump/delta/_blank.png new file mode 100644 index 0000000000..95007b9b3c Binary files /dev/null and b/NoteSkins/pump/delta/_blank.png differ diff --git a/NoteSkins/pump/delta/metrics.ini b/NoteSkins/pump/delta/metrics.ini new file mode 100644 index 0000000000..fe13a76055 --- /dev/null +++ b/NoteSkins/pump/delta/metrics.ini @@ -0,0 +1,30 @@ +[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/src/arch/LoadingWindow/LoadingWindow_Win32.cpp b/src/arch/LoadingWindow/LoadingWindow_Win32.cpp index 13d58489df..700620d41f 100644 --- a/src/arch/LoadingWindow/LoadingWindow_Win32.cpp +++ b/src/arch/LoadingWindow/LoadingWindow_Win32.cpp @@ -92,7 +92,7 @@ INT_PTR CALLBACK LoadingWindow_Win32::DlgProc( HWND hWnd, UINT msg, WPARAM wPara self=(LoadingWindow_Win32 *)GetWindowLong(hWnd,DWL_USER); } -#if(WINVER >= 0x0601) +#ifdef PROGRESS_IN_TASKBUTTON if (self && msg == self->taskbarCreatedEvent && !self->pTaskbarList) { HRESULT hr = CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&self->pTaskbarList)); if (SUCCEEDED(hr)) { @@ -142,7 +142,7 @@ INT_PTR CALLBACK LoadingWindow_Win32::DlgProc( HWND hWnd, UINT msg, WPARAM wPara case WM_DESTROY: -#if(WINVER >= 0x0601) +#ifdef PROGRESS_IN_TASKBUTTON if (self->pTaskbarList) { self->pTaskbarList->Release(); self->pTaskbarList = NULL; @@ -205,7 +205,7 @@ LoadingWindow_Win32::LoadingWindow_Win32() cceData.dwICC=ICC_PROGRESS_CLASS; InitCommonControlsEx(&cceData); -#if(WINVER >= 0x0601) +#ifdef PROGRESS_IN_TASKBUTTON pTaskbarList=NULL; taskbarCreatedEvent=RegisterWindowMessage("TaskbarButtonCreated"); @@ -281,11 +281,13 @@ void LoadingWindow_Win32::SetProgress(const int progress) m_progress=progress; HWND hwndItem = ::GetDlgItem( hwnd, IDC_PROGRESS ); ::SendMessage(hwndItem,PBM_SETPOS,progress,0); -#if(WINVER >= 0x0601) + +#ifdef PROGRESS_IN_TASKBUTTON if(pTaskbarList) { pTaskbarList->SetProgressValue(hwnd, m_progress, m_totalWork); } #endif + } void LoadingWindow_Win32::SetTotalWork(const int totalWork) @@ -293,11 +295,13 @@ void LoadingWindow_Win32::SetTotalWork(const int totalWork) m_totalWork=totalWork; HWND hwndItem = ::GetDlgItem( hwnd, IDC_PROGRESS ); SendMessage(hwndItem,PBM_SETRANGE32,0,totalWork); -#if(WINVER >= 0x0601) + +#ifdef PROGRESS_IN_TASKBUTTON if(pTaskbarList) { pTaskbarList->SetProgressValue(hwnd, m_progress, m_totalWork); } #endif + } void LoadingWindow_Win32::SetIndeterminate(bool indeterminate) { @@ -306,7 +310,8 @@ void LoadingWindow_Win32::SetIndeterminate(bool indeterminate) { HWND hwndItem = ::GetDlgItem( hwnd, IDC_PROGRESS ); if(indeterminate) { -#if(WINVER >= 0x0601) + +#ifdef PROGRESS_IN_TASKBUTTON if(pTaskbarList) { pTaskbarList->SetProgressState(hwnd, TBPF_INDETERMINATE); } @@ -316,7 +321,7 @@ void LoadingWindow_Win32::SetIndeterminate(bool indeterminate) { } else { SendMessage(hwndItem,PBM_SETMARQUEE,0,0); SetWindowLong(hwndItem,GWL_STYLE, (~PBS_MARQUEE) & GetWindowLong(hwndItem,GWL_STYLE)); -#if(WINVER >= 0x0601) +#ifdef PROGRESS_IN_TASKBUTTON if(pTaskbarList) { pTaskbarList->SetProgressState(hwnd, TBPF_NORMAL); } diff --git a/src/arch/LoadingWindow/LoadingWindow_Win32.h b/src/arch/LoadingWindow/LoadingWindow_Win32.h index 491137aa99..a825c5c86d 100644 --- a/src/arch/LoadingWindow/LoadingWindow_Win32.h +++ b/src/arch/LoadingWindow/LoadingWindow_Win32.h @@ -10,6 +10,10 @@ #include "archutils/Win32/AppInstance.h" #if(WINVER >= 0x0601) +#define PROGRESS_IN_TASKBUTTON +#endif + +#ifdef PROGRESS_IN_TASKBUTTON #include "Shobjidl.h" #endif @@ -35,7 +39,7 @@ private: DWORD pumpThreadId; HANDLE guiReadyEvent; -#if(WINVER >= 0x0601) +#ifdef PROGRESS_IN_TASKBUTTON UINT taskbarCreatedEvent; ITaskbarList3 *pTaskbarList; #endif