diff --git a/NoteSkins/dance/midi-note/Down Hold Body Active (doubleres).png b/NoteSkins/dance/midi-note/Down Hold Body Active (doubleres).png new file mode 100644 index 0000000000..7d5779e388 Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Hold Body Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Hold Body Active.png b/NoteSkins/dance/midi-note/Down Hold Body Active.png deleted file mode 100644 index ec3ab5861d..0000000000 Binary files a/NoteSkins/dance/midi-note/Down Hold Body Active.png and /dev/null 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 new file mode 100644 index 0000000000..d27f08ffb4 Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Hold Body Inactive.png b/NoteSkins/dance/midi-note/Down Hold Body Inactive.png deleted file mode 100644 index 06304a236b..0000000000 Binary files a/NoteSkins/dance/midi-note/Down Hold Body Inactive.png and /dev/null 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 new file mode 100644 index 0000000000..3206d1a93b Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Hold BottomCap Active.png b/NoteSkins/dance/midi-note/Down Hold BottomCap Active.png deleted file mode 100644 index 0b1704f751..0000000000 Binary files a/NoteSkins/dance/midi-note/Down Hold BottomCap Active.png and /dev/null 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 new file mode 100644 index 0000000000..8845b031d5 Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive.png b/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive.png deleted file mode 100644 index 865064e787..0000000000 Binary files a/NoteSkins/dance/midi-note/Down Hold BottomCap Inactive.png and /dev/null 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 new file mode 100644 index 0000000000..ea78328bb4 Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Roll Body Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Roll Body Active.png b/NoteSkins/dance/midi-note/Down Roll Body Active.png deleted file mode 100644 index 19976a8563..0000000000 Binary files a/NoteSkins/dance/midi-note/Down Roll Body Active.png and /dev/null 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 new file mode 100644 index 0000000000..e067b74dd2 Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Roll Body Inactive.png b/NoteSkins/dance/midi-note/Down Roll Body Inactive.png deleted file mode 100644 index ae0a36998f..0000000000 Binary files a/NoteSkins/dance/midi-note/Down Roll Body Inactive.png and /dev/null 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 new file mode 100644 index 0000000000..f1d6d7ca52 Binary files /dev/null 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 new file mode 100644 index 0000000000..aa9c23197e Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive.lua b/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive.lua deleted file mode 100644 index 0786a2aa09..0000000000 --- a/NoteSkins/dance/midi-note/Down Roll BottomCap Inactive.lua +++ /dev/null @@ -1,4 +0,0 @@ -return Def.Sprite { - Texture=NOTESKIN:GetPath('Down','Roll BottomCap Active'); - InitCommand=cmd(diffuse,color("0.5,0.5,0.5,0.5")); -}; \ No newline at end of file diff --git a/NoteSkins/dance/midi-note/Down Tap Fake (doubleres).png b/NoteSkins/dance/midi-note/Down Tap Fake (doubleres).png new file mode 100644 index 0000000000..741e7ad279 Binary files /dev/null and b/NoteSkins/dance/midi-note/Down Tap Fake (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/Down Tap Fake.png b/NoteSkins/dance/midi-note/Down Tap Fake.png deleted file mode 100644 index 1954aa2d53..0000000000 Binary files a/NoteSkins/dance/midi-note/Down Tap Fake.png and /dev/null differ diff --git a/NoteSkins/dance/midi-note/NoteSkin.lua b/NoteSkins/dance/midi-note/NoteSkin.lua index 4176829525..36ce77983f 100644 --- a/NoteSkins/dance/midi-note/NoteSkin.lua +++ b/NoteSkins/dance/midi-note/NoteSkin.lua @@ -14,7 +14,7 @@ ret.RedirTable = local OldRedir = ret.Redir; ret.Redir = function(sButton, sElement) - sButton, sElement = OldRedir(sButton, sElement); + -- sButton, sElement = OldRedir(sButton, sElement); -- Instead of separate hold heads, use the tap note graphics. if sElement == "Hold Head Inactive" or @@ -30,16 +30,23 @@ ret.Redir = function(sButton, sElement) return sButton, sElement; end +-- 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") then + 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(); @@ -52,6 +59,18 @@ function ret.Load() end return t; 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 = { diff --git a/NoteSkins/dance/midi-note/_Down Tap Note 8x8 (doubleres).png b/NoteSkins/dance/midi-note/_Down Tap Note 8x8 (doubleres).png new file mode 100644 index 0000000000..dd8b80d258 Binary files /dev/null and b/NoteSkins/dance/midi-note/_Down Tap Note 8x8 (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/_Down Tap Note 8x8.png b/NoteSkins/dance/midi-note/_Down Tap Note 8x8.png deleted file mode 100644 index 49ab0a5b57..0000000000 Binary files a/NoteSkins/dance/midi-note/_Down Tap Note 8x8.png and /dev/null differ diff --git a/NoteSkins/dance/midi-note/_Down Tap Receptor (doubleres).png b/NoteSkins/dance/midi-note/_Down Tap Receptor (doubleres).png new file mode 100644 index 0000000000..91b4f6ed29 Binary files /dev/null and b/NoteSkins/dance/midi-note/_Down Tap Receptor (doubleres).png differ diff --git a/NoteSkins/dance/midi-note/_Down Tap Receptor.png b/NoteSkins/dance/midi-note/_Down Tap Receptor.png deleted file mode 100644 index 4b1c2df488..0000000000 Binary files a/NoteSkins/dance/midi-note/_Down Tap Receptor.png and /dev/null differ diff --git a/NoteSkins/dance/midi-note/metrics.ini b/NoteSkins/dance/midi-note/metrics.ini index 947f0aea10..4437464064 100644 --- a/NoteSkins/dance/midi-note/metrics.ini +++ b/NoteSkins/dance/midi-note/metrics.ini @@ -1,5 +1,5 @@ [Global] -# FallbackNoteSkin=default +FallbackNoteSkin=default [NoteDisplay] TapNoteAnimationIsVivid=0 @@ -61,6 +61,10 @@ W1Command=blend,'BlendMode_Add';diffuse,1.0,1.0,1.0,0.875;zoom,1;linear,0.06;zoo LetGoCommand=blend,'BlendMode_Add'; HeldCommand=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +[HoldGhostArrow] +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 diff --git a/NoteSkins/dance/midi-vivid/Down Hold Head Active (doubleres).png b/NoteSkins/dance/midi-vivid/Down Hold Head Active (doubleres).png new file mode 100644 index 0000000000..f8f3c3cd66 Binary files /dev/null and b/NoteSkins/dance/midi-vivid/Down Hold Head Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-vivid/Down Hold Head Inactive (doubleres).png b/NoteSkins/dance/midi-vivid/Down Hold Head Inactive (doubleres).png new file mode 100644 index 0000000000..6549e6f045 Binary files /dev/null and b/NoteSkins/dance/midi-vivid/Down Hold Head Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-vivid/Down Roll Head Active (doubleres).png b/NoteSkins/dance/midi-vivid/Down Roll Head Active (doubleres).png new file mode 100644 index 0000000000..405856e719 Binary files /dev/null and b/NoteSkins/dance/midi-vivid/Down Roll Head Active (doubleres).png differ diff --git a/NoteSkins/dance/midi-vivid/Down Roll Head Inactive (doubleres).png b/NoteSkins/dance/midi-vivid/Down Roll Head Inactive (doubleres).png new file mode 100644 index 0000000000..31f5758cb3 Binary files /dev/null and b/NoteSkins/dance/midi-vivid/Down Roll Head Inactive (doubleres).png differ diff --git a/NoteSkins/dance/midi-vivid/Down Tap Addition 4x4 (doubleres).png b/NoteSkins/dance/midi-vivid/Down Tap Addition 4x4 (doubleres).png new file mode 100644 index 0000000000..f01905fceb Binary files /dev/null and b/NoteSkins/dance/midi-vivid/Down Tap Addition 4x4 (doubleres).png differ diff --git a/NoteSkins/dance/midi-vivid/Down Tap Addition 4x4.png b/NoteSkins/dance/midi-vivid/Down Tap Addition 4x4.png deleted file mode 100644 index 0552440df3..0000000000 Binary files a/NoteSkins/dance/midi-vivid/Down Tap Addition 4x4.png and /dev/null differ diff --git a/NoteSkins/dance/midi-vivid/Down Tap Note 4x4 (doubleres).png b/NoteSkins/dance/midi-vivid/Down Tap Note 4x4 (doubleres).png new file mode 100644 index 0000000000..4f7741d1b6 Binary files /dev/null and b/NoteSkins/dance/midi-vivid/Down Tap Note 4x4 (doubleres).png differ diff --git a/NoteSkins/dance/midi-vivid/Down Tap Note 4x4.png b/NoteSkins/dance/midi-vivid/Down Tap Note 4x4.png deleted file mode 100644 index 8390fba622..0000000000 Binary files a/NoteSkins/dance/midi-vivid/Down Tap Note 4x4.png and /dev/null differ diff --git a/NoteSkins/dance/midi-vivid/NoteSkin.lua b/NoteSkins/dance/midi-vivid/NoteSkin.lua new file mode 100644 index 0000000000..d705e14592 --- /dev/null +++ b/NoteSkins/dance/midi-vivid/NoteSkin.lua @@ -0,0 +1,117 @@ +-- 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 bb452c9d5f..605569f68b 100644 --- a/NoteSkins/dance/midi-vivid/metrics.ini +++ b/NoteSkins/dance/midi-vivid/metrics.ini @@ -3,6 +3,7 @@ FallbackNoteSkin=midi-note [NoteDisplay] TapNoteAnimationIsVivid=1 +TapAdditionAnimationIsVivid=1 DrawHoldHeadForTapsOnSameRow=1 TapNoteAnimationLength=4 TapAdditionAnimationLength=4 @@ -22,6 +23,8 @@ HoldLetGoGrayPercent=0.125 ReverseDrawOrder=1101 HoldHeadIsAboveWavyParts=1 HoldTailIsAboveWavyParts=1 +TapNoteNoteColorTextureCoordOffsetX=0 +TapNoteNoteColorTextureCoordOffsetY=0 TapNoteAdditionTextureCoordOffsetX=0 TapNoteAdditionTextureCoordOffsetY=0 FlipHeadAndTailWhenReverse=1 @@ -61,6 +64,10 @@ W1Command=blend,'BlendMode_Add';diffuse,1.0,1.0,1.0,0.875;zoom,1;linear,0.06;zoo LetGoCommand=blend,'BlendMode_Add'; HeldCommand=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +[HoldGhostArrow] +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