diff --git a/NoteSkins/kickbox/default/AnyLeftFist Explosion.lua b/NoteSkins/kickbox/default/AnyLeftFist Explosion.lua new file mode 100644 index 0000000000..091a5748b8 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFist Explosion.lua @@ -0,0 +1,5 @@ +local t = LoadActor("AnyRightFist Explosion") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/AnyLeftFist Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFist Hold Body Active (doubleres).png new file mode 100644 index 0000000000..f8d38093cc Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFist Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFist Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFist Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..27a16473b5 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFist Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFist Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFist Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..ee11ba1f7e Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFist Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFist Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFist Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..6c13aab879 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFist Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFist Hold Head Active.lua b/NoteSkins/kickbox/default/AnyLeftFist Hold Head Active.lua new file mode 100644 index 0000000000..6860d80e16 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFist Hold Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFist','Hold Head Active'); + InitCommand=cmd(basezoomx,-1); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyLeftFist Hold Head Inactive.lua b/NoteSkins/kickbox/default/AnyLeftFist Hold Head Inactive.lua new file mode 100644 index 0000000000..1f7b9e7ae8 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFist Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFist','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyLeftFist Receptor.lua b/NoteSkins/kickbox/default/AnyLeftFist Receptor.lua new file mode 100644 index 0000000000..02c21a986a --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFist Receptor.lua @@ -0,0 +1,5 @@ +local t = LoadActor("AnyRightFist Receptor") .. { + InitCommand=cmd(zoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/AnyLeftFist Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFist Roll Body Active (doubleres).png new file mode 100644 index 0000000000..a72adc84c0 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFist Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFist Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFist Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..1c1c24ac56 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFist Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFist Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFist Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..d37a6f7922 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFist Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFist Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFist Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..97a53f1339 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFist Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFist Roll Head Active.lua b/NoteSkins/kickbox/default/AnyLeftFist Roll Head Active.lua new file mode 100644 index 0000000000..3c7a58b5c4 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFist Roll Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFist','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyLeftFist Roll Head Inactive.lua b/NoteSkins/kickbox/default/AnyLeftFist Roll Head Inactive.lua new file mode 100644 index 0000000000..f78715a86b --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFist Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFist','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyLeftFist Tap Lift.lua b/NoteSkins/kickbox/default/AnyLeftFist Tap Lift.lua new file mode 100644 index 0000000000..69436f46e1 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFist Tap Lift.lua @@ -0,0 +1,5 @@ +local t = LoadActor("AnyRightFist Tap Lift") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/AnyLeftFist tap note.lua b/NoteSkins/kickbox/default/AnyLeftFist tap note.lua new file mode 100644 index 0000000000..2b684618ac --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFist tap note.lua @@ -0,0 +1,5 @@ +local t = LoadActor("AnyRightFist tap Note") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Explosion.lua b/NoteSkins/kickbox/default/AnyLeftFoot Explosion.lua new file mode 100644 index 0000000000..d5a4101423 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFoot Explosion.lua @@ -0,0 +1,5 @@ +local t = LoadActor("AnyRightFoot Explosion") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFoot Hold Body Active (doubleres).png new file mode 100644 index 0000000000..c6d425f298 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFoot Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFoot Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..14494e82c4 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFoot Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFoot Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..66949fc088 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFoot Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFoot Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..f88bc86cfa Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFoot Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Hold Head Active.lua b/NoteSkins/kickbox/default/AnyLeftFoot Hold Head Active.lua new file mode 100644 index 0000000000..c1d9bb879a --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFoot Hold Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFoot','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Hold Head Inactive.lua b/NoteSkins/kickbox/default/AnyLeftFoot Hold Head Inactive.lua new file mode 100644 index 0000000000..6e40567184 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFoot Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFoot','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Receptor.lua b/NoteSkins/kickbox/default/AnyLeftFoot Receptor.lua new file mode 100644 index 0000000000..9ea311f4bb --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFoot Receptor.lua @@ -0,0 +1,5 @@ +local t = LoadActor("AnyRightFoot Receptor") .. { + InitCommand=cmd(zoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFoot Roll Body Active (doubleres).png new file mode 100644 index 0000000000..b001771a70 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFoot Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFoot Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..c6fb7b60f7 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFoot Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFoot Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..268a56e789 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFoot Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyLeftFoot Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..b361a4a42d Binary files /dev/null and b/NoteSkins/kickbox/default/AnyLeftFoot Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Roll Head Active.lua b/NoteSkins/kickbox/default/AnyLeftFoot Roll Head Active.lua new file mode 100644 index 0000000000..f5254f25ce --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFoot Roll Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFoot','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Roll Head Inactive.lua b/NoteSkins/kickbox/default/AnyLeftFoot Roll Head Inactive.lua new file mode 100644 index 0000000000..048ce0d90b --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFoot Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFoot','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyLeftFoot Tap Lift.lua b/NoteSkins/kickbox/default/AnyLeftFoot Tap Lift.lua new file mode 100644 index 0000000000..2adf78c28b --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFoot Tap Lift.lua @@ -0,0 +1,5 @@ +local t = LoadActor("AnyRightFoot Tap Lift") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/AnyLeftFoot tap note.lua b/NoteSkins/kickbox/default/AnyLeftFoot tap note.lua new file mode 100644 index 0000000000..c3cb6b2b34 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyLeftFoot tap note.lua @@ -0,0 +1,5 @@ +local t = LoadActor("AnyRightFoot tap Note") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/AnyRightFist Explosion.lua b/NoteSkins/kickbox/default/AnyRightFist Explosion.lua new file mode 100644 index 0000000000..1c4a2c1c90 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFist Explosion.lua @@ -0,0 +1,29 @@ +local t = Def.ActorFrame { + LoadActor( "_AnyRightFist Hold Explosion" ) .. { + HoldingOnCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOnCommand"); + HoldingOffCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOffCommand"); + InitCommand=cmd(playcommand,"HoldingOff";finishtweening); + }; + LoadActor( "_AnyRightFist Roll Explosion" ) .. { + RollOnCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "RollOnCommand"); + RollOffCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "RollOffCommand"); + InitCommand=cmd(playcommand,"RollOff";finishtweening); + }; + LoadActor( "_AnyRightFist 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"); + HeldCommand=NOTESKIN:GetMetricA("GhostArrowDim", "HeldCommand"); + JudgmentCommand=cmd(finishtweening); + BrightCommand=cmd(visible,false); + DimCommand=cmd(visible,true); + }; + LoadActor( "AnyRightFist HitMine Explosion" ) .. { + InitCommand=cmd(blend,"BlendMode_Add";diffusealpha,0); + HitMineCommand=NOTESKIN:GetMetricA("GhostArrowBright", "HitMineCommand"); + }; +} +return t; diff --git a/NoteSkins/kickbox/default/AnyRightFist HitMine Explosion.redir b/NoteSkins/kickbox/default/AnyRightFist HitMine Explosion.redir new file mode 100644 index 0000000000..42966e5ea3 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFist HitMine Explosion.redir @@ -0,0 +1 @@ +Fallback HitMine Explosion \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFist Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist Hold Body Active (doubleres).png new file mode 100644 index 0000000000..f8d38093cc Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFist Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..27a16473b5 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFist Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..9f7bef91a6 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFist Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..48b7f39d65 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFist Hold Head Active.redir b/NoteSkins/kickbox/default/AnyRightFist Hold Head Active.redir new file mode 100644 index 0000000000..4b94e621e2 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFist Hold Head Active.redir @@ -0,0 +1 @@ +AnyRightFist tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFist Hold Head Inactive.lua b/NoteSkins/kickbox/default/AnyRightFist Hold Head Inactive.lua new file mode 100644 index 0000000000..1da889831b --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFist Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFist','Roll Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFist Receptor.lua b/NoteSkins/kickbox/default/AnyRightFist Receptor.lua new file mode 100644 index 0000000000..b02bcff4bf --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFist Receptor.lua @@ -0,0 +1,19 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture="_AnyRightFist receptor underlay"; + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; + Def.Sprite { + Texture="_AnyRightFist receptor frame"; + 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/kickbox/default/AnyRightFist Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist Roll Body Active (doubleres).png new file mode 100644 index 0000000000..6357ddf13e Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFist Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..7018cca581 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFist Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..0fc3e30726 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFist Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..7e2ba13d7a Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFist Roll Head Active.redir b/NoteSkins/kickbox/default/AnyRightFist Roll Head Active.redir new file mode 100644 index 0000000000..4b94e621e2 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFist Roll Head Active.redir @@ -0,0 +1 @@ +AnyRightFist tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFist Roll Head Inactive.lua b/NoteSkins/kickbox/default/AnyRightFist Roll Head Inactive.lua new file mode 100644 index 0000000000..1da889831b --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFist Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFist','Roll Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFist Tap Lift.lua b/NoteSkins/kickbox/default/AnyRightFist Tap Lift.lua new file mode 100644 index 0000000000..df2bf160a9 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFist Tap Lift.lua @@ -0,0 +1,10 @@ +local t = Def.ActorFrame { + InitCommand=cmd(pulse;effectclock,'beat';effectmagnitude,1,1.2,1); + Def.Sprite { + Texture=NOTESKIN:GetPath( '_AnyRightFist', 'tap lift' ); + Frame0000=0; + Delay0000=1; + InitCommand=cmd(diffuseramp;effectclock,'beat';effectcolor1,color("1,1,1,1");effectcolor2,color("1,1,1,0.5")); + }; +}; +return t; diff --git a/NoteSkins/kickbox/default/AnyRightFist tap Note (doubleres).png b/NoteSkins/kickbox/default/AnyRightFist tap Note (doubleres).png new file mode 100644 index 0000000000..c973d2d61a Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFist tap Note (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Explosion.lua b/NoteSkins/kickbox/default/AnyRightFoot Explosion.lua new file mode 100644 index 0000000000..d6626a9543 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFoot Explosion.lua @@ -0,0 +1,29 @@ +local t = Def.ActorFrame { + LoadActor( "_AnyRightFoot Hold Explosion" ) .. { + HoldingOnCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOnCommand"); + HoldingOffCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "HoldingOffCommand"); + InitCommand=cmd(playcommand,"HoldingOff";finishtweening); + }; + LoadActor( "_AnyRightFoot Roll Explosion" ) .. { + RollOnCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "RollOnCommand"); + RollOffCommand=NOTESKIN:GetMetricA("HoldGhostArrow", "RollOffCommand"); + InitCommand=cmd(playcommand,"RollOff";finishtweening); + }; + LoadActor( "_AnyRightFoot 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"); + HeldCommand=NOTESKIN:GetMetricA("GhostArrowDim", "HeldCommand"); + JudgmentCommand=cmd(finishtweening); + BrightCommand=cmd(visible,false); + DimCommand=cmd(visible,true); + }; + LoadActor( "AnyRightFoot HitMine Explosion" ) .. { + InitCommand=cmd(blend,"BlendMode_Add";diffusealpha,0); + HitMineCommand=NOTESKIN:GetMetricA("GhostArrowBright", "HitMineCommand"); + }; +} +return t; diff --git a/NoteSkins/kickbox/default/AnyRightFoot HitMine Explosion.redir b/NoteSkins/kickbox/default/AnyRightFoot HitMine Explosion.redir new file mode 100644 index 0000000000..42966e5ea3 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFoot HitMine Explosion.redir @@ -0,0 +1 @@ +Fallback HitMine Explosion \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFoot Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot Hold Body Active (doubleres).png new file mode 100644 index 0000000000..2edfc9edcc Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..e0ce58df3f Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..ff1c84141d Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..59a3396f10 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Hold Head Active.redir b/NoteSkins/kickbox/default/AnyRightFoot Hold Head Active.redir new file mode 100644 index 0000000000..7b3cc70420 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFoot Hold Head Active.redir @@ -0,0 +1 @@ +AnyRightFoot tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFoot Hold Head Inactive.redir b/NoteSkins/kickbox/default/AnyRightFoot Hold Head Inactive.redir new file mode 100644 index 0000000000..7b3cc70420 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFoot Hold Head Inactive.redir @@ -0,0 +1 @@ +AnyRightFoot tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFoot Receptor.lua b/NoteSkins/kickbox/default/AnyRightFoot Receptor.lua new file mode 100644 index 0000000000..e22d359884 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFoot Receptor.lua @@ -0,0 +1,19 @@ +local t = Def.ActorFrame { + Def.Sprite { + Texture="_AnyRightFoot receptor underlay"; + Frame0000=0; + Delay0000=1; + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; + Def.Sprite { + Texture="_AnyRightFoot receptor frame"; + 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/kickbox/default/AnyRightFoot Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot Roll Body Active (doubleres).png new file mode 100644 index 0000000000..442a9af6d5 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..62d6829cd3 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..1f9213caca Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..4c215082a6 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/AnyRightFoot Roll Head Active.redir b/NoteSkins/kickbox/default/AnyRightFoot Roll Head Active.redir new file mode 100644 index 0000000000..7b3cc70420 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFoot Roll Head Active.redir @@ -0,0 +1 @@ +AnyRightFoot tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFoot Roll Head Inactive.lua b/NoteSkins/kickbox/default/AnyRightFoot Roll Head Inactive.lua new file mode 100644 index 0000000000..ef274ab9f3 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFoot Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('AnyRightFoot','Roll Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/AnyRightFoot Tap Lift.lua b/NoteSkins/kickbox/default/AnyRightFoot Tap Lift.lua new file mode 100644 index 0000000000..af6974d334 --- /dev/null +++ b/NoteSkins/kickbox/default/AnyRightFoot Tap Lift.lua @@ -0,0 +1,10 @@ +local t = Def.ActorFrame { + InitCommand=cmd(pulse;effectclock,'beat';effectmagnitude,1,1.2,1); + Def.Sprite { + Texture=NOTESKIN:GetPath( '_AnyRightFoot', 'tap lift' ); + Frame0000=0; + Delay0000=1; + InitCommand=cmd(diffuseramp;effectclock,'beat';effectcolor1,color("1,1,1,1");effectcolor2,color("1,1,1,0.5")); + }; +}; +return t; diff --git a/NoteSkins/kickbox/default/AnyRightFoot tap note (doubleres).png b/NoteSkins/kickbox/default/AnyRightFoot tap note (doubleres).png new file mode 100644 index 0000000000..6cc60d40d3 Binary files /dev/null and b/NoteSkins/kickbox/default/AnyRightFoot tap note (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/DownLeftFist Hold Body Active (doubleres).png new file mode 100644 index 0000000000..db01049885 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFist Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/DownLeftFist Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..27a16473b5 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFist Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/DownLeftFist Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..3972aee3e0 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFist Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/DownLeftFist Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..6c13aab879 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFist Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Hold Head Active.lua b/NoteSkins/kickbox/default/DownLeftFist Hold Head Active.lua new file mode 100644 index 0000000000..546daeca87 --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFist Hold Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFist','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownLeftFist Hold Head Inactive.lua b/NoteSkins/kickbox/default/DownLeftFist Hold Head Inactive.lua new file mode 100644 index 0000000000..58b947ade3 --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFist Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFist','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownLeftFist Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/DownLeftFist Roll Body Active (doubleres).png new file mode 100644 index 0000000000..80a697aaa0 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFist Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/DownLeftFist Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..1c1c24ac56 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFist Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/DownLeftFist Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..5fbd74b81e Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFist Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/DownLeftFist Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..97a53f1339 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFist Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFist Roll Head Active.lua b/NoteSkins/kickbox/default/DownLeftFist Roll Head Active.lua new file mode 100644 index 0000000000..ffc18da6b2 --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFist Roll Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFist','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownLeftFist Roll Head Inactive.lua b/NoteSkins/kickbox/default/DownLeftFist Roll Head Inactive.lua new file mode 100644 index 0000000000..dd9179c9d5 --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFist Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFist','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownLeftFist tap note.lua b/NoteSkins/kickbox/default/DownLeftFist tap note.lua new file mode 100644 index 0000000000..0da60031f1 --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFist tap note.lua @@ -0,0 +1,5 @@ +local t = LoadActor("DownRightFist tap Note") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/DownLeftFoot Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/DownLeftFoot Hold Body Active (doubleres).png new file mode 100644 index 0000000000..df3691df3e Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFoot Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFoot Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/DownLeftFoot Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..14494e82c4 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFoot Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFoot Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/DownLeftFoot Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..46e135de94 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFoot Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFoot Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/DownLeftFoot Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..f88bc86cfa Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFoot Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFoot Hold Head Active.lua b/NoteSkins/kickbox/default/DownLeftFoot Hold Head Active.lua new file mode 100644 index 0000000000..c54e0cb61e --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFoot Hold Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFoot','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownLeftFoot Hold Head Inactive.lua b/NoteSkins/kickbox/default/DownLeftFoot Hold Head Inactive.lua new file mode 100644 index 0000000000..fc85fe577e --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFoot Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFoot','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownLeftFoot Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/DownLeftFoot Roll Body Active (doubleres).png new file mode 100644 index 0000000000..0ab2d0ae31 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFoot Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFoot Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/DownLeftFoot Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..c6fb7b60f7 Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFoot Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFoot Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/DownLeftFoot Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..0360109f8a Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFoot Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFoot Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/DownLeftFoot Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..b361a4a42d Binary files /dev/null and b/NoteSkins/kickbox/default/DownLeftFoot Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownLeftFoot Roll Head Active.lua b/NoteSkins/kickbox/default/DownLeftFoot Roll Head Active.lua new file mode 100644 index 0000000000..9ced3372f7 --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFoot Roll Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFoot','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownLeftFoot Roll Head Inactive.lua b/NoteSkins/kickbox/default/DownLeftFoot Roll Head Inactive.lua new file mode 100644 index 0000000000..baab4167b6 --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFoot Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFoot','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownLeftFoot tap note.lua b/NoteSkins/kickbox/default/DownLeftFoot tap note.lua new file mode 100644 index 0000000000..7befd52196 --- /dev/null +++ b/NoteSkins/kickbox/default/DownLeftFoot tap note.lua @@ -0,0 +1,5 @@ +local t = LoadActor("DownRightfoot tap Note") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/DownRightFist Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Hold Body Active (doubleres).png new file mode 100644 index 0000000000..db01049885 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFist Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..27a16473b5 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFist Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..7ce3ea8918 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFist Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..48b7f39d65 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFist Hold Head Active.redir b/NoteSkins/kickbox/default/DownRightFist Hold Head Active.redir new file mode 100644 index 0000000000..f75ddace0e --- /dev/null +++ b/NoteSkins/kickbox/default/DownRightFist Hold Head Active.redir @@ -0,0 +1 @@ +DownRightFist Tap Note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownRightFist Hold Head Inactive.lua b/NoteSkins/kickbox/default/DownRightFist Hold Head Inactive.lua new file mode 100644 index 0000000000..9421a85389 --- /dev/null +++ b/NoteSkins/kickbox/default/DownRightFist Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFist','Hold Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownRightFist Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Roll Body Active (doubleres).png new file mode 100644 index 0000000000..7d8e6e4eb0 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFist Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..7018cca581 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFist Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..b49d74be20 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFist Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..7e2ba13d7a Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFist Roll Head Active.redir b/NoteSkins/kickbox/default/DownRightFist Roll Head Active.redir new file mode 100644 index 0000000000..f75ddace0e --- /dev/null +++ b/NoteSkins/kickbox/default/DownRightFist Roll Head Active.redir @@ -0,0 +1 @@ +DownRightFist Tap Note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownRightFist Roll Head Inactive.lua b/NoteSkins/kickbox/default/DownRightFist Roll Head Inactive.lua new file mode 100644 index 0000000000..e932453fbf --- /dev/null +++ b/NoteSkins/kickbox/default/DownRightFist Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFist','Roll Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownRightFist Tap Note (doubleres).png b/NoteSkins/kickbox/default/DownRightFist Tap Note (doubleres).png new file mode 100644 index 0000000000..4910ff6934 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFist Tap Note (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot Hold Body Active (doubleres).png new file mode 100644 index 0000000000..e33823e061 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..e0ce58df3f Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..0ea451be10 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..59a3396f10 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Hold Head Active.redir b/NoteSkins/kickbox/default/DownRightFoot Hold Head Active.redir new file mode 100644 index 0000000000..cfce5762a3 --- /dev/null +++ b/NoteSkins/kickbox/default/DownRightFoot Hold Head Active.redir @@ -0,0 +1 @@ +DownRightFoot Tap Note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownRightFoot Hold Head Inactive.lua b/NoteSkins/kickbox/default/DownRightFoot Hold Head Inactive.lua new file mode 100644 index 0000000000..3da4bc208f --- /dev/null +++ b/NoteSkins/kickbox/default/DownRightFoot Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFoot','Hold Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownRightFoot Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot Roll Body Active (doubleres).png new file mode 100644 index 0000000000..4a5053ae40 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..62d6829cd3 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..452664de64 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..4c215082a6 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/DownRightFoot Roll Head Active.redir b/NoteSkins/kickbox/default/DownRightFoot Roll Head Active.redir new file mode 100644 index 0000000000..cfce5762a3 --- /dev/null +++ b/NoteSkins/kickbox/default/DownRightFoot Roll Head Active.redir @@ -0,0 +1 @@ +DownRightFoot Tap Note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownRightFoot Roll Head Inactive.lua b/NoteSkins/kickbox/default/DownRightFoot Roll Head Inactive.lua new file mode 100644 index 0000000000..1a8e3831e1 --- /dev/null +++ b/NoteSkins/kickbox/default/DownRightFoot Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('DownRightFoot','Roll Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/DownRightFoot tap note (doubleres).png b/NoteSkins/kickbox/default/DownRightFoot tap note (doubleres).png new file mode 100644 index 0000000000..03175feae6 Binary files /dev/null and b/NoteSkins/kickbox/default/DownRightFoot tap note (doubleres).png differ diff --git a/NoteSkins/kickbox/default/Fallback HitMine Explosion.png b/NoteSkins/kickbox/default/Fallback HitMine Explosion.png new file mode 100644 index 0000000000..34c26623b2 Binary files /dev/null and b/NoteSkins/kickbox/default/Fallback HitMine Explosion.png differ diff --git a/NoteSkins/kickbox/default/NoteSkin.lua b/NoteSkins/kickbox/default/NoteSkin.lua index c71e135f87..36d13e337a 100644 --- a/NoteSkins/kickbox/default/NoteSkin.lua +++ b/NoteSkins/kickbox/default/NoteSkin.lua @@ -1 +1,77 @@ -return ... +local ret = ... or {}; + +local pn = Var "Player" + +local OldRedir = ret.Redir; +ret.Redir = function(sButton, sElement) + -- Replace all receptors with genericized ones + if string.find(sButton,"RightFoot") and string.find(sElement, "Receptor") then + return "AnyRightFoot", "Receptor" + end + if string.find(sButton,"LeftFoot") and string.find(sElement, "Receptor") then + return "AnyLeftFoot", "Receptor" + end + if string.find(sButton,"RightFist") and string.find(sElement, "Receptor") then + return "AnyRightFist", "Receptor" + end + if string.find(sButton,"LeftFist") and string.find(sElement, "Receptor") then + return "AnyLeftFist", "Receptor" + end + + -- Replace all Lifts with genericized ones + if string.find(sButton,"RightFoot") and string.find(sElement, "Tap Lift") then + return "AnyRightFoot", "Tap Lift" + end + if string.find(sButton,"LeftFoot") and string.find(sElement, "Tap Lift") then + return "AnyLeftFoot", "Tap Lift" + end + if string.find(sButton,"RightFist") and string.find(sElement, "Tap Lift") then + return "AnyRightFist", "Tap Lift" + end + if string.find(sButton,"LeftFist") and string.find(sElement, "Tap Lift") then + return "AnyLeftFist", "Tap Lift" + end + + -- Replace all explosions with AnyRight* or AnyLeft*. Is there a better way to do this? + if string.find(sButton,"RightFoot") and string.find(sElement, "Explosion") then + return "AnyRightFoot", "Explosion" + end + if string.find(sButton,"LeftFoot") and string.find(sElement, "Explosion") then + return "AnyLeftFoot", "Explosion" + end + if string.find(sButton,"RightFist") and string.find(sElement, "Explosion") then + return "AnyRightFist", "Explosion" + end + if string.find(sButton,"LeftFist") and string.find(sElement, "Explosion") then + return "AnyLeftFist", "Explosion" + end + + if (GAMESTATE:GetCurrentStyle(pn):GetStepsType() == "StepsType_Kickbox_Human") then + if string.find(sButton, "LeftFoot") then + sButton = "AnyLeftFoot" + end + if string.find(sButton, "RightFoot") then + sButton = "AnyRightFoot" + end + -- + if string.find(sButton, "LeftFist") then + sButton = "AnyLeftFist" + end + if string.find(sButton, "RightFist") then + sButton = "AnyRightFist" + end + end + + if (GAMESTATE:GetCurrentStyle(pn):GetStepsType() == "StepsType_Kickbox_Insect") then + if string.find(sButton, "LeftFoot") then + sButton = "AnyLeftFoot" + end + if string.find(sButton, "RightFoot") then + sButton = "AnyRightFoot" + end + end + -- return OldRedir(sButton, sElement); + return sButton, sElement +end + +return ret \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFist Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/UpLeftFist Hold Body Active (doubleres).png new file mode 100644 index 0000000000..45cc937c45 Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFist Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFist Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/UpLeftFist Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..27a16473b5 Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFist Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFist Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/UpLeftFist Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..cedaa8d60c Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFist Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFist Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/UpLeftFist Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..6c13aab879 Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFist Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFist Hold Head Active.lua b/NoteSkins/kickbox/default/UpLeftFist Hold Head Active.lua new file mode 100644 index 0000000000..fc9b4d75fb --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFist Hold Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFist','Hold Head Active'); + InitCommand=cmd(basezoomx,-1); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFist Hold Head Inactive.lua b/NoteSkins/kickbox/default/UpLeftFist Hold Head Inactive.lua new file mode 100644 index 0000000000..843b85ee6f --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFist Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFist','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFist Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/UpLeftFist Roll Body Active (doubleres).png new file mode 100644 index 0000000000..2b1ba16fdc Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFist Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFist Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/UpLeftFist Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..1c1c24ac56 Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFist Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFist Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/UpLeftFist Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..29c99b9ceb Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFist Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFist Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/UpLeftFist Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..97a53f1339 Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFist Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFist Roll Head Active.lua b/NoteSkins/kickbox/default/UpLeftFist Roll Head Active.lua new file mode 100644 index 0000000000..130785536e --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFist Roll Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFist','Roll Head Active'); + InitCommand=cmd(basezoomx,-1); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFist Roll Head Inactive.lua b/NoteSkins/kickbox/default/UpLeftFist Roll Head Inactive.lua new file mode 100644 index 0000000000..5a4f6740e1 --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFist Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFist','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFist tap note.lua b/NoteSkins/kickbox/default/UpLeftFist tap note.lua new file mode 100644 index 0000000000..19354e02ef --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFist tap note.lua @@ -0,0 +1,5 @@ +local t = LoadActor("UpRightFist tap Note") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/UpLeftFoot Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/UpLeftFoot Hold Body Active (doubleres).png new file mode 100644 index 0000000000..04df3ae21f Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFoot Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFoot Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/UpLeftFoot Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..14494e82c4 Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFoot Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFoot Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/UpLeftFoot Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..ad57537f3b Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFoot Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFoot Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/UpLeftFoot Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..f88bc86cfa Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFoot Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFoot Hold Head Active.lua b/NoteSkins/kickbox/default/UpLeftFoot Hold Head Active.lua new file mode 100644 index 0000000000..61146282f1 --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFoot Hold Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFoot','Hold Head Active'); + InitCommand=cmd(basezoomx,-1); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFoot Hold Head Inactive.lua b/NoteSkins/kickbox/default/UpLeftFoot Hold Head Inactive.lua new file mode 100644 index 0000000000..c5a6822b3a --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFoot Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFoot','Hold Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFoot Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/UpLeftFoot Roll Body Active (doubleres).png new file mode 100644 index 0000000000..73aa60a8bb Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFoot Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFoot Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/UpLeftFoot Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..c6fb7b60f7 Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFoot Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFoot Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/UpLeftFoot Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..34196a23cc Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFoot Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFoot Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/UpLeftFoot Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..b361a4a42d Binary files /dev/null and b/NoteSkins/kickbox/default/UpLeftFoot Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpLeftFoot Roll Head Active.lua b/NoteSkins/kickbox/default/UpLeftFoot Roll Head Active.lua new file mode 100644 index 0000000000..dde3793531 --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFoot Roll Head Active.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFoot','Roll Head Active'); + InitCommand=cmd(basezoomx,-1); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFoot Roll Head Inactive.lua b/NoteSkins/kickbox/default/UpLeftFoot Roll Head Inactive.lua new file mode 100644 index 0000000000..e6cf005901 --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFoot Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFoot','Roll Head Active'); + InitCommand=cmd(basezoomx,-1;diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpLeftFoot tap note.lua b/NoteSkins/kickbox/default/UpLeftFoot tap note.lua new file mode 100644 index 0000000000..b5a0ee700a --- /dev/null +++ b/NoteSkins/kickbox/default/UpLeftFoot tap note.lua @@ -0,0 +1,5 @@ +local t = LoadActor("UpRightFoot tap Note") .. { + InitCommand=cmd(basezoomx,-1); +} + +return t; diff --git a/NoteSkins/kickbox/default/UpRightFist Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Hold Body Active (doubleres).png new file mode 100644 index 0000000000..45cc937c45 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFist Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..27a16473b5 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFist Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..ca71791d1f Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFist Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..48b7f39d65 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFist Hold Head Active.redir b/NoteSkins/kickbox/default/UpRightFist Hold Head Active.redir new file mode 100644 index 0000000000..dd2524567c --- /dev/null +++ b/NoteSkins/kickbox/default/UpRightFist Hold Head Active.redir @@ -0,0 +1 @@ +UpRightFist tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpRightFist Hold Head Inactive.lua b/NoteSkins/kickbox/default/UpRightFist Hold Head Inactive.lua new file mode 100644 index 0000000000..6ee636e5ae --- /dev/null +++ b/NoteSkins/kickbox/default/UpRightFist Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFist','Hold Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpRightFist Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Roll Body Active (doubleres).png new file mode 100644 index 0000000000..6340cd7e48 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFist Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..7018cca581 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFist Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..b4347051f9 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFist Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..7e2ba13d7a Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFist Roll Head Active.redir b/NoteSkins/kickbox/default/UpRightFist Roll Head Active.redir new file mode 100644 index 0000000000..dd2524567c --- /dev/null +++ b/NoteSkins/kickbox/default/UpRightFist Roll Head Active.redir @@ -0,0 +1 @@ +UpRightFist tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpRightFist Roll Head Inactive.lua b/NoteSkins/kickbox/default/UpRightFist Roll Head Inactive.lua new file mode 100644 index 0000000000..8224fb70dc --- /dev/null +++ b/NoteSkins/kickbox/default/UpRightFist Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFist','Roll Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpRightFist Tap Note (doubleres).png b/NoteSkins/kickbox/default/UpRightFist Tap Note (doubleres).png new file mode 100644 index 0000000000..691ed89bd8 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFist Tap Note (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Hold Body Active (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot Hold Body Active (doubleres).png new file mode 100644 index 0000000000..2d23d94c70 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot Hold Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Hold Body Inactive (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot Hold Body Inactive (doubleres).png new file mode 100644 index 0000000000..e0ce58df3f Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot Hold Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Hold BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot Hold BottomCap Active (doubleres).png new file mode 100644 index 0000000000..5dc1b546fa Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot Hold BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Hold BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot Hold BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..59a3396f10 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot Hold BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Hold Head Active.redir b/NoteSkins/kickbox/default/UpRightFoot Hold Head Active.redir new file mode 100644 index 0000000000..173d519124 --- /dev/null +++ b/NoteSkins/kickbox/default/UpRightFoot Hold Head Active.redir @@ -0,0 +1 @@ +UpRightFoot tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpRightFoot Hold Head Inactive.lua b/NoteSkins/kickbox/default/UpRightFoot Hold Head Inactive.lua new file mode 100644 index 0000000000..f6ece95dcf --- /dev/null +++ b/NoteSkins/kickbox/default/UpRightFoot Hold Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFoot','Hold Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpRightFoot Roll Body Active (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot Roll Body Active (doubleres).png new file mode 100644 index 0000000000..11558f0025 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot Roll Body Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Roll Body Inactive (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot Roll Body Inactive (doubleres).png new file mode 100644 index 0000000000..62d6829cd3 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot Roll Body Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Roll BottomCap Active (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot Roll BottomCap Active (doubleres).png new file mode 100644 index 0000000000..dd7770fd1b Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot Roll BottomCap Active (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Roll BottomCap Inactive (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot Roll BottomCap Inactive (doubleres).png new file mode 100644 index 0000000000..4c215082a6 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot Roll BottomCap Inactive (doubleres).png differ diff --git a/NoteSkins/kickbox/default/UpRightFoot Roll Head Active.redir b/NoteSkins/kickbox/default/UpRightFoot Roll Head Active.redir new file mode 100644 index 0000000000..173d519124 --- /dev/null +++ b/NoteSkins/kickbox/default/UpRightFoot Roll Head Active.redir @@ -0,0 +1 @@ +UpRightFoot tap note \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpRightFoot Roll Head Inactive.lua b/NoteSkins/kickbox/default/UpRightFoot Roll Head Inactive.lua new file mode 100644 index 0000000000..8c1e64442a --- /dev/null +++ b/NoteSkins/kickbox/default/UpRightFoot Roll Head Inactive.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath('UpRightFoot','Roll Head Active'); + InitCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); +}; \ No newline at end of file diff --git a/NoteSkins/kickbox/default/UpRightFoot tap note (doubleres).png b/NoteSkins/kickbox/default/UpRightFoot tap note (doubleres).png new file mode 100644 index 0000000000..3b7b2103c6 Binary files /dev/null and b/NoteSkins/kickbox/default/UpRightFoot tap note (doubleres).png differ diff --git a/NoteSkins/kickbox/default/_AnyRightFist Hold Explosion.redir b/NoteSkins/kickbox/default/_AnyRightFist Hold Explosion.redir new file mode 100644 index 0000000000..da0637f259 --- /dev/null +++ b/NoteSkins/kickbox/default/_AnyRightFist Hold Explosion.redir @@ -0,0 +1 @@ +_AnyRightFist Tap explosion dim \ No newline at end of file diff --git a/NoteSkins/kickbox/default/_AnyRightFist Roll Explosion.redir b/NoteSkins/kickbox/default/_AnyRightFist Roll Explosion.redir new file mode 100644 index 0000000000..da0637f259 --- /dev/null +++ b/NoteSkins/kickbox/default/_AnyRightFist Roll Explosion.redir @@ -0,0 +1 @@ +_AnyRightFist Tap explosion dim \ No newline at end of file diff --git a/NoteSkins/kickbox/default/_AnyRightFist Tap Explosion Dim (doubleres).png b/NoteSkins/kickbox/default/_AnyRightFist Tap Explosion Dim (doubleres).png new file mode 100644 index 0000000000..7072601112 Binary files /dev/null and b/NoteSkins/kickbox/default/_AnyRightFist Tap Explosion Dim (doubleres).png differ diff --git a/NoteSkins/kickbox/default/_AnyRightFist Tap Lift (doubleres).png b/NoteSkins/kickbox/default/_AnyRightFist Tap Lift (doubleres).png new file mode 100644 index 0000000000..8bf71144a5 Binary files /dev/null and b/NoteSkins/kickbox/default/_AnyRightFist Tap Lift (doubleres).png differ diff --git a/NoteSkins/kickbox/default/_AnyRightFist receptor frame (doubleres).png b/NoteSkins/kickbox/default/_AnyRightFist receptor frame (doubleres).png new file mode 100644 index 0000000000..8e5c28506e Binary files /dev/null and b/NoteSkins/kickbox/default/_AnyRightFist receptor frame (doubleres).png differ diff --git a/NoteSkins/kickbox/default/_AnyRightFist receptor underlay (doubleres).png b/NoteSkins/kickbox/default/_AnyRightFist receptor underlay (doubleres).png new file mode 100644 index 0000000000..067dbeebff Binary files /dev/null and b/NoteSkins/kickbox/default/_AnyRightFist receptor underlay (doubleres).png differ diff --git a/NoteSkins/kickbox/default/_AnyRightFoot Hold Explosion.redir b/NoteSkins/kickbox/default/_AnyRightFoot Hold Explosion.redir new file mode 100644 index 0000000000..92395ce391 --- /dev/null +++ b/NoteSkins/kickbox/default/_AnyRightFoot Hold Explosion.redir @@ -0,0 +1 @@ +_AnyRightFoot Tap explosion dim \ No newline at end of file diff --git a/NoteSkins/kickbox/default/_AnyRightFoot Roll Explosion.redir b/NoteSkins/kickbox/default/_AnyRightFoot Roll Explosion.redir new file mode 100644 index 0000000000..92395ce391 --- /dev/null +++ b/NoteSkins/kickbox/default/_AnyRightFoot Roll Explosion.redir @@ -0,0 +1 @@ +_AnyRightFoot Tap explosion dim \ No newline at end of file diff --git a/NoteSkins/kickbox/default/_AnyRightFoot Tap Explosion Dim (doubleres).png b/NoteSkins/kickbox/default/_AnyRightFoot Tap Explosion Dim (doubleres).png new file mode 100644 index 0000000000..ac8b969e48 Binary files /dev/null and b/NoteSkins/kickbox/default/_AnyRightFoot Tap Explosion Dim (doubleres).png differ diff --git a/NoteSkins/kickbox/default/_AnyRightFoot Tap Lift (doubleres).png b/NoteSkins/kickbox/default/_AnyRightFoot Tap Lift (doubleres).png new file mode 100644 index 0000000000..25f1ef1f6b Binary files /dev/null and b/NoteSkins/kickbox/default/_AnyRightFoot Tap Lift (doubleres).png differ diff --git a/NoteSkins/kickbox/default/_AnyRightFoot receptor frame (doubleres).png b/NoteSkins/kickbox/default/_AnyRightFoot receptor frame (doubleres).png new file mode 100644 index 0000000000..8c930452e1 Binary files /dev/null and b/NoteSkins/kickbox/default/_AnyRightFoot receptor frame (doubleres).png differ diff --git a/NoteSkins/kickbox/default/_AnyRightFoot receptor underlay (doubleres).png b/NoteSkins/kickbox/default/_AnyRightFoot receptor underlay (doubleres).png new file mode 100644 index 0000000000..539556d338 Binary files /dev/null and b/NoteSkins/kickbox/default/_AnyRightFoot receptor underlay (doubleres).png differ diff --git a/NoteSkins/kickbox/default/metrics.ini b/NoteSkins/kickbox/default/metrics.ini index a046334934..a9376cb03c 100644 --- a/NoteSkins/kickbox/default/metrics.ini +++ b/NoteSkins/kickbox/default/metrics.ini @@ -1,2 +1,57 @@ -[Global] -FallbackNoteSkin=common +[Global] +FallbackNoteSkin=common + +[NoteDisplay] +StartDrawingHoldBodyOffsetFromHead=-12 +StopDrawingHoldBodyOffsetFromTail=-32 // top of tail + +FlipHeadAndTailWhenReverse=0 +FlipHoldBodyWhenReverse=0 + +[GhostArrowDim] +HitMineCommand=blend,"BlendMode_Add";diffuse,1,1,1,1;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +W5Command=diffuse,0.8,0.0,0.6,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W4Command=diffuse,0.3,0.8,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W3Command=diffuse,0.0,1.0,0.4,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W2Command=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W1Command=diffuse,1.0,1.0,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +HeldCommand=diffuse,1.0,1.0,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 + +[GhostArrowBright] +NoneCommand= +HitMineCommand=blend,"BlendMode_Add";diffuse,1,1,1,1;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +AvoidMineCommand= +MissCommand= +W5Command=diffuse,0.8,0.0,0.6,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W4Command=diffuse,0.3,0.8,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W3Command=diffuse,0.0,1.0,0.4,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W2Command=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +W1Command=diffuse,1.0,1.0,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 +HeldCommand=diffuse,1.0,1.0,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 + +[HoldGhostArrow] +HoldingOnCommand=visible,true;pulse;effectmagnitude,1,1.1,1;effectclock,'beat';effectperiod,0.125 +HoldingOffCommand=visible,false;stopeffect; +RollOnCommand=visible,true;pulse;effectmagnitude,1,1.1,1;effectclock,'beat';effectperiod,0.125 +RollOffCommand=visible,false;stopeffect; + +[ReceptorArrow] +InitCommand=effectclock,'beat';glowramp;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.5"); +# By default, always step. Individual game skins can override this. +NoneCommand= +HitMineCommand= +AvoidMineCommand= +MissCommand= +W5Command= +W4Command= +W3Command= +W2Command= +W1Command= +PressCommand=stoptweening;bounceend,0.05;zoom,0.75 +LiftCommand=stoptweening;decelerate,0.1;zoom,1 + +[ReceptorOverlay] +InitCommand= +PressCommand=stoptweening;bounceend,0.05;zoom,0.75 +LiftCommand=stoptweening;decelerate,0.1;zoom,1 +NoneCommand= \ No newline at end of file diff --git a/src/NoteDataUtil.cpp b/src/NoteDataUtil.cpp index f6766ee6c7..2017f704dd 100644 --- a/src/NoteDataUtil.cpp +++ b/src/NoteDataUtil.cpp @@ -1579,6 +1579,72 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu iTakeFromTrack[8] = 0; iTakeFromTrack[9] = 1; break; + case StepsType_kickbox_human: + if(iRandChoice == 1) + { + iTakeFromTrack[0]= 3; + iTakeFromTrack[3]= 0; + } + if(iRandChoice == 2) + { + iTakeFromTrack[1]= 2; + iTakeFromTrack[2]= 1; + } + break; + case StepsType_kickbox_quadarm: + if(iRandChoice == 1) + { + iTakeFromTrack[0]= 1; + iTakeFromTrack[1]= 0; + iTakeFromTrack[2]= 3; + iTakeFromTrack[3]= 2; + } + if(iRandChoice == 2) + { + iTakeFromTrack[1]= 2; + iTakeFromTrack[2]= 1; + } + break; + case StepsType_kickbox_insect: + if(iRandChoice == 1) + { + iTakeFromTrack[1]= 2; + iTakeFromTrack[2]= 1; + iTakeFromTrack[3]= 4; + iTakeFromTrack[4]= 3; + } + if(iRandChoice == 2) + { + iTakeFromTrack[1]= 4; + iTakeFromTrack[2]= 3; + iTakeFromTrack[3]= 2; + iTakeFromTrack[4]= 1; + } + break; + case StepsType_kickbox_arachnid: + if(iRandChoice == 1) + { + iTakeFromTrack[0]= 1; + iTakeFromTrack[1]= 0; + iTakeFromTrack[2]= 3; + iTakeFromTrack[3]= 2; + iTakeFromTrack[4]= 5; + iTakeFromTrack[5]= 4; + iTakeFromTrack[6]= 7; + iTakeFromTrack[7]= 6; + } + if(iRandChoice == 2) + { + iTakeFromTrack[0]= 6; + iTakeFromTrack[1]= 7; + iTakeFromTrack[2]= 4; + iTakeFromTrack[3]= 5; + iTakeFromTrack[4]= 2; + iTakeFromTrack[5]= 3; + iTakeFromTrack[6]= 0; + iTakeFromTrack[7]= 1; + } + break; default: break; } break; @@ -1617,6 +1683,36 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu iTakeFromTrack[6] = 7; iTakeFromTrack[7] = 6; break; + case StepsType_kickbox_human: + iTakeFromTrack[0]= 1; + iTakeFromTrack[1]= 0; + iTakeFromTrack[2]= 3; + iTakeFromTrack[3]= 2; + break; + case StepsType_kickbox_quadarm: + iTakeFromTrack[0]= 1; + iTakeFromTrack[1]= 0; + iTakeFromTrack[2]= 3; + iTakeFromTrack[3]= 2; + break; + case StepsType_kickbox_insect: + iTakeFromTrack[0]= 1; + iTakeFromTrack[1]= 4; + iTakeFromTrack[2]= 3; + iTakeFromTrack[3]= 2; + iTakeFromTrack[4]= 1; + iTakeFromTrack[5]= 4; + break; + case StepsType_kickbox_arachnid: + iTakeFromTrack[0]= 5; + iTakeFromTrack[1]= 4; + iTakeFromTrack[2]= 5; + iTakeFromTrack[3]= 4; + iTakeFromTrack[4]= 3; + iTakeFromTrack[5]= 2; + iTakeFromTrack[6]= 1; + iTakeFromTrack[7]= 0; + break; default: break; }