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

Changed naming convention in theme elements from "game 0" -> "dance", and "style 0" -> "single" so things won't break if we change the game/style ordering. Cleaned up ez2: replaced missing graphics, fixed alignment of lifemeter.

Browse Source
This commit is contained in:
Chris Danford
2002-09-15 03:50:57 +00:00
parent 02bfd77a8a
commit 35688cfea5
7 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/TODO.chris
+2
View File
@@ -2,6 +2,8 @@
Fix
/////////////////////////
the CDTitles DWI style arent being read anymore.
faster IniFile (with std::map?)
fix movie texture crash
stepmania/Themes/default/metrics.ini
+11 -11
View File
@@ -438,7 +438,7 @@ SectionColor6=0.0, 0.6, 0.2, 1
SectionColor7=0.8, 0.6, 0.0, 1
[LifeMeterBar]
MeterWidth=258
MeterWidth=260
MeterHeight=20
DangerThreshold=0.2
NumChambers=32
@@ -712,13 +712,13 @@ HowToPlay=Toggle whether the How To Play screen is shown.
[bganims-ez2-0]
NumElements=2
Sprite0-path=Easy Anim Sprite 01
Sprite0-path=Ez2 select style Anim Easy 01
Sprite0-effect=RA
Sprite0-speed=0.01
Sprite0-zoom=2.0
Sprite0-X=CENTER_X
Sprite0-Y=CENTER_Y
Sprite1-path=Easy Anim Sprite 02
Sprite1-path=Ez2 select style Anim Easy 02
Sprite1-effect=RC
Sprite1-speed=0.01
Sprite1-zoom=2.0
@@ -727,7 +727,7 @@ Sprite1-Y=CENTER_Y
[bganims-ez2-0x]
NumElements=1
Sprite0-path=select style preview game 2 style 3
Sprite0-path=select style preview ez2 single
Sprite0-effect=RA
Sprite0-speed=0.01
Sprite0-zoom=2.0
@@ -736,7 +736,7 @@ Sprite0-Y=CENTER_Y
[bganims-ez2-1]
NumElements=1
Sprite0-path=select style preview game 2 style 0
Sprite0-path=select style preview ez2 singlehard
Sprite0-effect=RA
Sprite0-speed=0.01
Sprite0-zoom=2.0
@@ -745,7 +745,7 @@ Sprite0-Y=CENTER_Y
[bganims-ez2-2x]
NumElements=1
Sprite0-path=select style preview game 2 style 1
Sprite0-path=select style preview ez2 singlehard
Sprite0-effect=RC
Sprite0-speed=0.03
Sprite0-zoom=2.0
@@ -754,25 +754,25 @@ Sprite0-Y=CENTER_Y
[bganims-ez2-2]
NumElements=4
Sprite0-path=Real Anim Sprite 04
Sprite0-path=Ez2 select style Anim Real 04
Sprite0-effect=SL
Sprite0-speed=5
Sprite0-zoom=1.0
Sprite0-X=CENTER_X
Sprite0-Y=CENTER_Y
Sprite1-path=Real Anim Sprite 01
Sprite1-path=Ez2 select style Anim Real 01
Sprite1-effect=SL
Sprite1-speed=5
Sprite1-zoom=1.0
Sprite1-X=CENTER_X
Sprite1-Y=CENTER_Y
Sprite2-path=Real Anim Sprite 02
Sprite2-path=Ez2 select style Anim Real 02
Sprite2-effect=SL
Sprite2-speed=3
Sprite2-zoom=1.0
Sprite2-X=CENTER_X
Sprite2-Y=CENTER_Y
Sprite3-path=Real Anim Sprite 03
Sprite3-path=Ez2 select style Anim Real 03
Sprite3-effect=SL
Sprite3-speed=1
Sprite3-zoom=1.0
@@ -781,7 +781,7 @@ Sprite3-Y=CENTER_Y
[bganims-ez2-3]
NumElements=1
Sprite0-path=select style preview game 2 style 2
Sprite0-path=select style preview ez2 double
Sprite0-effect=RC
Sprite0-speed=0.005
Sprite0-zoom=5.0
stepmania/src/GameManager.cpp
+22 -22
View File
@@ -211,7 +211,7 @@ GameDef g_GameDefs[NUM_GAMES] =
},
{
"ez2", // m_szName
"Ez2dancer", // m_szDescription
"Ez2Dancer", // m_szDescription
2, // m_iNumControllers
NUM_EZ2_BUTTONS, // m_iButtonsPerController
{ // m_szButtonNames
@@ -266,8 +266,8 @@ GameDef g_GameDefs[NUM_GAMES] =
DIK_C, // EZ2_BUTTON_FOOTUPRIGHT,
DIK_X, // EZ2_BUTTON_FOOTDOWN,
DIK_Q, // EZ2_BUTTON_HANDUPLEFT,
DIK_A, // EZ2_BUTTON_HANDUPRIGHT,
DIK_E, // EZ2_BUTTON_HANDLRLEFT,
DIK_E, // EZ2_BUTTON_HANDUPRIGHT,
DIK_A, // EZ2_BUTTON_HANDLRLEFT,
DIK_D, // EZ2_BUTTON_HANDLRRIGHT,
DIK_RETURN, // EZ2_BUTTON_START,
DIK_ESCAPE, // EZ2_BUTTON_BACK,
@@ -377,7 +377,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_DANCE, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"DDR Single", // m_szName
"single", // m_szName
{ NOTES_TYPE_DANCE_SINGLE,NOTES_TYPE_DANCE_SINGLE }, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -404,7 +404,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_DANCE, // m_Game
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
"DDR Versus", // m_szName
"versus", // m_szName
{ NOTES_TYPE_DANCE_SINGLE,NOTES_TYPE_DANCE_SINGLE }, // m_NotesTypes
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -431,7 +431,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_DANCE, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"DDR Double", // m_szName
"double", // m_szName
{ NOTES_TYPE_DANCE_DOUBLE,NOTES_TYPE_DANCE_DOUBLE }, // m_NotesTypes
StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 320 }, // m_iCenterX
@@ -466,7 +466,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_DANCE, // m_Game
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
"DDR Couples", // m_szName
"couple", // m_szName
{ NOTES_TYPE_DANCE_COUPLE, NOTES_TYPE_DANCE_COUPLE }, // m_NotesTypes
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -493,7 +493,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_DANCE, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"DDR Solo", // m_szName
"solo", // m_szName
{ NOTES_TYPE_DANCE_SOLO,NOTES_TYPE_DANCE_SOLO }, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 320, 320 }, // m_iCenterX
@@ -524,7 +524,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_DANCE, // m_Game
false, // m_bUsedForGameplay
true, // m_bUsedForEdit
"DDR Couples", // m_szName
"couple (edit-only)", // m_szName
{ NOTES_TYPE_DANCE_COUPLE, NOTES_TYPE_DANCE_COUPLE }, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -583,7 +583,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_PUMP, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"Pump Single", // m_szName
"single", // m_szName
{ NOTES_TYPE_PUMP_SINGLE,NOTES_TYPE_PUMP_SINGLE }, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -612,7 +612,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_PUMP, // m_Game
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
"Pump Versus", // m_szName
"versus", // m_szName
{ NOTES_TYPE_PUMP_SINGLE,NOTES_TYPE_PUMP_SINGLE }, // m_NotesTypes
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -641,7 +641,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_PUMP, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"Pump Double", // m_szName
"double", // m_szName
{ NOTES_TYPE_PUMP_DOUBLE,NOTES_TYPE_PUMP_DOUBLE }, // m_NotesTypes
StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 480 }, // m_iCenterX
@@ -680,7 +680,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_PUMP, // m_Game
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
"Pump Couples", // m_szName
"couple", // m_szName
{ NOTES_TYPE_PUMP_COUPLE,NOTES_TYPE_PUMP_COUPLE}, // m_NotesTypes
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -709,7 +709,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_PUMP, // m_Game
false, // m_bUsedForGameplay
true, // m_bUsedForEdit
"Pump Couples", // m_szName
"couple (edit-only)", // m_szName
{ NOTES_TYPE_PUMP_COUPLE,NOTES_TYPE_PUMP_COUPLE}, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -743,7 +743,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_EZ2, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"EZ2 Single", // m_szName
"single", // m_szName
{ NOTES_TYPE_EZ2_SINGLE,NOTES_TYPE_EZ2_SINGLE }, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -772,7 +772,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_EZ2, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"EZ2 SingleHard", // m_szName
"singleHard", // m_szName
{ NOTES_TYPE_EZ2_SINGLE_HARD,NOTES_TYPE_EZ2_SINGLE_HARD}, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -801,7 +801,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_EZ2, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"EZ2 Real", // m_szName
"real", // m_szName
{ NOTES_TYPE_EZ2_REAL,NOTES_TYPE_EZ2_REAL }, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -834,7 +834,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_EZ2, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"EZ2Double", // m_szName
"double", // m_szName
{ NOTES_TYPE_EZ2_DOUBLE,NOTES_TYPE_EZ2_DOUBLE }, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -873,7 +873,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_EZ2, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"EZ2 Versus", // m_szName
"versus", // m_szName
{ NOTES_TYPE_EZ2_SINGLE,NOTES_TYPE_EZ2_SINGLE }, // m_NotesTypes
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -902,7 +902,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_EZ2, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"EZ2 VersusHard", // m_szName
"versusHard", // m_szName
{ NOTES_TYPE_EZ2_SINGLE_HARD,NOTES_TYPE_EZ2_SINGLE_HARD }, // m_NotesTypes
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -931,7 +931,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_EZ2, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"EZ2 VersusReal", // m_szName
"versusReal", // m_szName
{ NOTES_TYPE_EZ2_REAL,NOTES_TYPE_EZ2_REAL }, // m_NotesTypes
StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType
{ 160, 480 }, // m_iCenterX
@@ -964,7 +964,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
GAME_PARA, // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
"Para Single", // m_szName
"single", // m_szName
{ NOTES_TYPE_PARA,NOTES_TYPE_PARA}, // m_NotesTypes
StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 320, 320 }, // m_iCenterX
stepmania/src/LifeMeterBar.cpp
+5 -3
View File
@@ -117,9 +117,11 @@ public:
DrawMask( m_fPercent );
const float fChamberWidthInPercent = 1.0f/g_iNumChambers;
const float fPercentBetweenStrips = froundf( 1.0f/g_iNumStrips, fChamberWidthInPercent );
float fPercentBetweenStrips = 1.0f/g_iNumStrips;
if( g_iNumChambers > 10 )
fPercentBetweenStrips = froundf( fPercentBetweenStrips, fChamberWidthInPercent );
const float fPercentOffset = fmodf( GAMESTATE->m_fSongBeat/4+1000, fPercentBetweenStrips );
float fPercentOffset = fmodf( GAMESTATE->m_fSongBeat/4+1000, fPercentBetweenStrips );
ASSERT( fPercentOffset >= 0 && fPercentOffset <= fPercentBetweenStrips );
for( float f=fPercentOffset+1; f>=fPercentOffset; f-=fPercentBetweenStrips )
@@ -149,7 +151,7 @@ public:
// set size of streams
rect.left = LONG(-g_iMeterWidth/2 + g_iMeterWidth*fCorrectedLeftEdgePercent);
rect.left = LONG(-g_iMeterWidth/2 + g_iMeterWidth*max(0,fCorrectedLeftEdgePercent));
rect.top = LONG(-g_iMeterHeight/2);
rect.right = LONG(-g_iMeterWidth/2 + g_iMeterWidth*min(1,fCorrectedRightEdgePercent));
rect.bottom = LONG(+g_iMeterHeight/2);
stepmania/src/MenuElements.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ void MenuElements::Load( CString sBackgroundPath, CString sTopEdgePath, CString
m_sprTopEdge.Load( sTopEdgePath );
m_sprTopEdge.SetXY( TOP_EDGE_X, TOP_EDGE_Y );
m_sprStyleIcon.Load( THEME->GetPathTo("Graphics",ssprintf("menu style icons game %d",GAMESTATE->m_CurGame)) );
m_sprStyleIcon.Load( THEME->GetPathTo("Graphics",ssprintf("menu style icons %s",GAMESTATE->GetCurrentGameDef()->m_szName)) );
m_sprStyleIcon.StopAnimating();
m_sprStyleIcon.SetXY( STYLE_ICON_X, STYLE_ICON_Y );
if( GAMESTATE->m_CurStyle == STYLE_NONE || !bShowStyleIcon )
stepmania/src/ScreenSelectStyle.cpp
+11 -5
View File
@@ -56,7 +56,7 @@ ScreenSelectStyle::ScreenSelectStyle()
for( int i=0; i<m_aPossibleStyles.GetSize(); i++ )
{
m_sprIcon[i].Load( THEME->GetPathTo("Graphics",ssprintf("select style icons game %d",GAMESTATE->m_CurGame) ) );
m_sprIcon[i].Load( THEME->GetPathTo("Graphics",ssprintf("select style icons %s",GAMESTATE->GetCurrentGameDef()->m_szName) ) );
m_sprIcon[i].StopAnimating();
m_sprIcon[i].SetState( i );
m_sprIcon[i].SetXY( ICONS_START_X + i*ICONS_SPACING_X, ICONS_START_Y + i*ICONS_SPACING_Y );
@@ -76,11 +76,14 @@ ScreenSelectStyle::ScreenSelectStyle()
this->AddChild( &m_sprInfo );
const GameDef* pGameDef = GAMESTATE->GetCurrentGameDef();
const StyleDef* pStyleDef = GAMEMAN->GetStyleDefForStyle( m_aPossibleStyles[m_iSelection] );
// Load dummy Sprites
for( i=0; i<m_aPossibleStyles.GetSize(); i++ )
{
m_sprDummyPreview[i].Load( THEME->GetPathTo("Graphics",ssprintf("select style preview game %d style %d",GAMESTATE->m_CurGame,i)) );
m_sprDummyInfo[i].Load( THEME->GetPathTo("Graphics",ssprintf("select style info game %d style %d",GAMESTATE->m_CurGame,i)) );
m_sprDummyPreview[i].Load( THEME->GetPathTo("Graphics",ssprintf("select style preview %s %s",pGameDef->m_szName,pStyleDef->m_szName)) );
m_sprDummyInfo[i].Load( THEME->GetPathTo("Graphics",ssprintf("select style info %s %s",pGameDef->m_szName,pStyleDef->m_szName)) );
}
@@ -155,8 +158,11 @@ void ScreenSelectStyle::AfterChange()
{
m_sprIcon[m_iSelection].SetEffectGlowing();
const GameDef* pGameDef = GAMESTATE->GetCurrentGameDef();
const StyleDef* pStyleDef = GAMEMAN->GetStyleDefForStyle( m_aPossibleStyles[m_iSelection] );
// Tween Preview
m_sprPreview.Load( THEME->GetPathTo("Graphics",ssprintf("select style preview game %d style %d",GAMESTATE->m_CurGame,m_iSelection)) );
m_sprPreview.Load( THEME->GetPathTo("Graphics",ssprintf("select style preview %s %s",pGameDef->m_szName,pStyleDef->m_szName)) );
m_sprPreview.StopTweening();
m_sprPreview.SetGlow( D3DXCOLOR(1,1,1,0) );
@@ -177,7 +183,7 @@ void ScreenSelectStyle::AfterChange()
// Tween Info
m_sprInfo.Load( THEME->GetPathTo("Graphics",ssprintf("select style info game %d style %d",GAMESTATE->m_CurGame,m_iSelection)) );
m_sprInfo.Load( THEME->GetPathTo("Graphics",ssprintf("select style info %s %s",pGameDef->m_szName,pStyleDef->m_szName)) );
m_sprInfo.StopTweening();
m_sprInfo.SetZoomY( 0 );
m_sprInfo.BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
stepmania/src/ScreenTitleMenu.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ ScreenTitleMenu::ScreenTitleMenu()
m_sprBG.StretchTo( CRect(0,0,SCREEN_WIDTH,SCREEN_HEIGHT) );
this->AddChild( &m_sprBG );
m_sprLogo.Load( THEME->GetPathTo("Graphics",ssprintf("title menu logo game %d",GAMESTATE->m_CurGame)) );
m_sprLogo.Load( THEME->GetPathTo("Graphics",ssprintf("title menu logo %s",GAMESTATE->GetCurrentGameDef()->m_szName)) );
m_sprLogo.SetXY( LOGO_X, LOGO_Y );
m_sprLogo.SetGlow( D3DXCOLOR(1,1,1,1) );
m_sprLogo.SetZoomY( 0 );