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

Convert the Layout_Method to staticmethod()

Browse source 
This way it can be called as before in both python2 and python3.
This commit is contained in:
Shlomi Fish 2017-06-03 12:50:08 +03:00
parent 6b9d5bd0c6
commit 5ac5039687
15 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pysollib/games/bakersdozen.py
View file

@ -51,7 +51,7 @@ from pysollib.hint import FreeCellSolverWrapper
# ************************************************************************ # ************************************************************************
class CastlesInSpain(Game): class CastlesInSpain(Game):
Layout_Method = Layout.bakersDozenLayout Layout_Method = staticmethod(Layout.bakersDozenLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = SuperMoveAC_RowStack RowStack_Class = SuperMoveAC_RowStack

4
pysollib/games/beleagueredcastle.py
View file

@ -200,7 +200,7 @@ class ExiledKings(Citadel):
# ************************************************************************ # ************************************************************************
class Fortress(Game): class Fortress(Game):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = UD_SS_RowStack RowStack_Class = UD_SS_RowStack
@ -250,7 +250,7 @@ class Fortress(Game):
# ************************************************************************ # ************************************************************************
class Bastion(Game): class Bastion(Game):
Layout_Method = Layout.freeCellLayout Layout_Method = staticmethod(Layout.freeCellLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = UD_SS_RowStack RowStack_Class = UD_SS_RowStack

6
pysollib/games/freecell.py
View file

@ -61,7 +61,7 @@ from pysollib.stack import \
class FreeCell(Game): class FreeCell(Game):
Layout_Method = Layout.freeCellLayout Layout_Method = staticmethod(Layout.freeCellLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = SuperMoveAC_RowStack RowStack_Class = SuperMoveAC_RowStack
@ -77,9 +77,9 @@ class FreeCell(Game):
# create layout # create layout
l, s = Layout(self), self.s l, s = Layout(self), self.s
kwdefault(layout, rows=8, reserves=4, texts=0) kwdefault(layout, rows=8, reserves=4, texts=0)
# self.Layout_Method(l, **layout) self.Layout_Method(l, **layout)
# self.__class__.__dict__['Layout_Method'](l, **layout) # self.__class__.__dict__['Layout_Method'](l, **layout)
self.__class__.Layout_Method(l, **layout) # self.__class__.Layout_Method(l, **layout)
self.setSize(l.size[0], l.size[1]) self.setSize(l.size[0], l.size[1])
# create stacks # create stacks
s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self)

18
pysollib/games/gypsy.py
View file

@ -63,7 +63,7 @@ from pysollib.stack import \
# ************************************************************************ # ************************************************************************
class Gypsy(Game): class Gypsy(Game):
Layout_Method = Layout.gypsyLayout Layout_Method = staticmethod(Layout.gypsyLayout)
Talon_Class = DealRowTalonStack Talon_Class = DealRowTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -135,7 +135,7 @@ class Irmgard_Talon(TalonStack):
class Irmgard(Gypsy): class Irmgard(Gypsy):
GAME_VERSION = 2 GAME_VERSION = 2
Layout_Method = Layout.harpLayout Layout_Method = staticmethod(Layout.harpLayout)
Talon_Class = Irmgard_Talon Talon_Class = Irmgard_Talon
RowStack_Class = KingAC_RowStack RowStack_Class = KingAC_RowStack
@ -381,7 +381,7 @@ class Griffon(Mississippi):
# ************************************************************************ # ************************************************************************
class Blockade(Gypsy): class Blockade(Gypsy):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
RowStack_Class = SS_RowStack RowStack_Class = SS_RowStack
def createGame(self): def createGame(self):
@ -402,7 +402,7 @@ class Blockade(Gypsy):
class PhantomBlockade(Gypsy): class PhantomBlockade(Gypsy):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
RowStack_Class = KingAC_RowStack RowStack_Class = KingAC_RowStack
def createGame(self): def createGame(self):
@ -528,7 +528,7 @@ class Surprise(Gypsy):
# ************************************************************************ # ************************************************************************
class Elba(Gypsy): class Elba(Gypsy):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
RowStack_Class = KingAC_RowStack RowStack_Class = KingAC_RowStack
def createGame(self): def createGame(self):
@ -546,7 +546,7 @@ class Elba(Gypsy):
# ************************************************************************ # ************************************************************************
class Millie(Gypsy): class Millie(Gypsy):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
def createGame(self): def createGame(self):
Gypsy.createGame(self, playcards=24) Gypsy.createGame(self, playcards=24)
@ -563,7 +563,7 @@ class Millie(Gypsy):
# ************************************************************************ # ************************************************************************
class Hypotenuse(Gypsy): class Hypotenuse(Gypsy):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
RowStack_Class = KingAC_RowStack RowStack_Class = KingAC_RowStack
def createGame(self): def createGame(self):
@ -733,7 +733,7 @@ class Flamenco(Gypsy):
# ************************************************************************ # ************************************************************************
class Eclipse(Gypsy): class Eclipse(Gypsy):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
RowStack_Class = SS_RowStack RowStack_Class = SS_RowStack
def createGame(self): def createGame(self):
@ -754,7 +754,7 @@ class Eclipse(Gypsy):
# ************************************************************************ # ************************************************************************
class BrazilianPatience(Gypsy): class BrazilianPatience(Gypsy):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
RowStack_Class = KingAC_RowStack RowStack_Class = KingAC_RowStack
def createGame(self): def createGame(self):

6
pysollib/games/harp.py
View file

@ -55,7 +55,7 @@ from pysollib.stack import \
class DoubleKlondike(Game): class DoubleKlondike(Game):
Layout_Method = Layout.harpLayout Layout_Method = staticmethod(Layout.harpLayout)
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = KingAC_RowStack RowStack_Class = KingAC_RowStack
Hint_Class = KlondikeType_Hint Hint_Class = KlondikeType_Hint
@ -301,7 +301,7 @@ class DoubleKingsley(DoubleKlondike):
# ************************************************************************ # ************************************************************************
class ThievesOfEgypt(DoubleKlondike): class ThievesOfEgypt(DoubleKlondike):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
def createGame(self): def createGame(self):
DoubleKlondike.createGame(self, rows=10, max_rounds=2) DoubleKlondike.createGame(self, rows=10, max_rounds=2)
@ -323,7 +323,7 @@ class ThievesOfEgypt(DoubleKlondike):
# ************************************************************************ # ************************************************************************
class Brush(DoubleKlondike): class Brush(DoubleKlondike):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Foundation_Class = Spider_SS_Foundation Foundation_Class = Spider_SS_Foundation
RowStack_Class = Spider_RowStack RowStack_Class = Spider_RowStack
Hint_Class = Spider_Hint Hint_Class = Spider_Hint

12
pysollib/games/klondike.py
View file

@ -69,7 +69,7 @@ from pysollib.stack import \
class Klondike(Game): class Klondike(Game):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = KingAC_RowStack RowStack_Class = KingAC_RowStack
@ -79,8 +79,8 @@ class Klondike(Game):
# create layout # create layout
l, s = Layout(self), self.s l, s = Layout(self), self.s
kwdefault(layout, rows=7, waste=1, texts=1, playcards=16) kwdefault(layout, rows=7, waste=1, texts=1, playcards=16)
# self.Layout_Method.__get__(l, l.__class__)(**layout) self.Layout_Method.__get__(l, l.__class__)(**layout)
self.__class__.Layout_Method(l, **layout) # self.__class__.Layout_Method(l, **layout)
self.setSize(l.size[0], l.size[1]) self.setSize(l.size[0], l.size[1])
# create stacks # create stacks
s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self,
@ -213,7 +213,7 @@ class Whitehead(Klondike):
# ************************************************************************ # ************************************************************************
class SmallHarp(Klondike): class SmallHarp(Klondike):
Layout_Method = Layout.gypsyLayout Layout_Method = staticmethod(Layout.gypsyLayout)
def startGame(self): def startGame(self):
for i in range(len(self.s.rows)): for i in range(len(self.s.rows)):
@ -421,7 +421,7 @@ class AgnesSorel(Klondike):
# ************************************************************************ # ************************************************************************
class EightTimesEight(Klondike): class EightTimesEight(Klondike):
Layout_Method = Layout.gypsyLayout Layout_Method = staticmethod(Layout.gypsyLayout)
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
def createGame(self): def createGame(self):
@ -451,7 +451,7 @@ class EightByEight_RowStack(RK_RowStack):
class EightByEight(EightTimesEight): class EightByEight(EightTimesEight):
Layout_Method = Layout.klondikeLayout # gypsyLayout Layout_Method = staticmethod(Layout.klondikeLayout) # gypsyLayout
Talon_Class = CanfieldRush_Talon Talon_Class = CanfieldRush_Talon
RowStack_Class = EightByEight_RowStack RowStack_Class = EightByEight_RowStack

2
pysollib/games/sanibel.py
View file

@ -44,7 +44,7 @@ from pysollib.stack import \
class Sanibel(Gypsy): class Sanibel(Gypsy):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1) Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1)
Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0)
RowStack_Class = Yukon_AC_RowStack RowStack_Class = Yukon_AC_RowStack

2
pysollib/games/special/tarock.py
View file

@ -841,7 +841,7 @@ class Ponytail(Tarock_GameMethods, Braid):
# ************************************************************************ # ************************************************************************
class Cavalier(AbstractTarockGame): class Cavalier(AbstractTarockGame):
Layout_Method = Layout.bakersDozenLayout Layout_Method = staticmethod(Layout.bakersDozenLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = Cavalier_RowStack RowStack_Class = Cavalier_RowStack

14
pysollib/games/spider.py
View file

@ -130,7 +130,7 @@ class SuperMoveSpider_RowStack(SuperMoveStack_StackMethods, Spider_RowStack):
# ************************************************************************ # ************************************************************************
class RelaxedSpider(Game): class RelaxedSpider(Game):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = DealRowTalonStack Talon_Class = DealRowTalonStack
Foundation_Class = Spider_SS_Foundation Foundation_Class = Spider_SS_Foundation
RowStack_Class = Spider_RowStack RowStack_Class = Spider_RowStack
@ -140,9 +140,9 @@ class RelaxedSpider(Game):
# create layout # create layout
l, s = Layout(self), self.s l, s = Layout(self), self.s
kwdefault(layout, rows=10, waste=0, texts=1, playcards=23) kwdefault(layout, rows=10, waste=0, texts=1, playcards=23)
# self.Layout_Method(l, **layout) self.Layout_Method(l, **layout)
# self.__class__.__dict__['Layout_Method'](l, **layout) # self.__class__.__dict__['Layout_Method'](l, **layout)
self.__class__.Layout_Method(l, **layout) # self.__class__.Layout_Method(l, **layout)
self.setSize(l.size[0], l.size[1]) self.setSize(l.size[0], l.size[1])
# create stacks # create stacks
s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self)
@ -227,7 +227,7 @@ class GroundsForADivorce_Talon(TalonStack):
class GroundsForADivorce(RelaxedSpider): class GroundsForADivorce(RelaxedSpider):
Layout_Method = Layout.harpLayout Layout_Method = staticmethod(Layout.harpLayout)
Talon_Class = GroundsForADivorce_Talon Talon_Class = GroundsForADivorce_Talon
Foundation_Class = StackWrapper( Foundation_Class = StackWrapper(
Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) Spider_SS_Foundation, base_rank=ANY_RANK, mod=13)
@ -250,7 +250,7 @@ class GroundsForADivorce(RelaxedSpider):
# ************************************************************************ # ************************************************************************
class GrandmothersGame(RelaxedSpider): class GrandmothersGame(RelaxedSpider):
Layout_Method = Layout.harpLayout Layout_Method = staticmethod(Layout.harpLayout)
def createGame(self): def createGame(self):
RelaxedSpider.createGame(self, playcards=22) RelaxedSpider.createGame(self, playcards=22)
@ -494,7 +494,7 @@ class RougeEtNoir_RowStack(KingAC_RowStack):
class RougeEtNoir(Game): class RougeEtNoir(Game):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = DealRowTalonStack Talon_Class = DealRowTalonStack
RowStack_Class = RougeEtNoir_RowStack RowStack_Class = RougeEtNoir_RowStack
@ -755,7 +755,7 @@ class Chelicera(Game):
class ScorpionHead(Scorpion): class ScorpionHead(Scorpion):
Layout_Method = Layout.freeCellLayout Layout_Method = staticmethod(Layout.freeCellLayout)
def createGame(self, **layout): def createGame(self, **layout):

20
pysollib/games/ultra/dashavatara.py
View file

@ -528,7 +528,7 @@ class TenAvatars(AbstractDashavataraGame):
# ***********************************************************************/ # ***********************************************************************/
class Balarama(AbstractDashavataraGame): class Balarama(AbstractDashavataraGame):
Layout_Method = Layout.ghulamLayout Layout_Method = staticmethod(Layout.ghulamLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = Dashavatara_AC_RowStack RowStack_Class = Dashavatara_AC_RowStack
@ -589,7 +589,7 @@ class Balarama(AbstractDashavataraGame):
# ***********************************************************************/ # ***********************************************************************/
class Hayagriva(Balarama): class Hayagriva(Balarama):
Layout_Method = Layout.ghulamLayout Layout_Method = staticmethod(Layout.ghulamLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = Dashavatara_RK_RowStack RowStack_Class = Dashavatara_RK_RowStack
@ -612,7 +612,7 @@ class Hayagriva(Balarama):
# ***********************************************************************/ # ***********************************************************************/
class Shanka(Balarama): class Shanka(Balarama):
Layout_Method = Layout.ghulamLayout Layout_Method = staticmethod(Layout.ghulamLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = Dashavatara_RK_RowStack RowStack_Class = Dashavatara_RK_RowStack
@ -639,7 +639,7 @@ class Shanka(Balarama):
# ***********************************************************************/ # ***********************************************************************/
class Surukh(Balarama): class Surukh(Balarama):
Layout_Method = Layout.ghulamLayout Layout_Method = staticmethod(Layout.ghulamLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = Dashavatara_AF_RowStack RowStack_Class = Dashavatara_AF_RowStack
@ -671,7 +671,7 @@ class Surukh(Balarama):
# ***********************************************************************/ # ***********************************************************************/
class Matsya(AbstractDashavataraGame): class Matsya(AbstractDashavataraGame):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = RK_RowStack RowStack_Class = RK_RowStack
@ -727,7 +727,7 @@ class Matsya(AbstractDashavataraGame):
# ***********************************************************************/ # ***********************************************************************/
class Kurma(Matsya): class Kurma(Matsya):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = SS_RowStack RowStack_Class = SS_RowStack
@ -746,7 +746,7 @@ class Kurma(Matsya):
# ***********************************************************************/ # ***********************************************************************/
class Varaha(Matsya): class Varaha(Matsya):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = SS_RowStack RowStack_Class = SS_RowStack
@ -765,7 +765,7 @@ class Varaha(Matsya):
# ***********************************************************************/ # ***********************************************************************/
class Narasimha(Matsya): class Narasimha(Matsya):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -789,7 +789,7 @@ class Narasimha(Matsya):
# ***********************************************************************/ # ***********************************************************************/
class Vamana(Matsya): class Vamana(Matsya):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -813,7 +813,7 @@ class Vamana(Matsya):
# ***********************************************************************/ # ***********************************************************************/
class Parashurama(Matsya): class Parashurama(Matsya):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = RK_RowStack RowStack_Class = RK_RowStack

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

@ -228,7 +228,7 @@ class Gaji(AbstractFlowerGame):
# ***********************************************************************/ # ***********************************************************************/
class Oonsoo(AbstractFlowerGame): class Oonsoo(AbstractFlowerGame):
Layout_Method = Layout.oonsooLayout Layout_Method = staticmethod(Layout.oonsooLayout)
Talon_Class = DealRowTalonStack Talon_Class = DealRowTalonStack
RowStack_Class = Oonsoo_SequenceStack RowStack_Class = Oonsoo_SequenceStack
Rows = 12 Rows = 12
@ -654,7 +654,7 @@ class FourWinds(AbstractFlowerGame):
# ************************************************************************ # ************************************************************************
class Sumo(AbstractFlowerGame): class Sumo(AbstractFlowerGame):
Layout_Method = Layout.sumoLayout Layout_Method = staticmethod(Layout.sumoLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = Hanafuda_SS_FoundationStack Foundation_Class = Hanafuda_SS_FoundationStack
RowStack_Class = Hanafuda_SequenceStack RowStack_Class = Hanafuda_SequenceStack
@ -702,7 +702,7 @@ class Sumo(AbstractFlowerGame):
# ************************************************************************ # ************************************************************************
class BigSumo(AbstractFlowerGame): class BigSumo(AbstractFlowerGame):
Layout_Method = Layout.sumoLayout Layout_Method = staticmethod(Layout.sumoLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = Hanafuda_SS_FoundationStack Foundation_Class = Hanafuda_SS_FoundationStack
RowStack_Class = Hanafuda_SequenceStack RowStack_Class = Hanafuda_SequenceStack
@ -748,7 +748,7 @@ class BigSumo(AbstractFlowerGame):
# ************************************************************************ # ************************************************************************
class Samuri(AbstractFlowerGame): class Samuri(AbstractFlowerGame):
Layout_Method = Layout.samuriLayout Layout_Method = staticmethod(Layout.samuriLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = Hanafuda_SS_FoundationStack Foundation_Class = Hanafuda_SS_FoundationStack
RowStack_Class = Hanafuda_SequenceStack RowStack_Class = Hanafuda_SequenceStack
@ -826,7 +826,7 @@ class SuperSamuri(DoubleSamuri):
# ************************************************************************ # ************************************************************************
class LittleEasy(AbstractFlowerGame): class LittleEasy(AbstractFlowerGame):
Layout_Method = Layout.easyLayout Layout_Method = staticmethod(Layout.easyLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = FourWinds_Foundation Foundation_Class = FourWinds_Foundation
RowStack_Class = Hanafuda_SequenceStack RowStack_Class = Hanafuda_SequenceStack
@ -913,7 +913,7 @@ class EasySupreme(LittleEasy):
# ************************************************************************ # ************************************************************************
class JustForFun(AbstractFlowerGame): class JustForFun(AbstractFlowerGame):
Layout_Method = Layout.funLayout Layout_Method = staticmethod(Layout.funLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = FourWinds_Foundation Foundation_Class = FourWinds_Foundation
RowStack_Class = Hanafuda_SequenceStack RowStack_Class = Hanafuda_SequenceStack
@ -990,7 +990,7 @@ class CherryBomb(Firecracker):
# ************************************************************************ # ************************************************************************
class Paulownia(AbstractFlowerGame): class Paulownia(AbstractFlowerGame):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = Hanafuda_SS_FoundationStack Foundation_Class = Hanafuda_SS_FoundationStack
RowStack_Class = Hanafuda_SequenceStack RowStack_Class = Hanafuda_SequenceStack

2
pysollib/games/ultra/hanafuda1.py
View file

@ -66,7 +66,7 @@ from pysollib.stack import \
class Paulownia(AbstractFlowerGame): class Paulownia(AbstractFlowerGame):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = Hanafuda_SS_FoundationStack Foundation_Class = Hanafuda_SS_FoundationStack
RowStack_Class = Hanafuda_SequenceStack RowStack_Class = Hanafuda_SequenceStack

24
pysollib/games/ultra/hexadeck.py
View file

@ -410,7 +410,7 @@ class BitsNBytes(Game):
class HexAKlon(Game): class HexAKlon(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = HexAKlon_RowStack RowStack_Class = HexAKlon_RowStack
@ -476,7 +476,7 @@ class HexAKlon(Game):
class HexAKlonByThrees(Game): class HexAKlonByThrees(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = HexAKlon_RowStack RowStack_Class = HexAKlon_RowStack
@ -542,7 +542,7 @@ class HexAKlonByThrees(Game):
class KingOnlyHexAKlon(Game): class KingOnlyHexAKlon(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = HexAKlon_RowStack RowStack_Class = HexAKlon_RowStack
@ -616,7 +616,7 @@ class KingOnlyHexAKlon(Game):
class KlondikePlus16(Game): class KlondikePlus16(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = HexAKlon_RowStack RowStack_Class = HexAKlon_RowStack
@ -674,7 +674,7 @@ class KlondikePlus16(Game):
class TheFamiliar(Game): class TheFamiliar(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -739,7 +739,7 @@ class TheFamiliar(Game):
class TwoFamiliars(Game): class TwoFamiliars(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -804,7 +804,7 @@ class TwoFamiliars(Game):
class TenByEight(Game): class TenByEight(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.gypsyLayout Layout_Method = staticmethod(Layout.gypsyLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -865,7 +865,7 @@ class TenByEight(Game):
class Drawbridge(Game): class Drawbridge(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.harpLayout Layout_Method = staticmethod(Layout.harpLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -924,7 +924,7 @@ class Drawbridge(Game):
class DoubleDrawbridge(Game): class DoubleDrawbridge(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.harpLayout Layout_Method = staticmethod(Layout.harpLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -984,7 +984,7 @@ class DoubleDrawbridge(Game):
class HiddenPassages(Game): class HiddenPassages(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack
@ -1058,7 +1058,7 @@ class HiddenPassages(Game):
class CluitjarsLair(Game): class CluitjarsLair(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = HexADeck_ACRowStack RowStack_Class = HexADeck_ACRowStack
@ -1276,7 +1276,7 @@ class MerlinsMeander(AbstractHexADeckGame):
class MagesGame(Game): class MagesGame(Game):
Hint_Class = CautiousDefaultHint Hint_Class = CautiousDefaultHint
Layout_Method = Layout.gypsyLayout Layout_Method = staticmethod(Layout.gypsyLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = AC_RowStack RowStack_Class = AC_RowStack

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

@ -443,7 +443,7 @@ class EightLegions(AbstractMughalGame):
# ***********************************************************************/ # ***********************************************************************/
class Shamsher(AbstractMughalGame): class Shamsher(AbstractMughalGame):
Layout_Method = Layout.ghulamLayout Layout_Method = staticmethod(Layout.ghulamLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = RK_RowStack RowStack_Class = RK_RowStack
@ -501,7 +501,7 @@ class Shamsher(AbstractMughalGame):
# ***********************************************************************/ # ***********************************************************************/
class Ashrafi(Shamsher): class Ashrafi(Shamsher):
Layout_Method = Layout.ghulamLayout Layout_Method = staticmethod(Layout.ghulamLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = RK_RowStack RowStack_Class = RK_RowStack
@ -520,7 +520,7 @@ class Ashrafi(Shamsher):
# ***********************************************************************/ # ***********************************************************************/
class Ghulam(Shamsher): class Ghulam(Shamsher):
Layout_Method = Layout.ghulamLayout Layout_Method = staticmethod(Layout.ghulamLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = SS_RowStack RowStack_Class = SS_RowStack
@ -544,7 +544,7 @@ class Ghulam(Shamsher):
# ***********************************************************************/ # ***********************************************************************/
class Tipati(AbstractMughalGame): class Tipati(AbstractMughalGame):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = WasteTalonStack Talon_Class = WasteTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = RK_RowStack RowStack_Class = RK_RowStack

14
pysollib/games/yukon.py
View file

@ -56,7 +56,7 @@ from pysollib.games.spider import Spider_SS_Foundation
# ************************************************************************ # ************************************************************************
class Yukon(Game): class Yukon(Game):
Layout_Method = Layout.yukonLayout Layout_Method = staticmethod(Layout.yukonLayout)
Talon_Class = InitialDealTalonStack Talon_Class = InitialDealTalonStack
Foundation_Class = SS_FoundationStack Foundation_Class = SS_FoundationStack
RowStack_Class = StackWrapper(Yukon_AC_RowStack, base_rank=KING) RowStack_Class = StackWrapper(Yukon_AC_RowStack, base_rank=KING)
@ -221,7 +221,7 @@ class Roslin(Yukon):
# ************************************************************************ # ************************************************************************
class ChineseDiscipline(Yukon): class ChineseDiscipline(Yukon):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = DealRowTalonStack Talon_Class = DealRowTalonStack
def createGame(self): def createGame(self):
@ -244,7 +244,7 @@ class ChineseSolitaire(ChineseDiscipline):
# ************************************************************************ # ************************************************************************
class Queenie(Yukon): class Queenie(Yukon):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = DealRowTalonStack Talon_Class = DealRowTalonStack
def createGame(self): def createGame(self):
@ -263,7 +263,7 @@ class Queenie(Yukon):
# ************************************************************************ # ************************************************************************
class Rushdike(RussianSolitaire): class Rushdike(RussianSolitaire):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
Talon_Class = DealRowTalonStack Talon_Class = DealRowTalonStack
def createGame(self): def createGame(self):
@ -399,7 +399,7 @@ class TenAcross(Yukon):
Foundation_Class = Spider_SS_Foundation Foundation_Class = Spider_SS_Foundation
RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING)
Layout_Method = Layout.freeCellLayout Layout_Method = staticmethod(Layout.freeCellLayout)
# #
# game layout # game layout
@ -520,7 +520,7 @@ class BimBom(AustralianPatience):
# ************************************************************************ # ************************************************************************
class Geoffrey(Yukon): class Geoffrey(Yukon):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING)
def createGame(self): def createGame(self):
@ -542,7 +542,7 @@ class Geoffrey(Yukon):
# ************************************************************************ # ************************************************************************
class Queensland(Yukon): class Queensland(Yukon):
Layout_Method = Layout.klondikeLayout Layout_Method = staticmethod(Layout.klondikeLayout)
RowStack_Class = Yukon_SS_RowStack RowStack_Class = Yukon_SS_RowStack
def createGame(self): def createGame(self):