diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index d8a1b4906e..63158d73a5 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -6,7 +6,6 @@ StepMania=StepMania Couldn't open any loading windows.=Couldn't open any loading windows. Starting sound subsystem...=Starting sound subsystem... Initializing bookkeeper...=Initializing bookkeeper... -Starting lights subsystem...=Starting lights subsystem... Loading game type...=Loading game type... Building song cache index...=Building song cache index... Loading banner cache...=Loading banner cache... @@ -510,7 +509,6 @@ Steps=Steps StretchBackgrounds=Toggle the stretching of backgrounds. Style= Test Input=Test the responsiveness of connected joysticks. -Test Lights=Test the responsiveness of connected lights. TextureColorDepth=Choose the color depth of textures. 32 bit textures use more memory, but look nicer. Theme=Choose from this list of installed theme packs. ThreeKeyNavigation=&oq;Five Key&oq;: L/R/D/U menu buttons and Start. &oq;Three Key&oq;: L/R menu buttons and Start. @@ -1246,7 +1244,6 @@ SuperGrowth=Super Growth Tap Steps=Tap Steps Tempo=Tempo Test Input=Test Input -Test Lights=Test Lights TextureColorDepth=Texture Color Theme=Theme ThreeKeyNavigation=Menu Navigation @@ -1460,7 +1457,6 @@ Fill Profile Stats=Fill Profile Stats Flush Log=Flush Log Force Crash=Force Crash Halt=Halt -Lights Debug=Lights Debug Machine=Machine Menu Timer=Menu Timer Monkey Input=Monkey Input @@ -1842,7 +1838,6 @@ HelpTextContinue=Press any button or key. Press ESCAPE when done. HelpTextEvaluation=Press &START; to continue HelpTextScreenshot=Press &SELECT; to take a screenshot HelpTextTestInput=Press any button or key. Press ESCAPE when done. -HelpTextTestLights=Press &MENULEFT;&MENURIGHT; to cycle lights. Press ESCAPE when done. HelpTextTextEntry=Type a value using the keyboard. Press Enter to finish. HelpTextMapControllers=Use arrow keys to move, ENTER to assign, SPACE to clear::Press ESCAPE when done HelpTextOnline=stepmaniaonline.net to connect to official Stepmania Online Server::Check out stepmaniaonline.net for more information @@ -1952,12 +1947,6 @@ Controller=Controller not mapped=not mapped secondary=secondary -[ScreenTestLights] -Auto Cycle=Auto Cycle -Manual Cycle=Manual Cycle -cabinet light=cabinet light -controller light=controller light - [ScreenTextEntry] Backspace=Backsp Cancel=Cancel @@ -2077,7 +2066,6 @@ dance-single=single dance-solo=solo dance-threepanel=3panel dance-routine=routine -lights-cabinet=Lights # Dance_Single=Single Dance_Double=Double @@ -2112,11 +2100,6 @@ Pnm_Five=5 Button Pnm_Nine=9 Button Guitar_Five=5 Frets Karaoke=Karaoke -Lights_Cabinet=Lights -Kickbox_Human=Human -Kickbox_Quadarm=Quadarm -Kickbox_Insect=Insect -Kickbox_Arachnid=Arachnid [StyleType] StyleType_OnePlayerOneSide=1 Player @@ -2666,10 +2649,6 @@ Pump_Halfdouble=Half-Double Pump_Couple=Couple Pump_Routine=Routine Kb7_Single=KB7 -Kickbox_Human=Human -Kickbox_Quadarm=Quadarm -Kickbox_Insect=Insect -Kickbox_Arachnid=Arachnid Ez2_Single=Single Ez2_Double=Double Ez2_Real=Real @@ -2691,7 +2670,6 @@ Pnm_Five=5 Button Pnm_Nine=9 Button Guitar_Five=5 Frets Karaoke=Karaoke -Lights_Cabinet=Lights [StepsListDisplayRow StepsType] Dance_Single=Single Dance_Double=Double @@ -2705,10 +2683,6 @@ Pump_Halfdouble=Half-Double Pump_Couple=Couple Pump_Routine=Routine Kb7_Single=KB7 -Kickbox_Human=Human -Kickbox_Quadarm=Quadarm -Kickbox_Insect=Insect -Kickbox_Arachnid=Arachnid Ez2_Single=Single Ez2_Double=Double Ez2_Real=Real @@ -2729,7 +2703,6 @@ Pnm_Five=5 Button Pnm_Nine=9 Button Guitar_Five=5 Frets Karaoke=Karaoke -Lights_Cabinet=Lights [ScreenHowToInstallSongs] HeaderText=Installing Songs diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h index 7a4c3519ae..6c626c18c7 100644 --- a/src/GameConstantsAndTypes.h +++ b/src/GameConstantsAndTypes.h @@ -113,10 +113,6 @@ enum StepsType StepsType_techno_double8, StepsType_popn_five, StepsType_popn_nine, - StepsType_kickbox_human, - StepsType_kickbox_quadarm, - StepsType_kickbox_insect, - StepsType_kickbox_arachnid, NUM_StepsType, // leave this at the end StepsType_Invalid, }; diff --git a/src/GameInput.h b/src/GameInput.h index c3ed05ea06..5a474f0e71 100644 --- a/src/GameInput.h +++ b/src/GameInput.h @@ -174,16 +174,6 @@ GameButton StringToGameButton( const InputScheme* pInputs, const RString& s ); #define LIGHTS_BUTTON_BASS_RIGHT GAME_BUTTON_CUSTOM_08 #define NUM_LIGHTS_BUTTONS GAME_BUTTON_CUSTOM_09 -#define KICKBOX_BUTTON_DOWN_LEFT_FOOT GAME_BUTTON_CUSTOM_01 -#define KICKBOX_BUTTON_UP_LEFT_FOOT GAME_BUTTON_CUSTOM_02 -#define KICKBOX_BUTTON_UP_LEFT_FIST GAME_BUTTON_CUSTOM_03 -#define KICKBOX_BUTTON_DOWN_LEFT_FIST GAME_BUTTON_CUSTOM_04 -#define KICKBOX_BUTTON_DOWN_RIGHT_FIST GAME_BUTTON_CUSTOM_05 -#define KICKBOX_BUTTON_UP_RIGHT_FIST GAME_BUTTON_CUSTOM_06 -#define KICKBOX_BUTTON_UP_RIGHT_FOOT GAME_BUTTON_CUSTOM_07 -#define KICKBOX_BUTTON_DOWN_RIGHT_FOOT GAME_BUTTON_CUSTOM_08 -#define NUM_KICKBOX_BUTTONS GAME_BUTTON_CUSTOM_09 - #define GAME_BUTTON_LEFT GAME_BUTTON_MENULEFT #define GAME_BUTTON_RIGHT GAME_BUTTON_MENURIGHT #define GAME_BUTTON_UP GAME_BUTTON_MENUUP diff --git a/src/GameManager.cpp b/src/GameManager.cpp index 2e075724dc..36a26ea49a 100644 --- a/src/GameManager.cpp +++ b/src/GameManager.cpp @@ -90,11 +90,6 @@ static const StepsTypeInfo g_StepsTypeInfos[] = { // pop'n music { "pnm-five", 5, true, StepsTypeCategory_Single }, // called "pnm" for backward compat { "pnm-nine", 9, true, StepsTypeCategory_Single }, // called "pnm" for backward compat - // kickbox mania - { "kickbox-human", 4, true, StepsTypeCategory_Single }, - { "kickbox-quadarm", 4, true, StepsTypeCategory_Single }, - { "kickbox-insect", 6, true, StepsTypeCategory_Single }, - { "kickbox-arachnid", 8, true, StepsTypeCategory_Single }, }; @@ -2737,393 +2732,6 @@ static const AutoMappings g_AutoKeyMappings_Lights = AutoMappings ( AutoMappingEntry( 0, KEY_Ci, LIGHTS_BUTTON_BASS_RIGHT, false ) ); -/** Kickbox mania **********************************************************/ -static const AutoMappings g_AutoKeyMappings_Kickbox = AutoMappings ( - "", "", "", - AutoMappingEntry(0, KEY_Cq, GAME_BUTTON_MENULEFT, false), - AutoMappingEntry(0, KEY_Cr, GAME_BUTTON_MENURIGHT, false), - AutoMappingEntry(0, KEY_Ce, GAME_BUTTON_MENUUP, false), - AutoMappingEntry(0, KEY_Cw, GAME_BUTTON_MENUDOWN, false), - AutoMappingEntry(0, KEY_Cz, KICKBOX_BUTTON_DOWN_LEFT_FOOT, false), - AutoMappingEntry(0, KEY_Ca, KICKBOX_BUTTON_UP_LEFT_FOOT, false), - AutoMappingEntry(0, KEY_Cs, KICKBOX_BUTTON_UP_LEFT_FIST, false), - AutoMappingEntry(0, KEY_Cx, KICKBOX_BUTTON_DOWN_LEFT_FIST, false), - AutoMappingEntry(0, KEY_Cc, KICKBOX_BUTTON_DOWN_RIGHT_FIST, false), - AutoMappingEntry(0, KEY_Cd, KICKBOX_BUTTON_UP_RIGHT_FIST, false), - AutoMappingEntry(0, KEY_Cf, KICKBOX_BUTTON_UP_RIGHT_FOOT, false), - AutoMappingEntry(0, KEY_Cv, KICKBOX_BUTTON_DOWN_RIGHT_FOOT, false), - AutoMappingEntry(0, KEY_Cu, GAME_BUTTON_MENULEFT, true), - AutoMappingEntry(0, KEY_Cp, GAME_BUTTON_MENURIGHT, true), - AutoMappingEntry(0, KEY_Ci, GAME_BUTTON_MENUUP, true), - AutoMappingEntry(0, KEY_Co, GAME_BUTTON_MENUDOWN, true), - AutoMappingEntry(0, KEY_Cm, KICKBOX_BUTTON_DOWN_LEFT_FOOT, true), - AutoMappingEntry(0, KEY_Cj, KICKBOX_BUTTON_UP_LEFT_FOOT, true), - AutoMappingEntry(0, KEY_Ck, KICKBOX_BUTTON_UP_LEFT_FIST, true), - AutoMappingEntry(0, KEY_COMMA, KICKBOX_BUTTON_DOWN_LEFT_FIST, true), - AutoMappingEntry(0, KEY_PERIOD, KICKBOX_BUTTON_DOWN_RIGHT_FIST, true), - AutoMappingEntry(0, KEY_Cl, KICKBOX_BUTTON_UP_RIGHT_FIST, true), - AutoMappingEntry(0, KEY_SEMICOLON, KICKBOX_BUTTON_UP_RIGHT_FOOT, true), - AutoMappingEntry(0, KEY_SLASH, KICKBOX_BUTTON_DOWN_RIGHT_FOOT, true) -); - -static const int KICKBOX_COL_SPACING= 64; - -static const Style g_Style_Kickbox_Human= -{ - true, // m_bUsedForGameplay - true, // m_bUsedForEdit - true, // m_bUsedForDemonstration - true, // m_bUsedForHowToPlay - "human", // m_szName - StepsType_kickbox_human, // m_StepsType - StyleType_OnePlayerOneSide, // m_StyleType - 4, // m_iColsPerPlayer - { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_3, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*1.5f, NULL }, - }, - { // PLAYER_2 - { TRACK_1, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_3, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*1.5f, NULL }, - }, - }, - { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { 0, 0, 1, 1, 2, 2, 3, 3, Style::END_MAPPING }, - { 0, 0, 1, 1, 2, 2, 3, 3, Style::END_MAPPING } - }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 0, 1, 2, 3 - }, - false, // m_bCanUseBeginnerHelper - false, // m_bLockDifficulties -}; - -static const Style g_Style_Kickbox_Human_Versus= -{ - true, // m_bUsedForGameplay - false, // m_bUsedForEdit - true, // m_bUsedForDemonstration - false, // m_bUsedForHowToPlay - "hversus", // m_szName - StepsType_kickbox_human, // m_StepsType - StyleType_TwoPlayersTwoSides, // m_StyleType - 4, // m_iColsPerPlayer - { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_3, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*1.5f, NULL }, - }, - { // PLAYER_2 - { TRACK_1, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_3, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*1.5f, NULL }, - }, - }, - { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { 0, 0, 1, 1, 2, 2, 3, 3, Style::END_MAPPING }, - { 0, 0, 1, 1, 2, 2, 3, 3, Style::END_MAPPING } - }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 0, 1, 2, 3 - }, - false, // m_bCanUseBeginnerHelper - false, // m_bLockDifficulties -}; - -static const Style g_Style_Kickbox_Quadarm= -{ - true, // m_bUsedForGameplay - true, // m_bUsedForEdit - true, // m_bUsedForDemonstration - true, // m_bUsedForHowToPlay - "quadarm", // m_szName - StepsType_kickbox_quadarm, // m_StepsType - StyleType_OnePlayerOneSide, // m_StyleType - 4, // m_iColsPerPlayer - { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_3, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*1.5f, NULL }, - }, - { // PLAYER_2 - { TRACK_1, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_3, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*1.5f, NULL }, - }, - }, - { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { Style::NO_MAPPING, Style::NO_MAPPING, 0, 1, 2, 3, Style::NO_MAPPING, Style::NO_MAPPING, Style::END_MAPPING }, - { Style::NO_MAPPING, Style::NO_MAPPING, 0, 1, 2, 3, Style::NO_MAPPING, Style::NO_MAPPING, Style::END_MAPPING } - }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 0, 1, 2, 3 - }, - false, // m_bCanUseBeginnerHelper - false, // m_bLockDifficulties -}; - -static const Style g_Style_Kickbox_Quadarm_Versus= -{ - true, // m_bUsedForGameplay - false, // m_bUsedForEdit - true, // m_bUsedForDemonstration - false, // m_bUsedForHowToPlay - "qversus", // m_szName - StepsType_kickbox_quadarm, // m_StepsType - StyleType_TwoPlayersTwoSides, // m_StyleType - 4, // m_iColsPerPlayer - { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_3, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*1.5f, NULL }, - }, - { // PLAYER_2 - { TRACK_1, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_3, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*1.5f, NULL }, - }, - }, - { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { Style::NO_MAPPING, Style::NO_MAPPING, 0, 1, 2, 3, Style::NO_MAPPING, Style::NO_MAPPING, Style::END_MAPPING }, - { Style::NO_MAPPING, Style::NO_MAPPING, 0, 1, 2, 3, Style::NO_MAPPING, Style::NO_MAPPING, Style::END_MAPPING } - }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 0, 1, 2, 3 - }, - false, // m_bCanUseBeginnerHelper - false, // m_bLockDifficulties -}; - -static const Style g_Style_Kickbox_Insect= -{ - true, // m_bUsedForGameplay - true, // m_bUsedForEdit - true, // m_bUsedForDemonstration - true, // m_bUsedForHowToPlay - "insect", // m_szName - StepsType_kickbox_insect, // m_StepsType - StyleType_OnePlayerOneSide, // m_StyleType - 6, // m_iColsPerPlayer - { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_3, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_6, +KICKBOX_COL_SPACING*2.5f, NULL }, - }, - { // PLAYER_2 - { TRACK_1, -KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_3, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_6, +KICKBOX_COL_SPACING*2.5f, NULL }, - }, - }, - { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { 0, 0, 1, 2, 3, 4, 5, 5, Style::END_MAPPING }, - { 0, 0, 1, 2, 3, 4, 5, 5, Style::END_MAPPING } - }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 0, 1, 2, 3, 4, 5 - }, - false, // m_bCanUseBeginnerHelper - false, // m_bLockDifficulties -}; - -static const Style g_Style_Kickbox_Insect_Versus= -{ - true, // m_bUsedForGameplay - false, // m_bUsedForEdit - true, // m_bUsedForDemonstration - false, // m_bUsedForHowToPlay - "iversus", // m_szName - StepsType_kickbox_insect, // m_StepsType - StyleType_TwoPlayersTwoSides, // m_StyleType - 6, // m_iColsPerPlayer - { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_3, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_6, +KICKBOX_COL_SPACING*2.5f, NULL }, - }, - { // PLAYER_2 - { TRACK_1, -KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_3, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_4, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_6, +KICKBOX_COL_SPACING*2.5f, NULL }, - }, - }, - { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { 0, 0, 1, 2, 3, 4, 5, 5, Style::END_MAPPING }, - { 0, 0, 1, 2, 3, 4, 5, 5, Style::END_MAPPING } - }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 0, 1, 2, 3, 4, 5 - }, - false, // m_bCanUseBeginnerHelper - false, // m_bLockDifficulties -}; - -static const Style g_Style_Kickbox_Arachnid= -{ - true, // m_bUsedForGameplay - true, // m_bUsedForEdit - true, // m_bUsedForDemonstration - true, // m_bUsedForHowToPlay - "arachnid", // m_szName - StepsType_kickbox_arachnid, // m_StepsType - StyleType_OnePlayerOneSide, // m_StyleType - 8, // m_iColsPerPlayer - { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KICKBOX_COL_SPACING*3.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_3, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_4, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_6, +KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_7, +KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_8, +KICKBOX_COL_SPACING*3.5f, NULL }, - }, - { // PLAYER_2 - { TRACK_1, -KICKBOX_COL_SPACING*3.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_3, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_4, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_6, +KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_7, +KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_8, +KICKBOX_COL_SPACING*3.5f, NULL }, - }, - }, - { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { 0, 1, 2, 3, 4, 5, 6, 7, Style::END_MAPPING }, - { 0, 1, 2, 3, 4, 5, 6, 7, Style::END_MAPPING } - }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 0, 1, 2, 3, 4, 5, 6, 7 - }, - false, // m_bCanUseBeginnerHelper - false, // m_bLockDifficulties -}; - -static const Style g_Style_Kickbox_Arachnid_Versus= -{ - true, // m_bUsedForGameplay - false, // m_bUsedForEdit - true, // m_bUsedForDemonstration - false, // m_bUsedForHowToPlay - "aversus", // m_szName - StepsType_kickbox_arachnid, // m_StepsType - StyleType_TwoPlayersTwoSides, // m_StyleType - 8, // m_iColsPerPlayer - { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; - { // PLAYER_1 - { TRACK_1, -KICKBOX_COL_SPACING*3.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_3, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_4, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_6, +KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_7, +KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_8, +KICKBOX_COL_SPACING*3.5f, NULL }, - }, - { // PLAYER_2 - { TRACK_1, -KICKBOX_COL_SPACING*3.5f, NULL }, - { TRACK_2, -KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_3, -KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_4, -KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_5, +KICKBOX_COL_SPACING*0.5f, NULL }, - { TRACK_6, +KICKBOX_COL_SPACING*1.5f, NULL }, - { TRACK_7, +KICKBOX_COL_SPACING*2.5f, NULL }, - { TRACK_8, +KICKBOX_COL_SPACING*3.5f, NULL }, - }, - }, - { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { 0, 1, 2, 3, 4, 5, 6, 7, Style::END_MAPPING }, - { 0, 1, 2, 3, 4, 5, 6, 7, Style::END_MAPPING } - }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 0, 1, 2, 3, 4, 5, 6, 7 - }, - false, // m_bCanUseBeginnerHelper - false, // m_bLockDifficulties -}; - -static const Style* g_apGame_Kickbox_Styles[] = -{ - &g_Style_Kickbox_Human, - &g_Style_Kickbox_Quadarm, - &g_Style_Kickbox_Insect, - &g_Style_Kickbox_Arachnid, - &g_Style_Kickbox_Human_Versus, - &g_Style_Kickbox_Quadarm_Versus, - &g_Style_Kickbox_Insect_Versus, - &g_Style_Kickbox_Arachnid_Versus, - NULL -}; - -static const Game g_Game_Kickbox = -{ - "kickbox", // m_szName - g_apGame_Kickbox_Styles, // m_apStyles - true, // m_bCountNotesSeparately - false, // m_bTickHolds - true, // m_PlayersHaveSeparateStyles - { // m_InputScheme - "kickbox", // m_szName - NUM_KICKBOX_BUTTONS, // m_iButtonsPerController - { // m_szButtonNames - { "DownLeftFoot", GameButton_Invalid }, - { "UpLeftFoot", GameButton_Invalid }, - { "UpLeftFist", GAME_BUTTON_LEFT }, - { "DownLeftFist", GAME_BUTTON_UP }, - { "DownRightFist", GAME_BUTTON_DOWN }, - { "UpRightFist", GAME_BUTTON_RIGHT }, - { "UpRightFoot", GameButton_Invalid }, - { "DownRightFoot", GameButton_Invalid }, - }, - &g_AutoKeyMappings_Kickbox - }, - { - { GameButtonType_Step }, - { GameButtonType_Step }, - { GameButtonType_Step }, - { GameButtonType_Step }, - { GameButtonType_Step }, - { GameButtonType_Step }, - { GameButtonType_Step }, - { GameButtonType_Step }, - }, - TNS_W1, // m_mapW1To - TNS_W2, // m_mapW2To - TNS_W3, // m_mapW3To - TNS_W4, // m_mapW4To - TNS_W5, // m_mapW5To -}; - static const Game *g_Games[] = { &g_Game_Dance, @@ -3136,7 +2744,6 @@ static const Game *g_Games[] = &g_Game_Maniax, &g_Game_Techno, &g_Game_Popn, - &g_Game_Kickbox, }; GameManager::GameManager() diff --git a/src/NoteDataUtil.cpp b/src/NoteDataUtil.cpp index 6bae9bbcd9..9fc5852455 100644 --- a/src/NoteDataUtil.cpp +++ b/src/NoteDataUtil.cpp @@ -1363,72 +1363,6 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu iTakeFromTrack[8] = 0; iTakeFromTrack[9] = 1; break; - case StepsType_kickbox_human: - if(iRandChoice == 1) - { - iTakeFromTrack[0]= 3; - iTakeFromTrack[3]= 0; - } - if(iRandChoice == 2) - { - iTakeFromTrack[1]= 2; - iTakeFromTrack[2]= 1; - } - break; - case StepsType_kickbox_quadarm: - if(iRandChoice == 1) - { - iTakeFromTrack[0]= 1; - iTakeFromTrack[1]= 0; - iTakeFromTrack[2]= 3; - iTakeFromTrack[3]= 2; - } - if(iRandChoice == 2) - { - iTakeFromTrack[1]= 2; - iTakeFromTrack[2]= 1; - } - break; - case StepsType_kickbox_insect: - if(iRandChoice == 1) - { - iTakeFromTrack[1]= 2; - iTakeFromTrack[2]= 1; - iTakeFromTrack[3]= 4; - iTakeFromTrack[4]= 3; - } - if(iRandChoice == 2) - { - iTakeFromTrack[1]= 4; - iTakeFromTrack[2]= 3; - iTakeFromTrack[3]= 2; - iTakeFromTrack[4]= 1; - } - break; - case StepsType_kickbox_arachnid: - if(iRandChoice == 1) - { - iTakeFromTrack[0]= 1; - iTakeFromTrack[1]= 0; - iTakeFromTrack[2]= 3; - iTakeFromTrack[3]= 2; - iTakeFromTrack[4]= 5; - iTakeFromTrack[5]= 4; - iTakeFromTrack[6]= 7; - iTakeFromTrack[7]= 6; - } - if(iRandChoice == 2) - { - iTakeFromTrack[0]= 6; - iTakeFromTrack[1]= 7; - iTakeFromTrack[2]= 4; - iTakeFromTrack[3]= 5; - iTakeFromTrack[4]= 2; - iTakeFromTrack[5]= 3; - iTakeFromTrack[6]= 0; - iTakeFromTrack[7]= 1; - } - break; default: break; } break; @@ -1467,36 +1401,6 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu iTakeFromTrack[6] = 7; iTakeFromTrack[7] = 6; break; - case StepsType_kickbox_human: - iTakeFromTrack[0]= 1; - iTakeFromTrack[1]= 0; - iTakeFromTrack[2]= 3; - iTakeFromTrack[3]= 2; - break; - case StepsType_kickbox_quadarm: - iTakeFromTrack[0]= 1; - iTakeFromTrack[1]= 0; - iTakeFromTrack[2]= 3; - iTakeFromTrack[3]= 2; - break; - case StepsType_kickbox_insect: - iTakeFromTrack[0]= 1; - iTakeFromTrack[1]= 4; - iTakeFromTrack[2]= 3; - iTakeFromTrack[3]= 2; - iTakeFromTrack[4]= 1; - iTakeFromTrack[5]= 4; - break; - case StepsType_kickbox_arachnid: - iTakeFromTrack[0]= 5; - iTakeFromTrack[1]= 4; - iTakeFromTrack[2]= 5; - iTakeFromTrack[3]= 4; - iTakeFromTrack[4]= 3; - iTakeFromTrack[5]= 2; - iTakeFromTrack[6]= 1; - iTakeFromTrack[7]= 0; - break; default: break; }