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 a method.

Browse source
This commit is contained in:
Shlomi Fish 2017-11-13 22:27:43 +02:00
parent 4ad3f0f889
commit 76580b7a3f
13 changed files with 20 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pysollib/game.py
View file

@ -3412,6 +3412,10 @@ in the current implementation.''') % version)
def _startAndDealRow(self):
self._startDealNumRowsAndDealSingleRow(0)
def _startDealNumRowsAndDealRowAndCards(self, n):
self._startDealNumRowsAndDealSingleRow(n)
self.s.talon.dealCards()
def _startAndDealRowAndCards(self):
self._startAndDealRow()
self.s.talon.dealCards()

8
pysollib/games/beleagueredcastle.py
View file

@ -527,9 +527,7 @@ class Zerline(Game):
#
def startGame(self):
self._startDealNumRows(4)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(4)
shallHighlightMatch = Game._shallHighlightMatch_RK
@ -850,9 +848,7 @@ class Soother(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(4)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(4)
shallHighlightMatch = Game._shallHighlightMatch_RK

4
pysollib/games/bisley.py
View file

@ -402,9 +402,7 @@ class Cringle(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(4)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(4)
shallHighlightMatch = Game._shallHighlightMatch_AC

4
pysollib/games/canfield.py
View file

@ -805,9 +805,7 @@ class Skippy(Canfield):
for s in self.s.rows:
s.cap.base_rank = row_base_rank
#
self._startDealNumRows(3)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(3)
shallHighlightMatch = Game._shallHighlightMatch_RKW

8
pysollib/games/fortythieves.py
View file

@ -1038,9 +1038,7 @@ class FortyNine(Interchange):
RowStack_Class = FortyNine_RowStack
def startGame(self):
self._startDealNumRows(6)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(6)
shallHighlightMatch = Game._shallHighlightMatch_AC
@ -1137,9 +1135,7 @@ class Floradora(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(5)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(5)
shallHighlightMatch = Game._shallHighlightMatch_RK

8
pysollib/games/golf.py
View file

@ -1007,9 +1007,7 @@ class NapoleonTakesMoscow(Game, FirTree_GameMethods):
def startGame(self):
self.s.talon.dealRow(rows=self.s.reserves, frames=0)
self._startDealNumRows(3)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(3)
shallHighlightMatch = Game._shallHighlightMatch_SS
@ -1020,9 +1018,7 @@ class NapoleonLeavesMoscow(NapoleonTakesMoscow):
def startGame(self):
self.s.talon.dealRow(rows=self.s.reserves, frames=0)
self._startDealNumRows(4)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(4)
# ************************************************************************

4
pysollib/games/gypsy.py
View file

@ -859,9 +859,7 @@ class LockedCards(Game):
def startGame(self, rows=5):
self.s.talon.dealRow(rows=self.s.reserves, flip=0, frames=0)
self._startDealNumRows(rows-1)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(rows-1)
shallHighlightMatch = Game._shallHighlightMatch_AC

4
pysollib/games/klondike.py
View file

@ -1099,9 +1099,7 @@ class BigForty(Klondike):
Klondike.createGame(self, rows=10)
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(3)
shallHighlightMatch = Game._shallHighlightMatch_SS

4
pysollib/games/royalcotillion.py
View file

@ -700,9 +700,7 @@ class ThreePirates(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(3)
shallHighlightMatch = Game._shallHighlightMatch_SS

4
pysollib/games/terrace.py
View file

@ -342,9 +342,7 @@ class MamySusan(Terrace):
for i in range(6):
self.s.talon.dealRow(rows=self.s.reserves, flip=0, frames=0)
self.flipMove(self.s.reserves[0])
self._startDealNumRows(3)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(3)
def fillStack(self, stack):
pass

4
pysollib/games/ultra/hanafuda.py
View file

@ -683,9 +683,7 @@ class Sumo(AbstractFlowerGame):
def startGame(self):
assert len(self.s.talon.cards) == 48
self._startDealNumRows(5)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(5)
# ************************************************************************

4
pysollib/games/ultra/mughal.py
View file

@ -357,9 +357,7 @@ class MughalCircles(AbstractMughalGame):
def startGame(self):
assert len(self.s.talon.cards) == 96
self._startDealNumRows(3)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(3)
def shallHighlightMatch(self, stack1, card1, stack2, card2):
return ((card1.suit == card2.suit) and

8
pysollib/games/yukon.py
View file

@ -482,9 +482,7 @@ class AustralianPatience(RussianSolitaire):
l.defaultAll()
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(3)
class RawPrawn(AustralianPatience):
@ -498,9 +496,7 @@ class BimBom(AustralianPatience):
AustralianPatience.createGame(self, rows=8)
def startGame(self):
self._startDealNumRows(4)
self.s.talon.dealRow()
self.s.talon.dealCards()
self._startDealNumRowsAndDealRowAndCards(4)
# ************************************************************************