From 5af28f3fb1aabc94bba765bbbae08fadb0bb00a7 Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Tue, 7 Oct 2003 00:01:32 +0000 Subject: [PATCH] Added: Pop'n Music Gametype. --- stepmania/src/Game.h | 1 + stepmania/src/GameConstantsAndTypes.h | 2 + stepmania/src/GameInput.h | 22 +++++++++ stepmania/src/GameManager.cpp | 70 +++++++++++++++++++++++++++ stepmania/src/ScreenCredits.cpp | 1 + stepmania/src/Style.h | 2 + 6 files changed, 98 insertions(+) diff --git a/stepmania/src/Game.h b/stepmania/src/Game.h index 4aac82d887..58ad8eccf2 100644 --- a/stepmania/src/Game.h +++ b/stepmania/src/Game.h @@ -21,6 +21,7 @@ enum Game GAME_BM, // Beatmania GAME_MANIAX, // DanceManiax GAME_TECHNO, // TechnoMotion + GAME_PNM, // pop n music NUM_GAMES, // leave this at the end GAME_INVALID, }; diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 91571f16ec..a83ad568fb 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -84,6 +84,8 @@ enum StepsType STEPS_TYPE_MANIAX_SINGLE, STEPS_TYPE_MANIAX_DOUBLE, STEPS_TYPE_TECHNO_SINGLE8, + STEPS_TYPE_PNM_FIVE, + STEPS_TYPE_PNM_NINE, NUM_STEPS_TYPES, // leave this at the end STEPS_TYPE_INVALID, }; diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h index bb82eb166b..5bb3d90ee4 100644 --- a/stepmania/src/GameInput.h +++ b/stepmania/src/GameInput.h @@ -179,6 +179,28 @@ enum // TechnoButtons NUM_TECHNO_BUTTONS, // leave this at the end }; +enum // PnM Buttons +{ + PNM_BUTTON_LEFT_WHITE, + PNM_BUTTON_LEFT_YELLOW, + PNM_BUTTON_LEFT_GREEN, + PNM_BUTTON_LEFT_BLUE, + PNM_BUTTON_RED, + PNM_BUTTON_RIGHT_BLUE, + PNM_BUTTON_RIGHT_GREEN, + PNM_BUTTON_RIGHT_YELLOW, + PNM_BUTTON_RIGHT_WHITE, + PNM_BUTTON_START, + PNM_BUTTON_BACK, + PNM_BUTTON_MENULEFT, + PNM_BUTTON_MENURIGHT, + PNM_BUTTON_MENUUP, + PNM_BUTTON_MENUDOWN, + PNM_BUTTON_COIN, + PNM_BUTTON_OPERATOR, + NUM_PNM_BUTTONS, // leave this at the end +}; + const GameButton MAX_GAME_BUTTONS = 20; const GameButton GAME_BUTTON_INVALID = MAX_GAME_BUTTONS+1; diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index c8d0cf1d5b..160ae1eb00 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -34,6 +34,8 @@ const int DS3DDX_COL_SPACING = 46; const int BM_COL_SPACING=34; const int MANIAX_COL_SPACING = 36; const int TECHNO_COL_SPACING = 64; +const int PNM5_COL_SPACING = 46; +const int PNM9_COL_SPACING = 46; struct { char *name; @@ -56,6 +58,8 @@ struct { { "maniax-single", 4 }, { "maniax-double", 8 }, { "techno-single8", 8 }, + { "pnm-five", 5 }, + { "pnm-nine", 9 }, }; // @@ -1605,6 +1609,72 @@ StyleDef g_StyleDefs[NUM_STYLES] = 0,1,2,3,4,5,6,7 }, }, + { // STYLE_PNM_FIVE + GAME_PNM, // m_Game + true, // m_bUsedForGameplay + true, // m_bUsedForEdit + "pnm-five", // m_szName + STEPS_TYPE_PNM_FIVE, // m_StepsType + StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType + { 320, 320 }, // m_iCenterX + 5, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_GREEN, -PNM5_COL_SPACING*1.5f }, + { TRACK_2, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_BLUE, -PNM5_COL_SPACING*0.5f }, + { TRACK_3, GAME_CONTROLLER_1, PNM_BUTTON_RED, -PNM5_COL_SPACING*0.0f }, + { TRACK_4, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_BLUE, +PNM5_COL_SPACING*0.5f }, + { TRACK_5, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_GREEN, +PNM5_COL_SPACING*1.5f }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_GREEN, -PNM5_COL_SPACING*1.5f }, + { TRACK_2, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_BLUE, -PNM5_COL_SPACING*0.5f }, + { TRACK_3, GAME_CONTROLLER_2, PNM_BUTTON_RED, -PNM5_COL_SPACING*0.0f }, + { TRACK_4, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_BLUE, +PNM5_COL_SPACING*0.5f }, + { TRACK_5, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_GREEN, +PNM5_COL_SPACING*1.5f }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,1,2,3,4 + }, + }, + { // STYLE_PNM_FIVE + GAME_PNM, // m_Game + true, // m_bUsedForGameplay + true, // m_bUsedForEdit + "pnm-nine", // m_szName + STEPS_TYPE_PNM_NINE, // m_StepsType + StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType + { 320, 320 }, // m_iCenterX + 9, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_WHITE, -PNM9_COL_SPACING*3.5f }, + { TRACK_2, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_YELLOW, -PNM9_COL_SPACING*2.5f }, + { TRACK_3, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_GREEN, -PNM9_COL_SPACING*1.5f }, + { TRACK_4, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_BLUE, -PNM9_COL_SPACING*0.5f }, + { TRACK_5, GAME_CONTROLLER_1, PNM_BUTTON_RED, -PNM9_COL_SPACING*0.0f }, + { TRACK_6, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_BLUE, +PNM9_COL_SPACING*0.5f }, + { TRACK_7, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_GREEN, +PNM9_COL_SPACING*1.5f }, + { TRACK_8, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_YELLOW, +PNM9_COL_SPACING*2.5f }, + { TRACK_9, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_WHITE, +PNM9_COL_SPACING*3.5f }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_WHITE, -PNM9_COL_SPACING*3.5f }, + { TRACK_2, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_YELLOW, -PNM9_COL_SPACING*2.5f }, + { TRACK_3, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_GREEN, -PNM9_COL_SPACING*1.5f }, + { TRACK_4, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_BLUE, -PNM9_COL_SPACING*0.5f }, + { TRACK_5, GAME_CONTROLLER_2, PNM_BUTTON_RED, -PNM9_COL_SPACING*0.0f }, + { TRACK_6, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_BLUE, +PNM9_COL_SPACING*0.5f }, + { TRACK_7, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_GREEN, +PNM9_COL_SPACING*1.5f }, + { TRACK_8, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_YELLOW, +PNM9_COL_SPACING*2.5f }, + { TRACK_9, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_WHITE, +PNM9_COL_SPACING*3.5f }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,1,2,3,4,5,6,7,8 + }, + }, }; diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index 25d69ce704..a60f7cf0ea 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -132,6 +132,7 @@ const CreditLine CREDIT_LINES[] = {0,"NMR"}, {0,"Random Hajile"}, {0,"Chocobo Ghost"}, + {0,"Tyma"}, {0,"Lagged"}, {0,"The Melting Pot"}, {0,"DDRJamz Global BBS"}, diff --git a/stepmania/src/Style.h b/stepmania/src/Style.h index 2d47bad772..2d34fe6d40 100644 --- a/stepmania/src/Style.h +++ b/stepmania/src/Style.h @@ -37,6 +37,8 @@ enum Style STYLE_MANIAX_VERSUS, STYLE_MANIAX_DOUBLE, STYLE_TECHNO_SINGLE8, + STYLE_PNM_FIVE, + STYLE_PNM_NINE, NUM_STYLES, // leave this at the end STYLE_INVALID, };