+Spider game type. 1 deck. No redeal. + +
+Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace. + +
+Cards are dealt to seven piles of seven cards. The cards in the +first pile are all face-up while the bottom two cards of the +remaining piles are face-down. The remaining three cards are +placed in reserves. +
+Tableau piles are built down by same suit. Groups of cards can +be moved between tableau piles regardless of suit. Reserve cards +can be moved to the tableau, but cards cannot be moved to the +reserves. +
+The game is won when all the cards are dealt into four sequences of +the same suit, descending from King to Ace. diff --git a/html-src/rules/badseven.html b/html-src/rules/badseven.html index a029c1d4..91b49216 100644 --- a/html-src/rules/badseven.html +++ b/html-src/rules/badseven.html @@ -27,5 +27,5 @@ piles have seven cards, any remaining cards are dealt to the bottom of the piles face-up, until the deck is empty.
The foundations are built up by suit, with sevens being placed -on top of aces. The game is won if al cards are moved to the +on top of aces. The game is won if all cards are moved to the foundations. diff --git a/html-src/rules/boxfan.html b/html-src/rules/boxfan.html new file mode 100644 index 00000000..180daaff --- /dev/null +++ b/html-src/rules/boxfan.html @@ -0,0 +1,13 @@ +
+Fan game type. 1 deck. No redeal. + +
+Move all cards to the foundations. + +
+Like Fan, +but there are 16 piles, built down by alternate color, +and the aces are dealt to the foundations at the start. diff --git a/html-src/rules/britishconstitution.html b/html-src/rules/britishconstitution.html new file mode 100644 index 00000000..4d99776e --- /dev/null +++ b/html-src/rules/britishconstitution.html @@ -0,0 +1,41 @@ +
+Two-Deck game type. 2 decks. No redeal. + +
+Move all the cards to the foundations. + +
+This game only uses the ranks from ace through jack. The +kings and queens are removed. +
+The aces are dealt to the foundation, and a card is dealt to +each tableau pile. There are four rows of eight tableau piles. +The tableau piles are built down by alternate color, so only the +top card is visible, and only cards from the row directly below +can be moved to a tableau pile. Only one card can be moved at +a time. +
+Cards are dealt one at a time from the stock, and can be moved to +the bottommost tableau row only. Empty spaces in the bottom row +of the tableau are immediately filled from the waste pile. No +redeal is allowed. +
+The foundations are built up by suit from ace to jack, but only +cards from the top tableau row can be moved to the foundations. +The game is won if all cards are moved to the foundations. + +
+In this game, the foundations are often called the "Government" with +the tableau called the "Constitution", the top row being the "Privy +Council" and the bottom being the "People Row". +
+In the rules written by Lady Cadogan, the queen of diamonds and eight +kings are placed above the foundations, with the queen being the +"Sovereign", the red kings being the "Judges", and the black kings +the "Bishops". Since their role is entirely thematic and decorative, +this is left out of most modern variants of the game, though it does +explain why they are omitted from the deck. diff --git a/html-src/rules/carthage.html b/html-src/rules/carthage.html new file mode 100644 index 00000000..cb804492 --- /dev/null +++ b/html-src/rules/carthage.html @@ -0,0 +1,14 @@ +
+Three-Deck game type. 3 decks. No redeal. + +
+Fill all of the foundations. + +
+Like Algerian Patience, +but all of the foundations are built up from ace to king, +and the tableau is built down. No cards are dealt to the +foundations at the start of the game. diff --git a/html-src/rules/chamberlain.html b/html-src/rules/chamberlain.html new file mode 100644 index 00000000..9b6ef324 --- /dev/null +++ b/html-src/rules/chamberlain.html @@ -0,0 +1,13 @@ +
+Numerica type. 1 deck. No redeal. + +
+Move all cards to the foundations. + +
+Like Gloaming, but with four +reserve piles of thirteen cards, only three tableau piles, +and the foundations are built up by rank, regardless of suit. diff --git a/html-src/rules/chameleon.html b/html-src/rules/chameleon.html index 3168bef8..067bef2a 100644 --- a/html-src/rules/chameleon.html +++ b/html-src/rules/chameleon.html @@ -12,10 +12,6 @@ Like Canfield, but the three piles build down by rank, cards are dealt singly, and no redeal. -
-[To be written] -
This game is also known under names such as diff --git a/html-src/rules/doublescorpion.html b/html-src/rules/doublescorpion.html new file mode 100644 index 00000000..c636840b --- /dev/null +++ b/html-src/rules/doublescorpion.html @@ -0,0 +1,13 @@ +
+Spider type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+Like Scorpion, +but with two decks and ten piles of ten cards +(four face-down cards in five piles). diff --git a/html-src/rules/fanny.html b/html-src/rules/fanny.html new file mode 100644 index 00000000..43e3af5f --- /dev/null +++ b/html-src/rules/fanny.html @@ -0,0 +1,12 @@ +
+Numerica type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+Like Frog, but the reserve consists of +twelve cards, and only the top one is visible. diff --git a/html-src/rules/fly.html b/html-src/rules/fly.html new file mode 100644 index 00000000..48b4ae8f --- /dev/null +++ b/html-src/rules/fly.html @@ -0,0 +1,13 @@ +
+Numerica type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+Like Frog, but the aces are dealt +to the foundations at the start of the game. In this +variant, the reserve is known as the fly. diff --git a/html-src/rules/frog.html b/html-src/rules/frog.html new file mode 100644 index 00000000..31d698a6 --- /dev/null +++ b/html-src/rules/frog.html @@ -0,0 +1,22 @@ +
+Numerica type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+Thirteen cards are dealt to a reserve called the frog. If +an ace would be dealt to this reserve, it is dealt to the +foundations instead. +
+Cards are dealt one at a time from the stock, and are moved +to one of five tableau stacks, or the foundations. These stacks +can be built regardless of suit or rank, but once a card is in +the stacks, it can only be moved to the foundations. Cards in +the reserve can only be moved to the foundations. +
+Foundations are built up from ace to king, regardless of suit. +The game is won if all cards are moved to the foundations. diff --git a/html-src/rules/hospitalpatience.html b/html-src/rules/hospitalpatience.html new file mode 100644 index 00000000..67731dce --- /dev/null +++ b/html-src/rules/hospitalpatience.html @@ -0,0 +1,16 @@ +
+One-Deck game type. 1 deck. Unlimited redeals. + +
+Move all cards to foundations. + +
+Cards are dealt from the talon three at a time, and can be +moved to foundations. Unlimited redeals are allowed. There +are eight foundations, four built up by suit from ace to king, +and four built down by suit from king to ace. The game is +won if all cards are moved to the foundations - it doesn't +matter how many cards are in each foundation. diff --git a/html-src/rules/inquisitor.html b/html-src/rules/inquisitor.html new file mode 100644 index 00000000..b81078d5 --- /dev/null +++ b/html-src/rules/inquisitor.html @@ -0,0 +1,14 @@ +
+Klondike type. 2 decks. 2 redeals. + +
+Move all cards to the foundations. + +
+Like Big Harp, +but all cards are visible, tableau piles are built +down by same suit, and cards are dealt from the talon +three at a time with only two redeals allowed. diff --git a/html-src/rules/marshal.html b/html-src/rules/marshal.html new file mode 100644 index 00000000..a93f9b29 --- /dev/null +++ b/html-src/rules/marshal.html @@ -0,0 +1,24 @@ +
+Two-Deck game type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+A single card is dealt to each of twenty-four tableau piles. +Tableau piles are built up or down by same suit, cards placed +so only the top one is visible. Empty tableau piles are +immediately filled from the stock. If the stock is empty, +tableau piles can't be filled. +
+If there are no moves left, you can deal one card from the +stock to all 24 piles. +
+There are two sets of foundations - the set on the left builds
+up by same suit from ace to king while the set on the right
+builds down by same suit from king to ace. Cards can be moved
+between foundations. The game is won if all cards are moved
+to the foundations.
diff --git a/html-src/rules/midshipman.html b/html-src/rules/midshipman.html
index 3521d04b..1f9cdbe4 100644
--- a/html-src/rules/midshipman.html
+++ b/html-src/rules/midshipman.html
@@ -11,7 +11,3 @@ Move all cards to the foundations.
Like Forty Thieves,
but the 9 piles build down by any suit but own.
Much like Indian.
-
-
-[To be written] diff --git a/html-src/rules/minerva.html b/html-src/rules/minerva.html new file mode 100644 index 00000000..64b9fc8a --- /dev/null +++ b/html-src/rules/minerva.html @@ -0,0 +1,25 @@ +
+Canfield type. 1 deck. 1 redeal. + +
+Move all cards to the foundations. + +
+Cards are dealt to seven piles of four cards each, with the +first and third card in each pile face-down and the second and +top card face-up. Eleven cards are dealt to a reserve pile, +with only the top one face-up. Tableau piles are built down +by alternate color, and any card or valid sequence of cards +can be moved between piles. Empty piles can only be filled +by kings. +
+The top card of the reserve can be moved to the tableau or +foundations, but cards cannot be moved to the reserve. Cards +are drawn from the talon one at a time, and can be moved to +the tableau or foundations. One redeal is allowed. +
+The foundations are built up by same suit from ace to king. +The game is won if all cards are moved to the foundations. diff --git a/html-src/rules/napoleonssquare.html b/html-src/rules/napoleonssquare.html new file mode 100644 index 00000000..08e02944 --- /dev/null +++ b/html-src/rules/napoleonssquare.html @@ -0,0 +1,13 @@ +
+Forty Thieves type. 2 decks. 1 redeal. + +
+Move all cards to the foundations. + +
+Like Forty Thieves, +but with twelve piles, and sequences of cards may +be moved together. diff --git a/html-src/rules/newbritishconstitution.html b/html-src/rules/newbritishconstitution.html index ed170fea..2c8a1499 100644 --- a/html-src/rules/newbritishconstitution.html +++ b/html-src/rules/newbritishconstitution.html @@ -9,8 +9,5 @@ Move all cards to the foundations.
Like British Constitution, -but only Jacks on empty spaces and the piles build down by rank ignoring suit. - -
-[To be written] +but only Jacks on empty spaces and the piles build down by rank +ignoring suit. diff --git a/html-src/rules/portuguesesolitaire.html b/html-src/rules/portuguesesolitaire.html new file mode 100644 index 00000000..4e44b236 --- /dev/null +++ b/html-src/rules/portuguesesolitaire.html @@ -0,0 +1,12 @@ +
+Baker's Dozen type. 1 deck. No redeal. + +
+Move all cards to the foundations. + +
+Like Baker's Dozen, +but empty piles can be filled by kings. diff --git a/html-src/rules/pussinthecorner.html b/html-src/rules/pussinthecorner.html index 66f4015c..bbcdfc8d 100644 --- a/html-src/rules/pussinthecorner.html +++ b/html-src/rules/pussinthecorner.html @@ -1,5 +1,5 @@
+
Numerica type. 1 deck. 1 redeal.
+Klondike type. 2 decks. 1 redeal. + +
+Move all cards to the foundations. + +
+Cards are dealt to six piles of four cards each. Tableau +piles are built down by same suit. Only single cards can +be moved between tableau piles. Empty spaces are filled +immediately from the waste pile, but if the stock is empty, +any card can fill an empty tableau pile. +
+You can deal cards from the stock one at a time, and move +cards to the tableau and foundations. Only one redeal is +allowed. +
+The foundations are built up by same suit from ace to king. +The game is won if all cards are moved to the foundations. diff --git a/html-src/rules/ripplefan.html b/html-src/rules/ripplefan.html new file mode 100644 index 00000000..9b2c11bd --- /dev/null +++ b/html-src/rules/ripplefan.html @@ -0,0 +1,13 @@ +
+Baker's Dozen type. 1 deck. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Like Cruel, +but the aces aren't dealt to the foundations at +the start, and there's one more tableau pile. diff --git a/html-src/rules/scorpion.html b/html-src/rules/scorpion.html index 4ecb7fab..bf1978fb 100644 --- a/html-src/rules/scorpion.html +++ b/html-src/rules/scorpion.html @@ -18,6 +18,10 @@ but the cards can be moved like in The object is to group the cards in sets of 13 cards, from King to Ace of the same suit. Such groups can be moved to the foundations.
+Cards are dealt to seven piles of seven cards each, with three face-down +cards at the bottom of four piles, and all cards face-up in the other +three. The remaining three cards remain in the talon. +
Cards in tableau are built down by suit. Groups of cards can be moved regardless of sequence. An empty pile in the tableau can be filled with a King or a group diff --git a/html-src/rules/scorpionhead.html b/html-src/rules/scorpionhead.html index 405970bd..f341245c 100644 --- a/html-src/rules/scorpionhead.html +++ b/html-src/rules/scorpionhead.html @@ -10,7 +10,3 @@ Move all cards to the foundations.
Like Scorpion, but with four extra free cells. - -
-[To be written] diff --git a/html-src/rules/scorpionii.html b/html-src/rules/scorpionii.html new file mode 100644 index 00000000..145d2b5d --- /dev/null +++ b/html-src/rules/scorpionii.html @@ -0,0 +1,13 @@ +
+Spider type. 1 deck. No redeal. + +
+Move all cards to the foundations. + +
+Like Scorpion, +but only three of the tableau piles contain +face-down cards. diff --git a/html-src/rules/scorpiontail.html b/html-src/rules/scorpiontail.html index cb9b20a1..86444654 100644 --- a/html-src/rules/scorpiontail.html +++ b/html-src/rules/scorpiontail.html @@ -10,7 +10,3 @@ Move all cards to the foundations.
Like Scorpion, but the piles build down by alternate color. - -
-[To be written] diff --git a/html-src/rules/smallharp.html b/html-src/rules/smallharp.html index 12de0405..a0190f56 100644 --- a/html-src/rules/smallharp.html +++ b/html-src/rules/smallharp.html @@ -11,10 +11,6 @@ Move all cards to the foundations. Just like Klondike, only with a different layout. -
-[To be written] -
Small Harp and Big Harp are the German ways of playing diff --git a/html-src/rules/spanishpatience.html b/html-src/rules/spanishpatience.html index 2bc9d893..840d7709 100644 --- a/html-src/rules/spanishpatience.html +++ b/html-src/rules/spanishpatience.html @@ -10,7 +10,3 @@ Move all cards to the foundations.
Like Baker's Dozen, but the Foundations build up in alternate color. - -
-[To be written] diff --git a/html-src/rules/spanishpatienceii.html b/html-src/rules/spanishpatienceii.html new file mode 100644 index 00000000..71348181 --- /dev/null +++ b/html-src/rules/spanishpatienceii.html @@ -0,0 +1,12 @@ +
+Baker's Dozen type. 1 deck. No redeal. + +
+Move all cards to the foundations. + +
+Like Baker's Dozen, +but empty piles can be filled by any card. diff --git a/html-src/rules/thievesofegypt.html b/html-src/rules/thievesofegypt.html new file mode 100644 index 00000000..620a5822 --- /dev/null +++ b/html-src/rules/thievesofegypt.html @@ -0,0 +1,23 @@ +
+Klondike type. 2 decks. 1 redeal. + +
+Move all cards to the foundations. + +
+Cards are dealt to ten tableau piles, each with a different +number of cards, 1-3-5-7-9-10-8-6-4-2 from left to right. +Tableau piles are built down by alternate color, and only +kings can fill empty tableau piles. Any card or valid +sequence of cards can be moved between piles. +
+When there are no moves left, cards can be dealt from the +tableau one at a time, and moved to the tableau or foundations. +Only one redeal is allowed. +
+The foundations are built up by same suit from ace to king. +The game is won when all cards have been moved to the +foundations. diff --git a/html-src/rules/trapdoor.html b/html-src/rules/trapdoor.html new file mode 100644 index 00000000..11c5ba3c --- /dev/null +++ b/html-src/rules/trapdoor.html @@ -0,0 +1,25 @@ +
+Gypsy type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+Cards are dealt to eight tableau piles of three cards each. +Only the top card of each pile is face-up. Eight cards are +dealt to eight reserve piles, one below each tableau pile. +
+Tableau piles are built down by alternate color. Any card +or valid sequence of cards can be moved between piles. Cards +from the reserve can be moved to the tableau, but building on +the reserves is otherwise not allowed. +
+When there are no moves left, the card from each reserve can +be moved to the top of the associated tableau pile, and +eight new cards are dealt to the reserve. +
+The foundations are built up by same suit from ace to king. +The game is won if all cards are moved to the foundations. diff --git a/html-src/rules/trapdoorspider.html b/html-src/rules/trapdoorspider.html new file mode 100644 index 00000000..bc7eb17e --- /dev/null +++ b/html-src/rules/trapdoorspider.html @@ -0,0 +1,13 @@ +
+Spider type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+Like Trapdoor, but with a +layout, and tableau pile build style similar to +Spider. diff --git a/html-src/rules/triplescorpion.html b/html-src/rules/triplescorpion.html new file mode 100644 index 00000000..0a0b7afe --- /dev/null +++ b/html-src/rules/triplescorpion.html @@ -0,0 +1,13 @@ +
+Spider type. 3 decks. No redeal. + +
+Move all cards to the foundations. + +
+Like Scorpion, +but with three decks and thirteen piles of twelve cards +(five face-down cards in five piles). diff --git a/html-src/rules/waterfall.html b/html-src/rules/waterfall.html new file mode 100644 index 00000000..fc248566 --- /dev/null +++ b/html-src/rules/waterfall.html @@ -0,0 +1,32 @@ +
+Two-Deck game type. 2 decks. No redeal. + +
+Move all cards to the single foundation. + +
+Cards are dealt to eight piles of four cards each. +Tableau piles are built down by rank, regardless of +suit. Any card or valid sequence of cards can be moved. +Any card or sequence can fill an empty space. If there +are no moves left, you can deal one card from the talon to +each tableau pile. +
+The single foundation is built up by same suit, starting +with the ace of clubs, through the king of clubs. Once +the king has been played, the ace of the next suit is the +next card to be played to the foundation. The sequence +of suits is as follows: +
+After the king of diamonds is played, the suit changes back +to clubs, and so on until all the cards have been moved +to the foundation, and the game is won. diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index 0bf4de9c..0a8a3fd8 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -1197,8 +1197,7 @@ registerGame(GameInfo(171, LadyBetty, "Lady Betty", registerGame(GameInfo(355, Frog, "Frog", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(356, Fly, "Fly", - GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED, - rules_filename='frog.html')) + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(357, Gnat, "Gnat", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(378, Gloaming, "Gloaming",