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

Shift children's games to use tag rather than deprecated list

Browse source
This commit is contained in:
Joe R 2025-01-24 20:03:08 -05:00
parent 68138c7284
commit 6006e0f4c0
9 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pysollib/gamedb.py
View file

@ -600,8 +600,7 @@ class GI:
# deprecated - the correct way is to or a GI.GT_XXX flag # deprecated - the correct way is to or a GI.GT_XXX flag
# in the registerGame() call # in the registerGame() call
_CHILDREN_GAMES = [16, 33, 55, 90, 91, 96, 97, 176, 328, 329, 862, 865, _CHILDREN_GAMES = []
886, 903, ]
_OPEN_GAMES = [] _OPEN_GAMES = []

4
pysollib/games/acesup.py
View file

@ -504,7 +504,7 @@ class MaineCoon(TabbyCat):
# register the game # register the game
registerGame(GameInfo(903, AcesUp, "Aces Up", # was: 52 registerGame(GameInfo(903, AcesUp, "Aces Up", # was: 52
GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK, GI.GT_1DECK_TYPE | GI.GT_CHILDREN, 1, 0, GI.SL_LUCK,
altnames=("Aces High", "Drivel", "Discard"))) altnames=("Aces High", "Drivel", "Discard")))
registerGame(GameInfo(206, Fortunes, "Fortunes", registerGame(GameInfo(206, Fortunes, "Fortunes",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK))
@ -514,7 +514,7 @@ registerGame(GameInfo(130, PerpetualMotion, "Perpetual Motion",
GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK, GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK,
altnames=("First Law", "Narcotic"))) altnames=("First Law", "Narcotic")))
registerGame(GameInfo(353, AcesUp5, "Aces Up 5", registerGame(GameInfo(353, AcesUp5, "Aces Up 5",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) GI.GT_1DECK_TYPE | GI.GT_CHILDREN, 1, 0, GI.SL_LUCK))
registerGame(GameInfo(552, Cover, "Cover", registerGame(GameInfo(552, Cover, "Cover",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK))
registerGame(GameInfo(583, FiringSquad, "Firing Squad", registerGame(GameInfo(583, FiringSquad, "Firing Squad",

3
pysollib/games/eiffeltower.py
View file

@ -105,6 +105,7 @@ class StrictEiffelTower(EiffelTower):
# register the game # register the game
registerGame(GameInfo(16, EiffelTower, "Eiffel Tower", registerGame(GameInfo(16, EiffelTower, "Eiffel Tower",
GI.GT_PAIRING_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) GI.GT_PAIRING_TYPE | GI.GT_CHILDREN, 2, 0,
GI.SL_MOSTLY_LUCK))
# registerGame(GameInfo(801, StrictEiffelTower, "Strict Eiffel Tower", # registerGame(GameInfo(801, StrictEiffelTower, "Strict Eiffel Tower",
# GI.GT_PAIRING_TYPE, 2, 0)) # GI.GT_PAIRING_TYPE, 2, 0))

6
pysollib/games/grandfathersclock.py
View file

@ -776,11 +776,11 @@ registerGame(GameInfo(697, BigBen, "Big Ben",
GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED,
altnames=("Father Time"))) altnames=("Father Time")))
registerGame(GameInfo(737, Clock, "Clock", registerGame(GameInfo(737, Clock, "Clock",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK, GI.GT_1DECK_TYPE | GI.GT_CHILDREN, 1, 0, GI.SL_LUCK,
altnames=("Travellers", "Sundial"))) altnames=("Travellers", "Sundial")))
registerGame(GameInfo(827, GermanClock, "German Clock", registerGame(GameInfo(827, GermanClock, "German Clock",
GI.GT_1DECK_TYPE, 1, 1, GI.SL_MOSTLY_LUCK, GI.GT_1DECK_TYPE, 1, 1, GI.SL_MOSTLY_LUCK,
altnames=("Die Uhr",))) altnames=("Die Uhr",)))
registerGame(GameInfo(915, RelaxedClock, "Relaxed Clock", registerGame(GameInfo(915, RelaxedClock, "Relaxed Clock",
GI.GT_1DECK_TYPE | GI.GT_RELAXED, 1, 0, GI.SL_LUCK, GI.GT_1DECK_TYPE | GI.GT_RELAXED | GI.GT_CHILDREN, 1, 0,
altnames=("Watch"))) GI.SL_LUCK, altnames=("Watch")))

2
pysollib/games/hitormiss.py
View file

@ -170,5 +170,5 @@ registerGame(GameInfo(774, HitOrMiss, "Hit or Miss",
GI.GT_1DECK_TYPE, 1, VARIABLE_REDEALS, GI.GT_1DECK_TYPE, 1, VARIABLE_REDEALS,
GI.SL_LUCK, altnames=("Roll Call",))) GI.SL_LUCK, altnames=("Roll Call",)))
registerGame(GameInfo(865, HitOrMissUnlimited, "Hit or Miss Unlimited", registerGame(GameInfo(865, HitOrMissUnlimited, "Hit or Miss Unlimited",
GI.GT_1DECK_TYPE, 1, UNLIMITED_REDEALS, GI.GT_1DECK_TYPE | GI.GT_CHILDREN, 1, UNLIMITED_REDEALS,
GI.SL_LUCK)) GI.SL_LUCK))

3
pysollib/games/klondike.py
View file

@ -1640,7 +1640,8 @@ registerGame(GameInfo(66, Eastcliff, "Eastcliff",
registerGame(GameInfo(224, Easthaven, "Easthaven", registerGame(GameInfo(224, Easthaven, "Easthaven",
GI.GT_GYPSY, 1, 0, GI.SL_MOSTLY_LUCK)) GI.GT_GYPSY, 1, 0, GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(33, Westcliff, "Westcliff", registerGame(GameInfo(33, Westcliff, "Westcliff",
GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_LUCK)) GI.GT_KLONDIKE | GI.GT_CHILDREN, 1, 0,
GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(225, Westhaven, "Westhaven", registerGame(GameInfo(225, Westhaven, "Westhaven",
GI.GT_GYPSY, 1, 0, GI.SL_BALANCED)) GI.GT_GYPSY, 1, 0, GI.SL_BALANCED))
registerGame(GameInfo(107, PasSeul, "Pas Seul", registerGame(GameInfo(107, PasSeul, "Pas Seul",

24
pysollib/games/montecarlo.py
View file

@ -1118,15 +1118,16 @@ registerGame(GameInfo(216, MonteCarlo2Decks, "Monte Carlo (2 Decks)",
registerGame(GameInfo(212, Weddings, "Weddings", registerGame(GameInfo(212, Weddings, "Weddings",
GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(90, SimpleCarlo, "Simple Carlo", registerGame(GameInfo(90, SimpleCarlo, "Simple Carlo",
GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) GI.GT_PAIRING_TYPE | GI.GT_CHILDREN, 1, 0,
GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(91, SimplePairs, "Simple Pairs", registerGame(GameInfo(91, SimplePairs, "Simple Pairs",
GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK, GI.GT_PAIRING_TYPE | GI.GT_CHILDREN, 1, 0,
altnames=("Jamestown", "Pirate Gold", "Treasure Hunt", GI.SL_LUCK, altnames=("Jamestown", "Pirate Gold",
"Hunter"))) "Treasure Hunt", "Hunter")))
registerGame(GameInfo(92, Neighbour, "Neighbour", registerGame(GameInfo(92, Neighbour, "Neighbour",
GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(96, Fourteen, "Fourteen", registerGame(GameInfo(96, Fourteen, "Fourteen",
GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.GT_PAIRING_TYPE | GI.GT_OPEN | GI.GT_CHILDREN, 1, 0,
GI.SL_MOSTLY_LUCK, altnames=("Fourteen Out", GI.SL_MOSTLY_LUCK, altnames=("Fourteen Out",
"Fourteen Puzzle", "Fourteen Puzzle",
"Take Fourteen"))) "Take Fourteen")))
@ -1137,12 +1138,13 @@ registerGame(GameInfo(152, DerLetzteMonarch, "The Last Monarch",
GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL,
altnames=("Der letzte Monarch",))) altnames=("Der letzte Monarch",)))
registerGame(GameInfo(328, TheWish, "The Wish", registerGame(GameInfo(328, TheWish, "The Wish",
GI.GT_PAIRING_TYPE | GI.GT_STRIPPED, 1, 0, GI.GT_PAIRING_TYPE | GI.GT_STRIPPED | GI.GT_CHILDREN,
GI.SL_MOSTLY_LUCK, ranks=(0, 6, 7, 8, 9, 10, 11, 12))) 1, 0, GI.SL_MOSTLY_LUCK,
ranks=(0, 6, 7, 8, 9, 10, 11, 12)))
registerGame(GameInfo(329, TheWishOpen, "The Wish (Open)", registerGame(GameInfo(329, TheWishOpen, "The Wish (Open)",
GI.GT_PAIRING_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL | GI.GT_PAIRING_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL |
GI.GT_STRIPPED, 1, 0, GI.SL_MOSTLY_SKILL, GI.GT_STRIPPED | GI.GT_CHILDREN, 1, 0,
ranks=(0, 6, 7, 8, 9, 10, 11, 12), GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12),
rules_filename="thewish.html")) rules_filename="thewish.html"))
registerGame(GameInfo(368, Vertical, "Vertical", registerGame(GameInfo(368, Vertical, "Vertical",
GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0,
@ -1162,8 +1164,8 @@ registerGame(GameInfo(810, Quatorze, "Quatorze",
registerGame(GameInfo(829, BlockTen, "Block Ten", registerGame(GameInfo(829, BlockTen, "Block Ten",
GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK)) GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK))
registerGame(GameInfo(862, SimpleTens, "Simple Tens", registerGame(GameInfo(862, SimpleTens, "Simple Tens",
GI.GT_PAIRING_TYPE | GI.GT_STRIPPED, 1, 0, GI.SL_LUCK, GI.GT_PAIRING_TYPE | GI.GT_STRIPPED | GI.GT_CHILDREN,
ranks=(0, 1, 2, 3, 4, 5, 6, 7, 8), 1, 0, GI.SL_LUCK, ranks=(0, 1, 2, 3, 4, 5, 6, 7, 8),
altnames=("Add Up Tens",))) altnames=("Add Up Tens",)))
registerGame(GameInfo(867, DoubleFourteen, "Double Fourteen", registerGame(GameInfo(867, DoubleFourteen, "Double Fourteen",
GI.GT_PAIRING_TYPE | GI.GT_OPEN, 2, 0, GI.GT_PAIRING_TYPE | GI.GT_OPEN, 2, 0,

5
pysollib/games/royalcotillion.py
View file

@ -1573,13 +1573,14 @@ registerGame(GameInfo(54, RoyalCotillion, "Royal Cotillion",
GI.GT_2DECK_TYPE, 2, 0, GI.SL_LUCK, GI.GT_2DECK_TYPE, 2, 0, GI.SL_LUCK,
altnames=("Lords and Ladies",))) altnames=("Lords and Ladies",)))
registerGame(GameInfo(55, OddAndEven, "Odd and Even", registerGame(GameInfo(55, OddAndEven, "Odd and Even",
GI.GT_2DECK_TYPE, 2, 1, GI.SL_LUCK)) GI.GT_2DECK_TYPE | GI.GT_CHILDREN, 2, 1, GI.SL_LUCK))
registerGame(GameInfo(143, Kingdom, "Kingdom", registerGame(GameInfo(143, Kingdom, "Kingdom",
GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(234, Alhambra, "Alhambra", registerGame(GameInfo(234, Alhambra, "Alhambra",
GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED))
registerGame(GameInfo(97, Carpet, "Carpet", registerGame(GameInfo(97, Carpet, "Carpet",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) GI.GT_1DECK_TYPE | GI.GT_CHILDREN, 1, 0,
GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(391, BritishConstitution, "British Constitution", registerGame(GameInfo(391, BritishConstitution, "British Constitution",
GI.GT_2DECK_TYPE | GI.GT_STRIPPED, 2, 0, GI.SL_BALANCED, GI.GT_2DECK_TYPE | GI.GT_STRIPPED, 2, 0, GI.SL_BALANCED,
ranks=list(range(11)), # without Queens and Kings ranks=list(range(11)), # without Queens and Kings

8
pysollib/games/special/memory.py
View file

@ -392,12 +392,12 @@ class MemorySequence(Memory24):
# register the game # register the game
registerGame(GameInfo(886, Memory16, "Memory 16", registerGame(GameInfo(886, Memory16, "Memory 16",
GI.GT_MEMORY | GI.GT_SCORE, 2, 0, GI.SL_SKILL, GI.GT_MEMORY | GI.GT_SCORE | GI.GT_CHILDREN, 2, 0,
category=GI.GC_MATCHING, GI.SL_SKILL, category=GI.GC_MATCHING,
suits=(), ranks=(), trumps=list(range(8)))) suits=(), ranks=(), trumps=list(range(8))))
registerGame(GameInfo(176, Memory24, "Memory 24", registerGame(GameInfo(176, Memory24, "Memory 24",
GI.GT_MEMORY | GI.GT_SCORE, 2, 0, GI.SL_SKILL, GI.GT_MEMORY | GI.GT_SCORE | GI.GT_CHILDREN, 2, 0,
category=GI.GC_MATCHING, GI.SL_SKILL, category=GI.GC_MATCHING,
suits=(), ranks=(), trumps=list(range(12)))) suits=(), ranks=(), trumps=list(range(12))))
registerGame(GameInfo(219, Memory30, "Memory 30", registerGame(GameInfo(219, Memory30, "Memory 30",
GI.GT_MEMORY | GI.GT_SCORE, 2, 0, GI.SL_SKILL, GI.GT_MEMORY | GI.GT_SCORE, 2, 0, GI.SL_SKILL,