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

Update redeals for Devil's Grip

Browse source
This commit is contained in:
Joe R 2024-10-15 23:31:36 -04:00
parent 41c17c74f3
commit b77989cbdb
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
html-src/rules/devilsgrip.html
View file

@ -1,6 +1,6 @@
<h1>Devil's Grip</h1>
<p>
Picture Gallery type. 2 decks. No redeal.
Picture Gallery type. 2 decks. Unlimited redeals.
<h3>Object</h3>
<p>
@ -32,8 +32,8 @@ from the waste or talon (this is the only way the remaining 2s, 3s, and 4s
can be moved into the rows).
<p>
When there are no moves left, you can deal cards from the talon three at
a time, and move the top card to appropriate row piles. No redeal is
allowed.
a time, and move the top card to appropriate row piles. You can deal through
the deck as many times as needed.
<p>
The game is won if you're able to move all cards to the rows, and all the
piles are placed correctly.

14
pysollib/games/picturegallery.py
View file

@ -685,7 +685,7 @@ class DevilsGrip(RoyalParade):
StackWrapper(DevilsGrip_TableauStack,
base_rank=3, max_cards=4, dir=3),
]
Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1, num_deal=3)
Talon_Class = StackWrapper(WasteTalonStack, max_rounds=-1, num_deal=3)
NORMAL_OFFSET = True
@ -706,14 +706,14 @@ class DevilsGrip(RoyalParade):
def fillStack(self, stack):
if not stack.cards and stack in self.s.tableaux:
if self.s.waste.cards:
old_state = self.enterState(self.S_FILL)
self.s.waste.moveMove(1, stack)
self.leaveState(old_state)
elif self.s.talon.cards:
if self.s.talon.cards:
old_state = self.enterState(self.S_FILL)
self.s.talon.moveMove(1, stack)
self.leaveState(old_state)
elif self.s.waste.cards:
old_state = self.enterState(self.S_FILL)
self.s.waste.moveMove(1, stack)
self.leaveState(old_state)
# register the game
@ -746,7 +746,7 @@ registerGame(GameInfo(927, BigPictureGallery, "Big Picture Gallery",
registerGame(GameInfo(928, HugePictureGallery, "Huge Picture Gallery",
GI.GT_PICTURE_GALLERY, 4, 0, GI.SL_BALANCED))
registerGame(GameInfo(932, DevilsGrip, "Devil's Grip",
GI.GT_PICTURE_GALLERY | GI.GT_STRIPPED, 2, 0,
GI.GT_PICTURE_GALLERY | GI.GT_STRIPPED, 2, -1,
GI.SL_MOSTLY_LUCK,
ranks=list(range(1, 13)) # without Aces
))