adrien/TETRIS2000
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prints Combo instead of Combo x1

Browse Source
This commit is contained in:
adrienmalin 2018-08-22 18:37:55 +02:00
parent 9f2b687a8a
commit 6a5fba54ef
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/game_gui.py
View File

@ -636,9 +636,9 @@ class Stats(QtWidgets.QWidget):
self.temporary_text.emit(text + "\n{:n}".format(score)) self.temporary_text.emit(text + "\n{:n}".format(score))
# ============================================================================== # ==============================================================================
# Combo # Combo
# Bonus for complete lines on each consecutive lock downs # Bonus for complete lines on each consecutive lock downs
# if nb_complete_lines: # if nb_complete_lines:
# ============================================================================== # ==============================================================================
if nb_complete_lines: if nb_complete_lines:
self.combo += 1 self.combo += 1
@ -650,18 +650,23 @@ class Stats(QtWidgets.QWidget):
self.score_total += combo_score self.score_total += combo_score
self.max_combo = max(self.max_combo, self.combo) self.max_combo = max(self.max_combo, self.combo)
self.combos_total += 1 self.combos_total += 1
self.temporary_text.emit( if self.combo == 1:
self.tr("COMBO x{:n}\n{:n}").format(self.combo, combo_score) self.temporary_text.emit(
) self.tr("COMBO\n{:n}").format(combo_score)
)
else:
self.temporary_text.emit(
self.tr("COMBO x{:n}\n{:n}").format(self.combo, combo_score)
)
else: else:
self.combo = -1 self.combo = -1
# ============================================================================== # ==============================================================================
# Back-to_back sequence # Back-to_back sequence
# Two major bonus actions, such as two Tetrises, performed without # Two major bonus actions, such as two Tetrises, performed without
# a Single, Double, or Triple Line Clear occurring between them. # a Single, Double, or Triple Line Clear occurring between them.
# Bonus for Tetrises, T-Spin Line Clears, and Mini T-Spin Line Clears # Bonus for Tetrises, T-Spin Line Clears, and Mini T-Spin Line Clears
# performed consecutively in a B2B sequence. # performed consecutively in a B2B sequence.
# ============================================================================== # ==============================================================================
if (t_spin and nb_complete_lines) or nb_complete_lines == 4: if (t_spin and nb_complete_lines) or nb_complete_lines == 4:
if self.back_to_back_scores is not None: if self.back_to_back_scores is not None: