fixes B2B

This commit is contained in:
2025-03-28 21:45:50 +01:00
parent f883bd5bab
commit df7c9bd211
2 changed files with 16 additions and 9 deletions

View File

@@ -290,17 +290,21 @@ void Game::lockPiece() {
LineClear clear = this->board.lockPiece();
this->parameters.lockedPiece(clear);
bool B2BConditionsAreMet = ((clear.lines > B2B_MIN_LINE_NUMBER) || clear.isSpin || clear.isMiniSpin);
if (clear.lines > 0) {
bool B2BConditionsAreMet = ((clear.lines >= B2B_MIN_LINE_NUMBER) || clear.isSpin || clear.isMiniSpin);
/* clearing one more line is worth 2x more
clearing with a spin is worth as much as clearing 2x more lines */
clearing with a spin is worth as much as clearing 2x more lines */
long int clearScore = LINE_CLEAR_BASE_SCORE;
clearScore = clearScore << (clear.lines << (clear.isSpin));
if (this->B2BChain && B2BConditionsAreMet) clearScore *= B2B_SCORE_MULTIPLIER;
if (this->B2BChain && B2BConditionsAreMet) {
clearScore *= B2B_SCORE_MULTIPLIER;
}
this->score += clearScore;
this->B2BChain = B2BConditionsAreMet;
}
this->B2BChain = B2BConditionsAreMet;
if (!this->hasWon()) {
this->leftARETime = this->parameters.getARE();