Added additional missing game rules.

html-src/rules/accordion.html

@@ -0,0 +1,19 @@
+<h1>Accordion</h1>
+<p>
+One-Deck game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Remove all cards but one to a single pile.
+
+<h3>Rules</h3>
+<p>
+Two cards are dealt from the stock, but additional cards may be
+dealt at any time.
+<p>
+If two cards of the same suit or rank are next to each other, or
+separated by exactly two cards, the card that is further to the left
+(in PySol, this is the card that is further from the deck) may be moved
+on top of the other.
+<p>
+The game is won when only one card remains.

html-src/rules/algerianpatience.html

@@ -0,0 +1,27 @@
+<h1>Algerian Patience</h1>
+<p>
+Two-Deck game type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all the cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+At the start of the game, one king in each suit is placed in the
+rightmost of the eight foundations - these foundations are built
+down by suit while the remaining foundations are built up by suit,
+starting with an ace.
+<p>
+The tableau piles start with eight cards dealt, and six reserve
+stacks of four cards each are also dealt.  The tableau piles are built
+up or down by same suit, though only one card can be moved at a time.
+Cards from the reserve may be moved to tableau piles or foundations,
+but not other reserve piles.  Any card may be played in an empty space
+on the tableau.
+<p>
+When play comes to a standstill, you can deal two cards to each of the
+reserve piles from the stock.  When there are only eight cards left in
+the stock, you instead deal one of those cards to each tableau stack.
+<p>
+The game is won if all the cards are moved to the foundations.

html-src/rules/bayan.html

@@ -0,0 +1,12 @@
+<h1>Bayan</h1>
+<p>
+One deck type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Remove all the cards.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="accordion.html">Accordion</a>,
+but when you move a pile, both cards are removed.

html-src/rules/boardpatience.html

@@ -0,0 +1,22 @@
+<h1>Board Patience</h1>
+<p>
+One-Deck game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+One card is dealt to the foundations at the start of
+the game.  This card determines the base rank of the
+foundations.  The foundations are built up by suit,
+wrapping from king to ace as necessary.
+<p>
+There are ten tableau piles of five cards (except one
+with six), and the tableau is built down by alternate
+color, wrapping from ace to king as needed.  Cards may
+only be moved one at a time, and empty spaces may be filled
+with any card.
+<p>
+The game is won if all cards are moved to the foundations.

html-src/rules/cell11.html

@@ -0,0 +1,13 @@
+<h1>Cell 11</h1>
+<p>
+FreeCell type. 3 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="freecell.html">FreeCell</a>,
+but with three decks and eleven free cells, two
+of which start with a card in them.

html-src/rules/challengefreecell.html

@@ -0,0 +1,13 @@
+<h1>Challenge FreeCell</h1>
+<p>
+FreeCell type. 1 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="freecell.html">FreeCell</a>,
+but the aces and twos are dealt at the
+bottom of each tableau bolumn.

html-src/rules/doublerussiansolitaire.html

@@ -0,0 +1,12 @@
+<h1>Double Russian Solitaire</h1>
+<p>
+Yukon type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="russiansolitaire.html">Russian Solitaire</a>,
+but with two decks and ten playing piles.

html-src/rules/doubleyukon.html

@@ -0,0 +1,12 @@
+<h1>Double Yukon</h1>
+<p>
+Yukon type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="yukon.html">Yukon</a>,
+but with two decks and ten playing piles.

html-src/rules/freecell2reserves.html

@@ -0,0 +1,12 @@
+<h1>FreeCell (2 Reserves)</h1>
+<p>
+FreeCell type. 1 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="freecell.html">FreeCell</a>,
+but with two free cells rather than four.

html-src/rules/freecellnoreserve.html

@@ -0,0 +1,12 @@
+<h1>FreeCell (No Reserve)</h1>
+<p>
+FreeCell type. 1 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="freecell.html">FreeCell</a>,
+but without any free cells.

html-src/rules/goldmine.html

@@ -0,0 +1,19 @@
+<h1>Gold Mine</h1>
+<p>
+Numerica type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+The foundations build up by rank in the same suit.
+<p>
+Cards are dealt from the stock three at a time.  These cards
+may be moved to the foundations as appropriate, or to one of
+six tableau piles.  Tableau piles are built down by alternate
+color.  Sequences of cards may be moved between tableau piles.
+<p>
+You may only go through the stock once.  The game is won if all
+cards can be moved to the foundations.

html-src/rules/kingcell.html

@@ -0,0 +1,12 @@
+<h1>KingCell</h1>
+<p>
+FreeCell type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="freecell.html">FreeCell</a>,
+but only Kings can be played on empty spaces.

html-src/rules/memory30.html

@@ -0,0 +1,26 @@
+<h1>Memory 30</h1>
+<p>
+Memory game type. 30 cards. No redeal.
+
+<h3>Object</h3>
+<p>
+Flip all pairs of matching cards and get a score of 45 points or more.
+
+<h3>Rules</h3>
+<p>
+At game start 15 pairs of cards are dealt to the tableau piles.
+<p>
+Flip any 2 cards that match in suit and rank.
+<p>
+Any pair that matches will gain you 5 points, while a pair that
+doesn't match will cost you 1 point.
+<p>
+You win if your final score reaches 45 points.
+
+<h3>Notes</h3>
+<p>
+To get awarded for a perfect game you must reach the maximum score of
+75 points. You can reach this by restarting the game.
+<p>
+<i>Undo</i>, <i>Bookmarks</i>, <i>Autodrop</i> and <i>Quickplay</i>
+are disabled for this game.

html-src/rules/nestor.html

@@ -15,3 +15,7 @@ four cards are placed aside as reserve.
 Pairs of exposed cards between the top card of each column and the
 four reserve cards may be moved to the foundation.  You win if all
 cards can be paired off.
+
+<h3>Notes</h3>
+<p>
+<i>Autodrop</i> is disabled for this game.

html-src/rules/one234.html

@@ -0,0 +1,29 @@
+<h1>One234</h1>
+<p>
+One-Deck game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="calculation.html">Calculation</a>,
+but using an eight column tableau instead of a stack and waste pile.
+
+<h3>Rules</h3>
+<p>
+The four foundations build regardless of suit the following way:
+The first pile by one. The second pile by two. The third pile by three.
+The fourth pile by four.
+<pRE>
+1:  2 3 4 5 6 7 8 9 T J Q K
+2:  4 6 8 T Q A 3 5 7 9 J K
+3:  6 9 Q 2 5 8 J A 4 7 T K
+4:  8 Q 3 7 J 2 6 T A 5 9 K
+</pRE>
+<p>
+Cards are dealt into eight columns of six cards, and the remaining four
+cards are dealt to the foundations.  Building on the tableau is not allowed.
+Cards in the tableau may be moved to an appropriate foundation at any time.
+The game is won when all cards have been moved to the foundations.

html-src/rules/quartets.html

@@ -0,0 +1,17 @@
+<h1>Quartets</h1>
+<p>
+One deck type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundation.
+
+<h3>Rules</h3>
+<p>
+Cards may be moved between the tableau piles, moving one card at a time.
+The tableau piles are built up or down by alternating colors.
+<p>
+There are four reserves, each of which can hold one card.  If all four
+reserves hold a card of the same rank, all four of them are moved to the
+foundation.  The game is won when the entire deck is moved to the
+foundation in this way.

html-src/rules/thirteens.html

@@ -0,0 +1,19 @@
+<h1>Thirteens</h1>
+<p>
+Pairing game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Discard all the cards.
+
+<h3>Rules</h3>
+<p>
+The object is to use up all the cards from the tableau by
+discarding pairs of cards that total up to 13.  Kings can
+be removed on their own.
+<p>
+You win when the tableau piles are all gone.
+
+<h3>Notes</h3>
+<p>
+<i>Autodrop</i> is disabled for this game.

html-src/rules/triplerussiansolitaire.html

@@ -0,0 +1,12 @@
+<h1>Triple Russian Solitaire</h1>
+<p>
+Yukon type. 3 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="yukon.html">Yukon</a>,
+but with three decks and thirteen playing piles.

html-src/rules/tripleyukon.html

@@ -0,0 +1,12 @@
+<h1>Triple Yukon</h1>
+<p>
+Yukon type. 3 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="yukon.html">Yukon</a>,
+but with three decks and thirteen playing piles.

html-src/rules/twopyramids.html

@@ -0,0 +1,12 @@
+<h1>Two Pyramids</h1>
+<p>
+Pairing game type. 2 decks. 2 redeals.
+
+<h3>Object</h3>
+<p>
+Fill all of the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="pyramid.html">Pyramid</a>,
+but with two decks and the cards are arranged into two pyramids.

html-src/rules/vertical.html

@@ -0,0 +1,17 @@
+<h1>Vertical</h1>
+<p>
+Pairing game type. 1 deck. No redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the single foundation.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="nestor.html">Nestor</a>,
+but with a different layout (six stacks of six cards
+and one of seven, and nine reserve cards).  Also, it
+is possible for two cards of the same rank to be in
+a single column, so extra care must be taken not to
+trap the last remaining pair of a given rank in the
+same column.

pysollib/games/freecell.py

@@ -648,10 +648,11 @@ registerGame(GameInfo(5, RelaxedFreeCell, "Relaxed FreeCell",
                       GI.GT_FREECELL | GI.GT_RELAXED | GI.GT_OPEN, 1, 0,
                       GI.SL_SKILL))
 registerGame(GameInfo(8, FreeCell, "FreeCell",
+                      GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL,
+                      altnames=("Four Free")))
+registerGame(GameInfo(1901, ZeroFcFreeCell, "FreeCell (No Reserve)",
                       GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL))
-registerGame(GameInfo(1901, ZeroFcFreeCell, "FreeCell with Zero Reserves",
+registerGame(GameInfo(1900, PairFcFreeCell, "FreeCell (2 Reserves)",
-                      GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL))
-registerGame(GameInfo(1900, PairFcFreeCell, "FreeCell with Two Reserves",
                       GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL))
 registerGame(GameInfo(46, ForeCell, "ForeCell",
                       GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL))
@@ -663,8 +664,7 @@ registerGame(GameInfo(264, DoubleFreecell, "Double FreeCell",
 registerGame(GameInfo(265, TripleFreecell, "Triple FreeCell",
                       GI.GT_FREECELL | GI.GT_OPEN, 3, 0, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(336, ChallengeFreeCell, "Challenge FreeCell",
-                      GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL,
+                      GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL))
-                      rules_filename='freecell.html'))
 registerGame(GameInfo(337, SuperChallengeFreeCell, "Super Challenge FreeCell",
                       GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL))
 registerGame(GameInfo(363, Spidercells, "Spidercells",