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

+ 1 new game

Browse source 
* misc. improvements


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@76 39dd0a4e-7c14-0410-91b3-c4f2d318f732
This commit is contained in:
skomoroh 2006-10-02 21:13:16 +00:00
parent 6dd4b5cd9d
commit be2c60dd05
5 changed files with 47 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pysollib/games/acesup.py
View file

@ -174,6 +174,8 @@ class PerpetualMotion_Talon(DealRowTalonStack):
def dealCards(self, sound=0):
if self.cards:
return DealRowTalonStack.dealCards(self, sound=sound)
if sound:
self.game.startDealSample()
game, num_cards = self.game, len(self.cards)
rows = list(game.s.rows)[:]
rows.reverse()
@ -184,7 +186,10 @@ class PerpetualMotion_Talon(DealRowTalonStack):
if self.cards[-1].face_up:
game.flipMove(self)
assert len(self.cards) == num_cards
return DealRowTalonStack.dealCards(self, sound=sound)
n = DealRowTalonStack.dealCards(self, sound=0)
if sound:
self.game.stopSamples()
return n
class PerpetualMotion_Foundation(AbstractFoundationStack):

2
pysollib/games/bakersgame.py
View file

@ -208,7 +208,7 @@ class SeahavenTowers(KingOnlyBakersGame):
for i in range(10):
s.rows.append(self.RowStack_Class(x, y, self))
x = x + l.XS
self.setRegion(s.rows, (-999, y - l.YM / 2, 999999, 999999))
self.setRegion(s.rows, (-999, y - l.CH / 2, 999999, 999999))
s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self)
# define stack-groups

2
pysollib/games/katzenschwanz.py
View file

@ -92,7 +92,7 @@ class DerKatzenschwanz(Game):
s.reserves.append(ReserveStack(x, y, self))
x = x + l.XS
x, y = l.XM + (maxrows-rows)*l.XS/2, l.YM + l.YS
self.setRegion(s.reserves, (-999, -999, 999999, y - l.XM / 2))
self.setRegion(s.reserves, (-999, -999, 999999, y - l.CH / 2))
for i in range(rows):
stack = self.RowStack_Class(x, y, self)
stack.CARD_XOFFSET = xoffset

44
pysollib/games/montecarlo.py
View file

@ -678,6 +678,7 @@ class DerLetzteMonarch_RowStack(ReserveStack):
assert ncards == 1 and to_stack in self.game.s.rows
assert len(to_stack.cards) == 1
self._handlePairMove(ncards, to_stack, frames=-1, shadow=0)
self.fillStack()
def _handlePairMove(self, n, other_stack, frames=-1, shadow=-1):
game = self.game
@ -695,30 +696,42 @@ class DerLetzteMonarch_ReserveStack(ReserveStack):
class DerLetzteMonarch(Game):
Talon_Class = InitialDealTalonStack
#
# game layout
#
def createGame(self):
def createGame(self, texts=False):
# create layout
l, s = Layout(self, card_x_space=4), self.s
# set window
self.setSize(l.XM + 13*l.XS, l.YM + 5*l.YS)
decks = self.gameinfo.decks
if decks == 1:
w = l.XM + 13*l.XS
dx = 0
else:
w = l.XM + 15*l.XS
dx = l.XS
h = l.YM + 5*l.YS
self.setSize(w, h)
# create stacks
for i in range(4):
for j in range(13):
x, y, = l.XM + j*l.XS, l.YM + (i+1)*l.YS
x, y, = dx + l.XM + j*l.XS, l.YM + (i+1)*l.YS
s.rows.append(DerLetzteMonarch_RowStack(x, y, self, max_accept=1, max_cards=2))
for i in range(4):
x, y, = l.XM + (i+2)*l.XS, l.YM
s.reserves.append(DerLetzteMonarch_ReserveStack(x, y, self, max_accept=0))
for i in range(4):
for i in range(4*decks):
x, y, = l.XM + (i+7)*l.XS, l.YM
s.foundations.append(DerLetzteMonarch_Foundation(x, y, self, i, max_move=0))
s.talon = InitialDealTalonStack(l.XM, l.YM, self)
s.foundations.append(DerLetzteMonarch_Foundation(x, y, self,
suit=i%4, max_move=0))
s.talon = self.Talon_Class(l.XM, l.YM, self)
if texts:
l.createText(s.talon, 'ne')
# define stack-groups (non default)
self.sg.talonstacks = [s.talon]
@ -739,7 +752,7 @@ class DerLetzteMonarch(Game):
c = 0
for s in self.s.foundations:
c = c + len(s.cards)
return c == 51
return c == self.gameinfo.ncards-1
def getAutoStacks(self, event=None):
return ((), self.s.reserves, ())
@ -765,6 +778,21 @@ class DerLetzteMonarch(Game):
return diff in (-13, -1, 1, 13)
class TheLastMonarchII(DerLetzteMonarch):
Talon_Class = TalonStack
def createGame(self):
DerLetzteMonarch.createGame(self, texts=True)
def fillStack(self, stack):
if stack in self.s.rows and not stack.cards:
if self.s.talon.cards:
old_state = self.enterState(self.S_FILL)
self.s.talon.flipMove()
self.s.talon.moveMove(1, stack)
self.leaveState(old_state)
# /***********************************************************************
# // Doublets
# ************************************************************************/
@ -844,4 +872,6 @@ registerGame(GameInfo(368, Vertical, "Vertical",
GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(649, DoubletsII, "Doublets II",
GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(663, TheLastMonarchII, "The last Monarch II",
GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL))

4
pysollib/tk/tkhtml.py
View file

@ -269,14 +269,14 @@ class HTMLViewer:
# create text widget
text_frame = Tkinter.Frame(parent)
text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew')
vbar = Tkinter.Scrollbar(text_frame)
vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y)
self.text = Tkinter.Text(text_frame,
fg='black', bg='white',
bd=1, relief='sunken',
cursor=self.defcursor,
wrap='word', padx=20, pady=20)
self.text.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1)
vbar = Tkinter.Scrollbar(text_frame)
vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y)
self.text["yscrollcommand"] = vbar.set
vbar["command"] = self.text.yview