add lifts to a few things. (but not ScreenEvaluation DetailLines (yet). I may flip the switch on that before beta 3)
Profile:GetTotalLifts() Lua binding added.
This commit is contained in:
@@ -792,10 +792,12 @@ int ScoreKeeperNormal::GetPossibleDancePoints( const RadarValues& radars )
|
|||||||
* W2 will be used instead. */
|
* W2 will be used instead. */
|
||||||
|
|
||||||
int NumTaps = int(radars[RadarCategory_TapsAndHolds]);
|
int NumTaps = int(radars[RadarCategory_TapsAndHolds]);
|
||||||
|
int NumLifts = int(radars[RadarCategory_Lifts]);
|
||||||
int NumHolds = int(radars[RadarCategory_Holds]);
|
int NumHolds = int(radars[RadarCategory_Holds]);
|
||||||
int NumRolls = int(radars[RadarCategory_Rolls]);
|
int NumRolls = int(radars[RadarCategory_Rolls]);
|
||||||
return
|
return
|
||||||
NumTaps*TapNoteScoreToDancePoints(TNS_W1, false) +
|
NumTaps*TapNoteScoreToDancePoints(TNS_W1, false) +
|
||||||
|
NumLifts*TapNoteScoreToDancePoints(TNS_W1, false) +
|
||||||
NumHolds*HoldNoteScoreToDancePoints(HNS_Held, false) +
|
NumHolds*HoldNoteScoreToDancePoints(HNS_Held, false) +
|
||||||
NumRolls*HoldNoteScoreToDancePoints(HNS_Held, false);
|
NumRolls*HoldNoteScoreToDancePoints(HNS_Held, false);
|
||||||
}
|
}
|
||||||
@@ -816,10 +818,12 @@ int ScoreKeeperNormal::GetPossibleGradePoints( const RadarValues& radars )
|
|||||||
* W2 will be used instead. */
|
* W2 will be used instead. */
|
||||||
|
|
||||||
int NumTaps = int(radars[RadarCategory_TapsAndHolds]);
|
int NumTaps = int(radars[RadarCategory_TapsAndHolds]);
|
||||||
|
int NumLifts = int(radars[RadarCategory_Lifts]);
|
||||||
int NumHolds = int(radars[RadarCategory_Holds]);
|
int NumHolds = int(radars[RadarCategory_Holds]);
|
||||||
int NumRolls = int(radars[RadarCategory_Rolls]);
|
int NumRolls = int(radars[RadarCategory_Rolls]);
|
||||||
return
|
return
|
||||||
NumTaps*TapNoteScoreToGradePoints(TNS_W1, false) +
|
NumTaps*TapNoteScoreToGradePoints(TNS_W1, false) +
|
||||||
|
NumLifts*TapNoteScoreToGradePoints(TNS_W1, false) +
|
||||||
NumHolds*HoldNoteScoreToGradePoints(HNS_Held, false) +
|
NumHolds*HoldNoteScoreToGradePoints(HNS_Held, false) +
|
||||||
NumRolls*HoldNoteScoreToGradePoints(HNS_Held, false);
|
NumRolls*HoldNoteScoreToGradePoints(HNS_Held, false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -197,6 +197,7 @@ void ScreenEvaluation::Init()
|
|||||||
case RadarCategory_Mines:
|
case RadarCategory_Mines:
|
||||||
case RadarCategory_Hands:
|
case RadarCategory_Hands:
|
||||||
case RadarCategory_Rolls:
|
case RadarCategory_Rolls:
|
||||||
|
case RadarCategory_Lifts:
|
||||||
ss.m_player[p].m_radarPossible[rc] = 1 + (rand() % 200);
|
ss.m_player[p].m_radarPossible[rc] = 1 + (rand() % 200);
|
||||||
ss.m_player[p].m_radarActual[rc] = rand() % (int)(ss.m_player[p].m_radarPossible[rc]);
|
ss.m_player[p].m_radarActual[rc] = rand() % (int)(ss.m_player[p].m_radarPossible[rc]);
|
||||||
break;
|
break;
|
||||||
@@ -546,6 +547,7 @@ void ScreenEvaluation::Init()
|
|||||||
static const int indeces[NUM_DetailLine] =
|
static const int indeces[NUM_DetailLine] =
|
||||||
{
|
{
|
||||||
RadarCategory_TapsAndHolds, RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, RadarCategory_Hands, RadarCategory_Rolls
|
RadarCategory_TapsAndHolds, RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, RadarCategory_Hands, RadarCategory_Rolls
|
||||||
|
//, RadarCategory_Lifts
|
||||||
};
|
};
|
||||||
const int ind = indeces[l];
|
const int ind = indeces[l];
|
||||||
const int iActual = lrintf(m_pStageStats->m_player[p].m_radarActual[ind]);
|
const int iActual = lrintf(m_pStageStats->m_player[p].m_radarActual[ind]);
|
||||||
|
|||||||
Reference in New Issue
Block a user