diff --git a/html-src/rules/acquaintance.html b/html-src/rules/acquaintance.html new file mode 100644 index 00000000..933b07a9 --- /dev/null +++ b/html-src/rules/acquaintance.html @@ -0,0 +1,14 @@ +

Acquaintance

+

+Numerica type. 1 deck. 2 redeals. + +

Quick Description

+

+Like Auld Lang Syne, +but two redeals are allowed, in which the tableau +piles are combined and placed on top of each other +to form a new deck. + +

Notes

+

+Autodrop is disabled for this game. diff --git a/html-src/rules/arabella.html b/html-src/rules/arabella.html new file mode 100644 index 00000000..bec86e92 --- /dev/null +++ b/html-src/rules/arabella.html @@ -0,0 +1,14 @@ +

Arabella

+

+Klondike type. 3 decks. Unlimited redeals. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Triple Klondike, +but tableau piles are built down by rank regardless of suit, +though only sequences of the same suit can be moved as a +unit (similar to Spider). diff --git a/html-src/rules/bastion.html b/html-src/rules/bastion.html new file mode 100644 index 00000000..f48e32ee --- /dev/null +++ b/html-src/rules/bastion.html @@ -0,0 +1,18 @@ +

Bastion

+

+Beleaguered Castle type. 1 deck. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Rules

+

+Cards are dealt to ten piles of five cards each. The remaining two +cards are dealt to two reserves. Tableau piles are built up or down +by same suit, and only single cards can be moved between tableau +piles. You can move cards from the reserve to the tableau or the +foundations, and empty reserve piles can be used as free cells. +

+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/bigben.html b/html-src/rules/bigben.html new file mode 100644 index 00000000..7e41ddc9 --- /dev/null +++ b/html-src/rules/bigben.html @@ -0,0 +1,27 @@ +

Big Ben

+

+Two-Deck game type. 2 decks. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Rules

+

+A circle of twelve cards are dealt out to the foundations. The two +of clubs is dealt in the nine o'clock position, each pile clockwise +dealt with a rank one higher, in suit order clubs-hearts-spades-diamonds, +leading to the king of diamonds in the eight o'clock position. The +remaining cards are dealt out to eight piles of five cards each. +

+Move cards to the foundations until the top of each foundation is the +clock number for that position. Jack equals 11, Queen equals 12, and +Aces must be placed on Kings. The foundations are built up by same suit. +

+The playing piles build down by same suit. Only the top card is +available for play, and empty rows cannot be filled. When there are no +moves left, you can deal cards from the talon to the tableau piles until +each pile has at least three cards. If the piles already have at least +three cards each, the remaining talon cards can be dealt one at a time. +

+The game is won if all cards are moved to the foundations. diff --git a/html-src/rules/chinesespider.html b/html-src/rules/chinesespider.html new file mode 100644 index 00000000..303c295e --- /dev/null +++ b/html-src/rules/chinesespider.html @@ -0,0 +1,14 @@ +

Chinese Spider

+

+Spider type. 4 decks. No redeal. + +

Object

+

+Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

Quick Description

+

+Like Spider, +but with four decks, three suits, and 13 +playing piles of six cards each. diff --git a/html-src/rules/choice.html b/html-src/rules/choice.html new file mode 100644 index 00000000..16ed4328 --- /dev/null +++ b/html-src/rules/choice.html @@ -0,0 +1,22 @@ +

Choice

+

+Three-Deck game type. 3 stripped decks. No redeal. + +

Object

+

+Fill all of the foundations. + +

Rules

+

+This game is played with three stripped decks, including +only the cards with a rank from six through king. +

+All of the cards are dealt to twelve piles of eight cards each. +Tableau piles are built down by alternate color, and any valid +sequence of cards can be moved between tableau piles. Any card +or sequence can be moved to an empty pile. +

+The foundations are built up by same rank, with one pile for +each rank from six through king. The order of suits of the cards +in the foundations must be the same in each pile. The game is +won if all cards are moved to the foundations. diff --git a/html-src/rules/cloverleaf.html b/html-src/rules/cloverleaf.html new file mode 100644 index 00000000..99c7c67d --- /dev/null +++ b/html-src/rules/cloverleaf.html @@ -0,0 +1,21 @@ +

Clover Leaf

+

+Fan game type. 1 deck. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Rules

+

+The two black aces and red kings are moved to the +foundations. The remaining cards are dealt to sixteen +tableau piles of three cards each. Tableau piles are +built up or down by same suit. Only single cards can +be moved between tableau piles, and an ace or king can +fill an empty pile. +

+The red foundations are built down by same suit from king +to ace, while the black 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/doubleacquaintance.html b/html-src/rules/doubleacquaintance.html new file mode 100644 index 00000000..3f175b58 --- /dev/null +++ b/html-src/rules/doubleacquaintance.html @@ -0,0 +1,16 @@ +

Double Acquaintance

+

+Numerica type. 2 decks. 2 redeals. + +

Quick Description

+

+A two deck variant of Acquaintance. +

+Like Auld Lang Syne, +but with eight rows and two redeals are allowed, in +which the tableau piles are combined and placed on +top of each other to form a new deck. + +

Notes

+

+Autodrop is disabled for this game. diff --git a/html-src/rules/farmerswife.html b/html-src/rules/farmerswife.html new file mode 100644 index 00000000..3b2067dd --- /dev/null +++ b/html-src/rules/farmerswife.html @@ -0,0 +1,13 @@ +

Farmer's Wife

+

+Spider type. 1 deck. No redeal. + +

Object

+

+Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

Quick Description

+

+Like Three Blind Mice, +but the piles build down by alternate color. diff --git a/html-src/rules/fourcolours.html b/html-src/rules/fourcolours.html new file mode 100644 index 00000000..aedd5519 --- /dev/null +++ b/html-src/rules/fourcolours.html @@ -0,0 +1,21 @@ +

Four Colours

+

+FreeCell type. 1 deck. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Rules

+

+Cards are dealt to four tableau piles, with each pile containing +all the cards of a single suit. There are also three additional +empty tableau piles. Tableau piles are built down by alternate +color, and any valid sequence can be moved between piles. +

+There are four free cells, located above the first four tableau +piles. Each free cell can only contain a card of the same suit +as the tableau pile directly below it. +

+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/grandduchess.html b/html-src/rules/grandduchess.html new file mode 100644 index 00000000..49859ee0 --- /dev/null +++ b/html-src/rules/grandduchess.html @@ -0,0 +1,27 @@ +

Grand Duchess

+

+Two-Deck game type. 2 decks. 3 redeals. + +

Object

+

+Move all cards to the foundations. + +

Rules

+

+A card is dealt to each of four tableau piles, and one card +is dealt face-down to two reserve piles, one on each side of the +tableau. Building on the tableau is not allowed, and cards in +the tableau can only be moved to foundations. +

+One set of foundations for each suit is built up by suit from ace +to king, and one set is built down by suit from king to ace. +

+When there are no moves left, deal a card to each tableau and +reserve pile, from left to right. Cards dealt to the reserves +are dealt face-down, but when the stock is empty, both full reserves +are flipped face-up. After the stock is empty, you can combine all +six piles to form a new stock, and redeal. You can do this a max of +three times. After the third redeal, the reserves are no longer +used, and cards are only dealt to tableau piles. +

+The game is won if all cards are moved to the foundations. diff --git a/html-src/rules/grandduchessplus.html b/html-src/rules/grandduchessplus.html new file mode 100644 index 00000000..db2e8641 --- /dev/null +++ b/html-src/rules/grandduchessplus.html @@ -0,0 +1,12 @@ +

Grand Duchess +

+

+Two-Deck game type. 2 decks. 3 redeals. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Just like Grand Duchess, but +with six tableau piles. diff --git a/html-src/rules/grandfathersclock.html b/html-src/rules/grandfathersclock.html index 6193c60e..516869ed 100644 --- a/html-src/rules/grandfathersclock.html +++ b/html-src/rules/grandfathersclock.html @@ -8,6 +8,12 @@ Move all cards to the foundations.

Rules

+A circle of twelve cards are dealt out to the foundations. The two +of spades is dealt in the five o'clock position, each pile clockwise +dealt with a rank one higher, in suit order spades-hearts-clubs-diamonds, +leading to the king of diamonds in the four o'clock position. The +remaining cards are dealt out to eight piles of five cards each. +

Move cards to the foundations until the top of each foundation is the clock number for that position. Jack equals 11, Queen equals 12, and Aces must be placed on Kings. diff --git a/html-src/rules/howtheyrun.html b/html-src/rules/howtheyrun.html new file mode 100644 index 00000000..268c3839 --- /dev/null +++ b/html-src/rules/howtheyrun.html @@ -0,0 +1,14 @@ +

How They Run

+

+Spider type. 1 deck. No redeal. + +

Object

+

+Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

Quick Description

+

+Like Three Blind Mice, +except the reserve piles can be used as free cells +after their initial card has been played. diff --git a/html-src/rules/jungle.html b/html-src/rules/jungle.html new file mode 100644 index 00000000..b27ed7e3 --- /dev/null +++ b/html-src/rules/jungle.html @@ -0,0 +1,18 @@ +

Jungle

+

+Montana type. 1 deck. 2 redeals. + +

Object

+

+Group all the cards in sets of 13 cards in ascending sequence +by suit from Ace to King. + +

Quick Description

+

+Just like Blue Moon, +but you can move cards regardless of suit (though the sequences +still need to be same suit to win the game). + +

Notes

+

+Autodrop is disabled for this game. diff --git a/html-src/rules/luckypiles.html b/html-src/rules/luckypiles.html new file mode 100644 index 00000000..f4898375 --- /dev/null +++ b/html-src/rules/luckypiles.html @@ -0,0 +1,15 @@ +

Lucky Piles

+

+Fan type. 1 deck. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Rules

+

+Cards are dealt to thirteen piles of four cards each. Tableau piles +are built up or down by same suit. Only single cards can be moved +between piles, and only kings can fill empty piles. 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/luckythirteen.html b/html-src/rules/luckythirteen.html new file mode 100644 index 00000000..1a7489ea --- /dev/null +++ b/html-src/rules/luckythirteen.html @@ -0,0 +1,16 @@ +

Lucky Thirteen

+

+One-Deck game type. 1 deck. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Rules

+

+Cards are dealt to thirteen piles of four cards each, arranged +so only the top card is visible. Tableau piles are built down +by rank, regardless of suit. Only single cards can be moved +between piles, and empty piles cannot be filled. 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/master.html b/html-src/rules/master.html new file mode 100644 index 00000000..1cfc05e9 --- /dev/null +++ b/html-src/rules/master.html @@ -0,0 +1,13 @@ +

Master

+

+Napoleon type. 1 deck. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Der kleine Napoleon, +but with two free cells, and the foundations are built up by suit +from ace to king. diff --git a/html-src/rules/parisienne.html b/html-src/rules/parisienne.html new file mode 100644 index 00000000..642bfd7d --- /dev/null +++ b/html-src/rules/parisienne.html @@ -0,0 +1,13 @@ +

Parisienne

+

+Two-Deck game type. 2 decks. 3 redeals. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Just like Grand Duchess, but +an ace and a king of each suit is dealt to the foundations +at the start of the game. diff --git a/html-src/rules/parliament.html b/html-src/rules/parliament.html new file mode 100644 index 00000000..5bf33baa --- /dev/null +++ b/html-src/rules/parliament.html @@ -0,0 +1,13 @@ +

Parliament

+

+Forty Thieves type. 2 decks. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Just like Congress, +but the aces are dealt to the foundations at the start of +the game. diff --git a/html-src/rules/royalfamily.html b/html-src/rules/royalfamily.html new file mode 100644 index 00000000..1a6aab66 --- /dev/null +++ b/html-src/rules/royalfamily.html @@ -0,0 +1,15 @@ +

Royal Family

+

+Baker's Dozen type. 1 deck. 2 redeals. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Cruel, +but the tableau is built up or down by alternate color, with +any card being able to be moved to empty piles, foundations +are built down by same suit from king to ace, and only two +redeals are allowed. diff --git a/html-src/rules/scuffle.html b/html-src/rules/scuffle.html index 4ecd8c4c..0314f9c6 100644 --- a/html-src/rules/scuffle.html +++ b/html-src/rules/scuffle.html @@ -6,8 +6,8 @@ Numerica type. 1 deck. 2 redeals.

Like Auld Lang Syne, but two redeals are allowed, in which the tableau -piles are combined to form a new deck. Cards are -arranged so only the top cards are visible. +piles are shuffled together to form a new deck. Cards +are arranged so only the top cards are visible.

Notes

diff --git a/html-src/rules/spike.html b/html-src/rules/spike.html new file mode 100644 index 00000000..c5c43e8e --- /dev/null +++ b/html-src/rules/spike.html @@ -0,0 +1,15 @@ +

Spike

+

+Klondike type. 1 deck. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Klondike, but cards are dealt +from the talon three at a time, one to each of three waste +piles. These cards can be moved to the tableau or foundations. +No redeal is allowed. This is similar to +Bristol. diff --git a/html-src/rules/squadron.html b/html-src/rules/squadron.html new file mode 100644 index 00000000..7244f466 --- /dev/null +++ b/html-src/rules/squadron.html @@ -0,0 +1,13 @@ +

Squadron

+

+Forty Thieves type. 2 decks. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Forty Thieves, +but with three free cells. A card is dealt to each +free cell at the start of the game. diff --git a/html-src/rules/tenbyone.html b/html-src/rules/tenbyone.html new file mode 100644 index 00000000..43cc3ff4 --- /dev/null +++ b/html-src/rules/tenbyone.html @@ -0,0 +1,13 @@ +

Ten by One

+

+Beleaguered Castle type. 1 deck. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Bastion, +but the last two cards are dealt to the tableau instead +of reserves, and there is only one free cell. diff --git a/html-src/rules/tournament.html b/html-src/rules/tournament.html new file mode 100644 index 00000000..1765e03e --- /dev/null +++ b/html-src/rules/tournament.html @@ -0,0 +1,31 @@ +

Tournament

+

+Two-Deck game type. 2 decks. 2 redeals. + +

Object

+

+Move all the cards to the foundations. + +

Rules

+

+Eight cards are dealt out to two columns of four free cells. +These cards must contain at least one ace or king - if they +do not, they are immediately redealt. Then, cards are dealt +to six tableau piles of four cards each. +

+There are two sets of foundations, one built up by same suit +from ace to king, and the others built down by same suit from +king to ace. Each set contains one foundation of each suit. +Cards from the free cells or the tableau can be moved to the +foundations, but building on the tableau is not allowed. +Empty free cells can be filled with any card from the tableau. +

+When a tableau pile is empty, four cards from the talon are +dealt to fill it. When there are no moves left, you can +deal four cards from the talon to each tableau pile. +

+Once the talon is empty, you can combine the tableau piles, +placing the rightmost one on top of the next rightmost one, +and so on. You can redeal like this twice in the game. +

+The game is won when all cards are moved to the foundations. diff --git a/pysollib/games/grandduchess.py b/pysollib/games/grandduchess.py index 17219990..bf18769b 100644 --- a/pysollib/games/grandduchess.py +++ b/pysollib/games/grandduchess.py @@ -158,7 +158,6 @@ registerGame(GameInfo(557, GrandDuchess, "Grand Duchess", altnames=('Duchess de Luynes'))) registerGame(GameInfo(617, Parisienne, "Parisienne", GI.GT_2DECK_TYPE, 2, 3, - rules_filename='grandduchess.html', altnames=('La Parisienne', 'Parisian'))) registerGame(GameInfo(618, GrandDuchessPlus, "Grand Duchess +", GI.GT_2DECK_TYPE, 2, 3))