Skip to content

Commit

Permalink
Added comments to the algerian.py (#401)
Browse files Browse the repository at this point in the history
* Added comments to the algerian.py

* Update algerian.py

I made changes to the code so that it would pass flake8.

* Update algerian.py

I have revised the comments to comply with Flake8 standards.

* Update algerian.py

I have removed the trailing spaces to ensure AppVeyor passes successfully.

---------

Co-authored-by: Surani02 <[email protected]>
  • Loading branch information
Surani02 and Surani02 authored Oct 17, 2024
1 parent b77989c commit cc32c03
Showing 1 changed file with 45 additions and 31 deletions.
76 changes: 45 additions & 31 deletions pysollib/games/algerian.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,35 @@
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.stack import \
DealRowTalonStack, \
ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \
StackWrapper, \
UD_SS_RowStack
from pysollib.stack import (
DealRowTalonStack,
ReserveStack,
SS_FoundationStack,
SS_RowStack,
StackWrapper,
UD_SS_RowStack,
)
from pysollib.util import ACE, KING

# ************************************************************************
# * Carthage
# ************************************************************************

# Custom Talon class for the Carthage game. Handles the dealing of
# cards from the Talon.


class Carthage_Talon(DealRowTalonStack):
def dealCards(self, sound=False):
if sound:
self.game.startDealSample()
# Check if the number of cards equals the number of rows, then
# deal cards to rows.
if len(self.cards) == len(self.game.s.rows):
n = self.dealRowAvail(rows=self.game.s.rows, sound=False)
else:
# Otherwise, deal to reserves twice (used when rows
# are full or initial deal phase).
n = self.dealRowAvail(rows=self.game.s.reserves, sound=False)
n += self.dealRowAvail(rows=self.game.s.reserves, sound=False)
if sound:
Expand All @@ -57,57 +65,52 @@ class Carthage(Game):

Hint_Class = CautiousDefaultHint
Talon_Class = Carthage_Talon
Foundation_Classes = (SS_FoundationStack,
SS_FoundationStack)
Foundation_Classes = (SS_FoundationStack, SS_FoundationStack)
RowStack_Class = StackWrapper(SS_RowStack, max_move=1)

#
# game layout
#

# Game layout
def createGame(self, rows=8, reserves=6, playcards=12):
# create layout
l, s = Layout(self), self.s

# set window
# Set window size based on the number of decks and other
# layout parameters.
decks = self.gameinfo.decks
foundations = decks*4
foundations = decks * 4
max_rows = max(foundations, rows)
w, h = l.XM+(max_rows+1)*l.XS, l.YM+3*l.YS+playcards*l.YOFFSET
w, h = (l.XM + (max_rows + 1) * l.XS,
l.YM + 3 * l.YS + playcards * l.YOFFSET)
self.setSize(w, h)

# create stacks
x, y = l.XM+l.XS+(max_rows-foundations)*l.XS//2, l.YM
# Create stacks
x, y = l.XM + l.XS + (max_rows - foundations) * l.XS // 2, l.YM
for fclass in self.Foundation_Classes:
for i in range(4):
s.foundations.append(fclass(x, y, self, suit=i))
x += l.XS

x, y = l.XM+l.XS+(max_rows-rows)*l.XS//2, l.YM+l.YS
x, y = l.XM + l.XS + (max_rows - rows) * l.XS // 2, l.YM + l.YS
for i in range(rows):
s.rows.append(self.RowStack_Class(x, y, self,
max_move=1, max_accept=1))
x += l.XS
self.setRegion(s.rows, (-999, y-l.CH//2, 999999, h-l.YS-l.CH//2))
self.setRegion(s.rows, (-999, y - l.CH // 2,
999999, h - l.YS - l.CH // 2))

d = (w-reserves*l.XS)//reserves
x, y = l.XM, h-l.YS
d = (w - reserves * l.XS) // reserves
x, y = l.XM, h - l.YS
for i in range(reserves):
stack = ReserveStack(x, y, self)
stack.CARD_XOFFSET, stack.CARD_YOFFSET = 2, 0
s.reserves.append(stack)
x += l.XS+d
x += l.XS + d

s.talon = self.Talon_Class(l.XM, l.YM, self)
l.createText(s.talon, "s")

# define stack-groups
# Define stack-groups
l.defaultStackGroups()

#
# game overrides
#

# Game overrides
def startGame(self):
self.s.talon.dealRow(rows=self.s.rows, frames=0)
for i in range(5):
Expand All @@ -122,15 +125,21 @@ def startGame(self):
# * Algerian Patience
# ************************************************************************

# Algerian Patience is a variation of Carthage with different rules
# for dealing and card movement.


class AlgerianPatience(Carthage):

# Different foundation rules for stacking cards
Foundation_Classes = (SS_FoundationStack,
StackWrapper(SS_FoundationStack, base_rank=KING,
dir=-1))
RowStack_Class = StackWrapper(UD_SS_RowStack, mod=13)

# Hook for modifying the shuffle process, moves 4 Kings to the
# top of the Talon.
def _shuffleHook(self, cards):
# move 4 Kings to top of the Talon
return self._shuffleHookMoveToTop(
cards, lambda c: (c.rank == KING and c.deck == 0, c.suit))

Expand All @@ -145,19 +154,24 @@ class AlgerianPatience3(Carthage):
SS_FoundationStack)
RowStack_Class = StackWrapper(UD_SS_RowStack, mod=13)

# Modify the game layout to accommodate 8 rows, 8 reserves, and
# 20 playcards.
def createGame(self):
Carthage.createGame(self, rows=8, reserves=8, playcards=20)

def _shuffleHook(self, cards):
return self._shuffleHookMoveToTop(
cards, lambda c: (c.rank == ACE, (c.deck, c.suit)))

# Start the game by dealing rows to the foundations first, then
# follow Carthage rules.
def startGame(self):
self.s.talon.dealRow(rows=self.s.foundations, frames=0)
Carthage.startGame(self)


# register the game
# Register the Carthage, Algerian Patience, and Algerian
# Patience (3 Decks) games in the system.
registerGame(GameInfo(321, Carthage, "Carthage",
GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(322, AlgerianPatience, "Algerian Patience",
Expand Down

0 comments on commit cc32c03

Please sign in to comment.