Move all cards to the foundations. -
-A single card is dealt to the first foundation, and the remaining -cards are dealt three at a time from the stock. On this first -foundation, any card of the same suit as the first card can be played. -
-Lower foundations are started with a card of the same rank as the -first card. Subsequent cards played to these foundations must be the -same suit as that first card played to it, and have a rank that matches -that of a card that's already been played to the foundation directly -above it. -
-The game is won if all cards are moved to the foundations. +Just like Osmosis, +but there is no tableau. diff --git a/html-src/rules/osmium.html b/html-src/rules/osmium.html new file mode 100644 index 00000000..742a8690 --- /dev/null +++ b/html-src/rules/osmium.html @@ -0,0 +1,20 @@ +
+One-Deck game type. 1 deck. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Just like Osmosis, +but all four foundations must be built in the same +sequence of ranks. Additionally, the order of the +foundations doesn't matter and cards are dealt one +at a time from the stock. + +
+Osmium is based on an altered version of the Osmosis +rules used in older versions of PySolFC. diff --git a/html-src/rules/osmiumii.html b/html-src/rules/osmiumii.html new file mode 100644 index 00000000..b7280049 --- /dev/null +++ b/html-src/rules/osmiumii.html @@ -0,0 +1,13 @@ +
+One-Deck game type. 1 deck. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Just like Osmium, +but the rows are dealt face-up, similar to +Peek. diff --git a/html-src/rules/osmosis.html b/html-src/rules/osmosis.html index fb7cb2ea..3a134806 100644 --- a/html-src/rules/osmosis.html +++ b/html-src/rules/osmosis.html @@ -8,4 +8,16 @@ Move all cards to the foundations.
-[To be written] +A single card is dealt to the first foundation, and four cards are dealt +to each of four tableau rows, with only the top card visible. No building +in this tableau is allowed. The remaining cards are dealt three at a time +from the stock. On this first foundation, any card of the same suit as +the first card can be played. +
+Lower foundations are started with a card of the same rank as the +first card. Subsequent cards played to these foundations must be the +same suit as that first card played to it, and have a rank that matches +that of a card that's already been played to the foundation directly +above it. +
+The game is won if all cards are moved to the foundations. diff --git a/html-src/rules/peek.html b/html-src/rules/peek.html index a1120b9e..586359c4 100644 --- a/html-src/rules/peek.html +++ b/html-src/rules/peek.html @@ -10,7 +10,3 @@ Move all cards to the foundations.
Just like Osmosis, but the rows are dealt face-up. - -
-[To be written] diff --git a/po/de_games.po b/po/de_games.po index 9d5d07c9..e0c89d64 100644 --- a/po/de_games.po +++ b/po/de_games.po @@ -3039,6 +3039,9 @@ msgstr "" msgid "Open Jumbo" msgstr "Öffne Jumbo" +msgid "Open Osmium" +msgstr "" + msgid "Open Peek" msgstr "Öffne heimlichen Blick" @@ -3060,6 +3063,12 @@ msgstr "Reihenfolge" msgid "Order of Precedence" msgstr "" +msgid "Osmium" +msgstr "" + +msgid "Osmium II" +msgstr "" + msgid "Osmosis" msgstr "Osmose" diff --git a/po/fr_games.po b/po/fr_games.po index deb38f1f..ffcc3a06 100644 --- a/po/fr_games.po +++ b/po/fr_games.po @@ -3000,6 +3000,9 @@ msgstr "" msgid "Open Jumbo" msgstr "" +msgid "Open Osmium" +msgstr "" + msgid "Open Peek" msgstr "" @@ -3021,6 +3024,12 @@ msgstr "" msgid "Order of Precedence" msgstr "" +msgid "Osmium" +msgstr "" + +msgid "Osmium II" +msgstr "" + msgid "Osmosis" msgstr "" diff --git a/po/games.pot b/po/games.pot index d9924d50..0f4f34c5 100644 --- a/po/games.pot +++ b/po/games.pot @@ -3003,6 +3003,9 @@ msgstr "" msgid "Open Jumbo" msgstr "" +msgid "Open Osmium" +msgstr "" + msgid "Open Peek" msgstr "" @@ -3024,6 +3027,12 @@ msgstr "" msgid "Order of Precedence" msgstr "" +msgid "Osmium" +msgstr "" + +msgid "Osmium II" +msgstr "" + msgid "Osmosis" msgstr "" diff --git a/po/it_games.po b/po/it_games.po index 183eeb09..7e0f3e6b 100644 --- a/po/it_games.po +++ b/po/it_games.po @@ -3005,6 +3005,9 @@ msgstr "" msgid "Open Jumbo" msgstr "" +msgid "Open Osmium" +msgstr "" + msgid "Open Peek" msgstr "" @@ -3026,6 +3029,12 @@ msgstr "" msgid "Order of Precedence" msgstr "" +msgid "Osmium" +msgstr "" + +msgid "Osmium II" +msgstr "" + msgid "Osmosis" msgstr "" diff --git a/po/pl_games.po b/po/pl_games.po index b92ece40..a52ec0aa 100644 --- a/po/pl_games.po +++ b/po/pl_games.po @@ -3011,6 +3011,9 @@ msgstr "" msgid "Open Jumbo" msgstr "" +msgid "Open Osmium" +msgstr "" + msgid "Open Peek" msgstr "" @@ -3032,6 +3035,12 @@ msgstr "" msgid "Order of Precedence" msgstr "" +msgid "Osmium" +msgstr "" + +msgid "Osmium II" +msgstr "" + msgid "Osmosis" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 93970dca..5405fe8e 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -3044,6 +3044,9 @@ msgstr "" msgid "Open Jumbo" msgstr "Открытый гигант" +msgid "Open Osmium" +msgstr "" + msgid "Open Peek" msgstr "Открытый взгляд" @@ -3065,6 +3068,12 @@ msgstr "Порядок" msgid "Order of Precedence" msgstr "" +msgid "Osmium" +msgstr "" + +msgid "Osmium II" +msgstr "" + msgid "Osmosis" msgstr "Осмос" diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index 10c65848..36b99c09 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -322,11 +322,11 @@ class GI: # Saratoga, Thieves, Treize, Valentine, Wall ("Gnome AisleRiot", ( 1, 2, 8, 9, 11, 12, 13, 19, 24, 27, 29, 31, 33, 34, 35, 36, - 38, 40, 41, 42, 43, 45, 48, 58, 59, 60, 65, 67, 89, 91, 92, - 93, 94, 95, 96, 97, 100, 104, 105, 111, 112, 113, 130, 135, - 139, 144, 146, 147, 148, 200, 201, 206, 224, 225, 229, 230, - 233, 257, 258, 280, 281, 282, 283, 284, 334, 384, 495, 551, - 552, 553, 572, 593, 674, 700, 737, 772, 810, 819, 824, 829, + 38, 40, 41, 42, 43, 45, 48, 58, 65, 67, 89, 91, 92, 93, 94, + 95, 96, 97, 100, 104, 105, 111, 112, 113, 130, 135, 139, 144, + 146, 147, 148, 200, 201, 206, 224, 225, 229, 230, 233, 257, + 258, 280, 281, 282, 283, 284, 334, 384, 495, 551, 552, 553, + 572, 593, 674, 700, 715, 716, 737, 772, 810, 819, 824, 829, 22231, )), @@ -365,11 +365,11 @@ class GI: # Six By Six ("Solitude for Windows", ( 2, 8, 11, 13, 19, 24, 25, 29, 30, 31, 33, 34, 36, 38, 42, - 43, 45, 48, 50, 53, 56, 57, 58, 59, 60, 62, 64, 67, 69, 71, - 86, 87, 88, 89, 95, 96, 97, 98, 100, 104, 105, 107, 109, - 112, 125, 128, 133, 134, 135, 139, 146, 147, 171, 172, 173, - 221, 222, 224, 228, 233, 234, 235, 256, 257, 258, 282, 314, - 327, 330, 355, 356, 398, 406, 414, 418, 434, 437, 484, 593, + 43, 45, 48, 50, 53, 56, 57, 58, 62, 64, 67, 69, 71, 86, 87, + 88, 89, 95, 96, 97, 98, 100, 104, 105, 107, 109, 112, 125, + 128, 133, 134, 135, 139, 146, 147, 171, 172, 173, 221, 222, + 224, 228, 233, 234, 235, 256, 257, 258, 282, 314, 327, 330, + 355, 356, 398, 406, 414, 418, 434, 437, 484, 593, 715, 716, 737, 751, 805, 830, 845, 847, 901, 903 )), @@ -398,20 +398,20 @@ class GI: # 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, Step By Step, Strategy 7, + # 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, # Wasp Baby, Yukon FreeCell ("XM Solitaire", ( 2, 8, 9, 13, 15, 18, 19, 20, 29, 30, 31, 34, 36, 38, 41, 42, - 45, 46, 50, 53, 54, 56, 57, 59, 64, 77, 78, 86, 96, 97, 98, - 105, 110, 112, 124, 145, 220, 222, 223, 224, 228, 231, 233, - 234, 235, 236, 257, 258, 264, 265, 267, 270, 271, 290, 291, - 292, 303, 309, 314, 318, 320, 322, 324, 325, 336, 338, 341, - 363, 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, 516, 561, 610, 625, 629, 631, 638, 641, 647, - 650, 655, 678, 734, 751, 784, 825, 829, 834, 837, 844, 901, + 45, 46, 50, 53, 54, 56, 57, 64, 77, 78, 86, 96, 97, 98, 105, + 110, 112, 124, 145, 220, 222, 223, 224, 228, 231, 233, 234, + 235, 236, 257, 258, 264, 265, 267, 270, 271, 290, 291, 292, + 303, 309, 314, 318, 320, 322, 324, 325, 336, 338, 341, 363, + 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, 516, 561, 610, 625, 629, 631, 638, 641, 647, 650, + 655, 678, 734, 751, 784, 825, 829, 834, 837, 844, 901, )), # xpat2 1.06 (we have 14 out of 16 games) diff --git a/pysollib/games/osmosis.py b/pysollib/games/osmosis.py index 34ef31ae..1c375836 100644 --- a/pysollib/games/osmosis.py +++ b/pysollib/games/osmosis.py @@ -340,11 +340,11 @@ class Bridesmaids(Game): # register the game -registerGame(GameInfo(59, Osmosis, "Osmosis", +registerGame(GameInfo(59, Osmosis, "Osmium", GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK)) -registerGame(GameInfo(60, Peek, "Peek", +registerGame(GameInfo(60, Peek, "Osmium II", GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK)) -registerGame(GameInfo(298, OpenPeek, "Open Peek", +registerGame(GameInfo(298, OpenPeek, "Open Osmium", GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(370, Genesis, "Genesis", @@ -355,8 +355,8 @@ registerGame(GameInfo(371, GenesisPlus, "Genesis +", GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(409, Bridesmaids, "Bridesmaids", GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK)) -registerGame(GameInfo(715, OsmosisII, "Treasure Trove", - GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK)) -registerGame(GameInfo(716, PeekII, "Peek II", +registerGame(GameInfo(715, OsmosisII, "Osmosis", GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK, - rules_filename='treasuretrove.html')) + altnames=("Treasure Trove",))) +registerGame(GameInfo(716, PeekII, "Peek", + GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK))