NEW FEATURE: Added 0.25x scroll speed
CHANGE: Reorganized options on Player Options screen NEW FEATURE: New modifier: Acceleration-Land NEW FEATURE: New modifier: Acceleration-Expand NEW FEATURE: New modifier: Acceleration-Boomerang CHANGE: Tweaked Acceleration-Wave for more of a challenge CHANGE: Changed format NoteSkin tap graphic format. Existing NoteSkins will need to update the tap graphic.
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
|
||||
enum {
|
||||
PO_SPEED = 0,
|
||||
PO_BOOST,
|
||||
PO_ACCEL,
|
||||
PO_EFFECT,
|
||||
PO_APPEAR,
|
||||
PO_TURN,
|
||||
@@ -34,10 +34,10 @@ enum {
|
||||
NUM_PLAYER_OPTIONS_LINES
|
||||
};
|
||||
OptionRowData g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
|
||||
{ "Speed", 9, {"x0.5","x0.75","x1","x1.5","x2","x3","x4","x5","x8"} },
|
||||
{ "Boost", 2, {"OFF","ON"} },
|
||||
{ "Effect", 8, {"OFF","WAVE", "DRUNK", "DIZZY","SPACE","MINI","FLIP","TORNADO"} },
|
||||
{ "Appear\n-ance", 5, {"VISIBLE","HIDDEN","SUDDEN","STEALTH", "BLINK"} },
|
||||
{ "Speed", 10, {"x0.25","x0.5","x0.75","x1","x1.5","x2","x3","x4","x5","x8"} },
|
||||
{ "Acceler\n-ation",6, {"OFF","BOOST","LAND","WAVE","EXPAND","BOOMERANG"} },
|
||||
{ "Effect", 7, {"OFF","DRUNK","DIZZY","SPACE","MINI","FLIP","TORNADO"} },
|
||||
{ "Appear\n-ance", 5, {"VISIBLE","HIDDEN","SUDDEN","STEALTH","BLINK"} },
|
||||
{ "Turn", 6, {"OFF","MIRROR","LEFT","RIGHT","SHUFFLE","SUPER SHUFFLE"} },
|
||||
{ "Little", 2, {"OFF","ON"} },
|
||||
{ "Scroll", 2, {"STANDARD","REVERSE"} },
|
||||
@@ -72,18 +72,19 @@ void ScreenPlayerOptions::ImportOptions()
|
||||
{
|
||||
PlayerOptions &po = GAMESTATE->m_PlayerOptions[p];
|
||||
|
||||
if( po.m_fArrowScrollSpeed == 0.5f ) m_iSelectedOption[p][PO_SPEED] = 0;
|
||||
else if( po.m_fArrowScrollSpeed == 0.75f) m_iSelectedOption[p][PO_SPEED] = 1;
|
||||
else if( po.m_fArrowScrollSpeed == 1.0f ) m_iSelectedOption[p][PO_SPEED] = 2;
|
||||
else if( po.m_fArrowScrollSpeed == 1.5f ) m_iSelectedOption[p][PO_SPEED] = 3;
|
||||
else if( po.m_fArrowScrollSpeed == 2.0f ) m_iSelectedOption[p][PO_SPEED] = 4;
|
||||
else if( po.m_fArrowScrollSpeed == 3.0f ) m_iSelectedOption[p][PO_SPEED] = 5;
|
||||
else if( po.m_fArrowScrollSpeed == 4.0f ) m_iSelectedOption[p][PO_SPEED] = 6;
|
||||
else if( po.m_fArrowScrollSpeed == 5.0f ) m_iSelectedOption[p][PO_SPEED] = 7;
|
||||
else if( po.m_fArrowScrollSpeed == 8.0f ) m_iSelectedOption[p][PO_SPEED] = 8;
|
||||
else m_iSelectedOption[p][PO_SPEED] = 2;
|
||||
if( po.m_fScrollSpeed == 0.25f ) m_iSelectedOption[p][PO_SPEED] = 0;
|
||||
else if( po.m_fScrollSpeed == 0.5f ) m_iSelectedOption[p][PO_SPEED] = 1;
|
||||
else if( po.m_fScrollSpeed == 0.75f) m_iSelectedOption[p][PO_SPEED] = 2;
|
||||
else if( po.m_fScrollSpeed == 1.0f ) m_iSelectedOption[p][PO_SPEED] = 3;
|
||||
else if( po.m_fScrollSpeed == 1.5f ) m_iSelectedOption[p][PO_SPEED] = 4;
|
||||
else if( po.m_fScrollSpeed == 2.0f ) m_iSelectedOption[p][PO_SPEED] = 5;
|
||||
else if( po.m_fScrollSpeed == 3.0f ) m_iSelectedOption[p][PO_SPEED] = 6;
|
||||
else if( po.m_fScrollSpeed == 4.0f ) m_iSelectedOption[p][PO_SPEED] = 7;
|
||||
else if( po.m_fScrollSpeed == 5.0f ) m_iSelectedOption[p][PO_SPEED] = 8;
|
||||
else if( po.m_fScrollSpeed == 8.0f ) m_iSelectedOption[p][PO_SPEED] = 9;
|
||||
else m_iSelectedOption[p][PO_SPEED] = 3;
|
||||
|
||||
m_iSelectedOption[p][PO_BOOST] = po.m_bBoost ? 1 : 0;
|
||||
m_iSelectedOption[p][PO_ACCEL] = po.m_AccelType;
|
||||
|
||||
for( int i=0; i<PlayerOptions::NUM_EFFECT_TYPES; i++ )
|
||||
{
|
||||
@@ -109,18 +110,19 @@ void ScreenPlayerOptions::ExportOptions()
|
||||
|
||||
switch( m_iSelectedOption[p][PO_SPEED] )
|
||||
{
|
||||
case 0: po.m_fArrowScrollSpeed = 0.5f; break;
|
||||
case 1: po.m_fArrowScrollSpeed = 0.75f; break;
|
||||
case 2: po.m_fArrowScrollSpeed = 1.0f; break;
|
||||
case 3: po.m_fArrowScrollSpeed = 1.5f; break;
|
||||
case 4: po.m_fArrowScrollSpeed = 2.0f; break;
|
||||
case 5: po.m_fArrowScrollSpeed = 3.0f; break;
|
||||
case 6: po.m_fArrowScrollSpeed = 4.0f; break;
|
||||
case 7: po.m_fArrowScrollSpeed = 5.0f; break;
|
||||
case 8: po.m_fArrowScrollSpeed = 8.0f; break;
|
||||
case 0: po.m_fScrollSpeed = 0.25f; break;
|
||||
case 1: po.m_fScrollSpeed = 0.5f; break;
|
||||
case 2: po.m_fScrollSpeed = 0.75f; break;
|
||||
case 3: po.m_fScrollSpeed = 1.0f; break;
|
||||
case 4: po.m_fScrollSpeed = 1.5f; break;
|
||||
case 5: po.m_fScrollSpeed = 2.0f; break;
|
||||
case 6: po.m_fScrollSpeed = 3.0f; break;
|
||||
case 7: po.m_fScrollSpeed = 4.0f; break;
|
||||
case 8: po.m_fScrollSpeed = 5.0f; break;
|
||||
case 9: po.m_fScrollSpeed = 8.0f; break;
|
||||
}
|
||||
|
||||
po.m_bBoost = (m_iSelectedOption[p][PO_BOOST] == 1);
|
||||
po.m_AccelType = (PlayerOptions::AccelType)m_iSelectedOption[p][PO_ACCEL];
|
||||
|
||||
ZERO( po.m_bEffects );
|
||||
if( m_iSelectedOption[p][PO_EFFECT] > 0 )
|
||||
|
||||
Reference in New Issue
Block a user