diff --git a/NoteSkins/dance/default/Down Hold Body Active (res 64x32).png b/NoteSkins/dance/default/Down Hold Body Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold Body Active (res 64x32).png rename to NoteSkins/dance/default/Down Hold Body Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold Body Inactive (res 64x32).png b/NoteSkins/dance/default/Down Hold Body Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold Body Inactive (res 64x32).png rename to NoteSkins/dance/default/Down Hold Body Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold BottomCap Active (res 64x32).png b/NoteSkins/dance/default/Down Hold BottomCap Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold BottomCap Active (res 64x32).png rename to NoteSkins/dance/default/Down Hold BottomCap Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold BottomCap Inactive (res 64x32).png b/NoteSkins/dance/default/Down Hold BottomCap Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold BottomCap Inactive (res 64x32).png rename to NoteSkins/dance/default/Down Hold BottomCap Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold TopCap Active (res 64x32).png b/NoteSkins/dance/default/Down Hold TopCap Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold TopCap Active (res 64x32).png rename to NoteSkins/dance/default/Down Hold TopCap Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold TopCap Inactive (res 64x32).png b/NoteSkins/dance/default/Down Hold TopCap Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold TopCap Inactive (res 64x32).png rename to NoteSkins/dance/default/Down Hold TopCap Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Receptor.lua b/NoteSkins/dance/default/Down Receptor.lua index aaeb0937e8..eda1a4c957 100644 --- a/NoteSkins/dance/default/Down Receptor.lua +++ b/NoteSkins/dance/default/Down Receptor.lua @@ -1,19 +1,19 @@ -local t = Def.ActorFrame { - Def.Sprite { - Texture="_receptor"; - Frame0000=0; - Delay0000=1; - InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); - NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); - }; - Def.Sprite { - Texture="_rflash"; - Frame0000=0; - Delay0000=1; - InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); - PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); - LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); - NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); - }; -}; -return t; +local t = Def.ActorFrame { + Def.Sprite { + Texture="_receptor"; + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; + Def.Sprite { + Texture="_rflash"; + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'InitCommand'); + PressCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'PressCommand'); + LiftCommand=NOTESKIN:GetMetricA('ReceptorOverlay', 'LiftCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; +}; +return t; diff --git a/NoteSkins/dance/default/Down Roll Body Active (res 64x32).png b/NoteSkins/dance/default/Down Roll Body Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll Body Active (res 64x32).png rename to NoteSkins/dance/default/Down Roll Body Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll Body Inactive (res 64x32).png b/NoteSkins/dance/default/Down Roll Body Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll Body Inactive (res 64x32).png rename to NoteSkins/dance/default/Down Roll Body Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll BottomCap Active (res 64x32).png b/NoteSkins/dance/default/Down Roll BottomCap Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll BottomCap Active (res 64x32).png rename to NoteSkins/dance/default/Down Roll BottomCap Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll BottomCap Inactive (res 64x32).png b/NoteSkins/dance/default/Down Roll BottomCap Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll BottomCap Inactive (res 64x32).png rename to NoteSkins/dance/default/Down Roll BottomCap Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll TopCap Active (res 64x32).png b/NoteSkins/dance/default/Down Roll TopCap Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll TopCap Active (res 64x32).png rename to NoteSkins/dance/default/Down Roll TopCap Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll TopCap Inactive (res 64x32).png b/NoteSkins/dance/default/Down Roll TopCap Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll TopCap Inactive (res 64x32).png rename to NoteSkins/dance/default/Down Roll TopCap Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Tap Lift.lua b/NoteSkins/dance/default/Down Tap Lift.lua index 1574106d6a..ac6a010454 100644 --- a/NoteSkins/dance/default/Down Tap Lift.lua +++ b/NoteSkins/dance/default/Down Tap Lift.lua @@ -1,17 +1,9 @@ --- from midi's skin 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")); + Texture="_arrow"; + Frame0000=7; + Delay0000=1; + InitCommand=cmd(animate,false;pulse;effectclock,"beat";effectmagnitude,0.9,1,1); }; }; return t; diff --git a/NoteSkins/dance/default/NoteSkin.lua b/NoteSkins/dance/default/NoteSkin.lua index c628ac5e79..54e2176a2e 100644 --- a/NoteSkins/dance/default/NoteSkin.lua +++ b/NoteSkins/dance/default/NoteSkin.lua @@ -42,6 +42,7 @@ ret.PartsToRotate = { ["Receptor"] = true, ["Tap Note"] = true, + ["Tap Lift"] = true, ["Tap Fake"] = true, ["Ready Receptor"] = true, ["Tap Explosion Bright"] = true, @@ -75,4 +76,4 @@ ret.Blank = ["Roll Tail Inactive"] = true, }; -return ret; \ No newline at end of file +return ret; diff --git a/NoteSkins/dance/default/_Down Lift Fill 4x1.png b/NoteSkins/dance/default/_Down Lift Fill 4x1.png deleted file mode 100644 index 8080f3f981..0000000000 Binary files a/NoteSkins/dance/default/_Down Lift Fill 4x1.png and /dev/null differ diff --git a/NoteSkins/dance/default/_Down Tap Lift.png b/NoteSkins/dance/default/_Down Tap Lift.png deleted file mode 100644 index 645dabe06a..0000000000 Binary files a/NoteSkins/dance/default/_Down Tap Lift.png and /dev/null differ diff --git a/NoteSkins/dance/default/_arrow 1x8 (res 64x512).png b/NoteSkins/dance/default/_arrow 1x8 (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_arrow 1x8 (res 64x512).png rename to NoteSkins/dance/default/_arrow 1x8 (doubleres).png diff --git a/NoteSkins/dance/default/_circle (res 8x8).png b/NoteSkins/dance/default/_circle (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_circle (res 8x8).png rename to NoteSkins/dance/default/_circle (doubleres).png diff --git a/NoteSkins/dance/default/_glow (doubleres).png b/NoteSkins/dance/default/_glow (doubleres).png new file mode 100644 index 0000000000..c1f30b3312 Binary files /dev/null and b/NoteSkins/dance/default/_glow (doubleres).png differ diff --git a/NoteSkins/dance/default/_glow (res 64x64).png b/NoteSkins/dance/default/_glow (res 64x64).png deleted file mode 100644 index e748409407..0000000000 Binary files a/NoteSkins/dance/default/_glow (res 64x64).png and /dev/null differ diff --git a/NoteSkins/dance/default/_receptor (res 64x64).png b/NoteSkins/dance/default/_receptor (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_receptor (res 64x64).png rename to NoteSkins/dance/default/_receptor (doubleres).png diff --git a/NoteSkins/dance/default/_rflash (res 74x74).png b/NoteSkins/dance/default/_rflash (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_rflash (res 74x74).png rename to NoteSkins/dance/default/_rflash (doubleres).png diff --git a/NoteSkins/dance/default/metrics.ini b/NoteSkins/dance/default/metrics.ini index 31db6e3d81..9ba2b98feb 100644 --- a/NoteSkins/dance/default/metrics.ini +++ b/NoteSkins/dance/default/metrics.ini @@ -2,7 +2,7 @@ FallbackNoteSkin=common [NoteDisplay] -TapNoteAnimationIsVivid=1 +TapNoteAnimationIsVivid=0 DrawHoldHeadForTapsOnSameRow=1 TapNoteAnimationLengthInBeats=1 // none of these matter because Lua is handling the animation, not sprites. TapAdditionAnimationLengthInBeats=1 @@ -38,12 +38,12 @@ InitCommand= NoneCommand= HitMineCommand=finishtweening;blend,'BlendMode_Add';diffuse,color("1,1,1,1;zoom,1;rotationz,0;decelerate,.3;rotationz,90;linear,.3;rotationz,180;diffusealpha,0 MissCommand= -W5Command=finishtweening;diffuse,color("1,.5,1,1");sleep,.1;decelerate,.4;diffusealpha,0 -W4Command=finishtweening;diffuse,color(".5,1,1,1");sleep,.1;decelerate,.4;diffusealpha,0 -W3Command=finishtweening;diffuse,color(".5,1,.75,1");sleep,.1;decelerate,.4;diffusealpha,0 -W2Command=finishtweening;diffuse,color("1,1,.85,1");sleep,.1;decelerate,.4;diffusealpha,0 -W1Command=finishtweening;diffuse,color("1,1,1,1");sleep,.1;decelerate,.4;diffusealpha,0 -LetGoCommand=finishtweening;decelerate,.1;diffusealpha,0; +W5Command=finishtweening;diffuse,color("1,.5,1,1");sleep,.1;decelerate,.5;diffusealpha,0 +W4Command=finishtweening;diffuse,color(".5,1,1,1");sleep,.1;decelerate,.5;diffusealpha,0 +W3Command=finishtweening;diffuse,color(".5,1,.75,1");sleep,.1;decelerate,.5;diffusealpha,0 +W2Command=finishtweening;diffuse,color("1,1,.85,1");sleep,.1;decelerate,.5;diffusealpha,0 +W1Command=finishtweening;diffuse,color("1,1,1,1");sleep,.1;decelerate,.5;diffusealpha,0 +LetGoCommand=stoptweening;decelerate,.2;diffusealpha,0; HeldCommand=finishtweening;diffuse,color("1,1,1,1");zoom,1;linear,.2;zoom,.9;linear,.1;diffusealpha,0 [GhostArrowBright] @@ -51,12 +51,12 @@ InitCommand= NoneCommand= HitMineCommand=finishtweening;blend,'BlendMode_Add';diffuse,color("1,1,1,1");zoom,1;rotationz,0;decelerate,.3;rotationz,90;linear,.3;rotationz,180;diffusealpha,0 MissCommand= -W5Command=finishtweening;diffuse,color("1,.6,1,1");sleep,.1;decelerate,.4;diffusealpha,0 -W4Command=finishtweening;diffuse,color(".6,1,1,1");sleep,.1;decelerate,.4;diffusealpha,0 -W3Command=finishtweening;diffuse,color(".6,1,.8,1");sleep,.1;decelerate,.4;diffusealpha,0 -W2Command=finishtweening;diffuse,color("1,1,.9,1");sleep,.1;decelerate,.4;diffusealpha,0 -W1Command=finishtweening;diffuse,color("1,1,1,1");sleep,.1;decelerate,.4;diffusealpha,0 -LetGoCommand= +W5Command=finishtweening;diffuse,color("1,.6,1,1");sleep,.1;decelerate,.5;diffusealpha,0 +W4Command=finishtweening;diffuse,color(".6,1,1,1");sleep,.1;decelerate,.5;diffusealpha,0 +W3Command=finishtweening;diffuse,color(".6,1,.8,1");sleep,.1;decelerate,.5;diffusealpha,0 +W2Command=finishtweening;diffuse,color("1,1,.9,1");sleep,.1;decelerate,.5;diffusealpha,0 +W1Command=finishtweening;diffuse,color("1,1,1,1");sleep,.1;decelerate,.5;diffusealpha,0 +LetGoCommand=stoptweening;decelerate,.2;diffusealpha,0; HeldCommand=finishtweening;diffuse,color("1,1,1,1");zoom,1;linear,.2;zoom,.9;linear,.1;diffusealpha,0 [HoldGhostArrow] @@ -70,5 +70,5 @@ NoneCommand=finishtweening;zoom,.85;diffusealpha,.9;linear,.11;diffusealpha,1;zo [ReceptorOverlay] InitCommand=diffusealpha,0 -PressCommand=finishtweening;zoom,1;blend,"BlendMode_Add";diffusealpha,.6 -LiftCommand=finishtweening;decelerate,.12;diffusealpha,0;zoom,1.2 \ No newline at end of file +PressCommand=finishtweening;zoom,1;blend,"BlendMode_Add";diffusealpha,.8;decelerate,0.2;diffusealpha,0.4 +LiftCommand=stoptweening;decelerate,.2;diffusealpha,0;zoom,1.2 \ No newline at end of file