diff --git a/NoteSkins/kb7/default/Key Go Receptor.png b/NoteSkins/kb7/default/Key Go Receptor.png deleted file mode 100644 index 6df47f2f66..0000000000 Binary files a/NoteSkins/kb7/default/Key Go Receptor.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Hold Body active.png b/NoteSkins/kb7/default/Key Hold Body active.png deleted file mode 100644 index 60a62549f6..0000000000 Binary files a/NoteSkins/kb7/default/Key Hold Body active.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Hold Body inactive.png b/NoteSkins/kb7/default/Key Hold Body inactive.png deleted file mode 100644 index 4ef3a238d1..0000000000 Binary files a/NoteSkins/kb7/default/Key Hold Body inactive.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Hold BottomCap Inactive.png b/NoteSkins/kb7/default/Key Hold BottomCap Inactive.png deleted file mode 100644 index e97dd7f33e..0000000000 Binary files a/NoteSkins/kb7/default/Key Hold BottomCap Inactive.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Hold BottomCap active.png b/NoteSkins/kb7/default/Key Hold BottomCap active.png deleted file mode 100644 index 699cdd5445..0000000000 Binary files a/NoteSkins/kb7/default/Key Hold BottomCap active.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Hold Explosion 2x1.png b/NoteSkins/kb7/default/Key Hold Explosion 2x1.png deleted file mode 100644 index a91319d791..0000000000 Binary files a/NoteSkins/kb7/default/Key Hold Explosion 2x1.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Receptor.lua b/NoteSkins/kb7/default/Key Receptor.lua deleted file mode 100644 index aef9e9a115..0000000000 --- a/NoteSkins/kb7/default/Key Receptor.lua +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index ac9daa346f..0000000000 Binary files a/NoteSkins/kb7/default/Key Roll Body active.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Roll Body inactive.png b/NoteSkins/kb7/default/Key Roll Body inactive.png deleted file mode 100644 index 2ca5f5d03c..0000000000 Binary files a/NoteSkins/kb7/default/Key Roll Body inactive.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Roll BottomCap active.png b/NoteSkins/kb7/default/Key Roll BottomCap active.png deleted file mode 100644 index 8a9fffffa6..0000000000 Binary files a/NoteSkins/kb7/default/Key Roll BottomCap active.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Roll BottomCap inactive.png b/NoteSkins/kb7/default/Key Roll BottomCap inactive.png deleted file mode 100644 index 02a27b822a..0000000000 Binary files a/NoteSkins/kb7/default/Key Roll BottomCap inactive.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Tap Explosion Bright.png b/NoteSkins/kb7/default/Key Tap Explosion Bright.png deleted file mode 100644 index 892e327c58..0000000000 Binary files a/NoteSkins/kb7/default/Key Tap Explosion Bright.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Tap Explosion Dim.png b/NoteSkins/kb7/default/Key Tap Explosion Dim.png deleted file mode 100644 index cbd86ed7e0..0000000000 Binary files a/NoteSkins/kb7/default/Key Tap Explosion Dim.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Key Tap Note.lua b/NoteSkins/kb7/default/Key Tap Note.lua deleted file mode 100644 index 9415a36c96..0000000000 --- a/NoteSkins/kb7/default/Key Tap Note.lua +++ /dev/null @@ -1,4 +0,0 @@ -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 index 3aac9fd5db..1bced82839 100644 --- a/NoteSkins/kb7/default/NoteSkin.lua +++ b/NoteSkins/kb7/default/NoteSkin.lua @@ -5,7 +5,7 @@ ret.RedirTable = Key1 = "Key", Key2 = "Key", Key3 = "Key", - Key4 = "Space", + Key4 = "Key", Key5 = "Key", Key6 = "Key", Key7 = "Key", diff --git a/NoteSkins/kb7/default/Space Hold Body active.png b/NoteSkins/kb7/default/Space Hold Body active.png deleted file mode 100644 index 34d6fad3ce..0000000000 Binary files a/NoteSkins/kb7/default/Space Hold Body active.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Hold Body inactive.png b/NoteSkins/kb7/default/Space Hold Body inactive.png deleted file mode 100644 index f4dbeaea82..0000000000 Binary files a/NoteSkins/kb7/default/Space Hold Body inactive.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Hold BottomCap active.png b/NoteSkins/kb7/default/Space Hold BottomCap active.png deleted file mode 100644 index de8033e015..0000000000 Binary files a/NoteSkins/kb7/default/Space Hold BottomCap active.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Hold BottomCap inactive.png b/NoteSkins/kb7/default/Space Hold BottomCap inactive.png deleted file mode 100644 index 0604d261ee..0000000000 Binary files a/NoteSkins/kb7/default/Space Hold BottomCap inactive.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Hold Explosion 2x1.png b/NoteSkins/kb7/default/Space Hold Explosion 2x1.png deleted file mode 100644 index 3c0f693b3c..0000000000 Binary files a/NoteSkins/kb7/default/Space Hold Explosion 2x1.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Receptor.lua b/NoteSkins/kb7/default/Space Receptor.lua deleted file mode 100644 index ac83a6d2ab..0000000000 --- a/NoteSkins/kb7/default/Space Receptor.lua +++ /dev/null @@ -1 +0,0 @@ -return Def.Actor {} diff --git a/NoteSkins/kb7/default/Space Roll Body active.png b/NoteSkins/kb7/default/Space Roll Body active.png deleted file mode 100644 index 055d451ea2..0000000000 Binary files a/NoteSkins/kb7/default/Space Roll Body active.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Roll Body inactive.png b/NoteSkins/kb7/default/Space Roll Body inactive.png deleted file mode 100644 index 9cac60073a..0000000000 Binary files a/NoteSkins/kb7/default/Space Roll Body inactive.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Roll BottomCap active.png b/NoteSkins/kb7/default/Space Roll BottomCap active.png deleted file mode 100644 index a7286e8577..0000000000 Binary files a/NoteSkins/kb7/default/Space Roll BottomCap active.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Roll BottomCap inactive.png b/NoteSkins/kb7/default/Space Roll BottomCap inactive.png deleted file mode 100644 index ea25d9d0fd..0000000000 Binary files a/NoteSkins/kb7/default/Space Roll BottomCap inactive.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Tap Explosion Bright.png b/NoteSkins/kb7/default/Space Tap Explosion Bright.png deleted file mode 100644 index be0ba55b12..0000000000 Binary files a/NoteSkins/kb7/default/Space Tap Explosion Bright.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Tap Explosion Dim.png b/NoteSkins/kb7/default/Space Tap Explosion Dim.png deleted file mode 100644 index 0de23983a1..0000000000 Binary files a/NoteSkins/kb7/default/Space Tap Explosion Dim.png and /dev/null differ diff --git a/NoteSkins/kb7/default/Space Tap Note.lua b/NoteSkins/kb7/default/Space Tap Note.lua deleted file mode 100644 index 916fabe7e5..0000000000 --- a/NoteSkins/kb7/default/Space Tap Note.lua +++ /dev/null @@ -1,5 +0,0 @@ -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/_key tap note 4x8.png b/NoteSkins/kb7/default/_key tap note 4x8.png deleted file mode 100644 index 42028db2c0..0000000000 Binary files a/NoteSkins/kb7/default/_key tap note 4x8.png and /dev/null differ diff --git a/NoteSkins/kb7/default/_space tap note 1x8.png b/NoteSkins/kb7/default/_space tap note 1x8.png deleted file mode 100644 index b064d571b7..0000000000 Binary files a/NoteSkins/kb7/default/_space tap note 1x8.png and /dev/null differ diff --git a/NoteSkins/kb7/default/metrics.ini b/NoteSkins/kb7/default/metrics.ini deleted file mode 100644 index 7ccea909a7..0000000000 --- a/NoteSkins/kb7/default/metrics.ini +++ /dev/null @@ -1,68 +0,0 @@ -[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 diff --git a/src/GameManager.cpp b/src/GameManager.cpp index 85a1474801..bbb1e35ff1 100644 --- a/src/GameManager.cpp +++ b/src/GameManager.cpp @@ -929,24 +929,24 @@ static const Style g_Style_KB7_Single = StyleType_OnePlayerOneSide, // m_StyleType 7, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KB7_COL_SPACING*2.5f, NULL }, - { TRACK_2, -KB7_COL_SPACING*1.5f, NULL }, - { TRACK_3, -KB7_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KB7_COL_SPACING*0.0f, NULL }, - { TRACK_4, +KB7_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KB7_COL_SPACING*1.5f, NULL }, - { TRACK_6, +KB7_COL_SPACING*2.5f, NULL }, - }, // intentionally different - { // PLAYER_2 + { // PLAYER_1 { TRACK_1, -KB7_COL_SPACING*3.0f, NULL }, { TRACK_2, -KB7_COL_SPACING*2.0f, NULL }, { TRACK_3, -KB7_COL_SPACING*1.0f, NULL }, { TRACK_4, +KB7_COL_SPACING*0.0f, NULL }, - { TRACK_4, +KB7_COL_SPACING*1.0f, NULL }, - { TRACK_5, +KB7_COL_SPACING*2.0f, NULL }, - { TRACK_6, +KB7_COL_SPACING*3.0f, NULL }, + { TRACK_5, +KB7_COL_SPACING*1.0f, NULL }, + { TRACK_6, +KB7_COL_SPACING*2.0f, NULL }, + { TRACK_7, +KB7_COL_SPACING*3.0f, NULL }, + }, + { // PLAYER_2 + { TRACK_1, -KB7_COL_SPACING*2.5f, NULL }, + { TRACK_2, -KB7_COL_SPACING*1.5f, NULL }, + { TRACK_3, -KB7_COL_SPACING*0.5f, NULL }, + { TRACK_4, +KB7_COL_SPACING*0.0f, NULL }, + { TRACK_5, +KB7_COL_SPACING*0.5f, NULL }, + { TRACK_6, +KB7_COL_SPACING*1.5f, NULL }, + { TRACK_7, +KB7_COL_SPACING*2.5f, NULL }, }, }, { // m_iInputColumn[NUM_GameController][NUM_GameButton] @@ -954,7 +954,7 @@ static const Style g_Style_KB7_Single = { 0, 1, 2, 3, 4, 5, 6, Style::END_MAPPING }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 4,0,1,2,3,5,6 + 4,0,1,2,3,5,6 // doesn't work? }, false, // m_bNeedsZoomOutWith2Players false, // m_bCanUseBeginnerHelper @@ -977,18 +977,18 @@ static const Style g_Style_KB7_Versus = { TRACK_2, -KB7_COL_SPACING*1.5f, NULL }, { TRACK_3, -KB7_COL_SPACING*0.5f, NULL }, { TRACK_4, +KB7_COL_SPACING*0.0f, NULL }, - { TRACK_4, +KB7_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KB7_COL_SPACING*1.5f, NULL }, - { TRACK_6, +KB7_COL_SPACING*2.5f, NULL }, + { TRACK_5, +KB7_COL_SPACING*0.5f, NULL }, + { TRACK_6, +KB7_COL_SPACING*1.5f, NULL }, + { TRACK_7, +KB7_COL_SPACING*2.5f, NULL }, }, { // PLAYER_2 { TRACK_1, -KB7_COL_SPACING*2.5f, NULL }, { TRACK_2, -KB7_COL_SPACING*1.5f, NULL }, { TRACK_3, -KB7_COL_SPACING*0.5f, NULL }, { TRACK_4, +KB7_COL_SPACING*0.0f, NULL }, - { TRACK_4, +KB7_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KB7_COL_SPACING*1.5f, NULL }, - { TRACK_6, +KB7_COL_SPACING*2.5f, NULL }, + { TRACK_5, +KB7_COL_SPACING*0.5f, NULL }, + { TRACK_6, +KB7_COL_SPACING*1.5f, NULL }, + { TRACK_7, +KB7_COL_SPACING*2.5f, NULL }, }, }, { // m_iInputColumn[NUM_GameController][NUM_GameButton]