From b7edf0175289a8f5245f42be1a8e6bfbfc1ac22f Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Thu, 8 Jun 2023 17:55:04 -0400
Subject: [PATCH] Added Four Rivers game.

---
 html-src/gen-html.py                 |  1 +
 html-src/rules/fourrivers.html       | 13 +++++++++++
 pysollib/gamedb.py                   |  3 ++-
 pysollib/games/mahjongg/shisensho.py | 33 ++++++++++++++++++++++++++--
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 html-src/rules/fourrivers.html

diff --git a/html-src/gen-html.py b/html-src/gen-html.py
index e6d05099..5ee1a5df 100755
--- a/html-src/gen-html.py
+++ b/html-src/gen-html.py
@@ -78,6 +78,7 @@ rules_files = [
     ('spider.html', 'PySol - Rules for Spider'),
     ('freecell.html', 'PySol - Rules for FreeCell'),
     ('lightsout.html', 'PySol - Rules for Lights Out'),
+    ('fourrivers.html', 'PySol - Rules for Four Rivers'),
     ]
 
 
diff --git a/html-src/rules/fourrivers.html b/html-src/rules/fourrivers.html
new file mode 100644
index 00000000..8abd1839
--- /dev/null
+++ b/html-src/rules/fourrivers.html
@@ -0,0 +1,13 @@
+<h1>Four Rivers</h1>
+<p>
+Four Rivers is a variation of <a href="shisensho.html">Shisen-Sho</a>.
+
+<h3>Object</h3>
+<p>
+The object of the game is to remove all tiles from the field.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="shisensho.html">Shisen-Sho</a>,
+but adjacent tiles cannot be removed together, unless they can be
+connected in another way.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 4a681f82..fb7b5715 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -559,7 +559,8 @@ class GI:
         ('fc-2.14', tuple(range(811, 827))),
         ('fc-2.15', tuple(range(827, 855)) + tuple(range(22400, 22407))),
         ('fc-2.20', tuple(range(855, 897))),
-        ('dev', tuple(range(897, 900)) + tuple(range(13160, 13163)) + (16682,))
+        ('dev', tuple(range(897, 900)) + tuple(range(11014, 11017)) +
+         tuple(range(13160, 13163)) + (16682,))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/mahjongg/shisensho.py b/pysollib/games/mahjongg/shisensho.py
index d637da60..21c472a3 100644
--- a/pysollib/games/mahjongg/shisensho.py
+++ b/pysollib/games/mahjongg/shisensho.py
@@ -93,6 +93,7 @@ class Shisen_Foundation(AbstractFoundationStack):
 
 
 class Shisen_RowStack(Mahjongg_RowStack):
+    allowAdjacent = True
 
     def basicIsBlocked(self):
         return 0
@@ -112,7 +113,9 @@ class Shisen_RowStack(Mahjongg_RowStack):
             a.append([5]*(rows+2))
 
         def can_move(x, y, nx, ny, direct, d, direct_chng_cnt):
-            if nx == x2 and ny == y2:
+            if (nx == x2 and ny == y2 and (self.allowAdjacent or
+                                           (abs(dx) > 1 and abs(dy) > 1)
+                                           or direct_chng_cnt > 0)):
                 return 1
             if nx < 0 or ny < 0 or nx > cols+1 or ny > rows+1:
                 return 0
@@ -502,6 +505,30 @@ class NotShisen_24x12(AbstractShisenGame):
     NCARDS = 288
 
 
+# ************************************************************************
+# * Four Rivers
+# ************************************************************************
+class FourRivers_RowStack(Shisen_RowStack):
+    allowAdjacent = False
+
+
+class FourRivers_14x6(AbstractShisenGame):
+    RowStack_Class = FourRivers_RowStack
+    L = (14, 6)
+    NCARDS = 84
+
+
+class FourRivers_18x8(AbstractShisenGame):
+    RowStack_Class = FourRivers_RowStack
+    L = (18, 8)
+
+
+class FourRivers_24x12(AbstractShisenGame):
+    RowStack_Class = FourRivers_RowStack
+    L = (24, 12)
+    NCARDS = 288
+
+
 # ************************************************************************
 # * register a Shisen-Sho type game
 # ************************************************************************
@@ -529,6 +556,8 @@ r(11006, Shisen_24x12_NoGravity, "Shisen-Sho (No Gravity) 24x12")
 r(11011, NotShisen_14x6, "Not Shisen-Sho 14x6", "notshisensho.html")
 r(11012, NotShisen_18x8, "Not Shisen-Sho 18x8", "notshisensho.html")
 r(11013, NotShisen_24x12, "Not Shisen-Sho 24x12", "notshisensho.html")
-
+r(11014, FourRivers_14x6, "Four Rivers 14x6", "fourrivers.html")
+r(11015, FourRivers_18x8, "Four Rivers 18x8", "fourrivers.html")
+r(11016, FourRivers_24x12, "Four Rivers 24x12", "fourrivers.html")
 
 del r