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

Added a code that changes the scroll speed in reverse order.

Browse Source 
Pump style screen now has Mirror and Random icons.
This commit is contained in:
Andrew Livy
2003-01-16 23:31:34 +00:00
parent 0b91c86e6f
commit a14de6f9ff
4 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+9
View File
@@ -237,6 +237,14 @@ SpeedIconP1X=40
SpeedIconP2X=600
SpeedIconP1Y=200
SpeedIconP2Y=200
MirrorIconP1X=40
MirrorIconP2X=600
MirrorIconP1Y=280
MirrorIconP2Y=280
ShuffleIconP1X=40
ShuffleIconP2X=600
ShuffleIconP1Y=320
ShuffleIconP2Y=320
PreviewMusicMode=0 // 0 = play music as you select, 1 = no music plays, select once and preview music plays, select again for confirm, 2 = no music plays at all.
[ScreenSelectCourse]
@@ -650,6 +658,7 @@ Shuffle=Down,Up,Down,Up
SuperShuffle=Down,Up,Left,Right
Little=
NextScrollSpeed=
PreviousScrollSpeed=
Boost=Left,Right,Down,Up
NextEffect=Left,Down,Right
NextAppearance=Left,Up,Right
stepmania/src/CodeDetector.cpp
+4
View File
@@ -32,6 +32,7 @@ enum Code {
CODE_SUPER_SHUFFLE,
CODE_LITTLE,
CODE_NEXT_SCROLL_SPEED,
CODE_PREVIOUS_SCROLL_SPEED,
CODE_BOOST,
CODE_NEXT_EFFECT,
CODE_NEXT_APPEARANCE,
@@ -58,6 +59,7 @@ const CString g_sCodeNames[NUM_CODES] = {
"SuperShuffle",
"Little",
"NextScrollSpeed",
"PreviousScrollSpeed",
"Boost",
"NextEffect",
"NextAppearance",
@@ -151,6 +153,7 @@ bool CodeDetector::EnteredNextSort( GameController controller )
#define TOGGLE(v,a,b) if(v!=a) v=a; else v=b;
#define INCREMENT_SCROLL_SPEED(s) (s==0.5f) ? s=0.75f : (s==0.75f) ? s=1.0f : (s==1.0f) ? s=1.5f : (s==1.5f) ? s=2.0f : (s==2.0f) ? s=3.0f : (s==3.0f) ? s=4.0f : (s==4.0f) ? s=5.0f : (s==5.0f) ? s=8.0f : s=0.5f;
#define DECREMENT_SCROLL_SPEED(s) (s==0.75f) ? s=0.5f : (s==1.0f) ? s=0.75f : (s==1.5f) ? s=1.0f : (s==2.0f) ? s=1.5f : (s==3.0f) ? s=2.0f : (s==4.0f) ? s=3.0f : (s==5.0f) ? s=4.0f : (s==8.0f) ? s=4.0f : s=8.0f;
bool CodeDetector::DetectAndAdjustOptions( GameController controller )
{
@@ -172,6 +175,7 @@ bool CodeDetector::DetectAndAdjustOptions( GameController controller )
case CODE_SUPER_SHUFFLE: TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_TurnType, PlayerOptions::TURN_SUPER_SHUFFLE, PlayerOptions::TURN_NONE ); break;
case CODE_LITTLE: TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_bLittle, true, false ); break;
case CODE_NEXT_SCROLL_SPEED:INCREMENT_SCROLL_SPEED( GAMESTATE->m_PlayerOptions[pn].m_fArrowScrollSpeed ); break;
case CODE_PREVIOUS_SCROLL_SPEED:DECREMENT_SCROLL_SPEED( GAMESTATE->m_PlayerOptions[pn].m_fArrowScrollSpeed ); break;
case CODE_BOOST: GAMESTATE->m_PlayerOptions[pn].m_bBoost ^= true; break;
case CODE_NEXT_EFFECT: GAMESTATE->m_PlayerOptions[pn].NextEffect(); break;
case CODE_NEXT_APPEARANCE: GAMESTATE->m_PlayerOptions[pn].m_AppearanceType = PlayerOptions::AppearanceType((GAMESTATE->m_PlayerOptions[pn].m_AppearanceType+1) %PlayerOptions::NUM_APPEARANCE_TYPES ); break;
stepmania/src/ScreenEz2SelectMusic.cpp
+37 -6
View File
@@ -42,6 +42,10 @@
#define GUIDE_Y THEME->GetMetricF("ScreenSelectMode","GuideY")
#define SPEEDICON_X( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("SpeedIconP%dX",p+1))
#define SPEEDICON_Y( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("SpeedIconP%dY",p+1))
#define MIRRORICON_X( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("MirrorIconP%dX",p+1))
#define MIRRORICON_Y( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("MirrorIconP%dY",p+1))
#define SHUFFLEICON_X( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("ShuffleIconP%dX",p+1))
#define SHUFFLEICON_Y( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("ShuffleIconP%dY",p+1))
#define PREVIEWMUSICMODE THEME->GetMetricI("ScreenEz2SelectMusic","PreviewMusicMode")
const float TWEEN_TIME = 0.5f;
@@ -111,6 +115,16 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
m_SpeedIcon[p].SetDiffuse( RageColor(0,0,0,0) );
this->AddChild(&m_SpeedIcon[p] );
m_MirrorIcon[p].Load( THEME->GetPathTo("Graphics","select music mirroricon"));
m_MirrorIcon[p].SetXY( MIRRORICON_X(p), MIRRORICON_Y(p) );
m_MirrorIcon[p].SetDiffuse( RageColor(0,0,0,0) );
this->AddChild(&m_MirrorIcon[p] );
m_ShuffleIcon[p].Load( THEME->GetPathTo("Graphics","select music shuffleicon"));
m_ShuffleIcon[p].SetXY( SHUFFLEICON_X(p), SHUFFLEICON_Y(p) );
m_ShuffleIcon[p].SetDiffuse( RageColor(0,0,0,0) );
this->AddChild(&m_ShuffleIcon[p] );
UpdateOptions((PlayerNumber) p,0);
m_iSelection[p] = 0;
@@ -209,18 +223,35 @@ void ScreenEz2SelectMusic::UpdateOptions(PlayerNumber pn, int nosound)
if(asOptions.size() > 0) // check it's not empty!
{
if(asOptions[0] != "1.0X" && asOptions[0] != "" && asOptions[0] != NULL)
m_MirrorIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
m_ShuffleIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
for(int i=0; i<asOptions.size(); i++)
{
m_SpeedIcon[pn].SetDiffuse( RageColor(1,1,1,1) );
}
else
{
m_SpeedIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
if(asOptions[0] == "2X" || asOptions[0] == "1.5X" || asOptions[0] == "3X" || asOptions[0] == "4X" || asOptions[0] == "5X" || asOptions[0] == "8X" || asOptions[0] == "0.5X" || asOptions[0] == "0.75X")
{
m_SpeedIcon[pn].SetDiffuse( RageColor(1,1,1,1) );
}
else
{
m_SpeedIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
}
if(asOptions[i] == "Mirror")
{
m_MirrorIcon[pn].SetDiffuse( RageColor(1,1,1,1) );
}
else if(asOptions[i] == "Shuffle" || asOptions[i] == "SuperShuffle" )
{
m_ShuffleIcon[pn].SetDiffuse( RageColor(1,1,1,1) );
}
}
}
else
{
m_SpeedIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
m_MirrorIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
m_ShuffleIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
}
if(nosound !=0)
m_soundOptionsChange.Play();
stepmania/src/ScreenEz2SelectMusic.h
+2
View File
@@ -55,6 +55,8 @@ protected:
Sprite m_sprOptionsMessage;
Sprite m_PumpDifficultyCircle;
Sprite m_SpeedIcon[NUM_PLAYERS];
Sprite m_MirrorIcon[NUM_PLAYERS];
Sprite m_ShuffleIcon[NUM_PLAYERS];
BitmapText m_PumpDifficultyRating;
RageSound m_soundOptionsChange;