diff --git a/contrib/help-pages-translation-to-french/all_games.html b/contrib/help-pages-translation-to-french/all_games.html index 1d101597..6a1812d7 100644 --- a/contrib/help-pages-translation-to-french/all_games.html +++ b/contrib/help-pages-translation-to-french/all_games.html @@ -1122,7 +1122,7 @@
Three-Deck game type. 3 decks. No redeal. diff --git a/html-src/rules/flake.html b/html-src/rules/flake.html new file mode 100644 index 00000000..b5c19aa4 --- /dev/null +++ b/html-src/rules/flake.html @@ -0,0 +1,19 @@ +
+Golf type. 1 deck. No redeal. + +
+Move all cards to the single foundation. + +
+Cards are dealt to six tableau piles, two with eight cards +and four with nine. Tableau piles can be built up or down +by rank, regardless of suit, and only single cards can be +moved between piles. Any single card can fill an empty +tableau pile. +
+There is only one foundation, built up or down by rank, +regardless of suit. The game is won if all cards are moved +to this foundation in a single sequence. diff --git a/html-src/rules/flake2decks.html b/html-src/rules/flake2decks.html new file mode 100644 index 00000000..3f9e495b --- /dev/null +++ b/html-src/rules/flake2decks.html @@ -0,0 +1,13 @@ +
+Golf type. 2 decks. No redeal. + +
+Move all cards to the single foundation. + +
+Like Flake, +but with two decks and eight piles of thirteen +card each. diff --git a/html-src/rules/fredsspider3decks.html b/html-src/rules/fredsspider3decks.html index c65f927b..940e7f35 100644 --- a/html-src/rules/fredsspider3decks.html +++ b/html-src/rules/fredsspider3decks.html @@ -1,4 +1,4 @@ -
Spider type. 3 decks. No redeal. diff --git a/html-src/rules/montecarlo2decks.html b/html-src/rules/montecarlo2decks.html index 8e32449f..c10cc78c 100644 --- a/html-src/rules/montecarlo2decks.html +++ b/html-src/rules/montecarlo2decks.html @@ -1,4 +1,4 @@ -
Pairing game type. 2 decks. No redeal. diff --git a/html-src/rules/numerica2decks.html b/html-src/rules/numerica2decks.html index dec96ee8..9bf92514 100644 --- a/html-src/rules/numerica2decks.html +++ b/html-src/rules/numerica2decks.html @@ -1,4 +1,4 @@ -
Numerica game type. 2 decks. No redeal. diff --git a/html-src/rules/spider4decks.html b/html-src/rules/spider4decks.html index 2b0b5406..5b1c9c0c 100644 --- a/html-src/rules/spider4decks.html +++ b/html-src/rules/spider4decks.html @@ -1,4 +1,4 @@ -
Spider type. 4 decks. No redeal. diff --git a/html-src/rules/triplealliance2decks.html b/html-src/rules/triplealliance2decks.html index 21d8b4ed..219f0928 100644 --- a/html-src/rules/triplealliance2decks.html +++ b/html-src/rules/triplealliance2decks.html @@ -1,4 +1,4 @@ -
Two-Deck game type. 2 decks. No redeal. diff --git a/html-src/rules/wakerobin.html b/html-src/rules/wakerobin.html new file mode 100644 index 00000000..5fd346fd --- /dev/null +++ b/html-src/rules/wakerobin.html @@ -0,0 +1,23 @@ +
+Spider type. 2 decks. No redeal. + +
+Arrange all cards in columns with complete sequences from king to ace. + +
+Like Trillium, +but with only nine piles, and the tableau is built down by rank, +regardless of suit. + +
+Cards are dealt to nine piles of four cards each, with alternating +cards face-up and face-down. Tableau piles are built down by rank, regardless +of suit, and any card or sequence of cards can be moved between piles. +
+When there are no moves left, you can deal one card from the top of the +talon to each tableau pile. The game is won if you're able to organize +all the cards into complete sequences from king to ace. diff --git a/html-src/rules/wakerobin3decks.html b/html-src/rules/wakerobin3decks.html new file mode 100644 index 00000000..32277caa --- /dev/null +++ b/html-src/rules/wakerobin3decks.html @@ -0,0 +1,12 @@ +
+Spider type. 3 decks. No redeal. + +
+Move all cards to the foundations. + +
+Like Wake-Robin, +but with three decks and 13 playing piles. diff --git a/html-src/rules/zerline.html b/html-src/rules/zerline.html new file mode 100644 index 00000000..40e95664 --- /dev/null +++ b/html-src/rules/zerline.html @@ -0,0 +1,26 @@ +
+Beleaguered Castle type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+Cards are dealt to eight tableau piles of five cards each. +Tableau piles are built down by rank, regardless of suit. +Only single cards can be moved between tableau piles, and +only queens can fill empty piles. +
+There is a single reserve pile, that can hold a max of four +cards. Only cards from the tableau can be moved to the +reserve, and the top card of the reserve can be moved back to +the tableau or foundations. When there are no moves left, +you can deal cards from the talon one at a time, and move them +to tableau piles or foundations. No redeal is allowed. +
+The foundations are built up by same suit, starting with kings. +The aces is then played on the king and the foundations are +built up to queen. The game is won if all cards are moved +to the foundations. diff --git a/html-src/rules/zerline3decks.html b/html-src/rules/zerline3decks.html new file mode 100644 index 00000000..561585a2 --- /dev/null +++ b/html-src/rules/zerline3decks.html @@ -0,0 +1,13 @@ +
+Three-Deck game type. 3 decks. No redeal. + +
+Move all cards to the foundations. + +
+Like Zerline, +but with three decks and a max of six cards in +the reserve. diff --git a/po/de_games.po b/po/de_games.po index e0c89d64..fc17e5aa 100644 --- a/po/de_games.po +++ b/po/de_games.po @@ -84,7 +84,7 @@ msgstr "Аlaska" msgid "Algerian Patience" msgstr "Algerische Patience" -msgid "Algerian Patience (3 decks)" +msgid "Algerian Patience (3 Decks)" msgstr "Algerische Patience (3 Decks)" msgid "Alhambra" @@ -327,10 +327,10 @@ msgstr "" msgid "Big Spider" msgstr "Große Spinne" -msgid "Big Spider (1 suit)" +msgid "Big Spider (1 Suit)" msgstr "Große Spinne (1 Farbe)" -msgid "Big Spider (2 suits)" +msgid "Big Spider (2 Suits)" msgstr "Große Spinne (2 Farben)" msgid "Big Streets" @@ -1219,7 +1219,7 @@ msgstr "Fünfzehn" msgid "Fifteen Puzzle" msgstr "Fünfzehn Plus" -msgid "Fifteen plus" +msgid "Fifteen Plus" msgstr "Fünfzehn Plus" msgid "Fifteens" @@ -1261,7 +1261,7 @@ msgstr "Fünf Pyramiden" msgid "Flake" msgstr "Flocke" -msgid "Flake (2 decks)" +msgid "Flake (2 Decks)" msgstr "Flocke (2 Decks)" msgid "Flamenco" @@ -1392,7 +1392,7 @@ msgstr "Rahmen" msgid "Fred's Spider" msgstr "Fred's Spinne" -msgid "Fred's Spider (3 decks)" +msgid "Fred's Spider (3 Decks)" msgstr "Fred's Spinne (3 Decks)" msgid "Free Fan" @@ -2849,7 +2849,7 @@ msgstr "Montana" msgid "Monte Carlo" msgstr "Monte Carlo" -msgid "Monte Carlo (2 decks)" +msgid "Monte Carlo (2 Decks)" msgstr "Monte Carlo (2 Decks)" msgid "Moojub" @@ -2993,7 +2993,7 @@ msgstr "Nummer zwölf" msgid "Numerica" msgstr "Numerica" -msgid "Numerica (2 decks)" +msgid "Numerica (2 Decks)" msgstr "Numerica (2 Decks)" msgid "Ocean Towers" @@ -3821,13 +3821,13 @@ msgstr "Sphäre" msgid "Spider" msgstr "Spinne" -msgid "Spider (1 suit)" +msgid "Spider (1 Suit)" msgstr "Spinne (1 Deck)" -msgid "Spider (2 suits)" +msgid "Spider (2 Suits)" msgstr "Spinne (2 Decks)" -msgid "Spider (4 decks)" +msgid "Spider (4 Decks)" msgstr "Spinne (4 Decks)" msgid "Spider 3x3" @@ -4236,7 +4236,7 @@ msgstr "Trillium" msgid "Triple Alliance" msgstr "Dreifache Allianz" -msgid "Triple Alliance (2 decks)" +msgid "Triple Alliance (2 Decks)" msgstr "" msgid "Triple Canfield" @@ -4404,7 +4404,7 @@ msgid "Wake-Robin" msgstr "Robin" #, fuzzy -msgid "Wake-Robin (3 decks)" +msgid "Wake-Robin (3 Decks)" msgstr "Zerline (3 Decks)" msgid "Wall" @@ -4527,7 +4527,7 @@ msgstr "Zebra" msgid "Zerline" msgstr "Zerline" -msgid "Zerline (3 decks)" +msgid "Zerline (3 Decks)" msgstr "Zerline (3 Decks)" msgid "Zeus" diff --git a/po/fr_games.po b/po/fr_games.po index ffcc3a06..d494d03a 100644 --- a/po/fr_games.po +++ b/po/fr_games.po @@ -84,7 +84,7 @@ msgstr "" msgid "Algerian Patience" msgstr "" -msgid "Algerian Patience (3 decks)" +msgid "Algerian Patience (3 Decks)" msgstr "" msgid "Alhambra" @@ -324,10 +324,10 @@ msgstr "" msgid "Big Spider" msgstr "" -msgid "Big Spider (1 suit)" +msgid "Big Spider (1 Suit)" msgstr "" -msgid "Big Spider (2 suits)" +msgid "Big Spider (2 Suits)" msgstr "" msgid "Big Streets" @@ -1200,7 +1200,7 @@ msgstr "" msgid "Fifteen Puzzle" msgstr "" -msgid "Fifteen plus" +msgid "Fifteen Plus" msgstr "" msgid "Fifteens" @@ -1242,7 +1242,7 @@ msgstr "" msgid "Flake" msgstr "" -msgid "Flake (2 decks)" +msgid "Flake (2 Decks)" msgstr "" msgid "Flamenco" @@ -1371,7 +1371,7 @@ msgstr "" msgid "Fred's Spider" msgstr "" -msgid "Fred's Spider (3 decks)" +msgid "Fred's Spider (3 Decks)" msgstr "" msgid "Free Fan" @@ -2817,7 +2817,7 @@ msgstr "" msgid "Monte Carlo" msgstr "" -msgid "Monte Carlo (2 decks)" +msgid "Monte Carlo (2 Decks)" msgstr "" msgid "Moojub" @@ -2955,7 +2955,7 @@ msgstr "" msgid "Numerica" msgstr "" -msgid "Numerica (2 decks)" +msgid "Numerica (2 Decks)" msgstr "" msgid "Ocean Towers" @@ -3762,13 +3762,13 @@ msgstr "" msgid "Spider" msgstr "" -msgid "Spider (1 suit)" +msgid "Spider (1 Suit)" msgstr "" -msgid "Spider (2 suits)" +msgid "Spider (2 Suits)" msgstr "" -msgid "Spider (4 decks)" +msgid "Spider (4 Decks)" msgstr "" msgid "Spider 3x3" @@ -4164,7 +4164,7 @@ msgstr "" msgid "Triple Alliance" msgstr "" -msgid "Triple Alliance (2 decks)" +msgid "Triple Alliance (2 Decks)" msgstr "" msgid "Triple Canfield" @@ -4326,7 +4326,7 @@ msgstr "" msgid "Wake-Robin" msgstr "" -msgid "Wake-Robin (3 decks)" +msgid "Wake-Robin (3 Decks)" msgstr "" msgid "Wall" @@ -4443,7 +4443,7 @@ msgstr "" msgid "Zerline" msgstr "" -msgid "Zerline (3 decks)" +msgid "Zerline (3 Decks)" msgstr "" msgid "Zeus" diff --git a/po/games.pot b/po/games.pot index 0f4f34c5..49eba5d0 100644 --- a/po/games.pot +++ b/po/games.pot @@ -87,7 +87,7 @@ msgstr "" msgid "Algerian Patience" msgstr "" -msgid "Algerian Patience (3 decks)" +msgid "Algerian Patience (3 Decks)" msgstr "" msgid "Alhambra" @@ -327,10 +327,10 @@ msgstr "" msgid "Big Spider" msgstr "" -msgid "Big Spider (1 suit)" +msgid "Big Spider (1 Suit)" msgstr "" -msgid "Big Spider (2 suits)" +msgid "Big Spider (2 Suits)" msgstr "" msgid "Big Streets" @@ -1203,7 +1203,7 @@ msgstr "" msgid "Fifteen Puzzle" msgstr "" -msgid "Fifteen plus" +msgid "Fifteen Plus" msgstr "" msgid "Fifteens" @@ -1245,7 +1245,7 @@ msgstr "" msgid "Flake" msgstr "" -msgid "Flake (2 decks)" +msgid "Flake (2 Decks)" msgstr "" msgid "Flamenco" @@ -1374,7 +1374,7 @@ msgstr "" msgid "Fred's Spider" msgstr "" -msgid "Fred's Spider (3 decks)" +msgid "Fred's Spider (3 Decks)" msgstr "" msgid "Free Fan" @@ -2820,7 +2820,7 @@ msgstr "" msgid "Monte Carlo" msgstr "" -msgid "Monte Carlo (2 decks)" +msgid "Monte Carlo (2 Decks)" msgstr "" msgid "Moojub" @@ -2958,7 +2958,7 @@ msgstr "" msgid "Numerica" msgstr "" -msgid "Numerica (2 decks)" +msgid "Numerica (2 Decks)" msgstr "" msgid "Ocean Towers" @@ -3765,13 +3765,13 @@ msgstr "" msgid "Spider" msgstr "" -msgid "Spider (1 suit)" +msgid "Spider (1 Suit)" msgstr "" -msgid "Spider (2 suits)" +msgid "Spider (2 Suits)" msgstr "" -msgid "Spider (4 decks)" +msgid "Spider (4 Decks)" msgstr "" msgid "Spider 3x3" @@ -4167,7 +4167,7 @@ msgstr "" msgid "Triple Alliance" msgstr "" -msgid "Triple Alliance (2 decks)" +msgid "Triple Alliance (2 Decks)" msgstr "" msgid "Triple Canfield" @@ -4329,7 +4329,7 @@ msgstr "" msgid "Wake-Robin" msgstr "" -msgid "Wake-Robin (3 decks)" +msgid "Wake-Robin (3 Decks)" msgstr "" msgid "Wall" @@ -4446,7 +4446,7 @@ msgstr "" msgid "Zerline" msgstr "" -msgid "Zerline (3 decks)" +msgid "Zerline (3 Decks)" msgstr "" msgid "Zeus" diff --git a/po/it_games.po b/po/it_games.po index 7e0f3e6b..55c52571 100644 --- a/po/it_games.po +++ b/po/it_games.po @@ -89,7 +89,7 @@ msgstr "" msgid "Algerian Patience" msgstr "Pazienza Algerina" -msgid "Algerian Patience (3 decks)" +msgid "Algerian Patience (3 Decks)" msgstr "Pazienza Algerina (3 mazzi)" msgid "Alhambra" @@ -329,10 +329,10 @@ msgstr "" msgid "Big Spider" msgstr "" -msgid "Big Spider (1 suit)" +msgid "Big Spider (1 Suit)" msgstr "" -msgid "Big Spider (2 suits)" +msgid "Big Spider (2 Suits)" msgstr "" msgid "Big Streets" @@ -1205,7 +1205,7 @@ msgstr "" msgid "Fifteen Puzzle" msgstr "" -msgid "Fifteen plus" +msgid "Fifteen Plus" msgstr "" msgid "Fifteens" @@ -1247,7 +1247,7 @@ msgstr "" msgid "Flake" msgstr "" -msgid "Flake (2 decks)" +msgid "Flake (2 Decks)" msgstr "" msgid "Flamenco" @@ -1376,7 +1376,7 @@ msgstr "" msgid "Fred's Spider" msgstr "" -msgid "Fred's Spider (3 decks)" +msgid "Fred's Spider (3 Decks)" msgstr "" msgid "Free Fan" @@ -2822,7 +2822,7 @@ msgstr "" msgid "Monte Carlo" msgstr "" -msgid "Monte Carlo (2 decks)" +msgid "Monte Carlo (2 Decks)" msgstr "" msgid "Moojub" @@ -2960,7 +2960,7 @@ msgstr "" msgid "Numerica" msgstr "" -msgid "Numerica (2 decks)" +msgid "Numerica (2 Decks)" msgstr "" msgid "Ocean Towers" @@ -3768,13 +3768,13 @@ msgstr "" msgid "Spider" msgstr "" -msgid "Spider (1 suit)" +msgid "Spider (1 Suit)" msgstr "" -msgid "Spider (2 suits)" +msgid "Spider (2 Suits)" msgstr "" -msgid "Spider (4 decks)" +msgid "Spider (4 Decks)" msgstr "" msgid "Spider 3x3" @@ -4170,7 +4170,7 @@ msgstr "" msgid "Triple Alliance" msgstr "" -msgid "Triple Alliance (2 decks)" +msgid "Triple Alliance (2 Decks)" msgstr "" msgid "Triple Canfield" @@ -4332,7 +4332,7 @@ msgstr "" msgid "Wake-Robin" msgstr "" -msgid "Wake-Robin (3 decks)" +msgid "Wake-Robin (3 Decks)" msgstr "" msgid "Wall" @@ -4449,7 +4449,7 @@ msgstr "" msgid "Zerline" msgstr "" -msgid "Zerline (3 decks)" +msgid "Zerline (3 Decks)" msgstr "" msgid "Zeus" diff --git a/po/pl_games.po b/po/pl_games.po index a52ec0aa..a46e6699 100644 --- a/po/pl_games.po +++ b/po/pl_games.po @@ -89,7 +89,7 @@ msgstr "Alaska" msgid "Algerian Patience" msgstr "Algierski Pasjans" -msgid "Algerian Patience (3 decks)" +msgid "Algerian Patience (3 Decks)" msgstr "Algierski Pasjans (3 talie)" msgid "Alhambra" @@ -331,10 +331,10 @@ msgstr "" msgid "Big Spider" msgstr "Wielki Pająk" -msgid "Big Spider (1 suit)" +msgid "Big Spider (1 Suit)" msgstr "Wielki Pająk (1 kolor)" -msgid "Big Spider (2 suits)" +msgid "Big Spider (2 Suits)" msgstr "Wielki Pająk (2 kolory)" msgid "Big Streets" @@ -1210,7 +1210,7 @@ msgstr "" msgid "Fifteen Puzzle" msgstr "" -msgid "Fifteen plus" +msgid "Fifteen Plus" msgstr "" msgid "Fifteens" @@ -1252,7 +1252,7 @@ msgstr "" msgid "Flake" msgstr "" -msgid "Flake (2 decks)" +msgid "Flake (2 Decks)" msgstr "" msgid "Flamenco" @@ -1381,7 +1381,7 @@ msgstr "" msgid "Fred's Spider" msgstr "" -msgid "Fred's Spider (3 decks)" +msgid "Fred's Spider (3 Decks)" msgstr "" msgid "Free Fan" @@ -2828,7 +2828,7 @@ msgstr "Montana" msgid "Monte Carlo" msgstr "Monte Carlo" -msgid "Monte Carlo (2 decks)" +msgid "Monte Carlo (2 Decks)" msgstr "" msgid "Moojub" @@ -2966,7 +2966,7 @@ msgstr "" msgid "Numerica" msgstr "" -msgid "Numerica (2 decks)" +msgid "Numerica (2 Decks)" msgstr "" msgid "Ocean Towers" @@ -3774,13 +3774,13 @@ msgstr "" msgid "Spider" msgstr "Pająk" -msgid "Spider (1 suit)" +msgid "Spider (1 Suit)" msgstr "" -msgid "Spider (2 suits)" +msgid "Spider (2 Suits)" msgstr "" -msgid "Spider (4 decks)" +msgid "Spider (4 Decks)" msgstr "" msgid "Spider 3x3" @@ -4177,7 +4177,7 @@ msgstr "" msgid "Triple Alliance" msgstr "" -msgid "Triple Alliance (2 decks)" +msgid "Triple Alliance (2 Decks)" msgstr "" msgid "Triple Canfield" @@ -4339,7 +4339,7 @@ msgstr "" msgid "Wake-Robin" msgstr "" -msgid "Wake-Robin (3 decks)" +msgid "Wake-Robin (3 Decks)" msgstr "" msgid "Wall" @@ -4456,7 +4456,7 @@ msgstr "Zebra" msgid "Zerline" msgstr "" -msgid "Zerline (3 decks)" +msgid "Zerline (3 Decks)" msgstr "" msgid "Zeus" diff --git a/po/ru_games.po b/po/ru_games.po index 5405fe8e..0b58f39d 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -91,7 +91,7 @@ msgstr "Аляска" msgid "Algerian Patience" msgstr "Алжирский пасьянс" -msgid "Algerian Patience (3 decks)" +msgid "Algerian Patience (3 Decks)" msgstr "Алжирский пасьянс (3 колоды)" msgid "Alhambra" @@ -335,10 +335,10 @@ msgstr "" msgid "Big Spider" msgstr "Большой Паук" -msgid "Big Spider (1 suit)" +msgid "Big Spider (1 Suit)" msgstr "Большой Паук (1 масть)" -msgid "Big Spider (2 suits)" +msgid "Big Spider (2 Suits)" msgstr "Большой Паук (2 масти)" msgid "Big Streets" @@ -1224,7 +1224,7 @@ msgstr "Пятнадцать" msgid "Fifteen Puzzle" msgstr "Пятнашки" -msgid "Fifteen plus" +msgid "Fifteen Plus" msgstr "Пятнадцать плюс" msgid "Fifteens" @@ -1266,7 +1266,7 @@ msgstr "Пять пирамид" msgid "Flake" msgstr "Хлопья" -msgid "Flake (2 decks)" +msgid "Flake (2 Decks)" msgstr "Хлопья (2 колоды)" msgid "Flamenco" @@ -1397,7 +1397,7 @@ msgstr "Рамки" msgid "Fred's Spider" msgstr "Паук Фреда" -msgid "Fred's Spider (3 decks)" +msgid "Fred's Spider (3 Decks)" msgstr "Паук Фреда (3 колоды)" msgid "Free Fan" @@ -2855,7 +2855,7 @@ msgstr "Монтана" msgid "Monte Carlo" msgstr "Монте-Карло" -msgid "Monte Carlo (2 decks)" +msgid "Monte Carlo (2 Decks)" msgstr "Монте-Карло (2 колоды)" msgid "Moojub" @@ -2998,7 +2998,7 @@ msgstr "Номер двенадцать" msgid "Numerica" msgstr "Числовой" -msgid "Numerica (2 decks)" +msgid "Numerica (2 Decks)" msgstr "Числовой (2 колоды)" msgid "Ocean Towers" @@ -3816,13 +3816,13 @@ msgstr "Сфера" msgid "Spider" msgstr "Паук" -msgid "Spider (1 suit)" +msgid "Spider (1 Suit)" msgstr "Паук (1 масть)" -msgid "Spider (2 suits)" +msgid "Spider (2 Suits)" msgstr "Паук (2 масти)" -msgid "Spider (4 decks)" +msgid "Spider (4 Decks)" msgstr "Паук (4 колоды)" msgid "Spider 3x3" @@ -4231,7 +4231,7 @@ msgstr "Триллиум" msgid "Triple Alliance" msgstr "Тройной альянс" -msgid "Triple Alliance (2 decks)" +msgid "Triple Alliance (2 Decks)" msgstr "" msgid "Triple Canfield" @@ -4399,7 +4399,7 @@ msgid "Wake-Robin" msgstr "Робин" #, fuzzy -msgid "Wake-Robin (3 decks)" +msgid "Wake-Robin (3 Decks)" msgstr "Церлин (3 колоды)" msgid "Wall" @@ -4519,7 +4519,7 @@ msgstr "Зебра" msgid "Zerline" msgstr "Церлин" -msgid "Zerline (3 decks)" +msgid "Zerline (3 Decks)" msgstr "Церлин (3 колоды)" msgid "Zeus" diff --git a/pysollib/games/algerian.py b/pysollib/games/algerian.py index 10996638..0499bab4 100644 --- a/pysollib/games/algerian.py +++ b/pysollib/games/algerian.py @@ -162,6 +162,6 @@ registerGame(GameInfo(321, Carthage, "Carthage", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(322, AlgerianPatience, "Algerian Patience", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(457, AlgerianPatience3, "Algerian Patience (3 decks)", +registerGame(GameInfo(457, AlgerianPatience3, "Algerian Patience (3 Decks)", GI.GT_3DECK_TYPE | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 4f77e498..c49d0c9c 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -902,7 +902,7 @@ registerGame(GameInfo(351, Chequers, "Chequers", GI.GT_BELEAGUERED_CASTLE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(393, CastleOfIndolence, "Castle of Indolence", GI.GT_BELEAGUERED_CASTLE, 2, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(395, Zerline3Decks, "Zerline (3 decks)", +registerGame(GameInfo(395, Zerline3Decks, "Zerline (3 Decks)", GI.GT_BELEAGUERED_CASTLE | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(400, Rittenhouse, "Rittenhouse", diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index c18efb21..dcfd126b 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -520,7 +520,7 @@ class Mumbai(Indian): # * Napoleon's Exile # * Double Rail # * Single Rail (1 deck) -# * Triple Rail (3 decks) +# * Triple Rail (3 Decks) # * Final Battle # * rows build down by rank # ************************************************************************ diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 1b2a6eea..a26d0d6b 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -1163,7 +1163,7 @@ class NapoleonLeavesMoscow(NapoleonTakesMoscow): # ************************************************************************ # * Flake -# * Flake (2 decks) +# * Flake (2 Decks) # ************************************************************************ @@ -1312,7 +1312,7 @@ registerGame(GameInfo(734, NapoleonLeavesMoscow, "Napoleon Leaves Moscow", registerGame(GameInfo(749, Flake, "Flake", GI.GT_GOLF | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(750, Flake2Decks, "Flake (2 decks)", +registerGame(GameInfo(750, Flake2Decks, "Flake (2 Decks)", GI.GT_GOLF | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(763, Wasatch, "Wasatch", diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index d95d3539..40da346c 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -49,7 +49,7 @@ class MonteCarlo_Hint(DefaultHint): # ************************************************************************ # * Monte Carlo -# * Monte Carlo (2 decks) +# * Monte Carlo (2 Decks) # ************************************************************************ class MonteCarlo_Talon(TalonStack): @@ -963,7 +963,7 @@ class RightAndLeft(Game): registerGame(GameInfo(89, MonteCarlo, "Monte Carlo", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK, altnames=("Quilt",))) -registerGame(GameInfo(216, MonteCarlo2Decks, "Monte Carlo (2 decks)", +registerGame(GameInfo(216, MonteCarlo2Decks, "Monte Carlo (2 Decks)", GI.GT_PAIRING_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(212, Weddings, "Weddings", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index 0a8a3fd8..9ad36556 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -1214,7 +1214,7 @@ registerGame(GameInfo(435, Shifting, "Shifting", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(472, Strategerie, "Strategerie", GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(558, Numerica2Decks, "Numerica (2 decks)", +registerGame(GameInfo(558, Numerica2Decks, "Numerica (2 Decks)", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(589, LastChance, "Last Chance", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 8cb73e38..e3e696bf 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -148,7 +148,7 @@ class RelaxedPileOn(PileOn): # TWIDTH = 4 # NSTACKS = 15 # PLAYCARDS = 8 -# registerGame(GameInfo(341, PileOn2Decks, "PileOn (2 decks)", +# registerGame(GameInfo(341, PileOn2Decks, "PileOn (2 Decks)", # GI.GT_2DECK_TYPE | GI.GT_OPEN,, 2, 0)) diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index 95999215..a67973f7 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -1501,7 +1501,7 @@ registerGame(GameInfo(735, Hurricane, "Hurricane", registerGame(GameInfo(796, Exit, "Exit", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=('Gay Gordons',))) -registerGame(GameInfo(802, TripleAlliance2Decks, "Triple Alliance (2 decks)", +registerGame(GameInfo(802, TripleAlliance2Decks, "Triple Alliance (2 Decks)", GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(846, PyramidDozen, "Pyramid Dozen", diff --git a/pysollib/games/special/tarock.py b/pysollib/games/special/tarock.py index 6c73ab93..49c9a2c3 100644 --- a/pysollib/games/special/tarock.py +++ b/pysollib/games/special/tarock.py @@ -924,7 +924,7 @@ r(157, WheelOfFortune, "Wheel of Fortune", GI.GT_TAROCK, 1, 0, GI.SL_BALANCED) r(158, ImperialTrumps, "Imperial Trumps", GI.GT_TAROCK, 1, -1, GI.SL_BALANCED) r(159, Pagat, "Pagat", GI.GT_TAROCK | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) r(160, Skiz, "Skiz", GI.GT_TAROCK | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) -r(161, FifteenPlus, "Fifteen plus", GI.GT_TAROCK, 1, 0, GI.SL_BALANCED) +r(161, FifteenPlus, "Fifteen Plus", GI.GT_TAROCK, 1, 0, GI.SL_BALANCED) r(162, Excuse, "Excuse", GI.GT_TAROCK | GI.GT_OPEN, 1, 0, GI.SL_BALANCED) r(163, Grasshopper, "Grasshopper", GI.GT_TAROCK, 1, 1, GI.SL_MOSTLY_SKILL) r(164, DoubleGrasshopper, "Double Grasshopper", GI.GT_TAROCK, 2, 1, diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index bf11a056..f1cae684 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -870,7 +870,7 @@ class Applegate(Game): # * Big Spider # * Spider 3x3 # * Big Divorce -# * Spider (4 decks) +# * Spider (4 Decks) # * Very Big Divorce # * Chinese Spider # ************************************************************************ @@ -1505,11 +1505,11 @@ registerGame(GameInfo(185, Wasp, "Wasp", GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(220, RougeEtNoir, "Rouge et Noir", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(269, Spider1Suit, "Spider (1 suit)", +registerGame(GameInfo(269, Spider1Suit, "Spider (1 Suit)", GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 0, 0), rules_filename="spider.html")) -registerGame(GameInfo(270, Spider2Suits, "Spider (2 suits)", +registerGame(GameInfo(270, Spider2Suits, "Spider (2 Suits)", GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 2, 2), rules_filename="spider.html")) @@ -1545,18 +1545,18 @@ registerGame(GameInfo(441, York, "York", registerGame(GameInfo(444, BigYork, "Big York", GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, GI.SL_SKILL)) -registerGame(GameInfo(445, BigSpider1Suit, "Big Spider (1 suit)", +registerGame(GameInfo(445, BigSpider1Suit, "Big Spider (1 Suit)", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 0, 0), rules_filename="bigspider.html")) -registerGame(GameInfo(446, BigSpider2Suits, "Big Spider (2 suits)", +registerGame(GameInfo(446, BigSpider2Suits, "Big Spider (2 Suits)", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 2, 2), rules_filename="bigspider.html")) registerGame(GameInfo(449, Spider3x3, "Spider 3x3", GI.GT_SPIDER | GI.GT_ORIGINAL | GI.GT_STRIPPED, 3, 0, GI.SL_MOSTLY_SKILL, suits=(0, 1, 2))) -registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)", +registerGame(GameInfo(454, Spider4Decks, "Spider (4 Decks)", GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(455, GroundsForADivorce4Decks, "Very Big Divorce", GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) @@ -1564,14 +1564,14 @@ registerGame(GameInfo(458, Spidike, "Spidike", GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) # GT_GYPSY ? registerGame(GameInfo(459, FredsSpider, "Fred's Spider", GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(460, FredsSpider3Decks, "Fred's Spider (3 decks)", +registerGame(GameInfo(460, FredsSpider3Decks, "Fred's Spider (3 Decks)", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(461, OpenSpider, "Open Spider", GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, altnames=('Beetle',))) registerGame(GameInfo(501, WakeRobin, "Wake-Robin", GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(502, TripleWakeRobin, "Wake-Robin (3 decks)", +registerGame(GameInfo(502, TripleWakeRobin, "Wake-Robin (3 Decks)", GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(511, DoubleScorpion, "Double Scorpion", GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL))