From 432620d4360e3c4ddc0535fe668c0faa2223e7d0 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Mon, 12 Dec 2022 18:54:56 -0500
Subject: [PATCH] More alternate names.
---
pysollib/gamedb.py | 37 ++++++++++++++---------------
pysollib/games/acesup.py | 3 ++-
pysollib/games/beleagueredcastle.py | 4 ++--
pysollib/games/numerica.py | 2 +-
pysollib/games/pyramid.py | 3 ++-
pysollib/games/royalcotillion.py | 3 ++-
pysollib/games/windmill.py | 3 ++-
7 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index a9431f94..b93a1469 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -395,23 +395,22 @@ class GI:
# from XM Solitaire should be researched before being added to PySol.
#
# still missing:
- # Ace of Hearts, Affinity, Agnes Three, Antares, Avenue,
- # Baker's Fan, Baker's Spider, Bedeviled, Binding,
- # Black Holes, Black Spider, California, Carcassone,
- # Cascade, Club, Color Cell, Cornelius, Demons and Thieves,
- # Desert Fox, Deuces and Queens, Double Antares,
- # Double Antarctica, Double Arctica, Double Baker's Spider,
- # Double Cascade, Double Line 8, Double Majesty,
- # Double Spidercells, Doublet Cell 5, Doubt, Dream Fan,
- # Dumfries Cell, Falcon Wing, Fan Nine, Fanny 6, Four By Ten,
- # FreeCell AK, Gaps Alter, Gaps Diff, George V,
- # Grandmother's Clock, In a Frame, Inverted FreeCell, Kings,
- # Klondike FreeCell, La Cabane, La Double Entente,
- # Little Gazette, Magic FreeCell, Mini Gaps, Montreal,
- # Napoleon at Iena, Napoleon at Waterloo, Napoleon's Guards,
- # Nationale, Oasis, Opera, Ordered Suits, Osmotic FreeCell,
- # Pair FreeCell, Pairs 2, Petal, Reserved Thirteens,
- # Sea Spider, Sept Piles 0, Short Solitaire,
+ # Ace of Hearts, Agnes Three, Antares, Avenue, Baker's Fan,
+ # Baker's Spider, Bedeviled, Binding, Black Holes,
+ # Black Spider, California, Carcassone, Cascade, Club,
+ # Color Cell, Cornelius, Demons and Thieves, Desert Fox,
+ # Deuces and Queens, Double Antares, Double Antarctica,
+ # Double Arctica, Double Baker's Spider, Double Cascade,
+ # Double Line 8, Double Majesty, Double Spidercells,
+ # Doublet Cell 5, Doubt, Dream Fan, Dumfries Cell, Falcon Wing,
+ # Fan Nine, Fanny 6, Four By Ten, FreeCell AK, Gaps Alter,
+ # Gaps Diff, George V, Grandmother's Clock, In a Frame,
+ # Inverted FreeCell, Kings, Klondike FreeCell, La Cabane,
+ # La Double Entente, Little Gazette, Magic FreeCell, Mini Gaps,
+ # Montreal, Napoleon at Iena, Napoleon at Waterloo,
+ # Napoleon's Guards, Nationale, Oasis, Opera, Ordered Suits,
+ # Osmotic FreeCell, Pair FreeCell, Pairs 2, Petal,
+ # Reserved Thirteens, Sea Spider, Sept Piles 0, Short Solitaire,
# Simple Alternations, Smart Osmosis, Step By Step, Strategy 7,
# Stripped FreeCell, Tarantula, Triple Dispute, Trusty Twenty,
# Two Ways 3, Up Or Down, Versailles, Vertical FreeCell,
@@ -425,8 +424,8 @@ class GI:
364, 372, 376, 383, 384, 385, 386, 390, 391, 393, 398, 405,
415, 416, 425, 451, 453, 461, 464, 466, 467, 476, 480, 484,
511, 512, 513, 516, 561, 610, 625, 629, 631, 638, 641, 647,
- 650, 655, 678, 734, 751, 784, 825, 829, 834, 837, 844, 862,
- 867, 901,
+ 650, 655, 678, 684, 734, 751, 784, 825, 829, 834, 837, 844,
+ 862, 867, 901,
)),
# xpat2 1.06 (we have 14 out of 16 games)
diff --git a/pysollib/games/acesup.py b/pysollib/games/acesup.py
index 7d6e534b..81bec8ae 100644
--- a/pysollib/games/acesup.py
+++ b/pysollib/games/acesup.py
@@ -423,7 +423,8 @@ registerGame(GameInfo(552, Cover, "Cover",
registerGame(GameInfo(583, FiringSquad, "Firing Squad",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED))
registerGame(GameInfo(684, Deck, "Deck",
- GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK))
+ GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK,
+ altnames=('Affinity',)))
registerGame(GameInfo(756, TabbyCat, "Tabby Cat",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(757, Manx, "Manx",
diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py
index c49d0c9c..5dbb7d30 100644
--- a/pysollib/games/beleagueredcastle.py
+++ b/pysollib/games/beleagueredcastle.py
@@ -888,8 +888,8 @@ registerGame(GameInfo(300, Stronghold, "Stronghold",
GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0,
GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(301, Fastness, "Fastness",
- GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN | GI.GT_ORIGINAL,
- 1, 0, GI.SL_MOSTLY_SKILL))
+ GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0,
+ GI.SL_MOSTLY_SKILL, altnames=('Private Lane',)))
registerGame(GameInfo(306, Zerline, "Zerline",
GI.GT_BELEAGUERED_CASTLE, 2, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(324, Bastion, "Bastion",
diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py
index a9dadad6..c817bac8 100644
--- a/pysollib/games/numerica.py
+++ b/pysollib/games/numerica.py
@@ -1191,7 +1191,7 @@ class Ladybug(Game):
# register the game
registerGame(GameInfo(257, Numerica, "Numerica",
GI.GT_NUMERICA | GI.GT_CONTRIB, 1, 0, GI.SL_BALANCED,
- altnames=("Sir Tommy", "Old Patience",)))
+ altnames=("Sir Tommy", "Old Patience", "Try Again")))
registerGame(GameInfo(171, LadyBetty, "Lady Betty",
GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED))
registerGame(GameInfo(355, Frog, "Frog",
diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py
index 4386eb97..7d5f0a9c 100644
--- a/pysollib/games/pyramid.py
+++ b/pysollib/games/pyramid.py
@@ -1508,4 +1508,5 @@ registerGame(GameInfo(802, TripleAlliance2Decks, "Triple Alliance (2 Decks)",
registerGame(GameInfo(846, PyramidDozen, "Pyramid Dozen",
GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_BALANCED))
registerGame(GameInfo(854, Neptune, "Neptune",
- GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED))
+ GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED,
+ altnames=('Mixtures',)))
diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py
index e7155660..023c9d41 100644
--- a/pysollib/games/royalcotillion.py
+++ b/pysollib/games/royalcotillion.py
@@ -1388,7 +1388,8 @@ registerGame(GameInfo(609, GrantsReinforcement, "Grant's Reinforcement",
GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED,
altnames=("Reinforcements",)))
registerGame(GameInfo(638, RoyalRendezvous, "Royal Rendezvous",
- GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED))
+ GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED,
+ altnames=('Royal Appointment',)))
registerGame(GameInfo(639, ShadyLanes, "Shady Lanes",
GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED))
registerGame(GameInfo(675, FourWinds, "Four Winds",
diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py
index 3a222e5e..9c76b8a9 100644
--- a/pysollib/games/windmill.py
+++ b/pysollib/games/windmill.py
@@ -458,7 +458,8 @@ registerGame(GameInfo(483, Czarina, "Czarina",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(484, FourSeasons, "Four Seasons",
GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK,
- altnames=('Corner Card', 'Vanishing Cross')))
+ altnames=('Corner Card', 'Vanishing Cross',
+ 'Cross Currents')))
registerGame(GameInfo(561, DutchSolitaire, "Dutch Solitaire",
GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(696, FlorentinePatience, "Florentine Patience",