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

Added: Random Vanish mode: Arrows go in at the bottom, disappear, get randomized in the middle whist invisible and come out at the top somewhere else :)

Browse Source 
Known Bugs: The only major bug i've experienced with this is for some reason the arrows continue past the grey bar even if you get great, perfect or marvellous. This doesn't affect the score though, I can't quite figure this one out.

Added: Hidden and Vanish codes for PIU.
This commit is contained in:
Andrew Livy
2003-05-04 13:58:45 +00:00
parent 4cbdfbf128
commit 1c097d1d5f
18 changed files with 117 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Graphics/ScreenEz2SelectMusic hiddenicon.redir
+1
View File
@@ -0,0 +1 @@
ScreenSelectMusicEz2 hiddenicon.png
stepmania/Themes/default/Graphics/ScreenEz2SelectMusic vanishicon.redir
+1
View File
@@ -0,0 +1 @@
ScreenSelectMusicEz2 vanishicon.png
stepmania/Themes/default/Graphics/ScreenSelectMusicEz2 hiddenicon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

stepmania/Themes/default/Graphics/ScreenSelectMusicEz2 vanishicon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

stepmania/Themes/default/metrics.ini
+9
View File
@@ -592,6 +592,14 @@ ShuffleIconP1X=40
ShuffleIconP2X=600
ShuffleIconP1Y=320
ShuffleIconP2Y=320
VanishIconP1X=40
VanishIconP2X=600
VanishIconP1Y=240
VanishIconP2Y=240
HiddenIconP1X=40
HiddenIconP2X=600
HiddenIconP1Y=240
HiddenIconP2Y=240
InfoFrameX=999
InfoFrameY=999
DifficultyRatingX=999
@@ -1586,6 +1594,7 @@ Dark=
CancelAll=Left,Right,Left,Right,Left,Right,Left,Right
NextTheme=Left,Left,Left,Right,Right,Right,Left,Right
NextAnnouncer=Left,Left,Right,Right,Left,Left,Right,Right
Hidden=
[GrooveRadar]
Label1OffsetX=0 // stream
stepmania/src/ArrowEffects.cpp
+24
View File
@@ -165,6 +165,30 @@ float ArrowGetPercentVisible( PlayerNumber pn, float fYPos )
f = froundf( f, 0.3333f );
fVisibleAdjust += SCALE( f, 0, 1, -1, 0 );
}
if( fAppearances[PlayerOptions::APPEARANCE_RANDOMVANISH] > 0)
{
float adjustment = GAMESTATE->m_CurrentPlayerOptions[pn].m_fScrollSpeed;
if(adjustment == 0)
adjustment = 1;
float fRealCenterLine = fCenterLine / adjustment;
const float fDistFromRealCenterLine = fYPos - fRealCenterLine;
float fRealFadeDist = (fFadeDist - 20) / adjustment;
if(fYPos >= fRealCenterLine + (fRealFadeDist))
{
fVisibleAdjust += fAppearances[PlayerOptions::APPEARANCE_RANDOMVANISH] * (SCALE( fDistFromRealCenterLine-fRealFadeDist, 0, (fRealFadeDist), -1, 0 )); // go hidden
}
else if(fYPos <= fRealCenterLine - (fRealFadeDist))
{
fVisibleAdjust += fAppearances[PlayerOptions::APPEARANCE_RANDOMVANISH] * (SCALE( fDistFromRealCenterLine+fRealFadeDist, 0, -((fRealFadeDist)), -1, 0 )); // suddenly appear
}
else
{
fVisibleAdjust += fAppearances[PlayerOptions::APPEARANCE_RANDOMVANISH] * -1; // be invisible
}
}
return clamp( 1+fVisibleAdjust, 0, 1 );
}
stepmania/src/CodeDetector.cpp
+11 -1
View File
@@ -11,6 +11,7 @@
*/
#include "CodeDetector.h"
#include "PlayerOptions.h"
#include "GameState.h"
#include "InputQueue.h"
#include "ThemeManager.h"
@@ -41,6 +42,8 @@ const CString g_sCodeNames[CodeDetector::NUM_CODES] = {
"Reverse",
"HoldNotes",
"Dark",
"Hidden",
"RandomVanish",
"CancelAll",
"NextTheme",
"NextAnnouncer"
@@ -136,6 +139,9 @@ bool CodeDetector::EnteredNextSort( GameController controller )
#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;
#define TOGGLE_HIDDEN ZERO(GAMESTATE->m_PlayerOptions[pn].m_fAppearances); GAMESTATE->m_PlayerOptions[pn].m_fAppearances[PlayerOptions::APPEARANCE_HIDDEN] = 1;
#define TOGGLE_RANDOMVANISH ZERO(GAMESTATE->m_PlayerOptions[pn].m_fAppearances); GAMESTATE->m_PlayerOptions[pn].m_fAppearances[PlayerOptions::APPEARANCE_RANDOMVANISH] = 1;
bool CodeDetector::DetectAndAdjustMusicOptions( GameController controller )
{
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
@@ -159,12 +165,16 @@ bool CodeDetector::DetectAndAdjustMusicOptions( GameController controller )
case CODE_PREVIOUS_SCROLL_SPEED:DECREMENT_SCROLL_SPEED( GAMESTATE->m_PlayerOptions[pn].m_fScrollSpeed ); break;
case CODE_NEXT_ACCEL: GAMESTATE->m_PlayerOptions[pn].NextAccel(); break;
case CODE_NEXT_EFFECT: GAMESTATE->m_PlayerOptions[pn].NextEffect(); break;
case CODE_NEXT_APPEARANCE: GAMESTATE->m_PlayerOptions[pn].NextAppearance();; break;
case CODE_NEXT_APPEARANCE: GAMESTATE->m_PlayerOptions[pn].NextAppearance(); break;
case CODE_NEXT_TURN: GAMESTATE->m_PlayerOptions[pn].NextTurn(); break;
case CODE_REVERSE: FLOAT_TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_fReverseScroll ); break;
case CODE_HOLDS: TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_bHoldNotes, true, false ); break;
case CODE_DARK: FLOAT_TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_fDark ); break;
case CODE_CANCEL_ALL: GAMESTATE->m_PlayerOptions[pn].Init(); break;
case CODE_HIDDEN: TOGGLE_HIDDEN break;
case CODE_RANDOMVANISH: TOGGLE_RANDOMVANISH break;
// GAMESTATE->m_PlayerOptions[pn].SetOneAppearance(GAMESTATE->m_PlayerOptions[pn].GetFirstAppearance()); break;
}
return true; // don't check any more
}
stepmania/src/CodeDetector.h
+2
View File
@@ -38,6 +38,8 @@ public:
CODE_REVERSE,
CODE_HOLDS,
CODE_DARK,
CODE_HIDDEN,
CODE_RANDOMVANISH,
CODE_CANCEL_ALL,
CODE_NEXT_THEME,
CODE_NEXT_ANNOUNCER,
stepmania/src/NoteField.cpp
-2
View File
@@ -420,7 +420,6 @@ void NoteField::DrawPrimitives()
float fBeat = NoteRowToBeat(i);
bIsInSelectionRange = m_fBeginMarker<=fBeat && fBeat<=m_fEndMarker;
}
m_NoteDisplay[c].DrawTap( c, NoteRowToBeat(i), bHoldNoteBeginsOnThisBeat, bIsInSelectionRange ? fSelectedRangeGlow : m_fPercentFadeToFail );
}
@@ -429,7 +428,6 @@ void NoteField::DrawPrimitives()
}
void NoteField::RemoveTapNoteRow( int iIndex )
{
for( int c=0; c<GetNumTracks(); c++ )
stepmania/src/OptionIconRow.cpp
+1
View File
@@ -53,6 +53,7 @@ const OptionColumnEntry g_OptionColumnEntries[] =
{"Sudden", 2},
{"Stealth", 2},
{"Blink", 2},
{"RandomVanish", 2},
{"Mirror", 3},
{"Left", 3},
{"Right", 3},
stepmania/src/Player.cpp
+30
View File
@@ -144,6 +144,7 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
CString BackdropName = g_NoteFieldMode[pn].m_Backdrop;
if( !BackdropName.empty() )
m_ArrowBackdrop.LoadFromAniDir( THEME->GetPathToB( BackdropName ) );
m_NoteField.Load( (NoteData*)this, pn, iStartDrawingAtPixels, iStopDrawingAtPixels );
m_ArrowBackdrop.SetPlayer( pn );
@@ -572,6 +573,35 @@ void Player::CrossedRow( int iNoteRow )
Step( t );
}
void Player::RandomiseNotes( int iNoteRow )
{
int NewNoteRow = iNoteRow + 50 / GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fScrollSpeed; // change the row to look ahead from based upon their speed mod
// check to see if they're at the crossed row
int EmptyNoteCol = -1;
int WaitingForEmptyColumn = -1;
bool b_updatenotedata = false;
int iNumOfTracks = GetNumTracks();
for(int t=0; t<iNumOfTracks; t++)
{
if(t+1 < iNumOfTracks)
{
int iRandomTrackToSwapWith = RandomInt(0, iNumOfTracks-1);
TapNote t1 = GetTapNote(t, NewNoteRow);
TapNote t2 = GetTapNote(iRandomTrackToSwapWith, NewNoteRow);
if((t1 == TAP_TAP || t1 == TAP_EMPTY) && (t2 == TAP_TAP || t2 == TAP_EMPTY) && (!(t1 == TAP_EMPTY && t2 == TAP_EMPTY) && !(t1 == TAP_TAP && t2 == TAP_TAP)))
{
SetTapNote(t, NewNoteRow, t2);
SetTapNote(iRandomTrackToSwapWith, NewNoteRow, t1);
b_updatenotedata = true;
}
}
}
if(b_updatenotedata)
{
m_NoteField.CopyAll((NoteData*)this);
}
}
void Player::HandleTapRowScore( unsigned row )
{
stepmania/src/Player.h
+2 -2
View File
@@ -50,8 +50,8 @@ public:
void Load( PlayerNumber player_no, NoteData* pNoteData, LifeMeter* pLM, ScoreDisplay* pScore, Inventory* pInventory, ScoreKeeper* pScoreKeeper );
void CrossedRow( int iNoteRow );
void Step( int col );
void FadeToFail();
void RandomiseNotes( int iNoteRow );
void FadeToFail();
protected:
void UpdateTapNotesMissedOlderThan( float fMissIfOlderThanThisBeat );
stepmania/src/PlayerOptions.cpp
+2
View File
@@ -97,6 +97,7 @@ CString PlayerOptions::GetString()
if( m_fAppearances[APPEARANCE_SUDDEN]==1 ) sReturn += "Sudden, ";
if( m_fAppearances[APPEARANCE_STEALTH]==1 ) sReturn += "Stealth, ";
if( m_fAppearances[APPEARANCE_BLINK]==1 ) sReturn += "Blink, ";
if( m_fAppearances[APPEARANCE_RANDOMVANISH]==1) sReturn += "RandomVanish, ";
if( m_fReverseScroll == 1 ) sReturn += "Reverse, ";
@@ -184,6 +185,7 @@ void PlayerOptions::FromString( CString sOptions )
else if( sBit == "sudden" ) m_fAppearances[APPEARANCE_SUDDEN] = 1;
else if( sBit == "stealth" ) m_fAppearances[APPEARANCE_STEALTH] = 1;
else if( sBit == "blink" ) m_fAppearances[APPEARANCE_BLINK] = 1;
else if( sBit == "randomvanish" ) m_fAppearances[APPEARANCE_RANDOMVANISH] = 1;
else if( sBit == "mirror" ) m_Turn = TURN_MIRROR;
else if( sBit == "left" ) m_Turn = TURN_LEFT;
else if( sBit == "right" ) m_Turn = TURN_RIGHT;
stepmania/src/PlayerOptions.h
+1
View File
@@ -42,6 +42,7 @@ struct PlayerOptions
APPEARANCE_SUDDEN,
APPEARANCE_STEALTH,
APPEARANCE_BLINK,
APPEARANCE_RANDOMVANISH,
NUM_APPEARANCES
};
enum Turn {
stepmania/src/ScreenEz2SelectMusic.cpp
+24
View File
@@ -42,6 +42,10 @@
#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 HIDDENICON_X( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("HiddenIconP%dX",p+1))
#define HIDDENICON_Y( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("HiddenIconP%dY",p+1))
#define VANISHICON_X( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("VanishIconP%dX",p+1))
#define VANISHICON_Y( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("VanishIconP%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")
@@ -124,6 +128,16 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
m_ShuffleIcon[p].SetDiffuse( RageColor(0,0,0,0) );
this->AddChild(&m_ShuffleIcon[p] );
m_HiddenIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic hiddenicon"));
m_HiddenIcon[p].SetXY( HIDDENICON_X(p), HIDDENICON_Y(p) );
m_HiddenIcon[p].SetDiffuse( RageColor(0,0,0,0) );
this->AddChild(&m_HiddenIcon[p] );
m_VanishIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic vanishicon"));
m_VanishIcon[p].SetXY( VANISHICON_X(p), VANISHICON_Y(p) );
m_VanishIcon[p].SetDiffuse( RageColor(0,0,0,0) );
this->AddChild(&m_VanishIcon[p] );
UpdateOptions((PlayerNumber) p,0);
m_iSelection[p] = 0;
@@ -250,6 +264,14 @@ void ScreenEz2SelectMusic::UpdateOptions(PlayerNumber pn, int nosound)
{
m_ShuffleIcon[pn].SetDiffuse( RageColor(1,1,1,1) );
}
else if(asOptions[i] == "Hidden")
{
m_HiddenIcon[pn].SetDiffuse( RageColor(1,1,1,1) );
}
else if(asOptions[i] == "RandomVanish")
{
m_VanishIcon[pn].SetDiffuse( RageColor(1,1,1,1) );
}
}
}
else
@@ -257,6 +279,8 @@ void ScreenEz2SelectMusic::UpdateOptions(PlayerNumber pn, int nosound)
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) );
m_HiddenIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
m_VanishIcon[pn].SetDiffuse( RageColor(0,0,0,0) );
}
if(nosound !=0)
m_soundOptionsChange.Play();
stepmania/src/ScreenEz2SelectMusic.h
+2
View File
@@ -60,6 +60,8 @@ protected:
Sprite m_SpeedIcon[NUM_PLAYERS];
Sprite m_MirrorIcon[NUM_PLAYERS];
Sprite m_ShuffleIcon[NUM_PLAYERS];
Sprite m_HiddenIcon[NUM_PLAYERS];
Sprite m_VanishIcon[NUM_PLAYERS];
BitmapText m_PumpDifficultyRating;
RageSound m_soundOptionsChange;
stepmania/src/ScreenGameplay.cpp
+6
View File
@@ -983,7 +983,13 @@ void ScreenGameplay::Update( float fDeltaTime )
for( ; m_iRowLastCrossed <= iRowNow; m_iRowLastCrossed++ ) // for each index we crossed since the last update
for( pn=0; pn<NUM_PLAYERS; pn++ )
if( GAMESTATE->IsPlayerEnabled(pn) )
{
if(GAMESTATE->m_CurrentPlayerOptions[pn].m_fAppearances[PlayerOptions::APPEARANCE_RANDOMVANISH]==1) // if we're doing random vanish
{
m_Player[pn].RandomiseNotes( m_iRowLastCrossed ); // randomise notes on the fly
}
m_Player[pn].CrossedRow( m_iRowLastCrossed );
}
}
if( GAMESTATE->m_SongOptions.m_bAssistTick && IsTimeToPlayTicks())
stepmania/src/ScreenPlayerOptions.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ OptionRow g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
OptionRow( "Speed", "x0.25","x0.5","x0.75","x1","x1.5","x2","x3","x5","x8","C200","C300" ),
OptionRow( "Acceler\n-ation", "OFF","BOOST","BRAKE","WAVE","EXPAND","BOOMERANG" ),
OptionRow( "Effect", "OFF","DRUNK","DIZZY","MINI","FLIP","TORNADO" ),
OptionRow( "Appear\n-ance", "VISIBLE","HIDDEN","SUDDEN","STEALTH","BLINK" ),
OptionRow( "Appear\n-ance", "VISIBLE","HIDDEN","SUDDEN","STEALTH","BLINK", "R.VANISH" ),
OptionRow( "Turn", "OFF","MIRROR","LEFT","RIGHT","SHUFFLE","SUPER SHUFFLE" ),
OptionRow( "Trans\n-form", "OFF","LITTLE","WIDE","BIG","QUICK","SKIPPY" ),
OptionRow( "Scroll", "STANDARD","REVERSE" ),