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

* fixed Accordion game

Browse source 
+ new game: Relaxed Accordion


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@272 efabe8c0-fbe8-4139-b769-b5e6d273206e
This commit is contained in:
skomoroh 2011-03-07 09:20:26 +00:00
parent 2dac93f0a3
commit 1b0da82bdd
2 changed files with 64 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
html-src/rules/relaxedaccordion.html Normal file
View file

@ -0,0 +1,12 @@
<h1>Westcliff</h1>
<p>
One deck type. 1 deck. No redeal.
<h3>Object</h3>
<p>
Compress the entire deck into one pile.
<h3>Quick Description</h3>
<p>
Like <a href="accordion.html">Accordion</a>,
but you can move piles to left and to right.

56
pysollib/games/pushpin.py
View file

@ -226,7 +226,7 @@ class Queens(PushPin):
# ************************************************************************
# * Accordion
# * Bayan (ex. Accordion)
# ************************************************************************
class Accordion_Hint(AbstractHint):
@ -239,12 +239,18 @@ class Accordion_Hint(AbstractHint):
if r1.cards and r2.cards:
c1, c2 = r1.cards[0], r2.cards[0]
if c1.rank == c2.rank or c1.suit == c2.suit:
self.addHint(5000, 1, r1, r2)
if r2.acceptsCards(r1, [c1]):
self.addHint(5000, 1, r1, r2)
if r1.acceptsCards(r2, [c2]):
self.addHint(5000, 1, r2, r1)
r1, r2 = rows[i], rows[i+3]
if r1.cards and r2.cards:
c1, c2 = r1.cards[0], r2.cards[0]
if c1.rank == c2.rank or c1.suit == c2.suit:
self.addHint(6000, 1, r1, r2)
if r2.acceptsCards(r1, [c1]):
self.addHint(6000, 1, r1, r2)
if r1.acceptsCards(r2, [c2]):
self.addHint(6000, 1, r2, r1)
class Accordion_RowStack(PushPin_RowStack):
@ -273,6 +279,44 @@ class Accordion(PushPin):
def isGameWon(self):
return len(self.s.foundations[0].cards) == 52
# ************************************************************************
# * Accordion (fixed)
# ************************************************************************
class Accordion2_RowStack(Accordion_RowStack):
def acceptsCards(self, from_stack, cards):
if not Accordion_RowStack.acceptsCards(self, from_stack, cards):
return False
# accepts only from right stack
return self.id < from_stack.id
def moveMove(self, ncards, to_stack, frames=-1, shadow=-1):
game = self.game
old_state = game.enterState(game.S_FILL)
f = game.s.foundations[0]
game.updateStackMove(game.s.talon, 2|16) # for undo
game.moveMove(ncards, to_stack, f, frames=frames, shadow=shadow)
game.moveMove(ncards, self, to_stack, frames=frames, shadow=shadow)
self.fillStack()
game.updateStackMove(game.s.talon, 1|16) # for redo
game.leaveState(old_state)
class Accordion2(Accordion):
RowStack_Class = Accordion2_RowStack
def isGameWon(self):
return len(self.s.foundations[0].cards) == 51
# ************************************************************************
# * Relaxed Accordion
# ************************************************************************
class RelaxedAccordion_RowStack(Accordion2_RowStack):
acceptsCards = Accordion_RowStack.acceptsCards
class RelaxedAccordion(Accordion2):
RowStack_Class = RelaxedAccordion_RowStack
registerGame(GameInfo(287, PushPin, "Push Pin",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
@ -280,6 +324,10 @@ registerGame(GameInfo(288, RoyalMarriage, "Royal Marriage",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
## registerGame(GameInfo(303, Queens, "Queens",
## GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0))
registerGame(GameInfo(656, Accordion, "Accordion",
registerGame(GameInfo(656, Accordion, "Bayan",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED))
registerGame(GameInfo(772, Accordion2, "Accordion",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED,
altnames=('Idle Year', 'Methuselah', 'Tower of Babel') ))
registerGame(GameInfo(773, RelaxedAccordion, "Relaxed Accordion",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED))