Skip to content

Commit

Permalink
Support alternate names for alternate deck games
Browse files Browse the repository at this point in the history
  • Loading branch information
joeraz committed Feb 12, 2025
1 parent 21c2780 commit 5b9f64a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions pysollib/games/special/dashavatara.py
Original file line number Diff line number Diff line change
Expand Up @@ -1266,10 +1266,10 @@ def getHighlightPilesStacks(self):
# *
# ***********************************************************************/

def r(id, gameclass, name, game_type, decks, redeals, skill_level):
def r(id, gameclass, name, game_type, decks, redeals, skill_level, altnames=()):
game_type = game_type | GI.GT_DASHAVATARA_GANJIFA
gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level,
suits=list(range(10)), ranks=list(range(12)))
suits=list(range(10)), ranks=list(range(12)), altnames=altnames)
registerGame(gi)
return gi

Expand Down Expand Up @@ -1301,6 +1301,6 @@ def r(id, gameclass, name, game_type, decks, redeals, skill_level):
r(15421, Hiranyaksha, 'Hiranyaksha', GI.GT_DASHAVATARA_GANJIFA, 1, 0,
GI.SL_MOSTLY_SKILL)
r(15422, Dashavatara, 'Dashavatara', GI.GT_DASHAVATARA_GANJIFA, 1, 0,
GI.SL_BALANCED)
GI.SL_BALANCED, altnames=('Ten Avatars'))

del r
6 changes: 3 additions & 3 deletions pysollib/games/special/hexadeck.py
Original file line number Diff line number Diff line change
Expand Up @@ -1605,11 +1605,11 @@ def isGameWon(self):
# ************************************************************************


def r(id, gameclass, name, game_type, decks, redeals, skill_level):
def r(id, gameclass, name, game_type, decks, redeals, skill_level, altnames=()):
game_type = game_type | GI.GT_HEXADECK
gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level,
suits=list(range(4)), ranks=list(range(16)),
trumps=list(range(4)))
trumps=list(range(4)), altnames=altnames)
registerGame(gi)
return gi

Expand All @@ -1633,7 +1633,7 @@ def r(id, gameclass, name, game_type, decks, redeals, skill_level):
r(16675, CluitjarsLair, 'Cluitjar\'s Lair', GI.GT_HEXADECK, 1, 0,
GI.SL_BALANCED)
r(16676, MerlinsMeander, 'Merlin\'s Meander', GI.GT_HEXADECK, 2, 2,
GI.SL_BALANCED)
GI.SL_BALANCED, altnames=('Merlin\'s Coil'))
r(16677, MagesGame, 'Mage\'s Game', GI.GT_HEXADECK | GI.GT_OPEN, 1, 0,
GI.SL_BALANCED)
r(16678, Convolution, 'Convolution', GI.GT_HEXADECK | GI.GT_OPEN, 2, 0,
Expand Down
6 changes: 3 additions & 3 deletions pysollib/games/special/mughal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1157,10 +1157,10 @@ def getHighlightPilesStacks(self):
# *
# ************************************************************************

def r(id, gameclass, name, game_type, decks, redeals, skill_level):
def r(id, gameclass, name, game_type, decks, redeals, skill_level, altnames=()):
game_type = game_type | GI.GT_MUGHAL_GANJIFA
gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level,
suits=list(range(8)), ranks=list(range(12)))
suits=list(range(8)), ranks=list(range(12)), altnames=altnames)
registerGame(gi)
return gi

Expand All @@ -1187,6 +1187,6 @@ def r(id, gameclass, name, game_type, decks, redeals, skill_level):
r(16002, Khadga, 'Khadga', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL)
r(16003, Makara, 'Makara', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL)
r(16004, AshtaDikapala, 'Ashta Dikapala', GI.GT_MUGHAL_GANJIFA, 1, 0,
GI.SL_BALANCED)
GI.SL_BALANCED, altnames=('Eight Guardians'))

del r
7 changes: 4 additions & 3 deletions pysollib/games/special/tarock1.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,10 @@ def isGameWon(self):
# ************************************************************************

def r(id, gameclass, name, game_type, decks, redeals, skill_level,
numcards=78):
numcards=78, altnames=()):
game_type = game_type | GI.GT_TAROCK | GI.GT_CONTRIB | GI.GT_ORIGINAL
gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level,
ranks=list(range(14)), trumps=list(range(22)),
ranks=list(range(14)), trumps=list(range(22)), altnames=altnames,
si={"ncards": numcards})
registerGame(gi)
return gi
Expand All @@ -519,7 +519,8 @@ def r(id, gameclass, name, game_type, decks, redeals, skill_level,
GI.SL_MOSTLY_SKILL)
r(13167, Rambling, 'Rambling', GI.GT_TAROCK | GI.GT_OPEN, 2, 0,
GI.SL_MOSTLY_SKILL)
r(13168, FoolsUp, "Fool's Up", GI.GT_TAROCK, 1, 0, GI.SL_LUCK)
r(13168, FoolsUp, "Fool's Up", GI.GT_TAROCK, 1, 0, GI.SL_LUCK,
altnames=('Solitairot'))
r(13169, TrumpsRow, "Trumps Row", GI.GT_TAROCK, 1, 4, GI.SL_MOSTLY_SKILL,
numcards=73)
r(22232, LeGrandeTeton, 'Le Grande Teton', GI.GT_TAROCK, 1, 0, GI.SL_BALANCED)

0 comments on commit 5b9f64a

Please sign in to comment.