actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ez2dancer "Hard" now a totally different style.

Browse Source
This commit is contained in:
Andrew Livy
2002-07-22 20:51:51 +00:00
parent e096178eb4
commit 83d773d239
4 changed files with 73 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.h
+14
View File
@@ -183,9 +183,11 @@ enum NotesType
NOTES_TYPE_PUMP_SINGLE,
NOTES_TYPE_PUMP_DOUBLE,
NOTES_TYPE_EZ2_SINGLE,
NOTES_TYPE_EZ2_SINGLE_HARD,
NOTES_TYPE_EZ2_DOUBLE,
NOTES_TYPE_EZ2_REAL,
NOTES_TYPE_EZ2_SINGLE_VERSUS,
NOTES_TYPE_EZ2_SINGLE_HARD_VERSUS,
NOTES_TYPE_EZ2_REAL_VERSUS,
NUM_NOTES_TYPES, // leave this at the end
NOTES_TYPE_INVALID,
@@ -202,9 +204,11 @@ inline int NotesTypeToNumTracks( NotesType nt )
case NOTES_TYPE_PUMP_SINGLE: return 5;
case NOTES_TYPE_PUMP_DOUBLE: return 10;
case NOTES_TYPE_EZ2_SINGLE: return 5; // Single: TL,LHH,D,RHH,TR
case NOTES_TYPE_EZ2_SINGLE_HARD: return 5; // Single: TL,LHH,D,RHH,TR
case NOTES_TYPE_EZ2_DOUBLE: return 10; // Double: Single x2
case NOTES_TYPE_EZ2_REAL: return 7; // Real: TL,LHH,LHL,D,RHL,RHH,TR
case NOTES_TYPE_EZ2_SINGLE_VERSUS: return 10;
case NOTES_TYPE_EZ2_SINGLE_HARD_VERSUS: return 10;
case NOTES_TYPE_EZ2_REAL_VERSUS: return 10;
default: ASSERT(0); return -1; // invalid NotesType
}
@@ -220,6 +224,7 @@ inline NotesType StringToNotesType( CString sNotesType )
else if( sNotesType == "pump-single" ) return NOTES_TYPE_PUMP_SINGLE;
else if( sNotesType == "pump-double" ) return NOTES_TYPE_PUMP_DOUBLE;
else if( sNotesType == "ez2-single" ) return NOTES_TYPE_EZ2_SINGLE;
else if( sNotesType == "ez2-single-hard" ) return NOTES_TYPE_EZ2_SINGLE_HARD;
else if( sNotesType == "ez2-double" ) return NOTES_TYPE_EZ2_DOUBLE;
else if( sNotesType == "ez2-real" ) return NOTES_TYPE_EZ2_REAL;
// else if( sNotesType == "ez2-real-versus" ) return NOTES_TYPE_EZ2_REAL_VERSUS;
@@ -238,6 +243,7 @@ inline CString NotesTypeToString( NotesType nt )
case NOTES_TYPE_PUMP_SINGLE: return "pump-single";
case NOTES_TYPE_PUMP_DOUBLE: return "pump-double";
case NOTES_TYPE_EZ2_SINGLE: return "ez2-single";
case NOTES_TYPE_EZ2_SINGLE_HARD: return "ez2-single-hard";
case NOTES_TYPE_EZ2_DOUBLE: return "ez2-double";
case NOTES_TYPE_EZ2_REAL: return "ez2-real";
// case NOTES_TYPE_EZ2_REAL_VERSUS: return "ez2-real-versus";
@@ -309,9 +315,11 @@ enum Style
STYLE_PUMP_VERSUS,
STYLE_PUMP_DOUBLE,
STYLE_EZ2_SINGLE,
STYLE_EZ2_SINGLE_HARD,
STYLE_EZ2_DOUBLE,
STYLE_EZ2_REAL,
STYLE_EZ2_SINGLE_VERSUS,
STYLE_EZ2_SINGLE_HARD_VERSUS,
STYLE_EZ2_REAL_VERSUS,
NUM_STYLES, // leave this at the end
STYLE_NONE,
@@ -332,9 +340,11 @@ inline Game StyleToGame( Style s )
case STYLE_PUMP_DOUBLE:
return GAME_PUMP;
case STYLE_EZ2_SINGLE:
case STYLE_EZ2_SINGLE_HARD:
case STYLE_EZ2_DOUBLE:
case STYLE_EZ2_REAL:
case STYLE_EZ2_SINGLE_VERSUS:
case STYLE_EZ2_SINGLE_HARD_VERSUS:
case STYLE_EZ2_REAL_VERSUS:
return GAME_EZ2;
default:
@@ -502,7 +512,9 @@ inline Style NotesTypeToStyle ( NotesType nt )
case NOTES_TYPE_EZ2_REAL: return STYLE_EZ2_REAL;
case NOTES_TYPE_EZ2_REAL_VERSUS: return STYLE_EZ2_REAL_VERSUS;
case NOTES_TYPE_EZ2_SINGLE: return STYLE_EZ2_SINGLE;
case NOTES_TYPE_EZ2_SINGLE_HARD: return STYLE_EZ2_SINGLE_HARD;
case NOTES_TYPE_EZ2_SINGLE_VERSUS: return STYLE_EZ2_SINGLE_VERSUS;
case NOTES_TYPE_EZ2_SINGLE_HARD_VERSUS: return STYLE_EZ2_SINGLE_HARD_VERSUS;
case NOTES_TYPE_INVALID: return STYLE_NONE;
case NOTES_TYPE_PUMP_DOUBLE: return STYLE_PUMP_DOUBLE;
case NOTES_TYPE_PUMP_SINGLE: return STYLE_PUMP_SINGLE;
@@ -526,7 +538,9 @@ inline NotesType StyleToNotesType ( Style s )
case STYLE_EZ2_REAL: return NOTES_TYPE_EZ2_REAL;
case STYLE_EZ2_REAL_VERSUS: return NOTES_TYPE_EZ2_REAL_VERSUS;
case STYLE_EZ2_SINGLE: return NOTES_TYPE_EZ2_SINGLE;
case STYLE_EZ2_SINGLE_HARD: return NOTES_TYPE_EZ2_SINGLE_HARD;
case STYLE_EZ2_SINGLE_VERSUS: return NOTES_TYPE_EZ2_SINGLE_VERSUS;
case STYLE_EZ2_SINGLE_HARD_VERSUS: return NOTES_TYPE_EZ2_SINGLE_HARD_VERSUS;
case STYLE_NONE: return NOTES_TYPE_INVALID;
case STYLE_PUMP_DOUBLE: return NOTES_TYPE_PUMP_DOUBLE;
case STYLE_PUMP_SINGLE: return NOTES_TYPE_PUMP_SINGLE;
stepmania/src/GameManager.cpp
+54
View File
@@ -403,6 +403,33 @@ StyleDef g_StyleDefs[NUM_STYLES] =
// 0,1,2,3,4
},
},
{ // EZ2_STYLE_SINGLE_HARD
"ez2-single-hard", // m_szName
NOTES_TYPE_EZ2_SINGLE_HARD, // m_NotesType
StyleDef::ONE_PLAYER_USES_ONE_SIDE, // m_StyleType
{ 160, 480 }, // m_iCenterX
5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*1.0f }, // CHANGE THESE WHEN WE CAN SEE THE
{ TRACK_2, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*0.5f }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*0.5f },
{ TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*1.0f },
},
{ // PLAYER_2
{ TRACK_1, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE
{ TRACK_2, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_4, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 },
{ TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 },
},
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
2,0,4,1,3 // This should be from back to front: Down, UpLeft, UpRight, Upper Left Hand, Upper Right Hand
// 0,1,2,3,4
},
},
{ // EZ2_STYLE_DOUBLE
"ez2-double", // m_szName
NOTES_TYPE_EZ2_DOUBLE, // m_NotesType
@@ -495,6 +522,33 @@ StyleDef g_StyleDefs[NUM_STYLES] =
2,0,4,1,3 // This should be from back to front: Down, UpLeft, UpRight, Upper Left Hand, Upper Right Hand
},
},
{ // EZ2_STYLE_SINGLE_VERSUS
"ez2-single-hard-versus", // m_szName
NOTES_TYPE_EZ2_SINGLE_HARD, // m_NotesType
StyleDef::TWO_PLAYERS_USE_TWO_SIDES, // m_StyleType
{ 160, 480 }, // m_iCenterX
5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_1, INSTRUMENT_1, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE
{ TRACK_2, INSTRUMENT_1, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_1, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_4, INSTRUMENT_1, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 },
{ TRACK_5, INSTRUMENT_1, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 },
},
{ // PLAYER_2
{ TRACK_1, INSTRUMENT_2, EZ2_BUTTON_UPLEFT, -EZ2_COL_SPACING*2 }, // CHANGE THESE WHEN WE CAN SEE THE
{ TRACK_2, INSTRUMENT_2, EZ2_BUTTON_UPLEFTHAND, -EZ2_COL_SPACING*1 }, // NOTES IN-GAME !!!!!!!!!!
{ TRACK_3, INSTRUMENT_2, EZ2_BUTTON_DOWN, +EZ2_COL_SPACING*0 },
{ TRACK_4, INSTRUMENT_2, EZ2_BUTTON_UPRIGHTHAND, +EZ2_COL_SPACING*1 },
{ TRACK_5, INSTRUMENT_2, EZ2_BUTTON_UPRIGHT, +EZ2_COL_SPACING*2 },
},
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
2,0,4,1,3 // This should be from back to front: Down, UpLeft, UpRight, Upper Left Hand, Upper Right Hand
},
},
{ // EZ2_STYLE_REAL_VERSUS
"ez2-real-versus", // m_szName
NOTES_TYPE_EZ2_REAL, // m_NotesType
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
}
else if (l == 5 && GAMEMAN->m_CurGame == GAME_EZ2 ) // sneakily use this one for the max combo.
{
if (p == PLAYER_ )
if (p == PLAYER_1 )
{
m_textJudgeNumbers[l][p].SetXY( JUDGE_NUMBERS_X_EZ2[p]-40, JUDGE_EZ2_COOL_Y + 180);
}
stepmania/src/ScreenEz2SelectStyle.cpp
+4 -36
View File
@@ -325,16 +325,12 @@ void ScreenEz2SelectStyle::HandleScreenMessage( const ScreenMessage SM )
if (m_iSelectedStyle == 0) // easy
{
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS;
PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY;
PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_EASY;
}
else if (m_iSelectedStyle == 1) // hard
{
// m_soundInvalid.PlayRandom();
// return;
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS;
PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_MEDIUM;
PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_MEDIUM;
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_HARD_VERSUS;
}
else if (m_iSelectedStyle == 2) // real
{
@@ -349,26 +345,10 @@ void ScreenEz2SelectStyle::HandleScreenMessage( const ScreenMessage SM )
if (m_iSelectedStyle == 0) // easy
{
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE;
if (m_iSelectedPlayer == 0)
{
PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY;
}
else
{
PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_EASY;
}
}
else if (m_iSelectedStyle == 1) // hard
{
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE;
if (m_iSelectedPlayer == 0)
{
PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_MEDIUM;
}
else
{
PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_MEDIUM;
}
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_HARD;
}
else if (m_iSelectedStyle == 2) // real
{
@@ -739,22 +719,14 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p )
if (m_iSelectedStyle == 0 || m_iSelectedStyle == 3) // easy
{
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS;
PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_EASY;
PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_EASY;
}
else if (m_iSelectedStyle == 1) // hard
{
// m_soundInvalid.PlayRandom();
// return;
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_VERSUS;
PREFSMAN->m_PreferredDifficultyClass[PLAYER_1] = CLASS_MEDIUM;
PREFSMAN->m_PreferredDifficultyClass[PLAYER_2] = CLASS_MEDIUM;
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_HARD_VERSUS;
}
else if (m_iSelectedStyle == 2) // real
{
GAMEMAN->m_CurStyle = STYLE_EZ2_REAL_VERSUS;
//m_soundInvalid.PlayRandom();
//return;
}
}
@@ -763,14 +735,10 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p )
if (m_iSelectedStyle == 0) // easy
{
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE;
PREFSMAN->m_PreferredDifficultyClass[p] = CLASS_EASY;
}
else if (m_iSelectedStyle == 1) // hard
{
// m_soundInvalid.PlayRandom();
// return;
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE;
PREFSMAN->m_PreferredDifficultyClass[p] = CLASS_MEDIUM;
GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE_HARD;
}
else if (m_iSelectedStyle == 2) // real
{