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

flake8 - games/u*

Browse source
This commit is contained in:
Shlomi Fish 2017-04-18 10:51:56 +03:00
parent e1bc790664
commit 118a8391e1
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pysollib/games/unionsquare.py
View file

@ -27,17 +27,28 @@ __all__ = []
# PySol imports # PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import *
from pysollib.mfxutil import kwdefault from pysollib.mfxutil import kwdefault
from pysollib.stack import *
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, ANY_RANK, NO_RANK
from pysollib.stack import \
AbstractFoundationStack, \
OpenStack, \
Stack, \
UD_SS_RowStack, \
WasteStack, \
WasteTalonStack, \
StackWrapper
# ************************************************************************ # ************************************************************************
# * # *
# ************************************************************************ # ************************************************************************
class UnionSquare_Foundation(AbstractFoundationStack): class UnionSquare_Foundation(AbstractFoundationStack):
def acceptsCards(self, from_stack, cards): def acceptsCards(self, from_stack, cards):
if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): if not AbstractFoundationStack.acceptsCards(self, from_stack, cards):
@ -54,7 +65,7 @@ class UnionSquare_RowStack(OpenStack):
kwdefault(cap, mod=8192, dir=0, base_rank=ANY_RANK, kwdefault(cap, mod=8192, dir=0, base_rank=ANY_RANK,
max_accept=1, max_move=1) max_accept=1, max_move=1)
OpenStack.__init__(self, x, y, game, **cap) OpenStack.__init__(self, x, y, game, **cap)
#self.CARD_YOFFSET = 1 # self.CARD_YOFFSET = 1
def acceptsCards(self, from_stack, cards): def acceptsCards(self, from_stack, cards):
if not OpenStack.acceptsCards(self, from_stack, cards): if not OpenStack.acceptsCards(self, from_stack, cards):
@ -67,8 +78,10 @@ class UnionSquare_RowStack(OpenStack):
card_dir = cards[0].rank - self.cards[-1].rank card_dir = cards[0].rank - self.cards[-1].rank
return card_dir == 1 or card_dir == -1 return card_dir == 1 or card_dir == -1
else: else:
stack_dir = (self.cards[1].rank - self.cards[0].rank) % self.cap.mod stack_dir = (self.cards[1].rank - self.cards[0].rank) % \
return (self.cards[-1].rank + stack_dir) % self.cap.mod == cards[0].rank self.cap.mod
return (self.cards[-1].rank + stack_dir) % \
self.cap.mod == cards[0].rank
getBottomImage = Stack._getReserveBottomImage getBottomImage = Stack._getReserveBottomImage
@ -119,7 +132,6 @@ class UnionSquare(Game):
# define stack-groups # define stack-groups
l.defaultStackGroups() l.defaultStackGroups()
# #
# game overrides # game overrides
# #
@ -142,12 +154,14 @@ class UnionSquare(Game):
class SolidSquare(UnionSquare): class SolidSquare(UnionSquare):
RowStack_Class = StackWrapper(UD_SS_RowStack, base_rank=NO_RANK, RowStack_Class = StackWrapper(UD_SS_RowStack, base_rank=NO_RANK,
max_accept=1, max_move=1, mod=13) max_accept=1, max_move=1, mod=13)
def createGame(self): def createGame(self):
UnionSquare.createGame(self, rows=20) UnionSquare.createGame(self, rows=20)
def _shuffleHook(self, cards): def _shuffleHook(self, cards):
return self._shuffleHookMoveToTop(cards, return self._shuffleHookMoveToTop(
lambda c: (c.rank == ACE and c.deck == 0, c.suit)) cards,
lambda c: (c.rank == ACE and c.deck == 0, c.suit))
def startGame(self): def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0) self.s.talon.dealRow(rows=self.s.foundations, frames=0)
@ -181,9 +195,10 @@ class Boomerang_Foundation(AbstractFoundationStack):
return cards[0].rank == ACE return cards[0].rank == ACE
elif len(self.cards) < 15: elif len(self.cards) < 15:
return cards[0].rank == 20 - len(self.cards) return cards[0].rank == 20 - len(self.cards)
else: # len(self.cards) == 15 else: # len(self.cards) == 15
return cards[0].rank == ACE return cards[0].rank == ACE
class Boomerang(UnionSquare): class Boomerang(UnionSquare):
Foundation_Class = StackWrapper(Boomerang_Foundation, Foundation_Class = StackWrapper(Boomerang_Foundation,
base_rank=6, max_cards=16) base_rank=6, max_cards=16)

2
tests/style/py-flake8.t
View file

@ -10,7 +10,7 @@ use String::ShellQuote qw/ shell_quote /;
# my $cmd = shell_quote( 'flake8', '.' ); # my $cmd = shell_quote( 'flake8', '.' );
my $cmd = shell_quote( 'flake8', my $cmd = shell_quote( 'flake8',
grep { not($_ eq './pysollib/pysoltk.py' or $_ eq './pysollib/tile/ttk.py') } glob('./pysollib/*.py ./pysollib/[cmpuw]*/*.py ./pysollib/tile/*.py ./pysollib/ui/tktile/*.py ./pysollib/games/[a-ty-z]*.py') ); grep { not($_ eq './pysollib/pysoltk.py' or $_ eq './pysollib/tile/ttk.py') } glob('./pysollib/*.py ./pysollib/[cmpuw]*/*.py ./pysollib/tile/*.py ./pysollib/ui/tktile/*.py ./pysollib/games/[a-uy-z]*.py') );
# TEST # TEST
eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." ); eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );