diff --git a/NoteSkins/kb7/default-p2/NoteSkin.lua b/NoteSkins/kb7/default-p2/NoteSkin.lua index 72a3237a3f..5f81a7a9a7 100644 --- a/NoteSkins/kb7/default-p2/NoteSkin.lua +++ b/NoteSkins/kb7/default-p2/NoteSkin.lua @@ -5,7 +5,7 @@ ret.RedirTable = Key1 = "Key", Key2 = "Key", Key3 = "Key", - Key4 = "Key", + Key4 = "Space", Key5 = "Key", Key6 = "Key", Key7 = "Key", diff --git a/NoteSkins/kb7/default-p2/Space Hold Body active.png b/NoteSkins/kb7/default-p2/Space Hold Body active.png new file mode 100644 index 0000000000..34d6fad3ce Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Hold Body active.png differ diff --git a/NoteSkins/kb7/default-p2/Space Hold Body inactive.png b/NoteSkins/kb7/default-p2/Space Hold Body inactive.png new file mode 100644 index 0000000000..f4dbeaea82 Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Hold Body inactive.png differ diff --git a/NoteSkins/kb7/default-p2/Space Hold BottomCap active.png b/NoteSkins/kb7/default-p2/Space Hold BottomCap active.png new file mode 100644 index 0000000000..de8033e015 Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Hold BottomCap active.png differ diff --git a/NoteSkins/kb7/default-p2/Space Hold BottomCap inactive.png b/NoteSkins/kb7/default-p2/Space Hold BottomCap inactive.png new file mode 100644 index 0000000000..0604d261ee Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Hold BottomCap inactive.png differ diff --git a/NoteSkins/kb7/default-p2/Space Hold Explosion 2x1.png b/NoteSkins/kb7/default-p2/Space Hold Explosion 2x1.png new file mode 100644 index 0000000000..3c0f693b3c Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Hold Explosion 2x1.png differ diff --git a/NoteSkins/kb7/default-p2/Space Receptor.lua b/NoteSkins/kb7/default-p2/Space Receptor.lua new file mode 100644 index 0000000000..ac83a6d2ab --- /dev/null +++ b/NoteSkins/kb7/default-p2/Space Receptor.lua @@ -0,0 +1 @@ +return Def.Actor {} diff --git a/NoteSkins/kb7/default-p2/Space Roll Body active.png b/NoteSkins/kb7/default-p2/Space Roll Body active.png new file mode 100644 index 0000000000..055d451ea2 Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Roll Body active.png differ diff --git a/NoteSkins/kb7/default-p2/Space Roll Body inactive.png b/NoteSkins/kb7/default-p2/Space Roll Body inactive.png new file mode 100644 index 0000000000..9cac60073a Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Roll Body inactive.png differ diff --git a/NoteSkins/kb7/default-p2/Space Roll BottomCap active.png b/NoteSkins/kb7/default-p2/Space Roll BottomCap active.png new file mode 100644 index 0000000000..a7286e8577 Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Roll BottomCap active.png differ diff --git a/NoteSkins/kb7/default-p2/Space Roll BottomCap inactive.png b/NoteSkins/kb7/default-p2/Space Roll BottomCap inactive.png new file mode 100644 index 0000000000..ea25d9d0fd Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Roll BottomCap inactive.png differ diff --git a/NoteSkins/kb7/default-p2/Space Tap Explosion Bright.png b/NoteSkins/kb7/default-p2/Space Tap Explosion Bright.png new file mode 100644 index 0000000000..be0ba55b12 Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Tap Explosion Bright.png differ diff --git a/NoteSkins/kb7/default-p2/Space Tap Explosion Dim.png b/NoteSkins/kb7/default-p2/Space Tap Explosion Dim.png new file mode 100644 index 0000000000..0de23983a1 Binary files /dev/null and b/NoteSkins/kb7/default-p2/Space Tap Explosion Dim.png differ diff --git a/NoteSkins/kb7/default-p2/Space Tap Note.lua b/NoteSkins/kb7/default-p2/Space Tap Note.lua new file mode 100644 index 0000000000..916fabe7e5 --- /dev/null +++ b/NoteSkins/kb7/default-p2/Space Tap Note.lua @@ -0,0 +1,5 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_space', 'tap note' ); + -- probably don't need this line + Frames = Sprite.LinearFrames( 1, 1 ); +}; diff --git a/NoteSkins/kb7/default-p2/_space tap note 1x8.png b/NoteSkins/kb7/default-p2/_space tap note 1x8.png new file mode 100644 index 0000000000..b064d571b7 Binary files /dev/null and b/NoteSkins/kb7/default-p2/_space tap note 1x8.png differ diff --git a/NoteSkins/kb7/default/Key Go Receptor.png b/NoteSkins/kb7/default/Key Go Receptor.png new file mode 100644 index 0000000000..6df47f2f66 Binary files /dev/null and b/NoteSkins/kb7/default/Key Go Receptor.png differ diff --git a/NoteSkins/kb7/default/Key Hold Body active.png b/NoteSkins/kb7/default/Key Hold Body active.png new file mode 100644 index 0000000000..60a62549f6 Binary files /dev/null and b/NoteSkins/kb7/default/Key Hold Body active.png differ diff --git a/NoteSkins/kb7/default/Key Hold Body inactive.png b/NoteSkins/kb7/default/Key Hold Body inactive.png new file mode 100644 index 0000000000..4ef3a238d1 Binary files /dev/null and b/NoteSkins/kb7/default/Key Hold Body inactive.png differ diff --git a/NoteSkins/kb7/default/Key Hold BottomCap Inactive.png b/NoteSkins/kb7/default/Key Hold BottomCap Inactive.png new file mode 100644 index 0000000000..e97dd7f33e Binary files /dev/null and b/NoteSkins/kb7/default/Key Hold BottomCap Inactive.png differ diff --git a/NoteSkins/kb7/default/Key Hold BottomCap active.png b/NoteSkins/kb7/default/Key Hold BottomCap active.png new file mode 100644 index 0000000000..699cdd5445 Binary files /dev/null and b/NoteSkins/kb7/default/Key Hold BottomCap active.png differ diff --git a/NoteSkins/kb7/default/Key Hold Explosion 2x1.png b/NoteSkins/kb7/default/Key Hold Explosion 2x1.png new file mode 100644 index 0000000000..a91319d791 Binary files /dev/null and b/NoteSkins/kb7/default/Key Hold Explosion 2x1.png differ diff --git a/NoteSkins/kb7/default/Key Receptor.lua b/NoteSkins/kb7/default/Key Receptor.lua new file mode 100644 index 0000000000..aef9e9a115 --- /dev/null +++ b/NoteSkins/kb7/default/Key Receptor.lua @@ -0,0 +1,13 @@ +local t = Def.ActorFrame { + LoadActor( "Key Go Receptor" )..{ + InitCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'InitCommand'); + NoneCommand=NOTESKIN:GetMetricA('ReceptorArrow', 'NoneCommand'); + }; + LoadActor( "Key Go Receptor" )..{ + 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/kb7/default/Key Roll Body active.png b/NoteSkins/kb7/default/Key Roll Body active.png new file mode 100644 index 0000000000..ac9daa346f Binary files /dev/null and b/NoteSkins/kb7/default/Key Roll Body active.png differ diff --git a/NoteSkins/kb7/default/Key Roll Body inactive.png b/NoteSkins/kb7/default/Key Roll Body inactive.png new file mode 100644 index 0000000000..2ca5f5d03c Binary files /dev/null and b/NoteSkins/kb7/default/Key Roll Body inactive.png differ diff --git a/NoteSkins/kb7/default/Key Roll BottomCap active.png b/NoteSkins/kb7/default/Key Roll BottomCap active.png new file mode 100644 index 0000000000..8a9fffffa6 Binary files /dev/null and b/NoteSkins/kb7/default/Key Roll BottomCap active.png differ diff --git a/NoteSkins/kb7/default/Key Roll BottomCap inactive.png b/NoteSkins/kb7/default/Key Roll BottomCap inactive.png new file mode 100644 index 0000000000..02a27b822a Binary files /dev/null and b/NoteSkins/kb7/default/Key Roll BottomCap inactive.png differ diff --git a/NoteSkins/kb7/default/Key Tap Explosion Bright.png b/NoteSkins/kb7/default/Key Tap Explosion Bright.png new file mode 100644 index 0000000000..892e327c58 Binary files /dev/null and b/NoteSkins/kb7/default/Key Tap Explosion Bright.png differ diff --git a/NoteSkins/kb7/default/Key Tap Explosion Dim.png b/NoteSkins/kb7/default/Key Tap Explosion Dim.png new file mode 100644 index 0000000000..cbd86ed7e0 Binary files /dev/null and b/NoteSkins/kb7/default/Key Tap Explosion Dim.png differ diff --git a/NoteSkins/kb7/default/Key Tap Note.lua b/NoteSkins/kb7/default/Key Tap Note.lua new file mode 100644 index 0000000000..9415a36c96 --- /dev/null +++ b/NoteSkins/kb7/default/Key Tap Note.lua @@ -0,0 +1,4 @@ +return Def.Sprite { + Texture=NOTESKIN:GetPath( '_key', 'tap note' ); + Frames = Sprite.LinearFrames( 4, 1 ); +}; diff --git a/NoteSkins/kb7/default/NoteSkin.lua b/NoteSkins/kb7/default/NoteSkin.lua deleted file mode 100644 index 1bced82839..0000000000 --- a/NoteSkins/kb7/default/NoteSkin.lua +++ /dev/null @@ -1,102 +0,0 @@ -local ret = ... or {}; - -ret.RedirTable = -{ - Key1 = "Key", - Key2 = "Key", - Key3 = "Key", - Key4 = "Key", - Key5 = "Key", - Key6 = "Key", - Key7 = "Key", -}; - -local OldRedir = ret.Redir; -ret.Redir = function(sButton, sElement) - sButton, sElement = OldRedir(sButton, sElement); - - -- Instead of separate hold heads, use the tap note graphics. - if sElement == "Hold Head Inactive" or - sElement == "Hold Head Active" or - sElement == "Roll Head Inactive" or - sElement == "Roll Head Active" - then - sElement = "Tap Note"; - end - - sButton = ret.RedirTable[sButton]; - - return sButton, sElement; -end - --- To have separate graphics for each hold part: ---[[ -local OldRedir = ret.Redir; -ret.Redir = function(sButton, sElement) - -- Redirect non-hold, non-roll parts. - if string.find(sElement, "hold") then - return sButton, sElement; - end - return OldRedir(sButton, sElement); -end -]] - -local OldFunc = ret.Load; -function ret.Load() - local t = OldFunc(); - - -- The main "Explosion" part just loads other actors; don't rotate - -- it. The "Hold Explosion" part should not be rotated. - if Var "Element" == "Explosion" or - Var "Element" == "Roll Explosion" or - Var "Element" == "Hold Explosion" then - t.BaseRotationZ = nil; - end - return t; -end - -ret.PartsToRotate = -{ - ["Go Receptor"] = true, - ["Ready Receptor"] = true, - ["Tap Explosion Bright"] = true, - ["Tap Explosion Dim"] = true, - ["Tap Note"] = true, - ["Hold Head Active"] = true, - ["Hold Head Inactive"] = true, - ["Roll Head Active"] = true, - ["Roll Head Inactive"] = true, -}; -ret.Rotate = -{ - Key1 = 0, - Key2 = 0, - Key3 = 0, - Key4 = 0, - Key5 = 0, - Key6 = 0, - Key7 = 0, -}; - --- --- If a derived skin wants to have separate UpLeft graphics, --- use this: --- --- ret.RedirTable.UpLeft = "UpLeft"; --- ret.RedirTable.UpRight = "UpLeft"; --- ret.Rotate.UpLeft = 0; --- ret.Rotate.UpRight = 90; --- -ret.Blank = -{ - ["Hold Topcap Active"] = true, - ["Hold Topcap Inactive"] = true, - ["Roll Topcap Active"] = true, - ["Roll Topcap Inactive"] = true, - ["Hold Tail Active"] = true, - ["Hold Tail Inactive"] = true, - ["Roll Tail Active"] = true, - ["Roll Tail Inactive"] = true, -}; - -return ret; diff --git a/NoteSkins/kb7/default/_key tap note 4x8.png b/NoteSkins/kb7/default/_key tap note 4x8.png new file mode 100644 index 0000000000..42028db2c0 Binary files /dev/null and b/NoteSkins/kb7/default/_key tap note 4x8.png differ diff --git a/NoteSkins/kb7/default/metrics.ini b/NoteSkins/kb7/default/metrics.ini new file mode 100644 index 0000000000..7ccea909a7 --- /dev/null +++ b/NoteSkins/kb7/default/metrics.ini @@ -0,0 +1,68 @@ +[Global] +#FallbackNoteSkin=common + +[NoteDisplay] +TapNoteAnimationIsVivid=0 +DrawHoldHeadForTapsOnSameRow=1 +TapNoteAnimationLengthInBeats=4 +TapAdditionAnimationLengthInBeats=4 +TapMineAnimationLengthInBeats=1 +TapLiftAnimationLengthInBeats=4 +HoldHeadAnimationLengthInBeats=4 +HoldTopCapAnimationLengthInBeats=4 +HoldBottomCapAnimationLengthInBeats=4 +HoldBodyAnimationLengthInBeats=4 +HoldTailAnimationLengthInBeats=4 +StartDrawingHoldBodyOffsetFromHead=0 +StopDrawingHoldBodyOffsetFromTail=-32 +HoldLetGoGrayPercent=0.25 +ReverseDrawOrder=1101 +HoldHeadIsAboveWavyParts=1 +HoldTailIsAboveWavyParts=1 +TapNoteAdditionTextureCoordOffsetX=0 +TapNoteAdditionTextureCoordOffsetY=0 +FlipHeadAndTailWhenReverse=1 +FlipHoldBodyWhenReverse=1 +TopHoldAnchorWhenReverse=1 + +TapNoteNoteColorTextureCoordSpacingX=0 +TapNoteNoteColorTextureCoordSpacingY=0.125 +HoldHeadNoteColorTextureCoordSpacingX=0 +HoldHeadNoteColorTextureCoordSpacingY=0.125 + +[GhostArrowDim] +NoneCommand= +HitMineCommand=blend,'BlendMode_Add';diffuse,1,1,1,1;zoom,1;rotationz,0;smooth,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 +MissCommand= +W5Command=diffuse,0.8,0.0,0.6,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W4Command=diffuse,0.3,0.8,1.0,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W3Command=diffuse,0.0,1.0,0.4,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W2Command=diffuse,1.0,1.0,0.3,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W1Command=diffuse,1.0,1.0,1.0,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 + +LetGoCommand= +HeldCommand=diffuse,1.0,1.0,0.3,1;decelerate,0.1;zoom,1.1;decelerate,0.1;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 +MissCommand= +W5Command=diffuse,0.8,0.0,0.6,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W4Command=diffuse,0.3,0.8,1.0,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W3Command=diffuse,0.0,1.0,0.4,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W2Command=diffuse,1.0,1.0,0.3,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +W1Command=diffuse,1.0,1.0,1.0,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 +LetGoCommand= +HeldCommand=diffuse,1.0,1.0,0.3,1;zoom,1;decelerate,0.1;zoom,1.1;decelerate,0.1;diffusealpha,0 + +[ReceptorArrow] +W3Command= +W2Command= +W1Command= +InitCommand=effectclock,"beat";diffuseramp;effectcolor1,color("0.8,0.8,0.8,1");effectcolor2,color("1,1,1,1");effecttiming,0.2,0,0.8,0;effectoffset,0.05 +NoneCommand=zoom,0.8;linear,0.1;zoom,1 + +[ReceptorOverlay] +InitCommand=diffusealpha,0 +PressCommand=blend,"BlendMode_Add";diffusealpha,0.6 +LiftCommand=diffusealpha,0 \ No newline at end of file