From e8d4b2a557f13cb9d51c9a3902849d5abc410e2a Mon Sep 17 00:00:00 2001 From: Alberto Ramos Date: Sun, 18 Jul 2010 19:07:23 -0600 Subject: [PATCH] HG: changed NoteSkins/pump/default/metrics.ini --- NoteSkins/pump/default/DownRight Tap Note.lua | 4 +- NoteSkins/pump/default/NoteSkin.lua | 35 +++++-------- NoteSkins/pump/default/UpLeft Explosion.lua | 50 +------------------ NoteSkins/pump/default/UpLeft Receptor.lua | 42 ++++++---------- NoteSkins/pump/default/UpRight Tap Note.lua | 4 +- NoteSkins/pump/default/metrics.ini | 17 ++++++- 6 files changed, 48 insertions(+), 104 deletions(-) diff --git a/NoteSkins/pump/default/DownRight Tap Note.lua b/NoteSkins/pump/default/DownRight Tap Note.lua index 04abf29c93..bb9a4f77f7 100644 --- a/NoteSkins/pump/default/DownRight Tap Note.lua +++ b/NoteSkins/pump/default/DownRight Tap Note.lua @@ -1,3 +1 @@ -return NOTESKIN:LoadActor("DownLeft","Tap Note")..{ - InitCommand=cmd(rotationy,180); -}; \ No newline at end of file +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 39a83ab332..8f2fe16c0d 100644 --- a/NoteSkins/pump/default/NoteSkin.lua +++ b/NoteSkins/pump/default/NoteSkin.lua @@ -1,19 +1,17 @@ -local Noteskin = {} +local Noteskin = ... or {} ---bBlanks: +--bBlanks: Noteskin.bBlanks = { --["element"] = true|false; ["Hold Tail Active"] = true; - ["Hold Tail Active"] = true; - ["Roll Tail Inactive"] = true; - ["Roll Tail Inactive"] = true; + ["Roll Tail Active"] = 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"; + ["Roll Head Active"] = "Tap Note"; + ["Roll Head Inactive"] = "Tap Note"; ["Tap Fake"] = "Tap Note"; -- ["Hold Topcap Inactive"] = "Hold Topcap Active"; @@ -21,22 +19,17 @@ Noteskin.ElementRedirs = { ["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"; + ["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"; UpLeft = "UpLeft"; - UpRight = "UpRight"; + UpRight = "UpLeft"; DownLeft = "DownLeft"; - DownRight = "DownRight"; + DownRight = "DownLeft"; } Noteskin.BaseRotX = { Center = 0; @@ -48,9 +41,9 @@ Noteskin.BaseRotX = { Noteskin.BaseRotY = { Center = 0; UpLeft = 0; - UpRight = 0; + UpRight = 180; DownLeft = 0; - DownRight = 0; + DownRight = 180; } local function func() @@ -78,8 +71,6 @@ local function func() 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 diff --git a/NoteSkins/pump/default/UpLeft Explosion.lua b/NoteSkins/pump/default/UpLeft Explosion.lua index 38188bdcd1..582bab2eb5 100644 --- a/NoteSkins/pump/default/UpLeft Explosion.lua +++ b/NoteSkins/pump/default/UpLeft Explosion.lua @@ -1,5 +1,4 @@ return Def.ActorFrame { - --note graphic NOTESKIN:LoadActor(Var "Button", "Tap Note") .. { InitCommand=cmd(blend,"BlendMode_Add";playcommand,"Glow"); W1Command=cmd(playcommand,"Glow"); @@ -7,55 +6,10 @@ return Def.ActorFrame { W3Command=cmd(playcommand,"Glow"); W4Command=cmd(); W5Command=cmd(); - --HoldingOnCommand=cmd(playcommand,"Glow"); + HoldingOnCommand=cmd(playcommand,"Glow"); HitMineCommand=cmd(playcommand,"Glow"); HeldCommand=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); - }; - ---[[ - NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ - Name="Tap"; - Frames = { { Frame = 2 } }; - InitCommand=cmd(zoom,1;diffusealpha,0); - --NOTESKIN:GetMetricA(Var "Button", "TapInitCommand"); - TapCommand=cmd(finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2); - --NOTESKIN:GetMetricA(Var "Button", "TapHeldCommand"); - - 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"); - --NoneCommand=cmd(linear,0.1;zoom,2); - }; - --]] - --explosion - LoadActor("_stepfx")..{ - Frames = { - { Frame = 0 ; Delay = 0.05 }; - { Frame = 1 ; Delay = 0.05 }; - { Frame = 2 ; Delay = 0.05 }; - { Frame = 3 ; Delay = 0.05 }; - { Frame = 4 ; Delay = 0.05 }; - --WUT... - { Frame = 5 ; Delay = 99999 }; - }; - InitCommand=cmd(blend,"BlendMode_Add";setstate,0); - W1Command=cmd(setstate,0); - W2Command=cmd(setstate,0); - W3Command=cmd(setstate,0); - W4Command=cmd(); - W5Command=cmd(); - --HoldingOnCommand=cmd(setstate,0); - HitMineCommand=cmd(setstate,0); - HeldCommand=cmd(setstate,1); + 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); }; Def.Quad { InitCommand=cmd(diffuse,1,1,1,0;zoomto,SCREEN_WIDTH*100,SCREEN_HEIGHT*100;zoomz,SCREEN_WIDTH*SCREEN_HEIGHT); diff --git a/NoteSkins/pump/default/UpLeft Receptor.lua b/NoteSkins/pump/default/UpLeft Receptor.lua index a5d1e7e0f7..4094b8111e 100644 --- a/NoteSkins/pump/default/UpLeft Receptor.lua +++ b/NoteSkins/pump/default/UpLeft Receptor.lua @@ -1,49 +1,39 @@ local function Beat(self) local this = self:GetChildren() + --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 - 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 + if beat >= 0 then + this.Glow:diffusealpha(eff); 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); + InitCommand=cmd(); }; 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); + InitCommand=cmd(); }; - --[[ 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"); - -- + 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 index a6060b7657..e3518c5f6f 100644 --- a/NoteSkins/pump/default/UpRight Tap Note.lua +++ b/NoteSkins/pump/default/UpRight Tap Note.lua @@ -1,3 +1 @@ -return NOTESKIN:LoadActor("UpLeft","Tap Note")..{ - InitCommand=cmd(rotationy,180); -}; \ No newline at end of file +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 index 96aaacb55f..740cd86a56 100644 --- a/NoteSkins/pump/default/metrics.ini +++ b/NoteSkins/pump/default/metrics.ini @@ -17,10 +17,23 @@ FlipHoldBodyWhenReverse=1 TopHoldAnchorWhenReverse=0 HoldActiveIsAddLayer=0 -TapInitCommand=zoom,1;diffusealpha,0;glow,1,1,1,0 -TapHeldCommand=finishtweening;glow,1,1,1,1;zoom,1;linear,0.2;glow,1,1,1,0;zoom,1.2 +;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 [DownLeft]