diff --git a/NoteSkins/pump/default/Center Ready Receptor 3x1 (res 192x64).png b/NoteSkins/pump/default/Center Ready Receptor 3x1 (res 192x64).png new file mode 100644 index 0000000000..8bccb6a173 Binary files /dev/null and b/NoteSkins/pump/default/Center Ready Receptor 3x1 (res 192x64).png differ diff --git a/NoteSkins/pump/default/Center Receptor.lua b/NoteSkins/pump/default/Center Receptor.lua deleted file mode 100644 index 32010edd4e..0000000000 --- a/NoteSkins/pump/default/Center Receptor.lua +++ /dev/null @@ -1,30 +0,0 @@ -local function Beat(self) - local this = self:GetChildren() - this.Glowpart:diffusealpha(0); - local beat = GAMESTATE:GetSongBeat() - local part = beat%1 - local eff = scale(part,0,0.5,1,0) - if beat >=0 then - this.Glowpart:diffusealpha(eff); - end -end - -return Def.ActorFrame { - InitCommand=cmd(SetUpdateFunction,Beat); - LoadActor("_receptor parts")..{ - InitCommand=cmd(pause;setstate,2); - }; - LoadActor("_receptor parts")..{ - Name="Glowpart"; - InitCommand=function(self) - --(NOTESKIN:GetMetricA("Receptor","BeatCommand"))(self); - self:pause(); - self:setstate(5); - self:blend('BlendMode_Add'); - end; - }; - LoadActor("_receptor parts")..{ - InitCommand=cmd(pause;setstate,8;zoom,1;diffusealpha,0;glow,1,1,1,0); - PressCommand=cmd(finishtweening;glow,1,1,1,1;zoom,1;linear,0.2;glow,1,1,1,0;zoom,1.2); - }; -} \ No newline at end of file diff --git a/NoteSkins/pump/default/DownLeft Ready Receptor 3x1 (res 192x64).png b/NoteSkins/pump/default/DownLeft Ready Receptor 3x1 (res 192x64).png new file mode 100644 index 0000000000..83bf9eb887 Binary files /dev/null and b/NoteSkins/pump/default/DownLeft Ready Receptor 3x1 (res 192x64).png differ diff --git a/NoteSkins/pump/default/DownLeft Receptor.lua b/NoteSkins/pump/default/DownLeft Receptor.lua deleted file mode 100644 index 6f9983485c..0000000000 --- a/NoteSkins/pump/default/DownLeft Receptor.lua +++ /dev/null @@ -1,30 +0,0 @@ -local function Beat(self) - local this = self:GetChildren() - this.Glowpart:diffusealpha(0); - local beat = GAMESTATE:GetSongBeat() - local part = beat%1 - local eff = scale(part,0,0.5,1,0) - if beat >=0 then - this.Glowpart:diffusealpha(eff); - end -end - -return Def.ActorFrame { - InitCommand=cmd(SetUpdateFunction,Beat); - LoadActor("_receptor parts")..{ - InitCommand=cmd(pause;setstate,0); - }; - LoadActor("_receptor parts")..{ - Name="Glowpart"; - InitCommand=function(self) - --(NOTESKIN:GetMetricA("Receptor","BeatCommand"))(self); - self:pause(); - self:setstate(3); - self:blend('BlendMode_Add'); - end; - }; - LoadActor("_receptor parts")..{ - InitCommand=cmd(pause;setstate,6;zoom,1;diffusealpha,0;glow,1,1,1,0); - PressCommand=cmd(finishtweening;glow,1,1,1,1;zoom,1;linear,0.2;glow,1,1,1,0;zoom,1.2); - }; -} \ 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..bb9a4f77f7 --- /dev/null +++ b/NoteSkins/pump/default/DownRight Tap Note.lua @@ -0,0 +1 @@ +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 index 65326c3091..8f2fe16c0d 100644 --- a/NoteSkins/pump/default/NoteSkin.lua +++ b/NoteSkins/pump/default/NoteSkin.lua @@ -1,5 +1,6 @@ local Noteskin = ... or {} +--bBlanks: Noteskin.bBlanks = { --["element"] = true|false; ["Hold Tail Active"] = true; @@ -8,8 +9,20 @@ Noteskin.bBlanks = { Noteskin.ElementRedirs = { --["element"] = "redirected_element"; ["Hold Head Active"] = "Tap Note"; + ["Hold Head Inactive"] = "Tap Note"; ["Roll Head Active"] = "Tap Note"; + ["Roll Head Inactive"] = "Tap Note"; ["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 Inactive"] = "Roll Topcap Active"; + ["Roll Body Inactive"] = "Roll Body Active"; + ["Roll Bottomcap Inactive"] = "Roll Bottomcap Active"; + ["Roll Tail Inactive"] = "Roll Tail Active"; } Noteskin.ButtonRedirs = { Center = "Center"; @@ -37,10 +50,6 @@ local function func() local sButton = Var "Button" local sElement = Var "Element" - --redir... - sElement = string.gsub(sElement,"Inactive","Active") - sElement = string.gsub(sElement,"inactive","active") - if Noteskin.bBlanks[sElement] then return Def.Actor {} end @@ -51,16 +60,32 @@ local function func() ElementToLoad = sElement end - if sElement == "Explosion" or sElement == "Tap Lift" or sElement == "Tap Mine" then + --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) - --sean holds o rollos pero que no sean cabezas ni colas, para tener gráficos separados por flechita :D - if ( string.find(sElement,"Hold") or string.find(sElement,"Roll") ) and not ( string.find(sElement,"Head") or string.find(sElement,"Tail") ) then + --Graficos separados para holds y rolls + if string.find(sElement,"Hold") or string.find(sElement,"Roll") 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] diff --git a/NoteSkins/pump/default/UpLeft Explosion.lua b/NoteSkins/pump/default/UpLeft Explosion.lua index 97cb1d39fa..582bab2eb5 100644 --- a/NoteSkins/pump/default/UpLeft Explosion.lua +++ b/NoteSkins/pump/default/UpLeft Explosion.lua @@ -1,6 +1,6 @@ return Def.ActorFrame { NOTESKIN:LoadActor(Var "Button", "Tap Note") .. { - InitCommand=cmd(blend,"BlendMode_Add";zoom,0;queuecommand,"Glow"); + InitCommand=cmd(blend,"BlendMode_Add";playcommand,"Glow"); W1Command=cmd(playcommand,"Glow"); W2Command=cmd(playcommand,"Glow"); W3Command=cmd(playcommand,"Glow"); @@ -9,33 +9,8 @@ return Def.ActorFrame { HoldingOnCommand=cmd(playcommand,"Glow"); HitMineCommand=cmd(playcommand,"Glow"); HeldCommand=cmd(playcommand,"Glow"); - GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,0.95;zoom,1;linear,0.15;zoom,1.15;linear,0.15;diffusealpha,0;zoom,1.30); + GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,1.0;zoom,1.0;linear,0.15;diffusealpha,0.9;zoom,1.1;linear,0.15;diffusealpha,0.0;zoom,1.2); }; - LoadActor("_flash")..{ - InitCommand=cmd(blend,"BlendMode_Add";zoom,0;queuecommand,"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,0.95;zoom,0.6;linear,0.15;zoom,0.65;linear,0.15;diffusealpha,0;zoom,0.7); - }; - --this is supposed to be the "press" effect - --[[LoadActor("_receptor parts")..{ - InitCommand=cmd(pause;diffusealpha,0.5;setstate,2); - ColumnJudgmentMessageCommand=function(self,params) - self:finishtweening(); - if params.TapNoteScore == 'TapNoteScore_W2' then - self:zoom(2); - self:linear(0.3); - self:zoom(0); - end - --cmd(finishtweening;zoom,2;linear,0.3;zoom,1); - end; - };]] 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); diff --git a/NoteSkins/pump/default/UpLeft Ready Receptor 3x1 (res 192x64).png b/NoteSkins/pump/default/UpLeft Ready Receptor 3x1 (res 192x64).png new file mode 100644 index 0000000000..296c09e1d7 Binary files /dev/null and b/NoteSkins/pump/default/UpLeft Ready Receptor 3x1 (res 192x64).png differ diff --git a/NoteSkins/pump/default/UpLeft Receptor.lua b/NoteSkins/pump/default/UpLeft Receptor.lua index a028351122..4094b8111e 100644 --- a/NoteSkins/pump/default/UpLeft Receptor.lua +++ b/NoteSkins/pump/default/UpLeft Receptor.lua @@ -1,30 +1,39 @@ local function Beat(self) local this = self:GetChildren() - this.Glowpart:diffusealpha(0); + --Yes, why not? + this.Base:pause(); + this.Glow:pause(); + this.Tap:pause(); + this.Base:setstate(0); + this.Glow:setstate(1); + this.Tap:setstate(2); + + this.Glow:blend('BlendMode_Add'); + + this.Glow:diffusealpha(0); local beat = GAMESTATE:GetSongBeat() local part = beat%1 local eff = scale(part,0,0.5,1,0) - if beat >=0 then - this.Glowpart:diffusealpha(eff); + if beat >= 0 then + this.Glow:diffusealpha(eff); end end return Def.ActorFrame { + -- COMMANDS -- InitCommand=cmd(SetUpdateFunction,Beat); - LoadActor("_receptor parts")..{ - InitCommand=cmd(pause;setstate,1); + -- LAYERS -- + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Base"; + InitCommand=cmd(); }; - LoadActor("_receptor parts")..{ - Name="Glowpart"; - InitCommand=function(self) - --(NOTESKIN:GetMetricA("Receptor","BeatCommand"))(self); - self:pause(); - self:setstate(4); - self:blend('BlendMode_Add'); - end; + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Glow"; + InitCommand=cmd(); }; - LoadActor("_receptor parts")..{ - InitCommand=cmd(pause;setstate,7;zoom,1;diffusealpha,0;glow,1,1,1,0); - PressCommand=cmd(finishtweening;glow,1,1,1,1;zoom,1;linear,0.2;glow,1,1,1,0;zoom,1.2); + NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ + Name="Tap"; + InitCommand=NOTESKIN:GetMetricA(Var "Button" ,"ReceptorTapInitCommand"); + PressCommand=NOTESKIN:GetMetricA(Var "Button" ,"ReceptorTapPressCommand"); }; } \ 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..e3518c5f6f --- /dev/null +++ b/NoteSkins/pump/default/UpRight Tap Note.lua @@ -0,0 +1 @@ +return NOTESKIN:LoadActor("UpLeft","Tap Note"); \ No newline at end of file diff --git a/NoteSkins/pump/default/_flash.png b/NoteSkins/pump/default/_flash.png deleted file mode 100644 index cb8e68ea1b..0000000000 Binary files a/NoteSkins/pump/default/_flash.png and /dev/null differ diff --git a/NoteSkins/pump/default/_receptor parts 3x3 (res 192x192).png b/NoteSkins/pump/default/_receptor parts 3x3 (res 192x192).png deleted file mode 100644 index 82092aa611..0000000000 Binary files a/NoteSkins/pump/default/_receptor parts 3x3 (res 192x192).png and /dev/null differ diff --git a/NoteSkins/pump/default/metrics.ini b/NoteSkins/pump/default/metrics.ini index 149c49bfd9..740cd86a56 100644 --- a/NoteSkins/pump/default/metrics.ini +++ b/NoteSkins/pump/default/metrics.ini @@ -17,11 +17,28 @@ FlipHoldBodyWhenReverse=1 TopHoldAnchorWhenReverse=0 HoldActiveIsAddLayer=0 +;Explosion commands +ButtonTapCommand=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 + +;you can go nuts now... +FlashTapCommand=finishtweening;diffusealpha,0.5;zoom,1.0;linear,0.15;diffusealpha,0.45;zoom,1.15;linear,0.15;diffusealpha,0.0;zoom,1.3 + +;if you want/need diferent commands for each button, write the previous commands +;under the correspondant button section in this metrics.ini + +;ReceptorTap commands +ReceptorTapInitCommand=zoom,1;diffusealpha,0;glow,1,1,1,0 +ReceptorTapPressCommand=finishtweening;glow,1,1,1,1;zoom,1;linear,0.2;glow,1,1,1,0;zoom,1.2 + [Center] TapNoteAnimationLengthInBeats=1 HoldHeadAnimationLengthInBeats=1 HoldTailAnimationLengthInBeats=1 -;useless -[Receptor] -BeatCommand=blend,"BlendMode_Add";diffuseshift;effectclock,"beat";effecttiming,0,0,.5,.5 \ No newline at end of file +[DownLeft] + +[DownRight] + +[UpLeft] + +[UpRight] 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/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/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