From e06b52bc90bc642c86bd6887e51fb80c24b48f39 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 28 Jun 2010 20:04:04 -0500 Subject: [PATCH] shakesoda fixes up kb7 spacing again --- .../ScreenHowToInstallSongs scroll.lua | 16 +++++++ src/GameManager.cpp | 43 +++++++++---------- 2 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 Themes/default/Graphics/ScreenHowToInstallSongs scroll.lua diff --git a/Themes/default/Graphics/ScreenHowToInstallSongs scroll.lua b/Themes/default/Graphics/ScreenHowToInstallSongs scroll.lua new file mode 100644 index 0000000000..35d1ab7005 --- /dev/null +++ b/Themes/default/Graphics/ScreenHowToInstallSongs scroll.lua @@ -0,0 +1,16 @@ +local gc = Var("GameCommand"); +local squareSize = 8; -- was 18 + +return Def.ActorFrame { + Def.Quad{ + InitCommand=cmd(x,-12;zoom,squareSize;rotationz,45;diffuse,color("#222222")); + GainFocusCommand=cmd(stoptweening;accelerate,0.25;zoom,squareSize;rotationz,45;); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;zoom,0;rotationz,360+45); + }; + LoadFont("Common Normal") .. { + Text=gc:GetText(); + InitCommand=cmd(halign,0;zoom,0.625); + GainFocusCommand=cmd(stoptweening;decelerate,0.25;diffuse,color("1,1,1,1")); + LoseFocusCommand=cmd(stoptweening;accelerate,0.25;diffuse,color("0.5,0.5,0.5,1")); + }; +}; \ No newline at end of file diff --git a/src/GameManager.cpp b/src/GameManager.cpp index bbb1e35ff1..afe8189c70 100644 --- a/src/GameManager.cpp +++ b/src/GameManager.cpp @@ -917,7 +917,7 @@ static const AutoMappings g_AutoKeyMappings_KB7 = AutoMappings ( ); //ThemeMetric KB7_COL_SPACING ("ColumnSpacing","KB7"); -static const int KB7_COL_SPACING = 54; +static const int KB7_COL_SPACING = 64; static const Style g_Style_KB7_Single = { // STYLE_KB7_SINGLE true, // m_bUsedForGameplay @@ -929,7 +929,6 @@ static const Style g_Style_KB7_Single = StyleType_OnePlayerOneSide, // m_StyleType 7, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - // intentionally different { // PLAYER_1 { TRACK_1, -KB7_COL_SPACING*3.0f, NULL }, { TRACK_2, -KB7_COL_SPACING*2.0f, NULL }, @@ -940,13 +939,13 @@ static const Style g_Style_KB7_Single = { 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_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_5, +KB7_COL_SPACING*0.5f, NULL }, - { TRACK_6, +KB7_COL_SPACING*1.5f, NULL }, - { TRACK_7, +KB7_COL_SPACING*2.5f, 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 }, }, }, { // m_iInputColumn[NUM_GameController][NUM_GameButton] @@ -954,7 +953,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 // doesn't work? + 0,1,2,3,4,5,6 // doesn't work? }, false, // m_bNeedsZoomOutWith2Players false, // m_bCanUseBeginnerHelper @@ -973,22 +972,22 @@ static const Style g_Style_KB7_Versus = 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_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_5, +KB7_COL_SPACING*0.5f, NULL }, - { TRACK_6, +KB7_COL_SPACING*1.5f, NULL }, - { TRACK_7, +KB7_COL_SPACING*2.5f, 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_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_5, +KB7_COL_SPACING*0.5f, NULL }, - { TRACK_6, +KB7_COL_SPACING*1.5f, NULL }, - { TRACK_7, +KB7_COL_SPACING*2.5f, 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 }, }, }, { // m_iInputColumn[NUM_GameController][NUM_GameButton] @@ -996,7 +995,7 @@ static const Style g_Style_KB7_Versus = { 0, 1, 2, 3, 4, 5, 6, Style::END_MAPPING }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 4,0,1,2,3,5,6 + 0,1,2,3,4,5,6 }, true, // m_bNeedsZoomOutWith2Players false, // m_bCanUseBeginnerHelper