diff --git a/NoteSkins/dance/lambda/Down Hold Body Active (doubleres).png b/NoteSkins/dance/lambda/Down Hold Body Active (doubleres).png new file mode 100644 index 0000000000..c704bf5998 Binary files /dev/null and b/NoteSkins/dance/lambda/Down Hold Body Active (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Hold Body Inactive (doubleres).png b/NoteSkins/dance/lambda/Down Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..7a538c5222 Binary files /dev/null and b/NoteSkins/dance/lambda/Down Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Hold BottomCap Active (doubleres).png b/NoteSkins/dance/lambda/Down Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..fefd02774b Binary files /dev/null and b/NoteSkins/dance/lambda/Down Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Hold BottomCap Inactive (doubleres).png b/NoteSkins/dance/lambda/Down Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..af1b73d119 Binary files /dev/null and b/NoteSkins/dance/lambda/Down Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Hold Explosion 2x1 (doubleres).png b/NoteSkins/dance/lambda/Down Hold Explosion 2x1 (doubleres).png new file mode 100644 index 0000000000..f23f6839fa Binary files /dev/null and b/NoteSkins/dance/lambda/Down Hold Explosion 2x1 (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Hold TopCap Active (doubleres).png b/NoteSkins/dance/lambda/Down Hold TopCap Active (doubleres).png new file mode 100644 index 0000000000..de7a000ebf Binary files /dev/null and b/NoteSkins/dance/lambda/Down Hold TopCap Active (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Hold TopCap Inactive (doubleres).png b/NoteSkins/dance/lambda/Down Hold TopCap Inactive (doubleres).png new file mode 100644 index 0000000000..4f3ce94520 Binary files /dev/null and b/NoteSkins/dance/lambda/Down Hold TopCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/default/Down Receptor.lua b/NoteSkins/dance/lambda/Down Receptor.lua similarity index 100% rename from NoteSkins/dance/default/Down Receptor.lua rename to NoteSkins/dance/lambda/Down Receptor.lua diff --git a/NoteSkins/dance/lambda/Down Roll Body Active (doubleres).png b/NoteSkins/dance/lambda/Down Roll Body Active (doubleres).png new file mode 100644 index 0000000000..5aca26e9f9 Binary files /dev/null and b/NoteSkins/dance/lambda/Down Roll Body Active (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Roll Body Inactive (doubleres).png b/NoteSkins/dance/lambda/Down Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..0d31dcb733 Binary files /dev/null and b/NoteSkins/dance/lambda/Down Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Roll BottomCap Active (doubleres).png b/NoteSkins/dance/lambda/Down Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..f158e2e95d Binary files /dev/null and b/NoteSkins/dance/lambda/Down Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Roll BottomCap Inactive (doubleres).png b/NoteSkins/dance/lambda/Down Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..a89f54407e Binary files /dev/null and b/NoteSkins/dance/lambda/Down Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Roll TopCap Active (doubleres).png b/NoteSkins/dance/lambda/Down Roll TopCap Active (doubleres).png new file mode 100644 index 0000000000..2569a46118 Binary files /dev/null and b/NoteSkins/dance/lambda/Down Roll TopCap Active (doubleres).png differ diff --git a/NoteSkins/dance/lambda/Down Roll TopCap Inactive (doubleres).png b/NoteSkins/dance/lambda/Down Roll TopCap Inactive (doubleres).png new file mode 100644 index 0000000000..ff948eeda8 Binary files /dev/null and b/NoteSkins/dance/lambda/Down Roll TopCap Inactive (doubleres).png differ diff --git a/NoteSkins/dance/default/Down Tap Explosion Bright.redir b/NoteSkins/dance/lambda/Down Tap Explosion Bright.redir similarity index 100% rename from NoteSkins/dance/default/Down Tap Explosion Bright.redir rename to NoteSkins/dance/lambda/Down Tap Explosion Bright.redir diff --git a/NoteSkins/dance/default/Down Tap Explosion Dim.redir b/NoteSkins/dance/lambda/Down Tap Explosion Dim.redir similarity index 100% rename from NoteSkins/dance/default/Down Tap Explosion Dim.redir rename to NoteSkins/dance/lambda/Down Tap Explosion Dim.redir diff --git a/NoteSkins/dance/lambda/Down Tap Lift.lua b/NoteSkins/dance/lambda/Down Tap Lift.lua new file mode 100644 index 0000000000..3337a1e3ae --- /dev/null +++ b/NoteSkins/dance/lambda/Down Tap Lift.lua @@ -0,0 +1,7 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap lift' ); + InitCommand=cmd(animate,false;pulse;effectclock,"beat";effectmagnitude,0.9,1,1;effectcolor1,color("1,1,1,1");effectcolor2,color("1,1,1,0.8");); + }; +}; +return t; diff --git a/NoteSkins/dance/lambda/Down Tap Mine.lua b/NoteSkins/dance/lambda/Down Tap Mine.lua new file mode 100644 index 0000000000..a489c415c4 --- /dev/null +++ b/NoteSkins/dance/lambda/Down Tap Mine.lua @@ -0,0 +1,9 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture=NOTESKIN:GetPath( '_down', 'tap mine' ); + Frame0000=0; + Delay0000=1; + InitCommand=cmd(spin;effectclock,'beat';effectmagnitude,0,0,-33); + }; +}; +return t; diff --git a/NoteSkins/dance/lambda/Down Tap Note.lua b/NoteSkins/dance/lambda/Down Tap Note.lua new file mode 100644 index 0000000000..2b82ea00ab --- /dev/null +++ b/NoteSkins/dance/lambda/Down Tap Note.lua @@ -0,0 +1,32 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture="_arrow"; + Frame0000=0; + Delay0000=1; + }; + Def.Sprite { + Texture="_circle"; + Frame0000=0; + Delay0000=1; + InitCommand=cmd(y,15;effectclock,"beat";diffuseramp;effectcolor1,color("1,1,1,0.1");effectcolor2,color("1,1,1,0.45");effectoffset,0;zoom,0.5); + }; + Def.Sprite { + Texture="_circle"; + Frame0000=0; + Delay0000=1; + InitCommand=cmd(y,5;effectclock,"beat";diffuseramp;effectcolor1,color("1,1,1,0.1");effectcolor2,color("1,1,1,0.45");effectoffset,0.25;zoom,0.5); + }; + Def.Sprite { + Texture="_circle"; + Frame0000=0; + Delay0000=1; + InitCommand=cmd(y,-5;effectclock,"beat";diffuseramp;effectcolor1,color("1,1,1,0.1");effectcolor2,color("1,1,1,0.45");effectoffset,0.5;zoom,0.5); + }; + Def.Sprite { + Texture="_circle"; + Frame0000=0; + Delay0000=1; + InitCommand=cmd(y,-15;effectclock,"beat";diffuseramp;effectcolor1,color("1,1,1,0.1");effectcolor2,color("1,1,1,0.45");effectoffset,0.75;zoom,0.5); + }; +}; +return t; diff --git a/NoteSkins/dance/lambda/Fallback Explosion.lua b/NoteSkins/dance/lambda/Fallback Explosion.lua new file mode 100644 index 0000000000..5acb24cf13 --- /dev/null +++ b/NoteSkins/dance/lambda/Fallback Explosion.lua @@ -0,0 +1,62 @@ +--If a Command has "NOTESKIN:GetMetricA" in it, that means it gets the command from the metrics.ini, else use cmd(); to define command. +--If you dont know how "NOTESKIN:GetMetricA" works here is an explanation. +--NOTESKIN:GetMetricA("The [Group] in the metrics.ini", "The actual Command to fallback on in the metrics.ini"); + +--The NOTESKIN:LoadActor() just tells us the name of the image the Actor redirects on. +--Oh and if you wonder about the "Button" in the "NOTESKIN:LoadActor( )" it means that it will check for that direction. +--So you dont have to do "Down" or "Up" or "Left" etc for every direction which will save space ;) +local t = Def.ActorFrame { + --Hold Explosion Commands + NOTESKIN:LoadActor( Var "Button", "Hold Explosion" ) .. { + HoldingOnCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOnCommand"); + HoldingOffCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOffCommand"); + InitCommand=cmd(playcommand,"HoldingOff";finishtweening); + }; + --Roll Explosion Commands + NOTESKIN:LoadActor( Var "Button", "Hold Explosion" ) .. { + RollOnCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "RollOnCommand"); + RollOffCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "RollOffCommand"); + InitCommand=cmd(playcommand,"RollOff";finishtweening); + }; + --Dim Explosion Commands + NOTESKIN:LoadActor( Var "Button", "Tap Explosion Dim" ) .. { + InitCommand=cmd(diffusealpha,0); + W5Command=NOTESKIN:GetMetricA("GhostArrowDim", "W5Command"); + W4Command=NOTESKIN:GetMetricA("GhostArrowDim", "W4Command"); + W3Command=NOTESKIN:GetMetricA("GhostArrowDim", "W3Command"); + W2Command=NOTESKIN:GetMetricA("GhostArrowDim", "W2Command"); + W1Command=NOTESKIN:GetMetricA("GhostArrowDim", "W1Command"); + JudgmentCommand=cmd(finishtweening); + BrightCommand=cmd(visible,false); + DimCommand=cmd(visible,true); + }; + --yes yes I know I could do it in another way but I'm lazy and it works doesnt it ;> + --This code give the Hold OK explosion Dim the same images as Bright + NOTESKIN:LoadActor( Var "Button", "Tap Explosion Bright" ) .. { + InitCommand=cmd(diffusealpha,0); + HeldCommand=NOTESKIN:GetMetricA("GhostArrowDim", "HeldCommand"); + JudgmentCommand=cmd(finishtweening); + BrightCommand=cmd(visible,false); + DimCommand=cmd(visible,true); + }; + --Bright Explosion Commands + NOTESKIN:LoadActor( Var "Button", "Tap Explosion Bright" ) .. { + InitCommand=cmd(diffusealpha,0); + W5Command=NOTESKIN:GetMetricA("GhostArrowBright", "W5Command"); + W4Command=NOTESKIN:GetMetricA("GhostArrowBright", "W4Command"); + W3Command=NOTESKIN:GetMetricA("GhostArrowBright", "W3Command"); + W2Command=NOTESKIN:GetMetricA("GhostArrowBright", "W2Command"); + W1Command=NOTESKIN:GetMetricA("GhostArrowBright", "W1Command"); + HeldCommand=NOTESKIN:GetMetricA("GhostArrowBright", "HeldCommand"); + JudgmentCommand=cmd(finishtweening); + BrightCommand=cmd(visible,true); + DimCommand=cmd(visible,false); + + }; + --Mine Explosion Commands + NOTESKIN:LoadActor( Var "Button", "HitMine Explosion" ) .. { + InitCommand=cmd(blend,"BlendMode_Add";diffusealpha,0); + HitMineCommand=NOTESKIN:GetMetricA("GhostArrowBright", "HitMineCommand"); + }; +} +return t; \ No newline at end of file diff --git a/NoteSkins/dance/lambda/NoteSkin.lua b/NoteSkins/dance/lambda/NoteSkin.lua new file mode 100644 index 0000000000..2df51fa790 --- /dev/null +++ b/NoteSkins/dance/lambda/NoteSkin.lua @@ -0,0 +1,79 @@ +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); + + --Point the head files back to the tap note + if string.find(sElement, "Head") or sElement == "Tap Fake" then + sElement = "Tap Note"; + end + + sButton = ret.RedirTable[sButton]; + + return 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, + ["Tap Note"] = true, + ["Tap Lift"] = true, + ["Tap Fake"] = true, + ["Ready Receptor"] = true, + ["Tap Explosion Bright"] = true, + ["Tap Explosion Dim"] = true, + ["Hold Explosion"] = true, + ["Roll Explosion"] = true, + ["Hold Head Active"] = true, + ["Hold Head Inactive"] = true, + ["Roll Head Active"] = true, + ["Roll Head Inactive"] = 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, +}; + +return ret; diff --git a/NoteSkins/dance/lambda/_Down Tap Lift (doubleres).png b/NoteSkins/dance/lambda/_Down Tap Lift (doubleres).png new file mode 100644 index 0000000000..d90a41fc9e Binary files /dev/null and b/NoteSkins/dance/lambda/_Down Tap Lift (doubleres).png differ diff --git a/NoteSkins/dance/lambda/_Down Tap Mine (doubleres).png b/NoteSkins/dance/lambda/_Down Tap Mine (doubleres).png new file mode 100644 index 0000000000..f64809a35a Binary files /dev/null and b/NoteSkins/dance/lambda/_Down Tap Mine (doubleres).png differ diff --git a/NoteSkins/dance/lambda/_arrow 1x8 (res 64x512).png b/NoteSkins/dance/lambda/_arrow 1x8 (res 64x512).png new file mode 100644 index 0000000000..338f587dbc Binary files /dev/null and b/NoteSkins/dance/lambda/_arrow 1x8 (res 64x512).png differ diff --git a/NoteSkins/dance/lambda/_circle (doubleres).png b/NoteSkins/dance/lambda/_circle (doubleres).png new file mode 100644 index 0000000000..476797a673 Binary files /dev/null and b/NoteSkins/dance/lambda/_circle (doubleres).png differ diff --git a/NoteSkins/dance/lambda/_glow (doubleres).png b/NoteSkins/dance/lambda/_glow (doubleres).png new file mode 100644 index 0000000000..7b294489d6 Binary files /dev/null and b/NoteSkins/dance/lambda/_glow (doubleres).png differ diff --git a/NoteSkins/dance/lambda/_receptor (res 64x64).png b/NoteSkins/dance/lambda/_receptor (res 64x64).png new file mode 100644 index 0000000000..5367d5fda5 Binary files /dev/null and b/NoteSkins/dance/lambda/_receptor (res 64x64).png differ diff --git a/NoteSkins/dance/lambda/_rflash (doubleres).png b/NoteSkins/dance/lambda/_rflash (doubleres).png new file mode 100644 index 0000000000..36dd9f527e Binary files /dev/null and b/NoteSkins/dance/lambda/_rflash (doubleres).png differ diff --git a/NoteSkins/dance/lambda/metrics.ini b/NoteSkins/dance/lambda/metrics.ini new file mode 100644 index 0000000000..597ebcceea --- /dev/null +++ b/NoteSkins/dance/lambda/metrics.ini @@ -0,0 +1,77 @@ +[Global] +FallbackNoteSkin=common + +[NoteDisplay] +TapNoteAnimationIsVivid=0 +DrawHoldHeadForTapsOnSameRow=1 +TapNoteAnimationLength=1 // none of these matter because Lua is handling the animation, not sprites. +TapAdditionAnimationLength=1 +TapMineAnimationLength=1 +TapLiftAnimationLength=1 +TapFakeAnimationLength=1 +HoldHeadAnimationLength=1 +HoldTopCapAnimationLength=1 +HoldBottomCapAnimationLength=1 +HoldBodyAnimationLength=1 +HoldTailAnimationLength=1 + +StartDrawingHoldBodyOffsetFromHead=0 +StopDrawingHoldBodyOffsetFromTail=0 + +HoldLetGoGrayPercent=.25 + +HoldHeadIsAboveWavyParts=1 +HoldTailIsAboveWavyParts=1 + +ReverseDrawOrder=1101 +FlipHeadAndTailWhenReverse=1 +FlipHoldBodyWhenReverse=1 + +TapNoteAdditionTextureCoordOffsetX=0 +TapNoteAdditionTextureCoordOffsetY=0 +TapNoteNoteColorTextureCoordSpacingX=0 +TapNoteNoteColorTextureCoordSpacingY=.125 +TapFakeNoteColorTextureCoordSpacingX=0 +TapFakeNoteColorTextureCoordSpacingY=.125 +HoldHeadNoteColorTextureCoordSpacingX=0 +HoldHeadNoteColorTextureCoordSpacingY=.125 + +[GhostArrowDim] +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,JudgmentLineToColor("JudgmentLine_W5");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +W4Command=finishtweening;diffuse,JudgmentLineToColor("JudgmentLine_W4");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +W3Command=finishtweening;diffuse,JudgmentLineToColor("JudgmentLine_W3");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +W2Command=finishtweening;diffuse,JudgmentLineToColor("JudgmentLine_W2");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +W1Command=finishtweening;diffuse,JudgmentLineToColor("JudgmentLine_W1");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +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] +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,JudgmentLineToColor("JudgmentLine_W5");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +W4Command=finishtweening;diffuse,JudgmentLineToColor("JudgmentLine_W4");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +W3Command=finishtweening;diffuse,JudgmentLineToColor("JudgmentLine_W3");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +W2Command=finishtweening;diffuse,JudgmentLineToColor("JudgmentLine_W2");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +W1Command=finishtweening;diffuse,JudgmentLineToColor("JudgmentLine_W1");diffusealpha,1;sleep,.1;decelerate,.2;diffusealpha,0;zoom,1.1; +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] +HoldingOnCommand=diffusealpha,1;glowshift;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,.7");effectperiod,.1 +HoldingOffCommand=diffusealpha,0 +InitCommand=finishtweening;playcommand,"HoldingOff" + +[ReceptorArrow] +InitCommand=effectclock,"beat";diffuseramp;effectcolor1,color(".8,.8,.8,1");effectcolor2,color("1,1,1,1");effecttiming,.2,0,.8,0;effectoffset,.05 +NoneCommand=finishtweening;zoom,.85;diffusealpha,.9;linear,.11;diffusealpha,1;zoom,1 + +[ReceptorOverlay] +InitCommand=diffusealpha,0 +PressCommand=finishtweening;zoom,1;blend,"BlendMode_Add";diffusealpha,.8;decelerate,0.2;diffusealpha,0.4 +LiftCommand=stoptweening;decelerate,.2;diffusealpha,0;zoom,1.2 diff --git a/NoteSkins/dance/default/Down Hold Body Active (doubleres).png b/NoteSkins/dance/sm5-default/Down Hold Body Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold Body Active (doubleres).png rename to NoteSkins/dance/sm5-default/Down Hold Body Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold Body Inactive (doubleres).png b/NoteSkins/dance/sm5-default/Down Hold Body Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold Body Inactive (doubleres).png rename to NoteSkins/dance/sm5-default/Down Hold Body Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold BottomCap Active (doubleres).png b/NoteSkins/dance/sm5-default/Down Hold BottomCap Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold BottomCap Active (doubleres).png rename to NoteSkins/dance/sm5-default/Down Hold BottomCap Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold BottomCap Inactive (doubleres).png b/NoteSkins/dance/sm5-default/Down Hold BottomCap Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold BottomCap Inactive (doubleres).png rename to NoteSkins/dance/sm5-default/Down Hold BottomCap Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold TopCap Active (doubleres).png b/NoteSkins/dance/sm5-default/Down Hold TopCap Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold TopCap Active (doubleres).png rename to NoteSkins/dance/sm5-default/Down Hold TopCap Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Hold TopCap Inactive (doubleres).png b/NoteSkins/dance/sm5-default/Down Hold TopCap Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Hold TopCap Inactive (doubleres).png rename to NoteSkins/dance/sm5-default/Down Hold TopCap Inactive (doubleres).png diff --git a/NoteSkins/dance/sm5-default/Down Receptor.lua b/NoteSkins/dance/sm5-default/Down Receptor.lua new file mode 100644 index 0000000000..eda1a4c957 --- /dev/null +++ b/NoteSkins/dance/sm5-default/Down Receptor.lua @@ -0,0 +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; diff --git a/NoteSkins/dance/default/Down Roll Body Active (doubleres).png b/NoteSkins/dance/sm5-default/Down Roll Body Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll Body Active (doubleres).png rename to NoteSkins/dance/sm5-default/Down Roll Body Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll Body Inactive (doubleres).png b/NoteSkins/dance/sm5-default/Down Roll Body Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll Body Inactive (doubleres).png rename to NoteSkins/dance/sm5-default/Down Roll Body Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll BottomCap Active (doubleres).png b/NoteSkins/dance/sm5-default/Down Roll BottomCap Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll BottomCap Active (doubleres).png rename to NoteSkins/dance/sm5-default/Down Roll BottomCap Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll BottomCap Inactive (doubleres).png b/NoteSkins/dance/sm5-default/Down Roll BottomCap Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll BottomCap Inactive (doubleres).png rename to NoteSkins/dance/sm5-default/Down Roll BottomCap Inactive (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll TopCap Active (doubleres).png b/NoteSkins/dance/sm5-default/Down Roll TopCap Active (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll TopCap Active (doubleres).png rename to NoteSkins/dance/sm5-default/Down Roll TopCap Active (doubleres).png diff --git a/NoteSkins/dance/default/Down Roll TopCap Inactive (doubleres).png b/NoteSkins/dance/sm5-default/Down Roll TopCap Inactive (doubleres).png similarity index 100% rename from NoteSkins/dance/default/Down Roll TopCap Inactive (doubleres).png rename to NoteSkins/dance/sm5-default/Down Roll TopCap Inactive (doubleres).png diff --git a/NoteSkins/dance/sm5-default/Down Tap Explosion Bright.redir b/NoteSkins/dance/sm5-default/Down Tap Explosion Bright.redir new file mode 100644 index 0000000000..4235e12eba --- /dev/null +++ b/NoteSkins/dance/sm5-default/Down Tap Explosion Bright.redir @@ -0,0 +1 @@ +_glow \ No newline at end of file diff --git a/NoteSkins/dance/sm5-default/Down Tap Explosion Dim.redir b/NoteSkins/dance/sm5-default/Down Tap Explosion Dim.redir new file mode 100644 index 0000000000..9bef57edb4 --- /dev/null +++ b/NoteSkins/dance/sm5-default/Down Tap Explosion Dim.redir @@ -0,0 +1 @@ +Down Tap Explosion Bright \ No newline at end of file diff --git a/NoteSkins/dance/default/Down Tap Lift.lua b/NoteSkins/dance/sm5-default/Down Tap Lift.lua similarity index 100% rename from NoteSkins/dance/default/Down Tap Lift.lua rename to NoteSkins/dance/sm5-default/Down Tap Lift.lua diff --git a/NoteSkins/dance/default/Down Tap Note.lua b/NoteSkins/dance/sm5-default/Down Tap Note.lua similarity index 100% rename from NoteSkins/dance/default/Down Tap Note.lua rename to NoteSkins/dance/sm5-default/Down Tap Note.lua diff --git a/NoteSkins/dance/default/NoteSkin.lua b/NoteSkins/dance/sm5-default/NoteSkin.lua similarity index 100% rename from NoteSkins/dance/default/NoteSkin.lua rename to NoteSkins/dance/sm5-default/NoteSkin.lua diff --git a/NoteSkins/dance/default/_arrow 1x8 (doubleres).png b/NoteSkins/dance/sm5-default/_arrow 1x8 (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_arrow 1x8 (doubleres).png rename to NoteSkins/dance/sm5-default/_arrow 1x8 (doubleres).png diff --git a/NoteSkins/dance/default/_circle (doubleres).png b/NoteSkins/dance/sm5-default/_circle (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_circle (doubleres).png rename to NoteSkins/dance/sm5-default/_circle (doubleres).png diff --git a/NoteSkins/dance/default/_glow (doubleres).png b/NoteSkins/dance/sm5-default/_glow (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_glow (doubleres).png rename to NoteSkins/dance/sm5-default/_glow (doubleres).png diff --git a/NoteSkins/dance/default/_receptor (doubleres).png b/NoteSkins/dance/sm5-default/_receptor (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_receptor (doubleres).png rename to NoteSkins/dance/sm5-default/_receptor (doubleres).png diff --git a/NoteSkins/dance/default/_rflash (doubleres).png b/NoteSkins/dance/sm5-default/_rflash (doubleres).png similarity index 100% rename from NoteSkins/dance/default/_rflash (doubleres).png rename to NoteSkins/dance/sm5-default/_rflash (doubleres).png diff --git a/NoteSkins/dance/default/metrics.ini b/NoteSkins/dance/sm5-default/metrics.ini similarity index 100% rename from NoteSkins/dance/default/metrics.ini rename to NoteSkins/dance/sm5-default/metrics.ini diff --git a/Themes/_fallback/base._ini b/Themes/_fallback/base._ini index a99f3a7104..b623bd8050 100644 --- a/Themes/_fallback/base._ini +++ b/Themes/_fallback/base._ini @@ -7,9 +7,9 @@ ColorP1Command=diffuse,PlayerColor(PLAYER_1) ColorP2Command=diffuse,PlayerColor(PLAYER_2) InitialScreen="ScreenCompany" FirstAttractScreen="ScreenCompany" -DefaultModifiers="default;1.5x" +DefaultModifiers="cel;1.5x" DefaultCpuModifiers="" -DefaultNoteSkinName="default" +DefaultNoteSkinName="cel" DifficultiesToShow="beginner,easy,medium,hard,challenge" CourseDifficultiesToShow="easy,medium,hard" StepsTypesToHide="dance-couple,dance-solo,pump-halfdouble,lights-cabinet" diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 7d8bebd7ff..0aee3e651f 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -30,7 +30,7 @@ AutoSetStyle=false # Default modifiers and noteskin. DefaultModifiers="1x" -DefaultNoteSkinName="default" +DefaultNoteSkinName="cel" # Difficulties to show. Useful for custom games where you want to hide these. DifficultiesToShow="beginner,easy,medium,hard,challenge"