diff --git a/NoteSkins/dance/midi-note/Down Hold Body Active (doubleres).png b/NoteSkins/dance/midi-note/Down Hold Body Active (doubleres).png index 50d0cc143a..5a5c758c47 100644 Binary files a/NoteSkins/dance/midi-note/Down Hold Body Active (doubleres).png and b/NoteSkins/dance/midi-note/Down Hold Body Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Hold Body Inactive (doubleres).png b/NoteSkins/dance/midi-note/Down Hold Body Inactive (doubleres).png index fbacd41054..890e85577f 100644 Binary files a/NoteSkins/dance/midi-note/Down Hold Body Inactive (doubleres).png and b/NoteSkins/dance/midi-note/Down Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Hold BottomCap Active (doubleres).png b/NoteSkins/dance/midi-note/Down Hold BottomCap Active (doubleres).png index d1892ca1db..c48bca4137 100644 Binary files a/NoteSkins/dance/midi-note/Down Hold BottomCap Active (doubleres).png and b/NoteSkins/dance/midi-note/Down Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive (doubleres).png b/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive (doubleres).png index 659026dba8..268a08ead1 100644 Binary files a/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive (doubleres).png and b/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Roll Body Active (doubleres).png b/NoteSkins/dance/midi-note/Down Roll Body Active (doubleres).png index 8bee27b953..a412335424 100644 Binary files a/NoteSkins/dance/midi-note/Down Roll Body Active (doubleres).png and b/NoteSkins/dance/midi-note/Down Roll Body Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Roll Body Inactive (doubleres).png b/NoteSkins/dance/midi-note/Down Roll Body Inactive (doubleres).png index c002e5049d..7d995a73ed 100644 Binary files a/NoteSkins/dance/midi-note/Down Roll Body Inactive (doubleres).png and b/NoteSkins/dance/midi-note/Down Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Roll BottomCap Active (doubleres).png b/NoteSkins/dance/midi-note/Down Roll BottomCap Active (doubleres).png index 40e660560f..7eeb31774e 100644 Binary files a/NoteSkins/dance/midi-note/Down Roll BottomCap Active (doubleres).png and b/NoteSkins/dance/midi-note/Down Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive (doubleres).png b/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive (doubleres).png index fc8714cb28..25be6edce3 100644 Binary files a/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive (doubleres).png and b/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/NoteSkin.lua b/NoteSkins/dance/midi-note/NoteSkin.lua index 36ce77983f..cba949fd6e 100644 --- a/NoteSkins/dance/midi-note/NoteSkin.lua +++ b/NoteSkins/dance/midi-note/NoteSkin.lua @@ -17,12 +17,17 @@ ret.Redir = function(sButton, sElement) -- sButton, sElement = OldRedir(sButton, sElement); -- Instead of separate hold heads, use the tap note graphics. - if sElement == "Hold Head Inactive" or - sElement == "Hold Head Active" or - sElement == "Roll Head Inactive" or + if sElement == "Hold Head Active" or sElement == "Roll Head Active" then - sElement = "Tap Note"; + sElement = "StreamHead Active"; + end + + -- Test + if sElement == "Hold Head Inactive" or + sElement == "Roll Head Inactive" or + then + sElement = "StreamHead Inactive"; end sButton = ret.RedirTable[sButton]; diff --git a/NoteSkins/dance/midi-note/metrics.ini b/NoteSkins/dance/midi-note/metrics.ini index 4437464064..b946fe4351 100644 --- a/NoteSkins/dance/midi-note/metrics.ini +++ b/NoteSkins/dance/midi-note/metrics.ini @@ -66,20 +66,20 @@ HoldingOnCommand=hidden,0 HoldingOffCommand=hidden,1 [ReceptorArrow] -W3Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 -W2Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 -W1Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 +W3Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +W2Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +W1Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 InitCommand= -NoneCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 -PressCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 +NoneCommand=stoptweening;zoom,0.85;linear,0.12;zoom,1 +PressCommand=stoptweening;zoom,0.85;linear,0.12;zoom,1 [ReceptorArrowOverlay] -W3Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 -W2Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 -W1Command=stoptweening;zoom,1.15;linear,0.12;zoom,1 +W3Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +W2Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 +W1Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 InitCommand=blend,"BlendMode_Add";effectclock,"beat";diffuseramp;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,1");effecttiming,.2,0,.8,0;effectoffset,.05 -NoneCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 -PressCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 +NoneCommand=stoptweening;zoom,0.85;linear,0.12;zoom,1 +PressCommand=stoptweening;zoom,0.85;linear,0.12;zoom,1 [ReceptorOverlay] InitCommand=diffusealpha,0;blend,"BlendMode_Add" -PressCommand=finishtweening;zoom,1.1;decelerate,0.12;zoom,1;diffusealpha,0.6; +PressCommand=finishtweening;zoom,0.85;decelerate,0.12;zoom,1;diffusealpha,0.6; LiftCommand=finishtweening;accelerate,0.12;diffusealpha,0;zoom,1.2 \ No newline at end of file diff --git a/NoteSkins/dance/midi-note/res/Resource.psd b/NoteSkins/dance/midi-note/res/Resource.psd index 224d767991..2ebcfdd717 100644 Binary files a/NoteSkins/dance/midi-note/res/Resource.psd and b/NoteSkins/dance/midi-note/res/Resource.psd differ diff --git a/NoteSkins/dance/midi-note/res/down hold tail active.psd b/NoteSkins/dance/midi-note/res/down hold tail active.psd index ec1030cecc..fa89b7884a 100644 Binary files a/NoteSkins/dance/midi-note/res/down hold tail active.psd and b/NoteSkins/dance/midi-note/res/down hold tail active.psd differ diff --git a/NoteSkins/dance/midi-note/res/down hold tail inactive.psd b/NoteSkins/dance/midi-note/res/down hold tail inactive.psd index 93f8790f1e..b82e788d14 100644 Binary files a/NoteSkins/dance/midi-note/res/down hold tail inactive.psd and b/NoteSkins/dance/midi-note/res/down hold tail inactive.psd differ diff --git a/NoteSkins/dance/midi-note/res/down roll tail active.psd b/NoteSkins/dance/midi-note/res/down roll tail active.psd index 5a995e365d..5c3175c83c 100644 Binary files a/NoteSkins/dance/midi-note/res/down roll tail active.psd and b/NoteSkins/dance/midi-note/res/down roll tail active.psd differ diff --git a/NoteSkins/dance/midi-note/res/down roll tail inactive.psd b/NoteSkins/dance/midi-note/res/down roll tail inactive.psd index 93525a026c..50fa746f70 100644 Binary files a/NoteSkins/dance/midi-note/res/down roll tail inactive.psd and b/NoteSkins/dance/midi-note/res/down roll tail inactive.psd differ diff --git a/NoteSkins/dance/midi-note/res/hold body active.psd b/NoteSkins/dance/midi-note/res/hold body active.psd index 6a0e7f4fc0..6a2a6e1f34 100644 Binary files a/NoteSkins/dance/midi-note/res/hold body active.psd and b/NoteSkins/dance/midi-note/res/hold body active.psd differ diff --git a/NoteSkins/dance/midi-note/res/hold body inactive.psd b/NoteSkins/dance/midi-note/res/hold body inactive.psd index 451422e452..4f6ec5c346 100644 Binary files a/NoteSkins/dance/midi-note/res/hold body inactive.psd and b/NoteSkins/dance/midi-note/res/hold body inactive.psd differ diff --git a/NoteSkins/dance/midi-note/res/roll body active.psd b/NoteSkins/dance/midi-note/res/roll body active.psd index 455b10a7d6..caa82b6f77 100644 Binary files a/NoteSkins/dance/midi-note/res/roll body active.psd and b/NoteSkins/dance/midi-note/res/roll body active.psd differ diff --git a/NoteSkins/dance/midi-note/res/roll body inactive.psd b/NoteSkins/dance/midi-note/res/roll body inactive.psd index 9bde0c21ee..cc8c4208b0 100644 Binary files a/NoteSkins/dance/midi-note/res/roll body inactive.psd and b/NoteSkins/dance/midi-note/res/roll body inactive.psd differ diff --git a/NoteSkins/dance/midi-solo/NoteSkin.lua b/NoteSkins/dance/midi-solo/NoteSkin.lua deleted file mode 100644 index d9bf269462..0000000000 --- a/NoteSkins/dance/midi-solo/NoteSkin.lua +++ /dev/null @@ -1,106 +0,0 @@ --- Haggen Daze - -local ret = ... or {}; - -ret.RedirTable = -{ - Up = "Down", - Down = "Down", - Left = "Down", - Right = "Down", - UpLeft = "Down", - UpRight = "Down", -}; - -local OldRedir = ret.Redir; -ret.Redir = function(sButton, sElement) - sButton, sElement = OldRedir(sButton, sElement); - - -- Instead of separate hold heads, use the tap note graphics. - if sElement == "Hold Head Inactive" or - sElement == "Hold Head Active" or - sElement == "Roll Head Inactive" or - sElement == "Roll Head Active" - then - sElement = "Tap Note"; - end - - sButton = ret.RedirTable[sButton]; - - return sButton, sElement; -end - --- To have separate graphics for each hold part: ---[[ -local OldRedir = ret.Redir; -ret.Redir = function(sButton, sElement) - -- Redirect non-hold, non-roll parts. - if string.find(sElement, "hold") then - return sButton, sElement; - end - return OldRedir(sButton, sElement); -end -]] - -local OldFunc = ret.Load; -function ret.Load() - local t = OldFunc(); - - -- The main "Explosion" part just loads other actors; don't rotate - -- it. The "Hold Explosion" part should not be rotated. - if Var "Element" == "Explosion" or - Var "Element" == "Roll Explosion" then - t.BaseRotationZ = nil; - end - return t; -end - -ret.PartsToRotate = -{ - ["Receptor"] = true, - ["Go Receptor"] = true, - ["Ready Receptor"] = true, - ["Tap Explosion Bright"] = true, - ["Tap Explosion Dim"] = true, - ["Tap Note"] = true, - ["Tap Lift"] = true, - ["Hold Head Active"] = true, - ["Hold Head Inactive"] = true, - ["Roll Head Active"] = true, - ["Roll Head Inactive"] = true, - ["Hold Explosion"] = true, - ["Roll Explosion"] = true, -}; -ret.Rotate = -{ - Up = 180, - Down = 0, - Left = 90, - Right = -90, - UpLeft = 135, - UpRight = 225, -}; - --- --- If a derived skin wants to have separate UpLeft graphics, --- use this: --- --- ret.RedirTable.UpLeft = "UpLeft"; --- ret.RedirTable.UpRight = "UpLeft"; --- ret.Rotate.UpLeft = 0; --- ret.Rotate.UpRight = 90; --- -ret.Blank = -{ - ["Hold Topcap Active"] = true, - ["Hold Topcap Inactive"] = true, - ["Roll Topcap Active"] = true, - ["Roll Topcap Inactive"] = true, - ["Hold Tail Active"] = true, - ["Hold Tail Inactive"] = true, - ["Roll Tail Active"] = true, - ["Roll Tail Inactive"] = true, - ["Roll Explosion"] = true, -}; - -return ret; diff --git a/NoteSkins/dance/midi-solo/original.Down Tap Lift.lua b/NoteSkins/dance/midi-solo/original.Down Tap Lift.lua deleted file mode 100644 index e02b61c4b0..0000000000 --- a/NoteSkins/dance/midi-solo/original.Down Tap Lift.lua +++ /dev/null @@ -1,16 +0,0 @@ -local t = Def.ActorFrame { - Def.Sprite { - Texture=NOTESKIN:GetPath( '_down', 'tap lift' ); - InitCommand=cmd(diffusealpha,0.5); - }; - Def.Sprite { - Texture=NOTESKIN:GetPath( '_down', 'tap lift' ); - InitCommand=cmd(pulse;effectclock,"beat";effecttiming,0,0,0.75/2,0.25/2;effectmagnitude,1,1,1;effectcolor1,color("1,1,1,1");effectcolor2,color("1,1.25,1,1")); - }; - Def.Sprite { - Texture=NOTESKIN:GetPath( '_down', 'lift fill' ); - Frames = Sprite.LinearFrames( 4, 1 ); - InitCommand=cmd(pulse;effectclock,"beat";effecttiming,0,0,0.75/4,0.25/4;effectmagnitude,1,1,1;effectcolor1,color("1,1,1,1");effectcolor2,color("1,1,1,1")); - }; -}; -return t; diff --git a/NoteSkins/dance/midi-vivid/NoteSkin.lua b/NoteSkins/dance/midi-vivid/NoteSkin.lua deleted file mode 100644 index d705e14592..0000000000 --- a/NoteSkins/dance/midi-vivid/NoteSkin.lua +++ /dev/null @@ -1,117 +0,0 @@ --- Haggen Daze - -local ret = ... or {}; - -ret.RedirTable = -{ - Up = "Down", - Down = "Down", - Left = "Down", - Right = "Down", - UpLeft = "Down", - UpRight = "Down", -}; - - -local OldRedir = ret.Redir; -ret.Redir = function(sButton, sElement) - sButton = ret.RedirTable[sButton]; - return sButton, sElement; -end - --- To have separate graphics for each hold part: -local OldRedir = ret.Redir; -ret.Redir = function(sButton, sElement) - -- Redirect non-hold, non-roll parts. - if string.find(sElement, "hold") or string.find(sElement, "roll") then - return sButton, sElement; - end - return OldRedir(sButton, sElement); -end - ---[[ -local OldFunc = ret.Load; -function ret.Load() - local t = OldFunc(); - - -- The main "Explosion" part just loads other actors; don't rotate - -- it. The "Hold Explosion" part should not be rotated. - if Var "Element" == "Explosion" or - Var "Element" == "Roll Explosion" then - t.BaseRotationZ = nil; - end - return t; -end - - -local OldRedir = ret.Redir; -ret.Redir = function(sButton, sElement) - sButton, sElement = OldRedir(sButton, sElement); - - --we want to use custom hold/roll per direction, but - --keep global hold/roll heads and explosions. - if not string.find(sElement, "Head") and - not string.find(sElement, "Explosion") then - if string.find(sElement, "Hold") or - string.find(sElement, "Roll") then - return sButton, sElement; - end - end - - sButton = ret.RedirTable[sButton]; - - return sButton, sElement; -end -]] -local OldFunc = ret.Load; -function ret.Load() - local t = OldFunc(); - - --Explosion should not be rotated; it calls other actors. - if Var "Element" == "Explosion" then - t.BaseRotationZ = nil; - end - return t; -end - - -ret.PartsToRotate = -{ - ["Receptor"] = true, - ["Go Receptor"] = true, - ["Ready Receptor"] = true, - ["Tap Explosion Bright"] = true, - ["Tap Explosion Dim"] = true, - ["Tap Note"] = true, - ["Tap Lift"] = true, - ["Hold Head Active"] = true, - ["Hold Head Inactive"] = true, - ["Roll Head Active"] = true, - ["Roll Head Inactive"] = true, - ["Hold Explosion"] = true, - ["Roll Explosion"] = true, -}; -ret.Rotate = -{ - Up = 180, - Down = 0, - Left = 90, - Right = -90, - UpLeft = 135, - UpRight = 225, -}; - -ret.Blank = -{ - ["Hold Topcap Active"] = true, - ["Hold Topcap Inactive"] = true, - ["Roll Topcap Active"] = true, - ["Roll Topcap Inactive"] = true, - ["Hold Tail Active"] = true, - ["Hold Tail Inactive"] = true, - ["Roll Tail Active"] = true, - ["Roll Tail Inactive"] = true, - ["Roll Explosion"] = true, -}; - -return ret; \ No newline at end of file diff --git a/NoteSkins/dance/midi-vivid/metrics.ini b/NoteSkins/dance/midi-vivid/metrics.ini index 605569f68b..9b9a2d19fa 100644 --- a/NoteSkins/dance/midi-vivid/metrics.ini +++ b/NoteSkins/dance/midi-vivid/metrics.ini @@ -39,6 +39,7 @@ TapFakeNoteColorTextureCoordSpacingY=0 HoldHeadNoteColorTextureCoordSpacingX=0 HoldHeadNoteColorTextureCoordSpacingY=0 +HoldHeadNoteColorTextureCoordSpacingY=0 [GhostArrowDim] NoneCommand= @@ -85,4 +86,4 @@ PressCommand=stoptweening;zoom,1.15;linear,0.12;zoom,1 [ReceptorOverlay] InitCommand=diffusealpha,0;blend,"BlendMode_Add" PressCommand=finishtweening;zoom,1.1;decelerate,0.12;zoom,1;diffusealpha,0.6; -LiftCommand=finishtweening;accelerate,0.12;diffusealpha,0;zoom,1.2 \ No newline at end of file +LiftCommand=finishtweening;accelerate,0.12;diffusealpha,0;zoom,1.2