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

Tentative fix for Scorpion Tail/etc. play.

Browse source 
See https://github.com/shlomif/PySolFC/issues/164

Thanks to @Arcorann. Needs tests.
This commit is contained in:
Shlomi Fish 2020-06-09 19:20:52 +03:00
parent 408a8fbb08
commit 8e4ed1e157
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pysollib/games/yukon.py
View file

@ -101,7 +101,7 @@ class RussianSolitaire(Yukon):
# ************************************************************************ # ************************************************************************
class Moosehide_RowStack(Yukon_AC_RowStack): class Moosehide_RowStack(Yukon_AC_RowStack):
def _isSequence(self, c1, c2): def _isYukonSequence(self, c1, c2):
return (c1.suit != c2.suit and c1.rank == c2.rank+1) return (c1.suit != c2.suit and c1.rank == c2.rank+1)
def getHelp(self): def getHelp(self):
@ -172,7 +172,7 @@ class Grandfather(RussianSolitaire):
# ************************************************************************ # ************************************************************************
class Alaska_RowStack(Yukon_SS_RowStack): class Alaska_RowStack(Yukon_SS_RowStack):
def _isSequence(self, c1, c2): def _isYukonSequence(self, c1, c2):
return (c1.suit == c2.suit and return (c1.suit == c2.suit and
((c1.rank + self.cap.dir) % self.cap.mod == c2.rank or ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank or
(c2.rank + self.cap.dir) % self.cap.mod == c1.rank)) (c2.rank + self.cap.dir) % self.cap.mod == c1.rank))
@ -191,7 +191,7 @@ class Alaska(RussianSolitaire):
# ************************************************************************ # ************************************************************************
class Roslin_RowStack(Yukon_AC_RowStack): class Roslin_RowStack(Yukon_AC_RowStack):
def _isSequence(self, c1, c2): def _isYukonSequence(self, c1, c2):
return (c1.color != c2.color and return (c1.color != c2.color and
((c1.rank + self.cap.dir) % self.cap.mod == c2.rank or ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank or
(c2.rank + self.cap.dir) % self.cap.mod == c1.rank)) (c2.rank + self.cap.dir) % self.cap.mod == c1.rank))
@ -289,7 +289,7 @@ class Abacus_Foundation(SS_FoundationStack):
class Abacus_RowStack(Yukon_SS_RowStack): class Abacus_RowStack(Yukon_SS_RowStack):
def _isSequence(self, c1, c2): def _isYukonSequence(self, c1, c2):
dir, mod = -(c1.suit + 1), 13 dir, mod = -(c1.suit + 1), 13
return c1.suit == c2.suit and (c1.rank + dir) % mod == c2.rank return c1.suit == c2.suit and (c1.rank + dir) % mod == c2.rank
@ -587,7 +587,7 @@ class DoubleRussianSpider(RussianSpider, DoubleRussianSolitaire):
# ************************************************************************ # ************************************************************************
class Brisbane_RowStack(Yukon_AC_RowStack): class Brisbane_RowStack(Yukon_AC_RowStack):
def _isSequence(self, c1, c2): def _isYukonSequence(self, c1, c2):
return (c1.rank + self.cap.dir) % self.cap.mod == c2.rank return (c1.rank + self.cap.dir) % self.cap.mod == c2.rank
def getHelp(self): def getHelp(self):

8
pysollib/stack.py
View file

@ -2629,7 +2629,7 @@ class Yukon_AC_RowStack(BasicRowStack):
kwdefault(cap, max_move=999999, max_accept=999999) kwdefault(cap, max_move=999999, max_accept=999999)
BasicRowStack.__init__(self, x, y, game, **cap) BasicRowStack.__init__(self, x, y, game, **cap)
def _isSequence(self, c1, c2): def _isYukonSequence(self, c1, c2):
return ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank and return ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank and
c1.color != c2.color) c1.color != c2.color)
@ -2637,7 +2637,7 @@ class Yukon_AC_RowStack(BasicRowStack):
if not self.basicAcceptsCards(from_stack, cards): if not self.basicAcceptsCards(from_stack, cards):
return False return False
# [topcard + card[0]] must be acceptable # [topcard + card[0]] must be acceptable
if self.cards and not self._isSequence(self.cards[-1], cards[0]): if self.cards and not self._isYukonSequence(self.cards[-1], cards[0]):
return False return False
return True return True
@ -2659,7 +2659,7 @@ class Yukon_AC_RowStack(BasicRowStack):
# A Yukon_SameSuit_RowStack builds down by rank and suit, # A Yukon_SameSuit_RowStack builds down by rank and suit,
# but can move any face-up cards regardless of sequence. # but can move any face-up cards regardless of sequence.
class Yukon_SS_RowStack(Yukon_AC_RowStack): class Yukon_SS_RowStack(Yukon_AC_RowStack):
def _isSequence(self, c1, c2): def _isYukonSequence(self, c1, c2):
return ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank and return ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank and
c1.suit == c2.suit) c1.suit == c2.suit)
@ -2678,7 +2678,7 @@ class Yukon_SS_RowStack(Yukon_AC_RowStack):
# A Yukon_Rank_RowStack builds down by rank # A Yukon_Rank_RowStack builds down by rank
# but can move any face-up cards regardless of sequence. # but can move any face-up cards regardless of sequence.
class Yukon_RK_RowStack(Yukon_AC_RowStack): class Yukon_RK_RowStack(Yukon_AC_RowStack):
def _isSequence(self, c1, c2): def _isYukonSequence(self, c1, c2):
return (c1.rank + self.cap.dir) % self.cap.mod == c2.rank return (c1.rank + self.cap.dir) % self.cap.mod == c2.rank
def getHelp(self): def getHelp(self):