Added Casino Canfield variation.

html-src/rules/casinocanfield.html

@@ -0,0 +1,24 @@
+<h1>Casino Canfield</h1>
+<p>
+Canfield type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Just like <a href="canfield.html">Canfield</a>,
+but cards are dealt from the talon one at a time,
+and there is no redeal.
+
+<h3>Notes</h3>
+<p>
+There is a simple casino scoring system here - you debit $52 for each game
+and for every card you bear off, you get $5 credit.
+Your balance is reset whenever you select a different game.
+Loaded games and manually entered game numbers don't count.
+<p>
+Casino Canfield is an attempt to recreate the game played in
+Richard A. Canfield's casino, though it is possible that the game in
+question is actually <a href="vegasklondike.html">a variation of Klondike</a>.

pysollib/gamedb.py

@@ -485,7 +485,7 @@ class GI:
         ('fc-2.12',   tuple(range(774, 811)) + (16681,) +
          tuple(range(22217, 22219))),
         ('fc-2.14', tuple(range(811, 827))),
-        ('fc-2.16', tuple(range(827, 835)))
+        ('fc-2.16', tuple(range(827, 836)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag

pysollib/games/canfield.py

@@ -348,6 +348,32 @@ class VariegatedCanfield(Canfield):
         pass
 
 
+# ************************************************************************
+# * Casino Canfield
+# ************************************************************************
+
+class CasinoCanfield(Canfield):
+    getGameScore = Game.getGameScoreCasino
+    getGameBalance = Game.getGameScoreCasino
+
+    def createGame(self, max_rounds=1, num_deal=1):
+        lay = Canfield.createGame(self, max_rounds=max_rounds,
+                                  num_deal=num_deal)
+        self.texts.score = MfxCanvasText(self.canvas,
+                                         8, self.height - 8, anchor="sw",
+                                         font=self.app.getFont("canvas_large"))
+        return lay
+
+    def updateText(self):
+        if self.preview > 1:
+            return
+        b1, b2 = self.app.stats.gameid_balance, 0
+        if self.shallUpdateBalance():
+            b2 = self.getGameBalance()
+        t = _("Balance $%d") % (b1 + b2)
+        self.texts.score.config(text=t)
+
+
 # ************************************************************************
 # * Eagle Wing
 # ************************************************************************
@@ -948,3 +974,5 @@ registerGame(GameInfo(642, Lafayette, "Lafayette",
                       GI.GT_CANFIELD, 1, -1, GI.SL_BALANCED))
 registerGame(GameInfo(789, Beehive, "Beehive",
                       GI.GT_CANFIELD, 1, -1, GI.SL_BALANCED))
+registerGame(GameInfo(835, CasinoCanfield, "Casino Canfield",
+                      GI.GT_CANFIELD | GI.GT_SCORE, 1, 0, GI.SL_BALANCED))