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

revert

Browse Source
This commit is contained in:
Steve Checkoway
2003-09-26 00:43:44 +00:00
parent 02b39c51c0
commit 5ab83410aa
1 changed files with 199 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScoreKeeperMAX2.cpp
+14 -15
View File
@@ -1,14 +1,14 @@
#include "global.h"
/*
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
Class: ScoreKeeperMAX2
Desc:
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
Chris Danford
-----------------------------------------------------------------------------
*/
-----------------------------------------------------------------------------
*/
#include "ScoreKeeperMAX2.h"
#include "GameState.h"
#include "PrefsManager.h"
@@ -26,7 +26,7 @@
ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Steps*>& apNotes_, const CStringArray &asModifiers, PlayerNumber pn_ ):
ScoreKeeper(pn_), apNotes(apNotes_)
ScoreKeeper(pn_), apNotes(apNotes_)
{
//
// Fill in m_CurStageStats, calculate multiplier
@@ -93,7 +93,7 @@ ScoreKeeper(pn_), apNotes(apNotes_)
void ScoreKeeperMAX2::OnNextSong( int iSongInCourseIndex, Steps* pNotes, NoteData* pNoteData )
{
/*
/*
http://www.aaroninjapan.com/ddr2.html
Note on NONSTOP Mode scoring
@@ -109,7 +109,7 @@ void ScoreKeeperMAX2::OnNextSong( int iSongInCourseIndex, Steps* pNotes, NoteDat
We also keep track of this scoring type in endless, with 100mil per iteration
of all songs, though this score isn't actually seen anywhere right now.
*/
*/
//
// Calculate the score multiplier
//
@@ -198,7 +198,7 @@ static int GetScore(int p, int B, int S, int n)
void ScoreKeeperMAX2::AddScore( TapNoteScore score )
{
int &iScore = GAMESTATE->m_CurStageStats.iScore[m_PlayerNumber];
/*
/*
http://www.aaroninjapan.com/ddr2.html
Regular scoring:
@@ -209,7 +209,7 @@ void ScoreKeeperMAX2::AddScore( TapNoteScore score )
Let p = score multiplier (Marvelous = 10, Perfect = 9, Great = 5, other = 0)
*/
*/
int p = 0; // score multiplier
switch( score )
@@ -293,14 +293,14 @@ void ScoreKeeperMAX2::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
// Regular combo
//
/*
/*
http://www.aaroninjapan.com/ddr2.html
Note on ONI Mode scoring
Your combo counter only increased with a "Marvelous/Perfect", and double Marvelous/Perfect steps (left and right, etc.)
only add 1 to your combo instead of 2. The combo counter thus becomes a "Marvelous/Perfect" counter.
*/
*/
/* True if a jump is one to combo, false if combo is purely based on tap count. */
bool ComboIsPerRow = true;
switch( PREFSMAN->m_iScoringType )
@@ -320,7 +320,7 @@ void ScoreKeeperMAX2::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
if( scoreOfLastTap >= MinScoreToContinueCombo )
GAMESTATE->m_CurStageStats.iCurCombo[m_PlayerNumber] += ComboCountIfHit;
/*
/*
http://www.aaroninjapan.com/ddr2.html
A single step's points are calculated as follows:
@@ -356,7 +356,7 @@ void ScoreKeeperMAX2::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
Note: if you got all Perfect on this song, you would get (p=10)*B, which is 80,000,000. In fact, the maximum possible
score for any song is the number of feet difficulty X 10,000,000.
*/
*/
AddScore( scoreOfLastTap ); // only score once per row
@@ -425,7 +425,7 @@ int ScoreKeeperMAX2::TapNoteScoreToDancePoints( TapNoteScore tns )
if( !GAMESTATE->ShowMarvelous() && tns == TNS_MARVELOUS )
tns = TNS_PERFECT;
/*
/*
http://www.aaroninjapan.com/ddr2.html
Regular play scoring
@@ -455,7 +455,7 @@ int ScoreKeeperMAX2::TapNoteScoreToDancePoints( TapNoteScore tns )
A "Miss" will subtract 8 points
An "OK" (Successful Freeze step) will add 6 points
A "NG" (Unsuccessful Freeze step) is worth 0 points
*/
*/
switch( GAMESTATE->m_PlayMode )
{
@@ -518,4 +518,3 @@ int ScoreKeeperMAX2::HoldNoteScoreToDancePoints( HoldNoteScore hns )
}
return +0;
}