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

Changed Notes difficulty/description in preparation for edit selection system

Browse Source
This commit is contained in:
Chris Danford
2003-01-21 22:35:14 +00:00
parent ac391552fd
commit a6864d3ef2
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+15 -13
View File
@@ -16,6 +16,7 @@ ColorP2=1.0,0.5,0.2,1 // orange
InitialScreen=ScreenCompany
[Notes]
ColorBeginner=0.0,0.9,1,1 // light blue
ColorEasy=0.9,0.9,0,1 // yellow
ColorMedium=1,0.1,0.1,1 // light red
ColorHard=0.2,1,0.2,1 // light green
@@ -111,18 +112,20 @@ ExplanationPage1X=170
ExplanationPage1Y=70
ExplanationPage2X=1100
ExplanationPage2Y=70
Choice1X=120
Choice1Y=200
Choice2X=320
Choice2Y=180
Choice3X=520
Choice3Y=200
Choice4X=760
Choice4Y=200
Choice5X=960
Choice5Y=180
Choice6X=1160
Choice6Y=200
BeginnerX=98
BeginnerY=180
EasyX=246
EasyY=220
MediumX=394
MediumY=180
HardX=542
HardY=220
NonstopX=760
NonstopY=200
OniX=960
OniY=200
EndlessX=1160
EndlessY=200
CursorOffsetP1X=-40
CursorOffsetP1Y=200
CursorOffsetP2X=+40
@@ -135,7 +138,6 @@ TimerSeconds=40
NextScreenArcade=ScreenSelectGroup
NextScreenOni=ScreenInstructions
[ScreenSelectGroup]
FrameX=180
FrameY=160
stepmania/src/MusicWheel.cpp
+5 -5
View File
@@ -66,7 +66,7 @@ WheelItemData::WheelItemData( WheelItemType wit, Song* pSong, const CString &sSe
m_sSectionName = sSectionName;
m_pCourse = pCourse;
m_color = color;
m_IconType = MusicStatusDisplay::none;
m_Type = MusicStatusDisplay::none;
}
@@ -127,7 +127,7 @@ void WheelItemDisplay::LoadFromWheelItemData( WheelItemData* pWID )
this->m_pCourse = pWID->m_pCourse;
this->m_pSong = pWID->m_pSong;
this->m_color = pWID->m_color;
this->m_IconType = pWID->m_IconType; */
this->m_Type = pWID->m_Type; */
// init type specific stuff
@@ -163,7 +163,7 @@ void WheelItemDisplay::LoadFromWheelItemData( WheelItemData* pWID )
{
m_TextBanner.LoadFromSong( data->m_pSong );
m_TextBanner.SetDiffuse( data->m_color );
m_MusicStatusDisplay.SetType( data->m_IconType );
m_MusicStatusDisplay.SetType( data->m_Type );
RefreshGrades();
}
break;
@@ -671,7 +671,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
bool bIsEasy = pSong->IsEasy( GAMESTATE->GetCurrentStyleDef()->m_NotesType );
WheelItemData& WID = arrayWheelItemDatas[i];
WID.m_IconType = bIsEasy ? MusicStatusDisplay::easy : MusicStatusDisplay::none;
WID.m_Type = bIsEasy ? MusicStatusDisplay::easy : MusicStatusDisplay::none;
}
if( so == SORT_MOST_PLAYED )
@@ -680,7 +680,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
for( i=0; i< min(3u,arrayWheelItemDatas.size()); i++ )
{
WheelItemData& WID = arrayWheelItemDatas[i];
WID.m_IconType = MusicStatusDisplay::IconType(MusicStatusDisplay::crown1 + i);
WID.m_Type = MusicStatusDisplay::Type(MusicStatusDisplay::crown1 + i);
}
}
stepmania/src/MusicWheel.h
+1 -1
View File
@@ -50,7 +50,7 @@ public:
Course* m_pCourse;
Song* m_pSong;
RageColor m_color; // either text color or section background color
MusicStatusDisplay::IconType m_IconType;
MusicStatusDisplay::Type m_Type;
};