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

Extract more common methods.

Browse source
This commit is contained in:
Shlomi Fish 2017-11-09 21:40:42 +02:00
parent 184d4e32db
commit 6cfd8d351e
16 changed files with 26 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pysollib/game.py
View file

@ -3411,3 +3411,7 @@ in the current implementation.''') % version)
def _startAndDealRow(self):
self._startDealNumRowsAndDealSingleRow(0)
def _startAndDealRowAndCards(self):
self._startAndDealRow()
self.s.talon.dealCards()

4
pysollib/games/curdsandwhey.py
View file

@ -458,9 +458,7 @@ class Glacier(Game):
l.defaultStackGroups()
def startGame(self):
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
shallHighlightMatch = Game._shallHighlightMatch_RKW

4
pysollib/games/diplomat.py
View file

@ -243,9 +243,7 @@ class LittleNapoleon(Diplomat):
def startGame(self):
for i in range(3):
self.s.talon.dealRow(frames=0, flip=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
getQuickPlayScore = Game._getSpiderQuickPlayScore

4
pysollib/games/eiffeltower.py
View file

@ -91,9 +91,7 @@ class EiffelTower(Game):
#
def startGame(self):
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def isGameWon(self):
return len(self.s.talon.cards) == 0 and len(self.s.waste.cards) == 0

12
pysollib/games/fortythieves.py
View file

@ -144,9 +144,7 @@ class FortyThieves(Game):
self.s.talon.dealRow(flip=0, frames=0)
for i in range(self.DEAL[1] - 1):
self.s.talon.dealRow(frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def fillStack(self, stack):
if self.FILL_EMPTY_ROWS and stack in self.s.rows and not stack.cards:
@ -691,9 +689,7 @@ class FortunesFavor(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def fillStack(self, stack):
if len(stack.cards) == 0:
@ -964,9 +960,7 @@ class TheSpark(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
shallHighlightMatch = Game._shallHighlightMatch_SS

4
pysollib/games/golf.py
View file

@ -290,9 +290,7 @@ class Elevator(RelaxedGolf):
class Escalator(Elevator):
def startGame(self):
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
# ************************************************************************

4
pysollib/games/grandfathersclock.py
View file

@ -347,9 +347,7 @@ class Hemispheres(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def fillStack(self, stack):
if stack in self.s.rows[4:] and not stack.cards:

12
pysollib/games/harp.py
View file

@ -86,9 +86,7 @@ class DoubleKlondike(Game):
def startGame(self, flip=0):
for i in range(len(self.s.rows)):
self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=flip, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
shallHighlightMatch = Game._shallHighlightMatch_AC
@ -138,9 +136,7 @@ class BigHarp(DoubleKlondike):
def startGame(self):
for i in range(len(self.s.rows)):
self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
# ************************************************************************
@ -309,9 +305,7 @@ class ThievesOfEgypt(DoubleKlondike):
for j in range(i):
self.s.talon.dealRow(rows=[self.s.rows[row]], frames=0)
row += 1
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
# ************************************************************************

12
pysollib/games/klondike.py
View file

@ -216,9 +216,7 @@ class SmallHarp(Klondike):
def startGame(self):
for i in range(len(self.s.rows)):
self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
# ************************************************************************
@ -286,9 +284,7 @@ class PasSeul(Eastcliff):
Klondike.createGame(self, max_rounds=1, rows=6)
def startGame(self):
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
# ************************************************************************
@ -509,9 +505,7 @@ class Jumbo(Klondike):
def startGame(self, flip=0):
for i in range(9):
self.s.talon.dealRow(rows=self.s.rows[:i], flip=flip, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
class OpenJumbo(Jumbo):

4
pysollib/games/royalcotillion.py
View file

@ -561,9 +561,7 @@ class BritishConstitution(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def _shuffleHook(self, cards):
# move Aces to top of the Talon (i.e. first cards to be dealt)

4
pysollib/games/royaleast.py
View file

@ -94,9 +94,7 @@ class RoyalEast(Game):
self.flipMove(self.s.talon)
self.moveMove(1, self.s.talon, to_stack, frames=0)
# deal rows
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def _restoreGameHook(self, game):
self.base_card = self.cards[game.loadinfo.base_card_id]

4
pysollib/games/simplex.py
View file

@ -102,9 +102,7 @@ class Simplex(Game):
l.defaultStackGroups()
def startGame(self):
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def shallHighlightMatch(self, stack1, card1, stack2, card2):
return card1.rank == card2.rank

4
pysollib/games/spider.py
View file

@ -323,9 +323,7 @@ class Rachel(RelaxedSpider):
RelaxedSpider.createGame(self, waste=1, rows=6, texts=1)
def startGame(self):
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
# ************************************************************************

8
pysollib/games/sultan.py
View file

@ -127,9 +127,7 @@ class Sultan(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def getAutoStacks(self, event=None):
return (self.sg.dropstacks, (), self.sg.dropstacks)
@ -1340,9 +1338,7 @@ class CatherineTheGreat(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
def fillStack(self, stack):
if stack in self.s.rows and not stack.cards:

4
pysollib/games/unionsquare.py
View file

@ -135,9 +135,7 @@ class UnionSquare(Game):
#
def startGame(self):
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
shallHighlightMatch = Game._shallHighlightMatch_SS

4
pysollib/games/windmill.py
View file

@ -243,9 +243,7 @@ class NapoleonsTomb(Game):
#
def startGame(self):
self.startDealSample()
self.s.talon.dealRow()
self.s.talon.dealCards() # deal first card to WasteStack
self._startAndDealRowAndCards()
# ************************************************************************