diff --git a/NoteSkins/pump/delta-note/Center NoteHit.lua b/NoteSkins/pump/delta-note/Center NoteHit.lua index 08e0f4f722..c4fd53cafb 100644 --- a/NoteSkins/pump/delta-note/Center NoteHit.lua +++ b/NoteSkins/pump/delta-note/Center NoteHit.lua @@ -1,3 +1,3 @@ -return LoadActor("_CenterHit")..{ - InitCommand=cmd(x,2;y,2); +return LoadActor("_CenterHit")..{ + InitCommand=cmd(x,2;y,2); } \ No newline at end of file diff --git a/NoteSkins/pump/delta-note/DownLeft NoteHit.lua b/NoteSkins/pump/delta-note/DownLeft NoteHit.lua index d9bd17bb15..c03e1ff9f9 100644 --- a/NoteSkins/pump/delta-note/DownLeft NoteHit.lua +++ b/NoteSkins/pump/delta-note/DownLeft NoteHit.lua @@ -1,3 +1,3 @@ -return LoadActor("_DownLeftHit")..{ - InitCommand=cmd(y,5;x,2); +return LoadActor("_DownLeftHit")..{ + InitCommand=cmd(y,5;x,2); } \ No newline at end of file diff --git a/NoteSkins/pump/delta-note/DownRight NoteHit.lua b/NoteSkins/pump/delta-note/DownRight NoteHit.lua index 69ed3e91be..fe29b678a3 100644 --- a/NoteSkins/pump/delta-note/DownRight NoteHit.lua +++ b/NoteSkins/pump/delta-note/DownRight NoteHit.lua @@ -1,3 +1,3 @@ -return NOTESKIN:LoadActor("DownLeft","NoteHit")..{ - OnCommand=cmd(x,-2;zoomx,-1); +return NOTESKIN:LoadActor("DownLeft","NoteHit")..{ + OnCommand=cmd(x,-2;zoomx,-1); } \ No newline at end of file diff --git a/NoteSkins/pump/delta-note/DownRight Ready Receptor.lua b/NoteSkins/pump/delta-note/DownRight Ready Receptor.lua index d61466c6b6..56db1e8c9f 100644 --- a/NoteSkins/pump/delta-note/DownRight Ready Receptor.lua +++ b/NoteSkins/pump/delta-note/DownRight Ready Receptor.lua @@ -1,8 +1,8 @@ -return NOTESKIN:LoadActor("DownLeft", "Ready Receptor")..{ - Frames = { - { Frame = 0 }; - { Frame = 1 }; - { Frame = 2 }; - }; - --InitCommand=cmd(rotationy,180); +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-note/DownRight Tap Note.lua b/NoteSkins/pump/delta-note/DownRight Tap Note.lua index 9832f98f23..bb158809a7 100644 --- a/NoteSkins/pump/delta-note/DownRight Tap Note.lua +++ b/NoteSkins/pump/delta-note/DownRight Tap Note.lua @@ -1,3 +1,3 @@ -return NOTESKIN:LoadActor("DownLeft","Tap Note")..{ - --InitCommand=cmd(rotationy,180); +return NOTESKIN:LoadActor("DownLeft","Tap Note")..{ + --InitCommand=cmd(rotationy,180); }; \ No newline at end of file diff --git a/NoteSkins/pump/delta-note/NoteSkin.lua b/NoteSkins/pump/delta-note/NoteSkin.lua index 5836773dfc..039892bbc5 100644 --- a/NoteSkins/pump/delta-note/NoteSkin.lua +++ b/NoteSkins/pump/delta-note/NoteSkin.lua @@ -1,117 +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"] = "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 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 - +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"] = "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 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-note/UpLeft Explosion.lua b/NoteSkins/pump/delta-note/UpLeft Explosion.lua index 6b8aa2fe7d..450bb7daa8 100644 --- a/NoteSkins/pump/delta-note/UpLeft Explosion.lua +++ b/NoteSkins/pump/delta-note/UpLeft Explosion.lua @@ -1,40 +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); - }; - - +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-note/UpLeft NoteHit.lua b/NoteSkins/pump/delta-note/UpLeft NoteHit.lua index 3056735ffd..9b54b344e9 100644 --- a/NoteSkins/pump/delta-note/UpLeft NoteHit.lua +++ b/NoteSkins/pump/delta-note/UpLeft NoteHit.lua @@ -1,3 +1,3 @@ -return NOTESKIN:LoadActor("DownLeft","NoteHit")..{ - InitCommand=cmd(rotationy,180;rotationz,180;y,-6;x,2); -} +return NOTESKIN:LoadActor("DownLeft","NoteHit")..{ + InitCommand=cmd(rotationy,180;rotationz,180;y,-6;x,2); +} diff --git a/NoteSkins/pump/delta-note/UpLeft Receptor.lua b/NoteSkins/pump/delta-note/UpLeft Receptor.lua index 282f04e671..cc96b63ab0 100644 --- a/NoteSkins/pump/delta-note/UpLeft Receptor.lua +++ b/NoteSkins/pump/delta-note/UpLeft Receptor.lua @@ -1,22 +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); - }; - -} - +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); + }; + +} + --Vin.il was here... =) \ No newline at end of file diff --git a/NoteSkins/pump/delta-note/UpRight NoteHit.lua b/NoteSkins/pump/delta-note/UpRight NoteHit.lua index 849a252694..d26d55d0d9 100644 --- a/NoteSkins/pump/delta-note/UpRight NoteHit.lua +++ b/NoteSkins/pump/delta-note/UpRight NoteHit.lua @@ -1,3 +1,3 @@ -return NOTESKIN:LoadActor("DownLeft","NoteHit")..{ - InitCommand=cmd(rotationy,180;rotationz,180;y,-6;x,-2); +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-note/UpRight Ready Receptor.lua b/NoteSkins/pump/delta-note/UpRight Ready Receptor.lua index cae1506df9..38c7312861 100644 --- a/NoteSkins/pump/delta-note/UpRight Ready Receptor.lua +++ b/NoteSkins/pump/delta-note/UpRight Ready Receptor.lua @@ -1,8 +1,8 @@ -return NOTESKIN:LoadActor("UpLeft", "Ready Receptor")..{ - Frames = { - { Frame = 0 }; - { Frame = 1 }; - { Frame = 2 }; - }; - --InitCommand=cmd(rotationy,180); +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-note/UpRight Tap Note.lua b/NoteSkins/pump/delta-note/UpRight Tap Note.lua index 7b882b751d..384d4e4450 100644 --- a/NoteSkins/pump/delta-note/UpRight Tap Note.lua +++ b/NoteSkins/pump/delta-note/UpRight Tap Note.lua @@ -1,4 +1,4 @@ -return NOTESKIN:LoadActor("UpLeft","Tap Note")..{ - --InitCommand=cmd(rotationy,180); - --BaseRotationY=180; +return NOTESKIN:LoadActor("UpLeft","Tap Note")..{ + --InitCommand=cmd(rotationy,180); + --BaseRotationY=180; }; \ No newline at end of file diff --git a/NoteSkins/pump/delta-note/reminder.txt b/NoteSkins/pump/delta-note/reminder.txt index bd8649bff8..6213e1d926 100644 --- a/NoteSkins/pump/delta-note/reminder.txt +++ b/NoteSkins/pump/delta-note/reminder.txt @@ -1,2 +1,2 @@ -base color: border darkest +base color: border darkest fill: border darkest 40% op \ No newline at end of file