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

* minor fixes

Browse source 
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@205 efabe8c0-fbe8-4139-b769-b5e6d273206e
This commit is contained in:
skomoroh 2007-08-31 21:30:22 +00:00
parent 1cf2e73101
commit 9d7698ecf1
8 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pysollib/customgame.py
View file

@ -129,7 +129,7 @@ class CustomGame(Game):
layout_kw['playcards'] = max(16, playcards) layout_kw['playcards'] = max(16, playcards)
if s['talon'] in (DealRowRedealTalonStack, if s['talon'] in (DealRowRedealTalonStack,
SpiderTalonStack, SpiderTalonStack,
GroundForADivorceTalonStack): GroundsForADivorceTalonStack):
layout_kw['playcards'] += 2 * s['decks'] layout_kw['playcards'] += 2 * s['decks']
# reserves # reserves

5
pysollib/gamedb.py
View file

@ -353,13 +353,14 @@ class GI:
16674, 16675, 16676, 16677, 16678, 16679, 16680, 22216, 16674, 16675, 16676, 16677, 16678, 16679, 16680, 22216,
22223, 22224, 22225, 22226, 22227, 22228, 22229, 22230, 22223, 22224, 22225, 22226, 22227, 22228, 22229, 22230,
22231, 22232,)), 22231, 22232,)),
('fc-0.8.0', tuple(range(263, 323))), ('fc-0.8.0', tuple(range(263, 323))), # exclude 297
('fc-0.9.0', tuple(range(323, 421))), ('fc-0.9.0', tuple(range(323, 421))),
('fc-0.9.1', tuple(range(421, 441))), ('fc-0.9.1', tuple(range(421, 441))),
('fc-0.9.2', tuple(range(441, 466))), ('fc-0.9.2', tuple(range(441, 466))),
('fc-0.9.3', tuple(range(466, 661))), ('fc-0.9.3', tuple(range(466, 661))),
('fc-0.9.4', tuple(range(661, 671))), ('fc-0.9.4', tuple(range(661, 671))),
('fc-1.0', tuple(range(671, 711))), ('fc-1.0', tuple(range(671, 711))),
('fc-1.1', tuple(range(711, 756))),
) )
# deprecated - the correct way is to or a GI.GT_XXX flag # deprecated - the correct way is to or a GI.GT_XXX flag
@ -377,7 +378,7 @@ class GI:
11, # Spider 11, # Spider
12, # Braid 12, # Braid
13, # Forty Thieves 13, # Forty Thieves
14, # Ground for a Divorce 14, # Grounds for a Divorce
19, # Yukon 19, # Yukon
31, # Baker's Dozen 31, # Baker's Dozen
36, # Golf 36, # Golf

24
pysollib/games/spider.py
View file

@ -181,10 +181,10 @@ class BlackWidow(Spider):
# /*********************************************************************** # /***********************************************************************
# // Scheidungsgrund (aka Ground for a Divorce) # // Scheidungsgrund (aka Grounds for a Divorce)
# ************************************************************************/ # ************************************************************************/
class GroundForADivorce_Talon(TalonStack): class GroundsForADivorce_Talon(TalonStack):
# A single click deals a new cards to each non-empty row. # A single click deals a new cards to each non-empty row.
def dealCards(self, sound=True): def dealCards(self, sound=True):
if self.cards: if self.cards:
@ -196,9 +196,9 @@ class GroundForADivorce_Talon(TalonStack):
return 0 return 0
class GroundForADivorce(RelaxedSpider): class GroundsForADivorce(RelaxedSpider):
Layout_Method = Layout.harpLayout Layout_Method = Layout.harpLayout
Talon_Class = GroundForADivorce_Talon Talon_Class = GroundsForADivorce_Talon
Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13)
RowStack_Class = StackWrapper(Spider_RowStack, mod=13) RowStack_Class = StackWrapper(Spider_RowStack, mod=13)
@ -891,8 +891,8 @@ class Spider3x3(BigSpider):
self.s.talon.dealRow() self.s.talon.dealRow()
class GroundForADivorce3Decks(BigSpider): class GroundsForADivorce3Decks(BigSpider):
Talon_Class = GroundForADivorce_Talon Talon_Class = GroundsForADivorce_Talon
Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13)
RowStack_Class = StackWrapper(Spider_RowStack, mod=13) RowStack_Class = StackWrapper(Spider_RowStack, mod=13)
def canDealCards(self): def canDealCards(self):
@ -929,8 +929,8 @@ class Spider4Decks(BigSpider):
l.defaultRegions() l.defaultRegions()
class GroundForADivorce4Decks(Spider4Decks): class GroundsForADivorce4Decks(Spider4Decks):
Talon_Class = GroundForADivorce_Talon Talon_Class = GroundsForADivorce_Talon
Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13)
RowStack_Class = StackWrapper(Spider_RowStack, mod=13) RowStack_Class = StackWrapper(Spider_RowStack, mod=13)
def createGame(self): def createGame(self):
@ -1089,7 +1089,7 @@ class ShortTail(LongTail):
# ************************************************************************/ # ************************************************************************/
class Incompatibility(Spidike): class Incompatibility(Spidike):
Talon_Class = GroundForADivorce_Talon Talon_Class = GroundsForADivorce_Talon
RowStack_Class = Spider_SS_RowStack RowStack_Class = Spider_SS_RowStack
def createGame(self): def createGame(self):
@ -1364,7 +1364,7 @@ registerGame(GameInfo(11, Spider, "Spider",
registerGame(GameInfo(49, BlackWidow, "Black Widow", registerGame(GameInfo(49, BlackWidow, "Black Widow",
GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL,
altnames=("Scarab",) )) altnames=("Scarab",) ))
registerGame(GameInfo(14, GroundForADivorce, "Ground for a Divorce", registerGame(GameInfo(14, GroundsForADivorce, "Grounds for a Divorce",
GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL,
altnames=('Scheidungsgrund',) )) altnames=('Scheidungsgrund',) ))
registerGame(GameInfo(114, GrandmothersGame, "Grandmother's Game", registerGame(GameInfo(114, GrandmothersGame, "Grandmother's Game",
@ -1417,7 +1417,7 @@ registerGame(GameInfo(382, Applegate, "Applegate",
GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(384, BigSpider, "Big Spider", registerGame(GameInfo(384, BigSpider, "Big Spider",
GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(401, GroundForADivorce3Decks, "Big Divorce", registerGame(GameInfo(401, GroundsForADivorce3Decks, "Big Divorce",
GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(441, York, "York", registerGame(GameInfo(441, York, "York",
GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_SKILL)) GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_SKILL))
@ -1437,7 +1437,7 @@ registerGame(GameInfo(449, Spider3x3, "Spider 3x3",
rules_filename="bigspider.html")) rules_filename="bigspider.html"))
registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)", registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)",
GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(455, GroundForADivorce4Decks, "Very Big Divorce", registerGame(GameInfo(455, GroundsForADivorce4Decks, "Very Big Divorce",
GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(458, Spidike, "Spidike", registerGame(GameInfo(458, Spidike, "Spidike",
GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) # GT_GYPSY ? GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) # GT_GYPSY ?

7
pysollib/settings.py
View file

@ -26,11 +26,10 @@ n_ = lambda x: x # for gettext
PACKAGE = 'PySolFC' PACKAGE = 'PySolFC'
TITLE = 'PySol' TITLE = 'PySol'
#PACKAGE_URL = 'http://pysolfc.sourceforge.net/' PACKAGE_URL = 'http://pysolfc.sourceforge.net/'
PACKAGE_URL = 'http://sourceforge.net/projects/pysolfc/'
VERSION = '1.0.1' VERSION = '1.1'
VERSION_TUPLE = (1, 0, 1) VERSION_TUPLE = (1, 1)
# Tk windowing system (auto set up in init.py) # Tk windowing system (auto set up in init.py)
WIN_SYSTEM = 'x11' # win32, x11, aqua, classic WIN_SYSTEM = 'x11' # win32, x11, aqua, classic

4
pysollib/stack.py
View file

@ -53,7 +53,7 @@ __all__ = ['cardsFaceUp',
'DealRowRedealTalonStack', 'DealRowRedealTalonStack',
'DealReserveRedealTalonStack', 'DealReserveRedealTalonStack',
'SpiderTalonStack', 'SpiderTalonStack',
'GroundForADivorceTalonStack', 'GroundsForADivorceTalonStack',
'OpenStack', 'OpenStack',
'AbstractFoundationStack', 'AbstractFoundationStack',
'SS_FoundationStack', 'SS_FoundationStack',
@ -1942,7 +1942,7 @@ class SpiderTalonStack(DealRowRedealTalonStack):
return False return False
return True return True
class GroundForADivorceTalonStack(DealRowRedealTalonStack): class GroundsForADivorceTalonStack(DealRowRedealTalonStack):
# A single click deals a new cards to each non-empty row. # A single click deals a new cards to each non-empty row.
def dealCards(self, sound=True): def dealCards(self, sound=True):
if self.cards: if self.cards:

2
pysollib/tile/toolbar.py
View file

@ -295,7 +295,7 @@ class PysolToolbar(PysolToolbarActions):
def _setButtonImage(self, button, name): def _setButtonImage(self, button, name):
image = self._loadImage(name) image = self._loadImage(name)
setattr(self, name + "_image", image) setattr(self, name + "_image", image)
if Image: # XXX: and WIN_SYSTEM != 'aqua': if Image:
dis_image = self._createDisabledButtonImage(image) dis_image = self._createDisabledButtonImage(image)
if dis_image: if dis_image:
setattr(self, name + "_disabled_image", dis_image) setattr(self, name + "_disabled_image", dis_image)

8
pysollib/wizardpresets.py
View file

@ -78,13 +78,13 @@ presets = {
'deal_face_up': 1, 'deal_face_up': 1,
}, },
'Ground for a Divorce': { 'Grounds for a Divorce': {
'preset': 'Ground for a Divorce', 'preset': 'Grounds for a Divorce',
'name': n_('My Ground for a Divorce'), 'name': n_('My Grounds for a Divorce'),
'skill_level': 'Mostly skill', 'skill_level': 'Mostly skill',
'decks': 'Two', 'decks': 'Two',
'layout': 'Harp', 'layout': 'Harp',
'talon': 'Ground for a Divorce', 'talon': 'Grounds for a Divorce',
'found_type': 'Spider same suit', 'found_type': 'Spider same suit',
'found_base_card': 'Any', 'found_base_card': 'Any',
'found_equal': 0, 'found_equal': 0,

14
pysollib/wizardutil.py
View file

@ -105,14 +105,14 @@ LayoutType = WizSetting(
var_name = 'layout', var_name = 'layout',
) )
TalonType = WizSetting( TalonType = WizSetting(
values_map = ((n_('Initial dealing'), InitialDealTalonStack), values_map = ((n_('Opening deal'), InitialDealTalonStack),
(n_('Deal to waste'), WasteTalonStack), (n_('Deal to waste'), WasteTalonStack),
(n_('Deal to tableau'), DealRowRedealTalonStack), (n_('Deal to tableau'), DealRowRedealTalonStack),
(n_('Deal to reserves'), DealReserveRedealTalonStack), (n_('Deal to reserves'), DealReserveRedealTalonStack),
(n_('Spider'), SpiderTalonStack), (n_('Spider'), SpiderTalonStack),
(n_('Ground for a Divorce'), GroundForADivorceTalonStack), (n_('Grounds for a Divorce'), GroundsForADivorceTalonStack),
), ),
default = n_('Initial dealing'), default = n_('Opening deal'),
label = _('Type:'), label = _('Type:'),
var_name = 'talon', var_name = 'talon',
) )