part A of a commit regarding kb7

NoteSkins/kb7/default/Key Receptor.lua

@@ -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;

NoteSkins/kb7/default/Key Tap Note.lua

@@ -1,4 +0,0 @@
-return Def.Sprite {
-	Texture=NOTESKIN:GetPath( '_key', 'tap note' );
-	Frames = Sprite.LinearFrames( 4, 1 );
-};

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",

NoteSkins/kb7/default/Space Receptor.lua

@@ -1 +0,0 @@
-return Def.Actor {}

NoteSkins/kb7/default/Space Tap Note.lua

@@ -1,5 +0,0 @@
-return Def.Sprite {
-	Texture=NOTESKIN:GetPath( '_space', 'tap note' );
-	-- probably don't need this line
-	Frames = Sprite.LinearFrames( 1, 1 );
-};

NoteSkins/kb7/default/metrics.ini

@@ -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

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*1.0f, NULL },
-			{ TRACK_5,	+KB7_COL_SPACING*2.0f, NULL },
+			{ TRACK_6,	+KB7_COL_SPACING*2.0f, NULL },
-			{ TRACK_6,	+KB7_COL_SPACING*3.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*0.5f, NULL },
-			{ TRACK_5,	+KB7_COL_SPACING*1.5f, NULL },
+			{ TRACK_6,	+KB7_COL_SPACING*1.5f, NULL },
-			{ TRACK_6,	+KB7_COL_SPACING*2.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*0.5f, NULL },
-			{ TRACK_5,	+KB7_COL_SPACING*1.5f, NULL },
+			{ TRACK_6,	+KB7_COL_SPACING*1.5f, NULL },
-			{ TRACK_6,	+KB7_COL_SPACING*2.5f, NULL },
+			{ TRACK_7,	+KB7_COL_SPACING*2.5f, NULL },
 		},
 	},
 	{	// m_iInputColumn[NUM_GameController][NUM_GameButton]