anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Fix Three Peaks scoring

Browse source 
Score is correctly updated after moving a card to the waste stack or
after winning a game. Double counting is prevented by the score_counted
variable.

see https://github.com/shlomif/PySolFC/issues/111
This commit is contained in:
Roderik Ploszek 2019-04-21 11:20:11 +02:00
parent 961634e685
commit 9bf8f475bb
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pysollib/games/threepeaks.py
View file

@ -82,7 +82,15 @@ class ThreePeaks_RowStack(OpenStack):
return True return True
return False return False
clickHandler = OpenStack.doubleclickHandler def clickHandler(self, event):
result = OpenStack.doubleclickHandler(self, event)
if result == 1 and not self.game.score_counted:
self.game.sequence += 1
self.game.computeHandScore()
self.game.updateText()
elif self.game.score_counted:
self.game.score_counted = False
return result
# ************************************************************************ # ************************************************************************
@ -115,8 +123,9 @@ class ThreePeaks(Game):
self.setSize(w, h) self.setSize(w, h)
# Extra settings # Extra settings
self.game_score = 52 self.game_score = 0
self.hand_score = self.sequence = 0 self.hand_score = self.sequence = 0
self.score_counted = False
self.peaks = [0] * 3 self.peaks = [0] * 3
# Create rows # Create rows
@ -166,7 +175,7 @@ class ThreePeaks(Game):
def startGame(self): def startGame(self):
assert len(self.s.talon.cards) == self.gameinfo.ncards assert len(self.s.talon.cards) == self.gameinfo.ncards
self.game_score = self.game_score + self.hand_score - 52 self.game_score = self.game_score + self.hand_score
self.hand_score = -52 self.hand_score = -52
self.peaks = [0] * 3 self.peaks = [0] * 3
self.startDealSample() self.startDealSample()
@ -180,6 +189,8 @@ class ThreePeaks(Game):
return False return False
if self.sequence: if self.sequence:
self.hand_score = self.hand_score + len(self.s.talon.cards) * 10 self.hand_score = self.hand_score + len(self.s.talon.cards) * 10
self.computeHandScore()
self.score_counted = True
self.updateText() self.updateText()
self.sequence = 0 self.sequence = 0
return True return True
@ -187,7 +198,7 @@ class ThreePeaks(Game):
def updateText(self): def updateText(self):
if self.preview > 1 or not self.texts.info or not self.SCORING: if self.preview > 1 or not self.texts.info or not self.SCORING:
return return
t = _('Score:\011This hand: ') + str(self.getHandScore()) t = _('Score:\011This hand: ') + str(self.hand_score)
t = t + _('\011This game: ') + str(self.game_score) t = t + _('\011This game: ') + str(self.game_score)
self.texts.info.config(text=t) self.texts.info.config(text=t)
@ -197,11 +208,8 @@ class ThreePeaks(Game):
(card1.rank - 1) % 13 == card2.rank) (card1.rank - 1) % 13 == card2.rank)
return False return False
def getHandScore(self): def computeHandScore(self):
# FIXME: bug #2937253
score, i = self.hand_score, 1 score, i = self.hand_score, 1
if 0: # self.busy:
return score
# First count the empty peaks # First count the empty peaks
for r in self.s.rows[:3]: for r in self.s.rows[:3]:
if not r.cards: if not r.cards:
@ -215,7 +223,6 @@ class ThreePeaks(Game):
score = score + i * 2 ** int((self.sequence - 1) / 4) score = score + i * 2 ** int((self.sequence - 1) / 4)
self.hand_score = score self.hand_score = score
# print 'getHandScore: score:', score # print 'getHandScore: score:', score
return score
def canUndo(self): def canUndo(self):
return False return False