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

Browse source
This commit is contained in:
Shlomi Fish 2017-04-18 00:18:32 +03:00
parent a6be4d22b6
commit d572d2921d
3 changed files with 77 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pysollib/games/labyrinth.py
View file

@ -24,22 +24,24 @@
__all__ = [] __all__ = []
# imports # imports
import sys
# PySol imports # PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI # from pysollib.gamedb import registerGame, GameInfo
from pysollib.util import *
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.util import
from pysollib.stack import \
BasicRowStack, \
DealRowTalonStack, \
SS_FoundationStack
# ************************************************************************ # ************************************************************************
# * Labyrinth # * Labyrinth
# ************************************************************************ # ************************************************************************
class Labyrinth_Talon(DealRowTalonStack): class Labyrinth_Talon(DealRowTalonStack):
def dealCards(self, sound=False): def dealCards(self, sound=False):
top_stacks = [] top_stacks = []
@ -50,6 +52,7 @@ class Labyrinth_Talon(DealRowTalonStack):
break break
return self.dealRowAvail(rows=top_stacks, sound=sound) return self.dealRowAvail(rows=top_stacks, sound=sound)
class Labyrinth_RowStack(BasicRowStack): class Labyrinth_RowStack(BasicRowStack):
def clickHandler(self, event): def clickHandler(self, event):
@ -67,7 +70,6 @@ class Labyrinth_RowStack(BasicRowStack):
return False return False
class Labyrinth(Game): class Labyrinth(Game):
# #
@ -110,15 +112,15 @@ class Labyrinth(Game):
self.s.talon.dealRow(rows=self.s.foundations) self.s.talon.dealRow(rows=self.s.foundations)
self.s.talon.dealRow(rows=self.s.rows[:8]) self.s.talon.dealRow(rows=self.s.rows[:8])
def _shuffleHook(self, cards): def _shuffleHook(self, cards):
return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) return self._shuffleHookMoveToTop(
cards, lambda c: (c.rank == 0, c.suit))
def fillStack(self, stack): def fillStack(self, stack):
if stack in self.s.rows[:8] and not stack.cards: if stack in self.s.rows[:8] and not stack.cards:
rows = self.s.rows rows = self.s.rows
to_stack = stack to_stack = stack
#if not self.demo: # if not self.demo:
# self.startDealSample() # self.startDealSample()
old_state = self.enterState(self.S_FILL) old_state = self.enterState(self.S_FILL)
for r in rows[list(rows).index(stack)+8::8]: for r in rows[list(rows).index(stack)+8::8]:
@ -130,12 +132,11 @@ class Labyrinth(Game):
if not stack.cards and self.s.talon.cards: if not stack.cards and self.s.talon.cards:
self.s.talon.dealRow(rows=[stack]) self.s.talon.dealRow(rows=[stack])
self.leaveState(old_state) self.leaveState(old_state)
#if not self.demo: # if not self.demo:
# self.stopSamples() # self.stopSamples()
# register the game # register the game
#registerGame(GameInfo(400, Labyrinth, "Labyrinth", # registerGame(GameInfo(400, Labyrinth, "Labyrinth",
# GI.GT_1DECK_TYPE, 1, 0)) # GI.GT_1DECK_TYPE, 1, 0))

99
pysollib/games/larasgame.py
View file

@ -26,19 +26,26 @@ __all__ = []
# imports # imports
# PySol imports # PySol imports
from pysollib.mygettext import _, n_ from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import *
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
from pysollib.stack import \
OpenStack, \
SS_FoundationStack, \
Stack, \
WasteTalonStack
# ************************************************************************ # ************************************************************************
# * # *
# ************************************************************************ # ************************************************************************
class LarasGame_Hint(CautiousDefaultHint): class LarasGame_Hint(CautiousDefaultHint):
pass pass
@ -82,7 +89,8 @@ class LarasGame_Talon(WasteTalonStack):
# If card rank == card location then add one card to talon # If card rank == card location then add one card to talon
# If card rank == ACE then add two cards to talon # If card rank == ACE then add two cards to talon
# If card rank == JACK, or higher then add one card to talon # If card rank == JACK, or higher then add one card to talon
# After all the rows have been dealt, deal cards to talon in self.dealRow # After all the rows have been dealt, deal cards to talon
# in self.dealRow
rank = r.getCard().rank rank = r.getCard().rank
if rank == i: # Is the rank == position? if rank == i: # Is the rank == position?
if not self.cards: if not self.cards:
@ -106,7 +114,8 @@ class LarasGame_Talon(WasteTalonStack):
self.game.startDealSample() self.game.startDealSample()
for r in game.s.reserves[:20]: for r in game.s.reserves[:20]:
while r.cards: while r.cards:
game.moveMove(1, r, game.s.rows[game.active_row], frames=3, shadow=0) game.moveMove(
1, r, game.s.rows[game.active_row], frames=3, shadow=0)
if self.cards: if self.cards:
game.active_row = self.getActiveRow() game.active_row = self.getActiveRow()
game.flipMove(self) game.flipMove(self)
@ -118,15 +127,17 @@ class LarasGame_Talon(WasteTalonStack):
# to have up to 28 cards on a row stack. # to have up to 28 cards on a row stack.
# We'll have to double up on some of the reserves. # We'll have to double up on some of the reserves.
for i in range(ncards - 19): for i in range(ncards - 19):
game.moveMove(1, game.s.rows[game.active_row], game.moveMove(
game.s.reserves[19 - i], frames=4, shadow=0) 1, game.s.rows[game.active_row],
game.s.reserves[19 - i], frames=4, shadow=0)
ncards = len(game.s.rows[game.active_row].cards) ncards = len(game.s.rows[game.active_row].cards)
assert ncards <= 19 assert ncards <= 19
for i in range(ncards): for i in range(ncards):
game.moveMove(1, game.s.rows[game.active_row], game.moveMove(
game.s.reserves[ncards - i], frames=4, shadow=0) 1, game.s.rows[game.active_row],
game.s.reserves[ncards - i], frames=4, shadow=0)
num_cards = len(self.cards) or self.canDealCards() num_cards = len(self.cards) or self.canDealCards()
else: # not self.cards else: # not self.cards
if self.round < self.max_rounds: if self.round < self.max_rounds:
ncards = 0 ncards = 0
rows = list(game.s.rows)[:game.MAX_ROW] rows = list(game.s.rows)[:game.MAX_ROW]
@ -149,7 +160,8 @@ class LarasGame_Talon(WasteTalonStack):
def canDealCards(self): def canDealCards(self):
if self.game.demo and self.game.moves.index >= 400: if self.game.demo and self.game.moves.index >= 400:
return False return False
return (self.cards or (self.round < self.max_rounds and not self.game.isGameWon())) return (self.cards or
(self.round < self.max_rounds and not self.game.isGameWon()))
def updateText(self): def updateText(self):
if self.game.preview > 1: if self.game.preview > 1:
@ -165,7 +177,7 @@ class LarasGame_Talon(WasteTalonStack):
class LarasGame_RowStack(OpenStack): class LarasGame_RowStack(OpenStack):
def __init__(self, x, y, game, yoffset = 1, **cap): def __init__(self, x, y, game, yoffset=1, **cap):
OpenStack.__init__(self, x, y, game, **cap) OpenStack.__init__(self, x, y, game, **cap)
self.CARD_YOFFSET = yoffset self.CARD_YOFFSET = yoffset
@ -208,7 +220,8 @@ class LarasGame(Game):
ROW_LENGTH = self.ROW_LENGTH ROW_LENGTH = self.ROW_LENGTH
# set window # set window
w, h = l.XM + l.XS * (ROW_LENGTH + 5), l.YM + l.YS * (ROW_LENGTH + (ROW_LENGTH != 6)) w, h = l.XM + l.XS * (ROW_LENGTH + 5), \
l.YM + l.YS * (ROW_LENGTH + (ROW_LENGTH != 6))
self.setSize(w, h) self.setSize(w, h)
# extra settings # extra settings
@ -218,9 +231,11 @@ class LarasGame(Game):
x, y = l.XM, l.YM x, y = l.XM, l.YM
for j in range(2): for j in range(2):
for i in range(ROW_LENGTH): for i in range(ROW_LENGTH):
s.foundations.append(SS_FoundationStack(x, y, self, self.Base_Suit(i, j), s.foundations.append(
max_cards = self.Max_Cards(i), mod = self.Mod(i), SS_FoundationStack(
dir = self.DIR[j], base_rank = self.Base_Rank(i, j))) x, y, self, self.Base_Suit(i, j),
max_cards=self.Max_Cards(i), mod=self.Mod(i),
dir=self.DIR[j], base_rank=self.Base_Rank(i, j)))
y = y + l.YS * (not j) y = y + l.YS * (not j)
x = x + l.XS * j x = x + l.XS * j
x, y = x + l.XS * 2, l.YM x, y = x + l.XS * 2, l.YM
@ -230,15 +245,18 @@ class LarasGame(Game):
for i in range(self.MAX_ROW): for i in range(self.MAX_ROW):
s.rows.append(LarasGame_RowStack(x, y, self)) s.rows.append(LarasGame_RowStack(x, y, self))
x = x + l.XS x = x + l.XS
if i == ROW_LENGTH or i == ROW_LENGTH * 2 + 1 or i == ROW_LENGTH * 3 + 2: if i == ROW_LENGTH or i == ROW_LENGTH * 2 + 1 \
or i == ROW_LENGTH * 3 + 2:
x, y = l.XM + l.XS, y + l.YS x, y = l.XM + l.XS, y + l.YS
# Create reserves # Create reserves
x, y = l.XM + l.XS * (ROW_LENGTH == 6), l.YM + l.YS * (ROW_LENGTH - (ROW_LENGTH == 6)) x, y = l.XM + l.XS * (ROW_LENGTH == 6), \
l.YM + l.YS * (ROW_LENGTH - (ROW_LENGTH == 6))
for i in range(20): for i in range(20):
s.reserves.append(LarasGame_ReserveStack(x, y, self, max_cards=2)) s.reserves.append(LarasGame_ReserveStack(x, y, self, max_cards=2))
x = x + l.XS * (i < (ROW_LENGTH + 4)) - l.XS * (i == (ROW_LENGTH + 9)) x += l.XS * (i < (ROW_LENGTH + 4)) - l.XS * (i == (ROW_LENGTH + 9))
y = y - l.YS * (i > (ROW_LENGTH + 3) and i < (ROW_LENGTH + 9)) + l.YS * (i > (ROW_LENGTH + 9)) y = y - l.YS * (i > (ROW_LENGTH + 3) and i < (ROW_LENGTH + 9)) \
+ l.YS * (i > (ROW_LENGTH + 9))
# Create talon # Create talon
x, y = l.XM + l.XS * (ROW_LENGTH + 2), h - l.YM - l.YS * 3 x, y = l.XM + l.XS * (ROW_LENGTH + 2), h - l.YM - l.YS * 3
@ -255,10 +273,12 @@ class LarasGame(Game):
self.sg.dropstacks = s.rows[:self.MAX_ROW] + s.reserves self.sg.dropstacks = s.rows[:self.MAX_ROW] + s.reserves
# Create relaxed reserve # Create relaxed reserve
if self.Reserve_Class != None: if self.Reserve_Class is not None:
x, y = l.XM + l.XS * (ROW_LENGTH + 2), l.YM + l.YS * .5 x, y = l.XM + l.XS * (ROW_LENGTH + 2), l.YM + l.YS * .5
s.reserves.append(self.Reserve_Class(x, y, self, s.reserves.append(
max_accept=1, max_cards=self.Reserve_Cards)) self.Reserve_Class(
x, y, self,
max_accept=1, max_cards=self.Reserve_Cards))
self.sg.openstacks = self.sg.openstacks + s.reserves[19:] self.sg.openstacks = self.sg.openstacks + s.reserves[19:]
self.sg.dropstacks = self.sg.dropstacks + s.reserves[19:] self.sg.dropstacks = self.sg.dropstacks + s.reserves[19:]
self.setRegion(s.reserves[19:], (x - l.XM / 2, 0, 99999, 99999)) self.setRegion(s.reserves[19:], (x - l.XM / 2, 0, 99999, 99999))
@ -298,22 +318,29 @@ class LarasGame(Game):
if i == 4 or len(self.s.talon.cards) <= ncards / 2: if i == 4 or len(self.s.talon.cards) <= ncards / 2:
self.startDealSample() self.startDealSample()
frames = 4 frames = 4
self.s.talon.dealRow(rows=self.s.rows[:self.Deal_Rows(i)], frames=frames) self.s.talon.dealRow(
self.moveMove(len(self.s.rows[-1].cards), self.s.rows[-1], self.s.talon, frames=0) rows=self.s.rows[:self.Deal_Rows(i)], frames=frames)
self.moveMove(
len(self.s.rows[-1].cards), self.s.rows[-1], self.s.talon,
frames=0)
self.active_row = None self.active_row = None
def shallHighlightMatch(self, stack1, card1, stack2, card2): def shallHighlightMatch(self, stack1, card1, stack2, card2):
i, j = (stack1 in self.s.foundations), (stack2 in self.s.foundations) i, j = (stack1 in self.s.foundations), (stack2 in self.s.foundations)
if not (i or j): return 0 if not (i or j):
if i: stack = stack1 return 0
else: stack = stack2 if i:
stack = stack1
else:
stack = stack2
i = 0 i = 0
for f in self.s.foundations: for f in self.s.foundations:
if f == stack: break if f == stack:
break
i = i + 1 % self.ROW_LENGTH i = i + 1 % self.ROW_LENGTH
return (card1.suit == card2.suit and return (card1.suit == card2.suit and
((card1.rank + 1) % self.Mod(i) == card2.rank ((card1.rank + 1) % self.Mod(i) == card2.rank
or (card1.rank - 1) % self.Mod(i) == card2.rank)) or (card1.rank - 1) % self.Mod(i) == card2.rank))
def getHighlightPilesStacks(self): def getHighlightPilesStacks(self):
return () return ()
@ -329,8 +356,8 @@ class LarasGame(Game):
self.hints.list = None self.hints.list = None
# resize (i.e. possibly shorten list from previous undos) # resize (i.e. possibly shorten list from previous undos)
if not moves.index == 0: if not moves.index == 0:
m = moves.history[len(moves.history) - 1] moves.history[len(moves.history) - 1]
del moves.history[moves.index : ] del moves.history[moves.index:]
# update stats # update stats
if self.demo: if self.demo:
stats.demo_moves = stats.demo_moves + 1 stats.demo_moves = stats.demo_moves + 1
@ -407,7 +434,6 @@ class LarasGame(Game):
p.dump(self.active_row) p.dump(self.active_row)
# ************************************************************************ # ************************************************************************
# * Relaxed Lara's Game # * Relaxed Lara's Game
# ************************************************************************ # ************************************************************************
@ -426,6 +452,7 @@ class RelaxedLarasGame(LarasGame):
class DoubleLarasGame(RelaxedLarasGame): class DoubleLarasGame(RelaxedLarasGame):
Reserve_Cards = 2 Reserve_Cards = 2
MAX_ROUNDS = 3 MAX_ROUNDS = 3
def Max_Cards(self, i): def Max_Cards(self, i):
return 26 return 26
@ -434,10 +461,8 @@ class DoubleLarasGame(RelaxedLarasGame):
registerGame(GameInfo(37, LarasGame, "Lara's Game", registerGame(GameInfo(37, LarasGame, "Lara's Game",
GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED,
altnames=("Thirteen Packs",) )) altnames=("Thirteen Packs",)))
registerGame(GameInfo(13006, RelaxedLarasGame, "Lara's Game Relaxed", registerGame(GameInfo(13006, RelaxedLarasGame, "Lara's Game Relaxed",
GI.GT_2DECK_TYPE, 2, 1, GI.SL_BALANCED)) GI.GT_2DECK_TYPE, 2, 1, GI.SL_BALANCED))
registerGame(GameInfo(13007, DoubleLarasGame, "Lara's Game Doubled", registerGame(GameInfo(13007, DoubleLarasGame, "Lara's Game Doubled",
GI.GT_2DECK_TYPE, 4, 2, GI.SL_BALANCED)) GI.GT_2DECK_TYPE, 4, 2, GI.SL_BALANCED))

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-ky-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-ly-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." );