From 5b9f64a7ebddd228b2f4b5a01dae6722997a2667 Mon Sep 17 00:00:00 2001 From: Joe R Date: Tue, 11 Feb 2025 21:39:43 -0500 Subject: [PATCH] Support alternate names for alternate deck games --- pysollib/games/special/dashavatara.py | 6 +++--- pysollib/games/special/hexadeck.py | 6 +++--- pysollib/games/special/mughal.py | 6 +++--- pysollib/games/special/tarock1.py | 7 ++++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pysollib/games/special/dashavatara.py b/pysollib/games/special/dashavatara.py index b475ae58..715a8967 100644 --- a/pysollib/games/special/dashavatara.py +++ b/pysollib/games/special/dashavatara.py @@ -1266,10 +1266,10 @@ class Dashavatara(Game): # * # ***********************************************************************/ -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 @@ -1301,6 +1301,6 @@ r(15420, AppachansWaterfall, "Appachan's Waterfall", GI.GT_DASHAVATARA_GANJIFA, 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 diff --git a/pysollib/games/special/hexadeck.py b/pysollib/games/special/hexadeck.py index 81fa35d7..23fdecc3 100644 --- a/pysollib/games/special/hexadeck.py +++ b/pysollib/games/special/hexadeck.py @@ -1605,11 +1605,11 @@ class MagicMontana(Montana): # ************************************************************************ -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 @@ -1633,7 +1633,7 @@ r(16674, HiddenPassages, 'Hidden Passages', GI.GT_HEXADECK, 1, 1, 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, diff --git a/pysollib/games/special/mughal.py b/pysollib/games/special/mughal.py index 4fe097ff..58b1f047 100644 --- a/pysollib/games/special/mughal.py +++ b/pysollib/games/special/mughal.py @@ -1157,10 +1157,10 @@ class AshtaDikapala(Game): # * # ************************************************************************ -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 @@ -1187,6 +1187,6 @@ r(16001, Danda, 'Danda', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) 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 diff --git a/pysollib/games/special/tarock1.py b/pysollib/games/special/tarock1.py index 2c3c8e7e..de8167f2 100644 --- a/pysollib/games/special/tarock1.py +++ b/pysollib/games/special/tarock1.py @@ -501,10 +501,10 @@ class TrumpsRow(Montana): # ************************************************************************ 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 @@ -519,7 +519,8 @@ r(13166, Serpent, 'Serpent', GI.GT_TAROCK | GI.GT_OPEN, 2, 0, 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)