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

Browse source
This commit is contained in:
Shlomi Fish 2017-11-09 19:20:41 +02:00
parent 4fc37276aa
commit 4f2b28e017
17 changed files with 37 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pysollib/game.py
View file

@ -3404,3 +3404,7 @@ in the current implementation.''') % version)
def _startDealNumRows(self, n):
self._dealNumRows(n)
self.startDealSample()
def _startDealNumRowsAndDealSingleRow(self, n):
self._startDealNumRows(n)
self.s.talon.dealRow()

3
pysollib/games/bakersgame.py
View file

@ -258,8 +258,7 @@ class Penguin(Tuxedo):
self.flipMove(self.s.talon)
self.moveMove(1, self.s.talon, to_stack, frames=0)
# deal rows
self._startDealNumRows(6)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(6)
def _restoreGameHook(self, game):
self.base_card = self.cards[game.loadinfo.base_card_id]

3
pysollib/games/beleagueredcastle.py
View file

@ -585,8 +585,7 @@ class Chequers(Fortress):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
def fillStack(self, stack):
if self.s.talon.cards and stack in self.s.rows and not stack.cards:

3
pysollib/games/buffalobill.py
View file

@ -90,8 +90,7 @@ class BuffaloBill(Game):
#
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
class LittleBillie(BuffaloBill):

3
pysollib/games/calculation.py
View file

@ -409,8 +409,7 @@ class SeniorWrangler(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations[:8], frames=0)
self._startDealNumRows(11)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(11)
# ************************************************************************

3
pysollib/games/capricieuse.py
View file

@ -152,8 +152,7 @@ class Strata(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(7)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(7)
def redealCards(self):
while self.s.talon.cards:

3
pysollib/games/curdsandwhey.py
View file

@ -115,8 +115,7 @@ class CurdsAndWhey(Game):
#
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
def isGameWon(self):
for s in self.s.rows:

6
pysollib/games/fan.py
View file

@ -781,8 +781,7 @@ class Crescent(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self._startDealNumRows(5)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(5)
shallHighlightMatch = Game._shallHighlightMatch_SSW
@ -930,8 +929,7 @@ class ForestGlade(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(2)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(2)
shallHighlightMatch = Game._shallHighlightMatch_SS

12
pysollib/games/freecell.py
View file

@ -270,8 +270,7 @@ class TripleFreecell(FreeCell):
#
def startGame(self):
self._startDealNumRows(11)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(11)
class Cell11(TripleFreecell):
@ -291,8 +290,7 @@ class BigCell(TripleFreecell):
TripleFreecell.createGame(self, rows=13, reserves=4)
def startGame(self):
self._startDealNumRows(11)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(11)
# ************************************************************************
@ -572,8 +570,7 @@ class Headquarters(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(12)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(12)
shallHighlightMatch = Game._shallHighlightMatch_AC
@ -637,8 +634,7 @@ class Limpopo(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(12)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(12)
shallHighlightMatch = Game._shallHighlightMatch_AC

15
pysollib/games/golf.py
View file

@ -447,8 +447,7 @@ class FourLeafClovers(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
shallHighlightMatch = Game._shallHighlightMatch_RKW
@ -495,8 +494,7 @@ class AllInARow(BlackHole):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
# ************************************************************************
@ -691,8 +689,7 @@ class Waterfall(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
def updateText(self):
if self.preview > 1:
@ -1080,8 +1077,7 @@ class Flake2Decks(Flake):
Flake.createGame(self, rows=8, playcards=22)
def startGame(self):
self._startDealNumRows(12)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(12)
# ************************************************************************
@ -1118,8 +1114,7 @@ class Beacon(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
def fillStack(self, stack):
if stack in self.s.rows and not stack.cards:

12
pysollib/games/gypsy.py
View file

@ -290,8 +290,7 @@ class Nomad(MissMilligan):
ReserveStack_Class = ReserveStack
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
# ************************************************************************
@ -403,8 +402,7 @@ class PhantomBlockade(Gypsy):
Gypsy.createGame(self, rows=13, playcards=24)
def startGame(self):
self._startDealNumRows(2)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(2)
# ************************************************************************
@ -714,8 +712,7 @@ class Flamenco(Gypsy):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self._startDealNumRows(2)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(2)
# ************************************************************************
@ -730,8 +727,7 @@ class Eclipse(Gypsy):
Gypsy.createGame(self, rows=13)
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
shallHighlightMatch = Game._shallHighlightMatch_SS

3
pysollib/games/katzenschwanz.py
View file

@ -388,8 +388,7 @@ class Deep(DerKatzenschwanz):
return DerKatzenschwanz.createGame(self, rows=8, reserves=8)
def startGame(self):
self._startDealNumRows(12)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(12)
# ************************************************************************

3
pysollib/games/klondike.py
View file

@ -1256,8 +1256,7 @@ class LuckyThirteen(Game):
lay.defaultStackGroups()
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
shallHighlightMatch = Game._shallHighlightMatch_RK

3
pysollib/games/montecarlo.py
View file

@ -633,8 +633,7 @@ class TheWishOpen(TheWish):
pass
def startGame(self):
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
# ************************************************************************
# * Der letzte Monarch (The last Monarch)

3
pysollib/games/napoleon.py
View file

@ -404,8 +404,7 @@ class BusyCards(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
self._startDealNumRows(7)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(7)
shallHighlightMatch = Game._shallHighlightMatch_SS

21
pysollib/games/spider.py
View file

@ -235,8 +235,7 @@ class GroundsForADivorce(RelaxedSpider):
RelaxedSpider.createGame(self, playcards=22)
def startGame(self):
self._startDealNumRows(4)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(4)
shallHighlightMatch = Game._shallHighlightMatch_RKW
@ -252,8 +251,7 @@ class GrandmothersGame(RelaxedSpider):
RelaxedSpider.createGame(self, playcards=22)
def startGame(self):
self._startDealNumRows(5)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(5)
# ************************************************************************
@ -538,8 +536,7 @@ class MrsMop(RelaxedSpider):
RelaxedSpider.createGame(self, rows=13, playcards=24, texts=0)
def startGame(self):
self._startDealNumRows(7)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(7)
# ************************************************************************
@ -598,8 +595,7 @@ class Cicely(Game):
def startGame(self):
self.s.talon.dealRow(rows=self.s.reserves, frames=0)
self._startDealNumRows(3)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(3)
shallHighlightMatch = Game._shallHighlightMatch_SS
@ -1051,8 +1047,7 @@ class FredsSpider(Spidike):
Spidike.createGame(self, rows=10, playcards=23)
def startGame(self):
self._startDealNumRows(4)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(4)
class FredsSpider3Decks(FredsSpider):
@ -1127,8 +1122,7 @@ class Incompatibility(Spidike):
Spidike.createGame(self, rows=10)
def startGame(self):
self._startDealNumRows(4)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(4)
# ************************************************************************
@ -1377,8 +1371,7 @@ class TheJollyRoger(Game):
l.defaultStackGroups()
def startGame(self):
self._startDealNumRows(2)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(2)
def shallHighlightMatch(self, stack1, card1, stack2, card2):
if card1.rank != ACE and card2.rank != ACE:

3
pysollib/games/yukon.py
View file

@ -657,8 +657,7 @@ class Hawaiian(Game):
def startGame(self):
for i in range(104-5*10):
self.s.talon.dealRow(rows=self.s.reserves, frames=0)
self._startDealNumRows(4)
self.s.talon.dealRow()
self._startDealNumRowsAndDealSingleRow(4)
def getHighlightPilesStacks(self):
return ()