From 29f737c633651d07c2410db8d8e24eadca086dca Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sun, 20 Aug 2023 21:32:26 -0400
Subject: [PATCH] Added Napoleon's Shoulder game.

---
 html-src/rules/napoleonsshoulder.html | 14 ++++++++++++++
 html-src/rules/napoleonssquare.html   |  2 +-
 pysollib/gamedb.py                    |  2 +-
 pysollib/games/fortythieves.py        | 17 +++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 html-src/rules/napoleonsshoulder.html

diff --git a/html-src/rules/napoleonsshoulder.html b/html-src/rules/napoleonsshoulder.html
new file mode 100644
index 00000000..f3a50d51
--- /dev/null
+++ b/html-src/rules/napoleonsshoulder.html
@@ -0,0 +1,14 @@
+<h1>Napoleon's Shoulder</h1>
+<p>
+Forty Thieves type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="fortythieves.html">Forty Thieves</a>,
+but with twelve piles, tableau piles are built down regardless
+of suit, and empty tableau piles can only be filled with a
+card from the waste.
diff --git a/html-src/rules/napoleonssquare.html b/html-src/rules/napoleonssquare.html
index 08e02944..f53a78fd 100644
--- a/html-src/rules/napoleonssquare.html
+++ b/html-src/rules/napoleonssquare.html
@@ -1,6 +1,6 @@
 <h1>Napoleon's Square</h1>
 <p>
-Forty Thieves type. 2 decks. 1 redeal.
+Forty Thieves type. 2 decks. No redeal.
 
 <h3>Object</h3>
 <p>
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index ab6da867..8c760fde 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -566,7 +566,7 @@ class GI:
         ('fc-2.20', tuple(range(855, 897))),
         ('fc-2.21', tuple(range(897, 900)) + tuple(range(11014, 11017)) +
          tuple(range(13160, 13163)) + (16682,)),
-        ('dev', tuple(range(906, 910)) + tuple(range(11017, 11020))),
+        ('dev', tuple(range(906, 911)) + tuple(range(11017, 11020))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py
index d6cfa580..5ed03bf9 100644
--- a/pysollib/games/fortythieves.py
+++ b/pysollib/games/fortythieves.py
@@ -157,6 +157,7 @@ class FortyThieves(Game):
 # * Waning Moon
 # * Lucas
 # * Napoleon's Square
+# * Napoleon's Shoulder
 # * Carre Napoleon
 # * Josephine
 # * Marie Rose
@@ -201,6 +202,20 @@ class NapoleonsSquare(FortyThieves):
         FortyThieves.createGame(self, rows=12)
 
 
+class NapoleonsShoulder_RowStack(RK_RowStack):
+    def acceptsCards(self, from_stack, cards):
+        if from_stack is not self.game.s.waste and len(self.cards) == 0:
+            return False
+        return RK_RowStack.acceptsCards(self, from_stack, cards)
+
+
+class NapoleonsShoulder(FortyThieves):
+    RowStack_Class = NapoleonsShoulder_RowStack
+
+    def createGame(self):
+        FortyThieves.createGame(self, rows=12)
+
+
 class CarreNapoleon(FortyThieves):
     RowStack_Class = StackWrapper(SS_RowStack, base_rank=KING)
 
@@ -1543,3 +1558,5 @@ registerGame(GameInfo(884, JacksInTheBox, "Jacks in the Box",
                       GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(895, Preference, "Preference",
                       GI.GT_FORTY_THIEVES, 1, 0, GI.SL_LUCK))
+registerGame(GameInfo(910, NapoleonsShoulder, "Napoleon's Shoulder",
+                      GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED))