Skip to content

Commit

Permalink
treats noholds the same as nomines when invalidating
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed Jul 17, 2018
1 parent 41716f7 commit ab16fb1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/Player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,9 @@ void Player::Load()
if(GAMESTATE->m_pCurSteps[pn]->GetRadarValues()[RadarCategory_Mines] > 0)
m_pPlayerStageStats->filegotmines = true;

if (GAMESTATE->m_pCurSteps[pn]->GetRadarValues()[RadarCategory_Holds] > 0 || GAMESTATE->m_pCurSteps[pn]->GetRadarValues()[RadarCategory_Rolls] > 0)
m_pPlayerStageStats->filegotholds = true;

// check for lua script load (technically this is redundant a little with negbpm but whatever) -mina
if (!m_Timing->ValidSequentialAssumption)
m_pPlayerStageStats->luascriptwasloaded = true;
Expand Down
1 change: 1 addition & 0 deletions src/PlayerStageStats.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ class PlayerStageStats
bool luascriptwasloaded;
bool filehadnegbpms; // the call after gameplay is over is apparently unreliable -mina
bool filegotmines; // this needs to be set before any notedata transforms
bool filegotholds;
bool gaveuplikeadumbass; // flag 'giving up' status so i can flag it as failing so i dont have to remove the feature entirely -mina

map<float,float> m_fLifeRecord;
Expand Down
4 changes: 4 additions & 0 deletions src/StageStats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,10 @@ bool DetermineScoreEligibility(const PlayerStageStats &pss, const PlayerState &p
if (mods.find("NoMines") != mods.npos && pss.filegotmines)
return false;

// this would be difficult to accomplish but for parity's sake we should
if (mods.find("NoHolds") != mods.npos && pss.filegotholds)
return false;

if (mods.find("Left") != mods.npos)
return false;

Expand Down

0 comments on commit ab16fb1

Please sign in to comment.