Added more missing game rules.

html-src/rules/acme.html

@@ -0,0 +1,25 @@
+<h1>Acme</h1>
+<p>
+Canfield type. 1 deck. 1 redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Four cards are dealt to four tableau piles, and 13 cards are
+dealt to a reserve.  The aces are dealt to four foundation
+piles.
+<p>
+The tableau piles are built down by same suit.  Single cards
+can be moved between tableau piles, or cards from the reserve
+can be moved to a tableau pile.  Empty tableau piles are
+immediately filled from the reserve.  Foundations are built up
+by same suit from ace to king.
+<p>
+Cards can be dealt from the talon one at a time.  These cards
+can be moved to a tableau or foundation pile.  You are allowed
+one redeal, so you can go through the stock twice.
+<p>
+The game is won when all cards are moved to the foundations.

html-src/rules/challengefreecell.html

@@ -10,4 +10,4 @@ Move all cards to the foundations.
 <p>
 Like <a href="freecell.html">FreeCell</a>,
 but the aces and twos are dealt at the
-bottom of each tableau bolumn.
+bottom of each tableau column.

html-src/rules/corners.html

@@ -0,0 +1,14 @@
+<h1>Corners</h1>
+<p>
+One-Deck game type. 1 deck. 2 redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="fourseasons.html">Four Seasons</a>,
+but a card is dealt to each foundation at the start
+of the game and building on the tableau is not
+allowed.  Also, two redeals are allowed.

html-src/rules/czarina.html

@@ -0,0 +1,13 @@
+<h1>Czarina</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="fourseasons.html">Four Seasons</a>,
+but empty tableau piles are filled immediately
+from the waste pile.

html-src/rules/easthaven.html

@@ -1,6 +1,6 @@
 <h1>Easthaven</h1>
 <p>
-Klondike type. 1 deck. No redeal.
+Gypsy type. 1 deck. No redeal.
 
 <h3>Object</h3>
 <p>
@@ -16,8 +16,7 @@ but anything on an empty space, and no redeal.
 Piles build down by alternate color, and an empty space can be filled
 with any card or sequence.
 <p>
-Cards from the Talon are turned over to the Waste pile, one at a time.
-You can move the top card to the playing piles or the Foundations.
-There is no redeal.
+When you are out of moves, you can deal one card from the talon to
+the top of each tableau pile.
 <p>
 You are also permitted to move cards back out of the Foundations.

html-src/rules/fascinationfan.html

@@ -0,0 +1,21 @@
+<h1>Fascination Fan</h1>
+<p>
+Fan game type. 1 deck. 6 redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+17 piles of three cards are dealt, and the last card is
+dealt to an eighteenth pile.  Only the top card of each
+pile is visible.  Piles are built down by alternating color.
+Empty piles can't be filled.
+<p>
+When no more moves are possible, click on the talon.
+All cards on the tableau will be re-shuffled and redealt
+in the same manner, with only the top cards again being
+visible.  Six redeals are allowed.
+<p>
+The game is won if all cards are moved to the foundations.

html-src/rules/fourseasons.html

@@ -0,0 +1,25 @@
+<h1>Four Seasons</h1>
+<p>
+One-Deck game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Five cards are dealt to the tableau, in a cross shape.  The
+four foundations are in the corners of the tableau.  A single
+card is dealt to one of the foundations - this is the base rank
+for the foundations for this game.
+<p>
+Tableau piles are built down by rank, regardless of suit.  The
+foundations are built up by suit.  Both wrap from ace to king as
+necessary.  Single cards can be moved between tableau piles and
+any card can fill an empty pile.
+<p>
+Cards can be dealt from the talon one at a time.  The last dealt
+card can be moved to an appropriate tableau pile or foundation.
+No redeal is allowed.
+<p>
+The game is won if all cards are moved to the foundations.

html-src/rules/montecarlo2decks.html

@@ -0,0 +1,12 @@
+<h1>Monte Carlo (2 decks)</h1>
+<p>
+Pairing game type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Discard all pairs of cards of the same rank.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="montecarlo.html">Monte Carlo</a>,
+but with two decks.

html-src/rules/openspider.html

@@ -0,0 +1,12 @@
+<h1>Open Spider</h1>
+<p>
+Spider type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="spider.html">Spider</a>,
+but all cards in the tableau are visible.

html-src/rules/phalanx.html

@@ -0,0 +1,17 @@
+<h1>Phalanx</h1>
+<p>
+One-Deck game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Fifteen cards are dealt to fifteen reserve piles, arranged
+in a triangle shape.  Four foundations are built up by same
+suit from ace to king.  Cards are dealt from the talon one
+at a time, and can be moved to empty reserve piles or
+foundations.  No redeal is allowed.
+<p>
+The game is won if all cards are moved to the foundations.

html-src/rules/russianaces.html

@@ -0,0 +1,13 @@
+<h1>Russian Aces</h1>
+<p>
+One-Deck game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards except the four Aces to the single foundation.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="acesup.html">Aces Up</a>,
+but when dealing from the talon, if there are any empty tableau
+piles, those are the only piles cards are dealt to.

html-src/rules/simplicity.html

@@ -0,0 +1,14 @@
+<h1>Simplicity</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="fourseasons.html">Four Seasons</a>,
+but the tableau piles are dealt in two rows of
+six cards, and are built down by alternating
+colors.

html-src/rules/spidike.html

@@ -0,0 +1,27 @@
+<h1>Spidike</h1>
+<p>
+Spider type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Cards are dealt in seven tableau piles, each with a different number of
+cards, from one to seven, all face-up.
+<p>
+The tableau piles are built down, regardless of suit.  However, sequences
+that are all of the same suit are preferred because these are available
+for further movement.  An empty tableau pile can only be filled by a king.
+<p>
+Aces can be moved to the foundations, which are built up by same suit from
+ace to king.
+<p>
+When no more moves are possible, click on the talon. One card will be
+added to each of the playing piles.
+
+<h3>Notes</h3>
+<p>
+Spidike is a combination of the games Spider and Klondike, that
+was invented by Thomas Warfield.

html-src/rules/superchallengefreecell.html

@@ -0,0 +1,14 @@
+<h1>Super 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 column, and only kings
+can be used to fill empty tableau piles.

html-src/rules/westhaven.html

@@ -0,0 +1,23 @@
+<h1>Westhaven</h1>
+<p>
+Gypsy type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="klondike.html">Klondike</a>,
+but 10 piles, anything on an empty space, and no redeal.
+<br>Very easy.
+
+<h3>Rules</h3>
+<p>
+Piles build down by alternate color, and an empty space can be filled
+with any card or sequence.
+<p>
+When you are out of moves, you can deal one card from the talon to
+the top of each tableau pile.
+<p>
+You are <em>not</em> permitted to move cards back out of the foundations.

pysollib/games/windmill.py

@@ -432,14 +432,11 @@ registerGame(GameInfo(30, Windmill, "Windmill",
 registerGame(GameInfo(277, NapoleonsTomb, "Napoleon's Tomb",
                       GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(417, Corners, "Corners",
-                      GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK,
-                      rules_filename='fourseasons.html'))
+                      GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(437, Simplicity, "Simplicity",
-                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK,
-                      rules_filename='fourseasons.html'))
+                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(483, Czarina, "Czarina",
-                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK,
-                      rules_filename='fourseasons.html'))
+                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(484, FourSeasons, "Four Seasons",
                       GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK,
                       altnames=('Corner Card', 'Vanishing Cross')))