From fbb369d93bbf40132913993d30a08bc41e6753f1 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Wed, 7 Dec 2022 18:36:23 -0500
Subject: [PATCH] Improvements to Knockout family games and full-deck variant.

---
 html-src/rules/knockoutplus.html | 13 +++++++++++++
 pysollib/gamedb.py               |  2 +-
 pysollib/games/knockout.py       | 17 +++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 html-src/rules/knockoutplus.html

diff --git a/html-src/rules/knockoutplus.html b/html-src/rules/knockoutplus.html
new file mode 100644
index 00000000..cff37233
--- /dev/null
+++ b/html-src/rules/knockoutplus.html
@@ -0,0 +1,13 @@
+<h1>Knockout +</h1>
+<p>
+One deck type. 1 deck. 2 redeals.
+
+<h3>Object</h3>
+<p>
+Move all the clubs to the foundation.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="knockout.html">Knockout</a>,
+but with a full deck of cards, and eight rows of
+cards are dealt per redeal.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index f27ef57b..cc248fde 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -548,7 +548,7 @@ class GI:
          tuple(range(22217, 22219))),
         ('fc-2.14', tuple(range(811, 827))),
         ('fc-2.15', tuple(range(827, 855)) + tuple(range(22400, 22407))),
-        ('dev', tuple(range(855, 872)))
+        ('dev', tuple(range(855, 873)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/knockout.py b/pysollib/games/knockout.py
index a599925f..3b896d9a 100644
--- a/pysollib/games/knockout.py
+++ b/pysollib/games/knockout.py
@@ -34,13 +34,14 @@ from pysollib.util import ANY_RANK, CLUB, HEART
 
 # ************************************************************************
 # * Knockout
+# * Knockout +
 # ************************************************************************
 
 class Knockout_Talon(DealRowTalonStack):
     def dealCards(self, sound=False):
         game = self.game
         if game.cards_dealt == game.DEALS_BEFORE_SHUFFLE:
-            if self.round < self.max_rounds:
+            if self.canDealCards():
                 old_state = game.enterState(game.S_FILL)
                 game.saveStateMove(2 | 16)  # for undo
                 self.game.cards_dealt = 0
@@ -58,6 +59,11 @@ class Knockout_Talon(DealRowTalonStack):
 
         return DealRowTalonStack.dealCards(self, sound)
 
+    def canDealCards(self):
+        game = self.game
+        return (game.cards_dealt < game.DEALS_BEFORE_SHUFFLE
+                or self.round < self.max_rounds)
+
     def canFlipCard(self):
         return False
 
@@ -170,6 +176,10 @@ class Knockout(Game):
         return [self.cards_dealt]
 
 
+class KnockoutPlus(Knockout):
+    DEALS_BEFORE_SHUFFLE = 8
+
+
 # ************************************************************************
 # * Herz zu Herz
 # ************************************************************************
@@ -184,8 +194,11 @@ class HerzZuHerz(Knockout):
 # register the game
 registerGame(GameInfo(850, Knockout, "Knockout",
                       GI.GT_1DECK_TYPE | GI.GT_STRIPPED, 1, 2, GI.SL_LUCK,
-                      altnames=("Hope Deferred",),
+                      altnames=("Hope Deferred", "Hope"),
                       ranks=(0, 6, 7, 8, 9, 10, 11, 12)))
 registerGame(GameInfo(851, HerzZuHerz, "Herz zu Herz",
                       GI.GT_1DECK_TYPE | GI.GT_STRIPPED, 1, 2, GI.SL_LUCK,
                       ranks=(0, 6, 7, 8, 9, 10, 11, 12)))
+registerGame(GameInfo(872, KnockoutPlus, "Knockout +",
+                      GI.GT_1DECK_TYPE, 1, 2, GI.SL_LUCK,
+                      altnames=("Abandon Hope",)))