1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00

Refactoring: extract a closure.

This commit is contained in:
Shlomi Fish 2018-03-14 19:20:36 +02:00
parent 58f458f58a
commit bc25ff5574

View file

@ -857,27 +857,21 @@ class Game(object):
if progress:
pstep = (100.0 - progress.percent) / gi.ncards
cards = []
id = 0
id = [0]
x, y = self.s.talon.x, self.s.talon.y
for deck in range(gi.decks):
for suit in gi.suits:
for rank in gi.ranks:
card = self._createCard(id, deck, suit, rank, x=x, y=y)
def _iter_ranks(ranks, suit):
for rank in ranks:
card = self._createCard(id[0], deck, suit, rank, x=x, y=y)
if card is None:
continue
cards.append(card)
id = id + 1
id[0] += 1
if progress:
progress.update(step=pstep)
trump_suit = len(gi.suits)
for rank in gi.trumps:
card = self._createCard(id, deck, trump_suit, rank, x=x, y=y)
if card is None:
continue
cards.append(card)
id = id + 1
if progress:
progress.update(step=pstep)
for suit in gi.suits:
_iter_ranks(gi.ranks, suit)
_iter_ranks(gi.trumps, len(gi.suits))
if progress:
progress.update(percent=100)
assert len(cards) == gi.ncards