diff --git a/stepmania/Themes/techno/metrics.ini b/stepmania/Themes/techno/metrics.ini index d189415def..137dcafdf0 100644 --- a/stepmania/Themes/techno/metrics.ini +++ b/stepmania/Themes/techno/metrics.ini @@ -1,8 +1,54 @@ [ScreenSelectStyle] -ChoiceNames=1,2 +ChoiceNames=1,2,3,4,5,6,7,8 # The "name" here affects the announcer, eg. "ScreenSelectStyle comment single". -Choice1=Style,single8;name,single -Choice2=Style,versus8;name,versus +Choice1=Style,single4;name,single +Choice2=Style,single5;name,single +Choice3=Style,single8;name,single +Choice4=Style,double4;name,double +Choice5=Style,double5;name,double +Choice6=Style,versus4;name,versus +Choice7=Style,versus5;name,versus +Choice8=Style,versus8;name,versus +NextScreen1=ScreenSelectDifficulty +NextScreen2=ScreenSelectDifficulty +NextScreen3=ScreenSelectDifficulty +NextScreen4=ScreenSelectDifficulty +NextScreen5=ScreenSelectDifficulty +NextScreen6=ScreenSelectDifficulty +NextScreen7=ScreenSelectDifficulty +NextScreen8=ScreenSelectDifficulty +Icon1X=60 +Icon1Y=84 +Icon1OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 +Icon1OffCommand=bouncebegin,0.5;zoomy,0 +Icon2X=140 +Icon2Y=84 +Icon2OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 +Icon2OffCommand=bouncebegin,0.5;zoomy,0 +Icon3X=220 +Icon3Y=84 +Icon3OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 +Icon3OffCommand=bouncebegin,0.5;zoomy,0 +Icon4X=300 +Icon4Y=84 +Icon4OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 +Icon4OffCommand=bouncebegin,0.5;zoomy,0 +Icon5X=380 +Icon5Y=84 +Icon5OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 +Icon5OffCommand=bouncebegin,0.5;zoomy,0 +Icon6X=60 +Icon6Y=164 +Icon6OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 +Icon6OffCommand=bouncebegin,0.5;zoomy,0 +Icon7X=140 +Icon7Y=164 +Icon7OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 +Icon7OffCommand=bouncebegin,0.5;zoomy,0 +Icon8X=220 +Icon8Y=164 +Icon8OnCommand=addx,-640;sleep,0.20;decelerate,0.3;addx,640 +Icon8OffCommand=bouncebegin,0.5;zoomy,0 [Judgment] BooOddCommand= @@ -43,3 +89,71 @@ FullComboGreatsCommand= FullComboPerfectsCommand= FullComboMarvelousesCommand= FullComboBrokenCommand= + +[ScreenOptionsMaster] +# Song options +LifeType=2,together +LifeTypeDefault= +LifeType,1=mod,bar;name,Bar +LifeType,2=mod,battery;name,Battery + +BarDrain=3,together +BarDrainDefault= +BarDrain,1=mod,normal-drain;name,Normal +BarDrain,2=mod,norecover;name,NoRecover +BarDrain,3=mod,suddendeath;name,SuddenDeath + +BatLives=10,together +BatLivesDefault= +BatLives,1=mod,1 life;name,1 +BatLives,2=mod,2 lives;name,2 +BatLives,3=mod,3 lives;name,3 +BatLives,4=mod,4 lives;name,4 +BatLives,5=mod,5 lives;name,5 +BatLives,6=mod,6 lives;name,6 +BatLives,7=mod,7 lives;name,7 +BatLives,8=mod,8 lives;name,8 +BatLives,9=mod,9 lives;name,9 +BatLives,10=mod,10 lives;name,10 + +Fail=3,together +FailDefault= +Fail,1=mod,failImmediate;name,Immediate +Fail,2=mod,failendofsong;name,EndOfSong +Fail,3=mod,failoff;name,Off + +AssistTick=2,together +AssistTickDefault= +AssistTick,1=mod,no assisttick;name,Off +AssistTick,2=mod,assisttick;name,On + +Rate=18,together +RateDefault= +Rate,1=mod,0.3xmusic;name,0.3x +Rate,2=mod,0.4xmusic;name,0.4x +Rate,3=mod,0.5xmusic;name,0.5x +Rate,4=mod,0.6xmusic;name,0.6x +Rate,5=mod,0.7xmusic;name,0.7x +Rate,6=mod,0.8xmusic;name,0.8x +Rate,7=mod,0.9xmusic;name,0.9x +Rate,8=mod,1.0xmusic;name,1.0x +Rate,9=mod,1.1xmusic;name,1.1x +Rate,10=mod,1.2xmusic;name,1.2x +Rate,11=mod,1.3xmusic;name,1.3x +Rate,12=mod,1.4xmusic;name,1.4x +Rate,13=mod,1.5xmusic;name,1.5x +Rate,14=mod,1.6xmusic;name,1.6x +Rate,15=mod,1.7xmusic;name,1.7x +Rate,16=mod,1.8xmusic;name,1.8x +Rate,17=mod,1.9xmusic;name,1.9x +Rate,18=mod,2.0xmusic;name,2.0x + +AutoAdjust=2,together +AutoAdjustDefault= +AutoAdjust,1=mod,no autosync;name,Off +AutoAdjust,2=mod,autosync;name,On + +SaveScores=2,together +SaveScoresDefault= +SaveScores,1=mod,no savescore;name,Off +SaveScores,2=mod,savescore;name,On \ No newline at end of file diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index acd2095fc3..91bb19b7f8 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -102,7 +102,11 @@ enum StepsType STEPS_TYPE_IIDX_DOUBLE5, STEPS_TYPE_MANIAX_SINGLE, STEPS_TYPE_MANIAX_DOUBLE, + STEPS_TYPE_TECHNO_SINGLE4, + STEPS_TYPE_TECHNO_SINGLE5, STEPS_TYPE_TECHNO_SINGLE8, + STEPS_TYPE_TECHNO_DOUBLE4, + STEPS_TYPE_TECHNO_DOUBLE5, STEPS_TYPE_PNM_FIVE, STEPS_TYPE_PNM_NINE, STEPS_TYPE_LIGHTS_CABINET, diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 96de4cc85d..ab48eb43b1 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -55,7 +55,11 @@ struct { { "iidx-double5", 12 }, { "maniax-single", 4 }, { "maniax-double", 8 }, + { "techno-single4", 4 }, + { "techno-single5", 5 }, { "techno-single8", 8 }, + { "techno-double4", 8 }, + { "techno-double5", 10 }, { "pnm-five", 5 }, { "pnm-nine", 9 }, { "lights-cabinet", NUM_CABINET_LIGHTS }, @@ -2176,6 +2180,62 @@ StyleDef g_StyleDefs[NUM_STYLES] = 0,1,2,3,4,5,6,7 }, }, + { // STYLE_TECHNO_SINGLE4 + GAME_TECHNO, // m_Game + true, // m_bUsedForGameplay + true, // m_bUsedForEdit + "single4", // m_szName + STEPS_TYPE_TECHNO_SINGLE4, // m_StepsType + StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType + { 112, 528 }, // m_iCenterX + 4, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*1.5f }, + { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, + { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, TECHNO_COL_SPACING*0.5f }, + { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, TECHNO_COL_SPACING*1.5f }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*1.5f }, + { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, + { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, TECHNO_COL_SPACING*0.5f }, + { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, TECHNO_COL_SPACING*1.5f }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,1,2,3 + }, + }, + { // STYLE_TECHNO_SINGLE5 + GAME_TECHNO, // m_Game + true, // m_bUsedForGameplay + true, // m_bUsedForEdit + "single5", // m_szName + STEPS_TYPE_TECHNO_SINGLE5, // m_StepsType + StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType + { 140, 500 }, // m_iCenterX + 5, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*2.0f }, + { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.0f }, + { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_CENTER, TECHNO_COL_SPACING*0.0f }, + { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.0f }, + { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*2.0f }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*2.0f }, + { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.0f }, + { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_CENTER, TECHNO_COL_SPACING*0.0f }, + { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.0f }, + { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*2.0f }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,1,2,3,4 + }, + }, { // STYLE_TECHNO_SINGLE8 GAME_TECHNO, // m_Game true, // m_bUsedForGameplay @@ -2211,6 +2271,62 @@ StyleDef g_StyleDefs[NUM_STYLES] = 0,1,2,3,4,5,6,7 }, }, + { // STYLE_TECHNO_VERSUS4 + GAME_TECHNO, // m_Game + true, // m_bUsedForGameplay + false, // m_bUsedForEdit + "versus4", // m_szName + STEPS_TYPE_TECHNO_SINGLE4, // m_StepsType + StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType + { 112, 528 }, // m_iCenterX + 4, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*1.5f }, + { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, + { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, TECHNO_COL_SPACING*0.5f }, + { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, TECHNO_COL_SPACING*1.5f }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*1.5f }, + { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, + { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, TECHNO_COL_SPACING*0.5f }, + { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, TECHNO_COL_SPACING*1.5f }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,1,2,3 + }, + }, + { // STYLE_TECHNO_VERSUS5 + GAME_TECHNO, // m_Game + true, // m_bUsedForGameplay + false, // m_bUsedForEdit + "versus5", // m_szName + STEPS_TYPE_TECHNO_SINGLE5, // m_StepsType + StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType + { 140, 500 }, // m_iCenterX + 5, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*2.0f }, + { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.0f }, + { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_CENTER, TECHNO_COL_SPACING*0.0f }, + { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.0f }, + { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*2.0f }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*2.0f }, + { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.0f }, + { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_CENTER, TECHNO_COL_SPACING*0.0f }, + { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.0f }, + { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*2.0f }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,1,2,3,4 + }, + }, { // STYLE_TECHNO_VERSUS8 GAME_TECHNO, // m_Game true, // m_bUsedForGameplay @@ -2246,6 +2362,80 @@ StyleDef g_StyleDefs[NUM_STYLES] = 0,1,2,3,4,5,6,7 }, }, + { // STYLE_TECHNO_DOUBLE4 + GAME_TECHNO, // m_Game + true, // m_bUsedForGameplay + true, // m_bUsedForEdit + "double4", // m_szName + STEPS_TYPE_TECHNO_DOUBLE4, // m_StepsType + StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType + { 320, 320 }, // m_iCenterX + 8, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*3.5f }, + { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*2.5f }, + { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, -TECHNO_COL_SPACING*1.5f }, + { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, -TECHNO_COL_SPACING*0.5f }, + { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, +TECHNO_COL_SPACING*0.5f }, + { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, +TECHNO_COL_SPACING*1.5f }, + { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, +TECHNO_COL_SPACING*2.5f }, + { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, +TECHNO_COL_SPACING*3.5f }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*3.5f }, + { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*2.5f }, + { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, -TECHNO_COL_SPACING*1.5f }, + { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, -TECHNO_COL_SPACING*0.5f }, + { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, +TECHNO_COL_SPACING*0.5f }, + { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, +TECHNO_COL_SPACING*1.5f }, + { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, +TECHNO_COL_SPACING*2.5f }, + { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, +TECHNO_COL_SPACING*3.5f }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,1,2,3,4,5,6,7 + }, + }, + { // STYLE_TECHNO_DOUBLE5 + GAME_TECHNO, // m_Game + true, // m_bUsedForGameplay + true, // m_bUsedForEdit + "double5", // m_szName + STEPS_TYPE_TECHNO_DOUBLE5, // m_StepsType + StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType + { 320, 320 }, // m_iCenterX + 10, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*4.5f }, + { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*3.5f }, + { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_CENTER, -TECHNO_COL_SPACING*2.5f }, + { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, -TECHNO_COL_SPACING*1.5f }, + { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT, -TECHNO_COL_SPACING*0.5f }, + { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, +TECHNO_COL_SPACING*0.5f }, + { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, +TECHNO_COL_SPACING*1.5f }, + { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_CENTER, +TECHNO_COL_SPACING*2.5f }, + { TRACK_9, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*3.5f }, + { TRACK_10, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT, +TECHNO_COL_SPACING*4.5f }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*4.5f }, + { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*3.5f }, + { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_CENTER, -TECHNO_COL_SPACING*2.5f }, + { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, -TECHNO_COL_SPACING*1.5f }, + { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT, -TECHNO_COL_SPACING*0.5f }, + { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, +TECHNO_COL_SPACING*0.5f }, + { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, +TECHNO_COL_SPACING*1.5f }, + { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_CENTER, +TECHNO_COL_SPACING*2.5f }, + { TRACK_9, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*3.5f }, + { TRACK_10, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT, +TECHNO_COL_SPACING*4.5f }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,1,2,3,4,5,6,7,8,9 + }, + }, { // STYLE_PNM_FIVE GAME_PNM, // m_Game true, // m_bUsedForGameplay diff --git a/stepmania/src/Style.h b/stepmania/src/Style.h index 11f5bf9435..fa4bc64422 100644 --- a/stepmania/src/Style.h +++ b/stepmania/src/Style.h @@ -33,8 +33,14 @@ enum Style STYLE_MANIAX_SINGLE, STYLE_MANIAX_VERSUS, STYLE_MANIAX_DOUBLE, + STYLE_TECHNO_SINGLE4, + STYLE_TECHNO_SINGLE5, STYLE_TECHNO_SINGLE8, + STYLE_TECHNO_VERSUS4, + STYLE_TECHNO_VERSUS5, STYLE_TECHNO_VERSUS8, + STYLE_TECHNO_DOUBLE4, + STYLE_TECHNO_DOUBLE5, STYLE_PNM_FIVE, STYLE_PNM_NINE, STYLE_LIGHTS_CABINET,