From f0df3b0f583c1e61bbf292a7c7986136720868a4 Mon Sep 17 00:00:00 2001 From: Joe R Date: Tue, 19 Oct 2021 22:00:31 -0400 Subject: [PATCH] Added additional open game tags to special games. --- pysollib/games/curdsandwhey.py | 2 +- pysollib/games/special/hanoi.py | 16 ++++++++-------- pysollib/games/ultra/hanafuda.py | 16 ++++++++++------ pysollib/games/ultra/hanafuda1.py | 3 ++- pysollib/games/ultra/hexadeck.py | 12 ++++++++---- pysollib/games/ultra/tarock.py | 9 ++++++--- 6 files changed, 35 insertions(+), 23 deletions(-) diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 0f01897d..3b0f9e29 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -612,4 +612,4 @@ registerGame(GameInfo(724, EightPacks, "Eight Packs", registerGame(GameInfo(762, FourPacks, "Four Packs", GI.GT_2DECK_TYPE, 2, 1, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(830, FireAndIce, "Fire and Ice", - GI.GT_1DECK_TYPE, 1, 0, GI.SL_SKILL)) + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) diff --git a/pysollib/games/special/hanoi.py b/pysollib/games/special/hanoi.py index b4d9d75a..44efdb4b 100644 --- a/pysollib/games/special/hanoi.py +++ b/pysollib/games/special/hanoi.py @@ -162,32 +162,32 @@ class HanoiSequence(TowerOfHanoy): # register the game registerGame(GameInfo(124, TowerOfHanoy, "Tower of Hanoy", - GI.GT_HANOI, 1, 0, GI.SL_SKILL, + GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(9)))) registerGame(GameInfo(207, HanoiPuzzle4, "Hanoi Puzzle 4", - GI.GT_HANOI, 1, 0, GI.SL_SKILL, + GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(4)), rules_filename="hanoipuzzle.html")) registerGame(GameInfo(208, HanoiPuzzle5, "Hanoi Puzzle 5", - GI.GT_HANOI, 1, 0, GI.SL_SKILL, + GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(5)), rules_filename="hanoipuzzle.html")) registerGame(GameInfo(209, HanoiPuzzle6, "Hanoi Puzzle 6", - GI.GT_HANOI, 1, 0, GI.SL_SKILL, + GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(6)), rules_filename="hanoipuzzle.html")) registerGame(GameInfo(779, HanoiPuzzle3, "Hanoi Puzzle 3", - GI.GT_HANOI, 1, 0, GI.SL_SKILL, + GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(3)), rules_filename="hanoipuzzle.html")) registerGame(GameInfo(780, HanoiPuzzle7, "Hanoi Puzzle 7", - GI.GT_HANOI, 1, 0, GI.SL_SKILL, + GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(7)), rules_filename="hanoipuzzle.html")) registerGame(GameInfo(781, HanoiPuzzle8, "Hanoi Puzzle 8", - GI.GT_HANOI, 1, 0, GI.SL_SKILL, + GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(8)), rules_filename="hanoipuzzle.html")) registerGame(GameInfo(769, HanoiSequence, "Hanoi Sequence", - GI.GT_HANOI, 1, 0, GI.SL_SKILL, + GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(9)))) diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/ultra/hanafuda.py index 49c76bea..bd073100 100644 --- a/pysollib/games/ultra/hanafuda.py +++ b/pysollib/games/ultra/hanafuda.py @@ -1041,20 +1041,24 @@ r(12350, Samuri, "Samuri", GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) r(12351, GreatWall, "Great Wall", GI.GT_HANAFUDA, 4, 0, GI.SL_MOSTLY_SKILL) r(12352, FourWinds, "Hanafuda Four Winds", GI.GT_HANAFUDA, 1, 1, GI.SL_MOSTLY_SKILL) -r(12353, Sumo, "Sumo", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) -r(12354, BigSumo, "Big Sumo", GI.GT_HANAFUDA, 2, 0, GI.SL_MOSTLY_SKILL) +r(12353, Sumo, "Sumo", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12354, BigSumo, "Big Sumo", GI.GT_HANAFUDA | GI.GT_OPEN, 2, 0, + GI.SL_MOSTLY_SKILL) r(12355, LittleEasy, "Little Easy", GI.GT_HANAFUDA, 1, -1, GI.SL_BALANCED) r(12356, BigEasy, "Big Easy", GI.GT_HANAFUDA, 2, -1, GI.SL_BALANCED) r(12357, EasySupreme, "Easy Supreme", GI.GT_HANAFUDA, 4, -1, GI.SL_BALANCED) -r(12358, JustForFun, "Just For Fun", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) -r(12359, Firecracker, "Firecracker", GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) +r(12358, JustForFun, "Just For Fun", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, + GI.SL_MOSTLY_SKILL) +r(12359, Firecracker, "Firecracker", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, + GI.SL_BALANCED) r(12360, EasyX1, "Easy x One", GI.GT_HANAFUDA, 1, 1, GI.SL_BALANCED) r(12361, Relax, "Relax", GI.GT_HANAFUDA, 1, 1, GI.SL_BALANCED) r(12362, DoubleSamuri, "Double Samuri", GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED) r(12363, SuperSamuri, "Super Samuri", GI.GT_HANAFUDA, 4, 0, GI.SL_BALANCED) -r(12364, DoubleYourFun, "Double Your Fun", GI.GT_HANAFUDA, 2, 0, +r(12364, DoubleYourFun, "Double Your Fun", GI.GT_HANAFUDA | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL) -r(12365, CherryBomb, "Cherry Bomb", GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED) +r(12365, CherryBomb, "Cherry Bomb", GI.GT_HANAFUDA | GI.GT_OPEN, 2, 0, + GI.SL_BALANCED) r(12366, OonsooToo, "Oonsoo Too", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) r(12367, OonsooStrict, "Oonsoo Strict", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py index d9db5a04..2d1dbcca 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/ultra/hanafuda1.py @@ -739,7 +739,8 @@ r(12380, Eularia, 'Eularia', GI.GT_HANAFUDA, 1, -1, GI.SL_BALANCED) r(12381, Peony, 'Peony', GI.GT_HANAFUDA, 1, -1, GI.SL_BALANCED) r(12382, Iris, 'Iris', GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) r(12383, Pine, 'Pine', GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) -r(12384, Wisteria, 'Wisteria', GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) +r(12384, Wisteria, 'Wisteria', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, + GI.SL_MOSTLY_SKILL) r(12385, FlowerArrangement, 'Flower Arrangement', GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED) diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/ultra/hexadeck.py index 020274f6..6185b205 100644 --- a/pysollib/games/ultra/hexadeck.py +++ b/pysollib/games/ultra/hexadeck.py @@ -1531,10 +1531,14 @@ 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) -r(16677, MagesGame, 'Mage\'s Game', GI.GT_HEXADECK, 1, 0, GI.SL_BALANCED) -r(16678, Convolution, 'Convolution', GI.GT_HEXADECK, 2, 0, GI.SL_MOSTLY_SKILL) -r(16679, Labyrinth, 'Hex Labyrinth', GI.GT_HEXADECK, 2, 0, GI.SL_MOSTLY_SKILL) -r(16680, Snakestone, 'Snakestone', GI.GT_HEXADECK, 2, 0, GI.SL_MOSTLY_SKILL) +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, + GI.SL_MOSTLY_SKILL) +r(16679, Labyrinth, 'Hex Labyrinth', GI.GT_HEXADECK | GI.GT_OPEN, 2, 0, + GI.SL_MOSTLY_SKILL) +r(16680, Snakestone, 'Snakestone', GI.GT_HEXADECK | GI.GT_OPEN, 2, 0, + GI.SL_MOSTLY_SKILL) r(16681, HexYukon, 'Hex Yukon', GI.GT_HEXADECK, 1, 0, GI.SL_BALANCED) del r diff --git a/pysollib/games/ultra/tarock.py b/pysollib/games/ultra/tarock.py index 1f34ba5d..15a1d916 100644 --- a/pysollib/games/ultra/tarock.py +++ b/pysollib/games/ultra/tarock.py @@ -282,7 +282,10 @@ def r(id, gameclass, name, game_type, decks, redeals, skill_level): r(13163, Cockroach, 'Cockroach', GI.GT_TAROCK, 1, 0, GI.SL_MOSTLY_SKILL) r(13164, DoubleCockroach, 'Double Cockroach', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) -r(13165, Corkscrew, 'Corkscrew', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) -r(13166, Serpent, 'Serpent', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) -r(13167, Rambling, 'Rambling', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) +r(13165, Corkscrew, 'Corkscrew', GI.GT_TAROCK | GI.GT_OPEN, 2, 0, + GI.SL_MOSTLY_SKILL) +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(22232, LeGrandeTeton, 'Le Grande Teton', GI.GT_TAROCK, 1, 0, GI.SL_BALANCED)