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

move Random "don't lock after choose" logic to a separate wheel item, "LEAP"

Browse Source
This commit is contained in:
Chris Danford
2004-04-26 06:47:03 +00:00
parent 1781f0148a
commit 4ac1e0ee45
12 changed files with 82 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -2732,6 +2732,7 @@ SongRealExtraColor=0.9,0.9,0,1 // yellow
SortMenuColor=1,1,0,1
ShowRoulette=1
ShowRandom=1
ShowLeap=0
Use3D=0
Wheel3DRadius=200 # Possibly safe defaults?
CirclePercent=0.5
stepmania/src/Banner.cpp
+10 -2
View File
@@ -20,13 +20,15 @@
#include "Course.h"
#include "Character.h"
CachedThemeMetricB SCROLL_RANDOM ("Banner","ScrollRandom");
CachedThemeMetricB SCROLL_ROULETTE ("Banner","ScrollRoulette");
CachedThemeMetricB SCROLL_RANDOM ("Banner","ScrollRandom");
CachedThemeMetricB SCROLL_ROULETTE ("Banner","ScrollRoulette");
CachedThemeMetricB SCROLL_LEAP ("Banner","ScrollLeap");
Banner::Banner()
{
SCROLL_RANDOM.Refresh();
SCROLL_ROULETTE.Refresh();
SCROLL_LEAP.Refresh();
m_bScrolling = false;
m_fPercentScrolling = 0;
@@ -176,3 +178,9 @@ void Banner::LoadRandom()
Load( THEME->GetPathToG("Banner random") );
m_bScrolling = (bool)SCROLL_ROULETTE;
}
void Banner::LoadLeap()
{
Load( THEME->GetPathToG("Banner leap") );
m_bScrolling = (bool)SCROLL_LEAP;
}
stepmania/src/Banner.h
+1
View File
@@ -38,6 +38,7 @@ public:
void LoadTABreakFromCharacter( Character* pCharacter );
void LoadRoulette();
void LoadRandom();
void LoadLeap();
void LoadFallback();
void SetScrolling( bool bScroll, float Percent = 0);
stepmania/src/FadingBanner.cpp
+6
View File
@@ -200,6 +200,12 @@ void FadingBanner::LoadRandom()
m_Banner[GetBackIndex()].LoadRandom();
}
void FadingBanner::LoadLeap()
{
BeforeChange();
m_Banner[GetBackIndex()].LoadLeap();
}
void FadingBanner::LoadFallback()
{
BeforeChange();
stepmania/src/FadingBanner.h
+1
View File
@@ -31,6 +31,7 @@ public:
void LoadFromCourse( Course* pCourse );
void LoadRoulette();
void LoadRandom();
void LoadLeap();
void LoadFallback();
void SetMovingFast( bool fast ) { m_bMovingFast=fast; }
stepmania/src/MusicWheel.cpp
+43 -36
View File
@@ -54,6 +54,7 @@ CachedThemeMetricF CIRCLE_PERCENT ("MusicWheel","CirclePercent");
#define SORT_MENU_COLOR THEME->GetMetricC("MusicWheel","SortMenuColor")
#define SHOW_ROULETTE THEME->GetMetricB("MusicWheel","ShowRoulette")
#define SHOW_RANDOM THEME->GetMetricB("MusicWheel","ShowRandom")
#define SHOW_LEAP THEME->GetMetricB("MusicWheel","ShowLeap")
CachedThemeMetricB USE_3D ("MusicWheel","Use3D");
CachedThemeMetricI NUM_WHEEL_ITEMS_METRIC ("MusicWheel","NumWheelItems");
#define NUM_WHEEL_ITEMS min( MAX_WHEEL_ITEMS, (int) NUM_WHEEL_ITEMS_METRIC )
@@ -579,10 +580,15 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
}
}
if( so != SORT_ROULETTE && SHOW_ROULETTE )
arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1), SORT_INVALID) );
if( so != SORT_ROULETTE && SHOW_RANDOM )
arrayWheelItemDatas.push_back( WheelItemData(TYPE_RANDOM, NULL, "", NULL, RageColor(1,0,0,1), SORT_INVALID) );
if( so != SORT_ROULETTE )
{
if( SHOW_ROULETTE )
arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1), SORT_INVALID) );
if( SHOW_RANDOM )
arrayWheelItemDatas.push_back( WheelItemData(TYPE_RANDOM, NULL, "", NULL, RageColor(1,0,0,1), SORT_INVALID) );
if( SHOW_LEAP )
arrayWheelItemDatas.push_back( WheelItemData(TYPE_LEAP, NULL, "", NULL, RageColor(1,0,0,1), SORT_INVALID) );
}
// HACK: Add extra stage item if it isn't already present on the music wheel
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
@@ -1257,6 +1263,9 @@ bool MusicWheel::Select() // return true if this selection ends the screen
case TYPE_RANDOM:
StartRandom();
return false;
case TYPE_LEAP:
StartLeap();
return false;
case TYPE_SONG:
if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() )
UNLOCKMAN->UnlockSong( m_CurWheelItemData[m_iSelection]->m_pSong );
@@ -1285,41 +1294,39 @@ void MusicWheel::StartRoulette()
void MusicWheel::StartRandom()
{
if( PREFSMAN->m_bLockWheelAfterRandom )
/* Shuffle the roulette wheel. */
RandomGen rnd;
random_shuffle( m_WheelItemDatas[SORT_ROULETTE].begin(), m_WheelItemDatas[SORT_ROULETTE].end(), rnd );
SetOpenGroup("", SortOrder(SORT_ROULETTE));
m_Moving = -1;
m_TimeBeforeMovingBegins = 0;
m_SpinSpeed = 1.0f/ROULETTE_SWITCH_SECONDS;
m_SpinSpeed *= 20.0f; /* faster! */
m_WheelState = STATE_RANDOM_SPINNING;
this->Select();
RebuildMusicWheelItems();
}
void MusicWheel::StartLeap()
{
/* If we're in SORT_SORT_MENU or SORT_MODE_MENU, then the timer probably ran
* out. Make sure we're in a sort with actual selections. */
switch( GAMESTATE->m_SortOrder )
{
/* Shuffle the roulette wheel. */
RandomGen rnd;
random_shuffle( m_WheelItemDatas[SORT_ROULETTE].begin(), m_WheelItemDatas[SORT_ROULETTE].end(), rnd );
SetOpenGroup("", SortOrder(SORT_ROULETTE));
m_Moving = -1;
m_TimeBeforeMovingBegins = 0;
m_SpinSpeed = 1.0f/ROULETTE_SWITCH_SECONDS;
m_SpinSpeed *= 20.0f; /* faster! */
m_WheelState = STATE_RANDOM_SPINNING;
this->Select();
RebuildMusicWheelItems();
case SORT_SORT_MENU:
case SORT_MODE_MENU:
SetOpenGroup("", SortOrder(m_LastSortOrder));
}
else
{
/* If we're in SORT_SORT_MENU or SORT_MODE_MENU, then the timer probably ran
* out. Make sure we're in a sort with actual selections. */
switch( GAMESTATE->m_SortOrder )
{
case SORT_SORT_MENU:
case SORT_MODE_MENU:
SetOpenGroup("", SortOrder(m_LastSortOrder));
}
m_iSelection = rand() % m_CurWheelItemData.size();
m_fPositionOffsetFromSelection = 0;
m_WheelState = STATE_SELECTING_MUSIC;
m_soundStart.Play();
SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
RebuildMusicWheelItems();
}
m_iSelection = rand() % m_CurWheelItemData.size();
m_fPositionOffsetFromSelection = 0;
m_WheelState = STATE_SELECTING_MUSIC;
m_soundStart.Play();
SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
RebuildMusicWheelItems();
}
void MusicWheel::SetOpenGroup(CString group, SortOrder so)
stepmania/src/MusicWheel.h
+1
View File
@@ -58,6 +58,7 @@ public:
bool NextSort(); // return true if change successful
void StartRoulette();
void StartRandom();
void StartLeap();
bool IsRouletting() const;
/* Return true if we're moving fast automatically. */
int IsMoving() const;
stepmania/src/MusicWheelItem.cpp
+13 -2
View File
@@ -174,11 +174,15 @@ void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID )
}
break;
case TYPE_ROULETTE:
m_textRoulette.SetText( "ROULETTE" );
m_textRoulette.SetText( THEME->GetMetric("MusicWheel","Roulette") );
break;
case TYPE_RANDOM:
m_textRoulette.SetText( "RANDOM" );
m_textRoulette.SetText( THEME->GetMetric("MusicWheel","Random") );
break;
case TYPE_LEAP:
m_textRoulette.SetText( THEME->GetMetric("MusicWheel","Leap") );
break;
default:
@@ -227,6 +231,7 @@ void MusicWheelItem::Update( float fDeltaTime )
break;
case TYPE_ROULETTE:
case TYPE_RANDOM:
case TYPE_LEAP:
m_sprSectionBar.Update( fDeltaTime );
m_textRoulette.Update( fDeltaTime );
break;
@@ -260,6 +265,7 @@ void MusicWheelItem::DrawPrimitives()
case TYPE_SECTION:
case TYPE_ROULETTE:
case TYPE_RANDOM:
case TYPE_LEAP:
case TYPE_SORT:
bar = &m_sprSectionBar;
break;
@@ -279,6 +285,7 @@ void MusicWheelItem::DrawPrimitives()
break;
case TYPE_ROULETTE:
case TYPE_RANDOM:
case TYPE_LEAP:
m_textRoulette.Draw();
break;
case TYPE_SONG:
@@ -338,6 +345,7 @@ bool WheelItemData::HasBanner() const
/* XXX: These are special cases. */
case TYPE_ROULETTE:
case TYPE_RANDOM:
case TYPE_LEAP:
case TYPE_SORT:
return false;
@@ -362,6 +370,9 @@ CString WheelItemData::GetBanner() const
case TYPE_RANDOM:
return THEME->GetPathToG("Banner roulette");
case TYPE_LEAP:
return THEME->GetPathToG("Banner leap");
default: ASSERT(0); return "";
}
}
stepmania/src/MusicWheelItem.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
ActorFrame m_All;
};
enum WheelItemType { TYPE_SECTION, TYPE_SONG, TYPE_ROULETTE, TYPE_RANDOM, TYPE_COURSE, TYPE_SORT };
enum WheelItemType { TYPE_SECTION, TYPE_SONG, TYPE_ROULETTE, TYPE_RANDOM, TYPE_LEAP, TYPE_COURSE, TYPE_SORT };
struct WheelItemData
{
stepmania/src/PrefsManager.cpp
-3
View File
@@ -214,7 +214,6 @@ PrefsManager::PrefsManager()
m_iAttractSoundFrequency = 1;
m_bAllowExtraStage = true;
m_bLockWheelAfterRandom = true;
m_bHideDefaultNoteSkin = false;
m_iMaxHighScoresPerList = 10;
m_fPadStickSeconds = 0;
@@ -503,7 +502,6 @@ void PrefsManager::ReadGlobalPrefsFromDisk()
ini.GetValue( "Options", "CenterImageScaleY", m_fCenterImageScaleY );
ini.GetValue( "Options", "AttractSoundFrequency", m_iAttractSoundFrequency );
ini.GetValue( "Options", "AllowExtraStage", m_bAllowExtraStage );
ini.GetValue( "Options", "LockWheelAfterRandom", m_bLockWheelAfterRandom );
ini.GetValue( "Options", "HideDefaultNoteSkin", m_bHideDefaultNoteSkin );
ini.GetValue( "Options", "MaxHighScoresPerList", m_iMaxHighScoresPerList );
ini.GetValue( "Options", "PadStickSeconds", m_fPadStickSeconds );
@@ -723,7 +721,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "CenterImageScaleY", m_fCenterImageScaleY );
ini.SetValue( "Options", "AttractSoundFrequency", m_iAttractSoundFrequency );
ini.SetValue( "Options", "AllowExtraStage", m_bAllowExtraStage );
ini.SetValue( "Options", "LockWheelAfterRandom", m_bLockWheelAfterRandom );
ini.SetValue( "Options", "HideDefaultNoteSkin", m_bHideDefaultNoteSkin );
ini.SetValue( "Options", "MaxHighScoresPerList", m_iMaxHighScoresPerList );
ini.SetValue( "Options", "PadStickSeconds", m_fPadStickSeconds );
stepmania/src/PrefsManager.h
-1
View File
@@ -190,7 +190,6 @@ public:
float m_fCenterImageScaleY;
int m_iAttractSoundFrequency; // 0 = never, 1 = every time
bool m_bAllowExtraStage;
bool m_bLockWheelAfterRandom;
bool m_bHideDefaultNoteSkin;
int m_iMaxHighScoresPerList;
stepmania/src/ScreenSelectMusic.cpp
+5
View File
@@ -1393,10 +1393,12 @@ void ScreenSelectMusic::AfterMusicChange()
break;
case TYPE_ROULETTE:
case TYPE_RANDOM:
case TYPE_LEAP:
switch(m_MusicWheel.GetSelectedType())
{
case TYPE_ROULETTE: m_Banner.LoadRoulette(); break;
case TYPE_RANDOM: m_Banner.LoadRandom(); break;
case TYPE_LEAP: m_Banner.LoadLeap(); break;
default: ASSERT(0);
}
@@ -1415,6 +1417,9 @@ void ScreenSelectMusic::AfterMusicChange()
case TYPE_RANDOM:
SampleMusicToPlay = THEME->GetPathToS("ScreenSelectMusic random music");
break;
case TYPE_LEAP:
SampleMusicToPlay = THEME->GetPathToS("ScreenSelectMusic leap music");
break;
default:
ASSERT(0);
}