Fixed some miscategorized games.

html-src/rules/brush.html

@@ -0,0 +1,22 @@
+<h1>Brush</h1>
+<p>
+Spider type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+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.
+
+<h3>Rules</h3>
+<p>
+Cards are dealt to 10 piles of four cards each.  Tableau piled are built
+down, regardless of suit.  However, only sequences that are all of the same
+suit can be moved as a sequence.  A space can be filled by any card or legal
+group of cards.
+<p>
+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.
+<p>
+When no more moves are possible, you can deal cards from the talon one at
+a time, and can move them to the tableau.  No redeal is allowed.  The game
+is won if you can move all eight same suit sequences to the foundations.

html-src/rules/cornersuite.html

@@ -0,0 +1,20 @@
+<h1>Corner Suite</h1>
+<p>
+One-Deck game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all the cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Cards are dealt from the stock one at a time, and can be
+moved to one of nine tableau piles, which are built down by
+rank, regardless of suit, with only the top card visible.
+Though single cards can be moved between tableau piles,
+empty piles can only be filled from the waste pile.  No
+redeal is allowed.
+<p>
+The foundations, located in the corners of the game, are
+built up by same suit from ace to king.  The game is won
+if all cards are moved to the foundations.

html-src/rules/triplealliance.html

@@ -1,6 +1,6 @@
 <h1>Triple Alliance</h1>
 <p>
-One-Deck game type. 1 deck. No redeals.
+Pairing game type. 1 deck. No redeals.
 
 <h3>Object</h3>
 <p>

html-src/rules/triplealliance2decks.html

@@ -1,6 +1,6 @@
 <h1>Triple Alliance (2 Decks)</h1>
 <p>
-Two-Deck game type. 2 decks. No redeal.
+Pairing game type. 2 decks. No redeal.
 
 <h3>Object</h3>
 <p>

html-src/rules/wave.html

@@ -0,0 +1,22 @@
+<h1>Wave</h1>
+<p>
+Yukon type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Cards are dealt to eight piles of three cards each, with the
+middle card of each pile dealt face-down.  Tableau piles are
+built down by color, and face-up cards can be moved regardless
+of sequence, though a face-down card or a card with a face-down
+card on top of it cannot be moved.  Any card or sequence can be
+moved to an empty pile.
+<p>
+When there are no moves left, you can deal two cards from the
+talon to each tableau pile, one face-down then one face-up.
+<p>
+The foundations are built up by same suit from ace to king.
+The game is won if all cards are moved to the foundations.

pysollib/games/harp.py

@@ -436,7 +436,7 @@ registerGame(GameInfo(668, DoubleKingsley, "Double Kingsley",
 registerGame(GameInfo(678, ThievesOfEgypt, "Thieves of Egypt",
                       GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED))
 registerGame(GameInfo(689, Brush, "Brush",
-                      GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0,
+                      GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0,
                       GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(822, DoubleTrigon, "Double Trigon",
                       GI.GT_KLONDIKE, 2, -1, GI.SL_BALANCED))

pysollib/games/pyramid.py

@@ -1469,7 +1469,7 @@ registerGame(GameInfo(596, SuitElevens, "Suit Elevens",
 registerGame(GameInfo(597, Fifteens, "Fifteens",
                       GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(619, TripleAlliance, "Triple Alliance",
-                      GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0,
+                      GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0,
                       GI.SL_MOSTLY_SKILL, altnames=('Triplets',)))
 registerGame(GameInfo(655, Pharaohs, "Pharaohs",
                       GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_BALANCED))
@@ -1502,7 +1502,7 @@ registerGame(GameInfo(796, Exit, "Exit",
                       GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0,
                       GI.SL_MOSTLY_SKILL, altnames=('Gay Gordons',)))
 registerGame(GameInfo(802, TripleAlliance2Decks, "Triple Alliance (2 Decks)",
-                      GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0,
+                      GI.GT_PAIRING_TYPE | GI.GT_OPEN, 2, 0,
                       GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(846, PyramidDozen, "Pyramid Dozen",
                       GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_BALANCED))

pysollib/games/sultan.py

@@ -1413,7 +1413,7 @@ registerGame(GameInfo(429, Patriarchs, "Patriarchs",
 registerGame(GameInfo(438, SixesAndSevens, "Sixes and Sevens",
                       GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(477, CornerSuite, "Corner Suite",
-                      GI.GT_2DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
+                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(559, Marshal, "Marshal",
                       GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED))
 registerGame(GameInfo(565, RoyalAids, "Royal Aids",

pysollib/games/yukon.py

@@ -806,6 +806,6 @@ registerGame(GameInfo(603, Brisbane, "Brisbane",
 registerGame(GameInfo(707, Hawaiian, "Hawaiian",
                       GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED))
 registerGame(GameInfo(732, Wave, "Wave",
-                      GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED))
+                      GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED))
 registerGame(GameInfo(826, YukonicPlague, "Yukonic Plague",
                       GI.GT_YUKON, 1, 0, GI.SL_BALANCED))