From 276f7f543e9e8dfce5be3a75dedee2b93648574b Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Sat, 20 Aug 2022 12:45:43 +1000
Subject: [PATCH 001/198] Add program strucutre

---
 56_Life_for_Two/csharp/LifeforTwo.csproj     |  8 ++++++
 56_Life_for_Two/csharp/Program.cs            |  1 +
 56_Life_for_Two/csharp/Resources/Resource.cs | 27 ++++++++++++++++++++
 56_Life_for_Two/csharp/Resources/Title.txt   |  5 ++++
 4 files changed, 41 insertions(+)
 create mode 100644 56_Life_for_Two/csharp/Program.cs
 create mode 100644 56_Life_for_Two/csharp/Resources/Resource.cs
 create mode 100644 56_Life_for_Two/csharp/Resources/Title.txt

diff --git a/56_Life_for_Two/csharp/LifeforTwo.csproj b/56_Life_for_Two/csharp/LifeforTwo.csproj
index d3fe4757..3870320c 100644
--- a/56_Life_for_Two/csharp/LifeforTwo.csproj
+++ b/56_Life_for_Two/csharp/LifeforTwo.csproj
@@ -6,4 +6,12 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources/*.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\00_Common\dotnet\Games.Common\Games.Common.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
new file mode 100644
index 00000000..8261ff82
--- /dev/null
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -0,0 +1 @@
+global using Games.Common.IO;
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Resources/Resource.cs b/56_Life_for_Two/csharp/Resources/Resource.cs
new file mode 100644
index 00000000..60a767bc
--- /dev/null
+++ b/56_Life_for_Two/csharp/Resources/Resource.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace LifeForTwo.Resources;
+
+internal static class Resource
+{
+    internal static class Streams
+    {
+        public static Stream Title => GetStream();
+    }
+
+    internal static class Formats
+    {
+    }
+
+    private static string GetString([CallerMemberName] string? name = null)
+    {
+        using var stream = GetStream(name);
+        using var reader = new StreamReader(stream);
+        return reader.ReadToEnd();
+    }
+
+    private static Stream GetStream([CallerMemberName] string? name = null) =>
+        Assembly.GetExecutingAssembly().GetManifestResourceStream($"{typeof(Resource).Namespace}.{name}.txt")
+            ?? throw new Exception($"Could not find embedded resource stream '{name}'.");
+}
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Resources/Title.txt b/56_Life_for_Two/csharp/Resources/Title.txt
new file mode 100644
index 00000000..b9ab3cc6
--- /dev/null
+++ b/56_Life_for_Two/csharp/Resources/Title.txt
@@ -0,0 +1,5 @@
+                                 Life2
+               Creative Computing  Morristown, New Jersey
+
+
+

From fafddfbf1a6bbe9fee55d887aae266f11cbf56df Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Sat, 20 Aug 2022 17:58:35 +1000
Subject: [PATCH 002/198] Transliterate BASIC code

---
 56_Life_for_Two/csharp/Program.cs            | 150 ++++++++++++++++++-
 56_Life_for_Two/csharp/Resources/Resource.cs |   2 +-
 56_Life_for_Two/csharp/Resources/Title.txt   |   1 +
 3 files changed, 151 insertions(+), 2 deletions(-)

diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index 8261ff82..6f0a10ce 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -1 +1,149 @@
-global using Games.Common.IO;
\ No newline at end of file
+global using Games.Common.IO;
+global using static LifeforTwo.Resources.Resource;
+
+var io = new ConsoleIO();
+
+io.Write(Streams.Title);
+
+var N = new int[7, 7];
+var K = new[] { 3, 102, 103, 120, 130, 121, 112, 111, 12, 21, 30, 1020, 1030, 1011, 1021, 1003, 1002, 1012 };
+var A = new[] { -1, 0, 1, 0, 0, -1, 0, 1, -1, -1, 1, -1, -1, 1, 1, 1 };
+var X = new int[3];
+var Y = new int[3];
+int M2, M3;
+
+void L50()
+{
+    for (var j = 1; j <= 5; j++)
+    {
+        for (var k = 1; k <= 5; k++)
+        {
+            if (N[j, k] > 99)
+            {
+                L200(j, k);
+            }
+        }
+    }
+    L90();
+}
+
+void L90()
+{
+    M2 = M3 = 0;
+    for (var j = 0; j <= 6; j++)
+    {
+        io.WriteLine();
+        for (var k = 0; k <= 6; k++)
+        {
+            if (j == 0 || j == 6)
+            {
+                if (k == 6) { io.Write(" 0 "); break; }
+                io.Write($" {k} ");
+            }
+            else if (k == 0 || k == 6)
+            {
+                if (j == 6) { io.WriteLine(" 0 "); return; }
+                io.Write($" {j} ");
+            }
+            else
+            {
+                L300(j, k);
+            }
+        }
+    }
+    return;
+
+}
+void L200(int j, int k)
+{
+    int B = N[j, k] > 999 ? 10 : 1;
+    for (var O1 = 0; O1 < 15; O1 += 2)
+    {
+        N[j + A[O1], k + A[O1 + 1]] = N[j + A[O1], k + A[O1 + 1]] + B;
+    }
+}
+void L300(int j, int k)
+{
+    if (N[j, k] >= 3)
+    {
+        for (var O1 = 0; O1 < 18; O1++)
+        {
+            if (N[j, k] == K[O1])
+            {
+                if (O1 < 9)
+                {
+                    N[j, k] = 100; M2++; io.Write(" * ");
+                    return;
+                }
+                else
+                {
+                    N[j, k] = 1000; M3++; io.Write(" # ");
+                    return;
+                }
+            }
+        }
+    }
+
+    N[j, k] = 0; io.Write("   ");
+}
+
+for (var j = 1; j <= 5; j++)
+{
+    for (var k = 1; k <= 5; k++)
+    {
+        N[j, k] = 0;
+    }
+}
+for (var B = 1; B <= 2; B++)
+{
+    var P1 = B == 2 ? 30 : 3;
+    io.WriteLine(); io.WriteLine($"PLAYER {B}  - 3 LIVE PIECES.");
+    for (var K1 = 1; K1 <= 3; K1++)
+    {
+        L700(B);
+        N[X[B], Y[B]] = P1;
+    }
+}
+L90();
+while (true)
+{
+    io.WriteLine();
+    L50();
+
+    if (M2 == 0 && M3 == 0) { io.WriteLine(); io.WriteLine("A DRAW"); return; }
+    else if (M3 == 0) { var B = 1; io.WriteLine(); io.WriteLine($"PLAYER {B} IS THE WINNER"); return; }
+    else if (M2 == 0) { var B = 2; io.WriteLine($"PLAYER {B} IS THE WINNER"); return; }
+
+    for (var B = 1; B <= 2; B++)
+    {
+        io.WriteLine();
+        io.WriteLine();
+        io.WriteLine($"PLAYER {B}");
+        B = L700(B);
+        if (B == 2) { N[X[1], Y[1]] = 100; N[X[2], Y[2]] = 1000; }
+    }
+}
+
+int L700(int B)
+{
+    while (true)
+    {
+        io.WriteLine("X,Y");
+        var (y, x) = io.Read2Numbers("&&&&&&\r");
+        (Y[B], X[B]) = ((int)y, (int)x);
+        if (X[B] <= 5 && X[B] > 0 && Y[B] <= 5 && Y[B] > 0 && N[X[B], Y[B]] == 0)
+        {
+            break;
+        }
+        io.WriteLine("Illegal Coords. Retype");
+    }
+
+    if (B == 2 && X[1] == X[2] && Y[1] == Y[2])
+    {
+        io.WriteLine("SAME COORD.  SET TO 0");
+        N[X[B] + 1, Y[B] + 1] = 0;
+        B = 99;
+    }
+
+    return B;
+}
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Resources/Resource.cs b/56_Life_for_Two/csharp/Resources/Resource.cs
index 60a767bc..e076044e 100644
--- a/56_Life_for_Two/csharp/Resources/Resource.cs
+++ b/56_Life_for_Two/csharp/Resources/Resource.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-namespace LifeForTwo.Resources;
+namespace LifeforTwo.Resources;
 
 internal static class Resource
 {
diff --git a/56_Life_for_Two/csharp/Resources/Title.txt b/56_Life_for_Two/csharp/Resources/Title.txt
index b9ab3cc6..0e3404a7 100644
--- a/56_Life_for_Two/csharp/Resources/Title.txt
+++ b/56_Life_for_Two/csharp/Resources/Title.txt
@@ -3,3 +3,4 @@
 
 
 
+          U.B. Life Game

From 48eda0785d7a2a88ab3acb910be2cff2ed7be303 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Sat, 20 Aug 2022 21:33:25 +1000
Subject: [PATCH 003/198] Clean up logic, names and strings

---
 56_Life_for_Two/csharp/Program.cs             | 132 +++++++++---------
 56_Life_for_Two/csharp/Resources/Draw.txt     |   2 +
 .../csharp/Resources/IllegalCoords.txt        |   1 +
 .../csharp/Resources/InitialPieces.txt        |   2 +
 56_Life_for_Two/csharp/Resources/Player.txt   |   3 +
 56_Life_for_Two/csharp/Resources/Resource.cs  |   6 +
 .../csharp/Resources/SameCoords.txt           |   1 +
 56_Life_for_Two/csharp/Resources/Winner.txt   |   2 +
 8 files changed, 82 insertions(+), 67 deletions(-)
 create mode 100644 56_Life_for_Two/csharp/Resources/Draw.txt
 create mode 100644 56_Life_for_Two/csharp/Resources/IllegalCoords.txt
 create mode 100644 56_Life_for_Two/csharp/Resources/InitialPieces.txt
 create mode 100644 56_Life_for_Two/csharp/Resources/Player.txt
 create mode 100644 56_Life_for_Two/csharp/Resources/SameCoords.txt
 create mode 100644 56_Life_for_Two/csharp/Resources/Winner.txt

diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index 6f0a10ce..f85123bd 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -5,145 +5,143 @@ var io = new ConsoleIO();
 
 io.Write(Streams.Title);
 
-var N = new int[7, 7];
-var K = new[] { 3, 102, 103, 120, 130, 121, 112, 111, 12, 21, 30, 1020, 1030, 1011, 1021, 1003, 1002, 1012 };
-var A = new[] { -1, 0, 1, 0, 0, -1, 0, 1, -1, -1, 1, -1, -1, 1, 1, 1 };
+var _cells = new int[7, 7];
+var _willLive = new[] { 3, 102, 103, 120, 130, 121, 112, 111, 12, 21, 30, 1020, 1030, 1011, 1021, 1003, 1002, 1012 };
+var _offsets = new[] { -1, 0, 1, 0, 0, -1, 0, 1, -1, -1, 1, -1, -1, 1, 1, 1 };
 var X = new int[3];
 var Y = new int[3];
-int M2, M3;
+int _player1Count, _player2Count;
 
-void L50()
+void CalculateNeighbors()
 {
     for (var j = 1; j <= 5; j++)
     {
         for (var k = 1; k <= 5; k++)
         {
-            if (N[j, k] > 99)
+            if (_cells[j, k] > 99)
             {
-                L200(j, k);
+                int B = _cells[j, k] > 999 ? 10 : 1;
+                for (var o = 0; o < 15; o += 2)
+                {
+                    _cells[j + _offsets[o], k + _offsets[o + 1]] += B;
+                }
             }
         }
     }
-    L90();
 }
 
-void L90()
+void CalculateAndDisplayNext()
 {
-    M2 = M3 = 0;
+    _player1Count = _player2Count = 0;
     for (var j = 0; j <= 6; j++)
     {
         io.WriteLine();
         for (var k = 0; k <= 6; k++)
         {
-            if (j == 0 || j == 6)
+            if (j % 6 == 0)
             {
-                if (k == 6) { io.Write(" 0 "); break; }
-                io.Write($" {k} ");
+                io.Write($" {k % 6} ");
             }
-            else if (k == 0 || k == 6)
+            else if (k % 6 == 0)
             {
-                if (j == 6) { io.WriteLine(" 0 "); return; }
-                io.Write($" {j} ");
+                io.Write($" {j % 6} ");
             }
             else
             {
-                L300(j, k);
+                CalculateAndDisplayCell(j, k);
             }
         }
     }
     return;
+}
 
-}
-void L200(int j, int k)
+void CalculateAndDisplayCell(int j, int k)
 {
-    int B = N[j, k] > 999 ? 10 : 1;
-    for (var O1 = 0; O1 < 15; O1 += 2)
-    {
-        N[j + A[O1], k + A[O1 + 1]] = N[j + A[O1], k + A[O1 + 1]] + B;
-    }
-}
-void L300(int j, int k)
-{
-    if (N[j, k] >= 3)
+    if (_cells[j, k] >= 3)
     {
         for (var O1 = 0; O1 < 18; O1++)
         {
-            if (N[j, k] == K[O1])
+            if (_cells[j, k] == _willLive[O1])
             {
                 if (O1 < 9)
                 {
-                    N[j, k] = 100; M2++; io.Write(" * ");
-                    return;
+                    _cells[j, k] = 100; _player1Count++; io.Write(" * ");
                 }
                 else
                 {
-                    N[j, k] = 1000; M3++; io.Write(" # ");
-                    return;
+                    _cells[j, k] = 1000; _player2Count++; io.Write(" # ");
                 }
+                return;
             }
         }
     }
 
-    N[j, k] = 0; io.Write("   ");
+    _cells[j, k] = 0;
+    io.Write("   ");
 }
 
-for (var j = 1; j <= 5; j++)
+for (var _player = 1; _player <= 2; _player++)
 {
-    for (var k = 1; k <= 5; k++)
+    var P1 = _player == 2 ? 30 : 3;
+    io.WriteLine(Formats.InitialPieces, _player);
+    for (var i = 1; i <= 3; i++)
     {
-        N[j, k] = 0;
+        ReadCoordinates(_player);
+        _cells[X[_player], Y[_player]] = P1;
     }
 }
-for (var B = 1; B <= 2; B++)
-{
-    var P1 = B == 2 ? 30 : 3;
-    io.WriteLine(); io.WriteLine($"PLAYER {B}  - 3 LIVE PIECES.");
-    for (var K1 = 1; K1 <= 3; K1++)
-    {
-        L700(B);
-        N[X[B], Y[B]] = P1;
-    }
-}
-L90();
+
+CalculateAndDisplayNext();
+
 while (true)
 {
     io.WriteLine();
-    L50();
+    CalculateNeighbors();
+    CalculateAndDisplayNext();
 
-    if (M2 == 0 && M3 == 0) { io.WriteLine(); io.WriteLine("A DRAW"); return; }
-    else if (M3 == 0) { var B = 1; io.WriteLine(); io.WriteLine($"PLAYER {B} IS THE WINNER"); return; }
-    else if (M2 == 0) { var B = 2; io.WriteLine($"PLAYER {B} IS THE WINNER"); return; }
+    if (_player1Count == 0 || _player2Count == 0) { break; }
 
-    for (var B = 1; B <= 2; B++)
+    for (var _player = 1; _player <= 2; _player++)
     {
-        io.WriteLine();
-        io.WriteLine();
-        io.WriteLine($"PLAYER {B}");
-        B = L700(B);
-        if (B == 2) { N[X[1], Y[1]] = 100; N[X[2], Y[2]] = 1000; }
+        io.WriteLine(Formats.Player, _player);
+        if (ReadCoordinates(_player)) 
+        { 
+            _cells[X[1], Y[1]] = 100; 
+            _cells[X[2], Y[2]] = 1000; 
+        }
     }
 }
 
-int L700(int B)
+if (_player1Count == 0 && _player2Count == 0)
+{
+    io.Write(Streams.Draw);
+}
+else
+{
+    io.WriteLine(Formats.Winner, _player2Count == 0 ? 1 : 2);
+}
+
+bool ReadCoordinates(int _player)
 {
     while (true)
     {
         io.WriteLine("X,Y");
         var (y, x) = io.Read2Numbers("&&&&&&\r");
-        (Y[B], X[B]) = ((int)y, (int)x);
-        if (X[B] <= 5 && X[B] > 0 && Y[B] <= 5 && Y[B] > 0 && N[X[B], Y[B]] == 0)
+        (Y[_player], X[_player]) = ((int)y, (int)x);
+        if (X[_player] <= 5 && X[_player] > 0 && Y[_player] <= 5 && Y[_player] > 0 && _cells[X[_player], Y[_player]] == 0)
         {
             break;
         }
-        io.WriteLine("Illegal Coords. Retype");
+        io.Write(Streams.IllegalCoords);
     }
 
-    if (B == 2 && X[1] == X[2] && Y[1] == Y[2])
+    if (_player == 2 && X[1] == X[2] && Y[1] == Y[2])
     {
-        io.WriteLine("SAME COORD.  SET TO 0");
-        N[X[B] + 1, Y[B] + 1] = 0;
-        B = 99;
+        io.Write(Streams.SameCoords);
+        // This is a bug existing in the original code. The line should be N[X[B], Y[B]] = 0;
+        _cells[X[_player] + 1, Y[_player] + 1] = 0;
+        return false;
     }
 
-    return B;
+    return _player == 2;
 }
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Resources/Draw.txt b/56_Life_for_Two/csharp/Resources/Draw.txt
new file mode 100644
index 00000000..a4549a74
--- /dev/null
+++ b/56_Life_for_Two/csharp/Resources/Draw.txt
@@ -0,0 +1,2 @@
+
+A draw
diff --git a/56_Life_for_Two/csharp/Resources/IllegalCoords.txt b/56_Life_for_Two/csharp/Resources/IllegalCoords.txt
new file mode 100644
index 00000000..ff01dfcb
--- /dev/null
+++ b/56_Life_for_Two/csharp/Resources/IllegalCoords.txt
@@ -0,0 +1 @@
+Illegal coords. Retype
diff --git a/56_Life_for_Two/csharp/Resources/InitialPieces.txt b/56_Life_for_Two/csharp/Resources/InitialPieces.txt
new file mode 100644
index 00000000..abbadf16
--- /dev/null
+++ b/56_Life_for_Two/csharp/Resources/InitialPieces.txt
@@ -0,0 +1,2 @@
+
+Player {0}  - 3 live pieces
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Resources/Player.txt b/56_Life_for_Two/csharp/Resources/Player.txt
new file mode 100644
index 00000000..73fbf366
--- /dev/null
+++ b/56_Life_for_Two/csharp/Resources/Player.txt
@@ -0,0 +1,3 @@
+
+
+Player {0}
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Resources/Resource.cs b/56_Life_for_Two/csharp/Resources/Resource.cs
index e076044e..51e64c69 100644
--- a/56_Life_for_Two/csharp/Resources/Resource.cs
+++ b/56_Life_for_Two/csharp/Resources/Resource.cs
@@ -8,10 +8,16 @@ internal static class Resource
     internal static class Streams
     {
         public static Stream Title => GetStream();
+        public static Stream Draw => GetStream();
+        public static Stream IllegalCoords => GetStream();
+        public static Stream SameCoords => GetStream();
     }
 
     internal static class Formats
     {
+        public static string InitialPieces => GetString();
+        public static string Player => GetString();
+        public static string Winner => GetString();
     }
 
     private static string GetString([CallerMemberName] string? name = null)
diff --git a/56_Life_for_Two/csharp/Resources/SameCoords.txt b/56_Life_for_Two/csharp/Resources/SameCoords.txt
new file mode 100644
index 00000000..8af7b066
--- /dev/null
+++ b/56_Life_for_Two/csharp/Resources/SameCoords.txt
@@ -0,0 +1 @@
+Same coord.  Set to 0
diff --git a/56_Life_for_Two/csharp/Resources/Winner.txt b/56_Life_for_Two/csharp/Resources/Winner.txt
new file mode 100644
index 00000000..e35c5440
--- /dev/null
+++ b/56_Life_for_Two/csharp/Resources/Winner.txt
@@ -0,0 +1,2 @@
+
+Player {0} is the winner
\ No newline at end of file

From 93101cbad2b0c0f1cb40d219625160641d397c0f Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Sun, 21 Aug 2022 22:18:09 +1000
Subject: [PATCH 004/198] Add Board and Coordinates

---
 56_Life_for_Two/csharp/Board.cs       | 18 ++++++++
 56_Life_for_Two/csharp/Coordinates.cs | 36 ++++++++++++++++
 56_Life_for_Two/csharp/Program.cs     | 61 +++++++++++++--------------
 3 files changed, 84 insertions(+), 31 deletions(-)
 create mode 100644 56_Life_for_Two/csharp/Board.cs
 create mode 100644 56_Life_for_Two/csharp/Coordinates.cs

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
new file mode 100644
index 00000000..4618f881
--- /dev/null
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -0,0 +1,18 @@
+namespace LifeforTwo;
+
+internal class Board
+{
+    private readonly int[,] _cells = new int[7,7];
+
+    public int this[Coordinates coordinates]
+    {
+        get => _cells[coordinates.X, coordinates.Y];
+        set => _cells[coordinates.X, coordinates.Y] = value;
+    }
+
+    public int this[int x, int y]
+    {
+        get => _cells[x, y];
+        set => _cells[x, y] = value;
+    }
+}
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Coordinates.cs b/56_Life_for_Two/csharp/Coordinates.cs
new file mode 100644
index 00000000..b3d69960
--- /dev/null
+++ b/56_Life_for_Two/csharp/Coordinates.cs
@@ -0,0 +1,36 @@
+namespace LifeforTwo;
+
+internal class Coordinates
+{
+    private Coordinates (int x, int y)
+    {
+        X = x;
+        Y = y;
+    }
+
+    public int X { get; }
+    public int Y { get; }
+
+    public static bool TryCreate((float X, float Y) values, out Coordinates coordinates)
+    {
+        if (values.X <= 0 || values.X > 5 || values.Y <= 0 || values.Y > 5)
+        {
+            coordinates = new(0, 0);
+            return false;
+        }
+
+        coordinates = new((int)values.X, (int)values.Y);
+        return true;
+    }
+
+    public static Coordinates operator +(Coordinates coordinates, int value) =>
+        new (coordinates.X + value, coordinates.Y + value);
+
+    public static bool operator ==(Coordinates a, Coordinates b) => a.X == b.X && a.Y == b.Y;
+    
+    public static bool operator !=(Coordinates a, Coordinates b) => !(a == b);
+
+    public override bool Equals(object? obj) => obj is Coordinates other && other == this;
+
+    public override int GetHashCode() => HashCode.Combine(X, Y);
+}
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index f85123bd..dec165db 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -1,15 +1,15 @@
 global using Games.Common.IO;
 global using static LifeforTwo.Resources.Resource;
+global using LifeforTwo;
 
 var io = new ConsoleIO();
 
 io.Write(Streams.Title);
 
-var _cells = new int[7, 7];
+var _board = new Board();
 var _willLive = new[] { 3, 102, 103, 120, 130, 121, 112, 111, 12, 21, 30, 1020, 1030, 1011, 1021, 1003, 1002, 1012 };
 var _offsets = new[] { -1, 0, 1, 0, 0, -1, 0, 1, -1, -1, 1, -1, -1, 1, 1, 1 };
-var X = new int[3];
-var Y = new int[3];
+var _coordinates = new Coordinates[3];
 int _player1Count, _player2Count;
 
 void CalculateNeighbors()
@@ -18,12 +18,12 @@ void CalculateNeighbors()
     {
         for (var k = 1; k <= 5; k++)
         {
-            if (_cells[j, k] > 99)
+            if (_board[j, k] > 99)
             {
-                int B = _cells[j, k] > 999 ? 10 : 1;
+                int B = _board[j, k] > 999 ? 10 : 1;
                 for (var o = 0; o < 15; o += 2)
                 {
-                    _cells[j + _offsets[o], k + _offsets[o + 1]] += B;
+                    _board[j + _offsets[o], k + _offsets[o + 1]] += B;
                 }
             }
         }
@@ -33,50 +33,50 @@ void CalculateNeighbors()
 void CalculateAndDisplayNext()
 {
     _player1Count = _player2Count = 0;
-    for (var j = 0; j <= 6; j++)
+    for (var y = 0; y <= 6; y++)
     {
         io.WriteLine();
-        for (var k = 0; k <= 6; k++)
+        for (var x = 0; x <= 6; x++)
         {
-            if (j % 6 == 0)
+            if (y % 6 == 0)
             {
-                io.Write($" {k % 6} ");
+                io.Write($" {x % 6} ");
             }
-            else if (k % 6 == 0)
+            else if (x % 6 == 0)
             {
-                io.Write($" {j % 6} ");
+                io.Write($" {y % 6} ");
             }
             else
             {
-                CalculateAndDisplayCell(j, k);
+                CalculateAndDisplayCell(y, x);
             }
         }
     }
     return;
 }
 
-void CalculateAndDisplayCell(int j, int k)
+void CalculateAndDisplayCell(int y, int x)
 {
-    if (_cells[j, k] >= 3)
+    if (_board[x, y] >= 3)
     {
-        for (var O1 = 0; O1 < 18; O1++)
+        for (var o = 0; o < 18; o++)
         {
-            if (_cells[j, k] == _willLive[O1])
+            if (_board[x, y] == _willLive[o])
             {
-                if (O1 < 9)
+                if (o < 9)
                 {
-                    _cells[j, k] = 100; _player1Count++; io.Write(" * ");
+                    _board[x, y] = 100; _player1Count++; io.Write(" * ");
                 }
                 else
                 {
-                    _cells[j, k] = 1000; _player2Count++; io.Write(" # ");
+                    _board[x, y] = 1000; _player2Count++; io.Write(" # ");
                 }
                 return;
             }
         }
     }
 
-    _cells[j, k] = 0;
+    _board[x, y] = 0;
     io.Write("   ");
 }
 
@@ -87,7 +87,7 @@ for (var _player = 1; _player <= 2; _player++)
     for (var i = 1; i <= 3; i++)
     {
         ReadCoordinates(_player);
-        _cells[X[_player], Y[_player]] = P1;
+        _board[_coordinates[_player]] = P1;
     }
 }
 
@@ -106,8 +106,8 @@ while (true)
         io.WriteLine(Formats.Player, _player);
         if (ReadCoordinates(_player)) 
         { 
-            _cells[X[1], Y[1]] = 100; 
-            _cells[X[2], Y[2]] = 1000; 
+            _board[_coordinates[1]] = 100; 
+            _board[_coordinates[2]] = 1000; 
         }
     }
 }
@@ -126,22 +126,21 @@ bool ReadCoordinates(int _player)
     while (true)
     {
         io.WriteLine("X,Y");
-        var (y, x) = io.Read2Numbers("&&&&&&\r");
-        (Y[_player], X[_player]) = ((int)y, (int)x);
-        if (X[_player] <= 5 && X[_player] > 0 && Y[_player] <= 5 && Y[_player] > 0 && _cells[X[_player], Y[_player]] == 0)
+        var values = io.Read2Numbers("&&&&&&\r");
+        if (Coordinates.TryCreate(values, out _coordinates[_player]) && _board[_coordinates[_player]] == 0)
         {
             break;
         }
         io.Write(Streams.IllegalCoords);
     }
 
-    if (_player == 2 && X[1] == X[2] && Y[1] == Y[2])
+    if (_player == 2 && _coordinates[1] == _coordinates[2])
     {
         io.Write(Streams.SameCoords);
-        // This is a bug existing in the original code. The line should be N[X[B], Y[B]] = 0;
-        _cells[X[_player] + 1, Y[_player] + 1] = 0;
+        // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
+        _board[_coordinates[_player] + 1] = 0;
         return false;
     }
 
     return _player == 2;
-}
\ No newline at end of file
+}

From 99fb001f6c6a4c17d58c4c924c2db81a5cac0263 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Thu, 25 Aug 2022 09:25:27 +1000
Subject: [PATCH 005/198] Add Coordinates.GetNeighbors

---
 56_Life_for_Two/csharp/Coordinates.cs | 29 +++++++++++----------------
 56_Life_for_Two/csharp/Program.cs     | 18 ++++++++---------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/56_Life_for_Two/csharp/Coordinates.cs b/56_Life_for_Two/csharp/Coordinates.cs
index b3d69960..09bd3dd4 100644
--- a/56_Life_for_Two/csharp/Coordinates.cs
+++ b/56_Life_for_Two/csharp/Coordinates.cs
@@ -1,16 +1,7 @@
 namespace LifeforTwo;
 
-internal class Coordinates
+internal record Coordinates (int X, int Y)
 {
-    private Coordinates (int x, int y)
-    {
-        X = x;
-        Y = y;
-    }
-
-    public int X { get; }
-    public int Y { get; }
-
     public static bool TryCreate((float X, float Y) values, out Coordinates coordinates)
     {
         if (values.X <= 0 || values.X > 5 || values.Y <= 0 || values.Y > 5)
@@ -26,11 +17,15 @@ internal class Coordinates
     public static Coordinates operator +(Coordinates coordinates, int value) =>
         new (coordinates.X + value, coordinates.Y + value);
 
-    public static bool operator ==(Coordinates a, Coordinates b) => a.X == b.X && a.Y == b.Y;
-    
-    public static bool operator !=(Coordinates a, Coordinates b) => !(a == b);
-
-    public override bool Equals(object? obj) => obj is Coordinates other && other == this;
-
-    public override int GetHashCode() => HashCode.Combine(X, Y);
+    public IEnumerable<Coordinates> GetNeighbors()
+    {
+        yield return new(X - 1, Y);
+        yield return new(X + 1, Y);
+        yield return new(X, Y - 1);
+        yield return new(X, Y + 1);
+        yield return new(X - 1, Y - 1);
+        yield return new(X + 1, Y - 1);
+        yield return new(X - 1, Y + 1);
+        yield return new(X + 1, Y + 1);
+    }
 }
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index dec165db..6208be04 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -8,22 +8,22 @@ io.Write(Streams.Title);
 
 var _board = new Board();
 var _willLive = new[] { 3, 102, 103, 120, 130, 121, 112, 111, 12, 21, 30, 1020, 1030, 1011, 1021, 1003, 1002, 1012 };
-var _offsets = new[] { -1, 0, 1, 0, 0, -1, 0, 1, -1, -1, 1, -1, -1, 1, 1, 1 };
 var _coordinates = new Coordinates[3];
 int _player1Count, _player2Count;
 
 void CalculateNeighbors()
 {
-    for (var j = 1; j <= 5; j++)
+    for (var x = 1; x <= 5; x++)
     {
-        for (var k = 1; k <= 5; k++)
+        for (var y = 1; y <= 5; y++)
         {
-            if (_board[j, k] > 99)
+            var coordinates = new Coordinates(x, y);
+            if (_board[coordinates] > 99)
             {
-                int B = _board[j, k] > 999 ? 10 : 1;
-                for (var o = 0; o < 15; o += 2)
+                int B = _board[coordinates] > 999 ? 10 : 1;
+                foreach (var neighbor in coordinates.GetNeighbors())
                 {
-                    _board[j + _offsets[o], k + _offsets[o + 1]] += B;
+                    _board[neighbor] += B;
                 }
             }
         }
@@ -48,14 +48,14 @@ void CalculateAndDisplayNext()
             }
             else
             {
-                CalculateAndDisplayCell(y, x);
+                CalculateAndDisplayCell(x, y);
             }
         }
     }
     return;
 }
 
-void CalculateAndDisplayCell(int y, int x)
+void CalculateAndDisplayCell(int x, int y)
 {
     if (_board[x, y] >= 3)
     {

From b156755ee079f95b605183db2551c48ac2616047 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Fri, 2 Sep 2022 07:54:18 +1000
Subject: [PATCH 006/198] Move neighbour calculation

---
 56_Life_for_Two/csharp/Board.cs   | 23 +++++++++++++++++++++++
 56_Life_for_Two/csharp/Program.cs | 21 +--------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index 4618f881..1469749b 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -2,6 +2,10 @@ namespace LifeforTwo;
 
 internal class Board
 {
+    private const int Player1Piece = 100;
+    private const int Player2Piece = 1000;
+    private const int Player1Neighbour = 1;
+    private const int Player2Neighbour = 10;
     private readonly int[,] _cells = new int[7,7];
 
     public int this[Coordinates coordinates]
@@ -15,4 +19,23 @@ internal class Board
         get => _cells[x, y];
         set => _cells[x, y] = value;
     }
+
+    public void CalculateNeighbours()
+    {
+        for (var x = 1; x <= 5; x++)
+        {
+            for (var y = 1; y <= 5; y++)
+            {
+                var coordinates = new Coordinates(x, y);
+                if (this[coordinates] >= Player1Piece)
+                {
+                    int _playerPiece = this[coordinates] > Player2Piece ? Player2Neighbour : Player1Neighbour;
+                    foreach (var neighbour in coordinates.GetNeighbors())
+                    {
+                        this[neighbour] += _playerPiece;
+                    }
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index 6208be04..73d3aa85 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -11,25 +11,6 @@ var _willLive = new[] { 3, 102, 103, 120, 130, 121, 112, 111, 12, 21, 30, 1020,
 var _coordinates = new Coordinates[3];
 int _player1Count, _player2Count;
 
-void CalculateNeighbors()
-{
-    for (var x = 1; x <= 5; x++)
-    {
-        for (var y = 1; y <= 5; y++)
-        {
-            var coordinates = new Coordinates(x, y);
-            if (_board[coordinates] > 99)
-            {
-                int B = _board[coordinates] > 999 ? 10 : 1;
-                foreach (var neighbor in coordinates.GetNeighbors())
-                {
-                    _board[neighbor] += B;
-                }
-            }
-        }
-    }
-}
-
 void CalculateAndDisplayNext()
 {
     _player1Count = _player2Count = 0;
@@ -96,7 +77,7 @@ CalculateAndDisplayNext();
 while (true)
 {
     io.WriteLine();
-    CalculateNeighbors();
+    _board.CalculateNeighbours();
     CalculateAndDisplayNext();
 
     if (_player1Count == 0 || _player2Count == 0) { break; }

From 28736b9dbeb72559d3b95663c9e034beecdb92e0 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Fri, 2 Sep 2022 08:40:46 +1000
Subject: [PATCH 007/198] Make cell values binary

---
 56_Life_for_Two/csharp/Board.cs   | 12 +++++-------
 56_Life_for_Two/csharp/Program.cs | 13 +++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index 1469749b..dbe7ece9 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -2,10 +2,8 @@ namespace LifeforTwo;
 
 internal class Board
 {
-    private const int Player1Piece = 100;
-    private const int Player2Piece = 1000;
-    private const int Player1Neighbour = 1;
-    private const int Player2Neighbour = 10;
+    private const int PieceMask = 0x1100;
+    private const int NeighbourValueOffset = 8;
     private readonly int[,] _cells = new int[7,7];
 
     public int this[Coordinates coordinates]
@@ -27,12 +25,12 @@ internal class Board
             for (var y = 1; y <= 5; y++)
             {
                 var coordinates = new Coordinates(x, y);
-                if (this[coordinates] >= Player1Piece)
+                var neighbourValue = (this[coordinates] & PieceMask) >> NeighbourValueOffset;
+                if (neighbourValue > 0)
                 {
-                    int _playerPiece = this[coordinates] > Player2Piece ? Player2Neighbour : Player1Neighbour;
                     foreach (var neighbour in coordinates.GetNeighbors())
                     {
-                        this[neighbour] += _playerPiece;
+                        this[neighbour] += neighbourValue;
                     }
                 }
             }
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index 73d3aa85..e63db901 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -7,7 +7,8 @@ var io = new ConsoleIO();
 io.Write(Streams.Title);
 
 var _board = new Board();
-var _willLive = new[] { 3, 102, 103, 120, 130, 121, 112, 111, 12, 21, 30, 1020, 1030, 1011, 1021, 1003, 1002, 1012 };
+var _willLive = new[] { 0x0003, 0x0102, 0x0103, 0x0120, 0x0130, 0x0121, 0x0112, 0x0111, 0x0012, 
+                        0x0021, 0x0030, 0x1020, 0x1030, 0x1011, 0x1021, 0x1003, 0x1002, 0x1012 };
 var _coordinates = new Coordinates[3];
 int _player1Count, _player2Count;
 
@@ -46,11 +47,11 @@ void CalculateAndDisplayCell(int x, int y)
             {
                 if (o < 9)
                 {
-                    _board[x, y] = 100; _player1Count++; io.Write(" * ");
+                    _board[x, y] = 0x0100; _player1Count++; io.Write(" * ");
                 }
                 else
                 {
-                    _board[x, y] = 1000; _player2Count++; io.Write(" # ");
+                    _board[x, y] = 0x1000; _player2Count++; io.Write(" # ");
                 }
                 return;
             }
@@ -63,7 +64,7 @@ void CalculateAndDisplayCell(int x, int y)
 
 for (var _player = 1; _player <= 2; _player++)
 {
-    var P1 = _player == 2 ? 30 : 3;
+    var P1 = _player == 2 ? 0x30 : 0x03;
     io.WriteLine(Formats.InitialPieces, _player);
     for (var i = 1; i <= 3; i++)
     {
@@ -87,8 +88,8 @@ while (true)
         io.WriteLine(Formats.Player, _player);
         if (ReadCoordinates(_player)) 
         { 
-            _board[_coordinates[1]] = 100; 
-            _board[_coordinates[2]] = 1000; 
+            _board[_coordinates[1]] = 0x0100; 
+            _board[_coordinates[2]] = 0x1000; 
         }
     }
 }

From 2ccbdcc98d02ad0ef52e5440c9c49b283d42c931 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Wed, 7 Sep 2022 20:41:54 +1000
Subject: [PATCH 008/198] Move display to Board

---
 56_Life_for_Two/csharp/Board.cs   | 28 +++++++++++++++++++++++++-
 56_Life_for_Two/csharp/Program.cs | 33 +++++++++++--------------------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index dbe7ece9..7c5d53c5 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -2,7 +2,10 @@ namespace LifeforTwo;
 
 internal class Board
 {
-    private const int PieceMask = 0x1100;
+    private const int Empty = 0x0000;
+    private const int Player1 = 0x0100;
+    private const int Player2 = 0x1000;
+    private const int PieceMask = Player1 | Player2;
     private const int NeighbourValueOffset = 8;
     private readonly int[,] _cells = new int[7,7];
 
@@ -36,4 +39,27 @@ internal class Board
             }
         }
     }
+
+    public void Display(IReadWrite io)
+    {
+        for (var y = 0; y <= 6; y++)
+        {
+            io.WriteLine();
+            for (var x = 0; x <= 6; x++)
+            {
+                io.Write(GetDisplay(x, y));
+            }
+        }
+    }
+
+    private string GetDisplay(int x, int y) =>
+        (x, y, this[x, y]) switch
+        {
+            (0 or 6, _, _) => $" {y % 6} ",
+            (_, 0 or 6, _) => $" {x % 6} ",
+            (_, _, Empty) => "   ",
+            (_, _, Player1) => " * ",
+            (_, _, Player2) => " # ",
+            _ => throw new InvalidOperationException($"Unexpected cell value at ({x}, {y}): {this[x, y]}")
+        };
 }
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index e63db901..1754cdc5 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -12,32 +12,20 @@ var _willLive = new[] { 0x0003, 0x0102, 0x0103, 0x0120, 0x0130, 0x0121, 0x0112,
 var _coordinates = new Coordinates[3];
 int _player1Count, _player2Count;
 
-void CalculateAndDisplayNext()
+void CalculateNext()
 {
     _player1Count = _player2Count = 0;
-    for (var y = 0; y <= 6; y++)
+    for (var y = 1; y <= 5; y++)
     {
-        io.WriteLine();
-        for (var x = 0; x <= 6; x++)
+        for (var x = 1; x <= 5; x++)
         {
-            if (y % 6 == 0)
-            {
-                io.Write($" {x % 6} ");
-            }
-            else if (x % 6 == 0)
-            {
-                io.Write($" {y % 6} ");
-            }
-            else
-            {
-                CalculateAndDisplayCell(x, y);
-            }
+            CalculateNextCell(x, y);
         }
     }
     return;
 }
 
-void CalculateAndDisplayCell(int x, int y)
+void CalculateNextCell(int x, int y)
 {
     if (_board[x, y] >= 3)
     {
@@ -47,11 +35,11 @@ void CalculateAndDisplayCell(int x, int y)
             {
                 if (o < 9)
                 {
-                    _board[x, y] = 0x0100; _player1Count++; io.Write(" * ");
+                    _board[x, y] = 0x0100; _player1Count++;
                 }
                 else
                 {
-                    _board[x, y] = 0x1000; _player2Count++; io.Write(" # ");
+                    _board[x, y] = 0x1000; _player2Count++;
                 }
                 return;
             }
@@ -59,7 +47,6 @@ void CalculateAndDisplayCell(int x, int y)
     }
 
     _board[x, y] = 0;
-    io.Write("   ");
 }
 
 for (var _player = 1; _player <= 2; _player++)
@@ -73,13 +60,15 @@ for (var _player = 1; _player <= 2; _player++)
     }
 }
 
-CalculateAndDisplayNext();
+CalculateNext();
+_board.Display(io);
 
 while (true)
 {
     io.WriteLine();
     _board.CalculateNeighbours();
-    CalculateAndDisplayNext();
+    CalculateNext();
+    _board.Display(io);
 
     if (_player1Count == 0 || _player2Count == 0) { break; }
 

From 96a0d7bee546f34c1f751ca17336b2c18bf1db86 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Wed, 7 Sep 2022 21:37:28 +1000
Subject: [PATCH 009/198] Move generation calculation to Board

---
 56_Life_for_Two/csharp/Board.cs   | 32 +++++++++++++++++++++++
 56_Life_for_Two/csharp/Program.cs | 43 ++-----------------------------
 2 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index 7c5d53c5..f17a6f48 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -1,3 +1,5 @@
+using System.Collections.Immutable;
+
 namespace LifeforTwo;
 
 internal class Board
@@ -7,6 +9,12 @@ internal class Board
     private const int Player2 = 0x1000;
     private const int PieceMask = Player1 | Player2;
     private const int NeighbourValueOffset = 8;
+
+    private readonly ImmutableHashSet<int> _willBePlayer1 = 
+        new[] { 0x0003, 0x0102, 0x0103, 0x0120, 0x0130, 0x0121, 0x0112, 0x0111, 0x0012 }.ToImmutableHashSet();
+    private readonly ImmutableHashSet<int> _willBePlayer2 = 
+        new[] { 0x0021, 0x0030, 0x1020, 0x1030, 0x1011, 0x1021, 0x1003, 0x1002, 0x1012 }.ToImmutableHashSet();
+
     private readonly int[,] _cells = new int[7,7];
 
     public int this[Coordinates coordinates]
@@ -21,6 +29,30 @@ internal class Board
         set => _cells[x, y] = value;
     }
 
+    public (int Player1Count, int Player2Count) CalculateNextGeneration()
+    {
+        var _cellCounts = new Dictionary<int, int>() { [Empty] = 0, [Player1] = 0, [Player2] = 0 };
+
+        for (var x = 1; x <= 5; x++)
+        {
+            for (var y = 1; y <= 5; y++)
+            {
+                var currentValue = this[x, y];
+                var newValue = currentValue switch
+                {
+                    _ when _willBePlayer1.Contains(currentValue) => Player1,
+                    _ when _willBePlayer2.Contains(currentValue) => Player2,
+                    _ => Empty
+                };
+
+                this[x, y] = newValue;
+                _cellCounts[newValue]++;
+            }
+        }
+
+        return (_cellCounts[Player1], _cellCounts[Player2]);
+    }
+
     public void CalculateNeighbours()
     {
         for (var x = 1; x <= 5; x++)
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index 1754cdc5..5f2ed7dc 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -7,48 +7,9 @@ var io = new ConsoleIO();
 io.Write(Streams.Title);
 
 var _board = new Board();
-var _willLive = new[] { 0x0003, 0x0102, 0x0103, 0x0120, 0x0130, 0x0121, 0x0112, 0x0111, 0x0012, 
-                        0x0021, 0x0030, 0x1020, 0x1030, 0x1011, 0x1021, 0x1003, 0x1002, 0x1012 };
 var _coordinates = new Coordinates[3];
 int _player1Count, _player2Count;
 
-void CalculateNext()
-{
-    _player1Count = _player2Count = 0;
-    for (var y = 1; y <= 5; y++)
-    {
-        for (var x = 1; x <= 5; x++)
-        {
-            CalculateNextCell(x, y);
-        }
-    }
-    return;
-}
-
-void CalculateNextCell(int x, int y)
-{
-    if (_board[x, y] >= 3)
-    {
-        for (var o = 0; o < 18; o++)
-        {
-            if (_board[x, y] == _willLive[o])
-            {
-                if (o < 9)
-                {
-                    _board[x, y] = 0x0100; _player1Count++;
-                }
-                else
-                {
-                    _board[x, y] = 0x1000; _player2Count++;
-                }
-                return;
-            }
-        }
-    }
-
-    _board[x, y] = 0;
-}
-
 for (var _player = 1; _player <= 2; _player++)
 {
     var P1 = _player == 2 ? 0x30 : 0x03;
@@ -60,14 +21,14 @@ for (var _player = 1; _player <= 2; _player++)
     }
 }
 
-CalculateNext();
+_board.CalculateNextGeneration();
 _board.Display(io);
 
 while (true)
 {
     io.WriteLine();
     _board.CalculateNeighbours();
-    CalculateNext();
+    (_player1Count, _player2Count) = _board.CalculateNextGeneration();
     _board.Display(io);
 
     if (_player1Count == 0 || _player2Count == 0) { break; }

From c1d43a742afd72364d9cacba18da73fb24385d2d Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Thu, 8 Sep 2022 07:53:02 +1000
Subject: [PATCH 010/198] Simplify player input

---
 56_Life_for_Two/csharp/IOExtensions.cs | 22 ++++++++++++
 56_Life_for_Two/csharp/Program.cs      | 47 +++++++-------------------
 2 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 56_Life_for_Two/csharp/IOExtensions.cs

diff --git a/56_Life_for_Two/csharp/IOExtensions.cs b/56_Life_for_Two/csharp/IOExtensions.cs
new file mode 100644
index 00000000..5f361ef8
--- /dev/null
+++ b/56_Life_for_Two/csharp/IOExtensions.cs
@@ -0,0 +1,22 @@
+internal static class IOExtensions
+{
+    internal static Coordinates ReadCoordinates(this IReadWrite io, int player, Board board)
+    {
+        io.WriteLine(Formats.Player, player);
+        return io.ReadCoordinates(board);
+    }
+
+    internal static Coordinates ReadCoordinates(this IReadWrite io, Board board)
+    {
+        while (true)
+        {
+            io.WriteLine("X,Y");
+            var values = io.Read2Numbers("&&&&&&\r");
+            if (Coordinates.TryCreate(values, out var coordinates) && board[coordinates] == 0)
+            {
+                return coordinates;
+            }
+            io.Write(Streams.IllegalCoords);
+        }
+    }
+}
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index 5f2ed7dc..51b4f909 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -7,7 +7,6 @@ var io = new ConsoleIO();
 io.Write(Streams.Title);
 
 var _board = new Board();
-var _coordinates = new Coordinates[3];
 int _player1Count, _player2Count;
 
 for (var _player = 1; _player <= 2; _player++)
@@ -16,8 +15,7 @@ for (var _player = 1; _player <= 2; _player++)
     io.WriteLine(Formats.InitialPieces, _player);
     for (var i = 1; i <= 3; i++)
     {
-        ReadCoordinates(_player);
-        _board[_coordinates[_player]] = P1;
+        _board[io.ReadCoordinates(_board)] = P1;
     }
 }
 
@@ -33,14 +31,19 @@ while (true)
 
     if (_player1Count == 0 || _player2Count == 0) { break; }
 
-    for (var _player = 1; _player <= 2; _player++)
+    var player1Coordinate = io.ReadCoordinates(1, _board);
+    var player2Coordinate = io.ReadCoordinates(2, _board);
+
+    if (player1Coordinate == player2Coordinate)
     {
-        io.WriteLine(Formats.Player, _player);
-        if (ReadCoordinates(_player)) 
-        { 
-            _board[_coordinates[1]] = 0x0100; 
-            _board[_coordinates[2]] = 0x1000; 
-        }
+        io.Write(Streams.SameCoords);
+        // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
+        _board[player1Coordinate + 1] = 0;
+    }
+    else
+    {
+        _board[player1Coordinate] = 0x0100;
+        _board[player2Coordinate] = 0x1000;
     }
 }
 
@@ -52,27 +55,3 @@ else
 {
     io.WriteLine(Formats.Winner, _player2Count == 0 ? 1 : 2);
 }
-
-bool ReadCoordinates(int _player)
-{
-    while (true)
-    {
-        io.WriteLine("X,Y");
-        var values = io.Read2Numbers("&&&&&&\r");
-        if (Coordinates.TryCreate(values, out _coordinates[_player]) && _board[_coordinates[_player]] == 0)
-        {
-            break;
-        }
-        io.Write(Streams.IllegalCoords);
-    }
-
-    if (_player == 2 && _coordinates[1] == _coordinates[2])
-    {
-        io.Write(Streams.SameCoords);
-        // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
-        _board[_coordinates[_player] + 1] = 0;
-        return false;
-    }
-
-    return _player == 2;
-}

From 5e998088f91279fa7ca52da2b9b99428b9efdfd5 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Thu, 8 Sep 2022 08:11:08 +1000
Subject: [PATCH 011/198] Move player counts into Board

---
 56_Life_for_Two/csharp/Board.cs              | 20 ++++++++++++++++----
 56_Life_for_Two/csharp/Program.cs            | 14 +++-----------
 56_Life_for_Two/csharp/Resources/Draw.txt    |  2 +-
 56_Life_for_Two/csharp/Resources/Resource.cs |  6 +++++-
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index f17a6f48..48cf8bdc 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -17,6 +17,8 @@ internal class Board
 
     private readonly int[,] _cells = new int[7,7];
 
+    private readonly Dictionary<int, int> _cellCounts = new();
+
     public int this[Coordinates coordinates]
     {
         get => _cells[coordinates.X, coordinates.Y];
@@ -29,9 +31,21 @@ internal class Board
         set => _cells[x, y] = value;
     }
 
-    public (int Player1Count, int Player2Count) CalculateNextGeneration()
+    public int Player1Count => _cellCounts[Player1];
+    public int Player2Count => _cellCounts[Player2];
+
+    public string? Result => 
+        (Player1Count, Player2Count) switch
+        {
+            (0, 0) => Strings.Draw,
+            (_, 0) => string.Format(Formats.Winner, 1),
+            (0, _) => string.Format(Formats.Winner, 2),
+            _ => null
+        };
+
+    public void CalculateNextGeneration()
     {
-        var _cellCounts = new Dictionary<int, int>() { [Empty] = 0, [Player1] = 0, [Player2] = 0 };
+        _cellCounts[Empty] = _cellCounts[Player1] = _cellCounts[Player2] = 0;
 
         for (var x = 1; x <= 5; x++)
         {
@@ -49,8 +63,6 @@ internal class Board
                 _cellCounts[newValue]++;
             }
         }
-
-        return (_cellCounts[Player1], _cellCounts[Player2]);
     }
 
     public void CalculateNeighbours()
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index 51b4f909..bc2a3440 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -7,7 +7,6 @@ var io = new ConsoleIO();
 io.Write(Streams.Title);
 
 var _board = new Board();
-int _player1Count, _player2Count;
 
 for (var _player = 1; _player <= 2; _player++)
 {
@@ -26,10 +25,10 @@ while (true)
 {
     io.WriteLine();
     _board.CalculateNeighbours();
-    (_player1Count, _player2Count) = _board.CalculateNextGeneration();
+    _board.CalculateNextGeneration();
     _board.Display(io);
 
-    if (_player1Count == 0 || _player2Count == 0) { break; }
+    if (_board.Result is not null) { break; }
 
     var player1Coordinate = io.ReadCoordinates(1, _board);
     var player2Coordinate = io.ReadCoordinates(2, _board);
@@ -47,11 +46,4 @@ while (true)
     }
 }
 
-if (_player1Count == 0 && _player2Count == 0)
-{
-    io.Write(Streams.Draw);
-}
-else
-{
-    io.WriteLine(Formats.Winner, _player2Count == 0 ? 1 : 2);
-}
+io.WriteLine(_board.Result);
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Resources/Draw.txt b/56_Life_for_Two/csharp/Resources/Draw.txt
index a4549a74..9b9fd8fc 100644
--- a/56_Life_for_Two/csharp/Resources/Draw.txt
+++ b/56_Life_for_Two/csharp/Resources/Draw.txt
@@ -1,2 +1,2 @@
 
-A draw
+A draw
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Resources/Resource.cs b/56_Life_for_Two/csharp/Resources/Resource.cs
index 51e64c69..c6f59d3b 100644
--- a/56_Life_for_Two/csharp/Resources/Resource.cs
+++ b/56_Life_for_Two/csharp/Resources/Resource.cs
@@ -8,7 +8,6 @@ internal static class Resource
     internal static class Streams
     {
         public static Stream Title => GetStream();
-        public static Stream Draw => GetStream();
         public static Stream IllegalCoords => GetStream();
         public static Stream SameCoords => GetStream();
     }
@@ -20,6 +19,11 @@ internal static class Resource
         public static string Winner => GetString();
     }
 
+    internal static class Strings
+    {
+        public static string Draw => GetString();
+    }
+
     private static string GetString([CallerMemberName] string? name = null)
     {
         using var stream = GetStream(name);

From 3042247e064a97f52ca7a20fc378e81aecf097cb Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Thu, 8 Sep 2022 17:02:17 +1000
Subject: [PATCH 012/198] Create Game class

---
 56_Life_for_Two/csharp/Game.cs              | 56 +++++++++++++++++++++
 56_Life_for_Two/csharp/IOExtensions.cs      |  2 +-
 56_Life_for_Two/csharp/Program.cs           | 46 +----------------
 56_Life_for_Two/csharp/Resources/Player.txt |  2 +-
 4 files changed, 59 insertions(+), 47 deletions(-)
 create mode 100644 56_Life_for_Two/csharp/Game.cs

diff --git a/56_Life_for_Two/csharp/Game.cs b/56_Life_for_Two/csharp/Game.cs
new file mode 100644
index 00000000..0b2704bf
--- /dev/null
+++ b/56_Life_for_Two/csharp/Game.cs
@@ -0,0 +1,56 @@
+internal class Game
+{
+    private readonly IReadWrite _io;
+
+    public Game(IReadWrite io)
+    {
+        _io = io;
+    }
+
+    public void Play()
+    {
+        _io.Write(Streams.Title);
+
+        var _board = new Board();
+
+        for (var _player = 1; _player <= 2; _player++)
+        {
+            var P1 = _player == 2 ? 0x30 : 0x03;
+            _io.WriteLine(Formats.InitialPieces, _player);
+            for (var i = 1; i <= 3; i++)
+            {
+                _board[_io.ReadCoordinates(_board)] = P1;
+            }
+        }
+
+        _board.CalculateNextGeneration();
+        _board.Display(_io);
+
+        while (true)
+        {
+            _io.WriteLine();
+            _board.CalculateNeighbours();
+            _board.CalculateNextGeneration();
+            _board.Display(_io);
+
+            if (_board.Result is not null) { break; }
+
+            var player1Coordinate = _io.ReadCoordinates(1, _board);
+            var player2Coordinate = _io.ReadCoordinates(2, _board);
+
+            if (player1Coordinate == player2Coordinate)
+            {
+                _io.Write(Streams.SameCoords);
+                // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
+                _board[player1Coordinate + 1] = 0;
+            }
+            else
+            {
+                _board[player1Coordinate] = 0x0100;
+                _board[player2Coordinate] = 0x1000;
+            }
+        }
+
+        _io.WriteLine(_board.Result);
+    }
+}
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/IOExtensions.cs b/56_Life_for_Two/csharp/IOExtensions.cs
index 5f361ef8..7d8bfc62 100644
--- a/56_Life_for_Two/csharp/IOExtensions.cs
+++ b/56_Life_for_Two/csharp/IOExtensions.cs
@@ -2,7 +2,7 @@ internal static class IOExtensions
 {
     internal static Coordinates ReadCoordinates(this IReadWrite io, int player, Board board)
     {
-        io.WriteLine(Formats.Player, player);
+        io.Write(Formats.Player, player);
         return io.ReadCoordinates(board);
     }
 
diff --git a/56_Life_for_Two/csharp/Program.cs b/56_Life_for_Two/csharp/Program.cs
index bc2a3440..4c399811 100644
--- a/56_Life_for_Two/csharp/Program.cs
+++ b/56_Life_for_Two/csharp/Program.cs
@@ -2,48 +2,4 @@ global using Games.Common.IO;
 global using static LifeforTwo.Resources.Resource;
 global using LifeforTwo;
 
-var io = new ConsoleIO();
-
-io.Write(Streams.Title);
-
-var _board = new Board();
-
-for (var _player = 1; _player <= 2; _player++)
-{
-    var P1 = _player == 2 ? 0x30 : 0x03;
-    io.WriteLine(Formats.InitialPieces, _player);
-    for (var i = 1; i <= 3; i++)
-    {
-        _board[io.ReadCoordinates(_board)] = P1;
-    }
-}
-
-_board.CalculateNextGeneration();
-_board.Display(io);
-
-while (true)
-{
-    io.WriteLine();
-    _board.CalculateNeighbours();
-    _board.CalculateNextGeneration();
-    _board.Display(io);
-
-    if (_board.Result is not null) { break; }
-
-    var player1Coordinate = io.ReadCoordinates(1, _board);
-    var player2Coordinate = io.ReadCoordinates(2, _board);
-
-    if (player1Coordinate == player2Coordinate)
-    {
-        io.Write(Streams.SameCoords);
-        // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
-        _board[player1Coordinate + 1] = 0;
-    }
-    else
-    {
-        _board[player1Coordinate] = 0x0100;
-        _board[player2Coordinate] = 0x1000;
-    }
-}
-
-io.WriteLine(_board.Result);
\ No newline at end of file
+new Game(new ConsoleIO()).Play();
diff --git a/56_Life_for_Two/csharp/Resources/Player.txt b/56_Life_for_Two/csharp/Resources/Player.txt
index 73fbf366..f920e489 100644
--- a/56_Life_for_Two/csharp/Resources/Player.txt
+++ b/56_Life_for_Two/csharp/Resources/Player.txt
@@ -1,3 +1,3 @@
 
 
-Player {0}
\ No newline at end of file
+Player {0} 
\ No newline at end of file

From 8994d9b03c3ca86ff47ec54ad14d4c78adcb2d89 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Fri, 9 Sep 2022 07:57:51 +1000
Subject: [PATCH 013/198] Move neighbour count to generation calculation

---
 56_Life_for_Two/csharp/Board.cs        | 14 ++++++++++++--
 56_Life_for_Two/csharp/Game.cs         | 17 ++++++++---------
 56_Life_for_Two/csharp/IOExtensions.cs |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index 48cf8bdc..1da68626 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -34,6 +34,8 @@ internal class Board
     public int Player1Count => _cellCounts[Player1];
     public int Player2Count => _cellCounts[Player2];
 
+    internal bool IsEmptyAt(Coordinates coordinates) => (this[coordinates] & PieceMask) == Empty;
+
     public string? Result => 
         (Player1Count, Player2Count) switch
         {
@@ -43,6 +45,12 @@ internal class Board
             _ => null
         };
 
+    internal void ClearCell(Coordinates coordinates) => this[coordinates] = Empty;
+
+    internal void AddPlayer1Piece(Coordinates coordinates) => this[coordinates] = Player1;
+
+    internal void AddPlayer2Piece(Coordinates coordinates) => this[coordinates] = Player2;
+
     public void CalculateNextGeneration()
     {
         _cellCounts[Empty] = _cellCounts[Player1] = _cellCounts[Player2] = 0;
@@ -63,9 +71,11 @@ internal class Board
                 _cellCounts[newValue]++;
             }
         }
+
+        CountNeighbours();
     }
 
-    public void CalculateNeighbours()
+    private void CountNeighbours()
     {
         for (var x = 1; x <= 5; x++)
         {
@@ -97,7 +107,7 @@ internal class Board
     }
 
     private string GetDisplay(int x, int y) =>
-        (x, y, this[x, y]) switch
+        (x, y, this[x, y] & PieceMask) switch
         {
             (0 or 6, _, _) => $" {y % 6} ",
             (_, 0 or 6, _) => $" {x % 6} ",
diff --git a/56_Life_for_Two/csharp/Game.cs b/56_Life_for_Two/csharp/Game.cs
index 0b2704bf..e8fb05aa 100644
--- a/56_Life_for_Two/csharp/Game.cs
+++ b/56_Life_for_Two/csharp/Game.cs
@@ -1,18 +1,18 @@
 internal class Game
 {
     private readonly IReadWrite _io;
+    private readonly Board _board;
 
     public Game(IReadWrite io)
     {
         _io = io;
+        _board = new Board();
     }
 
     public void Play()
     {
         _io.Write(Streams.Title);
 
-        var _board = new Board();
-
         for (var _player = 1; _player <= 2; _player++)
         {
             var P1 = _player == 2 ? 0x30 : 0x03;
@@ -26,11 +26,10 @@ internal class Game
         _board.CalculateNextGeneration();
         _board.Display(_io);
 
-        while (true)
+        while(true)
         {
-            _io.WriteLine();
-            _board.CalculateNeighbours();
             _board.CalculateNextGeneration();
+            _io.WriteLine();
             _board.Display(_io);
 
             if (_board.Result is not null) { break; }
@@ -42,15 +41,15 @@ internal class Game
             {
                 _io.Write(Streams.SameCoords);
                 // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
-                _board[player1Coordinate + 1] = 0;
+                _board.ClearCell(player1Coordinate + 1);
             }
             else
             {
-                _board[player1Coordinate] = 0x0100;
-                _board[player2Coordinate] = 0x1000;
+                _board.AddPlayer1Piece(player1Coordinate);
+                _board.AddPlayer2Piece(player2Coordinate);
             }
         }
 
         _io.WriteLine(_board.Result);
     }
-}
\ No newline at end of file
+}
diff --git a/56_Life_for_Two/csharp/IOExtensions.cs b/56_Life_for_Two/csharp/IOExtensions.cs
index 7d8bfc62..d7db9bf4 100644
--- a/56_Life_for_Two/csharp/IOExtensions.cs
+++ b/56_Life_for_Two/csharp/IOExtensions.cs
@@ -12,7 +12,7 @@ internal static class IOExtensions
         {
             io.WriteLine("X,Y");
             var values = io.Read2Numbers("&&&&&&\r");
-            if (Coordinates.TryCreate(values, out var coordinates) && board[coordinates] == 0)
+            if (Coordinates.TryCreate(values, out var coordinates) && board.IsEmptyAt(coordinates))
             {
                 return coordinates;
             }

From 58fd90f543ffd1cf7bf3bec7edb2206c9cddcfc4 Mon Sep 17 00:00:00 2001
From: AnthonyMichaelTDM <68485672+AnthonyMichaelTDM@users.noreply.github.com>
Date: Thu, 8 Sep 2022 19:29:01 -0700
Subject: [PATCH 014/198] rust implementation of 92_Trap

---
 92_Trap/rust/Cargo.toml  |   9 +++
 92_Trap/rust/README.md   |   3 +
 92_Trap/rust/src/lib.rs  | 155 +++++++++++++++++++++++++++++++++++++++
 92_Trap/rust/src/main.rs |  41 +++++++++++
 4 files changed, 208 insertions(+)
 create mode 100644 92_Trap/rust/Cargo.toml
 create mode 100644 92_Trap/rust/README.md
 create mode 100644 92_Trap/rust/src/lib.rs
 create mode 100644 92_Trap/rust/src/main.rs

diff --git a/92_Trap/rust/Cargo.toml b/92_Trap/rust/Cargo.toml
new file mode 100644
index 00000000..ed59870f
--- /dev/null
+++ b/92_Trap/rust/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "rust"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand="0.8.5"
diff --git a/92_Trap/rust/README.md b/92_Trap/rust/README.md
new file mode 100644
index 00000000..7e85f9a1
--- /dev/null
+++ b/92_Trap/rust/README.md
@@ -0,0 +1,3 @@
+Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
+
+Conversion to [Rust](https://www.rust-lang.org/) by Anthony Rubick [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
diff --git a/92_Trap/rust/src/lib.rs b/92_Trap/rust/src/lib.rs
new file mode 100644
index 00000000..d796a20a
--- /dev/null
+++ b/92_Trap/rust/src/lib.rs
@@ -0,0 +1,155 @@
+/*
+ lib.rs contains all the logic of the program
+*/
+use rand::{Rng, prelude::thread_rng}; //rng
+use std::error::Error; //better errors
+use std::io::{self, Write}; //io interactions
+use std::{str::FromStr, fmt::Display}; //traits
+
+//DATA
+
+/// handles setup for the game
+pub struct Config {
+}
+impl Config {
+    /// creates and returns a new Config from user input
+    pub fn new() -> Result<Config, Box<dyn Error>> {
+        //DATA
+        let config: Config = Config { 
+        };
+        
+        //return new config
+        return Ok(config);
+    }
+}
+
+/// run the program
+pub fn run(_config: &Config) -> Result<(), Box<dyn Error>> {
+    //DATA
+    let mut rng = thread_rng();
+    
+    let mut speed_train_1;
+    let mut time_difference;
+    let mut speed_train_2;
+
+    let mut guess;
+    let mut answer;
+    
+    let mut error:f32; 
+
+    //Game loop
+    loop {
+        //initialize variables
+        speed_train_1 =  rng.gen_range(40..65);
+        time_difference = rng.gen_range(5..20); 
+        speed_train_2 = rng.gen_range(20..39);
+
+        //print starting message / conditions
+        println!("A CAR TRAVELING {} MPH CAN MAKE A CERTAIN TRIP IN\n{} HOURS LESS THAN A TRAIN TRAVELING AT {} MPH",speed_train_1,time_difference,speed_train_2);
+        println!();
+
+        //get guess
+        guess = loop {
+            match get_number_from_input("HOW LONG DOES THE TRIP TAKE BY CAR?",0,-1) {
+                Ok(num) => break num,
+                Err(err) => {
+                    eprintln!("{}",err);
+                    continue;
+                },
+            }
+        };
+
+        //calculate answer and error
+        answer = time_difference * speed_train_2 / (speed_train_1 - speed_train_2);
+        error = ((answer - guess) as isize).abs() as f32 * 100.0/(guess as f32) + 0.5;
+
+        //check guess against answer
+        if error > 5.0 {
+            println!("SORRY, YOU WERE OFF BY {} PERCENT.", error);
+            println!("CORRECT ANSWER IS {} HOURS.",answer);
+        } else {
+            println!("GOOD! ANSWER WITHIN {} PERCENT.", error);
+        }
+
+        //ask user if they want to go again
+        match get_string_from_user_input("ANOTHER PROBLEM (Y/N)") {
+            Ok(s) => if !s.to_uppercase().eq("Y") {break;} else {continue;},
+            _ => break,
+        }
+    }
+
+    //return to main
+    Ok(())
+}
+
+/// gets a string from user input
+fn get_string_from_user_input(prompt: &str) -> Result<String, Box<dyn Error>> {
+    //DATA
+    let mut raw_input = String::new();
+
+    //print prompt
+    print!("{}", prompt);
+    //make sure it's printed before getting input
+    io::stdout().flush().expect("couldn't flush stdout");
+
+    //read user input from standard input, and store it to raw_input, then return it or an error as needed
+    raw_input.clear(); //clear input
+    match io::stdin().read_line(&mut raw_input) {
+        Ok(_num_bytes_read) => return Ok(String::from(raw_input.trim())),
+        Err(err) => return Err(format!("ERROR: CANNOT READ INPUT!: {}", err).into()),
+    }
+}
+/// generic function to get a number from the passed string (user input)
+/// pass a min lower  than the max to have minimum and maximum bounds
+/// pass a min higher than the max to only have a minimum bound
+/// pass a min equal   to  the max to only have a maximum bound
+/// 
+/// Errors:
+/// no number on user input
+fn get_number_from_input<T:Display + PartialOrd + FromStr>(prompt: &str, min:T, max:T) -> Result<T, Box<dyn Error>> {
+    //DATA
+    let raw_input: String;
+    let processed_input: String;
+
+    
+    //input loop
+    raw_input = loop {
+        match get_string_from_user_input(prompt) {
+            Ok(input) => break input,
+            Err(e) => {
+                eprintln!("{}",e);
+                continue;
+            },
+        }
+    };
+
+    //filter out non-numeric characters from user input
+    processed_input = raw_input.chars().filter(|c| c.is_numeric()).collect();
+
+    //from input, try to read a number
+    match processed_input.trim().parse() {
+        Ok(i) => {
+            //what bounds must the input fall into
+            if min < max {  //have a min and max bound: [min,max]
+                if i >= min && i <= max {//is input valid, within bounds
+                    return Ok(i); //exit the loop with the value i, returning it
+                } else { //print error message specific to this case
+                    return Err(format!("ONLY BETWEEN {} AND {}, PLEASE!", min, max).into());
+                } 
+            } else if min > max { //only a min bound: [min, infinity)
+                if i >= min {
+                    return Ok(i);
+                } else {
+                    return Err(format!("NO LESS THAN {}, PLEASE!", min).into());
+                }
+            } else { //only a max bound: (-infinity, max]
+                if i <= max {
+                    return Ok(i);
+                } else {
+                    return Err(format!("NO MORE THAN {}, PLEASE!", max).into());
+                }
+            }
+        },
+        Err(_e) => return Err(format!("Error: couldn't find a valid number in {}",raw_input).into()),
+    }
+}
diff --git a/92_Trap/rust/src/main.rs b/92_Trap/rust/src/main.rs
new file mode 100644
index 00000000..438f69be
--- /dev/null
+++ b/92_Trap/rust/src/main.rs
@@ -0,0 +1,41 @@
+use std::process;//allows for some better error handling
+
+mod lib; //allows access to lib.rs
+use lib::Config;
+
+/// main function
+/// responsibilities:
+/// - Calling the command line logic with the argument values
+/// - Setting up any other configuration
+/// - Calling a run function in lib.rs
+/// - Handling the error if run returns an error
+fn main() {
+    //greet user
+    welcome();
+
+    // set up other configuration
+    let mut config = Config::new().unwrap_or_else(|err| {
+        eprintln!("Problem configuring program: {}", err);
+        process::exit(1);
+    });
+
+    // run the program
+    if let Err(e) = lib::run(&mut config) {
+        eprintln!("Application Error: {}", e); //use the eprintln! macro to output to standard error
+        process::exit(1); //exit the program with an error code
+    }
+
+    //end of program
+    println!("THANKS FOR PLAYING!");
+}
+
+/// print the welcome message
+fn welcome() {
+    println!("
+                                Train
+              CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY
+
+
+TIME - SPEED DISTANCE EXERCISE
+    ");
+}

From 3b208a1b92bbfe8efdcd69ef75d1b925994e855f Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Sat, 10 Sep 2022 22:29:16 +1000
Subject: [PATCH 015/198] Add Piece encapsulation

---
 56_Life_for_Two/csharp/Board.cs | 66 +++++++++++----------------------
 56_Life_for_Two/csharp/Game.cs  |  9 ++---
 56_Life_for_Two/csharp/Piece.cs | 50 +++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 50 deletions(-)
 create mode 100644 56_Life_for_Two/csharp/Piece.cs

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index 1da68626..a2c8e397 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -1,40 +1,27 @@
-using System.Collections.Immutable;
-
 namespace LifeforTwo;
 
 internal class Board
 {
-    private const int Empty = 0x0000;
-    private const int Player1 = 0x0100;
-    private const int Player2 = 0x1000;
-    private const int PieceMask = Player1 | Player2;
-    private const int NeighbourValueOffset = 8;
-
-    private readonly ImmutableHashSet<int> _willBePlayer1 = 
-        new[] { 0x0003, 0x0102, 0x0103, 0x0120, 0x0130, 0x0121, 0x0112, 0x0111, 0x0012 }.ToImmutableHashSet();
-    private readonly ImmutableHashSet<int> _willBePlayer2 = 
-        new[] { 0x0021, 0x0030, 0x1020, 0x1030, 0x1011, 0x1021, 0x1003, 0x1002, 0x1012 }.ToImmutableHashSet();
-
-    private readonly int[,] _cells = new int[7,7];
+    private readonly Piece[,] _cells = new Piece[7,7];
 
     private readonly Dictionary<int, int> _cellCounts = new();
 
-    public int this[Coordinates coordinates]
+    public Piece this[Coordinates coordinates]
     {
         get => _cells[coordinates.X, coordinates.Y];
         set => _cells[coordinates.X, coordinates.Y] = value;
     }
 
-    public int this[int x, int y]
+    public Piece this[int x, int y]
     {
         get => _cells[x, y];
         set => _cells[x, y] = value;
     }
 
-    public int Player1Count => _cellCounts[Player1];
-    public int Player2Count => _cellCounts[Player2];
+    public int Player1Count => _cellCounts[Piece.Player1];
+    public int Player2Count => _cellCounts[Piece.Player2];
 
-    internal bool IsEmptyAt(Coordinates coordinates) => (this[coordinates] & PieceMask) == Empty;
+    internal bool IsEmptyAt(Coordinates coordinates) => this[coordinates].IsEmpty;
 
     public string? Result => 
         (Player1Count, Player2Count) switch
@@ -45,49 +32,41 @@ internal class Board
             _ => null
         };
 
-    internal void ClearCell(Coordinates coordinates) => this[coordinates] = Empty;
+    internal void ClearCell(Coordinates coordinates) => this[coordinates] = Piece.NewEmpty();
 
-    internal void AddPlayer1Piece(Coordinates coordinates) => this[coordinates] = Player1;
+    internal void AddPlayer1Piece(Coordinates coordinates) => this[coordinates] = Piece.NewPlayer1();
 
-    internal void AddPlayer2Piece(Coordinates coordinates) => this[coordinates] = Player2;
+    internal void AddPlayer2Piece(Coordinates coordinates) => this[coordinates] = Piece.NewPlayer2();
 
     public void CalculateNextGeneration()
     {
-        _cellCounts[Empty] = _cellCounts[Player1] = _cellCounts[Player2] = 0;
+        _cellCounts[Piece.None] = _cellCounts[Piece.Player1] = _cellCounts[Piece.Player2] = 0;
 
         for (var x = 1; x <= 5; x++)
         {
             for (var y = 1; y <= 5; y++)
             {
-                var currentValue = this[x, y];
-                var newValue = currentValue switch
-                {
-                    _ when _willBePlayer1.Contains(currentValue) => Player1,
-                    _ when _willBePlayer2.Contains(currentValue) => Player2,
-                    _ => Empty
-                };
-
-                this[x, y] = newValue;
-                _cellCounts[newValue]++;
+                this[x, y] = this[x, y].GetNext();
+                _cellCounts[this[x, y].Value]++;
             }
         }
 
         CountNeighbours();
     }
 
-    private void CountNeighbours()
+    public void CountNeighbours()
     {
         for (var x = 1; x <= 5; x++)
         {
             for (var y = 1; y <= 5; y++)
             {
                 var coordinates = new Coordinates(x, y);
-                var neighbourValue = (this[coordinates] & PieceMask) >> NeighbourValueOffset;
-                if (neighbourValue > 0)
+                var piece = this[coordinates];
+                if (!piece.IsEmpty)
                 {
                     foreach (var neighbour in coordinates.GetNeighbors())
                     {
-                        this[neighbour] += neighbourValue;
+                        this[neighbour] = this[neighbour].AddNeighbour(piece);
                     }
                 }
             }
@@ -107,13 +86,10 @@ internal class Board
     }
 
     private string GetDisplay(int x, int y) =>
-        (x, y, this[x, y] & PieceMask) switch
+        (x, y) switch
         {
-            (0 or 6, _, _) => $" {y % 6} ",
-            (_, 0 or 6, _) => $" {x % 6} ",
-            (_, _, Empty) => "   ",
-            (_, _, Player1) => " * ",
-            (_, _, Player2) => " # ",
-            _ => throw new InvalidOperationException($"Unexpected cell value at ({x}, {y}): {this[x, y]}")
+            (0 or 6, _) => $" {y % 6} ",
+            (_, 0 or 6) => $" {x % 6} ",
+            _ => $" {this[x, y]} "
         };
-}
\ No newline at end of file
+}
diff --git a/56_Life_for_Two/csharp/Game.cs b/56_Life_for_Two/csharp/Game.cs
index e8fb05aa..c4656d43 100644
--- a/56_Life_for_Two/csharp/Game.cs
+++ b/56_Life_for_Two/csharp/Game.cs
@@ -13,17 +13,16 @@ internal class Game
     {
         _io.Write(Streams.Title);
 
-        for (var _player = 1; _player <= 2; _player++)
+        for (var player = 1; player <= 2; player++)
         {
-            var P1 = _player == 2 ? 0x30 : 0x03;
-            _io.WriteLine(Formats.InitialPieces, _player);
+            _io.WriteLine(Formats.InitialPieces, player);
             for (var i = 1; i <= 3; i++)
             {
-                _board[_io.ReadCoordinates(_board)] = P1;
+                _board[_io.ReadCoordinates(_board)] = player == 1 ? Piece.NewPlayer1() : Piece.NewPlayer2();
             }
         }
 
-        _board.CalculateNextGeneration();
+        _board.CountNeighbours();
         _board.Display(_io);
 
         while(true)
diff --git a/56_Life_for_Two/csharp/Piece.cs b/56_Life_for_Two/csharp/Piece.cs
new file mode 100644
index 00000000..545de669
--- /dev/null
+++ b/56_Life_for_Two/csharp/Piece.cs
@@ -0,0 +1,50 @@
+using System.Collections.Immutable;
+
+namespace LifeforTwo;
+
+public struct Piece
+{
+    public const int None = 0x0000;
+    public const int Player1 = 0x0100;
+    public const int Player2 = 0x1000;
+    private const int PieceMask = Player1 | Player2;
+    private const int NeighbourValueOffset = 8;
+
+    private static readonly ImmutableHashSet<int> _willBePlayer1 = 
+        new[] { 0x0003, 0x0102, 0x0103, 0x0120, 0x0130, 0x0121, 0x0112, 0x0111, 0x0012 }.ToImmutableHashSet();
+    private static readonly ImmutableHashSet<int> _willBePlayer2 = 
+        new[] { 0x0021, 0x0030, 0x1020, 0x1030, 0x1011, 0x1021, 0x1003, 0x1002, 0x1012 }.ToImmutableHashSet();
+
+    private int _value;
+
+    private Piece(int value) => _value = value;
+
+    public int Value => _value;
+    public bool IsEmpty => (_value & PieceMask) == None;
+
+    public static Piece NewEmpty() => new(None);
+    public static Piece NewPlayer1() => new(Player1);
+    public static Piece NewPlayer2() => new(Player2);
+
+    public Piece AddNeighbour(Piece neighbour)
+    {
+        _value += neighbour.Value >> NeighbourValueOffset;
+        return this;
+    }
+
+    public Piece GetNext() => new(
+        _value switch
+        {
+            _ when _willBePlayer1.Contains(_value) => Player1,
+            _ when _willBePlayer2.Contains(_value) => Player2,
+            _ => None
+        });
+
+    public override string ToString() =>
+        (_value & PieceMask) switch
+        {
+            Player1 => "*",
+            Player2 => "#",
+            _ => " "
+        };
+}
\ No newline at end of file

From db186bb86eb33f2ca9d6528c0da7c28f1337b8b9 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Tue, 13 Sep 2022 07:21:53 +1000
Subject: [PATCH 016/198] Add Generation encapsulation

---
 56_Life_for_Two/csharp/Board.cs      | 77 ++++++++-------------------
 56_Life_for_Two/csharp/Game.cs       | 32 ++++--------
 56_Life_for_Two/csharp/Generation.cs | 78 ++++++++++++++++++++++++++++
 56_Life_for_Two/csharp/Piece.cs      |  8 ++-
 4 files changed, 116 insertions(+), 79 deletions(-)
 create mode 100644 56_Life_for_Two/csharp/Generation.cs

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index a2c8e397..7886d4c2 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -1,21 +1,28 @@
+using System.Text;
+
 namespace LifeforTwo;
 
 internal class Board
 {
-    private readonly Piece[,] _cells = new Piece[7,7];
-
-    private readonly Dictionary<int, int> _cellCounts = new();
+    private readonly Piece[,] _cells = new Piece[7, 7];
+    private readonly Dictionary<int, int> _cellCounts = 
+        new() { [Piece.None] = 0, [Piece.Player1] = 0, [Piece.Player2] = 0 };
 
     public Piece this[Coordinates coordinates]
     {
-        get => _cells[coordinates.X, coordinates.Y];
-        set => _cells[coordinates.X, coordinates.Y] = value;
+        get => this[coordinates.X, coordinates.Y];
+        set => this[coordinates.X, coordinates.Y] = value;
     }
 
     public Piece this[int x, int y]
     {
         get => _cells[x, y];
-        set => _cells[x, y] = value;
+        set
+        {
+            if (!_cells[x, y].IsEmpty) { _cellCounts[_cells[x, y]] -= 1; }
+            _cells[x, y] = value;
+            _cellCounts[value] += 1;
+        }
     }
 
     public int Player1Count => _cellCounts[Piece.Player1];
@@ -23,69 +30,27 @@ internal class Board
 
     internal bool IsEmptyAt(Coordinates coordinates) => this[coordinates].IsEmpty;
 
-    public string? Result => 
-        (Player1Count, Player2Count) switch
-        {
-            (0, 0) => Strings.Draw,
-            (_, 0) => string.Format(Formats.Winner, 1),
-            (0, _) => string.Format(Formats.Winner, 2),
-            _ => null
-        };
-
-    internal void ClearCell(Coordinates coordinates) => this[coordinates] = Piece.NewEmpty();
-
+    internal void ClearCell(Coordinates coordinates) => this[coordinates] = Piece.NewNone();
     internal void AddPlayer1Piece(Coordinates coordinates) => this[coordinates] = Piece.NewPlayer1();
-
     internal void AddPlayer2Piece(Coordinates coordinates) => this[coordinates] = Piece.NewPlayer2();
 
-    public void CalculateNextGeneration()
+    public override string ToString()
     {
-        _cellCounts[Piece.None] = _cellCounts[Piece.Player1] = _cellCounts[Piece.Player2] = 0;
+        var builder = new StringBuilder();
 
-        for (var x = 1; x <= 5; x++)
-        {
-            for (var y = 1; y <= 5; y++)
-            {
-                this[x, y] = this[x, y].GetNext();
-                _cellCounts[this[x, y].Value]++;
-            }
-        }
-
-        CountNeighbours();
-    }
-
-    public void CountNeighbours()
-    {
-        for (var x = 1; x <= 5; x++)
-        {
-            for (var y = 1; y <= 5; y++)
-            {
-                var coordinates = new Coordinates(x, y);
-                var piece = this[coordinates];
-                if (!piece.IsEmpty)
-                {
-                    foreach (var neighbour in coordinates.GetNeighbors())
-                    {
-                        this[neighbour] = this[neighbour].AddNeighbour(piece);
-                    }
-                }
-            }
-        }
-    }
-
-    public void Display(IReadWrite io)
-    {
         for (var y = 0; y <= 6; y++)
         {
-            io.WriteLine();
+            builder.AppendLine();
             for (var x = 0; x <= 6; x++)
             {
-                io.Write(GetDisplay(x, y));
+                builder.Append(GetCellDisplay(x, y));
             }
         }
+
+        return builder.ToString();
     }
 
-    private string GetDisplay(int x, int y) =>
+    private string GetCellDisplay(int x, int y) =>
         (x, y) switch
         {
             (0 or 6, _) => $" {y % 6} ",
diff --git a/56_Life_for_Two/csharp/Game.cs b/56_Life_for_Two/csharp/Game.cs
index c4656d43..caa613f3 100644
--- a/56_Life_for_Two/csharp/Game.cs
+++ b/56_Life_for_Two/csharp/Game.cs
@@ -1,54 +1,44 @@
 internal class Game
 {
     private readonly IReadWrite _io;
-    private readonly Board _board;
 
     public Game(IReadWrite io)
     {
         _io = io;
-        _board = new Board();
     }
 
     public void Play()
     {
         _io.Write(Streams.Title);
 
-        for (var player = 1; player <= 2; player++)
-        {
-            _io.WriteLine(Formats.InitialPieces, player);
-            for (var i = 1; i <= 3; i++)
-            {
-                _board[_io.ReadCoordinates(_board)] = player == 1 ? Piece.NewPlayer1() : Piece.NewPlayer2();
-            }
-        }
+        var generation = Generation.Create(_io);
 
-        _board.CountNeighbours();
-        _board.Display(_io);
+        _io.Write(generation);
 
         while(true)
         {
-            _board.CalculateNextGeneration();
+            generation = generation.CalculateNextGeneration();
             _io.WriteLine();
-            _board.Display(_io);
+            _io.Write(generation);
 
-            if (_board.Result is not null) { break; }
+            if (generation.Result is not null) { break; }
 
-            var player1Coordinate = _io.ReadCoordinates(1, _board);
-            var player2Coordinate = _io.ReadCoordinates(2, _board);
+            var player1Coordinate = _io.ReadCoordinates(1, generation.Board);
+            var player2Coordinate = _io.ReadCoordinates(2, generation.Board);
 
             if (player1Coordinate == player2Coordinate)
             {
                 _io.Write(Streams.SameCoords);
                 // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
-                _board.ClearCell(player1Coordinate + 1);
+                generation.Board.ClearCell(player1Coordinate + 1);
             }
             else
             {
-                _board.AddPlayer1Piece(player1Coordinate);
-                _board.AddPlayer2Piece(player2Coordinate);
+                generation.Board.AddPlayer1Piece(player1Coordinate);
+                generation.Board.AddPlayer2Piece(player2Coordinate);
             }
         }
 
-        _io.WriteLine(_board.Result);
+        _io.WriteLine(generation.Result);
     }
 }
diff --git a/56_Life_for_Two/csharp/Generation.cs b/56_Life_for_Two/csharp/Generation.cs
new file mode 100644
index 00000000..1335df34
--- /dev/null
+++ b/56_Life_for_Two/csharp/Generation.cs
@@ -0,0 +1,78 @@
+internal class Generation
+{
+    private readonly Board _board;
+
+    public Generation(Board board)
+    {
+        _board = board;
+        CountNeighbours();
+    }
+
+    public Board Board => _board;
+
+    public int Player1Count => _board.Player1Count;
+    public int Player2Count => _board.Player2Count;
+
+    public string? Result => 
+        (Player1Count, Player2Count) switch
+        {
+            (0, 0) => Strings.Draw,
+            (_, 0) => string.Format(Formats.Winner, 1),
+            (0, _) => string.Format(Formats.Winner, 2),
+            _ => null
+        };
+
+    public static Generation Create(IReadWrite io)
+    {
+        var board = new Board();
+
+        SetInitialPieces(1, coord => board.AddPlayer1Piece(coord));
+        SetInitialPieces(2, coord => board.AddPlayer2Piece(coord));
+
+        return new Generation(board);
+
+        void SetInitialPieces(int player, Action<Coordinates> setPiece)
+        {
+            io.WriteLine(Formats.InitialPieces, player);
+            for (var i = 1; i <= 3; i++)
+            {
+                setPiece(io.ReadCoordinates(board));
+            }
+        }
+    }
+
+    public Generation CalculateNextGeneration()
+    {
+        var board = new Board();
+
+        for (var x = 1; x <= 5; x++)
+        {
+            for (var y = 1; y <= 5; y++)
+            {
+                board[x, y] = _board[x, y].GetNext();
+            }
+        }
+
+        return new(board);
+    }
+
+    private void CountNeighbours()
+    {
+        for (var x = 1; x <= 5; x++)
+        {
+            for (var y = 1; y <= 5; y++)
+            {
+                var coordinates = new Coordinates(x, y);
+                var piece = _board[coordinates];
+                if (piece.IsEmpty) { continue; }
+
+                foreach (var neighbour in coordinates.GetNeighbors())
+                {
+                    _board[neighbour] = _board[neighbour].AddNeighbour(piece);
+                }
+            }
+        }
+    }
+
+    public override string ToString() => _board.ToString();
+}
\ No newline at end of file
diff --git a/56_Life_for_Two/csharp/Piece.cs b/56_Life_for_Two/csharp/Piece.cs
index 545de669..20e5adba 100644
--- a/56_Life_for_Two/csharp/Piece.cs
+++ b/56_Life_for_Two/csharp/Piece.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 
 namespace LifeforTwo;
 
@@ -19,10 +20,10 @@ public struct Piece
 
     private Piece(int value) => _value = value;
 
-    public int Value => _value;
+    public int Value => _value & PieceMask;
     public bool IsEmpty => (_value & PieceMask) == None;
 
-    public static Piece NewEmpty() => new(None);
+    public static Piece NewNone() => new(None);
     public static Piece NewPlayer1() => new(Player1);
     public static Piece NewPlayer2() => new(Player2);
 
@@ -47,4 +48,7 @@ public struct Piece
             Player2 => "#",
             _ => " "
         };
+
+    public static implicit operator Piece(int value) => new(value);
+    public static implicit operator int(Piece piece) => piece.Value;
 }
\ No newline at end of file

From a9ec4e3eb1a2d71be883ef212bc26299e5aa71e0 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Tue, 13 Sep 2022 07:56:27 +1000
Subject: [PATCH 017/198] Add Life as a sequence of Gneerations

---
 56_Life_for_Two/csharp/Game.cs       | 26 ++++-------------------
 56_Life_for_Two/csharp/Generation.cs | 18 ++++++++++++++++
 56_Life_for_Two/csharp/Life.cs       | 31 ++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 22 deletions(-)
 create mode 100644 56_Life_for_Two/csharp/Life.cs

diff --git a/56_Life_for_Two/csharp/Game.cs b/56_Life_for_Two/csharp/Game.cs
index caa613f3..de6cb5a5 100644
--- a/56_Life_for_Two/csharp/Game.cs
+++ b/56_Life_for_Two/csharp/Game.cs
@@ -11,34 +11,16 @@ internal class Game
     {
         _io.Write(Streams.Title);
 
-        var generation = Generation.Create(_io);
+        var life = new Life(_io);
 
-        _io.Write(generation);
+        _io.Write(life.FirstGeneration);
 
-        while(true)
+        foreach (var generation in life)
         {
-            generation = generation.CalculateNextGeneration();
             _io.WriteLine();
             _io.Write(generation);
-
-            if (generation.Result is not null) { break; }
-
-            var player1Coordinate = _io.ReadCoordinates(1, generation.Board);
-            var player2Coordinate = _io.ReadCoordinates(2, generation.Board);
-
-            if (player1Coordinate == player2Coordinate)
-            {
-                _io.Write(Streams.SameCoords);
-                // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
-                generation.Board.ClearCell(player1Coordinate + 1);
-            }
-            else
-            {
-                generation.Board.AddPlayer1Piece(player1Coordinate);
-                generation.Board.AddPlayer2Piece(player2Coordinate);
-            }
         }
 
-        _io.WriteLine(generation.Result);
+        _io.WriteLine(life.Result ?? "No result");
     }
 }
diff --git a/56_Life_for_Two/csharp/Generation.cs b/56_Life_for_Two/csharp/Generation.cs
index 1335df34..26f8189e 100644
--- a/56_Life_for_Two/csharp/Generation.cs
+++ b/56_Life_for_Two/csharp/Generation.cs
@@ -55,6 +55,24 @@ internal class Generation
 
         return new(board);
     }
+    
+    public void AddPieces(IReadWrite io)
+    {
+        var player1Coordinate = io.ReadCoordinates(1, _board);
+        var player2Coordinate = io.ReadCoordinates(2, _board);
+
+        if (player1Coordinate == player2Coordinate)
+        {
+            io.Write(Streams.SameCoords);
+            // This is a bug existing in the original code. The line should be _board[_coordinates[_player]] = 0;
+            _board.ClearCell(player1Coordinate + 1);
+        }
+        else
+        {
+            _board.AddPlayer1Piece(player1Coordinate);
+            _board.AddPlayer2Piece(player2Coordinate);
+        }
+    }
 
     private void CountNeighbours()
     {
diff --git a/56_Life_for_Two/csharp/Life.cs b/56_Life_for_Two/csharp/Life.cs
new file mode 100644
index 00000000..7848a348
--- /dev/null
+++ b/56_Life_for_Two/csharp/Life.cs
@@ -0,0 +1,31 @@
+using System.Collections;
+
+internal class Life : IEnumerable<Generation>
+{
+    private readonly IReadWrite _io;
+
+    public Life(IReadWrite io)
+    {
+        _io = io;
+        FirstGeneration = Generation.Create(io);
+    }
+
+    public Generation FirstGeneration { get; }
+    public string? Result { get; private set; }
+    
+    public IEnumerator<Generation> GetEnumerator()
+    {
+        var current = FirstGeneration;
+        while (current.Result is null)
+        {
+            current = current.CalculateNextGeneration();
+            yield return current;
+
+            if (current.Result is null) { current.AddPieces(_io); }
+        }
+
+        Result = current.Result;
+    }
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); 
+}
\ No newline at end of file

From 307c5e8ee7b1ef13c5a88ebf3c1b797454616a50 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Tue, 13 Sep 2022 08:17:26 +1000
Subject: [PATCH 018/198] Add coordinates enumerator

---
 56_Life_for_Two/csharp/Board.cs      | 18 ++++++++++++++++--
 56_Life_for_Two/csharp/Generation.cs | 23 ++++++++---------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/56_Life_for_Two/csharp/Board.cs b/56_Life_for_Two/csharp/Board.cs
index 7886d4c2..f3cb0329 100644
--- a/56_Life_for_Two/csharp/Board.cs
+++ b/56_Life_for_Two/csharp/Board.cs
@@ -1,8 +1,9 @@
+using System.Collections;
 using System.Text;
 
 namespace LifeforTwo;
 
-internal class Board
+internal class Board : IEnumerable<Coordinates>
 {
     private readonly Piece[,] _cells = new Piece[7, 7];
     private readonly Dictionary<int, int> _cellCounts = 
@@ -14,7 +15,7 @@ internal class Board
         set => this[coordinates.X, coordinates.Y] = value;
     }
 
-    public Piece this[int x, int y]
+    private Piece this[int x, int y]
     {
         get => _cells[x, y];
         set
@@ -57,4 +58,17 @@ internal class Board
             (_, 0 or 6) => $" {x % 6} ",
             _ => $" {this[x, y]} "
         };
+
+    public IEnumerator<Coordinates> GetEnumerator()
+    {
+        for (var x = 1; x <= 5; x++)
+        {
+            for (var y = 1; y <= 5; y++)
+            {
+                yield return new(x, y);
+            }
+        }
+    }
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 }
diff --git a/56_Life_for_Two/csharp/Generation.cs b/56_Life_for_Two/csharp/Generation.cs
index 26f8189e..b96ee478 100644
--- a/56_Life_for_Two/csharp/Generation.cs
+++ b/56_Life_for_Two/csharp/Generation.cs
@@ -45,12 +45,9 @@ internal class Generation
     {
         var board = new Board();
 
-        for (var x = 1; x <= 5; x++)
+        foreach (var coordinates in _board)
         {
-            for (var y = 1; y <= 5; y++)
-            {
-                board[x, y] = _board[x, y].GetNext();
-            }
+            board[coordinates] = _board[coordinates].GetNext();
         }
 
         return new(board);
@@ -76,18 +73,14 @@ internal class Generation
 
     private void CountNeighbours()
     {
-        for (var x = 1; x <= 5; x++)
+        foreach (var coordinates in _board)
         {
-            for (var y = 1; y <= 5; y++)
-            {
-                var coordinates = new Coordinates(x, y);
-                var piece = _board[coordinates];
-                if (piece.IsEmpty) { continue; }
+            var piece = _board[coordinates];
+            if (piece.IsEmpty) { continue; }
 
-                foreach (var neighbour in coordinates.GetNeighbors())
-                {
-                    _board[neighbour] = _board[neighbour].AddNeighbour(piece);
-                }
+            foreach (var neighbour in coordinates.GetNeighbors())
+            {
+                _board[neighbour] = _board[neighbour].AddNeighbour(piece);
             }
         }
     }

From 218130f8586a3880cb28b6983420108a1eba7915 Mon Sep 17 00:00:00 2001
From: recanman <29310982+recanman@users.noreply.github.com>
Date: Fri, 16 Sep 2022 21:28:13 -0700
Subject: [PATCH 019/198] Added Lua implementation of 45_Hello

---
 45_Hello/lua/hello.lua | 156 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 45_Hello/lua/hello.lua

diff --git a/45_Hello/lua/hello.lua b/45_Hello/lua/hello.lua
new file mode 100644
index 00000000..5628749b
--- /dev/null
+++ b/45_Hello/lua/hello.lua
@@ -0,0 +1,156 @@
+-- HELLO
+--
+-- Converted from BASIC to Lua by Recanman
+
+local function tab(space)
+    local str = ""
+
+    for _ = space, 1, -1 do
+        str = str .. " "
+    end
+
+    return str
+end
+
+-- reused from Bagels.lua
+function getInput(prompt)
+    io.write(prompt)
+    io.flush()
+    local input = io.read("l")
+    if not input then  --- test for EOF
+        print("GOODBYE")
+        os.exit(0)
+    end
+    return input
+end
+
+print(tab(33) .. "HELLO\n")
+print(tab(15) .. "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n")
+print("\n")
+print("\n")
+print("\n")
+
+print("HELLO.  MY NAME IS CREATIVE COMPUTER.\n")
+print("\n")
+print("\n")
+
+print("WHAT'S YOUR NAME")
+local ns = getInput("? ")
+
+print("\n")
+print("HI THERE, " .. ns .. ", ARE YOU ENJOYING YOURSELF HERE")
+
+while true do
+    local bs = getInput("? ")
+    print("\n")
+    if bs == "YES" then
+        print("I'M GLAD TO HEAR THAT, " .. ns .. ".\n")
+        print("\n")
+        break
+    elseif bs == "NO" then
+        print("OH, I'M SORRY TO HEAR THAT, " .. ns .. ". MAYBE WE CAN\n")
+        print("BRIGHTEN UP YOUR VISIT A BIT.\n")
+        break
+    else
+        print("PLEASE ANSWER 'YES' OR 'NO'.  DO YOU LIKE IT HERE")
+    end
+end
+
+local function main()
+    print("\n")
+    print("SAY, " .. ns .. ", I CAN SOLVED ALL KINDS OF PROBLEMS EXCEPT\n")
+    print("THOSE DEALING WITH GREECE.  WHAT KIND OF PROBLEMS DO\n")
+    print("YOU HAVE (ANSWER SEX, HEALTH, MONEY, OR JOB)")
+
+    while true do
+        local cs = getInput("? ")
+        print("\n")
+
+        if cs ~= "SEX" and cs ~= "HEALTH" and cs ~= "MONEY" and cs ~= "JOB" then
+            print("OH, " .. ns .. ", YOUR ANSWER OF " .. cs .. " IS GREEK TO ME.\n")
+        elseif cs == "JOB" then
+            print("I CAN SYMPATHIZE WITH YOU " .. ns .. ".  I HAVE TO WORK\n")
+            print("VERY LONG HOURS FOR NO PAY -- AND SOME OF MY BOSSES\n")
+            print("REALLY BEAT ON MY KEYBOARD.  MY ADVICE TO YOU, " .. ns .. ",\n")
+            print("IS TO OPEN A RETAIL COMPUTER STORE.  IT'S GREAT FUN.\n")
+        elseif cs == "MONEY" then
+            print("SORRY, " .. ns .. ", I'M BROKE TOO.  WHY DON'T YOU SELL\n")
+            print("ENCYCLOPEADIAS OR MARRY SOMEONE RICH OR STOP EATING\n")
+            print("SO YOU WON'T NEED SO MUCH MONEY?\n")
+        elseif cs == "HEALTH" then
+            print("MY ADVICE TO YOU " .. ns .. " IS:\n")
+            print(tab(5) .. "1.  TAKE TWO ASPRIN\n")
+            print(tab(5) .. "2.  DRINK PLENTY OF FLUIDS (ORANGE JUICE, NOT BEER!)\n")
+            print(tab(5) .. "3.  GO TO BED (ALONE)\n")
+        elseif cs == "SEX" then
+            print("IS YOUR PROBLEM TOO MUCH OR TOO LITTLE")
+
+            while true do
+                local ds = getInput("? ")
+                print("\n")
+
+                if ds == "TOO MUCH" then
+                    print("YOU CALL THAT A PROBLEM?!!  I SHOULD HAVE SUCH PROBLEMS!\n")
+                    print("IF IT BOTHERS YOU, " .. ns .. ", TAKE A COLD SHOWER.\n")
+                    break
+                elseif ds == "TOO LITTLE" then
+                    print("WHY ARE YOU HERE IN SUFFERN, " .. ns .. "?  YOU SHOULD BE\n")
+                    print("IN TOKYO OR NEW YORK OR AMSTERDAM OR SOMEPLACE WITH SOME\n")
+                    print("REAL ACTION.\n")
+                    break
+                else
+                    print("DON'T GET ALL SHOOK, " .. ns .. ", JUST ANSWER THE QUESTION\n")
+                    print("WITH 'TOO MUCH' OR 'TOO LITTLE'.  WHICH IS IT")
+                end
+            end
+        end
+
+        print("\n")
+        print("ANY MORE PROBLEMS YOU WANT SOLVED, " .. ns)
+
+        local es = getInput("? ")
+
+        if es == "YES" then
+            print("WHAT KIND (SEX, MONEY, HEALTH, JOB)")
+        elseif es == "NO" then
+            print("THAT WILL BE $5.00 FOR THE ADVICE, " .. ns .. ".\n")
+            print("PLEASE LEAVE THE MONEY ON THE TERMINAL.\n")
+            print("\n")
+            print("\n")
+            print("\n")
+
+            while true do
+                print("DID YOU LEAVE THE MONEY")
+
+                local gs = getInput("? ")
+                print("\n")
+
+                if gs == "YES" then
+                    print("HEY, " .. ns .. "??? YOU LEFT NO MONEY AT ALL!\n")
+                    print("YOU ARE CHEATING ME OUT OF MY HARD-EARNED LIVING.\n")
+                    print("\n")
+                    print("WHAT A RIP OFF, " .. ns .. "!!!\n")
+                    print("\n")
+                    break
+                elseif gs == "NO" then
+                    print("THAT'S HONEST, " .. ns .. ", BUT HOW DO YOU EXPECT\n")
+                    print("ME TO GO ON WITH MY PSYCHOLOGY STUDIES IF MY PATIENT\n")
+                    print("DON'T PAY THEIR BILLS?\n")
+                    break
+                else
+                    print("YOUR ANSWER OF '" .. gs .. "' CONFUSES ME, " .. ns .. ".\n")
+                    print("PLEASE RESPOND WITH 'YES' OR 'NO'.\n")
+                end
+            end
+
+            break
+        end
+    end
+
+    print("\n")
+    print("TAKE A WALK, " .. ns .. ".\n")
+    print("\n")
+    print("\n")
+end
+
+main()
\ No newline at end of file

From 294c2fafa323c93e60784614cc8fd739ceef8c9b Mon Sep 17 00:00:00 2001
From: Anthony Rubick <68485672+AnthonyMichaelTDM@users.noreply.github.com>
Date: Thu, 22 Sep 2022 15:14:34 -0700
Subject: [PATCH 020/198] Update life_for_two.py

fixes syntax errors that were causing other PRs to fail python checks.
---
 56_Life_for_Two/python/life_for_two.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/56_Life_for_Two/python/life_for_two.py b/56_Life_for_Two/python/life_for_two.py
index e2116826..782c5678 100644
--- a/56_Life_for_Two/python/life_for_two.py
+++ b/56_Life_for_Two/python/life_for_two.py
@@ -10,11 +10,14 @@ Ported by Sajid Sarker (2022).
 gn = [[0 for i in range(6)] for j in range(6)]
 gx = [0 for x in range(3)]
 gy = [0 for x in range(3)]
-gk = [0, 3, 102, 103, 120, 130, 121, 112, 111, 12, 21, 30, 1020, 1030, 1011, 1021, 1003, 1002, 1012]
+gk = [0, 3, 102, 103, 120, 130, 121,
+      112, 111, 12, 21, 30, 1020, 1030,
+      1011, 1021, 1003, 1002, 1012]
 ga = [0, -1, 0, 1, 0, 0, -1, 0, 1, -1, -1, 1, -1, -1, 1, 1, 1]
 m2 = 0
 m3 = 0
 
+
 # Helper Functions
 def tab(number) -> str:
     t = ""
@@ -22,11 +25,13 @@ def tab(number) -> str:
         t += " "
     return t
 
+
 def display_header() -> None:
     print("{}LIFE2".format(tab(33)))
     print("{}CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n".format(tab(15)))
     print("{}U.B. LIFE GAME".format(tab(10)))
 
+
 # Board Functions
 def setup_board() -> None:
     # Players add symbols to initially setup the board
@@ -37,6 +42,7 @@ def setup_board() -> None:
             query_player(b)
             gn[gx[b]][gy[b]] = p1
 
+
 def modify_board() -> None:
     # Players take turns to add symbols and modify the board
     for b in range(1, 3):
@@ -48,6 +54,7 @@ def modify_board() -> None:
         gn[gx[1]][gy[1]] = 100
         gn[gx[2]][gy[2]] = 1000
 
+
 def simulate_board() -> None:
     # Simulate the board for one step
     for j in range(1, 6):
@@ -55,8 +62,9 @@ def simulate_board() -> None:
             if gn[j][k] > 99:
                 b = 1 if gn[j][k] <= 999 else 10
                 for o1 in range(1, 16, 2):
-                    gn[j + ga[o1] - 1][k + ga[o1 + 1] - 1] = gn[j + ga[o1] - 1][k + ga[o1 + 1] - 1] + b
-                    #gn[j + ga[o1]][k + ga[o1 + 1]] = gn[j + ga[o1]][k + ga[o1 + 1]] + b
+                    gn[j+ga[o1]-1][k+ga[o1+1]-1] += b
+                    # gn[j+ga[o1]][k+ga[o1+1]-1] = gn[j+ga[o1]][k+ga[o1+1]]+b
+
 
 def display_board() -> None:
     # Draws the board with all symbols
@@ -95,6 +103,7 @@ def display_board() -> None:
                         gn[j][k] = 0
                         print("   ", end="")
 
+
 # Player Functions
 def query_player(b) -> None:
     # Query player for symbol placement coordinates
@@ -108,7 +117,9 @@ def query_player(b) -> None:
         y_ = [0] if len(y_) == 0 else y_
         gx[b] = y_[0]
         gy[b] = x_[0]
-        if gx[b] in range(1, 6) and gy[b] in range(1, 6) and gn[gx[b]][gy[b]] == 0:
+        if gx[b] in range(1, 6)\
+                and gy[b] in range(1, 6)\
+                and gn[gx[b]][gy[b]] == 0:
             break
         print("ILLEGAL COORDS. RETYPE")
     if b != 1:
@@ -117,6 +128,7 @@ def query_player(b) -> None:
             gn[gx[b] + 1][gy[b] + 1] = 0
             b = 99
 
+
 # Game Functions
 def check_winner(m2, m3) -> None:
     # Check if the game has been won
@@ -130,6 +142,7 @@ def check_winner(m2, m3) -> None:
         print("\nPLAYER 2 IS THE WINNER\n")
         return
 
+
 # Program Flow
 def main() -> None:
     display_header()
@@ -142,5 +155,6 @@ def main() -> None:
         check_winner(m2, m3)
         modify_board()
 
+
 if __name__ == "__main__":
     main()

From b2b0f03339421ad8f46d951f881cc7f738bde87b Mon Sep 17 00:00:00 2001
From: Anthony Rubick <68485672+AnthonyMichaelTDM@users.noreply.github.com>
Date: Thu, 22 Sep 2022 15:18:13 -0700
Subject: [PATCH 021/198] fix 'missing whitespace around arithmetic operators'
 error

---
 56_Life_for_Two/python/life_for_two.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/56_Life_for_Two/python/life_for_two.py b/56_Life_for_Two/python/life_for_two.py
index 782c5678..44b25ad1 100644
--- a/56_Life_for_Two/python/life_for_two.py
+++ b/56_Life_for_Two/python/life_for_two.py
@@ -62,7 +62,7 @@ def simulate_board() -> None:
             if gn[j][k] > 99:
                 b = 1 if gn[j][k] <= 999 else 10
                 for o1 in range(1, 16, 2):
-                    gn[j+ga[o1]-1][k+ga[o1+1]-1] += b
+                    gn[j + ga[o1] - 1][k + ga[o1 + 1] - 1] += b
                     # gn[j+ga[o1]][k+ga[o1+1]-1] = gn[j+ga[o1]][k+ga[o1+1]]+b
 
 

From faf410a500389ce2566a8240758403f8d8d4874a Mon Sep 17 00:00:00 2001
From: Anthony Rubick <68485672+AnthonyMichaelTDM@users.noreply.github.com>
Date: Thu, 22 Sep 2022 15:20:14 -0700
Subject: [PATCH 022/198] fixed unused variable error on line 41

---
 56_Life_for_Two/python/life_for_two.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/56_Life_for_Two/python/life_for_two.py b/56_Life_for_Two/python/life_for_two.py
index 44b25ad1..da4e1619 100644
--- a/56_Life_for_Two/python/life_for_two.py
+++ b/56_Life_for_Two/python/life_for_two.py
@@ -38,7 +38,7 @@ def setup_board() -> None:
     for b in range(1, 3):
         p1 = 3 if b != 2 else 30
         print("\nPLAYER {} - 3 LIVE PIECES.".format(b))
-        for k1 in range(1, 4):
+        for _ in range(1, 4):
             query_player(b)
             gn[gx[b]][gy[b]] = p1
 

From b25f2207e1aa9c9f16132c218e9dc509c744614f Mon Sep 17 00:00:00 2001
From: recanman <abboudalomari6@gmail.com>
Date: Wed, 28 Sep 2022 10:28:31 -0700
Subject: [PATCH 023/198] Create name.lua

---
 63_Name/lua/name.lua | 85 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 63_Name/lua/name.lua

diff --git a/63_Name/lua/name.lua b/63_Name/lua/name.lua
new file mode 100644
index 00000000..32d51c93
--- /dev/null
+++ b/63_Name/lua/name.lua
@@ -0,0 +1,85 @@
+-- HELLO
+--
+-- Converted from BASIC to Lua by Recanman
+
+local function tab(space)
+    local str = ""
+
+    for _ = space, 1, -1 do
+        str = str .. " "
+    end
+
+    return str
+end
+
+-- reused from Bagels.lua
+function getInput(prompt)
+    io.write(prompt)
+    io.flush()
+    local input = io.read("l")
+    if not input then  --- test for EOF
+        print("GOODBYE")
+        os.exit(0)
+    end
+    return input
+end
+
+print(tab(33) .. "HELLO\n")
+print(tab(15) .. "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n")
+print("\n")
+print("\n")
+print("\n")
+
+print("HELLO.  MY NAME IS CREATIVE COMPUTER.\n")
+print("\n")
+print("\n")
+
+print("WHAT'S YOUR NAME (FIRST AND LAST)")
+
+local ns = getInput("? ")
+local l = string.len(ns)
+print("\n")
+
+local function main()
+    print("THANK YOU, " .. string.reverse(ns) .. ".\n")
+
+    print("OOPS!  I GUESS I GOT IT BACKWARDS.  A SMART")
+    print("COMPUTER LIKE ME SHOULDN'T MAKE A MISTAKE LIKE THAT!\n")
+    print("BUT I JUST NOTICED YOUR LETTERS ARE OUT OF ORDER.\n")
+    print("LET'S PUT THEM IN ORDER LIKE THIS: ")
+    
+    local b = {}
+    
+    for i = 1, l, 1 do
+        local letter = string.sub(ns, i, i)
+        b[i] = string.byte(letter)
+    end
+    
+    table.sort(b, function(v1, v2)
+        return v1 < v2
+    end)
+    
+    local str = ""
+    for _, letter in ipairs(b) do
+        str = str .. string.char(letter)
+    end
+    
+    str = string.reverse(str)
+    print(str)
+    
+    print("\n\n")
+    print("DON'T YOU LIKE THAT BETTER")
+    
+    local ds = getInput("? ")
+        
+    if ds == "YES" then
+        print("I KNEW YOU'D AGREE!!\n")
+    else
+        print("I'M SORRY YOU DON'T LIKE IT THAT WAY.\n")
+    end
+    
+    print("I REALLY ENJOYED MEETING YOU " ..  ns .. ".\n")
+    print("HAVE A NICE DAY!\n")
+end
+
+main()

From f27908a3e4720ebc6a2becab4db51616f44bd861 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Thu, 29 Sep 2022 22:46:10 +1000
Subject: [PATCH 024/198] Implement poetry generator

---
 70_Poetry/csharp/Context.cs      | 11 +++++
 70_Poetry/csharp/IOExtensions.cs |  8 +++
 70_Poetry/csharp/Phrase.cs       | 83 ++++++++++++++++++++++++++++++++
 70_Poetry/csharp/Poem.cs         | 56 +++++++++++++++++++++
 70_Poetry/csharp/Poetry.csproj   |  3 ++
 70_Poetry/csharp/Program.cs      |  5 ++
 6 files changed, 166 insertions(+)
 create mode 100644 70_Poetry/csharp/Context.cs
 create mode 100644 70_Poetry/csharp/IOExtensions.cs
 create mode 100644 70_Poetry/csharp/Phrase.cs
 create mode 100644 70_Poetry/csharp/Poem.cs
 create mode 100644 70_Poetry/csharp/Program.cs

diff --git a/70_Poetry/csharp/Context.cs b/70_Poetry/csharp/Context.cs
new file mode 100644
index 00000000..f9aecc06
--- /dev/null
+++ b/70_Poetry/csharp/Context.cs
@@ -0,0 +1,11 @@
+namespace Poetry;
+
+internal class Context
+{
+    public int U { get; set; }
+    public int I { get; set; }
+    public int J { get; set; } 
+    public int K { get; set; }
+    public bool SkipComma { get; set; }
+    public bool UseGroup2 { get; set; }
+}
diff --git a/70_Poetry/csharp/IOExtensions.cs b/70_Poetry/csharp/IOExtensions.cs
new file mode 100644
index 00000000..a2089264
--- /dev/null
+++ b/70_Poetry/csharp/IOExtensions.cs
@@ -0,0 +1,8 @@
+namespace Poetry;
+
+internal static class IOExtensions
+{
+
+    internal static void WritePhrase(this IReadWrite io, Context context)
+        => Phrase.GetPhrase(context).Write(io, context);
+}
diff --git a/70_Poetry/csharp/Phrase.cs b/70_Poetry/csharp/Phrase.cs
new file mode 100644
index 00000000..1df6a774
--- /dev/null
+++ b/70_Poetry/csharp/Phrase.cs
@@ -0,0 +1,83 @@
+namespace Poetry;
+
+internal class Phrase
+{
+    private static Phrase[][] _phrases = new Phrase[][]
+    {
+        new Phrase[]
+        {
+            new("midnight dreary"),
+            new("fiery eyes"),
+            new("bird or fiend"),
+            new("thing of evil"),
+            new("prophet")
+        },
+        new Phrase[]
+        {
+            new("beguiling me", ctx => ctx.U = 2),
+            new("thrilled me"),
+            new("still sitting....", ctx => ctx.SkipComma = true),
+            new("never flitting", ctx => ctx.U = 2),
+            new("burned")
+        },
+        new Phrase[]
+        {
+            new("and my soul"),
+            new("darkness there"),
+            new("shall be lifted"),
+            new("quoth the raven"),
+            new(ctx => ctx.U != 0, "sign of parting")
+        },
+        new Phrase[]
+        {
+            new("nothing more"),
+            new("yet again"),
+            new("slowly creeping"),
+            new("...evermore"),
+            new("nevermore")
+        }
+    };
+
+    private readonly Predicate<Context> _condition;
+    private readonly string _text;
+    private readonly Action<Context> _update;
+
+    private Phrase(Predicate<Context> condition, string text)
+        : this(condition, text, _ => { })
+    {
+    }
+
+    private Phrase(string text, Action<Context> update)
+        : this(_ => true, text, update)
+    {
+    }
+
+    private Phrase(string text)
+        : this(_ => true, text, _ => { })
+    {
+    }
+
+    private Phrase(Predicate<Context> condition, string text, Action<Context> update)
+    {
+        _condition = condition;
+        _text = text;
+        _update = update;
+    }
+
+    public static Phrase GetPhrase(Context context)
+    {
+        var group = context.UseGroup2 ? _phrases[1] : _phrases[context.J];
+        context.UseGroup2 = false;
+        return group[context.I % 5];
+    }
+
+    public void Write(IReadWrite io, Context context)
+    {
+        if (_condition.Invoke(context))
+        {
+            io.Write(_text);
+        }
+
+        _update.Invoke(context);
+    }
+}
\ No newline at end of file
diff --git a/70_Poetry/csharp/Poem.cs b/70_Poetry/csharp/Poem.cs
new file mode 100644
index 00000000..ed08d30c
--- /dev/null
+++ b/70_Poetry/csharp/Poem.cs
@@ -0,0 +1,56 @@
+namespace Poetry;
+
+internal class Poem
+{
+    internal static void Compose(IReadWrite io, IRandom random)
+    {
+        var context = new Context();
+
+        while (true)
+        {
+            io.WritePhrase(context);
+
+            if (!context.SkipComma && context.U != 0 && random.NextFloat() <= 0.19)
+            {
+                io.Write(",");
+                context.U = 2;
+            }
+
+            if (random.NextFloat() <= 0.65)
+            {
+                io.Write(" ");
+                context.U += 1;
+            }
+            else
+            {
+                io.WriteLine();
+                context.U = 0;
+            }
+
+            while (true)
+            {
+                context.I = random.Next(1, 6);
+                context.J += 1;
+                context.K += 1;
+
+                if (context.U == 0 && context.J % 2 == 0)
+                {
+                    io.Write("     ");
+                }
+
+                if (context.J < 4) { break; }
+
+                context.J = 0;
+                io.WriteLine();
+
+                if (context.K > 20)
+                {
+                    io.WriteLine();
+                    context.U = context.K = 0;
+                    context.UseGroup2 = true;
+                    break;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/70_Poetry/csharp/Poetry.csproj b/70_Poetry/csharp/Poetry.csproj
index d3fe4757..6d06ca76 100644
--- a/70_Poetry/csharp/Poetry.csproj
+++ b/70_Poetry/csharp/Poetry.csproj
@@ -6,4 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\00_Common\dotnet\Games.Common\Games.Common.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/70_Poetry/csharp/Program.cs b/70_Poetry/csharp/Program.cs
new file mode 100644
index 00000000..8920b37e
--- /dev/null
+++ b/70_Poetry/csharp/Program.cs
@@ -0,0 +1,5 @@
+global using Games.Common.IO;
+global using Games.Common.Randomness;
+global using Poetry;
+
+Poem.Compose(new ConsoleIO(), new RandomNumberGenerator());
\ No newline at end of file

From a80534b13e85c33d591900b3271465a35761c960 Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Sun, 2 Oct 2022 17:59:26 +0200
Subject: [PATCH 025/198] Lua port created

---
 33_Dice/lua/dice.lua | 113 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 33_Dice/lua/dice.lua

diff --git a/33_Dice/lua/dice.lua b/33_Dice/lua/dice.lua
new file mode 100644
index 00000000..76c6fae3
--- /dev/null
+++ b/33_Dice/lua/dice.lua
@@ -0,0 +1,113 @@
+--[[
+Dice
+
+From: BASIC Computer Games (1978)
+Edited by David H. Ahl
+
+    "Not exactly a game, this program simulates rolling
+    a pair of dice a large number of times and prints out
+    the frequency distribution.  You simply input the
+    number of rolls.  It is interesting to see how many
+    rolls are necessary to approach the theoretical
+    distribution:
+
+    2  1/36  2.7777...%
+    3  2/36  5.5555...%
+    4  3/36  8.3333...%
+    etc.
+
+    "Daniel Freidus wrote this program while in the
+     seventh grade at Harrison Jr-Sr High School,
+    Harrison, New York."
+
+
+Lua port by Alex Conconi, 2022.
+]]--
+
+
+local function print_intro()
+    print("\n                   Dice")
+    print("Creative Computing  Morristown, New Jersey")
+    print("\n\n")
+    print("This program simulates the rolling of a")
+    print("pair of dice.")
+    print("You enter the number of times you want the computer to")
+    print("'roll' the dice.   Watch out, very large numbers take")
+    print("a long time.  In particular, numbers over 5000.")
+end
+
+
+local function ask_how_many_rolls()
+    while true do
+        -- Print prompt and read a valid number from stdin
+        print("\nHow many rolls?")
+        local num_rolls = tonumber(io.stdin:read("*l"))
+        if num_rolls then
+            return num_rolls
+        else
+            print("Please enter a valid number.")
+        end
+    end
+end
+
+
+local function ask_try_again()
+    while true do
+        -- Print prompt and read a yes/no answer from stdin,
+        -- accepting only 'yes', 'y', 'no' or 'n' (case insensitive)
+        print("\nTry again? ([y]es / [n]o)")
+        local answer = string.lower(io.stdin:read("*l"))
+        if answer == "yes" or  answer == "y" then
+            return true
+        elseif answer == "no" or answer == "n" then
+            return false
+        else
+            print("Please answer '[y]es' or '[n]o'.")
+        end
+    end
+end
+
+
+local function roll_dice(num_rolls)
+    -- Initialize a table to track counts of roll outcomes
+    local counts = {}
+    for i=2, 12 do
+        counts[i] = 0
+    end
+
+    -- Roll the dice num_rolls times and update outcomes counts accordingly
+    for _=1, num_rolls do
+        local roll_total = math.random(1, 6) + math.random(1, 6)
+        counts[roll_total] = counts[roll_total] + 1
+    end
+
+    return counts
+end
+
+
+function print_results(counts)
+    print("\nTotal Spots   Number of Times")
+    for roll_total, count in pairs(counts) do
+        print(string.format(" %-14d%d", roll_total, count))
+    end
+end
+
+
+local function dice_main()
+    print_intro()
+
+    -- initialize the random number generator
+    math.randomseed(os.time())
+
+    -- main game loop
+    local keep_playing = true
+    while keep_playing do
+        local num_rolls = ask_how_many_rolls()
+        local counts = roll_dice(num_rolls)
+        print_results(counts)
+        keep_playing = ask_try_again()
+    end
+end
+
+
+dice_main()
\ No newline at end of file

From 831e972d444354fb87590dfab46f4545d0b017f0 Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Sun, 2 Oct 2022 18:04:10 +0200
Subject: [PATCH 026/198] added NL at end of file

---
 33_Dice/lua/dice.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/33_Dice/lua/dice.lua b/33_Dice/lua/dice.lua
index 76c6fae3..7b8d556a 100644
--- a/33_Dice/lua/dice.lua
+++ b/33_Dice/lua/dice.lua
@@ -110,4 +110,4 @@ local function dice_main()
 end
 
 
-dice_main()
\ No newline at end of file
+dice_main()

From 617053b1f4ae7d05204b03e94fbb3cde89d957e5 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Mon, 3 Oct 2022 21:22:44 +1100
Subject: [PATCH 027/198] Debug poem generation

---
 70_Poetry/csharp/Context.cs |  4 ++--
 70_Poetry/csharp/Phrase.cs  |  7 +++++--
 70_Poetry/csharp/Poem.cs    |  7 ++++---
 70_Poetry/csharp/Program.cs |  2 +-
 70_Poetry/poetry.bas        | 15 ++++++++++++---
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/70_Poetry/csharp/Context.cs b/70_Poetry/csharp/Context.cs
index f9aecc06..0036b52a 100644
--- a/70_Poetry/csharp/Context.cs
+++ b/70_Poetry/csharp/Context.cs
@@ -2,10 +2,10 @@ namespace Poetry;
 
 internal class Context
 {
-    public int U { get; set; }
     public int I { get; set; }
-    public int J { get; set; } 
+    public int J { get; set; }
     public int K { get; set; }
+    public int U { get; set; }
     public bool SkipComma { get; set; }
     public bool UseGroup2 { get; set; }
 }
diff --git a/70_Poetry/csharp/Phrase.cs b/70_Poetry/csharp/Phrase.cs
index 1df6a774..3f00abae 100644
--- a/70_Poetry/csharp/Phrase.cs
+++ b/70_Poetry/csharp/Phrase.cs
@@ -66,11 +66,14 @@ internal class Phrase
 
     public static Phrase GetPhrase(Context context)
     {
-        var group = context.UseGroup2 ? _phrases[1] : _phrases[context.J];
+        var group = GetGroup(context.UseGroup2 ? 2 : context.J);
         context.UseGroup2 = false;
-        return group[context.I % 5];
+        return group[Math.Max(context.I - 1, 0)];
     }
 
+    private static Phrase[] GetGroup(int groupNumber) => _phrases[Math.Max(groupNumber - 1, 0)];
+
+
     public void Write(IReadWrite io, Context context)
     {
         if (_condition.Invoke(context))
diff --git a/70_Poetry/csharp/Poem.cs b/70_Poetry/csharp/Poem.cs
index ed08d30c..75f24532 100644
--- a/70_Poetry/csharp/Poem.cs
+++ b/70_Poetry/csharp/Poem.cs
@@ -10,13 +10,14 @@ internal class Poem
         {
             io.WritePhrase(context);
 
-            if (!context.SkipComma && context.U != 0 && random.NextFloat() <= 0.19)
+            if (!context.SkipComma && random.NextFloat() <= 0.19F && context.U != 0)
             {
                 io.Write(",");
                 context.U = 2;
             }
+            context.SkipComma = false;
 
-            if (random.NextFloat() <= 0.65)
+            if (random.NextFloat() <= 0.65F)
             {
                 io.Write(" ");
                 context.U += 1;
@@ -38,7 +39,7 @@ internal class Poem
                     io.Write("     ");
                 }
 
-                if (context.J < 4) { break; }
+                if (context.J < 5) { break; }
 
                 context.J = 0;
                 io.WriteLine();
diff --git a/70_Poetry/csharp/Program.cs b/70_Poetry/csharp/Program.cs
index 8920b37e..3a17d72c 100644
--- a/70_Poetry/csharp/Program.cs
+++ b/70_Poetry/csharp/Program.cs
@@ -2,4 +2,4 @@ global using Games.Common.IO;
 global using Games.Common.Randomness;
 global using Poetry;
 
-Poem.Compose(new ConsoleIO(), new RandomNumberGenerator());
\ No newline at end of file
+Poem.Compose(new ConsoleIO(), new RandomNumberGenerator());
diff --git a/70_Poetry/poetry.bas b/70_Poetry/poetry.bas
index 3661287d..7fa3a1c4 100644
--- a/70_Poetry/poetry.bas
+++ b/70_Poetry/poetry.bas
@@ -1,3 +1,8 @@
+5 Y=RND(-1)
+6 REM FOR X = 1 TO 100
+7 REM PRINT RND(1);","
+8 REM NEXT X
+9 REM GOTO 999
 10 PRINT TAB(30);"POETRY"
 20 PRINT TAB(15);"CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY"
 30 PRINT:PRINT:PRINT
@@ -26,17 +31,21 @@
 133 PRINT "SLOWLY CREEPING";:GOTO 210
 134 PRINT "...EVERMORE";:GOTO 210
 135 PRINT "NEVERMORE";
-210 IF U=0 OR RND(1)>.19 THEN 212
+210 GOSUB 500 : IF U=0 OR X>.19 THEN 212
 211 PRINT ",";:U=2
-212 IF RND(1)>.65 THEN 214
+212 GOSUB 500 : IF X>.65 THEN 214
 213 PRINT " ";:U=U+1:GOTO 215
 214 PRINT : U=0
-215 I=INT(INT(10*RND(1))/2)+1
+215 GOSUB 500 : I=INT(INT(10*X)/2)+1
 220 J=J+1 : K=K+1
+225 REM PRINT "I=";I;"; J=";J;"; K=";K;"; U=";U
 230 IF U>0 OR INT(J/2)<>J/2 THEN 240
 235 PRINT "     ";
 240 ON J GOTO 90,110,120,130,250
 250 J=0 : PRINT : IF K>20 THEN 270
 260 GOTO 215
 270 PRINT : U=0 : K=0 : GOTO 110
+500 X = RND(1)
+505 REM PRINT "#";X;"#"
+510 RETURN
 999 END

From d16d72965f4c983797b2092c361ca89bb8a97e0d Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Mon, 3 Oct 2022 21:29:34 +1100
Subject: [PATCH 028/198] Add title

---
 70_Poetry/csharp/IOExtensions.cs       |  1 -
 70_Poetry/csharp/Poem.cs               |  4 ++++
 70_Poetry/csharp/Poetry.csproj         |  5 +++++
 70_Poetry/csharp/Resources/Resource.cs | 16 ++++++++++++++++
 70_Poetry/csharp/Resources/Title.txt   |  5 +++++
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 70_Poetry/csharp/Resources/Resource.cs
 create mode 100644 70_Poetry/csharp/Resources/Title.txt

diff --git a/70_Poetry/csharp/IOExtensions.cs b/70_Poetry/csharp/IOExtensions.cs
index a2089264..631c80f8 100644
--- a/70_Poetry/csharp/IOExtensions.cs
+++ b/70_Poetry/csharp/IOExtensions.cs
@@ -2,7 +2,6 @@ namespace Poetry;
 
 internal static class IOExtensions
 {
-
     internal static void WritePhrase(this IReadWrite io, Context context)
         => Phrase.GetPhrase(context).Write(io, context);
 }
diff --git a/70_Poetry/csharp/Poem.cs b/70_Poetry/csharp/Poem.cs
index 75f24532..64038963 100644
--- a/70_Poetry/csharp/Poem.cs
+++ b/70_Poetry/csharp/Poem.cs
@@ -1,9 +1,13 @@
+using static Poetry.Resources.Resource;
+
 namespace Poetry;
 
 internal class Poem
 {
     internal static void Compose(IReadWrite io, IRandom random)
     {
+        io.Write(Streams.Title);
+
         var context = new Context();
 
         while (true)
diff --git a/70_Poetry/csharp/Poetry.csproj b/70_Poetry/csharp/Poetry.csproj
index 6d06ca76..3870320c 100644
--- a/70_Poetry/csharp/Poetry.csproj
+++ b/70_Poetry/csharp/Poetry.csproj
@@ -6,6 +6,11 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources/*.txt" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\00_Common\dotnet\Games.Common\Games.Common.csproj" />
   </ItemGroup>
diff --git a/70_Poetry/csharp/Resources/Resource.cs b/70_Poetry/csharp/Resources/Resource.cs
new file mode 100644
index 00000000..b789f035
--- /dev/null
+++ b/70_Poetry/csharp/Resources/Resource.cs
@@ -0,0 +1,16 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace Poetry.Resources;
+
+internal static class Resource
+{
+    internal static class Streams
+    {
+        public static Stream Title => GetStream();
+    }
+
+    private static Stream GetStream([CallerMemberName] string? name = null) =>
+        Assembly.GetExecutingAssembly().GetManifestResourceStream($"{typeof(Resource).Namespace}.{name}.txt")
+            ?? throw new Exception($"Could not find embedded resource stream '{name}'.");
+}
\ No newline at end of file
diff --git a/70_Poetry/csharp/Resources/Title.txt b/70_Poetry/csharp/Resources/Title.txt
new file mode 100644
index 00000000..86161340
--- /dev/null
+++ b/70_Poetry/csharp/Resources/Title.txt
@@ -0,0 +1,5 @@
+                              Poetry
+               Creative Computing  Morristown, New Jersey
+
+
+

From 0c9d3580f52cc0ce77c950ff9092b4e71be71f4a Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Mon, 3 Oct 2022 22:00:42 +1100
Subject: [PATCH 029/198] Move output to context

---
 70_Poetry/csharp/Context.cs      | 76 ++++++++++++++++++++++++++++++++
 70_Poetry/csharp/IOExtensions.cs |  7 ---
 70_Poetry/csharp/Phrase.cs       |  3 +-
 70_Poetry/csharp/Poem.cs         | 47 ++++----------------
 4 files changed, 86 insertions(+), 47 deletions(-)
 delete mode 100644 70_Poetry/csharp/IOExtensions.cs

diff --git a/70_Poetry/csharp/Context.cs b/70_Poetry/csharp/Context.cs
index 0036b52a..9d340c8e 100644
--- a/70_Poetry/csharp/Context.cs
+++ b/70_Poetry/csharp/Context.cs
@@ -2,10 +2,86 @@ namespace Poetry;
 
 internal class Context
 {
+    private readonly IReadWrite _io;
+    private readonly IRandom _random;
+
+    public Context(IReadWrite io, IRandom random)
+    {
+        _io = io;
+        _random = random;
+    }
+
     public int I { get; set; }
     public int J { get; set; }
     public int K { get; set; }
     public int U { get; set; }
     public bool SkipComma { get; set; }
     public bool UseGroup2 { get; set; }
+    public bool ShouldIndent => U == 0 && J % 2 == 0;
+    public bool GroupNumberIsValid => J < 5;
+
+    public void WritePhrase()
+    {
+        Phrase.GetPhrase(this).Write(_io, this);
+    }
+
+    public void MaybeWriteComma()
+    {
+        if (!SkipComma && _random.NextFloat() <= 0.19F && U != 0)
+        {
+            _io.Write(",");
+            U = 2;
+        }
+        SkipComma = false;
+    }
+
+    public void WriteSpaceOrNewLine()
+    {
+        if (_random.NextFloat() <= 0.65F)
+        {
+            _io.Write(" ");
+            U += 1;
+        }
+        else
+        {
+            _io.WriteLine();
+            U = 0;
+        }
+    }
+
+    public void Update(IRandom random)
+    {
+        I = random.Next(1, 6);
+        J += 1;
+        K += 1;
+    }
+
+    public void MaybeIndent()
+    {
+        if (U == 0 && J % 2 == 0)
+        {
+            _io.Write("     ");
+        }
+    }
+    
+    public void ResetGroup(IReadWrite io)
+    {
+        J = 0;
+        io.WriteLine();
+    }
+
+    public bool MaybeCompleteStanza()
+    {
+        if (K > 20)
+        {
+            _io.WriteLine();
+            U = K = 0;
+            UseGroup2 = true;
+            return true;
+        }
+
+        return false;
+    }
+
+    public void SkipNextComma() => SkipComma = true;
 }
diff --git a/70_Poetry/csharp/IOExtensions.cs b/70_Poetry/csharp/IOExtensions.cs
deleted file mode 100644
index 631c80f8..00000000
--- a/70_Poetry/csharp/IOExtensions.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Poetry;
-
-internal static class IOExtensions
-{
-    internal static void WritePhrase(this IReadWrite io, Context context)
-        => Phrase.GetPhrase(context).Write(io, context);
-}
diff --git a/70_Poetry/csharp/Phrase.cs b/70_Poetry/csharp/Phrase.cs
index 3f00abae..919e8a71 100644
--- a/70_Poetry/csharp/Phrase.cs
+++ b/70_Poetry/csharp/Phrase.cs
@@ -16,7 +16,7 @@ internal class Phrase
         {
             new("beguiling me", ctx => ctx.U = 2),
             new("thrilled me"),
-            new("still sitting....", ctx => ctx.SkipComma = true),
+            new("still sitting....", ctx => ctx.SkipNextComma()),
             new("never flitting", ctx => ctx.U = 2),
             new("burned")
         },
@@ -73,7 +73,6 @@ internal class Phrase
 
     private static Phrase[] GetGroup(int groupNumber) => _phrases[Math.Max(groupNumber - 1, 0)];
 
-
     public void Write(IReadWrite io, Context context)
     {
         if (_condition.Invoke(context))
diff --git a/70_Poetry/csharp/Poem.cs b/70_Poetry/csharp/Poem.cs
index 64038963..03f3af68 100644
--- a/70_Poetry/csharp/Poem.cs
+++ b/70_Poetry/csharp/Poem.cs
@@ -8,53 +8,24 @@ internal class Poem
     {
         io.Write(Streams.Title);
 
-        var context = new Context();
+        var context = new Context(io, random);
 
         while (true)
         {
-            io.WritePhrase(context);
-
-            if (!context.SkipComma && random.NextFloat() <= 0.19F && context.U != 0)
-            {
-                io.Write(",");
-                context.U = 2;
-            }
-            context.SkipComma = false;
-
-            if (random.NextFloat() <= 0.65F)
-            {
-                io.Write(" ");
-                context.U += 1;
-            }
-            else
-            {
-                io.WriteLine();
-                context.U = 0;
-            }
+            context.WritePhrase();
+            context.MaybeWriteComma();
+            context.WriteSpaceOrNewLine();
 
             while (true)
             {
-                context.I = random.Next(1, 6);
-                context.J += 1;
-                context.K += 1;
+                context.Update(random);
+                context.MaybeIndent();
 
-                if (context.U == 0 && context.J % 2 == 0)
-                {
-                    io.Write("     ");
-                }
+                if (context.GroupNumberIsValid) { break; }
 
-                if (context.J < 5) { break; }
+                context.ResetGroup(io);
 
-                context.J = 0;
-                io.WriteLine();
-
-                if (context.K > 20)
-                {
-                    io.WriteLine();
-                    context.U = context.K = 0;
-                    context.UseGroup2 = true;
-                    break;
-                }
+                if (context.MaybeCompleteStanza()) { break; }
             }
         }
     }

From d8dd694ea49acb7d3743a1af0b9b20ca6da58c20 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Mon, 3 Oct 2022 22:19:51 +1100
Subject: [PATCH 030/198] Rationalise visibility of context values

---
 70_Poetry/csharp/Context.cs | 55 ++++++++++++++++++++++---------------
 70_Poetry/csharp/Phrase.cs  | 17 ++++--------
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/70_Poetry/csharp/Context.cs b/70_Poetry/csharp/Context.cs
index 9d340c8e..950c7c53 100644
--- a/70_Poetry/csharp/Context.cs
+++ b/70_Poetry/csharp/Context.cs
@@ -4,6 +4,11 @@ internal class Context
 {
     private readonly IReadWrite _io;
     private readonly IRandom _random;
+    private int _phraseNumber;
+    private int _groupNumber;
+    private bool _skipComma;
+    private int _lineCount;
+    private bool _useGroup2;
 
     public Context(IReadWrite io, IRandom random)
     {
@@ -11,14 +16,20 @@ internal class Context
         _random = random;
     }
 
-    public int I { get; set; }
-    public int J { get; set; }
-    public int K { get; set; }
-    public int U { get; set; }
-    public bool SkipComma { get; set; }
-    public bool UseGroup2 { get; set; }
-    public bool ShouldIndent => U == 0 && J % 2 == 0;
-    public bool GroupNumberIsValid => J < 5;
+    public int PhraseNumber => Math.Max(_phraseNumber - 1, 0); 
+
+    public int GroupNumber 
+    { 
+        get
+        {
+            var value = _useGroup2 ? 2 : _groupNumber;
+            _useGroup2 = false;
+            return Math.Max(value - 1, 0);
+        }
+    }
+
+    public int PhraseCount { get; set; }
+    public bool GroupNumberIsValid => _groupNumber < 5;
 
     public void WritePhrase()
     {
@@ -27,12 +38,12 @@ internal class Context
 
     public void MaybeWriteComma()
     {
-        if (!SkipComma && _random.NextFloat() <= 0.19F && U != 0)
+        if (!_skipComma && _random.NextFloat() <= 0.19F && PhraseCount != 0)
         {
             _io.Write(",");
-            U = 2;
+            PhraseCount = 2;
         }
-        SkipComma = false;
+        _skipComma = false;
     }
 
     public void WriteSpaceOrNewLine()
@@ -40,25 +51,25 @@ internal class Context
         if (_random.NextFloat() <= 0.65F)
         {
             _io.Write(" ");
-            U += 1;
+            PhraseCount += 1;
         }
         else
         {
             _io.WriteLine();
-            U = 0;
+            PhraseCount = 0;
         }
     }
 
     public void Update(IRandom random)
     {
-        I = random.Next(1, 6);
-        J += 1;
-        K += 1;
+        _phraseNumber = random.Next(1, 6);
+        _groupNumber += 1;
+        _lineCount += 1;
     }
 
     public void MaybeIndent()
     {
-        if (U == 0 && J % 2 == 0)
+        if (PhraseCount == 0 && _groupNumber % 2 == 0)
         {
             _io.Write("     ");
         }
@@ -66,22 +77,22 @@ internal class Context
     
     public void ResetGroup(IReadWrite io)
     {
-        J = 0;
+        _groupNumber = 0;
         io.WriteLine();
     }
 
     public bool MaybeCompleteStanza()
     {
-        if (K > 20)
+        if (_lineCount > 20)
         {
             _io.WriteLine();
-            U = K = 0;
-            UseGroup2 = true;
+            PhraseCount = _lineCount = 0;
+            _useGroup2 = true;
             return true;
         }
 
         return false;
     }
 
-    public void SkipNextComma() => SkipComma = true;
+    public void SkipNextComma() => _skipComma = true;
 }
diff --git a/70_Poetry/csharp/Phrase.cs b/70_Poetry/csharp/Phrase.cs
index 919e8a71..c1ac0866 100644
--- a/70_Poetry/csharp/Phrase.cs
+++ b/70_Poetry/csharp/Phrase.cs
@@ -2,7 +2,7 @@ namespace Poetry;
 
 internal class Phrase
 {
-    private static Phrase[][] _phrases = new Phrase[][]
+    private readonly static Phrase[][] _phrases = new Phrase[][]
     {
         new Phrase[]
         {
@@ -14,10 +14,10 @@ internal class Phrase
         },
         new Phrase[]
         {
-            new("beguiling me", ctx => ctx.U = 2),
+            new("beguiling me", ctx => ctx.PhraseCount = 2),
             new("thrilled me"),
             new("still sitting....", ctx => ctx.SkipNextComma()),
-            new("never flitting", ctx => ctx.U = 2),
+            new("never flitting", ctx => ctx.PhraseCount = 2),
             new("burned")
         },
         new Phrase[]
@@ -26,7 +26,7 @@ internal class Phrase
             new("darkness there"),
             new("shall be lifted"),
             new("quoth the raven"),
-            new(ctx => ctx.U != 0, "sign of parting")
+            new(ctx => ctx.PhraseCount != 0, "sign of parting")
         },
         new Phrase[]
         {
@@ -64,14 +64,7 @@ internal class Phrase
         _update = update;
     }
 
-    public static Phrase GetPhrase(Context context)
-    {
-        var group = GetGroup(context.UseGroup2 ? 2 : context.J);
-        context.UseGroup2 = false;
-        return group[Math.Max(context.I - 1, 0)];
-    }
-
-    private static Phrase[] GetGroup(int groupNumber) => _phrases[Math.Max(groupNumber - 1, 0)];
+    public static Phrase GetPhrase(Context context) => _phrases[context.GroupNumber][context.PhraseNumber];
 
     public void Write(IReadWrite io, Context context)
     {

From c18a1004a5042ca360f92a0c08044c10b8419626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=9Fur=20K=C3=BCpeli?= <uurkupeli@gmail.com>
Date: Tue, 4 Oct 2022 18:30:30 +0300
Subject: [PATCH 031/198] Rust implementation of 92 Trap

---
 92_Trap/rust/src/lib.rs  | 155 ---------------------------------------
 92_Trap/rust/src/main.rs | 111 ++++++++++++++++++++--------
 2 files changed, 80 insertions(+), 186 deletions(-)
 delete mode 100644 92_Trap/rust/src/lib.rs

diff --git a/92_Trap/rust/src/lib.rs b/92_Trap/rust/src/lib.rs
deleted file mode 100644
index d796a20a..00000000
--- a/92_Trap/rust/src/lib.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- lib.rs contains all the logic of the program
-*/
-use rand::{Rng, prelude::thread_rng}; //rng
-use std::error::Error; //better errors
-use std::io::{self, Write}; //io interactions
-use std::{str::FromStr, fmt::Display}; //traits
-
-//DATA
-
-/// handles setup for the game
-pub struct Config {
-}
-impl Config {
-    /// creates and returns a new Config from user input
-    pub fn new() -> Result<Config, Box<dyn Error>> {
-        //DATA
-        let config: Config = Config { 
-        };
-        
-        //return new config
-        return Ok(config);
-    }
-}
-
-/// run the program
-pub fn run(_config: &Config) -> Result<(), Box<dyn Error>> {
-    //DATA
-    let mut rng = thread_rng();
-    
-    let mut speed_train_1;
-    let mut time_difference;
-    let mut speed_train_2;
-
-    let mut guess;
-    let mut answer;
-    
-    let mut error:f32; 
-
-    //Game loop
-    loop {
-        //initialize variables
-        speed_train_1 =  rng.gen_range(40..65);
-        time_difference = rng.gen_range(5..20); 
-        speed_train_2 = rng.gen_range(20..39);
-
-        //print starting message / conditions
-        println!("A CAR TRAVELING {} MPH CAN MAKE A CERTAIN TRIP IN\n{} HOURS LESS THAN A TRAIN TRAVELING AT {} MPH",speed_train_1,time_difference,speed_train_2);
-        println!();
-
-        //get guess
-        guess = loop {
-            match get_number_from_input("HOW LONG DOES THE TRIP TAKE BY CAR?",0,-1) {
-                Ok(num) => break num,
-                Err(err) => {
-                    eprintln!("{}",err);
-                    continue;
-                },
-            }
-        };
-
-        //calculate answer and error
-        answer = time_difference * speed_train_2 / (speed_train_1 - speed_train_2);
-        error = ((answer - guess) as isize).abs() as f32 * 100.0/(guess as f32) + 0.5;
-
-        //check guess against answer
-        if error > 5.0 {
-            println!("SORRY, YOU WERE OFF BY {} PERCENT.", error);
-            println!("CORRECT ANSWER IS {} HOURS.",answer);
-        } else {
-            println!("GOOD! ANSWER WITHIN {} PERCENT.", error);
-        }
-
-        //ask user if they want to go again
-        match get_string_from_user_input("ANOTHER PROBLEM (Y/N)") {
-            Ok(s) => if !s.to_uppercase().eq("Y") {break;} else {continue;},
-            _ => break,
-        }
-    }
-
-    //return to main
-    Ok(())
-}
-
-/// gets a string from user input
-fn get_string_from_user_input(prompt: &str) -> Result<String, Box<dyn Error>> {
-    //DATA
-    let mut raw_input = String::new();
-
-    //print prompt
-    print!("{}", prompt);
-    //make sure it's printed before getting input
-    io::stdout().flush().expect("couldn't flush stdout");
-
-    //read user input from standard input, and store it to raw_input, then return it or an error as needed
-    raw_input.clear(); //clear input
-    match io::stdin().read_line(&mut raw_input) {
-        Ok(_num_bytes_read) => return Ok(String::from(raw_input.trim())),
-        Err(err) => return Err(format!("ERROR: CANNOT READ INPUT!: {}", err).into()),
-    }
-}
-/// generic function to get a number from the passed string (user input)
-/// pass a min lower  than the max to have minimum and maximum bounds
-/// pass a min higher than the max to only have a minimum bound
-/// pass a min equal   to  the max to only have a maximum bound
-/// 
-/// Errors:
-/// no number on user input
-fn get_number_from_input<T:Display + PartialOrd + FromStr>(prompt: &str, min:T, max:T) -> Result<T, Box<dyn Error>> {
-    //DATA
-    let raw_input: String;
-    let processed_input: String;
-
-    
-    //input loop
-    raw_input = loop {
-        match get_string_from_user_input(prompt) {
-            Ok(input) => break input,
-            Err(e) => {
-                eprintln!("{}",e);
-                continue;
-            },
-        }
-    };
-
-    //filter out non-numeric characters from user input
-    processed_input = raw_input.chars().filter(|c| c.is_numeric()).collect();
-
-    //from input, try to read a number
-    match processed_input.trim().parse() {
-        Ok(i) => {
-            //what bounds must the input fall into
-            if min < max {  //have a min and max bound: [min,max]
-                if i >= min && i <= max {//is input valid, within bounds
-                    return Ok(i); //exit the loop with the value i, returning it
-                } else { //print error message specific to this case
-                    return Err(format!("ONLY BETWEEN {} AND {}, PLEASE!", min, max).into());
-                } 
-            } else if min > max { //only a min bound: [min, infinity)
-                if i >= min {
-                    return Ok(i);
-                } else {
-                    return Err(format!("NO LESS THAN {}, PLEASE!", min).into());
-                }
-            } else { //only a max bound: (-infinity, max]
-                if i <= max {
-                    return Ok(i);
-                } else {
-                    return Err(format!("NO MORE THAN {}, PLEASE!", max).into());
-                }
-            }
-        },
-        Err(_e) => return Err(format!("Error: couldn't find a valid number in {}",raw_input).into()),
-    }
-}
diff --git a/92_Trap/rust/src/main.rs b/92_Trap/rust/src/main.rs
index 438f69be..5fc89876 100644
--- a/92_Trap/rust/src/main.rs
+++ b/92_Trap/rust/src/main.rs
@@ -1,41 +1,90 @@
-use std::process;//allows for some better error handling
+use std::io::stdin;
 
-mod lib; //allows access to lib.rs
-use lib::Config;
+use rand::Rng;
 
-/// main function
-/// responsibilities:
-/// - Calling the command line logic with the argument values
-/// - Setting up any other configuration
-/// - Calling a run function in lib.rs
-/// - Handling the error if run returns an error
 fn main() {
-    //greet user
-    welcome();
+    println!("\n\t\tTRAP");
+    println!("CREATIVE COMPUTING MORRISTOWN, NEW JERSEY\n");
 
-    // set up other configuration
-    let mut config = Config::new().unwrap_or_else(|err| {
-        eprintln!("Problem configuring program: {}", err);
-        process::exit(1);
-    });
+    let max_guess = 6;
+    let max_number = 100;
 
-    // run the program
-    if let Err(e) = lib::run(&mut config) {
-        eprintln!("Application Error: {}", e); //use the eprintln! macro to output to standard error
-        process::exit(1); //exit the program with an error code
+    prompt_instructions();
+
+    loop {
+        let number = rand::thread_rng().gen_range(1..(max_number + 1));
+        let mut guesses = 1u8;
+
+        loop {
+            let (min, max) = prompt_numbers(guesses);
+
+            if min == number && max == number {
+                println!("\nYou got it!!!");
+                break;
+            } else if (min..=max).contains(&number) {
+                println!("You have trapped my number.");
+            } else if number < min {
+                println!("My number is smaller than your trap numbers.");
+            } else if number > max {
+                println!("My number is bigger than your trap numbers.");
+            }
+
+            guesses += 1;
+            if guesses > max_guess {
+                println!("\nSorry, that was {max_guess} guesses. Number was {number}");
+                break;
+            }
+        }
+
+        println!("\nTry again.");
     }
-
-    //end of program
-    println!("THANKS FOR PLAYING!");
 }
 
-/// print the welcome message
-fn welcome() {
-    println!("
-                                Train
-              CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY
+fn prompt_instructions() {
+    println!("Instructions?\t");
 
-
-TIME - SPEED DISTANCE EXERCISE
-    ");
+    let mut input = String::new();
+    if let Ok(_) = stdin().read_line(&mut input) {
+        match input.to_uppercase().trim() {
+            "YES" | "Y" => {
+                println!("\nI am thinking of a number between 1 and 100");
+                println!("Try to guess my number. On each guess,");
+                println!("you are to enter 2 numbers, trying to trap");
+                println!("my number between the two numbers. I will");
+                println!("tell you if you have trapped my number, if my");
+                println!("number is larger than your two numbers, or if");
+                println!("my number is smaller than your two numbers.");
+                println!("If you want to guess one single number, type");
+                println!("your guess for both your trap numbers.");
+                println!("You get 6 guesses to get my number.");
+            }
+            _ => (),
+        }
+    }
+}
+
+fn prompt_numbers(guess: u8) -> (u8, u8) {
+    loop {
+        let mut nums: Vec<u8> = Vec::new();
+        println!("\nGuess # {guess} ?");
+
+        let mut input = String::new();
+        if let Ok(_) = stdin().read_line(&mut input) {
+            let input: Vec<&str> = input.trim().split(",").collect();
+
+            for string in input {
+                if let Ok(number) = string.parse::<u8>() {
+                    nums.push(number);
+                } else {
+                    break;
+                }
+            }
+
+            if nums.len() == 2 {
+                if nums[0] <= nums[1] {
+                    return (nums[0], nums[1]);
+                }
+            }
+        }
+    }
 }

From 06f2e8cc7ff83b6868a42ab0cc449692748be96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=9Fur=20K=C3=BCpeli?= <uurkupeli@gmail.com>
Date: Tue, 4 Oct 2022 18:31:45 +0300
Subject: [PATCH 032/198] Rust implementation

---
 92_Trap/rust/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/92_Trap/rust/README.md b/92_Trap/rust/README.md
index 7e85f9a1..362bf922 100644
--- a/92_Trap/rust/README.md
+++ b/92_Trap/rust/README.md
@@ -1,3 +1,3 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
-Conversion to [Rust](https://www.rust-lang.org/) by Anthony Rubick [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
+Conversion to [Rust](https://www.rust-lang.org/) by Uğur Küpeli [ugurkupeli](https://github.com/ugurkupeli)
\ No newline at end of file

From 739496dd68d68c6dd123c4a2bc542b254606f847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=9Fur=20K=C3=BCpeli?= <uurkupeli@gmail.com>
Date: Tue, 4 Oct 2022 21:59:02 +0300
Subject: [PATCH 033/198] rust implementation

---
 21_Calendar/rust/Cargo.toml  |   8 ++
 21_Calendar/rust/README.md   |   3 +
 21_Calendar/rust/src/main.rs | 152 +++++++++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+)
 create mode 100644 21_Calendar/rust/Cargo.toml
 create mode 100644 21_Calendar/rust/README.md
 create mode 100644 21_Calendar/rust/src/main.rs

diff --git a/21_Calendar/rust/Cargo.toml b/21_Calendar/rust/Cargo.toml
new file mode 100644
index 00000000..1ec69633
--- /dev/null
+++ b/21_Calendar/rust/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "rust"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/21_Calendar/rust/README.md b/21_Calendar/rust/README.md
new file mode 100644
index 00000000..e616424e
--- /dev/null
+++ b/21_Calendar/rust/README.md
@@ -0,0 +1,3 @@
+Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
+
+Conversion to [Rust](https://www.rust-lang.org/) by [Uğur Küpeli](https://github.com/ugurkupeli)
\ No newline at end of file
diff --git a/21_Calendar/rust/src/main.rs b/21_Calendar/rust/src/main.rs
new file mode 100644
index 00000000..a279f95d
--- /dev/null
+++ b/21_Calendar/rust/src/main.rs
@@ -0,0 +1,152 @@
+use std::io::stdin;
+
+const WIDTH: usize = 64;
+const DAYS_WIDTH: usize = WIDTH / 8;
+const MONTH_WIDTH: usize = WIDTH - (DAYS_WIDTH * 2);
+const DAY_NUMS_WIDTH: usize = WIDTH / 7;
+
+const DAYS: [&str; 7] = [
+    "SUNDAY",
+    "MONDAY",
+    "TUESDAY",
+    "WEDNESDAY",
+    "THURSDAY",
+    "FRIDAY",
+    "SATURDAY",
+];
+
+fn main() {
+    println!("\n\t\t CALENDAR");
+    println!("CREATIVE COMPUTING MORRISTOWN, NEW JERSEY\n");
+
+    let (starting_day, leap_year) = prompt();
+    let (months, total_days) = get_months_and_days(leap_year);
+
+    let mut days_passed = 0;
+    let mut current_day_index = DAYS.iter().position(|d| *d == starting_day).unwrap();
+
+    for (month, days) in months {
+        print_header(month, days_passed, total_days - days_passed);
+        print_days(&mut current_day_index, days);
+        days_passed += days as u16;
+        println!("\n");
+    }
+}
+
+fn prompt() -> (String, bool) {
+    let mut day = String::new();
+
+    loop {
+        println!("\nFirst day of the year?");
+        if let Ok(_) = stdin().read_line(&mut day) {
+            day = day.trim().to_uppercase();
+            if DAYS.contains(&day.as_str()) {
+                break;
+            } else {
+                day.clear();
+            }
+        }
+    }
+
+    let mut leap = false;
+
+    loop {
+        println!("Is this a leap year?");
+        let mut input = String::new();
+        if let Ok(_) = stdin().read_line(&mut input) {
+            match input.to_uppercase().trim() {
+                "Y" | "YES" => {
+                    leap = true;
+                    break;
+                }
+                "N" | "NO" => break,
+                _ => (),
+            }
+        }
+    }
+
+    println!();
+    (day, leap)
+}
+
+fn get_months_and_days(leap_year: bool) -> (Vec<(String, u8)>, u16) {
+    let months = [
+        "JANUARY",
+        "FEBUARY",
+        "MARCH",
+        "APRIL",
+        "MAY",
+        "JUNE",
+        "JULY",
+        "AUGUST",
+        "SEPTEMBER",
+        "OCTOBER",
+        "NOVEMBER",
+        "DECEMBER",
+    ];
+
+    let mut months_with_days = Vec::new();
+    let mut total_days: u16 = 0;
+
+    for (i, month) in months.iter().enumerate() {
+        let days = if i == 1 {
+            if leap_year {
+                29u8
+            } else {
+                28
+            }
+        } else if if i < 7 { (i % 2) == 0 } else { (i % 2) != 0 } {
+            31
+        } else {
+            30
+        };
+
+        total_days += days as u16;
+        months_with_days.push((month.to_string(), days));
+    }
+
+    (months_with_days, total_days)
+}
+
+fn print_between(s: String, w: usize, star: bool) {
+    let s = format!(" {s} ");
+    if star {
+        print!("{:*^w$}", s);
+        return;
+    }
+    print!("{:^w$}", s);
+}
+
+fn print_header(month: String, days_passed: u16, days_left: u16) {
+    print_between(days_passed.to_string(), DAYS_WIDTH, true);
+    print_between(month.to_string(), MONTH_WIDTH, true);
+    print_between(days_left.to_string(), DAYS_WIDTH, true);
+    println!();
+
+    for d in DAYS {
+        let d = d.chars().nth(0).unwrap();
+        print_between(d.to_string(), DAY_NUMS_WIDTH, false);
+    }
+    println!();
+
+    println!("{:*>WIDTH$}", "");
+}
+
+fn print_days(current_day_index: &mut usize, days: u8) {
+    let mut current_date = 1u8;
+
+    print!("{:>w$}", " ", w = DAY_NUMS_WIDTH * *current_day_index);
+
+    for _ in 1..=days {
+        print_between(current_date.to_string(), DAY_NUMS_WIDTH, false);
+
+        if ((*current_day_index + 1) % 7) == 0 {
+            *current_day_index = 0;
+            println!();
+        } else {
+            *current_day_index += 1;
+        }
+
+        current_date += 1;
+    }
+}

From 257ba1ab1799d56936f4187824703fb0a414ace4 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Wed, 5 Oct 2022 07:45:50 +1100
Subject: [PATCH 034/198] Capitalise first char of line

---
 70_Poetry/csharp/Context.cs | 17 ++++++++++++++---
 70_Poetry/csharp/Phrase.cs  |  2 +-
 70_Poetry/csharp/Poem.cs    |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/70_Poetry/csharp/Context.cs b/70_Poetry/csharp/Context.cs
index 950c7c53..a9297915 100644
--- a/70_Poetry/csharp/Context.cs
+++ b/70_Poetry/csharp/Context.cs
@@ -9,6 +9,7 @@ internal class Context
     private bool _skipComma;
     private int _lineCount;
     private bool _useGroup2;
+    private bool _atStartOfLine = true;
 
     public Context(IReadWrite io, IRandom random)
     {
@@ -34,6 +35,7 @@ internal class Context
     public void WritePhrase()
     {
         Phrase.GetPhrase(this).Write(_io, this);
+        _atStartOfLine = false;
     }
 
     public void MaybeWriteComma()
@@ -55,7 +57,7 @@ internal class Context
         }
         else
         {
-            _io.WriteLine();
+            EndLine();
             PhraseCount = 0;
         }
     }
@@ -75,10 +77,10 @@ internal class Context
         }
     }
     
-    public void ResetGroup(IReadWrite io)
+    public void ResetGroup()
     {
         _groupNumber = 0;
-        io.WriteLine();
+        EndLine();
     }
 
     public bool MaybeCompleteStanza()
@@ -94,5 +96,14 @@ internal class Context
         return false;
     }
 
+    internal string MaybeCapitalise(string text) =>
+        _atStartOfLine ? (char.ToUpper(text[0]) + text[1..]) : text;
+
     public void SkipNextComma() => _skipComma = true;
+
+    public void EndLine()
+    {
+        _io.WriteLine();
+        _atStartOfLine = true;
+    }
 }
diff --git a/70_Poetry/csharp/Phrase.cs b/70_Poetry/csharp/Phrase.cs
index c1ac0866..f70de30b 100644
--- a/70_Poetry/csharp/Phrase.cs
+++ b/70_Poetry/csharp/Phrase.cs
@@ -70,7 +70,7 @@ internal class Phrase
     {
         if (_condition.Invoke(context))
         {
-            io.Write(_text);
+            io.Write(context.MaybeCapitalise(_text));
         }
 
         _update.Invoke(context);
diff --git a/70_Poetry/csharp/Poem.cs b/70_Poetry/csharp/Poem.cs
index 03f3af68..fa3d5045 100644
--- a/70_Poetry/csharp/Poem.cs
+++ b/70_Poetry/csharp/Poem.cs
@@ -23,7 +23,7 @@ internal class Poem
 
                 if (context.GroupNumberIsValid) { break; }
 
-                context.ResetGroup(io);
+                context.ResetGroup();
 
                 if (context.MaybeCompleteStanza()) { break; }
             }

From d20a5781b6aaa7b55a3c004b8726d01255e40491 Mon Sep 17 00:00:00 2001
From: AnthonyMichaelTDM <68485672+AnthonyMichaelTDM@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:33:11 -0700
Subject: [PATCH 035/198] Rust implementation of 24_Chemist

---
 24_Chemist/rust/Cargo.toml  |   9 ++
 24_Chemist/rust/README.md   |   3 +
 24_Chemist/rust/src/lib.rs  | 158 ++++++++++++++++++++++++++++++++++++
 24_Chemist/rust/src/main.rs |  46 +++++++++++
 4 files changed, 216 insertions(+)
 create mode 100644 24_Chemist/rust/Cargo.toml
 create mode 100644 24_Chemist/rust/README.md
 create mode 100644 24_Chemist/rust/src/lib.rs
 create mode 100644 24_Chemist/rust/src/main.rs

diff --git a/24_Chemist/rust/Cargo.toml b/24_Chemist/rust/Cargo.toml
new file mode 100644
index 00000000..3b1d02f5
--- /dev/null
+++ b/24_Chemist/rust/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "rust"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.8.5"
diff --git a/24_Chemist/rust/README.md b/24_Chemist/rust/README.md
new file mode 100644
index 00000000..7e85f9a1
--- /dev/null
+++ b/24_Chemist/rust/README.md
@@ -0,0 +1,3 @@
+Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
+
+Conversion to [Rust](https://www.rust-lang.org/) by Anthony Rubick [AnthonyMichaelTDM](https://github.com/AnthonyMichaelTDM)
diff --git a/24_Chemist/rust/src/lib.rs b/24_Chemist/rust/src/lib.rs
new file mode 100644
index 00000000..b3618ccf
--- /dev/null
+++ b/24_Chemist/rust/src/lib.rs
@@ -0,0 +1,158 @@
+/*
+ lib.rs contains all the logic of the program
+*/
+use rand::{Rng, prelude::thread_rng}; //rng
+use std::error::Error; //better errors
+use std::io::{self, Write}; //io interactions
+use std::{str::FromStr, fmt::Display}; //traits
+
+//DATA
+
+/// handles setup for the game
+pub struct Config {
+}
+impl Config {
+    /// creates and returns a new Config from user input
+    pub fn new() -> Result<Config, Box<dyn Error>> {
+        //DATA
+        let config: Config = Config {
+        };
+        
+        //return new config
+        return Ok(config);
+    }
+}
+
+/// run the program
+pub fn run(_config: &Config) -> Result<(), Box<dyn Error>> {
+    //DATA
+    let mut rng = thread_rng();
+    let mut lives: i8 = 9;
+
+    let mut amount_of_acid:i8;
+
+    let mut guess:f32;
+    let mut answer:f32;
+    
+    let mut error:f32; 
+
+    //Game loop
+    loop {
+        //initialize variables
+        amount_of_acid =  rng.gen_range(1..50);
+        answer = 7.0 * (amount_of_acid as f32/3.0);
+
+        //print starting message / conditions
+        println!();
+        //get guess
+        guess = loop {
+            match get_number_from_input(&format!("{} Liters of Kryptocyanic acid.  How much water? ", amount_of_acid),0.0,-1.0) {
+                Ok(num) => break num,
+                Err(err) => {
+                    eprintln!("{}",err);
+                    continue;
+                },
+            }
+        };
+
+        //calculate error
+        error = (answer as f32 - guess).abs() / guess;
+        
+        println!("answer: {} | error: {}%", answer,error*100.);
+
+        //check guess against answer
+        if error > 0.05 { //error > 5%
+            println!(" Sizzle!  You may have just been desalinated into a blob");
+            println!(" of quivering protoplasm!");
+            //update lives
+            lives -= 1;
+
+            if lives <= 0 {
+                println!(" Your 9 lives are used, but you will be long remembered for");
+                println!(" your contributions to the field of comic book chemistry.");
+                break;
+            }
+            else {
+                println!(" However, you may try again with another life.")
+            } 
+        } else {
+            println!(" Good job!  You may breathe now, but don't inhale the fumes!");
+            println!();
+        }
+    }
+
+    //return to main
+    Ok(())
+}
+
+/// gets a string from user input
+fn get_string_from_user_input(prompt: &str) -> Result<String, Box<dyn Error>> {
+    //DATA
+    let mut raw_input = String::new();
+
+    //print prompt
+    print!("{}", prompt);
+    //make sure it's printed before getting input
+    io::stdout().flush().expect("couldn't flush stdout");
+
+    //read user input from standard input, and store it to raw_input, then return it or an error as needed
+    raw_input.clear(); //clear input
+    match io::stdin().read_line(&mut raw_input) {
+        Ok(_num_bytes_read) => return Ok(String::from(raw_input.trim())),
+        Err(err) => return Err(format!("ERROR: CANNOT READ INPUT!: {}", err).into()),
+    }
+}
+/// generic function to get a number from the passed string (user input)
+/// pass a min lower  than the max to have minimum and maximum bounds
+/// pass a min higher than the max to only have a minimum bound
+/// pass a min equal   to  the max to only have a maximum bound
+/// 
+/// Errors:
+/// no number on user input
+fn get_number_from_input<T:Display + PartialOrd + FromStr>(prompt: &str, min:T, max:T) -> Result<T, Box<dyn Error>> {
+    //DATA
+    let raw_input: String;
+    let processed_input: String;
+
+    
+    //input loop
+    raw_input = loop {
+        match get_string_from_user_input(prompt) {
+            Ok(input) => break input,
+            Err(e) => {
+                eprintln!("{}",e);
+                continue;
+            },
+        }
+    };
+
+    //filter out non-numeric characters from user input
+    processed_input = raw_input.chars().filter(|c| c.is_numeric()).collect();
+
+    //from input, try to read a number
+    match processed_input.trim().parse() {
+        Ok(i) => {
+            //what bounds must the input fall into
+            if min < max {  //have a min and max bound: [min,max]
+                if i >= min && i <= max {//is input valid, within bounds
+                    return Ok(i); //exit the loop with the value i, returning it
+                } else { //print error message specific to this case
+                    return Err(format!("ONLY BETWEEN {} AND {}, PLEASE!", min, max).into());
+                } 
+            } else if min > max { //only a min bound: [min, infinity)
+                if i >= min {
+                    return Ok(i);
+                } else {
+                    return Err(format!("NO LESS THAN {}, PLEASE!", min).into());
+                }
+            } else { //only a max bound: (-infinity, max]
+                if i <= max {
+                    return Ok(i);
+                } else {
+                    return Err(format!("NO MORE THAN {}, PLEASE!", max).into());
+                }
+            }
+        },
+        Err(_e) => return Err(format!("Error: couldn't find a valid number in {}",raw_input).into()),
+    }
+}
diff --git a/24_Chemist/rust/src/main.rs b/24_Chemist/rust/src/main.rs
new file mode 100644
index 00000000..91b1f86a
--- /dev/null
+++ b/24_Chemist/rust/src/main.rs
@@ -0,0 +1,46 @@
+use std::process;//allows for some better error handling
+
+mod lib; //allows access to lib.rs
+use lib::Config;
+
+/// main function
+/// responsibilities:
+/// - Calling the command line logic with the argument values
+/// - Setting up any other configuration
+/// - Calling a run function in lib.rs
+/// - Handling the error if run returns an error
+fn main() {
+    //greet user
+    welcome();
+
+    // set up other configuration
+    let mut config = Config::new().unwrap_or_else(|err| {
+        eprintln!("Problem configuring program: {}", err);
+        process::exit(1);
+    });
+
+    // run the program
+    if let Err(e) = lib::run(&mut config) {
+        eprintln!("Application Error: {}", e); //use the eprintln! macro to output to standard error
+        process::exit(1); //exit the program with an error code
+    }
+
+    //end of program
+    println!("THANKS FOR PLAYING!");
+}
+
+/// print the welcome message
+fn welcome() {
+    println!("
+                                Chemist
+              CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY
+
+
+The fictitious chemical kryptocyanic acid can only be
+diluted by the ratio of 7 parts water to 3 parts acid.
+If any other ratio is attempted, the acid becomes unstable
+and soon explodes.  Given the amount of acid, you must
+decide how much water to add for dilution.  If you miss
+you face the consequences.
+    ");
+}

From ab73a8b75c0b9653db3505553a2152df0e643c10 Mon Sep 17 00:00:00 2001
From: Anthony Rubick <68485672+AnthonyMichaelTDM@users.noreply.github.com>
Date: Tue, 4 Oct 2022 18:13:42 -0700
Subject: [PATCH 036/198] Update README.md

---
 24_Chemist/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/24_Chemist/README.md b/24_Chemist/README.md
index b36f0b04..fc62425a 100644
--- a/24_Chemist/README.md
+++ b/24_Chemist/README.md
@@ -17,5 +17,7 @@ http://www.vintage-basic.net/games.html
 
 (please note any difficulties or challenges in porting here)
 
+There is a type in the original Basic, "...DECIDE **WHO** MUCH WATER..." should be "DECIDE **HOW** MUCH WATER"
+
 #### External Links
  - C: https://github.com/ericfischer/basic-computer-games/blob/main/24%20Chemist/c/chemist.c

From 45df4253487f9c3f735006d8fc6a96473307401f Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Thu, 6 Oct 2022 16:10:27 +0200
Subject: [PATCH 037/198] Lua port and readme for 29_Craps added

---
 29_Craps/lua/README.md |  16 ++++-
 29_Craps/lua/craps.lua | 141 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 29_Craps/lua/craps.lua

diff --git a/29_Craps/lua/README.md b/29_Craps/lua/README.md
index c063f42f..091ddb4c 100644
--- a/29_Craps/lua/README.md
+++ b/29_Craps/lua/README.md
@@ -1,3 +1,17 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
-Conversion to [Lua](https://www.lua.org/)
+Conversion to [Lua](https://www.lua.org/) by Alex Conconi
+
+---
+
+#### Lua porting notes
+
+-  The `craps_main` function contains the main game loop, which iteratively
+plays craps rounds by calling `play_round` and tracks winnings and losings.
+- Replaced the original routine that tries to scramble the random number
+generator with a proper seed initializer in Lua: `math.randomseed(os.time())`
+(as advised in the general porting notes). 
+= Added basic input validation to accept only positive integers for the
+wager and the answer to the "If you want to play again print 5" question.
+- "If you want to play again print 5 if not print 2" reads a bit odd but
+we decided to leave it as is and stay true to the BASIC original version.
\ No newline at end of file
diff --git a/29_Craps/lua/craps.lua b/29_Craps/lua/craps.lua
new file mode 100644
index 00000000..cdb9c6e3
--- /dev/null
+++ b/29_Craps/lua/craps.lua
@@ -0,0 +1,141 @@
+--[[
+Craps
+
+From: BASIC Computer Games (1978)
+Edited by David H. Ahl
+
+    This game simulates the games of craps played according to standard
+    Nevada craps table rules. That is:
+    1. A 7 or 11 on the first roll wins
+    2. A 2, 3, or 12 on the first roll loses
+    3. Any other number rolled becomes your "point." You continue to roll;
+    if you get your point you win. If you roll a 7, you lose and the dice
+    change hands when this happens.
+
+    This version of craps was modified by Steve North of Creative Computing.
+    It is based on an original which appeared one day one a computer at DEC.
+
+
+Lua port by Alex Conconi, 2022
+--]]
+
+
+--- Throw two dice and return their sum.
+local function throw_dice()
+	return math.random(1, 6) + math.random(1, 6)
+end
+
+
+--- Print prompt and read a number > 0 from stdin.
+local function input_number(prompt)
+	while true do
+		io.write(prompt)
+		local number = tonumber(io.stdin:read("*l"))
+		if number and number > 0 then
+			return number
+		else
+			print("Please enter a number greater than zero.")
+		end
+	end
+end
+
+
+--- Play a round and return winnings or losings.
+local function play_round()
+    -- Input the wager
+    local wager = input_number("Input the amount of your wager: ")
+
+	-- Roll the die for the first time.
+	print("I will now throw the dice")
+	local first_roll = throw_dice()
+
+	-- A 7 or 11 on the first roll wins.
+	if first_roll == 7 or first_roll == 11 then
+		print(string.format("%d - natural.... a winner!!!!", first_roll))
+		print(string.format("%d pays even money, you win %d dollars", first_roll, wager))
+		return wager
+	end
+
+	-- A 2, 3, or 12 on the first roll loses.
+	if first_roll == 2 or first_roll == 3 or first_roll == 12 then
+		if first_roll == 2 then
+			-- Special 'you lose' message for 'snake eyes'
+			print(string.format("%d - snake eyes.... you lose.", first_roll))
+		else
+			-- Default 'you lose' message
+			print(string.format("%d - craps.... you lose.", first_roll))
+		end
+		print(string.format("You lose %d dollars", wager))
+		return -wager
+	end
+
+	-- Any other number rolled becomes your "point." You continue to roll;
+	-- if you get your point you win. If you roll a 7, you lose and the dice
+	-- change hands when this happens.
+	print(string.format("%d is the point. I will roll again", first_roll))
+	local second_roll
+	repeat
+		second_roll = throw_dice()
+		if second_roll == first_roll then
+			-- Player gets point and wins
+			print(string.format("%d - a winner.........congrats!!!!!!!!", first_roll))
+			print(string.format("%d at 2 to 1 odds pays you...let me see... %d dollars", first_roll, 2 * wager))
+			return 2 * wager
+		end
+		if second_roll == 7 then
+			-- Player gets 7 and loses
+			print(string.format("%d - craps. You lose.", second_roll))
+			print(string.format("You lose $ %d", wager))
+			return -wager
+		end
+		--  Continue to roll
+		print(string.format("%d  - no point. I will roll again", second_roll))
+	until second_roll == first_roll or second_roll == 7
+end
+
+
+--- Main game function.
+local function craps_main()
+	-- Print the introduction to the game
+	print(string.rep(" ", 32) .. "Craps")
+    print(string.rep(" ", 14) .. "Creative Computing  Morristown, New Jersey\n\n")
+	print("2,3,12 are losers; 4,5,6,8,9,10 are points; 7,11 are natural winners.")
+
+	-- Initialize random number generator seeed
+	math.randomseed(os.time())
+
+    -- Initialize balance to track winnings and losings
+	local balance = 0
+
+	-- Main game loop
+    local keep_playing = true
+	while keep_playing do
+		-- Play a round
+		balance = balance + play_round()
+
+		-- If player's answer is 5, then stop playing
+		keep_playing = (input_number("If you want to play again print 5 if not print 2: ") == 5)
+
+		-- Print an update on money won
+		if balance < 0 then
+			print(string.format("You are now under $%d", -balance))
+		elseif balance > 0 then
+			print(string.format("You are now ahead $%d", balance))
+		else
+			print("You are now even at 0")
+		end
+	end
+
+	-- Game over, print the goodbye message
+	if balance < 0 then
+		print("Too bad, you are in the hole. Come again.")
+	elseif balance > 0 then
+		print("Congratulations---you came out a winner. Come again.")
+	else
+		print("Congratulations---you came out even, not bad for an amateur")
+	end
+end
+
+
+--- Run the game.
+craps_main()

From 4dcde245f6b6391a2eed92b9f5dcfea8e8da049d Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Fri, 7 Oct 2022 18:59:43 +0200
Subject: [PATCH 038/198] added print_balance function, linting

---
 29_Craps/lua/craps.lua | 66 +++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/29_Craps/lua/craps.lua b/29_Craps/lua/craps.lua
index cdb9c6e3..063adad8 100644
--- a/29_Craps/lua/craps.lua
+++ b/29_Craps/lua/craps.lua
@@ -40,10 +40,22 @@ local function input_number(prompt)
 end
 
 
+--- Print custom balance message depending on balance value
+local function print_balance(balance, under_msg, ahead_msg, even_msg)
+	if balance < 0 then
+		print(under_msg)
+	elseif balance > 0 then
+		print(ahead_msg)
+	else
+		print(even_msg)
+	end
+end
+
+
 --- Play a round and return winnings or losings.
 local function play_round()
-    -- Input the wager
-    local wager = input_number("Input the amount of your wager: ")
+	-- Input the wager
+	local wager = input_number("Input the amount of your wager: ")
 
 	-- Roll the die for the first time.
 	print("I will now throw the dice")
@@ -69,13 +81,11 @@ local function play_round()
 		return -wager
 	end
 
-	-- Any other number rolled becomes your "point." You continue to roll;
-	-- if you get your point you win. If you roll a 7, you lose and the dice
-	-- change hands when this happens.
+	-- Any other number rolled becomes the "point".
+    -- Continue to roll until rolling a 7 or point.
 	print(string.format("%d is the point. I will roll again", first_roll))
-	local second_roll
-	repeat
-		second_roll = throw_dice()
+	while true do
+		local second_roll = throw_dice()
 		if second_roll == first_roll then
 			-- Player gets point and wins
 			print(string.format("%d - a winner.........congrats!!!!!!!!", first_roll))
@@ -83,14 +93,14 @@ local function play_round()
 			return 2 * wager
 		end
 		if second_roll == 7 then
-			-- Player gets 7 and loses
+			-- Player rolls a 7 and loses
 			print(string.format("%d - craps. You lose.", second_roll))
 			print(string.format("You lose $ %d", wager))
 			return -wager
 		end
 		--  Continue to roll
 		print(string.format("%d  - no point. I will roll again", second_roll))
-	until second_roll == first_roll or second_roll == 7
+	end
 end
 
 
@@ -98,17 +108,17 @@ end
 local function craps_main()
 	-- Print the introduction to the game
 	print(string.rep(" ", 32) .. "Craps")
-    print(string.rep(" ", 14) .. "Creative Computing  Morristown, New Jersey\n\n")
+	print(string.rep(" ", 14) .. "Creative Computing  Morristown, New Jersey\n\n")
 	print("2,3,12 are losers; 4,5,6,8,9,10 are points; 7,11 are natural winners.")
 
-	-- Initialize random number generator seeed
+	-- Initialize random number generator seed
 	math.randomseed(os.time())
 
-    -- Initialize balance to track winnings and losings
+	-- Initialize balance to track winnings and losings
 	local balance = 0
 
 	-- Main game loop
-    local keep_playing = true
+	local keep_playing = true
 	while keep_playing do
 		-- Play a round
 		balance = balance + play_round()
@@ -116,24 +126,22 @@ local function craps_main()
 		-- If player's answer is 5, then stop playing
 		keep_playing = (input_number("If you want to play again print 5 if not print 2: ") == 5)
 
-		-- Print an update on money won
-		if balance < 0 then
-			print(string.format("You are now under $%d", -balance))
-		elseif balance > 0 then
-			print(string.format("You are now ahead $%d", balance))
-		else
-			print("You are now even at 0")
-		end
+		-- Print an update on winnings or losings
+		print_balance(
+			balance,
+			string.format("You are now under $%d", -balance),
+			string.format("You are now ahead $%d", balance),
+			"You are now even at 0"
+		)
 	end
 
 	-- Game over, print the goodbye message
-	if balance < 0 then
-		print("Too bad, you are in the hole. Come again.")
-	elseif balance > 0 then
-		print("Congratulations---you came out a winner. Come again.")
-	else
-		print("Congratulations---you came out even, not bad for an amateur")
-	end
+	print_balance(
+		balance,
+		"Too bad, you are in the hole. Come again.",
+		"Congratulations---you came out a winner. Come again.",
+		"Congratulations---you came out even, not bad for an amateur"
+	)
 end
 
 

From 3a042277cd649fccb7829d86274313872f3efa11 Mon Sep 17 00:00:00 2001
From: AnthonyMichaelTDM <68485672+AnthonyMichaelTDM@users.noreply.github.com>
Date: Fri, 7 Oct 2022 16:41:07 -0700
Subject: [PATCH 039/198] update markdown_todo_rust

---
 00_Utilities/markdown_todo_rust/src/main.rs | 23 ++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/00_Utilities/markdown_todo_rust/src/main.rs b/00_Utilities/markdown_todo_rust/src/main.rs
index d1f49bf4..9df64567 100644
--- a/00_Utilities/markdown_todo_rust/src/main.rs
+++ b/00_Utilities/markdown_todo_rust/src/main.rs
@@ -1,4 +1,4 @@
-use std::ffi::{OsString, OsStr};
+use std::ffi::OsStr;
 use std::{fs, io};
 use std::fs::metadata;
 use std::path::{Path, PathBuf};
@@ -8,8 +8,6 @@ use std::path::{Path, PathBuf};
  * @author Anthony Rubick
  */
 
-
-
 //DATA
 const ROOT_DIR: &str = "../../";
 const LANGUAGES: [(&str,&str); 10] = [ //first element of tuple is the language name, second element is the file extension
@@ -25,13 +23,19 @@ const LANGUAGES: [(&str,&str); 10] = [ //first element of tuple is the language
     ("vbnet", "vb")
 ];
 const OUTPUT_PATH: &str = "../../todo.md";
-//const INGORE: [&str;5] = ["../../.git","../../.vscode","../../00_Utilities","../../buildJvm","../../node_modules"]; //folders to ignore
 
 fn main() {
     //DATA
     let mut root_folders:Vec<PathBuf>;
     let mut output_string: String = String::new();
     let format_game_first: bool;
+    let ingore: [PathBuf;5] = [
+        PathBuf::from(r"../../.git"),
+        PathBuf::from(r"../../.github"),
+        PathBuf::from(r"../../00_Alternate_Languages"),
+        PathBuf::from(r"../../00_Utilities"),
+        PathBuf::from(r"../../00_Common"),
+    ]; //folders to ignore
 
     //print welcome message
     println!("
@@ -66,15 +70,10 @@ fn main() {
 
     //for all folders, search for the languages and extensions
     root_folders = root_folders.into_iter().filter(|path| {
-        match fs::read_dir(path) {
-            Err(why) => {println!("! {:?}", why.kind()); false},
-            Ok(paths) => {
-                paths.into_iter().filter(|f| metadata(f.as_ref().unwrap().path()).unwrap().is_dir()) //filter to only folders
-                .filter_map( |path| path.ok() ) //extract only the DirEntries
-                .any(|f| LANGUAGES.iter().any(|tup| OsString::from(tup.1).eq_ignore_ascii_case(f.file_name()))) //filter out ones that don't contain folders with the language names
-            }
-        }
+        //not one of the ignored folders
+        !ingore.contains(path)
     }).collect();
+    root_folders.sort();
 
     //create todo list
     if format_game_first {

From 3bf29b6f123a3d38047000ad1855be7ec5d91869 Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Sat, 8 Oct 2022 13:08:17 +0200
Subject: [PATCH 040/198] minor edits

---
 29_Craps/lua/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/29_Craps/lua/README.md b/29_Craps/lua/README.md
index 091ddb4c..aac11dd0 100644
--- a/29_Craps/lua/README.md
+++ b/29_Craps/lua/README.md
@@ -4,14 +4,14 @@ Conversion to [Lua](https://www.lua.org/) by Alex Conconi
 
 ---
 
-#### Lua porting notes
+### Lua porting notes
 
 -  The `craps_main` function contains the main game loop, which iteratively
 plays craps rounds by calling `play_round` and tracks winnings and losings.
 - Replaced the original routine that tries to scramble the random number
 generator with a proper seed initializer in Lua: `math.randomseed(os.time())`
 (as advised in the general porting notes). 
-= Added basic input validation to accept only positive integers for the
+- Added basic input validation to accept only positive integers for the
 wager and the answer to the "If you want to play again print 5" question.
 - "If you want to play again print 5 if not print 2" reads a bit odd but
 we decided to leave it as is and stay true to the BASIC original version.
\ No newline at end of file

From 71d53f167ea4d937bebf5a57b380255df9e7167d Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Sat, 8 Oct 2022 20:16:30 +0200
Subject: [PATCH 041/198] linting, added porting notes for Lua

---
 33_Dice/lua/README.md | 10 +++++++++-
 33_Dice/lua/dice.lua  |  7 +++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/33_Dice/lua/README.md b/33_Dice/lua/README.md
index c063f42f..14d23cc2 100644
--- a/33_Dice/lua/README.md
+++ b/33_Dice/lua/README.md
@@ -1,3 +1,11 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
-Conversion to [Lua](https://www.lua.org/)
+Conversion to [Lua](https://www.lua.org/) by Alex Conconi
+
+---
+
+### Porting notes for Lua:
+
+- This is a straightfoward port with only minor modifications for input validation and text formatting.
+- The "Try again?" question accepts 'y', 'yes', 'n', 'no' (case insensitive), whereas the original BASIC version defaults to no unless 'YES' is typed.
+- The "How many rolls?" question presents a more user friendly message in case of invalid input.
diff --git a/33_Dice/lua/dice.lua b/33_Dice/lua/dice.lua
index 7b8d556a..17f9b8a6 100644
--- a/33_Dice/lua/dice.lua
+++ b/33_Dice/lua/dice.lua
@@ -26,9 +26,8 @@ Lua port by Alex Conconi, 2022.
 
 
 local function print_intro()
-    print("\n                   Dice")
-    print("Creative Computing  Morristown, New Jersey")
-    print("\n\n")
+    print("\n" .. string.rep(" ", 19) .. "Dice")
+    print("Creative Computing  Morristown, New Jersey\n\n")
     print("This program simulates the rolling of a")
     print("pair of dice.")
     print("You enter the number of times you want the computer to")
@@ -85,7 +84,7 @@ local function roll_dice(num_rolls)
 end
 
 
-function print_results(counts)
+local function print_results(counts)
     print("\nTotal Spots   Number of Times")
     for roll_total, count in pairs(counts) do
         print(string.format(" %-14d%d", roll_total, count))

From 97b28ee5b44ca2d97c3fdca845e9a82998ea63b0 Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Sat, 8 Oct 2022 20:52:11 +0200
Subject: [PATCH 042/198] converted indentation to spaces

---
 29_Craps/lua/craps.lua | 178 ++++++++++++++++++++---------------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/29_Craps/lua/craps.lua b/29_Craps/lua/craps.lua
index 063adad8..ddd1ce30 100644
--- a/29_Craps/lua/craps.lua
+++ b/29_Craps/lua/craps.lua
@@ -22,126 +22,126 @@ Lua port by Alex Conconi, 2022
 
 --- Throw two dice and return their sum.
 local function throw_dice()
-	return math.random(1, 6) + math.random(1, 6)
+    return math.random(1, 6) + math.random(1, 6)
 end
 
 
 --- Print prompt and read a number > 0 from stdin.
 local function input_number(prompt)
-	while true do
-		io.write(prompt)
-		local number = tonumber(io.stdin:read("*l"))
-		if number and number > 0 then
-			return number
-		else
-			print("Please enter a number greater than zero.")
-		end
-	end
+    while true do
+        io.write(prompt)
+        local number = tonumber(io.stdin:read("*l"))
+        if number and number > 0 then
+            return number
+        else
+            print("Please enter a number greater than zero.")
+        end
+    end
 end
 
 
 --- Print custom balance message depending on balance value
 local function print_balance(balance, under_msg, ahead_msg, even_msg)
-	if balance < 0 then
-		print(under_msg)
-	elseif balance > 0 then
-		print(ahead_msg)
-	else
-		print(even_msg)
-	end
+    if balance < 0 then
+        print(under_msg)
+    elseif balance > 0 then
+        print(ahead_msg)
+    else
+        print(even_msg)
+    end
 end
 
 
 --- Play a round and return winnings or losings.
 local function play_round()
-	-- Input the wager
-	local wager = input_number("Input the amount of your wager: ")
+    -- Input the wager
+    local wager = input_number("Input the amount of your wager: ")
 
-	-- Roll the die for the first time.
-	print("I will now throw the dice")
-	local first_roll = throw_dice()
+    -- Roll the die for the first time.
+    print("I will now throw the dice")
+    local first_roll = throw_dice()
 
-	-- A 7 or 11 on the first roll wins.
-	if first_roll == 7 or first_roll == 11 then
-		print(string.format("%d - natural.... a winner!!!!", first_roll))
-		print(string.format("%d pays even money, you win %d dollars", first_roll, wager))
-		return wager
-	end
+    -- A 7 or 11 on the first roll wins.
+    if first_roll == 7 or first_roll == 11 then
+        print(string.format("%d - natural.... a winner!!!!", first_roll))
+        print(string.format("%d pays even money, you win %d dollars", first_roll, wager))
+        return wager
+    end
 
-	-- A 2, 3, or 12 on the first roll loses.
-	if first_roll == 2 or first_roll == 3 or first_roll == 12 then
-		if first_roll == 2 then
-			-- Special 'you lose' message for 'snake eyes'
-			print(string.format("%d - snake eyes.... you lose.", first_roll))
-		else
-			-- Default 'you lose' message
-			print(string.format("%d - craps.... you lose.", first_roll))
-		end
-		print(string.format("You lose %d dollars", wager))
-		return -wager
-	end
+    -- A 2, 3, or 12 on the first roll loses.
+    if first_roll == 2 or first_roll == 3 or first_roll == 12 then
+        if first_roll == 2 then
+            -- Special 'you lose' message for 'snake eyes'
+            print(string.format("%d - snake eyes.... you lose.", first_roll))
+        else
+            -- Default 'you lose' message
+            print(string.format("%d - craps.... you lose.", first_roll))
+        end
+        print(string.format("You lose %d dollars", wager))
+        return -wager
+    end
 
-	-- Any other number rolled becomes the "point".
+    -- Any other number rolled becomes the "point".
     -- Continue to roll until rolling a 7 or point.
-	print(string.format("%d is the point. I will roll again", first_roll))
-	while true do
-		local second_roll = throw_dice()
-		if second_roll == first_roll then
-			-- Player gets point and wins
-			print(string.format("%d - a winner.........congrats!!!!!!!!", first_roll))
-			print(string.format("%d at 2 to 1 odds pays you...let me see... %d dollars", first_roll, 2 * wager))
-			return 2 * wager
-		end
-		if second_roll == 7 then
-			-- Player rolls a 7 and loses
-			print(string.format("%d - craps. You lose.", second_roll))
-			print(string.format("You lose $ %d", wager))
-			return -wager
-		end
-		--  Continue to roll
-		print(string.format("%d  - no point. I will roll again", second_roll))
-	end
+    print(string.format("%d is the point. I will roll again", first_roll))
+    while true do
+        local second_roll = throw_dice()
+        if second_roll == first_roll then
+            -- Player gets point and wins
+            print(string.format("%d - a winner.........congrats!!!!!!!!", first_roll))
+            print(string.format("%d at 2 to 1 odds pays you...let me see... %d dollars", first_roll, 2 * wager))
+            return 2 * wager
+        end
+        if second_roll == 7 then
+            -- Player rolls a 7 and loses
+            print(string.format("%d - craps. You lose.", second_roll))
+            print(string.format("You lose $ %d", wager))
+            return -wager
+        end
+        --  Continue to roll
+        print(string.format("%d  - no point. I will roll again", second_roll))
+    end
 end
 
 
 --- Main game function.
 local function craps_main()
-	-- Print the introduction to the game
-	print(string.rep(" ", 32) .. "Craps")
-	print(string.rep(" ", 14) .. "Creative Computing  Morristown, New Jersey\n\n")
-	print("2,3,12 are losers; 4,5,6,8,9,10 are points; 7,11 are natural winners.")
+    -- Print the introduction to the game
+    print(string.rep(" ", 32) .. "Craps")
+    print(string.rep(" ", 14) .. "Creative Computing  Morristown, New Jersey\n\n")
+    print("2,3,12 are losers; 4,5,6,8,9,10 are points; 7,11 are natural winners.")
 
-	-- Initialize random number generator seed
-	math.randomseed(os.time())
+    -- Initialize random number generator seed
+    math.randomseed(os.time())
 
-	-- Initialize balance to track winnings and losings
-	local balance = 0
+    -- Initialize balance to track winnings and losings
+    local balance = 0
 
-	-- Main game loop
-	local keep_playing = true
-	while keep_playing do
-		-- Play a round
-		balance = balance + play_round()
+    -- Main game loop
+    local keep_playing = true
+    while keep_playing do
+        -- Play a round
+        balance = balance + play_round()
 
-		-- If player's answer is 5, then stop playing
-		keep_playing = (input_number("If you want to play again print 5 if not print 2: ") == 5)
+        -- If player's answer is 5, then stop playing
+        keep_playing = (input_number("If you want to play again print 5 if not print 2: ") == 5)
 
-		-- Print an update on winnings or losings
-		print_balance(
-			balance,
-			string.format("You are now under $%d", -balance),
-			string.format("You are now ahead $%d", balance),
-			"You are now even at 0"
-		)
-	end
+        -- Print an update on winnings or losings
+        print_balance(
+            balance,
+            string.format("You are now under $%d", -balance),
+            string.format("You are now ahead $%d", balance),
+            "You are now even at 0"
+        )
+    end
 
-	-- Game over, print the goodbye message
-	print_balance(
-		balance,
-		"Too bad, you are in the hole. Come again.",
-		"Congratulations---you came out a winner. Come again.",
-		"Congratulations---you came out even, not bad for an amateur"
-	)
+    -- Game over, print the goodbye message
+    print_balance(
+        balance,
+        "Too bad, you are in the hole. Come again.",
+        "Congratulations---you came out a winner. Come again.",
+        "Congratulations---you came out even, not bad for an amateur"
+    )
 end
 
 

From 0d2b7c655974380fc143c030372313e03494f655 Mon Sep 17 00:00:00 2001
From: Jon Fetter-Degges <jonfetterdegges@gmail.com>
Date: Tue, 11 Oct 2022 12:43:22 -0400
Subject: [PATCH 043/198] Initial commit of Life in Rust

---
 55_Life/rust/Cargo.toml  |   8 ++
 55_Life/rust/src/main.rs | 253 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 261 insertions(+)
 create mode 100644 55_Life/rust/Cargo.toml
 create mode 100644 55_Life/rust/src/main.rs

diff --git a/55_Life/rust/Cargo.toml b/55_Life/rust/Cargo.toml
new file mode 100644
index 00000000..1ec69633
--- /dev/null
+++ b/55_Life/rust/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "rust"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/55_Life/rust/src/main.rs b/55_Life/rust/src/main.rs
new file mode 100644
index 00000000..d2901e6c
--- /dev/null
+++ b/55_Life/rust/src/main.rs
@@ -0,0 +1,253 @@
+use std::{io, thread, time};
+
+const HEIGHT:usize = 24;
+const WIDTH:usize = 70;
+
+// The BASIC implementation uses a 24x70 array of integers to represent the board state.
+// 1 is alive, 2 is about to die, 3 is about to be born, all other values are dead.
+// (I'm not actually sure whether there are other values besides zero.)
+// Here, we'll use an enum instead.
+#[derive(Clone, Copy, PartialEq)]
+enum CellState {
+    Empty,
+    Alive,
+    AboutToDie,
+    AboutToBeBorn
+}
+
+// Following the BASIC implementation, we will bound the board at 24 rows x 70 columns.
+// Since that isn't too big (even in the 70's), we just store the whole board as an
+// array of CellState. I'm experimenting with using an array-of-arrays to make references
+// more convenient.
+struct Board {
+    cells: [[CellState; WIDTH]; HEIGHT],
+    min_row: usize,
+    max_row: usize,
+    min_col: usize,
+    max_col: usize,
+    population: usize,
+    generation: usize,
+    invalid: bool
+}
+
+impl Board {
+    fn new() -> Board {
+        Board {
+            cells: [[CellState::Empty; WIDTH]; HEIGHT],
+            min_row: 0,
+            max_row: 0,
+            min_col: 0,
+            max_col: 0,
+            population: 0,
+            generation: 1,
+            invalid: false,
+        }
+    }
+}
+
+fn main() {
+    println!(); println!(); println!();
+    println!("Enter your pattern: ");
+    let mut board = parse_pattern(get_pattern());
+    loop {
+        finish_cell_transitions(&mut board);
+        print_board(&board);
+        update_bounds(&mut board);
+        update_board(&mut board);
+        if board.population == 0 {
+            break; // this isn't in the original implementation but I wanted it
+        }
+        delay();
+    }
+}
+
+fn get_pattern() -> Vec<String> {
+    let mut lines = Vec::new();
+    loop {
+        let mut line = String::new();
+        // read_line reads into the buffer (appending if it's not empty).
+        // It returns the number of characters read, including the newline. This will be 0 on EOF.
+        // unwrap() will panic and terminate the program if there is an error reading from stdin.
+        // I think that's reasonable behavior in this case.
+        let nread = io::stdin().read_line(&mut line).unwrap();
+        let line = line.trim_end();
+        if nread == 0 || line.eq_ignore_ascii_case("DONE") {
+            return lines;
+        }
+        lines.push(line.to_string());
+    }
+}
+
+fn parse_pattern(rows: Vec<String>) -> Board {
+    // A robust program would check the bounds of the inputs here. I'm not doing that,
+    // because the BASIC implementation didn't, and for me, part of the joy of these
+    // books back in the day was learning how my inputs could break things.
+
+    let mut board = Board::new();
+
+    // Strings are UTF-8 in Rust, so characters can take multiple bytes. We will convert
+    // each to a Vec<char> up front so that we don't have to do that conversion multiple
+    // times (to find the length of the strings in chars, then to parse each char).
+    // The into_iter() method consumes rows() so it can no longer be used.
+    let char_vecs = Vec::from_iter(rows.into_iter().map(|s| Vec::from_iter(s.chars())));
+
+    // The BASIC implementation puts the pattern roughly in the center of the board,
+    // assuming that there are no blank rows at the beginning or end, or blanks entered
+    // at the beginning or end of every row. It wouldn't be hard to check for that, but
+    // for now we'll preserve the original behavior.
+    let nrows = char_vecs.len();
+    let ncols = char_vecs.iter()
+        .map(|l| l.len())
+        .max()
+        .unwrap_or(0);  // handles the case where rows is empty
+
+    // Note that there's a subtlety here. The len() method returns a usize, i.e., an
+    // unsigned int, so the result type is the same. If nlines >= 24 or ncols >= 68, the
+    // result will wrap around to a giant value. These are stricter limits than you'd
+    // expect from just looking at the 24x70 bounds, but again, we're preserving the
+    // original behavior.
+    board.min_row = 11 - nrows / 2;
+    board.min_col = 33 - ncols / 2;
+    board.max_row = board.min_row + nrows - 1;
+    board.max_col = board.min_col + ncols - 1;
+
+    // Loop over the rows provided. The enumerate() method augments the iterator with an index.
+    for (row_index, pattern) in char_vecs.iter().enumerate()
+    {
+        let row = board.min_row + row_index;
+        // Now loop over the non-empty cells in the current row. filter_map takes a closure that
+        // returns an Option. If the Option is None, filter_map filters out that entry from the
+        // for loop. If it's Some(x), filter_map executes the loop body with the value x.
+        for col in pattern.iter().enumerate().filter_map(|(col_index, chr)| {
+                                if *chr == ' ' || (*chr == '.' && col_index == 0) {
+                                    None
+                                } else {
+                                    Some(board.min_col + col_index)
+                                }})
+        {
+            board.cells[row][col] = CellState::Alive;
+            board.population += 1;
+        }
+    }
+
+
+    board
+}
+
+fn finish_cell_transitions(board: &mut Board) {
+    for row in board.cells[board.min_row-1..=board.max_row+1].iter_mut() {
+        for cell in row[board.min_col-1..=board.max_col+1].iter_mut() {
+            if *cell == CellState::AboutToBeBorn {
+                *cell = CellState::Alive;
+                board.population += 1;
+            } else if *cell == CellState::AboutToDie {
+                *cell = CellState::Empty;
+                board.population -= 1;
+            }
+        }
+    }
+}
+
+fn print_board(board: &Board) {
+    println!(); println!(); println!();
+    println!("Generation: {}", board.generation);
+    println!("Population: {}", board.population);
+    if board.invalid {
+        println!("Invalid!");
+    }
+    for row_index in 0..HEIGHT {
+        for col_index in 0..WIDTH {
+            let rep = if board.cells[row_index][col_index] == CellState::Alive { "*" } else { " " };
+            print!("{rep}");
+        }
+        println!();
+    }
+}
+
+fn update_bounds(board: &mut Board) {
+    // In the BASIC implementation, this happens in the same loop that prints the board.
+    // We're breaking it out to improve separation of concerns.
+    // We could improve efficiency here by only searching one row outside the previous bounds.
+    board.min_row = HEIGHT;
+    board.max_row = 0;
+    board.min_col = WIDTH;
+    board.max_col = 0;
+    for (irow, row) in board.cells.iter().enumerate() {
+        let mut any_set = false;
+        for (icol, cell) in row.iter().enumerate() {
+            if *cell == CellState::Alive {
+                any_set = true;
+                if board.min_col > icol {
+                    board.min_col = icol;
+                }
+                if board.max_col < icol {
+                    board.max_col = icol;
+                }
+            }
+        }
+        if any_set {
+            if board.min_row > irow {
+                board.min_row = irow;
+            }
+            if board.max_row < irow {
+                board.max_row = irow;
+            }
+        }
+    }
+    // If anything is alive within two cells of the boundary, mark the board invalid and
+    // clamp the bounds. We need a two-cell margin because we'll count neighbors on cells
+    // one space outside the min/max, and when we count neighbors we go out by an
+    // additional space.
+    if board.min_row < 2 {
+        board.min_row = 2;
+        board.invalid = true;
+    }
+    if board.max_row > HEIGHT - 3 {
+        board.max_row = HEIGHT - 3;
+        board.invalid = true;
+    }
+    if board.min_col < 2 {
+        board.min_col = 2;
+        board.invalid = true;
+    }
+    if board.max_col > WIDTH - 3 {
+        board.max_col = WIDTH - 3;
+        board.invalid = true;
+    }
+}
+
+fn count_neighbors(board: &Board, row_index: usize, col_index: usize) -> i32 {
+    let mut count = 0;
+    assert!((1..=HEIGHT-2).contains(&row_index));
+    assert!((1..=WIDTH-2).contains(&col_index));
+    for i in row_index-1..=row_index+1 {
+        for j in col_index-1..=col_index+1 {
+            if i == row_index && j == col_index {
+                continue;
+            }
+            if board.cells[i][j] == CellState::Alive || board.cells [i][j] == CellState::AboutToDie {
+                count += 1;
+            }
+        }
+    }
+    count
+}
+
+fn update_board(board: &mut Board) {
+    for row_index in board.min_row-1..=board.max_row+1 {
+        for col_index in board.min_col-1..=board.max_col+1 {
+            let neighbors = count_neighbors(board, row_index, col_index);
+            let this_cell_state = &mut board.cells[row_index][col_index]; // borrow a mutable reference to the array cell
+            *this_cell_state = match *this_cell_state {
+                CellState::Empty if neighbors == 3 => CellState::AboutToBeBorn,
+                CellState::Alive if !(2..=3).contains(&neighbors) => CellState::AboutToDie,
+                _ => *this_cell_state
+            }
+        }
+    }
+    board.generation += 1;
+}
+
+fn delay() {
+    thread::sleep(time::Duration::from_millis(500));
+}

From a068af4bc9670470e5f82f1d9d52c1d2c77ad80c Mon Sep 17 00:00:00 2001
From: Jon Fetter-Degges <jonfetterdegges@gmail.com>
Date: Tue, 11 Oct 2022 16:26:28 -0400
Subject: [PATCH 044/198] Do bounds update in finish_cell_transitions

Merged the functionality of update_bounds into finish_cell_transitions,
eliminating a loop.
---
 55_Life/rust/src/main.rs | 107 +++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 55 deletions(-)

diff --git a/55_Life/rust/src/main.rs b/55_Life/rust/src/main.rs
index d2901e6c..d7ccb4e3 100644
--- a/55_Life/rust/src/main.rs
+++ b/55_Life/rust/src/main.rs
@@ -52,7 +52,6 @@ fn main() {
     loop {
         finish_cell_transitions(&mut board);
         print_board(&board);
-        update_bounds(&mut board);
         update_board(&mut board);
         if board.population == 0 {
             break; // this isn't in the original implementation but I wanted it
@@ -135,8 +134,16 @@ fn parse_pattern(rows: Vec<String>) -> Board {
 }
 
 fn finish_cell_transitions(board: &mut Board) {
-    for row in board.cells[board.min_row-1..=board.max_row+1].iter_mut() {
-        for cell in row[board.min_col-1..=board.max_col+1].iter_mut() {
+    // In the BASIC implementation, this happens in the same loop that prints the board.
+    // We're breaking it out to improve separation of concerns.
+    let mut min_row = HEIGHT - 1;
+    let mut max_row = 0usize;
+    let mut min_col = WIDTH - 1;
+    let mut max_col = 0usize;
+    for row_index in board.min_row-1..=board.max_row+1 {
+        let mut any_alive_this_row = false;
+        for col_index in board.min_col-1..=board.max_col+1 {
+            let cell = &mut board.cells[row_index][col_index];
             if *cell == CellState::AboutToBeBorn {
                 *cell = CellState::Alive;
                 board.population += 1;
@@ -144,8 +151,50 @@ fn finish_cell_transitions(board: &mut Board) {
                 *cell = CellState::Empty;
                 board.population -= 1;
             }
+            if *cell == CellState::Alive {
+                any_alive_this_row = true;
+                if min_col > col_index {
+                    min_col = col_index;
+                }
+                if max_col < col_index {
+                    max_col = col_index;
+                }
+            }
+        }
+        if any_alive_this_row {
+            if min_row > row_index {
+                min_row = row_index;
+            }
+            if max_row < row_index {
+                max_row = row_index;
+            }
         }
     }
+    // If anything is alive within two cells of the boundary, mark the board invalid and
+    // clamp the bounds. We need a two-cell margin because we'll count neighbors on cells
+    // one space outside the min/max, and when we count neighbors we go out by an
+    // additional space.
+    if min_row < 2 {
+        min_row = 2;
+        board.invalid = true;
+    }
+    if max_row > HEIGHT - 3 {
+        max_row = HEIGHT - 3;
+        board.invalid = true;
+    }
+    if min_col < 2 {
+        min_col = 2;
+        board.invalid = true;
+    }
+    if max_col > WIDTH - 3 {
+        max_col = WIDTH - 3;
+        board.invalid = true;
+    }
+
+    board.min_row = min_row;
+    board.max_row = max_row;
+    board.min_col = min_col;
+    board.max_col = max_col;
 }
 
 fn print_board(board: &Board) {
@@ -164,58 +213,6 @@ fn print_board(board: &Board) {
     }
 }
 
-fn update_bounds(board: &mut Board) {
-    // In the BASIC implementation, this happens in the same loop that prints the board.
-    // We're breaking it out to improve separation of concerns.
-    // We could improve efficiency here by only searching one row outside the previous bounds.
-    board.min_row = HEIGHT;
-    board.max_row = 0;
-    board.min_col = WIDTH;
-    board.max_col = 0;
-    for (irow, row) in board.cells.iter().enumerate() {
-        let mut any_set = false;
-        for (icol, cell) in row.iter().enumerate() {
-            if *cell == CellState::Alive {
-                any_set = true;
-                if board.min_col > icol {
-                    board.min_col = icol;
-                }
-                if board.max_col < icol {
-                    board.max_col = icol;
-                }
-            }
-        }
-        if any_set {
-            if board.min_row > irow {
-                board.min_row = irow;
-            }
-            if board.max_row < irow {
-                board.max_row = irow;
-            }
-        }
-    }
-    // If anything is alive within two cells of the boundary, mark the board invalid and
-    // clamp the bounds. We need a two-cell margin because we'll count neighbors on cells
-    // one space outside the min/max, and when we count neighbors we go out by an
-    // additional space.
-    if board.min_row < 2 {
-        board.min_row = 2;
-        board.invalid = true;
-    }
-    if board.max_row > HEIGHT - 3 {
-        board.max_row = HEIGHT - 3;
-        board.invalid = true;
-    }
-    if board.min_col < 2 {
-        board.min_col = 2;
-        board.invalid = true;
-    }
-    if board.max_col > WIDTH - 3 {
-        board.max_col = WIDTH - 3;
-        board.invalid = true;
-    }
-}
-
 fn count_neighbors(board: &Board, row_index: usize, col_index: usize) -> i32 {
     let mut count = 0;
     assert!((1..=HEIGHT-2).contains(&row_index));

From dc18b29aefa6f30d8a023e5b2137cfba047130ee Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Wed, 12 Oct 2022 08:48:08 +1000
Subject: [PATCH 045/198] add go for Acey Ducey

---
 .../01_Acey_Ducey/go/main.go                  | 112 ++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 00_Alternate_Languages/01_Acey_Ducey/go/main.go

diff --git a/00_Alternate_Languages/01_Acey_Ducey/go/main.go b/00_Alternate_Languages/01_Acey_Ducey/go/main.go
new file mode 100644
index 00000000..10e96589
--- /dev/null
+++ b/00_Alternate_Languages/01_Acey_Ducey/go/main.go
@@ -0,0 +1,112 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+)
+
+var welcome = `
+Acey-Ducey is played in the following manner
+The dealer (computer) deals two cards face up
+You have an option to bet or not bet depending
+on whether or not you feel the card will have
+a value between the first two.
+If you do not want to bet, input a 0
+  `
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+	scanner := bufio.NewScanner(os.Stdin)
+
+	fmt.Println(welcome)
+
+	for {
+		play(100)
+		fmt.Println("TRY AGAIN (YES OR NO)")
+		scanner.Scan()
+		response := scanner.Text()
+		if strings.ToUpper(response) != "YES" {
+			break
+		}
+	}
+
+	fmt.Println("O.K., HOPE YOU HAD FUN!")
+}
+
+func play(money int) {
+	scanner := bufio.NewScanner(os.Stdin)
+	var bet int
+
+	for {
+		// Shuffle the cards
+		cards := []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}
+		rand.Shuffle(len(cards), func(i, j int) { cards[i], cards[j] = cards[j], cards[i] })
+
+		// Take the first two for the dealer and sort
+		dealerCards := cards[0:2]
+		sort.Ints(dealerCards)
+
+		fmt.Printf("YOU NOW HAVE %d DOLLARS.\n\n", money)
+		fmt.Printf("HERE ARE YOUR NEXT TWO CARDS:\n%s\n%s", getCardName(dealerCards[0]), getCardName(dealerCards[1]))
+		fmt.Printf("\n\n")
+
+		//Check if Bet is Valid
+		for {
+			fmt.Println("WHAT IS YOUR BET:")
+			scanner.Scan()
+			b, err := strconv.Atoi(scanner.Text())
+			if err != nil {
+				fmt.Println("PLEASE ENTER A POSITIVE NUMBER")
+				continue
+			}
+			bet = b
+
+			if bet == 0 {
+				fmt.Printf("CHICKEN!\n\n")
+				goto there
+			}
+
+			if (bet > 0) && (bet <= money) {
+				break
+			}
+		}
+
+		// Draw Players Card
+		fmt.Printf("YOUR CARD: %s\n", getCardName(cards[2]))
+		if (cards[2] > dealerCards[0]) && (cards[2] < dealerCards[1]) {
+			fmt.Println("YOU WIN!!!")
+			money = money + bet
+		} else {
+			fmt.Println("SORRY, YOU LOSE")
+			money = money - bet
+		}
+		fmt.Println()
+
+		if money <= 0 {
+			fmt.Printf("%s\n", "SORRY, FRIEND, BUT YOU BLEW YOUR WAD.")
+			return
+		}
+	there:
+	}
+}
+
+func getCardName(c int) string {
+	switch c {
+	case 11:
+		return "JACK"
+	case 12:
+		return "QUEEN"
+	case 13:
+		return "KING"
+	case 14:
+		return "ACE"
+	default:
+		return strconv.Itoa(c)
+	}
+}

From 15724219b5500b903880d56907b7d8746bba298b Mon Sep 17 00:00:00 2001
From: Jon Fetter-Degges <jonfetterdegges@gmail.com>
Date: Tue, 11 Oct 2022 20:29:40 -0400
Subject: [PATCH 046/198] Input bounds checking, refactor and cleanup

get_pattern now checks the size of the input to prevent out of bounds
writes., and converts String to Vec<char> immediately.

Refactors: changed function names, ran rust-fmt, improved some comments
---
 55_Life/rust/src/main.rs | 95 +++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/55_Life/rust/src/main.rs b/55_Life/rust/src/main.rs
index d7ccb4e3..37e0f6c0 100644
--- a/55_Life/rust/src/main.rs
+++ b/55_Life/rust/src/main.rs
@@ -1,7 +1,7 @@
 use std::{io, thread, time};
 
-const HEIGHT:usize = 24;
-const WIDTH:usize = 70;
+const HEIGHT: usize = 24;
+const WIDTH: usize = 70;
 
 // The BASIC implementation uses a 24x70 array of integers to represent the board state.
 // 1 is alive, 2 is about to die, 3 is about to be born, all other values are dead.
@@ -12,7 +12,7 @@ enum CellState {
     Empty,
     Alive,
     AboutToDie,
-    AboutToBeBorn
+    AboutToBeBorn,
 }
 
 // Following the BASIC implementation, we will bound the board at 24 rows x 70 columns.
@@ -27,7 +27,7 @@ struct Board {
     max_col: usize,
     population: usize,
     generation: usize,
-    invalid: bool
+    invalid: bool,
 }
 
 impl Board {
@@ -52,84 +52,86 @@ fn main() {
     loop {
         finish_cell_transitions(&mut board);
         print_board(&board);
-        update_board(&mut board);
+        mark_cell_transitions(&mut board);
         if board.population == 0 {
-            break; // this isn't in the original implementation but I wanted it
+            break; // this isn't in the original implementation but it seemed better than
+                   // spewing blank screens
         }
         delay();
     }
 }
 
-fn get_pattern() -> Vec<String> {
+fn get_pattern() -> Vec<Vec<char>> {
+    let max_line_len = WIDTH - 4;
+    let max_line_count = HEIGHT - 4;
     let mut lines = Vec::new();
     loop {
         let mut line = String::new();
-        // read_line reads into the buffer (appending if it's not empty).
-        // It returns the number of characters read, including the newline. This will be 0 on EOF.
-        // unwrap() will panic and terminate the program if there is an error reading from stdin.
-        // I think that's reasonable behavior in this case.
+        // read_line reads into the buffer (appending if it's not empty). It returns the
+        // number of characters read, including the newline. This will be 0 on EOF.
+        // unwrap() will panic and terminate the program if there is an error reading
+        // from stdin. That's reasonable behavior in this case.
         let nread = io::stdin().read_line(&mut line).unwrap();
         let line = line.trim_end();
         if nread == 0 || line.eq_ignore_ascii_case("DONE") {
             return lines;
         }
-        lines.push(line.to_string());
+        // Handle Unicode by converting the string to a vector of characters up front. We
+        // do this here because we care about lengths and column alignment, so we might
+        // as well just do the Unicode parsing once.
+        let line = Vec::from_iter(line.chars());
+        if line.len() > max_line_len {
+            println!("Line too long - the maximum is {max_line_len} characters.");
+            continue;
+        }
+        lines.push(line);
+        if lines.len() == max_line_count {
+            println!("Maximum line count reached. Starting simulation.");
+            return lines;
+        }
     }
 }
 
-fn parse_pattern(rows: Vec<String>) -> Board {
-    // A robust program would check the bounds of the inputs here. I'm not doing that,
-    // because the BASIC implementation didn't, and for me, part of the joy of these
-    // books back in the day was learning how my inputs could break things.
+fn parse_pattern(rows: Vec<Vec<char>>) -> Board {
+    // This function assumes that the input pattern in rows is in-bounds. If the pattern
+    // is too large, this function will panic. get_pattern checks the size of the input,
+    // so it is safe to call this function with its results.
 
     let mut board = Board::new();
 
-    // Strings are UTF-8 in Rust, so characters can take multiple bytes. We will convert
-    // each to a Vec<char> up front so that we don't have to do that conversion multiple
-    // times (to find the length of the strings in chars, then to parse each char).
-    // The into_iter() method consumes rows() so it can no longer be used.
-    let char_vecs = Vec::from_iter(rows.into_iter().map(|s| Vec::from_iter(s.chars())));
-
     // The BASIC implementation puts the pattern roughly in the center of the board,
     // assuming that there are no blank rows at the beginning or end, or blanks entered
     // at the beginning or end of every row. It wouldn't be hard to check for that, but
     // for now we'll preserve the original behavior.
-    let nrows = char_vecs.len();
-    let ncols = char_vecs.iter()
-        .map(|l| l.len())
-        .max()
-        .unwrap_or(0);  // handles the case where rows is empty
+    let nrows = rows.len();
+    let ncols = rows.iter().map(|l| l.len()).max().unwrap_or(0); // handles the case where rows is empty
 
-    // Note that there's a subtlety here. The len() method returns a usize, i.e., an
-    // unsigned int, so the result type is the same. If nlines >= 24 or ncols >= 68, the
-    // result will wrap around to a giant value. These are stricter limits than you'd
-    // expect from just looking at the 24x70 bounds, but again, we're preserving the
-    // original behavior.
+    // If nrows >= 24 or ncols >= 68, these assignments will wrap around to large values.
+    // The array accesses below will then be out of bounds. Rust will bounds-check them
+    // and panic rather than performing an invalid access.
     board.min_row = 11 - nrows / 2;
     board.min_col = 33 - ncols / 2;
     board.max_row = board.min_row + nrows - 1;
     board.max_col = board.min_col + ncols - 1;
 
     // Loop over the rows provided. The enumerate() method augments the iterator with an index.
-    for (row_index, pattern) in char_vecs.iter().enumerate()
-    {
+    for (row_index, pattern) in rows.iter().enumerate() {
         let row = board.min_row + row_index;
         // Now loop over the non-empty cells in the current row. filter_map takes a closure that
         // returns an Option. If the Option is None, filter_map filters out that entry from the
         // for loop. If it's Some(x), filter_map executes the loop body with the value x.
         for col in pattern.iter().enumerate().filter_map(|(col_index, chr)| {
-                                if *chr == ' ' || (*chr == '.' && col_index == 0) {
-                                    None
-                                } else {
-                                    Some(board.min_col + col_index)
-                                }})
-        {
+            if *chr == ' ' || (*chr == '.' && col_index == 0) {
+                None
+            } else {
+                Some(board.min_col + col_index)
+            }
+        }) {
             board.cells[row][col] = CellState::Alive;
             board.population += 1;
         }
     }
 
-
     board
 }
 
@@ -214,15 +216,16 @@ fn print_board(board: &Board) {
 }
 
 fn count_neighbors(board: &Board, row_index: usize, col_index: usize) -> i32 {
+    // Simply loop over all the immediate neighbors of a cell. We assume that the row and
+    // column indices are not on (or outside) the boundary of the arrays; if they are,
+    // the function will panic instead of going out of bounds.
     let mut count = 0;
-    assert!((1..=HEIGHT-2).contains(&row_index));
-    assert!((1..=WIDTH-2).contains(&col_index));
     for i in row_index-1..=row_index+1 {
         for j in col_index-1..=col_index+1 {
             if i == row_index && j == col_index {
                 continue;
             }
-            if board.cells[i][j] == CellState::Alive || board.cells [i][j] == CellState::AboutToDie {
+            if board.cells[i][j] == CellState::Alive || board.cells[i][j] == CellState::AboutToDie {
                 count += 1;
             }
         }
@@ -230,7 +233,7 @@ fn count_neighbors(board: &Board, row_index: usize, col_index: usize) -> i32 {
     count
 }
 
-fn update_board(board: &mut Board) {
+fn mark_cell_transitions(board: &mut Board) {
     for row_index in board.min_row-1..=board.max_row+1 {
         for col_index in board.min_col-1..=board.max_col+1 {
             let neighbors = count_neighbors(board, row_index, col_index);
@@ -238,7 +241,7 @@ fn update_board(board: &mut Board) {
             *this_cell_state = match *this_cell_state {
                 CellState::Empty if neighbors == 3 => CellState::AboutToBeBorn,
                 CellState::Alive if !(2..=3).contains(&neighbors) => CellState::AboutToDie,
-                _ => *this_cell_state
+                _ => *this_cell_state,
             }
         }
     }

From 6e46aba249410a1b0e88ae09406b60e5c0433dae Mon Sep 17 00:00:00 2001
From: Jon Fetter-Degges <jonfetterdegges@gmail.com>
Date: Tue, 11 Oct 2022 21:34:40 -0400
Subject: [PATCH 047/198] README file for the Rust port

---
 55_Life/rust/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 55_Life/rust/README.md

diff --git a/55_Life/rust/README.md b/55_Life/rust/README.md
new file mode 100644
index 00000000..7bd5dd22
--- /dev/null
+++ b/55_Life/rust/README.md
@@ -0,0 +1,20 @@
+# Conway's Life
+
+Original from David Ahl's _Basic Computer Games_, downloaded from http://www.vintage-basic.net/games.html.
+
+Ported to Rust by Jon Fetter-Degges
+
+Developed and tested on Rust 1.64.0
+
+## How to Run
+
+Install Rust using the instructions at [rust-lang.org](https://www.rust-lang.org/tools/install).
+
+At a command or shell prompt in the `rust` subdirectory, enter `cargo run`.
+
+## Differences from Original Behavior
+
+* The simulation stops if all cells die.
+* Input of more than 66 columns is rejected. Input will automatically terminate after 20 rows. Beyond these bounds, the original
+implementation would have marked the board as invalid, and beyond 68 cols/24 rows it would have had an out of bounds array access.
+* The check for the string "DONE" at the end of input is case-independent.

From 14e59ac5fe3a86a2fde1466859865a255cd999ab Mon Sep 17 00:00:00 2001
From: Jon Fetter-Degges <jonfetterdegges@gmail.com>
Date: Tue, 11 Oct 2022 21:37:05 -0400
Subject: [PATCH 048/198] Improve printing, make output closer to original

Implemented Display for CellState, and tweaked outputs to match the
BASIC implementation.

Also fixed some more comments.
---
 55_Life/rust/src/main.rs | 59 ++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/55_Life/rust/src/main.rs b/55_Life/rust/src/main.rs
index 37e0f6c0..0cfe707f 100644
--- a/55_Life/rust/src/main.rs
+++ b/55_Life/rust/src/main.rs
@@ -1,12 +1,24 @@
-use std::{io, thread, time};
+// Rust implementation of David Ahl's implementation of Conway's Life
+//
+// Jon Fetter-Degges
+// October 2022
+
+// I am a Rust newbie. Corrections and suggestions are welcome.
+
+use std::{fmt, io, thread, time};
 
 const HEIGHT: usize = 24;
 const WIDTH: usize = 70;
 
 // The BASIC implementation uses a 24x70 array of integers to represent the board state.
-// 1 is alive, 2 is about to die, 3 is about to be born, all other values are dead.
-// (I'm not actually sure whether there are other values besides zero.)
-// Here, we'll use an enum instead.
+// 1 is alive, 2 is about to die, 3 is about to be born, 0 is dead. Here, we'll use an
+// enum instead.
+// Deriving Copy (which requires Clone) allows us to use this enum value in assignments.
+// Without that we would only be able to borrow it. That seems silly for a simple enum
+// like this one - it is required because enums can have large amounts of associated
+// data, so the programmer needs to decide whether to allow copying. Similarly, PartialEq
+// allows use of the == comparison. Again, this seems silly for a simple enum, but if
+// some enum cases have associated data, it may require some thought.
 #[derive(Clone, Copy, PartialEq)]
 enum CellState {
     Empty,
@@ -15,6 +27,20 @@ enum CellState {
     AboutToBeBorn,
 }
 
+// Support direct printing of the cell. In this program cells will only be Alive or Empty
+// when they are printed.
+impl fmt::Display for CellState {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let rep = match *self {
+            CellState::Empty => ' ',
+            CellState::Alive => '*',
+            CellState::AboutToDie => 'o',
+            CellState::AboutToBeBorn => '.',
+        };
+        write!(f, "{}", rep)
+    }
+}
+
 // Following the BASIC implementation, we will bound the board at 24 rows x 70 columns.
 // Since that isn't too big (even in the 70's), we just store the whole board as an
 // array of CellState. I'm experimenting with using an array-of-arrays to make references
@@ -39,7 +65,7 @@ impl Board {
             min_col: 0,
             max_col: 0,
             population: 0,
-            generation: 1,
+            generation: 0,
             invalid: false,
         }
     }
@@ -47,6 +73,8 @@ impl Board {
 
 fn main() {
     println!(); println!(); println!();
+    println!("{:33}{}", " ", "Life");
+    println!("{:14}{}", " ", "Creative Computing  Morristown, New Jersey");
     println!("Enter your pattern: ");
     let mut board = parse_pattern(get_pattern());
     loop {
@@ -104,11 +132,14 @@ fn parse_pattern(rows: Vec<Vec<char>>) -> Board {
     // at the beginning or end of every row. It wouldn't be hard to check for that, but
     // for now we'll preserve the original behavior.
     let nrows = rows.len();
-    let ncols = rows.iter().map(|l| l.len()).max().unwrap_or(0); // handles the case where rows is empty
+    // If rows is empty, the call to max will return None. The unwrap_or then provides a
+    // default value
+    let ncols = rows.iter().map(|l| l.len()).max().unwrap_or(0);
 
-    // If nrows >= 24 or ncols >= 68, these assignments will wrap around to large values.
-    // The array accesses below will then be out of bounds. Rust will bounds-check them
-    // and panic rather than performing an invalid access.
+    // The min and max values here are unsigned. If nrows >= 24 or ncols >= 68, these
+    // assignments will panic - they do not wrap around unless we use a function with
+    // that specific behavior. Again, we expect bounds checking on the input before this
+    // function is called.
     board.min_row = 11 - nrows / 2;
     board.min_col = 33 - ncols / 2;
     board.max_row = board.min_row + nrows - 1;
@@ -201,15 +232,15 @@ fn finish_cell_transitions(board: &mut Board) {
 
 fn print_board(board: &Board) {
     println!(); println!(); println!();
-    println!("Generation: {}", board.generation);
-    println!("Population: {}", board.population);
+    print!("Generation: {} Population: {}", board.generation, board.population);
     if board.invalid {
-        println!("Invalid!");
+        print!("Invalid!");
     }
+    println!();
     for row_index in 0..HEIGHT {
         for col_index in 0..WIDTH {
-            let rep = if board.cells[row_index][col_index] == CellState::Alive { "*" } else { " " };
-            print!("{rep}");
+            // This print will use the Display implementation for cell_state, above.
+            print!("{}", board.cells[row_index][col_index]);
         }
         println!();
     }

From 5214f2a68117d3964ab79d9bdfe0382546aaa8ed Mon Sep 17 00:00:00 2001
From: Jon Fetter-Degges <jonfetterdegges@gmail.com>
Date: Tue, 11 Oct 2022 21:49:40 -0400
Subject: [PATCH 049/198] One more implementation note

---
 55_Life/rust/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/55_Life/rust/README.md b/55_Life/rust/README.md
index 7bd5dd22..3cce8366 100644
--- a/55_Life/rust/README.md
+++ b/55_Life/rust/README.md
@@ -15,6 +15,7 @@ At a command or shell prompt in the `rust` subdirectory, enter `cargo run`.
 ## Differences from Original Behavior
 
 * The simulation stops if all cells die.
+* `.` at the beginning of an input line is supported but optional.
 * Input of more than 66 columns is rejected. Input will automatically terminate after 20 rows. Beyond these bounds, the original
 implementation would have marked the board as invalid, and beyond 68 cols/24 rows it would have had an out of bounds array access.
 * The check for the string "DONE" at the end of input is case-independent.

From 7b929ecbb1cd7ee43acc1e01423f5f37737e126e Mon Sep 17 00:00:00 2001
From: Jon Fetter-Degges <jonfetterdegges@gmail.com>
Date: Tue, 11 Oct 2022 22:03:57 -0400
Subject: [PATCH 050/198] Small fixes and use min/max

---
 55_Life/rust/README.md   |  1 +
 55_Life/rust/src/main.rs | 43 +++++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/55_Life/rust/README.md b/55_Life/rust/README.md
index 3cce8366..19f2d09d 100644
--- a/55_Life/rust/README.md
+++ b/55_Life/rust/README.md
@@ -19,3 +19,4 @@ At a command or shell prompt in the `rust` subdirectory, enter `cargo run`.
 * Input of more than 66 columns is rejected. Input will automatically terminate after 20 rows. Beyond these bounds, the original
 implementation would have marked the board as invalid, and beyond 68 cols/24 rows it would have had an out of bounds array access.
 * The check for the string "DONE" at the end of input is case-independent.
+* The program pauses for half a second between each generation.
diff --git a/55_Life/rust/src/main.rs b/55_Life/rust/src/main.rs
index 0cfe707f..0c1e83cc 100644
--- a/55_Life/rust/src/main.rs
+++ b/55_Life/rust/src/main.rs
@@ -5,7 +5,7 @@
 
 // I am a Rust newbie. Corrections and suggestions are welcome.
 
-use std::{fmt, io, thread, time};
+use std::{cmp, fmt, io, thread, time};
 
 const HEIGHT: usize = 24;
 const WIDTH: usize = 70;
@@ -42,9 +42,8 @@ impl fmt::Display for CellState {
 }
 
 // Following the BASIC implementation, we will bound the board at 24 rows x 70 columns.
-// Since that isn't too big (even in the 70's), we just store the whole board as an
-// array of CellState. I'm experimenting with using an array-of-arrays to make references
-// more convenient.
+// The board is an array of CellState. Using an array of arrays gives us bounds checking
+// in both dimensions.
 struct Board {
     cells: [[CellState; WIDTH]; HEIGHT],
     min_row: usize,
@@ -145,12 +144,13 @@ fn parse_pattern(rows: Vec<Vec<char>>) -> Board {
     board.max_row = board.min_row + nrows - 1;
     board.max_col = board.min_col + ncols - 1;
 
-    // Loop over the rows provided. The enumerate() method augments the iterator with an index.
+    // Loop over the rows provided. enumerate() augments the iterator with an index.
     for (row_index, pattern) in rows.iter().enumerate() {
         let row = board.min_row + row_index;
-        // Now loop over the non-empty cells in the current row. filter_map takes a closure that
-        // returns an Option. If the Option is None, filter_map filters out that entry from the
-        // for loop. If it's Some(x), filter_map executes the loop body with the value x.
+        // Now loop over the non-empty cells in the current row. filter_map takes a
+        // closure that returns an Option. If the Option is None, filter_map filters out
+        // that entry from the for loop. If it's Some(x), filter_map executes the loop
+        // body with the value x.
         for col in pattern.iter().enumerate().filter_map(|(col_index, chr)| {
             if *chr == ' ' || (*chr == '.' && col_index == 0) {
                 None
@@ -186,22 +186,14 @@ fn finish_cell_transitions(board: &mut Board) {
             }
             if *cell == CellState::Alive {
                 any_alive_this_row = true;
-                if min_col > col_index {
-                    min_col = col_index;
-                }
-                if max_col < col_index {
-                    max_col = col_index;
-                }
+                min_col = cmp::min(min_col, col_index);
+                max_col = cmp::max(max_col, col_index);
             }
         }
         if any_alive_this_row {
-            if min_row > row_index {
-                min_row = row_index;
-            }
-            if max_row < row_index {
-                max_row = row_index;
-            }
-        }
+            min_row = cmp::min(min_row, row_index);
+            max_row = cmp::max(max_row, row_index);
+    }
     }
     // If anything is alive within two cells of the boundary, mark the board invalid and
     // clamp the bounds. We need a two-cell margin because we'll count neighbors on cells
@@ -232,14 +224,14 @@ fn finish_cell_transitions(board: &mut Board) {
 
 fn print_board(board: &Board) {
     println!(); println!(); println!();
-    print!("Generation: {} Population: {}", board.generation, board.population);
+    print!("Generation: {}  Population: {}", board.generation, board.population);
     if board.invalid {
-        print!("Invalid!");
+        print!("  Invalid!");
     }
     println!();
     for row_index in 0..HEIGHT {
         for col_index in 0..WIDTH {
-            // This print will use the Display implementation for cell_state, above.
+            // This print uses the Display implementation for cell_state, above.
             print!("{}", board.cells[row_index][col_index]);
         }
         println!();
@@ -268,7 +260,8 @@ fn mark_cell_transitions(board: &mut Board) {
     for row_index in board.min_row-1..=board.max_row+1 {
         for col_index in board.min_col-1..=board.max_col+1 {
             let neighbors = count_neighbors(board, row_index, col_index);
-            let this_cell_state = &mut board.cells[row_index][col_index]; // borrow a mutable reference to the array cell
+            // Borrow a mutable reference to the array cell
+            let this_cell_state = &mut board.cells[row_index][col_index];
             *this_cell_state = match *this_cell_state {
                 CellState::Empty if neighbors == 3 => CellState::AboutToBeBorn,
                 CellState::Alive if !(2..=3).contains(&neighbors) => CellState::AboutToDie,

From 5e3e7d60aee112dcccd4822baa4ff8345be4f6fb Mon Sep 17 00:00:00 2001
From: Jon Fetter-Degges <jonfetterdegges@gmail.com>
Date: Tue, 11 Oct 2022 22:18:32 -0400
Subject: [PATCH 051/198] couple more comment changes

---
 55_Life/rust/src/main.rs | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/55_Life/rust/src/main.rs b/55_Life/rust/src/main.rs
index 0c1e83cc..50aa4927 100644
--- a/55_Life/rust/src/main.rs
+++ b/55_Life/rust/src/main.rs
@@ -1,4 +1,4 @@
-// Rust implementation of David Ahl's implementation of Conway's Life
+// Rust implementation of the "Basic Computer Games" version of Conway's Life
 //
 // Jon Fetter-Degges
 // October 2022
@@ -7,19 +7,14 @@
 
 use std::{cmp, fmt, io, thread, time};
 
-const HEIGHT: usize = 24;
-const WIDTH: usize = 70;
-
-// The BASIC implementation uses a 24x70 array of integers to represent the board state.
-// 1 is alive, 2 is about to die, 3 is about to be born, 0 is dead. Here, we'll use an
-// enum instead.
-// Deriving Copy (which requires Clone) allows us to use this enum value in assignments.
-// Without that we would only be able to borrow it. That seems silly for a simple enum
-// like this one - it is required because enums can have large amounts of associated
-// data, so the programmer needs to decide whether to allow copying. Similarly, PartialEq
-// allows use of the == comparison. Again, this seems silly for a simple enum, but if
-// some enum cases have associated data, it may require some thought.
-#[derive(Clone, Copy, PartialEq)]
+// The BASIC implementation uses integers to represent the state of each cell: 1 is
+// alive, 2 is about to die, 3 is about to be born, 0 is dead. Here, we'll use an enum
+// instead.
+// Deriving Copy (which requires Clone) allows us to use this enum value in assignments,
+// and deriving Eq (or PartialEq) allows us to use the == operator. These need to be
+// explicitly specified because some enums may have associated data that makes copies and
+// comparisons more complicated or expensive.
+#[derive(Clone, Copy, PartialEq, Eq)]
 enum CellState {
     Empty,
     Alive,
@@ -44,6 +39,9 @@ impl fmt::Display for CellState {
 // Following the BASIC implementation, we will bound the board at 24 rows x 70 columns.
 // The board is an array of CellState. Using an array of arrays gives us bounds checking
 // in both dimensions.
+const HEIGHT: usize = 24;
+const WIDTH: usize = 70;
+
 struct Board {
     cells: [[CellState; WIDTH]; HEIGHT],
     min_row: usize,
@@ -104,8 +102,8 @@ fn get_pattern() -> Vec<Vec<char>> {
             return lines;
         }
         // Handle Unicode by converting the string to a vector of characters up front. We
-        // do this here because we care about lengths and column alignment, so we might
-        // as well just do the Unicode parsing once.
+        // do this here because we check the number of characters several times, so we
+        // might as well just do the Unicode parsing once.
         let line = Vec::from_iter(line.chars());
         if line.len() > max_line_len {
             println!("Line too long - the maximum is {max_line_len} characters.");

From a5b2b8e0215dd1a946494e52167438fe9b88a78a Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Thu, 13 Oct 2022 07:56:19 +1000
Subject: [PATCH 052/198] Added go for Amazing

---
 00_Alternate_Languages/02_Amazing/go/main.go | 217 +++++++++++++++++++
 1 file changed, 217 insertions(+)
 create mode 100644 00_Alternate_Languages/02_Amazing/go/main.go

diff --git a/00_Alternate_Languages/02_Amazing/go/main.go b/00_Alternate_Languages/02_Amazing/go/main.go
new file mode 100644
index 00000000..11b027ef
--- /dev/null
+++ b/00_Alternate_Languages/02_Amazing/go/main.go
@@ -0,0 +1,217 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"log"
+	"math/rand"
+	"os"
+	"strconv"
+	"time"
+)
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+
+	printWelcome()
+
+	h, w := getDimensions()
+	m := NewMaze(h, w)
+	m.draw()
+}
+
+type direction int64
+
+const (
+	LEFT direction = iota
+	UP
+	RIGHT
+	DOWN
+)
+
+const (
+	EXIT_DOWN  = 1
+	EXIT_RIGHT = 2
+)
+
+type maze struct {
+	width    int
+	length   int
+	used     [][]int
+	walls    [][]int
+	enterCol int
+}
+
+func NewMaze(w, l int) maze {
+	if (w < 2) || (l < 2) {
+		log.Fatal("invalid dimensions supplied")
+	}
+
+	m := maze{width: w, length: l}
+
+	m.used = make([][]int, l)
+	for i := range m.used {
+		m.used[i] = make([]int, w)
+	}
+
+	m.walls = make([][]int, l)
+	for i := range m.walls {
+		m.walls[i] = make([]int, w)
+	}
+
+	// randomly determine the entry column
+	m.enterCol = rand.Intn(w)
+
+	// determine layout of walls
+	m.build()
+
+	// add an exit
+	col := rand.Intn(m.width - 1)
+	row := m.length - 1
+	m.walls[row][col] = m.walls[row][col] + 1
+
+	return m
+}
+
+func (m *maze) build() {
+	row := 0
+	col := 0
+	count := 2
+
+	for {
+		possibleDirs := m.getPossibleDirections(row, col)
+
+		if len(possibleDirs) != 0 {
+			row, col, count = m.makeOpening(possibleDirs, row, col, count)
+		} else {
+			for {
+				if col != m.width-1 {
+					col = col + 1
+				} else if row != m.length-1 {
+					row = row + 1
+					col = 0
+				} else {
+					row = 0
+					col = 0
+				}
+
+				if m.used[row][col] != 0 {
+					break
+				}
+			}
+		}
+
+		if count == (m.width*m.length)+1 {
+			break
+		}
+	}
+
+}
+
+func (m *maze) getPossibleDirections(row, col int) []direction {
+	possible_dirs := make(map[direction]bool, 4)
+	possible_dirs[LEFT] = true
+	possible_dirs[UP] = true
+	possible_dirs[RIGHT] = true
+	possible_dirs[DOWN] = true
+
+	if (col == 0) || (m.used[row][col-1] != 0) {
+		possible_dirs[LEFT] = false
+	}
+	if (row == 0) || (m.used[row-1][col] != 0) {
+		possible_dirs[UP] = false
+	}
+	if (col == m.width-1) || (m.used[row][col+1] != 0) {
+		possible_dirs[RIGHT] = false
+	}
+	if (row == m.length-1) || (m.used[row+1][col] != 0) {
+		possible_dirs[DOWN] = false
+	}
+
+	ret := make([]direction, 0)
+	for d, v := range possible_dirs {
+		if v {
+			ret = append(ret, d)
+		}
+	}
+	return ret
+}
+
+func (m *maze) makeOpening(dirs []direction, row, col, count int) (int, int, int) {
+	dir := rand.Intn(len(dirs))
+
+	if dirs[dir] == LEFT {
+		col = col - 1
+		m.walls[row][col] = int(EXIT_RIGHT)
+	} else if dirs[dir] == UP {
+		row = row - 1
+		m.walls[row][col] = int(EXIT_DOWN)
+	} else if dirs[dir] == RIGHT {
+		m.walls[row][col] = m.walls[row][col] + EXIT_RIGHT
+		col = col + 1
+	} else if dirs[dir] == DOWN {
+		m.walls[row][col] = m.walls[row][col] + EXIT_DOWN
+		row = row + 1
+	}
+
+	m.used[row][col] = count
+	count = count + 1
+	return row, col, count
+}
+
+// draw the maze
+func (m *maze) draw() {
+	for col := 0; col < m.width; col++ {
+		if col == m.enterCol {
+			fmt.Print(".  ")
+		} else {
+			fmt.Print(".--")
+		}
+	}
+	fmt.Println(".")
+
+	for row := 0; row < m.length; row++ {
+		fmt.Print("|")
+		for col := 0; col < m.width; col++ {
+			if m.walls[row][col] < 2 {
+				fmt.Print("  |")
+			} else {
+				fmt.Print("   ")
+			}
+		}
+		fmt.Println()
+		for col := 0; col < m.width; col++ {
+			if (m.walls[row][col] == 0) || (m.walls[row][col] == 2) {
+				fmt.Print(":--")
+			} else {
+				fmt.Print(":  ")
+			}
+		}
+		fmt.Println(".")
+	}
+}
+
+func printWelcome() {
+	fmt.Println("                            AMAZING PROGRAM")
+	fmt.Print("               CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n")
+}
+
+func getDimensions() (int, int) {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	fmt.Println("Enter a width ( > 1 ):")
+	scanner.Scan()
+	w, err := strconv.Atoi(scanner.Text())
+	if err != nil {
+		log.Fatal("invalid dimension")
+	}
+
+	fmt.Println("Enter a height ( > 1 ):")
+	scanner.Scan()
+	h, err := strconv.Atoi(scanner.Text())
+	if err != nil {
+		log.Fatal("invalid dimension")
+	}
+
+	return w, h
+}

From 096bc29a29f8eb7f7a90571603d2d0ed4b6c1453 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Thu, 13 Oct 2022 09:10:25 +1000
Subject: [PATCH 053/198] Added go for Animal

---
 00_Alternate_Languages/03_Animal/go/main.go | 159 ++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 00_Alternate_Languages/03_Animal/go/main.go

diff --git a/00_Alternate_Languages/03_Animal/go/main.go b/00_Alternate_Languages/03_Animal/go/main.go
new file mode 100644
index 00000000..2eb0904e
--- /dev/null
+++ b/00_Alternate_Languages/03_Animal/go/main.go
@@ -0,0 +1,159 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+)
+
+type node struct {
+	text    string
+	yesNode *node
+	noNode  *node
+}
+
+func newNode(text string, yes_node, no_node *node) *node {
+	n := node{text: text}
+	if yes_node != nil {
+		n.yesNode = yes_node
+	}
+	if no_node != nil {
+		n.noNode = no_node
+	}
+	return &n
+}
+
+func (n *node) update(newQuestion, newAnswer, newAnimal string) {
+	oldAnimal := n.text
+
+	n.text = newQuestion
+
+	if newAnswer == "y" {
+		n.yesNode = newNode(newAnimal, nil, nil)
+		n.noNode = newNode(oldAnimal, nil, nil)
+	} else {
+		n.yesNode = newNode(oldAnimal, nil, nil)
+		n.noNode = newNode(newAnimal, nil, nil)
+	}
+}
+
+func (n *node) isLeaf() bool {
+	return (n.yesNode == nil) && (n.noNode == nil)
+}
+
+func listKnownAnimals(root *node) {
+	if root == nil {
+		return
+	}
+
+	if root.isLeaf() {
+		fmt.Printf("%s           ", root.text)
+		return
+	}
+
+	if root.yesNode != nil {
+		listKnownAnimals(root.yesNode)
+	}
+
+	if root.noNode != nil {
+		listKnownAnimals(root.noNode)
+	}
+}
+
+func parseInput(message string, checkList bool, rootNode *node) string {
+	scanner := bufio.NewScanner(os.Stdin)
+	token := ""
+
+	for {
+		fmt.Println(message)
+		scanner.Scan()
+		inp := strings.ToLower(scanner.Text())
+
+		if checkList && inp == "list" {
+			fmt.Println("Animals I already know are:")
+			listKnownAnimals(rootNode)
+			fmt.Println()
+		}
+
+		if len(inp) > 0 {
+			token = inp
+		} else {
+			token = ""
+		}
+
+		if token == "y" || token == "n" {
+			break
+		}
+	}
+	return token
+}
+
+func avoidVoidInput(message string) string {
+	scanner := bufio.NewScanner(os.Stdin)
+	answer := ""
+	for {
+		fmt.Println(message)
+		scanner.Scan()
+		answer = scanner.Text()
+
+		if answer != "" {
+			break
+		}
+	}
+	return answer
+}
+
+func printIntro() {
+	fmt.Println("                                Animal")
+	fmt.Println("               Creative Computing Morristown, New Jersey")
+	fmt.Println("\nPlay 'Guess the Animal'")
+	fmt.Println("Think of an animal and the computer will try to guess it")
+}
+
+func main() {
+	yesChild := newNode("Fish", nil, nil)
+	noChild := newNode("Bird", nil, nil)
+	rootNode := newNode("Does it swim?", yesChild, noChild)
+
+	printIntro()
+
+	keepPlaying := (parseInput("Are you thinking of an animal?", true, rootNode) == "y")
+
+	for keepPlaying {
+		keepAsking := true
+
+		actualNode := rootNode
+
+		for keepAsking {
+			if !actualNode.isLeaf() {
+				answer := parseInput(actualNode.text, false, nil)
+
+				if answer == "y" {
+					if actualNode.yesNode == nil {
+						log.Fatal("invalid node")
+					}
+					actualNode = actualNode.yesNode
+				} else {
+					if actualNode.noNode == nil {
+						log.Fatal("invalid node")
+					}
+					actualNode = actualNode.noNode
+				}
+			} else {
+				answer := parseInput(fmt.Sprintf("Is it a %s?", actualNode.text), false, nil)
+				if answer == "n" {
+					newAnimal := avoidVoidInput("The animal you were thinking of was a ?")
+					newQuestion := avoidVoidInput(fmt.Sprintf("Please type in a question that would distinguish a '%s' from a '%s':", newAnimal, actualNode.text))
+					newAnswer := parseInput(fmt.Sprintf("For a '%s' the answer would be", newAnimal), false, nil)
+					actualNode.update(newQuestion+"?", newAnswer, newAnimal)
+				} else {
+					fmt.Println("Why not try another animal?")
+				}
+				keepAsking = false
+			}
+		}
+		keepPlaying = (parseInput("Are you thinking of an animal?", true, rootNode) == "y")
+	}
+}

From 93062df0744c1a650bb014c73ecf3d5925ec17a7 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Fri, 14 Oct 2022 12:23:55 +1000
Subject: [PATCH 054/198] Added go for Bagels

---
 00_Alternate_Languages/05_Bagels/go/main.go | 166 ++++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 00_Alternate_Languages/05_Bagels/go/main.go

diff --git a/00_Alternate_Languages/05_Bagels/go/main.go b/00_Alternate_Languages/05_Bagels/go/main.go
new file mode 100644
index 00000000..b0d2b106
--- /dev/null
+++ b/00_Alternate_Languages/05_Bagels/go/main.go
@@ -0,0 +1,166 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+const MAXGUESSES int = 20
+
+func printWelcome() {
+	fmt.Println("\n                Bagels")
+	fmt.Println("Creative Computing  Morristown, New Jersey")
+	fmt.Println()
+}
+func printRules() {
+	fmt.Println()
+	fmt.Println("I am thinking of a three-digit number.  Try to guess")
+	fmt.Println("my number and I will give you clues as follows:")
+	fmt.Println("   PICO   - One digit correct but in the wrong position")
+	fmt.Println("   FERMI  - One digit correct and in the right position")
+	fmt.Println("   BAGELS - No digits correct")
+}
+
+func getNumber() []string {
+	numbers := []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"}
+	rand.Shuffle(len(numbers), func(i, j int) { numbers[i], numbers[j] = numbers[j], numbers[i] })
+
+	return numbers[:3]
+}
+
+func getValidGuess(guessNumber int) string {
+	var guess string
+	scanner := bufio.NewScanner(os.Stdin)
+	valid := false
+	for !valid {
+		fmt.Printf("Guess # %d?\n", guessNumber)
+		scanner.Scan()
+		guess = strings.TrimSpace(scanner.Text())
+
+		// guess must be 3 characters
+		if len(guess) == 3 {
+			// and should be numeric
+			_, err := strconv.Atoi(guess)
+			if err != nil {
+				fmt.Println("What?")
+			} else {
+				// and the numbers should be unique
+				if (guess[0:1] != guess[1:2]) && (guess[0:1] != guess[2:3]) && (guess[1:2] != guess[2:3]) {
+					valid = true
+				} else {
+					fmt.Println("Oh, I forgot to tell you that the number I have in mind")
+					fmt.Println("has no two digits the same.")
+				}
+			}
+		} else {
+			fmt.Println("Try guessing a three-digit number.")
+		}
+	}
+
+	return guess
+}
+
+func buildResultString(num []string, guess string) string {
+	result := ""
+
+	// correct digits in wrong place
+	for i := 0; i < 2; i++ {
+		if num[i] == guess[i+1:i+2] {
+			result += "PICO "
+		}
+		if num[i+1] == guess[i:i+1] {
+			result += "PICO "
+		}
+	}
+	if num[0] == guess[2:3] {
+		result += "PICO "
+	}
+	if num[2] == guess[0:1] {
+		result += "PICO "
+	}
+
+	// correct digits in right place
+	for i := 0; i < 3; i++ {
+		if num[i] == guess[i:i+1] {
+			result += "FERMI "
+		}
+	}
+
+	// nothing right?
+	if result == "" {
+		result = "BAGELS"
+	}
+
+	return result
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+	scanner := bufio.NewScanner(os.Stdin)
+
+	printWelcome()
+
+	fmt.Println("Would you like the rules (Yes or No)? ")
+	scanner.Scan()
+	response := scanner.Text()
+	if len(response) > 0 {
+		if strings.ToUpper(response[0:1]) != "N" {
+			printRules()
+		}
+	} else {
+		printRules()
+	}
+
+	gamesWon := 0
+	stillRunning := true
+
+	for stillRunning {
+		num := getNumber()
+		numStr := strings.Join(num, "")
+		guesses := 1
+
+		fmt.Println("\nO.K.  I have a number in mind.")
+		guessing := true
+		for guessing {
+			guess := getValidGuess(guesses)
+
+			if guess == numStr {
+				fmt.Println("You got it!!")
+				gamesWon++
+				guessing = false
+			} else {
+				fmt.Println(buildResultString(num, guess))
+				guesses++
+				if guesses > MAXGUESSES {
+					fmt.Println("Oh well")
+					fmt.Printf("That's %d guesses. My number was %s\n", MAXGUESSES, numStr)
+					guessing = false
+				}
+			}
+		}
+
+		validRespone := false
+		for !validRespone {
+			fmt.Println("Play again (Yes or No)?")
+			scanner.Scan()
+			response := scanner.Text()
+			if len(response) > 0 {
+				validRespone = true
+				if strings.ToUpper(response[0:1]) != "Y" {
+					stillRunning = false
+				}
+			}
+		}
+	}
+
+	if gamesWon > 0 {
+		fmt.Printf("\nA %d point Bagels buff!!\n", gamesWon)
+	}
+
+	fmt.Println("Hope you had fun.  Bye")
+}

From 8c465586316f222fc2241572cdf0b62c6490ab21 Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Fri, 14 Oct 2022 20:33:51 +0200
Subject: [PATCH 055/198] 25_Chief port to Lua and updated readme

---
 25_Chief/lua/README.md |  23 +++++++++-
 25_Chief/lua/chief.lua | 101 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 25_Chief/lua/chief.lua

diff --git a/25_Chief/lua/README.md b/25_Chief/lua/README.md
index c063f42f..4c84051b 100644
--- a/25_Chief/lua/README.md
+++ b/25_Chief/lua/README.md
@@ -1,3 +1,24 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
-Conversion to [Lua](https://www.lua.org/)
+Conversion to [Lua](https://www.lua.org/) by Alex Conconi
+
+---
+
+### Lua porting notes
+
+- I did not like the old Western movie language style in the game introduction
+and decided to tone it down even if this deviates from the original BASIC
+version.
+
+- The `craps_game` function contains the main game logic: it
+  - prints the game credits and presents the intro question;
+  - asks for the end result and computes the original numer;
+  - calls `explain_solution` to print the various steps of the computation;
+  - presents the outro question and prints a `bolt` if necessary.
+
+- Added basic input validation to accept only valid integers for numeric input.
+
+- Minor formatting edits (lowercase, punctuation).
+
+- Any answer to a "yes or no" question is regarded as "yes" if the input line
+starts with 'y' or 'Y', else no.
diff --git a/25_Chief/lua/chief.lua b/25_Chief/lua/chief.lua
new file mode 100644
index 00000000..281ba645
--- /dev/null
+++ b/25_Chief/lua/chief.lua
@@ -0,0 +1,101 @@
+--- Helper function for tabulating messages.
+local function tab(n) return string.rep(" ", n) end
+
+
+--- Generates a multi-line string representing a lightning bolt
+local function bolt()
+    local bolt_lines = {}
+    for n = 29, 21, -1 do
+        table.insert(bolt_lines, tab(n) .. "x x")
+    end
+    table.insert(bolt_lines, tab(20) .. "x xxx")
+    table.insert(bolt_lines, tab(19) .. "x   x")
+    table.insert(bolt_lines, tab(18) .. "xx x")
+    for n = 19, 12, -1 do
+        table.insert(bolt_lines, tab(n) .. "x x")
+    end
+    table.insert(bolt_lines, tab(11) .. "xx")
+    table.insert(bolt_lines, tab(10) .. "x")
+    table.insert(bolt_lines, tab(9) .. "*\n")
+    table.insert(bolt_lines, string.rep("#", 25) .. "\n")
+    return table.concat(bolt_lines, "\n")
+end
+
+
+--- Print the prompt and read a yes/no answer from stdin.
+local function ask_yes_or_no(prompt)
+    io.stdout:write(prompt .. " ")
+    local answer = string.lower(io.stdin:read("*l"))
+    -- any line starting with a 'y' or 'Y' is considered a 'yes'
+    return answer:sub(1, 1) == "y"
+end
+
+
+--- Print the prompt and read a valid number from stdin.
+local function ask_number(prompt)
+    io.stdout:write(prompt .. " ")
+    while true do
+        local n = tonumber(io.stdin:read("*l"))
+        if n then
+            return n
+        else
+            print("Enter a valid number.")
+        end
+    end
+end
+
+
+--- Explain the solution to persuade the player.
+local function explain_solution()
+    local k = ask_number("What was your original number?")
+    -- For clarity we kept the same variable names of the original BASIC version
+    local f = k + 3
+    local g = f / 5
+    local h = g * 8
+    local i = h / 5 + 5
+    local j = i - 1
+    print("So you think you're so smart, eh?")
+    print("Now watch.")
+    print(k .. " plus 3 equals " .. f .. ". This divided by 5 equals " .. g .. ";")
+    print("this times 8 equals " .. h .. ". If we divide by 5 and add 5,")
+    print("we get " .. i .. ", which, minus 1, equals " .. j .. ".")
+end
+
+
+--- Main game function.
+local function chief_game()
+    --- Print game introduction and challenge
+    print(tab(29) .. "Chief")
+    print(tab(14) .. "Creative Computing  Morristown, New Jersey\n\n")
+    print("I am Chief Numbers Freek, the great math god.")
+    if not ask_yes_or_no("Are you ready to take the test you called me out for?") then
+        print("Shut up, wise tongue.")
+    end
+
+    -- Print how to obtain the end result.
+    print(" Take a number and add 3. Divide this number by 5 and")
+    print("multiply by 8. Divide by 5 and add the same. Subtract 1.")
+
+    -- Ask the result end and reverse calculate the original number.
+    local end_result = ask_number(" What do you have?")
+    local original_number = (end_result + 1 - 5) * 5 / 8 * 5 - 3
+
+    -- If it is an integer we do not want to print any zero decimals.
+    local int_part, dec_part = math.modf(original_number)
+    if dec_part == 0 then original_number = int_part end
+
+    -- If the player challenges the answer, print the explanation.
+    if not ask_yes_or_no("I bet your number was " .. original_number .. ". Am I right?") then
+        explain_solution()
+        -- If the player does not accept the explanation, zap them.
+        if not ask_yes_or_no("Now do you believe me?") then
+            print("YOU HAVE MADE ME MAD!!!")
+            print("THERE MUST BE A GREAT LIGHTNING BOLT!\n\n")
+            print(bolt())
+            print("I hope you believe me now, for your sake!!")
+        end
+    end
+end
+
+--- Run the game.
+chief_game()

From 6676cd90abf23692412ef5668a9c673dea4ade68 Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Fri, 14 Oct 2022 20:42:02 +0200
Subject: [PATCH 056/198] Added credits header to source code.

---
 25_Chief/lua/chief.lua | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/25_Chief/lua/chief.lua b/25_Chief/lua/chief.lua
index 281ba645..39a2e4e2 100644
--- a/25_Chief/lua/chief.lua
+++ b/25_Chief/lua/chief.lua
@@ -1,3 +1,23 @@
+--[[
+Chief
+
+From: BASIC Computer Games (1978)
+Edited by David H. Ahl
+
+    In the words of the program author, John Graham, “CHIEF is designed to
+    give people (mostly kids) practice in the four operations (addition,
+    multiplication, subtraction, and division).
+
+    It does this while giving people some fun. And then, if the people are
+    wrong, it shows them how they should have done it.
+
+    CHIEF was written by John Graham of Upper Brookville, New York.
+
+    
+Lua port by Alex Conconi, 2022.
+]]--
+
+
 --- Helper function for tabulating messages.
 local function tab(n) return string.rep(" ", n) end
 

From 15d0301cd53ee5139164acdda4b5cf6c42791716 Mon Sep 17 00:00:00 2001
From: Alex Conconi <4670015+aconconi@users.noreply.github.com>
Date: Fri, 14 Oct 2022 20:43:50 +0200
Subject: [PATCH 057/198] Update README.md

punctuation
---
 25_Chief/lua/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/25_Chief/lua/README.md b/25_Chief/lua/README.md
index 4c84051b..937d758c 100644
--- a/25_Chief/lua/README.md
+++ b/25_Chief/lua/README.md
@@ -7,7 +7,7 @@ Conversion to [Lua](https://www.lua.org/) by Alex Conconi
 ### Lua porting notes
 
 - I did not like the old Western movie language style in the game introduction
-and decided to tone it down even if this deviates from the original BASIC
+and decided to tone it down, even if this deviates from the original BASIC
 version.
 
 - The `craps_game` function contains the main game logic: it

From 79f197c5a3d8de0aad9babe7ff10fcf962008a67 Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Fri, 14 Oct 2022 20:48:31 +0200
Subject: [PATCH 058/198] Updated Lua porting notes

---
 33_Dice/lua/README.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/33_Dice/lua/README.md b/33_Dice/lua/README.md
index 14d23cc2..610e3873 100644
--- a/33_Dice/lua/README.md
+++ b/33_Dice/lua/README.md
@@ -4,8 +4,13 @@ Conversion to [Lua](https://www.lua.org/) by Alex Conconi
 
 ---
 
-### Porting notes for Lua:
+### Porting notes for Lua
 
-- This is a straightfoward port with only minor modifications for input validation and text formatting.
-- The "Try again?" question accepts 'y', 'yes', 'n', 'no' (case insensitive), whereas the original BASIC version defaults to no unless 'YES' is typed.
-- The "How many rolls?" question presents a more user friendly message in case of invalid input.
+- This is a straightfoward port with only minor modifications for input
+validation and text formatting.
+
+- The "Try again?" question accepts 'y', 'yes', 'n', 'no' (case insensitive),
+whereas the original BASIC version defaults to no unless 'YES' is typed.
+
+- The "How many rolls?" question presents a more user friendly message
+in case of invalid input.

From a46a2576e55895e81fc3f7b83fd6e121640a84a9 Mon Sep 17 00:00:00 2001
From: Ethan Dicks <ethan.dicks@gmail.com>
Date: Mon, 17 Oct 2022 00:10:55 -0400
Subject: [PATCH 059/198] Corrected typo in Hamurabi summary report

---
 00_Alternate_Languages/43_Hammurabi/hammurabi.bas | 2 +-
 43_Hammurabi/csharp/View.cs                       | 2 +-
 43_Hammurabi/hammurabi.bas                        | 2 +-
 43_Hammurabi/javascript/hammurabi.js              | 2 +-
 43_Hammurabi/python/hamurabi.py                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/00_Alternate_Languages/43_Hammurabi/hammurabi.bas b/00_Alternate_Languages/43_Hammurabi/hammurabi.bas
index 8f0998f0..e41fe4fb 100644
--- a/00_Alternate_Languages/43_Hammurabi/hammurabi.bas
+++ b/00_Alternate_Languages/43_Hammurabi/hammurabi.bas
@@ -108,7 +108,7 @@
 900 PRINT "A FANTASTIC PERFORMANCE!!!  CHARLEMANGE, DISRAELI, AND"
 905 PRINT "JEFFERSON COMBINED COULD NOT HAVE DONE BETTER!":GOTO 990
 940 PRINT "YOUR HEAVY-HANDED PERFORMANCE SMACKS OF NERO AND IVAN IV."
-945 PRINT "THE PEOPLE (REMIANING) FIND YOU AN UNPLEASANT RULER, AND,"
+945 PRINT "THE PEOPLE (REMAINING) FIND YOU AN UNPLEASANT RULER, AND,"
 950 PRINT "FRANKLY, HATE YOUR GUTS!!":GOTO 990
 960 PRINT "YOUR PERFORMANCE COULD HAVE BEEN SOMEWHAT BETTER, BUT"
 965 PRINT "REALLY WASN'T TOO BAD AT ALL. ";INT(P*.8*RND(1));"PEOPLE"
diff --git a/43_Hammurabi/csharp/View.cs b/43_Hammurabi/csharp/View.cs
index fcfb4cd5..e0c5b054 100644
--- a/43_Hammurabi/csharp/View.cs
+++ b/43_Hammurabi/csharp/View.cs
@@ -133,7 +133,7 @@ namespace Hammurabi
                     break;
                 case PerformanceRating.Bad:
                     Console.WriteLine("YOUR HEAVY-HANDED PERFORMANCE SMACKS OF NERO AND IVAN IV.");
-                    Console.WriteLine("THE PEOPLE (REMIANING) FIND YOU AN UNPLEASANT RULER, AND,");
+                    Console.WriteLine("THE PEOPLE (REMAINING) FIND YOU AN UNPLEASANT RULER, AND,");
                     Console.WriteLine("FRANKLY, HATE YOUR GUTS!!");
                     break;
                 case PerformanceRating.Ok:
diff --git a/43_Hammurabi/hammurabi.bas b/43_Hammurabi/hammurabi.bas
index 8f0998f0..e41fe4fb 100644
--- a/43_Hammurabi/hammurabi.bas
+++ b/43_Hammurabi/hammurabi.bas
@@ -108,7 +108,7 @@
 900 PRINT "A FANTASTIC PERFORMANCE!!!  CHARLEMANGE, DISRAELI, AND"
 905 PRINT "JEFFERSON COMBINED COULD NOT HAVE DONE BETTER!":GOTO 990
 940 PRINT "YOUR HEAVY-HANDED PERFORMANCE SMACKS OF NERO AND IVAN IV."
-945 PRINT "THE PEOPLE (REMIANING) FIND YOU AN UNPLEASANT RULER, AND,"
+945 PRINT "THE PEOPLE (REMAINING) FIND YOU AN UNPLEASANT RULER, AND,"
 950 PRINT "FRANKLY, HATE YOUR GUTS!!":GOTO 990
 960 PRINT "YOUR PERFORMANCE COULD HAVE BEEN SOMEWHAT BETTER, BUT"
 965 PRINT "REALLY WASN'T TOO BAD AT ALL. ";INT(P*.8*RND(1));"PEOPLE"
diff --git a/43_Hammurabi/javascript/hammurabi.js b/43_Hammurabi/javascript/hammurabi.js
index 6d878db9..ca4d471d 100644
--- a/43_Hammurabi/javascript/hammurabi.js
+++ b/43_Hammurabi/javascript/hammurabi.js
@@ -233,7 +233,7 @@ async function main()
             print("ALSO BEEN DECLARED NATIONAL FINK!!!!\n");
         } else if (p1 > 10 || l < 9) {
             print("YOUR HEAVY-HANDED PERFORMANCE SMACKS OF NERO AND IVAN IV.\n");
-            print("THE PEOPLE (REMIANING) FIND YOU AN UNPLEASANT RULER, AND,\n");
+            print("THE PEOPLE (REMAINING) FIND YOU AN UNPLEASANT RULER, AND,\n");
             print("FRANKLY, HATE YOUR GUTS!!\n");
         } else if (p1 > 3 || l < 10) {
             print("YOUR PERFORMANCE COULD HAVE BEEN SOMEWHAT BETTER, BUT\n");
diff --git a/43_Hammurabi/python/hamurabi.py b/43_Hammurabi/python/hamurabi.py
index 79de9ac1..c259ec80 100644
--- a/43_Hammurabi/python/hamurabi.py
+++ b/43_Hammurabi/python/hamurabi.py
@@ -212,7 +212,7 @@ def main() -> None:
             national_fink()
         elif P1 > 10 or L < 9:
             print("YOUR HEAVY-HANDED PERFORMANCE SMACKS OF NERO AND IVAN IV.")
-            print("THE PEOPLE (REMIANING) FIND YOU AN UNPLEASANT RULER, AND,")
+            print("THE PEOPLE (REMAINING) FIND YOU AN UNPLEASANT RULER, AND,")
             print("FRANKLY, HATE YOUR GUTS!!")
         elif P1 > 3 or L < 10:
             print("YOUR PERFORMANCE COULD HAVE BEEN SOMEWHAT BETTER, BUT")

From 98238c5e0851f34ca7dfce6f05e4bb5554dbd06b Mon Sep 17 00:00:00 2001
From: aconconi <aconconi@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:12:44 +0200
Subject: [PATCH 060/198] renamed function tab to space

---
 25_Chief/lua/chief.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/25_Chief/lua/chief.lua b/25_Chief/lua/chief.lua
index 39a2e4e2..6ac885b2 100644
--- a/25_Chief/lua/chief.lua
+++ b/25_Chief/lua/chief.lua
@@ -19,24 +19,24 @@ Lua port by Alex Conconi, 2022.
 
 
 --- Helper function for tabulating messages.
-local function tab(n) return string.rep(" ", n) end
+local function space(n) return string.rep(" ", n) end
 
 
 --- Generates a multi-line string representing a lightning bolt
 local function bolt()
     local bolt_lines = {}
     for n = 29, 21, -1 do
-        table.insert(bolt_lines, tab(n) .. "x x")
+        table.insert(bolt_lines, space(n) .. "x x")
     end
-    table.insert(bolt_lines, tab(20) .. "x xxx")
-    table.insert(bolt_lines, tab(19) .. "x   x")
-    table.insert(bolt_lines, tab(18) .. "xx x")
+    table.insert(bolt_lines, space(20) .. "x xxx")
+    table.insert(bolt_lines, space(19) .. "x   x")
+    table.insert(bolt_lines, space(18) .. "xx x")
     for n = 19, 12, -1 do
-        table.insert(bolt_lines, tab(n) .. "x x")
+        table.insert(bolt_lines, space(n) .. "x x")
     end
-    table.insert(bolt_lines, tab(11) .. "xx")
-    table.insert(bolt_lines, tab(10) .. "x")
-    table.insert(bolt_lines, tab(9) .. "*\n")
+    table.insert(bolt_lines, space(11) .. "xx")
+    table.insert(bolt_lines, space(10) .. "x")
+    table.insert(bolt_lines, space(9) .. "*\n")
     table.insert(bolt_lines, string.rep("#", 25) .. "\n")
     return table.concat(bolt_lines, "\n")
 end
@@ -85,8 +85,8 @@ end
 --- Main game function.
 local function chief_game()
     --- Print game introduction and challenge
-    print(tab(29) .. "Chief")
-    print(tab(14) .. "Creative Computing  Morristown, New Jersey\n\n")
+    print(space(29) .. "Chief")
+    print(space(14) .. "Creative Computing  Morristown, New Jersey\n\n")
     print("I am Chief Numbers Freek, the great math god.")
     if not ask_yes_or_no("Are you ready to take the test you called me out for?") then
         print("Shut up, wise tongue.")

From 7a882ea31779f99105b243d108aa0718ee36dec5 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Wed, 19 Oct 2022 12:21:29 +1000
Subject: [PATCH 061/198] Added go version of Batnum

---
 00_Alternate_Languages/08_Batnum/go/main.go | 248 ++++++++++++++++++++
 1 file changed, 248 insertions(+)
 create mode 100644 00_Alternate_Languages/08_Batnum/go/main.go

diff --git a/00_Alternate_Languages/08_Batnum/go/main.go b/00_Alternate_Languages/08_Batnum/go/main.go
new file mode 100644
index 00000000..10334799
--- /dev/null
+++ b/00_Alternate_Languages/08_Batnum/go/main.go
@@ -0,0 +1,248 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+)
+
+type StartOption int8
+
+const (
+	StartUndefined StartOption = iota
+	ComputerFirst
+	PlayerFirst
+)
+
+type WinOption int8
+
+const (
+	WinUndefined WinOption = iota
+	TakeLast
+	AvoidLast
+)
+
+type GameOptions struct {
+	pileSize    int
+	winOption   WinOption
+	startOption StartOption
+	minSelect   int
+	maxSelect   int
+}
+
+func NewOptions() *GameOptions {
+	g := GameOptions{}
+
+	g.pileSize = getPileSize()
+	if g.pileSize < 0 {
+		return &g
+	}
+
+	g.winOption = getWinOption()
+	g.minSelect, g.maxSelect = getMinMax()
+	g.startOption = getStartOption()
+
+	return &g
+}
+
+func getPileSize() int {
+	ps := 0
+	var err error
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("Enter Pile Size ")
+		scanner.Scan()
+		ps, err = strconv.Atoi(scanner.Text())
+		if err == nil {
+			break
+		}
+	}
+	return ps
+}
+
+func getWinOption() WinOption {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("ENTER WIN OPTION - 1 TO TAKE LAST, 2 TO AVOID LAST:")
+		scanner.Scan()
+		w, err := strconv.Atoi(scanner.Text())
+		if err == nil && (w == 1 || w == 2) {
+			return WinOption(w)
+		}
+	}
+}
+
+func getStartOption() StartOption {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("ENTER START OPTION - 1 COMPUTER FIRST, 2 YOU FIRST ")
+		scanner.Scan()
+		s, err := strconv.Atoi(scanner.Text())
+		if err == nil && (s == 1 || s == 2) {
+			return StartOption(s)
+		}
+	}
+}
+
+func getMinMax() (int, int) {
+	minSelect := 0
+	maxSelect := 0
+	var minErr error
+	var maxErr error
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("ENTER MIN AND MAX ")
+		scanner.Scan()
+		enteredValues := scanner.Text()
+		vals := strings.Split(enteredValues, " ")
+		minSelect, minErr = strconv.Atoi(vals[0])
+		maxSelect, maxErr = strconv.Atoi(vals[1])
+		if (minErr == nil) && (maxErr == nil) && (minSelect > 0) && (maxSelect > 0) && (maxSelect > minSelect) {
+			return minSelect, maxSelect
+		}
+	}
+}
+
+// This handles the player's turn - asking the player how many objects
+// to take and doing some basic validation around that input.  Then it
+// checks for any win conditions.
+// Returns a boolean indicating whether the game is over and the new pile_size.
+func playerMove(pile, min, max int, win WinOption) (bool, int) {
+	scanner := bufio.NewScanner(os.Stdin)
+	done := false
+	for !done {
+		fmt.Println("YOUR MOVE")
+		scanner.Scan()
+		m, err := strconv.Atoi(scanner.Text())
+		if err != nil {
+			continue
+		}
+
+		if m == 0 {
+			fmt.Println("I TOLD YOU NOT TO USE ZERO!  COMPUTER WINS BY FORFEIT.")
+			return true, pile
+		}
+
+		if m > max || m < min {
+			fmt.Println("ILLEGAL MOVE, REENTER IT")
+			continue
+		}
+
+		pile -= m
+		done = true
+
+		if pile <= 0 {
+			if win == AvoidLast {
+				fmt.Println("TOUGH LUCK, YOU LOSE.")
+			} else {
+				fmt.Println("CONGRATULATIONS, YOU WIN.")
+			}
+			return true, pile
+		}
+	}
+	return false, pile
+}
+
+// This handles the logic to determine how many objects the computer
+// will select on its turn.
+func computerPick(pile, min, max int, win WinOption) int {
+	var q int
+	if win == AvoidLast {
+		q = pile - 1
+	} else {
+		q = pile
+	}
+	c := min + max
+
+	pick := q - (c * int(q/c))
+
+	if pick < min {
+		pick = min
+	} else if pick > max {
+		pick = max
+	}
+
+	return pick
+}
+
+// This handles the computer's turn - first checking for the various
+// win/lose conditions and then calculating how many objects
+// the computer will take.
+// Returns a boolean indicating whether the game is over and the new pile_size.
+func computerMove(pile, min, max int, win WinOption) (bool, int) {
+	// first check for end-game conditions
+	if win == TakeLast && pile <= max {
+		fmt.Printf("COMPUTER TAKES %d AND WINS\n", pile)
+		return true, pile
+	}
+
+	if win == AvoidLast && pile <= min {
+		fmt.Printf("COMPUTER TAKES %d AND LOSES\n", pile)
+		return true, pile
+	}
+
+	// otherwise determine the computer's selection
+	selection := computerPick(pile, min, max, win)
+	pile -= selection
+	fmt.Printf("COMPUTER TAKES %d AND LEAVES %d\n", selection, pile)
+	return false, pile
+}
+
+// This is the main game loop - repeating each turn until one
+// of the win/lose conditions is met.
+func play(pile, min, max int, start StartOption, win WinOption) {
+	gameOver := false
+	playersTurn := (start == PlayerFirst)
+
+	for !gameOver {
+		if playersTurn {
+			gameOver, pile = playerMove(pile, min, max, win)
+			playersTurn = false
+			if gameOver {
+				return
+			}
+		}
+
+		if !playersTurn {
+			gameOver, pile = computerMove(pile, min, max, win)
+			playersTurn = true
+		}
+	}
+}
+
+// Print out the introduction and rules of the game
+func printIntro() {
+	fmt.Printf("%33s%s\n", " ", "BATNUM")
+	fmt.Printf("%15s%s\n", " ", "CREATIVE COMPUTING  MORRISSTOWN, NEW JERSEY")
+	fmt.Printf("\n\n\n")
+	fmt.Println("THIS PROGRAM IS A 'BATTLE OF NUMBERS' GAME, WHERE THE")
+	fmt.Println("COMPUTER IS YOUR OPPONENT.")
+	fmt.Println()
+	fmt.Println("THE GAME STARTS WITH AN ASSUMED PILE OF OBJECTS. YOU")
+	fmt.Println("AND YOUR OPPONENT ALTERNATELY REMOVE OBJECTS FROM THE PILE.")
+	fmt.Println("WINNING IS DEFINED IN ADVANCE AS TAKING THE LAST OBJECT OR")
+	fmt.Println("NOT. YOU CAN ALSO SPECIFY SOME OTHER BEGINNING CONDITIONS.")
+	fmt.Println("DON'T USE ZERO, HOWEVER, IN PLAYING THE GAME.")
+	fmt.Println("ENTER A NEGATIVE NUMBER FOR NEW PILE SIZE TO STOP PLAYING.")
+	fmt.Println()
+}
+
+func main() {
+	for {
+		printIntro()
+
+		g := NewOptions()
+
+		if g.pileSize < 0 {
+			return
+		}
+
+		play(g.pileSize, g.minSelect, g.maxSelect, g.startOption, g.winOption)
+	}
+}

From b8aa3daaa03498f7cd4721c639e0ca4e49cb0f2f Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Thu, 20 Oct 2022 12:13:27 +1000
Subject: [PATCH 062/198] Added go for Battle

---
 00_Alternate_Languages/09_Battle/go/main.go | 266 ++++++++++++++++++++
 1 file changed, 266 insertions(+)
 create mode 100644 00_Alternate_Languages/09_Battle/go/main.go

diff --git a/00_Alternate_Languages/09_Battle/go/main.go b/00_Alternate_Languages/09_Battle/go/main.go
new file mode 100644
index 00000000..c0f911f4
--- /dev/null
+++ b/00_Alternate_Languages/09_Battle/go/main.go
@@ -0,0 +1,266 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+const (
+	SEA_WIDTH        = 6
+	DESTROYER_LENGTH = 2
+	CRUISER_LENGTH   = 3
+	CARRIER_LENGTH   = 4
+)
+
+type Point [2]int
+type Vector Point
+type Sea [][]int
+
+func NewSea() Sea {
+	s := make(Sea, 6)
+	for r := 0; r < SEA_WIDTH; r++ {
+		c := make([]int, 6)
+		s[r] = c
+	}
+
+	return s
+}
+
+func getRandomVector() Vector {
+	v := Vector{}
+
+	for {
+		v[0] = rand.Intn(3) - 1
+		v[1] = rand.Intn(3) - 1
+
+		if !(v[0] == 0 && v[1] == 0) {
+			break
+		}
+	}
+	return v
+}
+
+func addVector(p Point, v Vector) Point {
+	newPoint := Point{}
+
+	newPoint[0] = p[0] + v[0]
+	newPoint[1] = p[1] + v[1]
+
+	return newPoint
+}
+
+func isWithinSea(p Point, s Sea) bool {
+	return (1 <= p[0] && p[0] <= len(s)) && (1 <= p[1] && p[1] <= len(s))
+}
+
+func valueAt(p Point, s Sea) int {
+	return s[p[1]-1][p[0]-1]
+}
+
+func reportInputError() {
+	fmt.Printf("INVALID. SPECIFY TWO NUMBERS FROM 1 TO %d, SEPARATED BY A COMMA.\n", SEA_WIDTH)
+}
+
+func getNextTarget(s Sea) Point {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("\n?")
+		scanner.Scan()
+
+		vals := strings.Split(scanner.Text(), ",")
+
+		if len(vals) != 2 {
+			reportInputError()
+			continue
+		}
+
+		x, xErr := strconv.Atoi(strings.TrimSpace(vals[0]))
+		y, yErr := strconv.Atoi(strings.TrimSpace(vals[1]))
+
+		if (len(vals) != 2) || (xErr != nil) || (yErr != nil) {
+			reportInputError()
+			continue
+		}
+
+		p := Point{}
+		p[0] = x
+		p[1] = y
+		if isWithinSea(p, s) {
+			return p
+		}
+	}
+}
+
+func setValueAt(value int, p Point, s Sea) {
+	s[p[1]-1][p[0]-1] = value
+}
+
+func hasShip(s Sea, code int) bool {
+	hasShip := false
+	for r := 0; r < SEA_WIDTH; r++ {
+		for c := 0; c < SEA_WIDTH; c++ {
+			if s[r][c] == code {
+				hasShip = true
+				break
+			}
+		}
+	}
+	return hasShip
+}
+
+func countSunk(s Sea, codes []int) int {
+	sunk := 0
+
+	for _, c := range codes {
+		if !hasShip(s, c) {
+			sunk += 1
+		}
+	}
+
+	return sunk
+}
+
+func placeShip(s Sea, size, code int) {
+	for {
+		start := Point{}
+		start[0] = rand.Intn(SEA_WIDTH) + 1
+		start[1] = rand.Intn(SEA_WIDTH) + 1
+		vector := getRandomVector()
+
+		point := start
+		points := []Point{}
+
+		for i := 0; i < size; i++ {
+			point = addVector(point, vector)
+			points = append(points, point)
+		}
+
+		clearPosition := true
+		for _, p := range points {
+			if !isWithinSea(p, s) {
+				clearPosition = false
+				break
+			}
+			if valueAt(p, s) > 0 {
+				clearPosition = false
+				break
+			}
+		}
+		if !clearPosition {
+			continue
+		}
+
+		for _, p := range points {
+			setValueAt(code, p, s)
+		}
+		break
+	}
+}
+
+func setupShips(s Sea) {
+	placeShip(s, DESTROYER_LENGTH, 1)
+	placeShip(s, DESTROYER_LENGTH, 2)
+	placeShip(s, CRUISER_LENGTH, 3)
+	placeShip(s, CRUISER_LENGTH, 4)
+	placeShip(s, CARRIER_LENGTH, 5)
+	placeShip(s, CARRIER_LENGTH, 6)
+}
+
+func printIntro() {
+	fmt.Println("                BATTLE")
+	fmt.Println("CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+	fmt.Println()
+	fmt.Println("THE FOLLOWING CODE OF THE BAD GUYS' FLEET DISPOSITION")
+	fmt.Println("HAS BEEN CAPTURED BUT NOT DECODED:	")
+	fmt.Println()
+}
+
+func printInstructions() {
+	fmt.Println()
+	fmt.Println()
+	fmt.Println("DE-CODE IT AND USE IT IF YOU CAN")
+	fmt.Println("BUT KEEP THE DE-CODING METHOD A SECRET.")
+	fmt.Println()
+	fmt.Println("START GAME")
+}
+
+func printEncodedSea(s Sea) {
+	for x := 0; x < SEA_WIDTH; x++ {
+		fmt.Println()
+		for y := SEA_WIDTH - 1; y > -1; y-- {
+			fmt.Printf(" %d", s[y][x])
+		}
+	}
+	fmt.Println()
+}
+
+func wipeout(s Sea) bool {
+	for c := 1; c <= 7; c++ {
+		if hasShip(s, c) {
+			return false
+		}
+	}
+	return true
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+
+	s := NewSea()
+
+	setupShips(s)
+
+	printIntro()
+
+	printEncodedSea(s)
+
+	printInstructions()
+
+	splashes := 0
+	hits := 0
+
+	for {
+		target := getNextTarget(s)
+		targetValue := valueAt(target, s)
+
+		if targetValue < 0 {
+			fmt.Printf("YOU ALREADY PUT A HOLE IN SHIP NUMBER %d AT THAT POINT.\n", targetValue)
+		}
+
+		if targetValue <= 0 {
+			fmt.Println("SPLASH! TRY AGAIN.")
+			splashes += 1
+			continue
+		}
+
+		fmt.Printf("A DIRECT HIT ON SHIP NUMBER %d\n", targetValue)
+		hits += 1
+		setValueAt(targetValue*-1, target, s)
+
+		if !hasShip(s, targetValue) {
+			fmt.Println("AND YOU SUNK IT. HURRAH FOR THE GOOD GUYS.")
+			fmt.Println("SO FAR, THE BAD GUYS HAVE LOST")
+			fmt.Printf("%d DESTROYER(S), %d CRUISER(S), AND %d AIRCRAFT CARRIER(S).\n", countSunk(s, []int{1, 2}), countSunk(s, []int{3, 4}), countSunk(s, []int{5, 6}))
+		}
+
+		if !wipeout(s) {
+			fmt.Printf("YOUR CURRENT SPLASH/HIT RATIO IS %2f\n", float32(splashes)/float32(hits))
+			continue
+		}
+
+		fmt.Printf("YOU HAVE TOTALLY WIPED OUT THE BAD GUYS' FLEET WITH A FINAL SPLASH/HIT RATIO OF %2f\n", float32(splashes)/float32(hits))
+
+		if splashes == 0 {
+			fmt.Println("CONGRATULATIONS -- A DIRECT HIT EVERY TIME.")
+		}
+
+		fmt.Println("\n****************************")
+		break
+	}
+}

From 9b471073b0dcd88612c10acbf1a4bfc3f04c6075 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Fri, 21 Oct 2022 21:48:58 +1100
Subject: [PATCH 063/198] CSHARP-53 Create program sturcture

---
 53_King/csharp/Game.cs                        | 28 ++++++++++++
 53_King/csharp/King.csproj                    |  8 ++++
 53_King/csharp/Program.cs                     |  6 +++
 .../csharp/Resources/Instructions_Prompt.txt  |  1 +
 .../csharp/Resources/Instructions_Text.txt    | 17 +++++++
 53_King/csharp/Resources/Resource.cs          | 45 +++++++++++++++++++
 53_King/csharp/Resources/Title.txt            |  5 +++
 7 files changed, 110 insertions(+)
 create mode 100644 53_King/csharp/Game.cs
 create mode 100644 53_King/csharp/Program.cs
 create mode 100644 53_King/csharp/Resources/Instructions_Prompt.txt
 create mode 100644 53_King/csharp/Resources/Instructions_Text.txt
 create mode 100644 53_King/csharp/Resources/Resource.cs
 create mode 100644 53_King/csharp/Resources/Title.txt

diff --git a/53_King/csharp/Game.cs b/53_King/csharp/Game.cs
new file mode 100644
index 00000000..d357bdf3
--- /dev/null
+++ b/53_King/csharp/Game.cs
@@ -0,0 +1,28 @@
+namespace King;
+
+internal class Game
+{
+    const int TermOfOffice = 8;
+
+    private readonly IReadWrite _io;
+    private readonly IRandom _random;
+
+    public Game(IReadWrite io, IRandom random)
+    {
+        _io = io;
+        _random = random;
+    }
+
+    public void Play()
+    {
+        _io.Write(Resource.Title);
+
+        var response = _io.ReadString(Resource.Instructions_Prompt).ToUpper();
+        if (!response.StartsWith('N'))
+        {
+            _io.Write(Resource.Instructions_Text(TermOfOffice));
+        }
+
+        _io.WriteLine();
+    }
+}
\ No newline at end of file
diff --git a/53_King/csharp/King.csproj b/53_King/csharp/King.csproj
index d3fe4757..3870320c 100644
--- a/53_King/csharp/King.csproj
+++ b/53_King/csharp/King.csproj
@@ -6,4 +6,12 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources/*.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\00_Common\dotnet\Games.Common\Games.Common.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/53_King/csharp/Program.cs b/53_King/csharp/Program.cs
new file mode 100644
index 00000000..6eb4c50e
--- /dev/null
+++ b/53_King/csharp/Program.cs
@@ -0,0 +1,6 @@
+global using Games.Common.IO;
+global using Games.Common.Randomness;
+global using King.Resources;
+using King;
+
+new Game(new ConsoleIO(), new RandomNumberGenerator()).Play();
diff --git a/53_King/csharp/Resources/Instructions_Prompt.txt b/53_King/csharp/Resources/Instructions_Prompt.txt
new file mode 100644
index 00000000..0d311b60
--- /dev/null
+++ b/53_King/csharp/Resources/Instructions_Prompt.txt
@@ -0,0 +1 @@
+Do you want instructions
\ No newline at end of file
diff --git a/53_King/csharp/Resources/Instructions_Text.txt b/53_King/csharp/Resources/Instructions_Text.txt
new file mode 100644
index 00000000..c576123b
--- /dev/null
+++ b/53_King/csharp/Resources/Instructions_Text.txt
@@ -0,0 +1,17 @@
+
+
+
+Congratulations! You've just been elected Premier of Setats
+Detinu, a small communist island 30 by 70 miles long. Your
+job is to decide upon the country's budget and distribute
+money to your countrymen from the communal treasury.
+The money system is rallods, and each person needs 100
+rallods per year to survive. Your country's income comes
+from farm produce and tourists visiting your magnificent
+forests, hunting, fishing, etc. Half your land if farm land
+which also has an excellent mineral content and may be sold
+to foreign industry (strip mining) who import and support
+their own workers. Crops cost between 10 and 15 rallods per
+square mile to plant.
+Your goal is to complete your {0} year term of office.
+Good luck!
diff --git a/53_King/csharp/Resources/Resource.cs b/53_King/csharp/Resources/Resource.cs
new file mode 100644
index 00000000..f8ddfd3f
--- /dev/null
+++ b/53_King/csharp/Resources/Resource.cs
@@ -0,0 +1,45 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace King.Resources;
+
+internal static class Resource
+{
+    public static Stream Title => GetStream();
+    
+    public static string Instructions_Prompt => GetString();
+    public static string Instructions_Text(int years) => string.Format(GetString(), years);
+
+    internal static class Formats
+    {
+        public static string Player => GetString();
+        public static string YouLose => GetString();
+    }
+
+    internal static class Prompts
+    {
+        public static string WantInstructions => GetString();
+        public static string HowManyPlayers => GetString();
+        public static string HowManyRows => GetString();
+        public static string HowManyColumns => GetString();
+        public static string TooManyColumns => GetString();
+    }
+
+    internal static class Strings
+    {
+        public static string TooManyColumns => GetString();
+        public static string TooManyRows => GetString();
+    }
+
+    private static string GetString([CallerMemberName] string? name = null)
+    {
+        using var stream = GetStream(name);
+        using var reader = new StreamReader(stream);
+        return reader.ReadToEnd();
+    }
+
+
+    private static Stream GetStream([CallerMemberName] string? name = null) =>
+        Assembly.GetExecutingAssembly().GetManifestResourceStream($"{typeof(Resource).Namespace}.{name}.txt")
+            ?? throw new Exception($"Could not find embedded resource stream '{name}'.");
+}
\ No newline at end of file
diff --git a/53_King/csharp/Resources/Title.txt b/53_King/csharp/Resources/Title.txt
new file mode 100644
index 00000000..f9f7854d
--- /dev/null
+++ b/53_King/csharp/Resources/Title.txt
@@ -0,0 +1,5 @@
+                                  King
+               Creative Computing  Morristown, New Jersey
+
+
+

From da0f2d13ab444be03485c4d53b57d21257c27356 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Sat, 22 Oct 2022 15:46:44 +1100
Subject: [PATCH 064/198] Add reign initizalization

---
 53_King/csharp/Country.cs                     | 34 +++++++++++++++
 53_King/csharp/Game.cs                        | 26 +++++++++--
 53_King/csharp/IOExtensions.cs                | 43 +++++++++++++++++++
 53_King/csharp/Reign.cs                       | 23 ++++++++++
 ...ions_Prompt.txt => InstructionsPrompt.txt} |  0
 ...ructions_Text.txt => InstructionsText.txt} |  0
 53_King/csharp/Resources/Resource.cs          | 12 +++++-
 .../Resources/SavedCountrymenPrompt.txt       |  1 +
 53_King/csharp/Resources/SavedLandError.txt   |  2 +
 53_King/csharp/Resources/SavedLandPrompt.txt  |  1 +
 .../csharp/Resources/SavedTreasuryPrompt.txt  |  1 +
 .../csharp/Resources/SavedWorkersPrompt.txt   |  1 +
 53_King/csharp/Resources/SavedYearsError.txt  |  1 +
 53_King/csharp/Resources/SavedYearsPrompt.txt |  1 +
 14 files changed, 140 insertions(+), 6 deletions(-)
 create mode 100644 53_King/csharp/Country.cs
 create mode 100644 53_King/csharp/IOExtensions.cs
 create mode 100644 53_King/csharp/Reign.cs
 rename 53_King/csharp/Resources/{Instructions_Prompt.txt => InstructionsPrompt.txt} (100%)
 rename 53_King/csharp/Resources/{Instructions_Text.txt => InstructionsText.txt} (100%)
 create mode 100644 53_King/csharp/Resources/SavedCountrymenPrompt.txt
 create mode 100644 53_King/csharp/Resources/SavedLandError.txt
 create mode 100644 53_King/csharp/Resources/SavedLandPrompt.txt
 create mode 100644 53_King/csharp/Resources/SavedTreasuryPrompt.txt
 create mode 100644 53_King/csharp/Resources/SavedWorkersPrompt.txt
 create mode 100644 53_King/csharp/Resources/SavedYearsError.txt
 create mode 100644 53_King/csharp/Resources/SavedYearsPrompt.txt

diff --git a/53_King/csharp/Country.cs b/53_King/csharp/Country.cs
new file mode 100644
index 00000000..1e94e821
--- /dev/null
+++ b/53_King/csharp/Country.cs
@@ -0,0 +1,34 @@
+namespace King;
+
+internal class Country
+{
+    private readonly IRandom _random;
+    private float _rallods;
+    private float _countrymen;
+    private float _foreigners;
+    private float _land;
+    private float _plantingCost;
+    private float _landValue;
+
+    public Country(IRandom random)
+        : this(
+            random,
+            (int)(60000 + random.NextFloat(1000) - random.NextFloat(1000)),
+            (int)(500 + random.NextFloat(10) - random.NextFloat(10)),
+            0,
+            2000)
+    {
+    }
+
+    public Country(IRandom random, float rallods, float countrymen, float foreigners, float land)
+    {
+        _random = random;
+        _rallods = rallods;
+        _countrymen = countrymen;
+        _foreigners = foreigners;
+        _land = land;
+
+        _plantingCost = random.Next(10, 15);
+        _landValue = random.Next(95, 105);
+    }
+}
diff --git a/53_King/csharp/Game.cs b/53_King/csharp/Game.cs
index d357bdf3..c8a44a8c 100644
--- a/53_King/csharp/Game.cs
+++ b/53_King/csharp/Game.cs
@@ -17,12 +17,30 @@ internal class Game
     {
         _io.Write(Resource.Title);
 
-        var response = _io.ReadString(Resource.Instructions_Prompt).ToUpper();
-        if (!response.StartsWith('N'))
+        if (SetUpReign() is Reign reign)
         {
-            _io.Write(Resource.Instructions_Text(TermOfOffice));
+            _io.Write(reign);
         }
 
         _io.WriteLine();
+        _io.WriteLine();
     }
-}
\ No newline at end of file
+
+    private Reign? SetUpReign()
+    {
+        var response = _io.ReadString(Resource.InstructionsPrompt).ToUpper();
+
+        if (response.Equals("Again", StringComparison.InvariantCultureIgnoreCase))
+        {
+            return _io.TryReadGameData(_random, out var reign) ? reign : null;
+        }
+        
+        if (!response.StartsWith("N", StringComparison.InvariantCultureIgnoreCase))
+        {
+            _io.Write(Resource.InstructionsText(TermOfOffice));
+        }
+
+        _io.WriteLine();
+        return new Reign(_io, _random);
+    }
+}
diff --git a/53_King/csharp/IOExtensions.cs b/53_King/csharp/IOExtensions.cs
new file mode 100644
index 00000000..183621ca
--- /dev/null
+++ b/53_King/csharp/IOExtensions.cs
@@ -0,0 +1,43 @@
+using System.Diagnostics.CodeAnalysis;
+using static King.Resources.Resource;
+
+namespace King;
+
+internal static class IOExtensions
+{
+    internal static bool TryReadGameData(this IReadWrite io, IRandom random, [NotNullWhen(true)] out Reign? reign)
+    {
+        if (io.TryReadValue(SavedYearsPrompt, v => v < Reign.MaxTerm, SavedYearsError(Reign.MaxTerm), out var years) &&
+            io.TryReadValue(SavedTreasuryPrompt, out var rallods) &&
+            io.TryReadValue(SavedCountrymenPrompt, out var countrymen) &&
+            io.TryReadValue(SavedWorkersPrompt, out var workers) &&
+            io.TryReadValue(SavedLandPrompt, v => v is > 1000 and <= 2000, SavedLandError, out var land))
+        {
+            reign = new Reign(io, new Country(random, rallods, countrymen, workers, land), years + 1);
+            return true;
+        }
+
+        reign = default;
+        return false;
+    }
+
+    private static bool TryReadValue(this IReadWrite io, string prompt, out float value)
+        => io.TryReadValue(prompt, _ => true, "", out value);
+    
+    private static bool TryReadValue(
+        this IReadWrite io,
+        string prompt,
+        Predicate<float> isValid,
+        string error,
+        out float value)
+    {
+        while (true)
+        {
+            value = io.ReadNumber(prompt);
+            if (value < 0) { return false; }
+            if (isValid(value)) { return true; }
+            
+            io.Write(error);
+        }
+    }
+}
\ No newline at end of file
diff --git a/53_King/csharp/Reign.cs b/53_King/csharp/Reign.cs
new file mode 100644
index 00000000..4e6c45c5
--- /dev/null
+++ b/53_King/csharp/Reign.cs
@@ -0,0 +1,23 @@
+namespace King;
+
+internal class Reign
+{
+    public const int MaxTerm = 8;
+
+    private readonly IReadWrite _io;
+    private readonly Country _country;
+    private readonly float _year;
+
+    public Reign(IReadWrite io, IRandom random)
+        : this(io, new Country(random), 0)
+    {
+
+    }
+
+    public Reign(IReadWrite io, Country country, float year)
+    {
+        _io = io;
+        _country = country;
+        _year = year;
+    }
+}
diff --git a/53_King/csharp/Resources/Instructions_Prompt.txt b/53_King/csharp/Resources/InstructionsPrompt.txt
similarity index 100%
rename from 53_King/csharp/Resources/Instructions_Prompt.txt
rename to 53_King/csharp/Resources/InstructionsPrompt.txt
diff --git a/53_King/csharp/Resources/Instructions_Text.txt b/53_King/csharp/Resources/InstructionsText.txt
similarity index 100%
rename from 53_King/csharp/Resources/Instructions_Text.txt
rename to 53_King/csharp/Resources/InstructionsText.txt
diff --git a/53_King/csharp/Resources/Resource.cs b/53_King/csharp/Resources/Resource.cs
index f8ddfd3f..6626a3dd 100644
--- a/53_King/csharp/Resources/Resource.cs
+++ b/53_King/csharp/Resources/Resource.cs
@@ -7,9 +7,17 @@ internal static class Resource
 {
     public static Stream Title => GetStream();
     
-    public static string Instructions_Prompt => GetString();
-    public static string Instructions_Text(int years) => string.Format(GetString(), years);
+    public static string InstructionsPrompt => GetString();
+    public static string InstructionsText(int years) => string.Format(GetString(), years);
 
+    public static string SavedYearsPrompt => GetString();
+    public static string SavedYearsError(int years) => string.Format(GetString(), years);
+    public static string SavedTreasuryPrompt => GetString();
+    public static string SavedCountrymenPrompt => GetString();
+    public static string SavedWorkersPrompt => GetString();
+    public static string SavedLandPrompt => GetString();
+    public static string SavedLandError => GetString();
+    
     internal static class Formats
     {
         public static string Player => GetString();
diff --git a/53_King/csharp/Resources/SavedCountrymenPrompt.txt b/53_King/csharp/Resources/SavedCountrymenPrompt.txt
new file mode 100644
index 00000000..120718d2
--- /dev/null
+++ b/53_King/csharp/Resources/SavedCountrymenPrompt.txt
@@ -0,0 +1 @@
+How many countrymen
\ No newline at end of file
diff --git a/53_King/csharp/Resources/SavedLandError.txt b/53_King/csharp/Resources/SavedLandError.txt
new file mode 100644
index 00000000..9ac66dad
--- /dev/null
+++ b/53_King/csharp/Resources/SavedLandError.txt
@@ -0,0 +1,2 @@
+   Come on, you started with 1000 sq. miles of farm land
+   and 10,000 sq. miles of forest land
diff --git a/53_King/csharp/Resources/SavedLandPrompt.txt b/53_King/csharp/Resources/SavedLandPrompt.txt
new file mode 100644
index 00000000..e8afdf72
--- /dev/null
+++ b/53_King/csharp/Resources/SavedLandPrompt.txt
@@ -0,0 +1 @@
+How many square miles of land
\ No newline at end of file
diff --git a/53_King/csharp/Resources/SavedTreasuryPrompt.txt b/53_King/csharp/Resources/SavedTreasuryPrompt.txt
new file mode 100644
index 00000000..f4a50f58
--- /dev/null
+++ b/53_King/csharp/Resources/SavedTreasuryPrompt.txt
@@ -0,0 +1 @@
+How much did you have in the treasury
\ No newline at end of file
diff --git a/53_King/csharp/Resources/SavedWorkersPrompt.txt b/53_King/csharp/Resources/SavedWorkersPrompt.txt
new file mode 100644
index 00000000..b88a9c10
--- /dev/null
+++ b/53_King/csharp/Resources/SavedWorkersPrompt.txt
@@ -0,0 +1 @@
+How many workers
\ No newline at end of file
diff --git a/53_King/csharp/Resources/SavedYearsError.txt b/53_King/csharp/Resources/SavedYearsError.txt
new file mode 100644
index 00000000..1c8c3c99
--- /dev/null
+++ b/53_King/csharp/Resources/SavedYearsError.txt
@@ -0,0 +1 @@
+   Come on, your term in office is only {0} years.
diff --git a/53_King/csharp/Resources/SavedYearsPrompt.txt b/53_King/csharp/Resources/SavedYearsPrompt.txt
new file mode 100644
index 00000000..afbda229
--- /dev/null
+++ b/53_King/csharp/Resources/SavedYearsPrompt.txt
@@ -0,0 +1 @@
+How many years had you been in office when interrupted
\ No newline at end of file

From 5e4430409a68a1c6a13c7677889fc81b6d9cca9f Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Tue, 25 Oct 2022 09:07:16 +1000
Subject: [PATCH 065/198] Added go implementation of Bombardment

---
 .../11_Bombardment/go/main.go                 | 181 ++++++++++++++++++
 1 file changed, 181 insertions(+)
 create mode 100644 00_Alternate_Languages/11_Bombardment/go/main.go

diff --git a/00_Alternate_Languages/11_Bombardment/go/main.go b/00_Alternate_Languages/11_Bombardment/go/main.go
new file mode 100644
index 00000000..e69ff3ea
--- /dev/null
+++ b/00_Alternate_Languages/11_Bombardment/go/main.go
@@ -0,0 +1,181 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Messages correspond to outposts remaining (3, 2, 1, 0)
+var PLAYER_PROGRESS_MESSAGES = []string{
+	"YOU GOT ME, I'M GOING FAST. BUT I'LL GET YOU WHEN\nMY TRANSISTO&S RECUP%RA*E!",
+	"THREE DOWN, ONE TO GO.\n\n",
+	"TWO DOWN, TWO TO GO.\n\n",
+	"ONE DOWN, THREE TO GO.\n\n",
+}
+
+var ENEMY_PROGRESS_MESSAGES = []string{
+	"YOU'RE DEAD. YOUR LAST OUTPOST WAS AT %d. HA, HA, HA.\nBETTER LUCK NEXT TIME.",
+	"YOU HAVE ONLY ONE OUTPOST LEFT.\n\n",
+	"YOU HAVE ONLY TWO OUTPOSTS LEFT.\n\n",
+	"YOU HAVE ONLY THREE OUTPOSTS LEFT.\n\n",
+}
+
+func displayField() {
+	for r := 0; r < 5; r++ {
+		initial := r*5 + 1
+		for c := 0; c < 5; c++ {
+			//x := strconv.Itoa(initial + c)
+			fmt.Printf("\t%d", initial+c)
+		}
+		fmt.Println()
+	}
+	fmt.Print("\n\n\n\n\n\n\n\n\n")
+}
+
+func printIntro() {
+	fmt.Println("                                BOMBARDMENT")
+	fmt.Println("                CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+	fmt.Println()
+	fmt.Println()
+	fmt.Println("YOU ARE ON A BATTLEFIELD WITH 4 PLATOONS AND YOU")
+	fmt.Println("HAVE 25 OUTPOSTS AVAILABLE WHERE THEY MAY BE PLACED.")
+	fmt.Println("YOU CAN ONLY PLACE ONE PLATOON AT ANY ONE OUTPOST.")
+	fmt.Println("THE COMPUTER DOES THE SAME WITH ITS FOUR PLATOONS.")
+	fmt.Println()
+	fmt.Println("THE OBJECT OF THE GAME IS TO FIRE MISSLES AT THE")
+	fmt.Println("OUTPOSTS OF THE COMPUTER.  IT WILL DO THE SAME TO YOU.")
+	fmt.Println("THE ONE WHO DESTROYS ALL FOUR OF THE ENEMY'S PLATOONS")
+	fmt.Println("FIRST IS THE WINNER.")
+	fmt.Println()
+	fmt.Println("GOOD LUCK... AND TELL US WHERE YOU WANT THE BODIES SENT!")
+	fmt.Println()
+	fmt.Println("TEAR OFF MATRIX AND USE IT TO CHECK OFF THE NUMBERS.")
+	fmt.Print("\n\n\n\n")
+}
+
+func positionList() []int {
+	positions := make([]int, 25)
+	for i := 0; i < 25; i++ {
+		positions[i] = i + 1
+	}
+	return positions
+}
+
+// Randomly choose 4 'positions' out of a range of 1 to 25
+func generateEnemyPositions() []int {
+	positions := positionList()
+	rand.Shuffle(len(positions), func(i, j int) { positions[i], positions[j] = positions[j], positions[i] })
+	return positions[:4]
+}
+
+func isValidPosition(p int) bool {
+	return p >= 1 && p <= 25
+}
+
+func promptForPlayerPositions() []int {
+	scanner := bufio.NewScanner(os.Stdin)
+	var positions []int
+
+	for {
+		fmt.Println("\nWHAT ARE YOUR FOUR POSITIONS (1-25)?")
+		scanner.Scan()
+		rawPositions := strings.Split(scanner.Text(), " ")
+
+		if len(rawPositions) != 4 {
+			fmt.Println("PLEASE ENTER FOUR UNIQUE POSITIONS")
+			goto there
+		}
+
+		for _, p := range rawPositions {
+			pos, err := strconv.Atoi(p)
+			if (err != nil) || !isValidPosition(pos) {
+				fmt.Println("ALL POSITIONS MUST RANGE (1-25)")
+				goto there
+			}
+			positions = append(positions, pos)
+		}
+		if len(positions) == 4 {
+			return positions
+		}
+
+	there:
+	}
+}
+
+func promptPlayerForTarget() int {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("\nWHERE DO YOU WISH TO FIRE YOUR MISSILE?")
+		scanner.Scan()
+		target, err := strconv.Atoi(scanner.Text())
+
+		if (err != nil) || !isValidPosition(target) {
+			fmt.Println("POSITIONS MUST RANGE (1-25)")
+			continue
+		}
+		return target
+	}
+}
+
+func generateAttackSequence() []int {
+	positions := positionList()
+	rand.Shuffle(len(positions), func(i, j int) { positions[i], positions[j] = positions[j], positions[i] })
+	return positions
+}
+
+// Performs attack procedure returning True if we are to continue.
+func attack(target int, positions *[]int, hitMsg, missMsg string, progressMsg []string) bool {
+	for i := 0; i < len(*positions); i++ {
+		if target == (*positions)[i] {
+			fmt.Print(hitMsg)
+
+			// remove the target just hit
+			(*positions)[i] = (*positions)[len((*positions))-1]
+			(*positions)[len((*positions))-1] = 0
+			(*positions) = (*positions)[:len((*positions))-1]
+
+			if len((*positions)) != 0 {
+				fmt.Print(progressMsg[len((*positions))])
+			} else {
+				fmt.Printf(progressMsg[len((*positions))], target)
+			}
+			return len((*positions)) > 0
+		}
+	}
+	fmt.Print(missMsg)
+	return len((*positions)) > 0
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+
+	printIntro()
+	displayField()
+
+	enemyPositions := generateEnemyPositions()
+	enemyAttacks := generateAttackSequence()
+	enemyAttackCounter := 0
+
+	playerPositions := promptForPlayerPositions()
+
+	for {
+		// player attacks
+		if !attack(promptPlayerForTarget(), &enemyPositions, "YOU GOT ONE OF MY OUTPOSTS!\n\n", "HA, HA YOU MISSED. MY TURN NOW:\n\n", PLAYER_PROGRESS_MESSAGES) {
+			break
+		}
+		// computer attacks
+		hitMsg := fmt.Sprintf("I GOT YOU. IT WON'T BE LONG NOW. POST %d WAS HIT.\n", enemyAttacks[enemyAttackCounter])
+		missMsg := fmt.Sprintf("I MISSED YOU, YOU DIRTY RAT. I PICKED %d. YOUR TURN:\n\n", enemyAttacks[enemyAttackCounter])
+		if !attack(enemyAttacks[enemyAttackCounter], &playerPositions, hitMsg, missMsg, ENEMY_PROGRESS_MESSAGES) {
+			break
+		}
+		enemyAttackCounter += 1
+	}
+
+}

From 5d3bd244607933c126d5aa03774b32b6813ebfa4 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Tue, 25 Oct 2022 13:56:16 +1000
Subject: [PATCH 066/198] Added go version of Bombs_Away

---
 .../12_Bombs_Away/go/main.go                  | 188 ++++++++++++++++++
 1 file changed, 188 insertions(+)
 create mode 100644 00_Alternate_Languages/12_Bombs_Away/go/main.go

diff --git a/00_Alternate_Languages/12_Bombs_Away/go/main.go b/00_Alternate_Languages/12_Bombs_Away/go/main.go
new file mode 100644
index 00000000..616f4451
--- /dev/null
+++ b/00_Alternate_Languages/12_Bombs_Away/go/main.go
@@ -0,0 +1,188 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type Choice struct {
+	idx string
+	msg string
+}
+
+func playerSurvived() {
+	fmt.Println("YOU MADE IT THROUGH TREMENDOUS FLAK!!")
+}
+
+func playerDeath() {
+	fmt.Println("* * * * BOOM * * * *")
+	fmt.Println("YOU HAVE BEEN SHOT DOWN.....")
+	fmt.Println("DEARLY BELOVED, WE ARE GATHERED HERE TODAY TO PAY OUR")
+	fmt.Println("LAST TRIBUTE...")
+}
+
+func missionSuccess() {
+	fmt.Printf("DIRECT HIT!!!! %d KILLED.\n", int(100*rand.Int()))
+	fmt.Println("MISSION SUCCESSFUL.")
+}
+
+// Takes a float between 0 and 1 and returns a boolean
+// if the player has survived (based on random chance)
+// Returns True if death, False if survived
+func deathWithChance(probability float64) bool {
+	return probability > rand.Float64()
+}
+
+func startNonKamikaziAttack() {
+	numMissions := getIntInput("HOW MANY MISSIONS HAVE YOU FLOWN? ")
+
+	for numMissions > 160 {
+		fmt.Println("MISSIONS, NOT MILES...")
+		fmt.Println("150 MISSIONS IS HIGH EVEN FOR OLD-TIMERS")
+		numMissions = getIntInput("HOW MANY MISSIONS HAVE YOU FLOWN? ")
+	}
+
+	if numMissions > 100 {
+		fmt.Println("THAT'S PUSHING THE ODDS!")
+	}
+
+	if numMissions < 25 {
+		fmt.Println("FRESH OUT OF TRAINING, EH?")
+	}
+
+	fmt.Println()
+
+	if float32(numMissions) > (160 * rand.Float32()) {
+		missionSuccess()
+	} else {
+		missionFailure()
+	}
+}
+
+func missionFailure() {
+	fmt.Printf("MISSED TARGET BY %d MILES!\n", int(2+30*rand.Float32()))
+	fmt.Println("NOW YOU'RE REALLY IN FOR IT !!")
+	fmt.Println()
+
+	enemyWeapons := getInputFromList("DOES THE ENEMY HAVE GUNS(1), MISSILES(2), OR BOTH(3)? ", []Choice{{idx: "1", msg: "GUNS"}, {idx: "2", msg: "MISSILES"}, {idx: "3", msg: "BOTH"}})
+
+	// If there are no gunners (i.e. weapon choice 2) then
+	// we say that the gunners have 0 accuracy for the purposes
+	// of calculating probability of player death
+	enemyGunnerAccuracy := 0.0
+	if enemyWeapons.idx != "2" {
+		enemyGunnerAccuracy = float64(getIntInput("WHAT'S THE PERCENT HIT RATE OF ENEMY GUNNERS (10 TO 50)? "))
+		if enemyGunnerAccuracy < 10.0 {
+			fmt.Println("YOU LIE, BUT YOU'LL PAY...")
+			playerDeath()
+		}
+	}
+
+	missileThreatWeighting := 35.0
+	if enemyWeapons.idx == "1" {
+		missileThreatWeighting = 0
+	}
+
+	death := deathWithChance((enemyGunnerAccuracy + missileThreatWeighting) / 100)
+
+	if death {
+		playerDeath()
+	} else {
+		playerSurvived()
+	}
+}
+
+func playItaly() {
+	targets := []Choice{{idx: "1", msg: "SHOULD BE EASY -- YOU'RE FLYING A NAZI-MADE PLANE."}, {idx: "2", msg: "BE CAREFUL!!!"}, {idx: "3", msg: "YOU'RE GOING FOR THE OIL, EH?"}}
+	target := getInputFromList("YOUR TARGET -- ALBANIA(1), GREECE(2), NORTH AFRICA(3)", targets)
+	fmt.Println(target.msg)
+	startNonKamikaziAttack()
+}
+
+func playAllies() {
+	aircraftMessages := []Choice{{idx: "1", msg: "YOU'VE GOT 2 TONS OF BOMBS FLYING FOR PLOESTI."}, {idx: "2", msg: "YOU'RE DUMPING THE A-BOMB ON HIROSHIMA."}, {idx: "3", msg: "YOU'RE CHASING THE BISMARK IN THE NORTH SEA."}, {idx: "4", msg: "YOU'RE BUSTING A GERMAN HEAVY WATER PLANT IN THE RUHR."}}
+	aircraft := getInputFromList("AIRCRAFT -- LIBERATOR(1), B-29(2), B-17(3), LANCASTER(4): ", aircraftMessages)
+	fmt.Println(aircraft.msg)
+	startNonKamikaziAttack()
+}
+
+func playJapan() {
+	acknowledgeMessage := []Choice{{idx: "Y", msg: "Y"}, {idx: "N", msg: "N"}}
+	firstMission := getInputFromList("YOU'RE FLYING A KAMIKAZE MISSION OVER THE USS LEXINGTON.\nYOUR FIRST KAMIKAZE MISSION? (Y OR N): ", acknowledgeMessage)
+	if firstMission.msg == "N" {
+		playerDeath()
+	}
+	if rand.Float64() > 0.65 {
+		missionSuccess()
+	} else {
+		playerDeath()
+	}
+}
+
+func playGermany() {
+	targets := []Choice{{idx: "1", msg: "YOU'RE NEARING STALINGRAD."}, {idx: "2", msg: "NEARING LONDON.  BE CAREFUL, THEY'VE GOT RADAR."}, {idx: "3", msg: "NEARING VERSAILLES.  DUCK SOUP.  THEY'RE NEARLY DEFENSELESS."}}
+	target := getInputFromList("A NAZI, EH?  OH WELL.  ARE YOU GOING FOR RUSSIA(1),\nENGLAND(2), OR FRANCE(3)? ", targets)
+	fmt.Println(target.msg)
+	startNonKamikaziAttack()
+}
+
+func playGame() {
+	fmt.Println("YOU ARE A PILOT IN A WORLD WAR II BOMBER.")
+	side := getInputFromList("WHAT SIDE -- ITALY(1), ALLIES(2), JAPAN(3), GERMANY(4): ", []Choice{{idx: "1", msg: "ITALY"}, {idx: "2", msg: "ALLIES"}, {idx: "3", msg: "JAPAN"}, {idx: "4", msg: "GERMANY"}})
+	switch side.idx {
+	case "1":
+		playItaly()
+	case "2":
+		playAllies()
+	case "3":
+		playJapan()
+	case "4":
+		playGermany()
+	}
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+
+	for {
+		playGame()
+		if getInputFromList("ANOTHER MISSION (Y OR N):", []Choice{{idx: "Y", msg: "Y"}, {idx: "N", msg: "N"}}).msg == "N" {
+			break
+		}
+	}
+}
+
+func getInputFromList(prompt string, choices []Choice) Choice {
+	scanner := bufio.NewScanner(os.Stdin)
+	for {
+		fmt.Println(prompt)
+		scanner.Scan()
+		choice := scanner.Text()
+		for _, c := range choices {
+			if strings.EqualFold(strings.ToUpper(choice), strings.ToUpper(c.idx)) {
+				return c
+			}
+		}
+		fmt.Println("TRY AGAIN...")
+	}
+}
+
+func getIntInput(prompt string) int {
+	scanner := bufio.NewScanner(os.Stdin)
+	for {
+		fmt.Println(prompt)
+		scanner.Scan()
+		choice, err := strconv.Atoi(scanner.Text())
+		if err != nil {
+			fmt.Println("TRY AGAIN...")
+			continue
+		} else {
+			return choice
+		}
+	}
+}

From be464fb38704c1d8cf3356d693aaa85bba466ff9 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Thu, 27 Oct 2022 09:03:10 +1000
Subject: [PATCH 067/198] Added go version of Depth_Charge

---
 .../31_Depth_Charge/go/main.go                | 156 ++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 00_Alternate_Languages/31_Depth_Charge/go/main.go

diff --git a/00_Alternate_Languages/31_Depth_Charge/go/main.go b/00_Alternate_Languages/31_Depth_Charge/go/main.go
new file mode 100644
index 00000000..0ab3f876
--- /dev/null
+++ b/00_Alternate_Languages/31_Depth_Charge/go/main.go
@@ -0,0 +1,156 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type Position []int
+
+func NewPosition() Position {
+	p := make([]int, 3)
+	return Position(p)
+}
+
+func showWelcome() {
+	fmt.Print("\033[H\033[2J")
+	fmt.Println("                DEPTH CHARGE")
+	fmt.Println("    Creative Computing  Morristown, New Jersey")
+	fmt.Println()
+}
+
+func getNumCharges() (int, int) {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("Dimensions of search area?")
+		scanner.Scan()
+		dim, err := strconv.Atoi(scanner.Text())
+		if err != nil {
+			fmt.Println("Must enter an integer number. Please try again...")
+			continue
+		}
+		return dim, int(math.Log2(float64(dim))) + 1
+	}
+}
+
+func askForNewGame() {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	fmt.Println("Another game (Y or N): ")
+	scanner.Scan()
+	if strings.ToUpper(scanner.Text()) == "Y" {
+		main()
+	}
+	fmt.Println("OK. Hope you enjoyed yourself")
+	os.Exit(1)
+}
+
+func showShotResult(shot, location Position) {
+	result := "Sonar reports shot was "
+
+	if shot[1] > location[1] { // y-direction
+		result += "north"
+	} else if shot[1] < location[1] { // y-direction
+		result += "south"
+	}
+
+	if shot[0] > location[0] { // x-direction
+		result += "east"
+	} else if shot[0] < location[0] { // x-direction
+		result += "west"
+	}
+
+	if shot[1] != location[1] || shot[0] != location[0] {
+		result += " and "
+	}
+	if shot[2] > location[2] {
+		result += "too low."
+	} else if shot[2] < location[2] {
+		result += "too high."
+	} else {
+		result += "depth OK."
+	}
+
+	fmt.Println(result)
+}
+
+func getShot() Position {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		shotPos := NewPosition()
+		fmt.Println("Enter coordinates: ")
+		scanner.Scan()
+		rawGuess := strings.Split(scanner.Text(), " ")
+		if len(rawGuess) != 3 {
+			goto there
+		}
+		for i := 0; i < 3; i++ {
+			val, err := strconv.Atoi(rawGuess[i])
+			if err != nil {
+				goto there
+			}
+			shotPos[i] = val
+		}
+		return shotPos
+	there:
+		fmt.Println("Please enter coordinates separated by spaces")
+		fmt.Println("Example: 3 2 1")
+	}
+}
+
+func getRandomPosition(searchArea int) Position {
+	pos := NewPosition()
+	for i := 0; i < 3; i++ {
+		pos[i] = rand.Intn(searchArea)
+	}
+	return pos
+}
+
+func playGame(searchArea, numCharges int) {
+	rand.Seed(time.Now().UTC().UnixNano())
+	fmt.Println("\nYou are the captain of the destroyer USS Computer.")
+	fmt.Println("An enemy sub has been causing you trouble. Your")
+	fmt.Printf("mission is to destroy it. You have %d shots.\n", numCharges)
+	fmt.Println("Specify depth charge explosion point with a")
+	fmt.Println("trio of numbers -- the first two are the")
+	fmt.Println("surface coordinates; the third is the depth.")
+	fmt.Println("\nGood luck!")
+	fmt.Println()
+
+	subPos := getRandomPosition(searchArea)
+
+	for c := 0; c < numCharges; c++ {
+		fmt.Printf("\nTrial #%d\n", c+1)
+
+		shot := getShot()
+
+		if shot[0] == subPos[0] && shot[1] == subPos[1] && shot[2] == subPos[2] {
+			fmt.Printf("\nB O O M ! ! You found it in %d tries!\n", c+1)
+			askForNewGame()
+		} else {
+			showShotResult(shot, subPos)
+		}
+	}
+
+	// out of depth charges
+	fmt.Println("\nYou have been torpedoed! Abandon ship!")
+	fmt.Printf("The submarine was at %d %d %d\n", subPos[0], subPos[1], subPos[2])
+	askForNewGame()
+
+}
+
+func main() {
+	showWelcome()
+
+	searchArea, numCharges := getNumCharges()
+
+	playGame(searchArea, numCharges)
+}

From 65ea4be550f1911f148f92f5a6701fc9f572ea32 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Thu, 27 Oct 2022 09:42:24 +1000
Subject: [PATCH 068/198] Added go version of Dice

---
 00_Alternate_Languages/33_Dice/go/main.go | 64 +++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 00_Alternate_Languages/33_Dice/go/main.go

diff --git a/00_Alternate_Languages/33_Dice/go/main.go b/00_Alternate_Languages/33_Dice/go/main.go
new file mode 100644
index 00000000..75bef387
--- /dev/null
+++ b/00_Alternate_Languages/33_Dice/go/main.go
@@ -0,0 +1,64 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+)
+
+func printWelcome() {
+	fmt.Println("\n                   Dice")
+	fmt.Println("Creative Computing  Morristown, New Jersey")
+	fmt.Println()
+	fmt.Println()
+	fmt.Println("This program simulates the rolling of a")
+	fmt.Println("pair of dice.")
+	fmt.Println("You enter the number of times you want the computer to")
+	fmt.Println("'roll' the dice.   Watch out, very large numbers take")
+	fmt.Println("a long time.  In particular, numbers over 5000.")
+	fmt.Println()
+}
+
+func main() {
+	printWelcome()
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("\nHow many rolls? ")
+		scanner.Scan()
+		numRolls, err := strconv.Atoi(scanner.Text())
+		if err != nil {
+			fmt.Println("Invalid input, try again...")
+			continue
+		}
+
+		// We'll track counts of roll outcomes in a 13-element list.
+		// The first two indices (0 & 1) are ignored, leaving just
+		// the indices that match the roll values (2 through 12).
+		results := make([]int, 13)
+
+		for n := 0; n < numRolls; n++ {
+			d1 := rand.Intn(6) + 1
+			d2 := rand.Intn(6) + 1
+			results[d1+d2] += 1
+		}
+
+		// Display final results
+		fmt.Println("\nTotal Spots   Number of Times")
+		for i := 2; i < 13; i++ {
+			fmt.Printf(" %-14d%d\n", i, results[i])
+		}
+
+		fmt.Println("\nTry again? ")
+		scanner.Scan()
+		if strings.ToUpper(scanner.Text()) == "Y" {
+			continue
+		} else {
+			os.Exit(1)
+		}
+
+	}
+}

From 7b813d5bdb3e4b6a14c3bf47fdac2a4bf335a40a Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Thu, 27 Oct 2022 12:45:57 +1000
Subject: [PATCH 069/198] Added go version of Digits

---
 00_Alternate_Languages/34_Digits/go/main.go | 171 ++++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 00_Alternate_Languages/34_Digits/go/main.go

diff --git a/00_Alternate_Languages/34_Digits/go/main.go b/00_Alternate_Languages/34_Digits/go/main.go
new file mode 100644
index 00000000..64326d53
--- /dev/null
+++ b/00_Alternate_Languages/34_Digits/go/main.go
@@ -0,0 +1,171 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"strconv"
+	"time"
+)
+
+func printIntro() {
+	fmt.Println("                                DIGITS")
+	fmt.Println("              CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+	fmt.Println()
+	fmt.Println()
+	fmt.Println("THIS IS A GAME OF GUESSING.")
+}
+
+func readInteger(prompt string) int {
+	scanner := bufio.NewScanner(os.Stdin)
+	for {
+		fmt.Println(prompt)
+		scanner.Scan()
+		response, err := strconv.Atoi(scanner.Text())
+
+		if err != nil {
+			fmt.Println("INVALID INPUT, TRY AGAIN... ")
+			continue
+		}
+
+		return response
+	}
+}
+
+func printInstructions() {
+	fmt.Println()
+	fmt.Println("PLEASE TAKE A PIECE OF PAPER AND WRITE DOWN")
+	fmt.Println("THE DIGITS '0', '1', OR '2' THIRTY TIMES AT RANDOM.")
+	fmt.Println("ARRANGE THEM IN THREE LINES OF TEN DIGITS EACH.")
+	fmt.Println("I WILL ASK FOR THEN TEN AT A TIME.")
+	fmt.Println("I WILL ALWAYS GUESS THEM FIRST AND THEN LOOK AT YOUR")
+	fmt.Println("NEXT NUMBER TO SEE IF I WAS RIGHT. BY PURE LUCK,")
+	fmt.Println("I OUGHT TO BE RIGHT TEN TIMES. BUT I HOPE TO DO BETTER")
+	fmt.Println("THAN THAT *****")
+	fmt.Println()
+}
+
+func readTenNumbers() []int {
+	numbers := make([]int, 10)
+
+	numbers[0] = readInteger("FIRST NUMBER: ")
+	for i := 1; i < 10; i++ {
+		numbers[i] = readInteger("NEXT NUMBER:")
+	}
+
+	return numbers
+}
+
+func printSummary(correct int) {
+	fmt.Println()
+
+	if correct > 10 {
+		fmt.Println()
+		fmt.Println("I GUESSED MORE THAN 1/3 OF YOUR NUMBERS.")
+		fmt.Println("I WIN.\u0007")
+	} else if correct < 10 {
+		fmt.Println("I GUESSED LESS THAN 1/3 OF YOUR NUMBERS.")
+		fmt.Println("YOU BEAT ME.  CONGRATULATIONS *****")
+	} else {
+		fmt.Println("I GUESSED EXACTLY 1/3 OF YOUR NUMBERS.")
+		fmt.Println("IT'S A TIE GAME.")
+	}
+}
+
+func buildArray(val, row, col int) [][]int {
+	a := make([][]int, row)
+	for r := 0; r < row; r++ {
+		b := make([]int, col)
+		for c := 0; c < col; c++ {
+			b[c] = val
+		}
+		a[r] = b
+	}
+	return a
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+
+	printIntro()
+	if readInteger("FOR INSTRUCTIONS, TYPE '1', ELSE TYPE '0' ? ") == 1 {
+		printInstructions()
+	}
+
+	a := 0
+	b := 1
+	c := 3
+
+	m := buildArray(1, 27, 3)
+	k := buildArray(9, 3, 3)
+	l := buildArray(3, 9, 3)
+
+	for {
+		l[0][0] = 2
+		l[4][1] = 2
+		l[8][2] = 2
+
+		z := float64(26)
+		z1 := float64(8)
+		z2 := 2
+		runningCorrect := 0
+
+		var numbers []int
+		for round := 1; round <= 4; round++ {
+			validNumbers := false
+			for !validNumbers {
+				numbers = readTenNumbers()
+				validNumbers = true
+				for _, n := range numbers {
+					if n < 0 || n > 2 {
+						fmt.Println("ONLY USE THE DIGITS '0', '1', OR '2'.")
+						fmt.Println("LET'S TRY AGAIN.")
+						validNumbers = false
+						break
+					}
+				}
+			}
+
+			fmt.Printf("\n%-14s%-14s%-14s%-14s\n", "MY GUESS", "YOUR NO.", "RESULT", "NO. RIGHT")
+
+			for _, n := range numbers {
+				s := 0
+				myGuess := 0
+
+				for j := 0; j < 3; j++ {
+					s1 := a*k[z2][j] + b*l[int(z1)][j] + c*m[int(z)][j]
+
+					if s < s1 {
+						s = s1
+						myGuess = j
+					} else if s1 == s && rand.Float64() > 0.5 {
+						myGuess = j
+					}
+				}
+				result := ""
+
+				if myGuess != n {
+					result = "WRONG"
+				} else {
+					runningCorrect += 1
+					result = "RIGHT"
+					m[int(z)][n] = m[int(z)][n] + 1
+					l[int(z1)][n] = l[int(z1)][n] + 1
+					k[int(z2)][n] = k[int(z2)][n] + 1
+					z = z - (z/9)*9
+					z = 3.0*z + float64(n)
+				}
+				fmt.Printf("\n%-14d%-14d%-14s%-14d\n", myGuess, n, result, runningCorrect)
+
+				z1 = z - (z/9)*9
+				z2 = n
+			}
+			printSummary(runningCorrect)
+			if readInteger("\nDO YOU WANT TO TRY AGAIN (1 FOR YES, 0 FOR NO) ? ") != 1 {
+				fmt.Println("\nTHANKS FOR THE GAME.")
+				os.Exit(0)
+			}
+		}
+	}
+}

From 55b047acdf70d0408663e740855d310879535bb6 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Thu, 27 Oct 2022 13:52:32 +1000
Subject: [PATCH 070/198] Added go version of Even Wins

---
 .../35_Even_Wins/go/evenwins.go               | 197 ++++++++++++++++++
 1 file changed, 197 insertions(+)
 create mode 100644 00_Alternate_Languages/35_Even_Wins/go/evenwins.go

diff --git a/00_Alternate_Languages/35_Even_Wins/go/evenwins.go b/00_Alternate_Languages/35_Even_Wins/go/evenwins.go
new file mode 100644
index 00000000..7c65aacc
--- /dev/null
+++ b/00_Alternate_Languages/35_Even_Wins/go/evenwins.go
@@ -0,0 +1,197 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+)
+
+const MAXTAKE = 4
+
+type PlayerType int8
+
+const (
+	HUMAN PlayerType = iota
+	COMPUTER
+)
+
+type Game struct {
+	table    int
+	human    int
+	computer int
+}
+
+func NewGame() Game {
+	g := Game{}
+	g.table = 27
+
+	return g
+}
+
+func printIntro() {
+	fmt.Println("Welcome to Even Wins!")
+	fmt.Println("Based on evenwins.bas from Creative Computing")
+	fmt.Println()
+	fmt.Println("Even Wins is a two-person game. You start with")
+	fmt.Println("27 marbles in the middle of the table.")
+	fmt.Println()
+	fmt.Println("Players alternate taking marbles from the middle.")
+	fmt.Println("A player can take 1 to 4 marbles on their turn, and")
+	fmt.Println("turns cannot be skipped. The game ends when there are")
+	fmt.Println("no marbles left, and the winner is the one with an even")
+	fmt.Println("number of marbles.")
+	fmt.Println()
+}
+
+func (g *Game) printBoard() {
+	fmt.Println()
+	fmt.Printf(" marbles in the middle: %d\n", g.table)
+	fmt.Printf("    # marbles you have: %d\n", g.human)
+	fmt.Printf("# marbles computer has: %d\n", g.computer)
+	fmt.Println()
+}
+
+func (g *Game) gameOver() {
+	fmt.Println()
+	fmt.Println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+	fmt.Println("!! All the marbles are taken: Game Over!")
+	fmt.Println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+	fmt.Println()
+	g.printBoard()
+	if g.human%2 == 0 {
+		fmt.Println("You are the winner! Congratulations!")
+	} else {
+		fmt.Println("The computer wins: all hail mighty silicon!")
+	}
+	fmt.Println()
+}
+
+func getPlural(count int) string {
+	m := "marble"
+	if count > 1 {
+		m += "s"
+	}
+	return m
+}
+
+func (g *Game) humanTurn() {
+	scanner := bufio.NewScanner(os.Stdin)
+	maxAvailable := MAXTAKE
+	if g.table < MAXTAKE {
+		maxAvailable = g.table
+	}
+
+	fmt.Println("It's your turn!")
+	for {
+		fmt.Printf("Marbles to take? (1 - %d) --> ", maxAvailable)
+		scanner.Scan()
+		n, err := strconv.Atoi(scanner.Text())
+		if err != nil {
+			fmt.Printf("\n  Please enter a whole number from 1 to %d\n", maxAvailable)
+			continue
+		}
+		if n < 1 {
+			fmt.Println("\n  You must take at least 1 marble!")
+			continue
+		}
+		if n > maxAvailable {
+			fmt.Printf("\n  You can take at most %d %s\n", maxAvailable, getPlural(maxAvailable))
+			continue
+		}
+		fmt.Printf("\nOkay, taking %d %s ...\n", n, getPlural(n))
+		g.table -= n
+		g.human += n
+		return
+	}
+}
+
+func (g *Game) computerTurn() {
+	marblesToTake := 0
+
+	fmt.Println("It's the computer's turn ...")
+	r := float64(g.table - 6*int((g.table)/6))
+
+	if int(g.human/2) == g.human/2 {
+		if r < 1.5 || r > 5.3 {
+			marblesToTake = 1
+		} else {
+			marblesToTake = int(r - 1)
+		}
+	} else if float64(g.table) < 4.2 {
+		marblesToTake = 4
+	} else if r > 3.4 {
+		if r < 4.7 || r > 3.5 {
+			marblesToTake = 4
+		}
+	} else {
+		marblesToTake = int(r + 1)
+	}
+
+	fmt.Printf("Computer takes %d %s ...\n", marblesToTake, getPlural(marblesToTake))
+	g.table -= marblesToTake
+	g.computer += marblesToTake
+}
+
+func (g *Game) play(playersTurn PlayerType) {
+	g.printBoard()
+
+	for {
+		if g.table == 0 {
+			g.gameOver()
+			return
+		} else if playersTurn == HUMAN {
+			g.humanTurn()
+			g.printBoard()
+			playersTurn = COMPUTER
+		} else {
+			g.computerTurn()
+			g.printBoard()
+			playersTurn = HUMAN
+		}
+	}
+}
+
+func getFirstPlayer() PlayerType {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("Do you want to play first? (y/n) --> ")
+		scanner.Scan()
+
+		if strings.ToUpper(scanner.Text()) == "Y" {
+			return HUMAN
+		} else if strings.ToUpper(scanner.Text()) == "N" {
+			return COMPUTER
+		} else {
+			fmt.Println()
+			fmt.Println("Please enter 'y' if you want to play first,")
+			fmt.Println("or 'n' if you want to play second.")
+			fmt.Println()
+		}
+	}
+}
+
+func main() {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	printIntro()
+
+	for {
+		g := NewGame()
+
+		g.play(getFirstPlayer())
+
+		fmt.Println("\nWould you like to play again? (y/n) --> ")
+		scanner.Scan()
+		if strings.ToUpper(scanner.Text()) == "Y" {
+			fmt.Println("\nOk, let's play again ...")
+		} else {
+			fmt.Println("\nOk, thanks for playing ... goodbye!")
+			return
+		}
+
+	}
+
+}

From cbdeb50f22220dd0707f7a155670d3e018b5951c Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Fri, 28 Oct 2022 11:42:41 +1000
Subject: [PATCH 071/198] Added go version of Fur Trader

---
 .../38_Fur_Trader/go/main.go                  | 326 ++++++++++++++++++
 1 file changed, 326 insertions(+)
 create mode 100644 00_Alternate_Languages/38_Fur_Trader/go/main.go

diff --git a/00_Alternate_Languages/38_Fur_Trader/go/main.go b/00_Alternate_Languages/38_Fur_Trader/go/main.go
new file mode 100644
index 00000000..642d48f0
--- /dev/null
+++ b/00_Alternate_Languages/38_Fur_Trader/go/main.go
@@ -0,0 +1,326 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"log"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+const (
+	MAXFURS    = 190
+	STARTFUNDS = 600
+)
+
+type Fur int8
+
+const (
+	FUR_MINK Fur = iota
+	FUR_BEAVER
+	FUR_ERMINE
+	FUR_FOX
+)
+
+type Fort int8
+
+const (
+	FORT_MONTREAL Fort = iota
+	FORT_QUEBEC
+	FORT_NEWYORK
+)
+
+type GameState int8
+
+const (
+	STARTING GameState = iota
+	TRADING
+	CHOOSINGFORT
+	TRAVELLING
+)
+
+func FURS() []string {
+	return []string{"MINK", "BEAVER", "ERMINE", "FOX"}
+}
+
+func FORTS() []string {
+	return []string{"HOCHELAGA (MONTREAL)", "STADACONA (QUEBEC)", "NEW YORK"}
+}
+
+type Player struct {
+	funds float32
+	furs  []int
+}
+
+func NewPlayer() Player {
+	p := Player{}
+	p.funds = STARTFUNDS
+	p.furs = make([]int, 4)
+	return p
+}
+
+func (p *Player) totalFurs() int {
+	f := 0
+	for _, v := range p.furs {
+		f += v
+	}
+	return f
+}
+
+func (p *Player) lostFurs() {
+	for f := 0; f < len(p.furs); f++ {
+		p.furs[f] = 0
+	}
+}
+
+func printTitle() {
+	fmt.Println("                               FUR TRADER")
+	fmt.Println("               CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+	fmt.Println()
+	fmt.Println()
+	fmt.Println()
+}
+
+func printIntro() {
+	fmt.Println("YOU ARE THE LEADER OF A FRENCH FUR TRADING EXPEDITION IN ")
+	fmt.Println("1776 LEAVING THE LAKE ONTARIO AREA TO SELL FURS AND GET")
+	fmt.Println("SUPPLIES FOR THE NEXT YEAR.  YOU HAVE A CHOICE OF THREE")
+	fmt.Println("FORTS AT WHICH YOU MAY TRADE.  THE COST OF SUPPLIES")
+	fmt.Println("AND THE AMOUNT YOU RECEIVE FOR YOUR FURS WILL DEPEND")
+	fmt.Println("ON THE FORT THAT YOU CHOOSE.")
+	fmt.Println()
+}
+
+func getFortChoice() Fort {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println()
+		fmt.Println("YOU MAY TRADE YOUR FURS AT FORT 1, FORT 2,")
+		fmt.Println("OR FORT 3.  FORT 1 IS FORT HOCHELAGA (MONTREAL)")
+		fmt.Println("AND IS UNDER THE PROTECTION OF THE FRENCH ARMY.")
+		fmt.Println("FORT 2 IS FORT STADACONA (QUEBEC) AND IS UNDER THE")
+		fmt.Println("PROTECTION OF THE FRENCH ARMY.  HOWEVER, YOU MUST")
+		fmt.Println("MAKE A PORTAGE AND CROSS THE LACHINE RAPIDS.")
+		fmt.Println("FORT 3 IS FORT NEW YORK AND IS UNDER DUTCH CONTROL.")
+		fmt.Println("YOU MUST CROSS THROUGH IROQUOIS LAND.")
+		fmt.Println("ANSWER 1, 2, OR 3.")
+		fmt.Print(">> ")
+		scanner.Scan()
+
+		f, err := strconv.Atoi(scanner.Text())
+		if err != nil || f < 1 || f > 3 {
+			fmt.Println("Invalid input, Try again ... ")
+			continue
+		}
+		return Fort(f)
+	}
+}
+
+func printFortComment(f Fort) {
+	fmt.Println()
+	switch f {
+	case FORT_MONTREAL:
+		fmt.Println("YOU HAVE CHOSEN THE EASIEST ROUTE.  HOWEVER, THE FORT")
+		fmt.Println("IS FAR FROM ANY SEAPORT.  THE VALUE")
+		fmt.Println("YOU RECEIVE FOR YOUR FURS WILL BE LOW AND THE COST")
+		fmt.Println("OF SUPPLIES HIGHER THAN AT FORTS STADACONA OR NEW YORK.")
+	case FORT_QUEBEC:
+		fmt.Println("YOU HAVE CHOSEN A HARD ROUTE.  IT IS, IN COMPARSION,")
+		fmt.Println("HARDER THAN THE ROUTE TO HOCHELAGA BUT EASIER THAN")
+		fmt.Println("THE ROUTE TO NEW YORK.  YOU WILL RECEIVE AN AVERAGE VALUE")
+		fmt.Println("FOR YOUR FURS AND THE COST OF YOUR SUPPLIES WILL BE AVERAGE.")
+	case FORT_NEWYORK:
+		fmt.Println("YOU HAVE CHOSEN THE MOST DIFFICULT ROUTE.  AT")
+		fmt.Println("FORT NEW YORK YOU WILL RECEIVE THE HIGHEST VALUE")
+		fmt.Println("FOR YOUR FURS.  THE COST OF YOUR SUPPLIES")
+		fmt.Println("WILL BE LOWER THAN AT ALL THE OTHER FORTS.")
+	}
+	fmt.Println()
+}
+
+func getYesOrNo() string {
+	scanner := bufio.NewScanner(os.Stdin)
+	for {
+		fmt.Println("ANSWER YES OR NO")
+		scanner.Scan()
+		if strings.ToUpper(scanner.Text())[0:1] == "Y" {
+			return "Y"
+		} else if strings.ToUpper(scanner.Text())[0:1] == "N" {
+			return "N"
+		}
+	}
+}
+
+func getFursPurchase() []int {
+	scanner := bufio.NewScanner(os.Stdin)
+	fmt.Printf("YOUR %d FURS ARE DISTRIBUTED AMONG THE FOLLOWING\n", MAXFURS)
+	fmt.Println("KINDS OF PELTS: MINK, BEAVER, ERMINE AND FOX.")
+	fmt.Println()
+
+	purchases := make([]int, 4)
+
+	for i, f := range FURS() {
+	retry:
+		fmt.Printf("HOW MANY %s DO YOU HAVE: ", f)
+		scanner.Scan()
+		count, err := strconv.Atoi(scanner.Text())
+		if err != nil {
+			fmt.Println("INVALID INPUT, TRY AGAIN ...")
+			goto retry
+		}
+		purchases[i] = count
+	}
+
+	return purchases
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+
+	printTitle()
+
+	gameState := STARTING
+	whichFort := FORT_NEWYORK
+	var (
+		minkPrice   int
+		erminePrice int
+		beaverPrice int
+		foxPrice    int
+	)
+	player := NewPlayer()
+
+	for {
+		switch gameState {
+		case STARTING:
+			printIntro()
+			fmt.Println("DO YOU WISH TO TRADE FURS?")
+			if getYesOrNo() == "N" {
+				os.Exit(0)
+			}
+			gameState = TRADING
+		case TRADING:
+			fmt.Println()
+			fmt.Printf("YOU HAVE $ %1.2f IN SAVINGS\n", player.funds)
+			fmt.Printf("AND %d FURS TO BEGIN THE EXPEDITION\n", MAXFURS)
+			player.furs = getFursPurchase()
+
+			if player.totalFurs() > MAXFURS {
+				fmt.Println()
+				fmt.Println("YOU MAY NOT HAVE THAT MANY FURS.")
+				fmt.Println("DO NOT TRY TO CHEAT.  I CAN ADD.")
+				fmt.Println("YOU MUST START AGAIN.")
+				gameState = STARTING
+			} else {
+				gameState = CHOOSINGFORT
+			}
+		case CHOOSINGFORT:
+			whichFort = getFortChoice()
+			printFortComment(whichFort)
+			fmt.Println("DO YOU WANT TO TRADE AT ANOTHER FORT?")
+			changeFort := getYesOrNo()
+			if changeFort == "N" {
+				gameState = TRAVELLING
+			}
+		case TRAVELLING:
+			switch whichFort {
+			case FORT_MONTREAL:
+				minkPrice = (int((0.2*rand.Float64()+0.70)*100+0.5) / 100)
+				erminePrice = (int((0.2*rand.Float64()+0.65)*100+0.5) / 100)
+				beaverPrice = (int((0.2*rand.Float64()+0.75)*100+0.5) / 100)
+				foxPrice = (int((0.2*rand.Float64()+0.80)*100+0.5) / 100)
+
+				fmt.Println("SUPPLIES AT FORT HOCHELAGA COST $150.00.")
+				fmt.Println("YOUR TRAVEL EXPENSES TO HOCHELAGA WERE $10.00.")
+				player.funds -= 160
+			case FORT_QUEBEC:
+				minkPrice = (int((0.30*rand.Float64()+0.85)*100+0.5) / 100)
+				erminePrice = (int((0.15*rand.Float64()+0.80)*100+0.5) / 100)
+				beaverPrice = (int((0.20*rand.Float64()+0.90)*100+0.5) / 100)
+				foxPrice = (int((0.25*rand.Float64()+1.10)*100+0.5) / 100)
+
+				event := int(10*rand.Float64()) + 1
+				if event <= 2 {
+					fmt.Println("YOUR BEAVER WERE TOO HEAVY TO CARRY ACROSS")
+					fmt.Println("THE PORTAGE. YOU HAD TO LEAVE THE PELTS, BUT FOUND")
+					fmt.Println("THEM STOLEN WHEN YOU RETURNED.")
+					player.furs[FUR_BEAVER] = 0
+				} else if event <= 6 {
+					fmt.Println("YOU ARRIVED SAFELY AT FORT STADACONA.")
+				} else if event <= 8 {
+					fmt.Println("YOUR CANOE UPSET IN THE LACHINE RAPIDS.  YOU")
+					fmt.Println("LOST ALL YOUR FURS.")
+					player.lostFurs()
+				} else if event <= 10 {
+					fmt.Println("YOUR FOX PELTS WERE NOT CURED PROPERLY.")
+					fmt.Println("NO ONE WILL BUY THEM.")
+					player.furs[FUR_FOX] = 0
+				} else {
+					log.Fatal("Unexpected error")
+				}
+
+				fmt.Println()
+				fmt.Println("SUPPLIES AT FORT STADACONA COST $125.00.")
+				fmt.Println("YOUR TRAVEL EXPENSES TO STADACONA WERE $15.00.")
+				player.funds -= 140
+			case FORT_NEWYORK:
+				minkPrice = (int((0.15*rand.Float64()+1.05)*100+0.5) / 100)
+				erminePrice = (int((0.15*rand.Float64()+0.95)*100+0.5) / 100)
+				beaverPrice = (int((0.25*rand.Float64()+1.00)*100+0.5) / 100)
+				foxPrice = (int((0.25*rand.Float64()+1.05)*100+0.5) / 100) // not in original code
+
+				event := int(10*rand.Float64()) + 1
+				if event <= 2 {
+					fmt.Println("YOU WERE ATTACKED BY A PARTY OF IROQUOIS.")
+					fmt.Println("ALL PEOPLE IN YOUR TRADING GROUP WERE")
+					fmt.Println("KILLED.  THIS ENDS THE GAME.")
+					os.Exit(0)
+				} else if event <= 6 {
+					fmt.Println("YOU WERE LUCKY.  YOU ARRIVED SAFELY")
+					fmt.Println("AT FORT NEW YORK.")
+				} else if event <= 8 {
+					fmt.Println("YOU NARROWLY ESCAPED AN IROQUOIS RAIDING PARTY.")
+					fmt.Println("HOWEVER, YOU HAD TO LEAVE ALL YOUR FURS BEHIND.")
+					player.lostFurs()
+				} else if event <= 10 {
+					minkPrice /= 2
+					foxPrice /= 2
+					fmt.Println("YOUR MINK AND BEAVER WERE DAMAGED ON YOUR TRIP.")
+					fmt.Println("YOU RECEIVE ONLY HALF THE CURRENT PRICE FOR THESE FURS.")
+				} else {
+					log.Fatal("Unexpected error")
+				}
+
+				fmt.Println()
+				fmt.Println("SUPPLIES AT NEW YORK COST $85.00.")
+				fmt.Println("YOUR TRAVEL EXPENSES TO NEW YORK WERE $25.00.")
+				player.funds -= 110
+			}
+
+			beaverValue := beaverPrice * player.furs[FUR_BEAVER]
+			foxValue := foxPrice * player.furs[FUR_FOX]
+			ermineValue := erminePrice * player.furs[FUR_ERMINE]
+			minkValue := minkPrice * player.furs[FUR_MINK]
+
+			fmt.Println()
+			fmt.Printf("YOUR BEAVER SOLD FOR $%6.2f\n", float64(beaverValue))
+			fmt.Printf("YOUR FOX SOLD FOR    $%6.2f\n", float64(foxValue))
+			fmt.Printf("YOUR ERMINE SOLD FOR $%6.2f\n", float64(ermineValue))
+			fmt.Printf("YOUR MINK SOLD FOR   $%6.2f\n", float64(minkValue))
+
+			player.funds += float32(beaverValue + foxValue + ermineValue + minkValue)
+
+			fmt.Println()
+			fmt.Printf("YOU NOW HAVE $%1.2f INCLUDING YOUR PREVIOUS SAVINGS\n", player.funds)
+			fmt.Println("\nDO YOU WANT TO TRADE FURS NEXT YEAR?")
+			if getYesOrNo() == "N" {
+				os.Exit(0)
+			} else {
+				gameState = TRADING
+			}
+		}
+	}
+}

From 41c367e7bfc63a7a755355ef0839734844c4772f Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Fri, 28 Oct 2022 12:26:25 +1000
Subject: [PATCH 072/198] Added go version of Guess

---
 00_Alternate_Languages/41_Guess/go/main.go | 95 ++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 00_Alternate_Languages/41_Guess/go/main.go

diff --git a/00_Alternate_Languages/41_Guess/go/main.go b/00_Alternate_Languages/41_Guess/go/main.go
new file mode 100644
index 00000000..eea6ad22
--- /dev/null
+++ b/00_Alternate_Languages/41_Guess/go/main.go
@@ -0,0 +1,95 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math"
+	"math/rand"
+	"os"
+	"strconv"
+	"time"
+)
+
+func printIntro() {
+	fmt.Println("                   Guess")
+	fmt.Println("Creative Computing  Morristown, New Jersey")
+	fmt.Println()
+	fmt.Println()
+	fmt.Println()
+	fmt.Println("This is a number guessing game. I'll think")
+	fmt.Println("of a number between 1 and any limit you want.")
+	fmt.Println("Then you have to guess what it is")
+}
+
+func getLimit() (int, int) {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println("What limit do you want?")
+		scanner.Scan()
+
+		limit, err := strconv.Atoi(scanner.Text())
+		if err != nil || limit < 0 {
+			fmt.Println("Please enter a number greater or equal to 1")
+			continue
+		}
+
+		limitGoal := int((math.Log(float64(limit)) / math.Log(2)) + 1)
+		return limit, limitGoal
+	}
+
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+	printIntro()
+
+	scanner := bufio.NewScanner(os.Stdin)
+
+	limit, limitGoal := getLimit()
+
+	guessCount := 1
+	stillGuessing := true
+	won := false
+	myGuess := int(float64(limit)*rand.Float64() + 1)
+
+	fmt.Printf("I'm thinking of a number between 1 and %d\n", limit)
+	fmt.Println("Now you try to guess what it is.")
+
+	for stillGuessing {
+		scanner.Scan()
+		n, err := strconv.Atoi(scanner.Text())
+		if err != nil {
+			fmt.Println("Please enter a number greater or equal to 1")
+			continue
+		}
+
+		if n < 0 {
+			break
+		}
+
+		fmt.Print("\n\n\n")
+		if n < myGuess {
+			fmt.Println("Too low. Try a bigger answer")
+			guessCount += 1
+		} else if n > myGuess {
+			fmt.Println("Too high. Try a smaller answer")
+			guessCount += 1
+		} else {
+			fmt.Printf("That's it! You got it in %d tries\n", guessCount)
+			won = true
+			stillGuessing = false
+		}
+	}
+
+	if won {
+		if guessCount < limitGoal {
+			fmt.Println("Very good.")
+		} else if guessCount == limitGoal {
+			fmt.Println("Good.")
+		} else {
+			fmt.Printf("You should have been able to get it in only %d guesses.\n", limitGoal)
+		}
+		fmt.Print("\n\n\n")
+	}
+}

From 6085f9f4e2c79dc73dbd0aa8bebe3ef8269d47ac Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Fri, 28 Oct 2022 13:17:55 +1000
Subject: [PATCH 073/198] Added go version of Gunner

---
 00_Alternate_Languages/42_Gunner/go/main.go | 125 ++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 00_Alternate_Languages/42_Gunner/go/main.go

diff --git a/00_Alternate_Languages/42_Gunner/go/main.go b/00_Alternate_Languages/42_Gunner/go/main.go
new file mode 100644
index 00000000..8ea76cec
--- /dev/null
+++ b/00_Alternate_Languages/42_Gunner/go/main.go
@@ -0,0 +1,125 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func printIntro() {
+	fmt.Println("                                 GUNNER")
+	fmt.Println("               CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+	fmt.Print("\n\n\n")
+	fmt.Println("YOU ARE THE OFFICER-IN-CHARGE, GIVING ORDERS TO A GUN")
+	fmt.Println("CREW, TELLING THEM THE DEGREES OF ELEVATION YOU ESTIMATE")
+	fmt.Println("WILL PLACE A PROJECTILE ON TARGET.  A HIT WITHIN 100 YARDS")
+	fmt.Println("OF THE TARGET WILL DESTROY IT.")
+	fmt.Println()
+}
+
+func getFloat() float64 {
+	scanner := bufio.NewScanner(os.Stdin)
+	for {
+		scanner.Scan()
+		fl, err := strconv.ParseFloat(scanner.Text(), 64)
+
+		if err != nil {
+			fmt.Println("Invalid input")
+			continue
+		}
+
+		return fl
+	}
+}
+
+func play() {
+	gunRange := int(40000*rand.Float64() + 20000)
+	fmt.Printf("\nMAXIMUM RANGE OF YOUR GUN IS %d YARDS\n", gunRange)
+
+	killedEnemies := 0
+	S1 := 0
+
+	for {
+		targetDistance := int(float64(gunRange) * (0.1 + 0.8*rand.Float64()))
+		shots := 0
+
+		fmt.Printf("\nDISTANCE TO THE TARGET IS %d YARDS\n", targetDistance)
+
+		for {
+			fmt.Print("\n\nELEVATION? ")
+			elevation := getFloat()
+
+			if elevation > 89 {
+				fmt.Println("MAXIMUM ELEVATION IS 89 DEGREES")
+				continue
+			}
+
+			if elevation < 1 {
+				fmt.Println("MINIMUM ELEVATION IS 1 DEGREE")
+				continue
+			}
+
+			shots += 1
+
+			if shots < 6 {
+				B2 := 2 * elevation / 57.3
+				shotImpact := int(float64(gunRange) * math.Sin(B2))
+				shotProximity := int(targetDistance - shotImpact)
+
+				if math.Abs(float64(shotProximity)) < 100 { // hit
+					fmt.Printf("*** TARGET DESTROYED *** %d ROUNDS OF AMMUNITION EXPENDED.\n", shots)
+					S1 += shots
+
+					if killedEnemies == 4 {
+						fmt.Printf("\n\nTOTAL ROUNDS EXPENDED WERE: %d\n", S1)
+						if S1 > 18 {
+							print("BETTER GO BACK TO FORT SILL FOR REFRESHER TRAINING!")
+							return
+						} else {
+							print("NICE SHOOTING !!")
+							return
+						}
+					} else {
+						killedEnemies += 1
+						fmt.Println("\nTHE FORWARD OBSERVER HAS SIGHTED MORE ENEMY ACTIVITY...")
+						break
+					}
+				} else { // missed
+					if shotProximity > 100 {
+						fmt.Printf("SHORT OF TARGET BY %d YARDS.\n", int(math.Abs(float64(shotProximity))))
+					} else {
+						fmt.Printf("OVER TARGET BY %d YARDS.\n", int(math.Abs(float64(shotProximity))))
+					}
+				}
+			} else {
+				fmt.Print("\nBOOM !!!!   YOU HAVE JUST BEEN DESTROYED BY THE ENEMY.\n\n\n")
+				fmt.Println("BETTER GO BACK TO FORT SILL FOR REFRESHER TRAINING!")
+				return
+			}
+		}
+	}
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+	scanner := bufio.NewScanner(os.Stdin)
+
+	printIntro()
+
+	for {
+		play()
+
+		fmt.Print("TRY AGAIN (Y OR N)? ")
+		scanner.Scan()
+
+		if strings.ToUpper(scanner.Text())[0:1] != "Y" {
+			fmt.Println("\nOK. RETURN TO BASE CAMP.")
+			break
+		}
+	}
+}

From c7fbc2c2569e3ddf7dcb17d7edba2837b38ffc9e Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Sat, 29 Oct 2022 00:49:21 +1100
Subject: [PATCH 074/198] Update HOW_TO_RUN_THE_GAMES.md

Remove the dead links, and add a command-line option for compiling and running kotlin
---
 HOW_TO_RUN_THE_GAMES.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/HOW_TO_RUN_THE_GAMES.md b/HOW_TO_RUN_THE_GAMES.md
index 688ee136..36061f16 100644
--- a/HOW_TO_RUN_THE_GAMES.md
+++ b/HOW_TO_RUN_THE_GAMES.md
@@ -23,9 +23,6 @@ Alternatively, for non-dotnet compatible translations, you will need [Visual Stu
 
 ## java
 
-**TIP:** You can build all the java and kotlin games at once
-using the instructions in the [buildJvm directory](buildJvm/README.md)
-
 The Java translations can be run via the command line or from an IDE such as [Eclipse](https://www.eclipse.org/downloads/packages/release/kepler/sr1/eclipse-ide-java-developers) or [IntelliJ](https://www.jetbrains.com/idea/)
 
 To run from the command line, you will need a Java SDK (eg. [Oracle JDK](https://www.oracle.com/java/technologies/downloads/) or [Open JDK](https://openjdk.java.net/)).
@@ -58,8 +55,14 @@ _Hint: Normally javascript files have a `*.js` extension. We are using `*.mjs` t
 
 ## kotlin
 
-Use the directions in [buildJvm](buildJvm/README.md) to build for kotlin. You can also use those directions to
-build java games.
+Kotlin programs are compiled with the Kotlin compiler, and run with the java runtime, just like java programs.
+In addition to the java runtime you will need the `kotlinc` compiler, which can be installed using [these instructions](https://kotlinlang.org/docs/command-line.html).
+
+1. Navigate to the corresponding directory.
+1. Compile the program with `kotlinc`:
+   * eg. `kotlinc AceyDuceyGame.kt -include-runtime -d AceyDuceyGame.jar`
+1. Run the compiled program with `java`:
+   * eg. `java -jar AceyDuceyGame.jar`
 
 ## pascal
 

From 2d1911ff3d6015bfd9c633400e98d8454a998f34 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Sat, 29 Oct 2022 01:27:47 +1100
Subject: [PATCH 075/198] Added explicit request for a gradle build submodule

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..da9078ed
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "basic-computer-games-gradle"]
+	path = basic-computer-games-gradle
+	url = https://github.com/pcholt/basic-computer-games-gradle.git

From 9198cb360df459bfd28ff379c3507fff5fd0d5e1 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Mon, 31 Oct 2022 07:20:34 +1000
Subject: [PATCH 076/198] Added go version of Buzzword

---
 00_Alternate_Languages/20_Buzzword/go/main.go | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 00_Alternate_Languages/20_Buzzword/go/main.go

diff --git a/00_Alternate_Languages/20_Buzzword/go/main.go b/00_Alternate_Languages/20_Buzzword/go/main.go
new file mode 100644
index 00000000..fdab9afa
--- /dev/null
+++ b/00_Alternate_Languages/20_Buzzword/go/main.go
@@ -0,0 +1,91 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"strings"
+	"time"
+)
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+	words := [][]string{
+		{
+			"Ability",
+			"Basal",
+			"Behavioral",
+			"Child-centered",
+			"Differentiated",
+			"Discovery",
+			"Flexible",
+			"Heterogeneous",
+			"Homogenous",
+			"Manipulative",
+			"Modular",
+			"Tavistock",
+			"Individualized",
+		}, {
+			"learning",
+			"evaluative",
+			"objective",
+			"cognitive",
+			"enrichment",
+			"scheduling",
+			"humanistic",
+			"integrated",
+			"non-graded",
+			"training",
+			"vertical age",
+			"motivational",
+			"creative",
+		}, {
+			"grouping",
+			"modification",
+			"accountability",
+			"process",
+			"core curriculum",
+			"algorithm",
+			"performance",
+			"reinforcement",
+			"open classroom",
+			"resource",
+			"structure",
+			"facility",
+			"environment",
+		},
+	}
+
+	scanner := bufio.NewScanner(os.Stdin)
+
+	// Display intro text
+	fmt.Println("\n           Buzzword Generator")
+	fmt.Println("Creative Computing  Morristown, New Jersey")
+	fmt.Println("\n\n")
+	fmt.Println("This program prints highly acceptable phrases in")
+	fmt.Println("'educator-speak' that you can work into reports")
+	fmt.Println("and speeches.  Whenever a question mark is printed,")
+	fmt.Println("type a 'Y' for another phrase or 'N' to quit.")
+	fmt.Println("\n\nHere's the first phrase:")
+
+	for {
+		phrase := ""
+		for _, section := range words {
+			if len(phrase) > 0 {
+				phrase += " "
+			}
+			phrase += section[rand.Intn(len(section))]
+		}
+		fmt.Println(phrase)
+		fmt.Println()
+
+		// continue?
+		fmt.Println("?")
+		scanner.Scan()
+		if strings.ToUpper(scanner.Text())[0:1] != "Y" {
+			break
+		}
+	}
+	fmt.Println("Come back when you need help with another report!")
+}

From f6d53947f34dd9aae77ff56b49d153b44dae7471 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Mon, 31 Oct 2022 08:08:25 +1000
Subject: [PATCH 077/198] Added go version of Change

---
 00_Alternate_Languages/22_Change/go/main.go | 115 ++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 00_Alternate_Languages/22_Change/go/main.go

diff --git a/00_Alternate_Languages/22_Change/go/main.go b/00_Alternate_Languages/22_Change/go/main.go
new file mode 100644
index 00000000..fabe4d4b
--- /dev/null
+++ b/00_Alternate_Languages/22_Change/go/main.go
@@ -0,0 +1,115 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math"
+	"os"
+	"strconv"
+)
+
+func printWelcome() {
+	fmt.Println("                 CHANGE")
+	fmt.Println("CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+	fmt.Println()
+	fmt.Println()
+	fmt.Println()
+	fmt.Println("I, YOUR FRIENDLY MICROCOMPUTER, WILL DETERMINE")
+	fmt.Println("THE CORRECT CHANGE FOR ITEMS COSTING UP TO $100.")
+	fmt.Println()
+}
+
+func computeChange(cost, payment float64) {
+	change := int(math.Round((payment - cost) * 100))
+
+	if change == 0 {
+		fmt.Println("\nCORRECT AMOUNT, THANK YOU.")
+		return
+	}
+
+	if change < 0 {
+		fmt.Printf("\nSORRY, YOU HAVE SHORT-CHANGED ME $%0.2f\n", float64(change)/-100.0)
+		print()
+		return
+	}
+
+	fmt.Printf("\nYOUR CHANGE, $%0.2f:\n", float64(change)/100.0)
+
+	d := change / 1000
+	if d > 0 {
+		fmt.Printf("  %d TEN DOLLAR BILL(S)\n", d)
+		change -= d * 1000
+	}
+
+	d = change / 500
+	if d > 0 {
+		fmt.Printf("  %d FIVE DOLLAR BILL(S)\n", d)
+		change -= d * 500
+	}
+
+	d = change / 100
+	if d > 0 {
+		fmt.Printf("  %d ONE DOLLAR BILL(S)\n", d)
+		change -= d * 100
+	}
+
+	d = change / 50
+	if d > 0 {
+		fmt.Println("  1 HALF DOLLAR")
+		change -= d * 50
+	}
+
+	d = change / 25
+	if d > 0 {
+		fmt.Printf("  %d QUARTER(S)\n", d)
+		change -= d * 25
+	}
+
+	d = change / 10
+	if d > 0 {
+		fmt.Printf("  %d DIME(S)\n", d)
+		change -= d * 10
+	}
+
+	d = change / 5
+	if d > 0 {
+		fmt.Printf("  %d NICKEL(S)\n", d)
+		change -= d * 5
+	}
+
+	if change > 0 {
+		fmt.Printf("  %d PENNY(S)\n", change)
+	}
+}
+
+func main() {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	printWelcome()
+
+	var cost, payment float64
+	var err error
+	for {
+		fmt.Println("COST OF ITEM?")
+		scanner.Scan()
+		cost, err = strconv.ParseFloat(scanner.Text(), 64)
+		if err != nil || cost < 0.0 {
+			fmt.Println("INVALID INPUT. TRY AGAIN.")
+			continue
+		}
+		break
+	}
+	for {
+		fmt.Println("\nAMOUNT OF PAYMENT?")
+		scanner.Scan()
+		payment, err = strconv.ParseFloat(scanner.Text(), 64)
+		if err != nil {
+			fmt.Println("INVALID INPUT. TRY AGAIN.")
+			continue
+		}
+		break
+	}
+
+	computeChange(cost, payment)
+	fmt.Println()
+}

From 1407289473a1b7b09660bac627d90560867bd610 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Mon, 31 Oct 2022 09:19:47 +1000
Subject: [PATCH 078/198] Added go version of Chief

---
 00_Alternate_Languages/25_Chief/go/main.go | 116 +++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 00_Alternate_Languages/25_Chief/go/main.go

diff --git a/00_Alternate_Languages/25_Chief/go/main.go b/00_Alternate_Languages/25_Chief/go/main.go
new file mode 100644
index 00000000..19d3e97c
--- /dev/null
+++ b/00_Alternate_Languages/25_Chief/go/main.go
@@ -0,0 +1,116 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+)
+
+func printLightning() {
+	fmt.Println("************************************")
+	n := 24
+	for n > 16 {
+		var b strings.Builder
+		b.Grow(n + 3)
+		for i := 0; i < n; i++ {
+			b.WriteString(" ")
+		}
+		b.WriteString("x x")
+		fmt.Println(b.String())
+		n--
+	}
+	fmt.Println("                x xxx")
+	fmt.Println("               x   x")
+	fmt.Println("              xx xx")
+	n--
+	for n > 8 {
+		var b strings.Builder
+		b.Grow(n + 3)
+		for i := 0; i < n; i++ {
+			b.WriteString(" ")
+		}
+		b.WriteString("x x")
+		fmt.Println(b.String())
+		n--
+	}
+	fmt.Println("        xx")
+	fmt.Println("       x")
+	fmt.Println("************************************")
+}
+
+func printSolution(n float64) {
+	fmt.Printf("\n%f plus 3 gives %f. This divided by 5 equals %f\n", n, n+3, (n+3)/5)
+	fmt.Printf("This times 8 gives %f. If we divide 5 and add 5.\n", ((n+3)/5)*8)
+	fmt.Printf("We get %f, which, minus 1 equals %f\n", (((n+3)/5)*8)/5+5, ((((n+3)/5)*8)/5+5)-1)
+}
+
+func play() {
+	fmt.Println("\nTake a Number and ADD 3. Now, Divide this number by 5 and")
+	fmt.Println("multiply by 8. Now, Divide by 5 and add the same. Subtract 1")
+
+	youHave := getFloat("\nWhat do you have?")
+	compGuess := (((youHave-4)*5)/8)*5 - 3
+	if getYesNo(fmt.Sprintf("\nI bet your number was %f was I right(Yes or No)? ", compGuess)) {
+		fmt.Println("\nHuh, I knew I was unbeatable")
+		fmt.Println("And here is how i did it")
+		printSolution(compGuess)
+	} else {
+		originalNumber := getFloat("\nHUH!! what was you original number? ")
+		if originalNumber == compGuess {
+			fmt.Println("\nThat was my guess, AHA i was right")
+			fmt.Println("Shamed to accept defeat i guess, don't worry you can master mathematics too")
+			fmt.Println("Here is how i did it")
+			printSolution(compGuess)
+		} else {
+			fmt.Println("\nSo you think you're so smart, EH?")
+			fmt.Println("Now, Watch")
+			printSolution(originalNumber)
+
+			if getYesNo("\nNow do you believe me? ") {
+				print("\nOk, Lets play again sometime bye!!!!")
+			} else {
+				fmt.Println("\nYOU HAVE MADE ME VERY MAD!!!!!")
+				fmt.Println("BY THE WRATH OF THE MATHEMATICS AND THE RAGE OF THE GODS")
+				fmt.Println("THERE SHALL BE LIGHTNING!!!!!!!")
+				printLightning()
+				fmt.Println("\nI Hope you believe me now, for your own sake")
+			}
+		}
+	}
+}
+
+func getFloat(prompt string) float64 {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	for {
+		fmt.Println(prompt)
+		scanner.Scan()
+		val, err := strconv.ParseFloat(scanner.Text(), 64)
+		if err != nil {
+			fmt.Println("INVALID INPUT, TRY AGAIN")
+			continue
+		}
+		return val
+	}
+}
+
+func getYesNo(prompt string) bool {
+	scanner := bufio.NewScanner(os.Stdin)
+	fmt.Println(prompt)
+	scanner.Scan()
+
+	return (strings.ToUpper(scanner.Text())[0:1] == "Y")
+
+}
+
+func main() {
+	fmt.Println("I am CHIEF NUMBERS FREEK, The GREAT INDIAN MATH GOD.")
+
+	if getYesNo("\nAre you ready to take the test you called me out for(Yes or No)? ") {
+		play()
+	} else {
+		fmt.Println("Ok, Nevermind. Let me go back to my great slumber, Bye")
+	}
+}

From cb3e6ca83d2aea53ded2df71fa4a78f8d4dc6760 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Mon, 31 Oct 2022 14:12:57 +1000
Subject: [PATCH 079/198] Added go version of Hello

---
 00_Alternate_Languages/45_Hello/go/main.go | 240 +++++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100644 00_Alternate_Languages/45_Hello/go/main.go

diff --git a/00_Alternate_Languages/45_Hello/go/main.go b/00_Alternate_Languages/45_Hello/go/main.go
new file mode 100644
index 00000000..b0aeda58
--- /dev/null
+++ b/00_Alternate_Languages/45_Hello/go/main.go
@@ -0,0 +1,240 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+	"time"
+)
+
+type PROBLEM_TYPE int8
+
+const (
+	SEX PROBLEM_TYPE = iota
+	HEALTH
+	MONEY
+	JOB
+	UKNOWN
+)
+
+func getYesOrNo() (bool, bool, string) {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	scanner.Scan()
+
+	if strings.ToUpper(scanner.Text()) == "YES" {
+		return true, true, scanner.Text()
+	} else if strings.ToUpper(scanner.Text()) == "NO" {
+		return true, false, scanner.Text()
+	} else {
+		return false, false, scanner.Text()
+	}
+}
+
+func printTntro() {
+	fmt.Println("                              HELLO")
+	fmt.Println("               CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+	fmt.Print("\n\n\n")
+	fmt.Println("HELLO. MY NAME IS CREATIVE COMPUTER.")
+	fmt.Println("\nWHAT'S YOUR NAME?")
+}
+
+func askEnjoyQuestion(user string) {
+	fmt.Printf("HI THERE %s, ARE YOU ENJOYING YOURSELF HERE?\n", user)
+
+	for {
+		valid, value, msg := getYesOrNo()
+
+		if valid {
+			if value {
+				fmt.Printf("I'M GLAD TO HEAR THAT, %s.\n", user)
+				fmt.Println()
+			} else {
+				fmt.Printf("OH, I'M SORRY TO HEAR THAT, %s. MAYBE WE CAN\n", user)
+				fmt.Println("BRIGHTEN UP YOUR VISIT A BIT.")
+			}
+			break
+		} else {
+			fmt.Printf("%s, I DON'T UNDERSTAND YOUR ANSWER OF '%s'.\n", user, msg)
+			fmt.Println("PLEASE ANSWER 'YES' OR 'NO'.  DO YOU LIKE IT HERE?")
+		}
+	}
+}
+
+func promptForProblems(user string) PROBLEM_TYPE {
+	scanner := bufio.NewScanner(os.Stdin)
+	fmt.Println()
+	fmt.Printf("SAY %s, I CAN SOLVE ALL KINDS OF PROBLEMS EXCEPT\n", user)
+	fmt.Println("THOSE DEALING WITH GREECE.  WHAT KIND OF PROBLEMS DO")
+	fmt.Println("YOU HAVE? (ANSWER SEX, HEALTH, MONEY, OR JOB)")
+	for {
+		scanner.Scan()
+
+		switch strings.ToUpper(scanner.Text()) {
+		case "SEX":
+			return SEX
+		case "HEALTH":
+			return HEALTH
+		case "MONEY":
+			return MONEY
+		case "JOB":
+			return JOB
+		default:
+			return UKNOWN
+		}
+	}
+}
+
+func promptTooMuchOrTooLittle() (bool, bool) {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	scanner.Scan()
+
+	if strings.ToUpper(scanner.Text()) == "TOO MUCH" {
+		return true, true
+	} else if strings.ToUpper(scanner.Text()) == "TOO LITTLE" {
+		return true, false
+	} else {
+		return false, false
+	}
+}
+
+func solveSexProblem(user string) {
+	fmt.Println("IS YOUR PROBLEM TOO MUCH OR TOO LITTLE?")
+	for {
+		valid, tooMuch := promptTooMuchOrTooLittle()
+		if valid {
+			if tooMuch {
+				fmt.Println("YOU CALL THAT A PROBLEM?!!  I SHOULD HAVE SUCH PROBLEMS!")
+				fmt.Printf("IF IT BOTHERS YOU, %s, TAKE A COLD SHOWER.\n", user)
+			} else {
+				fmt.Printf("WHY ARE YOU HERE IN SUFFERN, %s?  YOU SHOULD BE\n", user)
+				fmt.Println("IN TOKYO OR NEW YORK OR AMSTERDAM OR SOMEPLACE WITH SOME")
+				fmt.Println("REAL ACTION.")
+			}
+			return
+		} else {
+			fmt.Printf("DON'T GET ALL SHOOK, %s, JUST ANSWER THE QUESTION\n", user)
+			fmt.Println("WITH 'TOO MUCH' OR 'TOO LITTLE'.  WHICH IS IT?")
+		}
+	}
+}
+
+func solveHealthProblem(user string) {
+	fmt.Printf("MY ADVICE TO YOU %s IS:\n", user)
+	fmt.Println("     1.  TAKE TWO ASPRIN")
+	fmt.Println("     2.  DRINK PLENTY OF FLUIDS (ORANGE JUICE, NOT BEER!)")
+	fmt.Println("     3.  GO TO BED (ALONE)")
+}
+
+func solveMoneyProblem(user string) {
+	fmt.Printf("SORRY, %s, I'M BROKE TOO.  WHY DON'T YOU SELL\n", user)
+	fmt.Println("ENCYCLOPEADIAS OR MARRY SOMEONE RICH OR STOP EATING")
+	fmt.Println("SO YOU WON'T NEED SO MUCH MONEY?")
+}
+
+func solveJobProblem(user string) {
+	fmt.Printf("I CAN SYMPATHIZE WITH YOU %s.  I HAVE TO WORK\n", user)
+	fmt.Println("VERY LONG HOURS FOR NO PAY -- AND SOME OF MY BOSSES")
+	fmt.Printf("REALLY BEAT ON MY KEYBOARD.  MY ADVICE TO YOU, %s,\n", user)
+	fmt.Println("IS TO OPEN A RETAIL COMPUTER STORE.  IT'S GREAT FUN.")
+}
+
+func askQuestionLoop(user string) {
+	for {
+		problem := promptForProblems(user)
+
+		switch problem {
+		case SEX:
+			solveSexProblem(user)
+		case HEALTH:
+			solveHealthProblem(user)
+		case MONEY:
+			solveMoneyProblem(user)
+		case JOB:
+			solveJobProblem(user)
+		case UKNOWN:
+			fmt.Printf("OH %s, YOUR ANSWER IS GREEK TO ME.\n", user)
+		}
+
+		for {
+			fmt.Println()
+			fmt.Printf("ANY MORE PROBLEMS YOU WANT SOLVED, %s?\n", user)
+
+			valid, value, _ := getYesOrNo()
+			if valid {
+				if value {
+					fmt.Println("WHAT KIND (SEX, MONEY, HEALTH, JOB)")
+					break
+				} else {
+					return
+				}
+			}
+			fmt.Printf("JUST A SIMPLE 'YES' OR 'NO' PLEASE, %s\n", user)
+		}
+	}
+}
+
+func goodbyeUnhappy(user string) {
+	fmt.Println()
+	fmt.Printf("TAKE A WALK, %s.\n", user)
+	fmt.Println()
+	fmt.Println()
+}
+
+func goodbyeHappy(user string) {
+	fmt.Printf("NICE MEETING YOU %s, HAVE A NICE DAY.\n", user)
+}
+
+func askForFee(user string) {
+	fmt.Println()
+	fmt.Printf("THAT WILL BE $5.00 FOR THE ADVICE, %s.\n", user)
+	fmt.Println("PLEASE LEAVE THE MONEY ON THE TERMINAL.")
+	time.Sleep(4 * time.Second)
+	fmt.Print("\n\n\n")
+	fmt.Println("DID YOU LEAVE THE MONEY?")
+
+	for {
+		valid, value, msg := getYesOrNo()
+		if valid {
+			if value {
+				fmt.Printf("HEY, %s, YOU LEFT NO MONEY AT ALL!\n", user)
+				fmt.Println("YOU ARE CHEATING ME OUT OF MY HARD-EARNED LIVING.")
+				fmt.Println()
+				fmt.Printf("WHAT A RIP OFF, %s!!!\n", user)
+				fmt.Println()
+			} else {
+				fmt.Printf("THAT'S HONEST, %s, BUT HOW DO YOU EXPECT\n", user)
+				fmt.Println("ME TO GO ON WITH MY PSYCHOLOGY STUDIES IF MY PATIENTS")
+				fmt.Println("DON'T PAY THEIR BILLS?")
+			}
+			return
+		} else {
+			fmt.Printf("YOUR ANSWER OF '%s' CONFUSES ME, %s.\n", msg, user)
+			fmt.Println("PLEASE RESPOND WITH 'YES' or 'NO'.")
+		}
+	}
+}
+
+func main() {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	printTntro()
+	scanner.Scan()
+	userName := scanner.Text()
+	fmt.Println()
+
+	askEnjoyQuestion(userName)
+
+	askQuestionLoop(userName)
+
+	askForFee(userName)
+
+	if false {
+		goodbyeHappy(userName) // unreachable
+	} else {
+		goodbyeUnhappy(userName)
+	}
+
+}

From 4ef4a7d7e8c1b9de9a5256d6b5f4946026b3be92 Mon Sep 17 00:00:00 2001
From: Troy Campbell <troy.campbell@global.komatsu>
Date: Mon, 31 Oct 2022 14:35:22 +1000
Subject: [PATCH 080/198] Added go version of Hilo

---
 00_Alternate_Languages/47_Hi-Lo/go/main.go | 77 ++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 00_Alternate_Languages/47_Hi-Lo/go/main.go

diff --git a/00_Alternate_Languages/47_Hi-Lo/go/main.go b/00_Alternate_Languages/47_Hi-Lo/go/main.go
new file mode 100644
index 00000000..99bea1c3
--- /dev/null
+++ b/00_Alternate_Languages/47_Hi-Lo/go/main.go
@@ -0,0 +1,77 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+)
+
+const MAX_ATTEMPTS = 6
+
+func printIntro() {
+	fmt.Println("HI LO")
+	fmt.Println("CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+	fmt.Println("\n\n\nTHIS IS THE GAME OF HI LO.")
+	fmt.Println("\nYOU WILL HAVE 6 TRIES TO GUESS THE AMOUNT OF MONEY IN THE")
+	fmt.Println("HI LO JACKPOT, WHICH IS BETWEEN 1 AND 100 DOLLARS.  IF YOU")
+	fmt.Println("GUESS THE AMOUNT, YOU WIN ALL THE MONEY IN THE JACKPOT!")
+	fmt.Println("THEN YOU GET ANOTHER CHANCE TO WIN MORE MONEY.  HOWEVER,")
+	fmt.Println("IF YOU DO NOT GUESS THE AMOUNT, THE GAME ENDS.")
+	fmt.Println()
+	fmt.Println()
+}
+
+func main() {
+	rand.Seed(time.Now().UnixNano())
+	scanner := bufio.NewScanner(os.Stdin)
+
+	printIntro()
+
+	totalWinnings := 0
+
+	for {
+		fmt.Println()
+		secret := rand.Intn(1000) + 1
+
+		guessedCorrectly := false
+
+		for attempt := 0; attempt < MAX_ATTEMPTS; attempt++ {
+			fmt.Println("YOUR GUESS?")
+			scanner.Scan()
+			guess, err := strconv.Atoi(scanner.Text())
+			if err != nil {
+				fmt.Println("INVALID INPUT")
+			}
+
+			if guess == secret {
+				fmt.Printf("GOT IT!!!!!!!!!!   YOU WIN %d DOLLARS.\n", secret)
+				guessedCorrectly = true
+				break
+			} else if guess > secret {
+				fmt.Println("YOUR GUESS IS TOO HIGH.")
+			} else {
+				fmt.Println("YOUR GUESS IS TOO LOW.")
+			}
+		}
+
+		if guessedCorrectly {
+			totalWinnings += secret
+			fmt.Printf("YOUR TOTAL WINNINGS ARE NOW $%d.\n", totalWinnings)
+		} else {
+			fmt.Printf("YOU BLEW IT...TOO BAD...THE NUMBER WAS %d\n", secret)
+		}
+
+		fmt.Println()
+		fmt.Println("PLAYAGAIN (YES OR NO)?")
+		scanner.Scan()
+
+		if strings.ToUpper(scanner.Text())[0:1] != "Y" {
+			break
+		}
+	}
+	fmt.Println("\nSO LONG.  HOPE YOU ENJOYED YOURSELF!!!")
+}

From d4c5fb1df754931e27c3486b4527b1e01f31348c Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Tue, 1 Nov 2022 17:47:28 +1100
Subject: [PATCH 081/198] Add player input routines

---
 53_King/csharp/Country.cs                     | 71 ++++++++++++++++++-
 53_King/csharp/Game.cs                        |  2 +-
 53_King/csharp/IOExtensions.cs                | 28 ++++++--
 53_King/csharp/Program.cs                     |  1 +
 53_King/csharp/Reign.cs                       | 14 +++-
 53_King/csharp/Resources/GiveRallodsError.txt |  1 +
 .../csharp/Resources/GiveRallodsPrompt.txt    |  1 +
 53_King/csharp/Resources/PlantLandError1.txt  |  1 +
 53_King/csharp/Resources/PlantLandError2.txt  |  1 +
 53_King/csharp/Resources/PlantLandError3.txt  |  1 +
 53_King/csharp/Resources/PlantLandPrompt.txt  |  1 +
 53_King/csharp/Resources/PollutionError.txt   |  1 +
 53_King/csharp/Resources/PollutionPrompt.txt  |  1 +
 53_King/csharp/Resources/Resource.cs          | 62 ++++++++++------
 53_King/csharp/Resources/SellLandError.txt    |  2 +
 .../csharp/Resources/SellLandErrorReason.txt  |  4 ++
 53_King/csharp/Resources/SellLandPrompt.txt   |  1 +
 .../csharp/Resources/StatusSansWorkers.txt    |  6 ++
 .../csharp/Resources/StatusWithWorkers.txt    |  6 ++
 53_King/csharp/ValidityTest.cs                | 26 +++++++
 53_King/king.bas                              |  1 +
 21 files changed, 201 insertions(+), 31 deletions(-)
 create mode 100644 53_King/csharp/Resources/GiveRallodsError.txt
 create mode 100644 53_King/csharp/Resources/GiveRallodsPrompt.txt
 create mode 100644 53_King/csharp/Resources/PlantLandError1.txt
 create mode 100644 53_King/csharp/Resources/PlantLandError2.txt
 create mode 100644 53_King/csharp/Resources/PlantLandError3.txt
 create mode 100644 53_King/csharp/Resources/PlantLandPrompt.txt
 create mode 100644 53_King/csharp/Resources/PollutionError.txt
 create mode 100644 53_King/csharp/Resources/PollutionPrompt.txt
 create mode 100644 53_King/csharp/Resources/SellLandError.txt
 create mode 100644 53_King/csharp/Resources/SellLandErrorReason.txt
 create mode 100644 53_King/csharp/Resources/SellLandPrompt.txt
 create mode 100644 53_King/csharp/Resources/StatusSansWorkers.txt
 create mode 100644 53_King/csharp/Resources/StatusWithWorkers.txt
 create mode 100644 53_King/csharp/ValidityTest.cs

diff --git a/53_King/csharp/Country.cs b/53_King/csharp/Country.cs
index 1e94e821..5b47c50a 100644
--- a/53_King/csharp/Country.cs
+++ b/53_King/csharp/Country.cs
@@ -2,6 +2,7 @@ namespace King;
 
 internal class Country
 {
+    private readonly IReadWrite _io;
     private readonly IRandom _random;
     private float _rallods;
     private float _countrymen;
@@ -10,8 +11,9 @@ internal class Country
     private float _plantingCost;
     private float _landValue;
 
-    public Country(IRandom random)
+    public Country(IReadWrite io, IRandom random)
         : this(
+            io,
             random,
             (int)(60000 + random.NextFloat(1000) - random.NextFloat(1000)),
             (int)(500 + random.NextFloat(10) - random.NextFloat(10)),
@@ -20,8 +22,9 @@ internal class Country
     {
     }
 
-    public Country(IRandom random, float rallods, float countrymen, float foreigners, float land)
+    public Country(IReadWrite io, IRandom random, float rallods, float countrymen, float foreigners, float land)
     {
+        _io = io;
         _random = random;
         _rallods = rallods;
         _countrymen = countrymen;
@@ -31,4 +34,68 @@ internal class Country
         _plantingCost = random.Next(10, 15);
         _landValue = random.Next(95, 105);
     }
+
+    public string Status => Resource.Status(_rallods, _countrymen, _foreigners, _land, _landValue, _plantingCost);
+    private float FarmLand => _land - 1000;
+
+    public bool SellLand()
+    {
+        if (_io.TryReadValue(
+                SellLandPrompt, 
+                out var landSold, 
+                new ValidityTest(v => v <= FarmLand, () => SellLandError(FarmLand))))
+        {
+            _land = (int)(_land - landSold);
+            _rallods = (int)(_rallods + landSold * _landValue);
+            return true;
+        }
+
+        return false;
+    }
+
+    public bool DistributeRallods()
+    {
+        if (_io.TryReadValue(
+                GiveRallodsPrompt,
+                out var rallodsGiven, 
+                new ValidityTest(v => v <= _rallods, () => GiveRallodsError(_rallods))))
+        {
+            _rallods = (int)(_rallods - rallodsGiven);
+            return true;
+        }
+
+        return false;
+    }
+
+    public bool PlantLand()
+    {
+        if (_rallods > 0 && 
+            _io.TryReadValue(
+                PlantLandPrompt, 
+                out var landPlanted, 
+                new ValidityTest(v => v <= _countrymen * 2, PlantLandError1),
+                new ValidityTest(v => v <= FarmLand, PlantLandError2(FarmLand)),
+                new ValidityTest(v => v * _plantingCost <= _rallods, PlantLandError3(_rallods))))
+        {
+            _rallods -= (int)(landPlanted * _plantingCost);
+            return true;
+        }
+
+        return false;
+    }
+
+    public bool ControlPollution()
+    {
+        if (_rallods > 0 &&
+            _io.TryReadValue(
+                PollutionPrompt,
+                out var rallodsGiven, 
+                new ValidityTest(v => v <= _rallods, () => PollutionError(_rallods))))
+        {
+            _rallods = (int)(_rallods - rallodsGiven);
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/53_King/csharp/Game.cs b/53_King/csharp/Game.cs
index c8a44a8c..198ff14f 100644
--- a/53_King/csharp/Game.cs
+++ b/53_King/csharp/Game.cs
@@ -19,7 +19,7 @@ internal class Game
 
         if (SetUpReign() is Reign reign)
         {
-            _io.Write(reign);
+            reign.PlayYear();
         }
 
         _io.WriteLine();
diff --git a/53_King/csharp/IOExtensions.cs b/53_King/csharp/IOExtensions.cs
index 183621ca..c2707c0d 100644
--- a/53_King/csharp/IOExtensions.cs
+++ b/53_King/csharp/IOExtensions.cs
@@ -13,7 +13,7 @@ internal static class IOExtensions
             io.TryReadValue(SavedWorkersPrompt, out var workers) &&
             io.TryReadValue(SavedLandPrompt, v => v is > 1000 and <= 2000, SavedLandError, out var land))
         {
-            reign = new Reign(io, new Country(random, rallods, countrymen, workers, land), years + 1);
+            reign = new Reign(io, new Country(io, random, rallods, countrymen, workers, land), years + 1);
             return true;
         }
 
@@ -21,15 +21,33 @@ internal static class IOExtensions
         return false;
     }
 
-    private static bool TryReadValue(this IReadWrite io, string prompt, out float value)
+    internal static bool TryReadValue(this IReadWrite io, string prompt, out float value, params ValidityTest[] tests)
+    {
+        while (true)
+        {
+            var response = value = io.ReadNumber(prompt);
+            if (response < 0) { return false; }
+            if (tests.All(test => test.IsValid(response, io))) { return true; }
+        } 
+    }
+
+    internal static bool TryReadValue(this IReadWrite io, string prompt, out float value)
         => io.TryReadValue(prompt, _ => true, "", out value);
     
-    private static bool TryReadValue(
+    internal static bool TryReadValue(
         this IReadWrite io,
         string prompt,
         Predicate<float> isValid,
         string error,
         out float value)
+        => io.TryReadValue(prompt, isValid, () => error, out value);
+
+    internal static bool TryReadValue(
+        this IReadWrite io,
+        string prompt,
+        Predicate<float> isValid,
+        Func<string> getError,
+        out float value)
     {
         while (true)
         {
@@ -37,7 +55,7 @@ internal static class IOExtensions
             if (value < 0) { return false; }
             if (isValid(value)) { return true; }
             
-            io.Write(error);
+            io.Write(getError());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/53_King/csharp/Program.cs b/53_King/csharp/Program.cs
index 6eb4c50e..5aae4ccb 100644
--- a/53_King/csharp/Program.cs
+++ b/53_King/csharp/Program.cs
@@ -1,6 +1,7 @@
 global using Games.Common.IO;
 global using Games.Common.Randomness;
 global using King.Resources;
+global using static King.Resources.Resource;
 using King;
 
 new Game(new ConsoleIO(), new RandomNumberGenerator()).Play();
diff --git a/53_King/csharp/Reign.cs b/53_King/csharp/Reign.cs
index 4e6c45c5..58e89b66 100644
--- a/53_King/csharp/Reign.cs
+++ b/53_King/csharp/Reign.cs
@@ -9,9 +9,8 @@ internal class Reign
     private readonly float _year;
 
     public Reign(IReadWrite io, IRandom random)
-        : this(io, new Country(random), 0)
+        : this(io, new Country(io, random), 0)
     {
-
     }
 
     public Reign(IReadWrite io, Country country, float year)
@@ -20,4 +19,15 @@ internal class Reign
         _country = country;
         _year = year;
     }
+
+    public void PlayYear()
+    {
+        _io.Write(_country.Status);
+
+        var playerSoldLand = _country.SellLand();
+        var playerDistributedRallods = _country.DistributeRallods();
+        var playerPlantedLand = _country.PlantLand();
+        var playerControlledPollution = _country.ControlPollution();
+        
+    }
 }
diff --git a/53_King/csharp/Resources/GiveRallodsError.txt b/53_King/csharp/Resources/GiveRallodsError.txt
new file mode 100644
index 00000000..df0d7cc0
--- /dev/null
+++ b/53_King/csharp/Resources/GiveRallodsError.txt
@@ -0,0 +1 @@
+   Think again. You've only got {0}  rallods in the treasury.
diff --git a/53_King/csharp/Resources/GiveRallodsPrompt.txt b/53_King/csharp/Resources/GiveRallodsPrompt.txt
new file mode 100644
index 00000000..e8bd345b
--- /dev/null
+++ b/53_King/csharp/Resources/GiveRallodsPrompt.txt
@@ -0,0 +1 @@
+How many rallods will you distribute among your countrymen
\ No newline at end of file
diff --git a/53_King/csharp/Resources/PlantLandError1.txt b/53_King/csharp/Resources/PlantLandError1.txt
new file mode 100644
index 00000000..ef959f9f
--- /dev/null
+++ b/53_King/csharp/Resources/PlantLandError1.txt
@@ -0,0 +1 @@
+   Sorry, but each countryman can only plant 2 sq. miles.
\ No newline at end of file
diff --git a/53_King/csharp/Resources/PlantLandError2.txt b/53_King/csharp/Resources/PlantLandError2.txt
new file mode 100644
index 00000000..e5844aa1
--- /dev/null
+++ b/53_King/csharp/Resources/PlantLandError2.txt
@@ -0,0 +1 @@
+   Sorry, but you've only {0} sq. miles of farm land.
\ No newline at end of file
diff --git a/53_King/csharp/Resources/PlantLandError3.txt b/53_King/csharp/Resources/PlantLandError3.txt
new file mode 100644
index 00000000..38264442
--- /dev/null
+++ b/53_King/csharp/Resources/PlantLandError3.txt
@@ -0,0 +1 @@
+   Think again, You've only {0}  rallods left in the treasury.
diff --git a/53_King/csharp/Resources/PlantLandPrompt.txt b/53_King/csharp/Resources/PlantLandPrompt.txt
new file mode 100644
index 00000000..f2fe448e
--- /dev/null
+++ b/53_King/csharp/Resources/PlantLandPrompt.txt
@@ -0,0 +1 @@
+How many square miles do you wish to plant
\ No newline at end of file
diff --git a/53_King/csharp/Resources/PollutionError.txt b/53_King/csharp/Resources/PollutionError.txt
new file mode 100644
index 00000000..f99644e3
--- /dev/null
+++ b/53_King/csharp/Resources/PollutionError.txt
@@ -0,0 +1 @@
+   Think again. You only have  {0}  rallods remaining.
diff --git a/53_King/csharp/Resources/PollutionPrompt.txt b/53_King/csharp/Resources/PollutionPrompt.txt
new file mode 100644
index 00000000..252fb333
--- /dev/null
+++ b/53_King/csharp/Resources/PollutionPrompt.txt
@@ -0,0 +1 @@
+How many rallods do you wish to spend on pollution control
\ No newline at end of file
diff --git a/53_King/csharp/Resources/Resource.cs b/53_King/csharp/Resources/Resource.cs
index 6626a3dd..37ff09eb 100644
--- a/53_King/csharp/Resources/Resource.cs
+++ b/53_King/csharp/Resources/Resource.cs
@@ -5,11 +5,52 @@ namespace King.Resources;
 
 internal static class Resource
 {
+    private static bool _sellLandErrorShown;
+
     public static Stream Title => GetStream();
     
     public static string InstructionsPrompt => GetString();
     public static string InstructionsText(int years) => string.Format(GetString(), years);
 
+    public static string Status(
+        float rallods,
+        float countrymen,
+        float workers,
+        float land,
+        float landValue,
+        float plantingCost)
+        => string.Format(
+            workers == 0 ? StatusWithWorkers : StatusSansWorkers,
+            rallods,
+            (int)countrymen,
+            (int)workers,
+            (int)land,
+            landValue,
+            plantingCost);
+
+    private static string StatusWithWorkers => GetString();
+    private static string StatusSansWorkers => GetString();
+
+    public static string SellLandPrompt => GetString();
+    public static string SellLandError(float farmLand)
+    {
+        var error = string.Format(GetString(), farmLand, _sellLandErrorShown ? "" : SellLandErrorReason);
+        _sellLandErrorShown = true;
+        return error;
+    }
+    private static string SellLandErrorReason => GetString();
+
+    public static string GiveRallodsPrompt => GetString();
+    public static string GiveRallodsError(float rallods) => string.Format(GetString(), rallods);
+
+    public static string PlantLandPrompt => GetString();
+    public static string PlantLandError1 => GetString();
+    public static string PlantLandError2(float farmLand) => string.Format(GetString(), farmLand);
+    public static string PlantLandError3(float rallods) => string.Format(GetString(), rallods);
+
+    public static string PollutionPrompt => GetString();
+    public static string PollutionError(float rallods) => string.Format(GetString(), rallods);
+
     public static string SavedYearsPrompt => GetString();
     public static string SavedYearsError(int years) => string.Format(GetString(), years);
     public static string SavedTreasuryPrompt => GetString();
@@ -17,27 +58,6 @@ internal static class Resource
     public static string SavedWorkersPrompt => GetString();
     public static string SavedLandPrompt => GetString();
     public static string SavedLandError => GetString();
-    
-    internal static class Formats
-    {
-        public static string Player => GetString();
-        public static string YouLose => GetString();
-    }
-
-    internal static class Prompts
-    {
-        public static string WantInstructions => GetString();
-        public static string HowManyPlayers => GetString();
-        public static string HowManyRows => GetString();
-        public static string HowManyColumns => GetString();
-        public static string TooManyColumns => GetString();
-    }
-
-    internal static class Strings
-    {
-        public static string TooManyColumns => GetString();
-        public static string TooManyRows => GetString();
-    }
 
     private static string GetString([CallerMemberName] string? name = null)
     {
diff --git a/53_King/csharp/Resources/SellLandError.txt b/53_King/csharp/Resources/SellLandError.txt
new file mode 100644
index 00000000..83e0266c
--- /dev/null
+++ b/53_King/csharp/Resources/SellLandError.txt
@@ -0,0 +1,2 @@
+*** Think again. You only have {0} square miles of farm land.
+{1}
\ No newline at end of file
diff --git a/53_King/csharp/Resources/SellLandErrorReason.txt b/53_King/csharp/Resources/SellLandErrorReason.txt
new file mode 100644
index 00000000..836352bb
--- /dev/null
+++ b/53_King/csharp/Resources/SellLandErrorReason.txt
@@ -0,0 +1,4 @@
+
+(Foreign industry will only buy farm land because
+forest land is uneconomical to strip mine due to trees,
+thicker top soil, etc.)
diff --git a/53_King/csharp/Resources/SellLandPrompt.txt b/53_King/csharp/Resources/SellLandPrompt.txt
new file mode 100644
index 00000000..8d01c2c2
--- /dev/null
+++ b/53_King/csharp/Resources/SellLandPrompt.txt
@@ -0,0 +1 @@
+How many square miles do you wish to sell to industry
\ No newline at end of file
diff --git a/53_King/csharp/Resources/StatusSansWorkers.txt b/53_King/csharp/Resources/StatusSansWorkers.txt
new file mode 100644
index 00000000..7efb84e7
--- /dev/null
+++ b/53_King/csharp/Resources/StatusSansWorkers.txt
@@ -0,0 +1,6 @@
+
+You now have  {0}  rallods in the treasury.
+ {1} countrymen, and {3} sq. miles of land.
+This year industry will buy land for {4} rallods per square mile.
+Land currently costs {5} rallods per square mile to plant.
+
diff --git a/53_King/csharp/Resources/StatusWithWorkers.txt b/53_King/csharp/Resources/StatusWithWorkers.txt
new file mode 100644
index 00000000..e7bc5c4a
--- /dev/null
+++ b/53_King/csharp/Resources/StatusWithWorkers.txt
@@ -0,0 +1,6 @@
+
+You now have  {0}  rallods in the treasury.
+ {1} countrymen,  {2} foreign workers and {3} sq. miles of land.
+This year industry will buy land for {4} rallods per square mile.
+Land currently costs {5} rallods per square mile to plant.
+
diff --git a/53_King/csharp/ValidityTest.cs b/53_King/csharp/ValidityTest.cs
new file mode 100644
index 00000000..f1aeb5ec
--- /dev/null
+++ b/53_King/csharp/ValidityTest.cs
@@ -0,0 +1,26 @@
+namespace King;
+
+internal class ValidityTest
+{
+    private readonly Predicate<float> _isValid;
+    private readonly Func<string> _getError;
+
+    public ValidityTest(Predicate<float> isValid, string error)
+        : this(isValid, () => error)
+    {
+    }
+
+    public ValidityTest(Predicate<float> isValid, Func<string> getError)
+    {
+        _isValid = isValid;
+        _getError = getError;
+    }
+
+    public bool IsValid(float value, IReadWrite io)
+    {
+        if (_isValid(value)) { return true; }
+        
+        io.Write(_getError());
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/53_King/king.bas b/53_King/king.bas
index 7352fa58..5e9ae163 100644
--- a/53_King/king.bas
+++ b/53_King/king.bas
@@ -99,6 +99,7 @@
 1000 GOTO 600
 1002 PRINT
 1003 PRINT
+1005 PRINT A
 1010 A=INT(A-K)
 1020 A4=A
 1100 IF INT(I/100-B)>=0 THEN 1120

From ab7f2c11827160348eab05162e5191734a1d10a8 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Wed, 2 Nov 2022 08:00:27 +1100
Subject: [PATCH 082/198] Add game loop and end

---
 53_King/csharp/Game.cs               |  5 +++--
 53_King/csharp/IOExtensions.cs       |  2 +-
 53_King/csharp/Reign.cs              | 18 ++++++++++++++----
 53_King/csharp/Resources/Goodbye.txt |  5 +++++
 53_King/csharp/Resources/Resource.cs |  2 ++
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 53_King/csharp/Resources/Goodbye.txt

diff --git a/53_King/csharp/Game.cs b/53_King/csharp/Game.cs
index 198ff14f..92d8063f 100644
--- a/53_King/csharp/Game.cs
+++ b/53_King/csharp/Game.cs
@@ -17,9 +17,10 @@ internal class Game
     {
         _io.Write(Resource.Title);
 
-        if (SetUpReign() is Reign reign)
+        var reign = SetUpReign();
+        if (reign != null)
         {
-            reign.PlayYear();
+            while (reign.PlayYear());
         }
 
         _io.WriteLine();
diff --git a/53_King/csharp/IOExtensions.cs b/53_King/csharp/IOExtensions.cs
index c2707c0d..e59bf4c0 100644
--- a/53_King/csharp/IOExtensions.cs
+++ b/53_King/csharp/IOExtensions.cs
@@ -26,7 +26,7 @@ internal static class IOExtensions
         while (true)
         {
             var response = value = io.ReadNumber(prompt);
-            if (response < 0) { return false; }
+            if (response == 0) { return false; }
             if (tests.All(test => test.IsValid(response, io))) { return true; }
         } 
     }
diff --git a/53_King/csharp/Reign.cs b/53_King/csharp/Reign.cs
index 58e89b66..2bdc9b89 100644
--- a/53_King/csharp/Reign.cs
+++ b/53_King/csharp/Reign.cs
@@ -6,10 +6,10 @@ internal class Reign
 
     private readonly IReadWrite _io;
     private readonly Country _country;
-    private readonly float _year;
+    private float _year;
 
     public Reign(IReadWrite io, IRandom random)
-        : this(io, new Country(io, random), 0)
+        : this(io, new Country(io, random), 1)
     {
     }
 
@@ -20,7 +20,7 @@ internal class Reign
         _year = year;
     }
 
-    public void PlayYear()
+    public bool PlayYear()
     {
         _io.Write(_country.Status);
 
@@ -28,6 +28,16 @@ internal class Reign
         var playerDistributedRallods = _country.DistributeRallods();
         var playerPlantedLand = _country.PlantLand();
         var playerControlledPollution = _country.ControlPollution();
-        
+
+        if (playerSoldLand || playerDistributedRallods || playerPlantedLand || playerControlledPollution)
+        {
+            _year++;
+            return true;
+        }
+        else
+        {
+            _io.Write(Goodbye);
+            return false;
+        }
     }
 }
diff --git a/53_King/csharp/Resources/Goodbye.txt b/53_King/csharp/Resources/Goodbye.txt
new file mode 100644
index 00000000..325890a5
--- /dev/null
+++ b/53_King/csharp/Resources/Goodbye.txt
@@ -0,0 +1,5 @@
+
+Goodbye.
+(If you wish to continue this game at a later date, answer
+'again' when asked if you want instructions at the start
+of the game).
diff --git a/53_King/csharp/Resources/Resource.cs b/53_King/csharp/Resources/Resource.cs
index 37ff09eb..cf555583 100644
--- a/53_King/csharp/Resources/Resource.cs
+++ b/53_King/csharp/Resources/Resource.cs
@@ -59,6 +59,8 @@ internal static class Resource
     public static string SavedLandPrompt => GetString();
     public static string SavedLandError => GetString();
 
+    public static string Goodbye => GetString();
+
     private static string GetString([CallerMemberName] string? name = null)
     {
         using var stream = GetStream(name);

From 986c8732711a3bb62d0a461faf33e251ec4049ca Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Fri, 4 Nov 2022 23:45:15 +1100
Subject: [PATCH 083/198] bullfight added

---
 17_Bullfight/bullfight.bas                | 140 ++++++++++++---------
 17_Bullfight/kotlin/src/bullfight/Main.kt | 144 ++++++++++++++++++++++
 2 files changed, 229 insertions(+), 55 deletions(-)
 create mode 100644 17_Bullfight/kotlin/src/bullfight/Main.kt

diff --git a/17_Bullfight/bullfight.bas b/17_Bullfight/bullfight.bas
index 32b04b89..a2aa45b7 100644
--- a/17_Bullfight/bullfight.bas
+++ b/17_Bullfight/bullfight.bas
@@ -6,25 +6,25 @@
 205 PRINT "DO YOU WANT INSTRUCTIONS";
 206 INPUT Z$
 207 IF Z$="NO" THEN 400
-210 PRINT "HELLO, ALL YOU BLOODLOVERS AND AFICIONADOS."
-220 PRINT "HERE IS YOUR BIG CHANCE TO KILL A BULL."
-230 PRINT
-240 PRINT "ON EACH PASS OF THE BULL, YOU MAY TRY"
-250 PRINT "0 - VERONICA (DANGEROUS INSIDE MOVE OF THE CAPE)"
-260 PRINT "1 - LESS DANGEROUS OUTSIDE MOVE OF THE CAPE"
-270 PRINT "2 - ORDINARY SWIRL OF THE CAPE."
-280 PRINT
-290 PRINT "INSTEAD OF THE ABOVE, YOU MAY TRY TO KILL THE BULL"
-300 PRINT "ON ANY TURN: 4 (OVER THE HORNS), 5 (IN THE CHEST)."
-310 PRINT "BUT IF I WERE YOU,"
-320 PRINT "I WOULDN'T TRY IT BEFORE THE SEVENTH PASS."
-330 PRINT
-340 PRINT "THE CROWD WILL DETERMINE WHAT AWARD YOU DESERVE"
-350 PRINT "(POSTHUMOUSLY IF NECESSARY)."
-360 PRINT "THE BRAVER YOU ARE, THE BETTER THE AWARD YOU RECEIVE."
-370 PRINT
-380 PRINT "THE BETTER THE JOB THE PICADORES AND TOREADORES DO,"
-390 PRINT "THE BETTER YOUR CHANCES ARE."
+    println("HELLO, ALL YOU BLOODLOVERS AND AFICIONADOS.")
+    println("HERE IS YOUR BIG CHANCE TO KILL A BULL.")
+    println()
+    println("ON EACH PASS OF THE BULL, YOU MAY TRY")
+    println("0 - VERONICA (DANGEROUS INSIDE MOVE OF THE CAPE)")
+    println("1 - LESS DANGEROUS OUTSIDE MOVE OF THE CAPE")
+    println("2 - ORDINARY SWIRL OF THE CAPE.")
+    println()
+    println("INSTEAD OF THE ABOVE, YOU MAY TRY TO KILL THE BULL")
+    println("ON ANY TURN: 4 (OVER THE HORNS), 5 (IN THE CHEST).")
+    println("BUT IF I WERE YOU,")
+    println("I WOULDN'T TRY IT BEFORE THE SEVENTH PASS.")
+    println()
+    println("THE CROWD WILL DETERMINE WHAT AWARD YOU DESERVE")
+    println("(POSTHUMOUSLY IF NECESSARY).")
+    println("THE BRAVER YOU ARE, THE BETTER THE AWARD YOU RECEIVE.")
+    println()
+    println("THE BETTER THE JOB THE PICADORES AND TOREADORES DO,")
+    println("THE BETTER YOUR CHANCES ARE.")
 400 PRINT
 410 PRINT
 420 D(5)=1
@@ -32,55 +32,70 @@
 450 DIM L$(5)
 455 A=INT(RND(1)*5+1)
 460 FOR I=1 TO 5
-463 READ L$(I)
+    463 READ L$(I)
 467 NEXT I
 470 DATA "SUPERB","GOOD","FAIR","POOR","AWFUL"
 490 PRINT "YOU HAVE DRAWN A ";L$(A);" BULL."
 500 IF A>4 THEN 530
-510 IF A<2 THEN 550
-520 GOTO 570
-530 PRINT "YOU'RE LUCKY."
-540 GOTO 570
-550 PRINT "GOOD LUCK.  YOU'LL NEED IT."
-560 PRINT
+
+    510 IF A<2 THEN 550
+    520 GOTO 570
+
+    530 PRINT "YOU'RE LUCKY."
+    540 GOTO 570
+
+    550 PRINT "GOOD LUCK.  YOU'LL NEED IT."
+    560 PRINT
+
 570 PRINT
+
 590 A$="PICADO"
 595 B$="RES"
 600 GOSUB 1610
+
 610 D(1)=C
+
 630 A$="TOREAD"
 635 B$="ORES"
 640 GOSUB 1610
+
 650 D(2)=C
 660 PRINT
 670 PRINT
 680 IF Z=1 THEN 1310
+
 690 D(3)=D(3)+1
 700 PRINT "PASS NUMBER";D(3)
 710 IF D(3)<3 THEN 760
-720 PRINT "HERE COMES THE BULL.  TRY FOR A KILL";
-730 GOSUB 1930
-735 IF Z1=1 THEN 1130
-740 PRINT "CAPE MOVE";
-750 GOTO 800
-760 PRINT "THE BULL IS CHARGING AT YOU!  YOU ARE THE MATADOR--"
-770 PRINT "DO YOU WANT TO KILL THE BULL";
-780 GOSUB 1930
-785 IF Z1=1 THEN 1130
-790 PRINT "WHAT MOVE DO YOU MAKE WITH THE CAPE";
+
+    720 PRINT "HERE COMES THE BULL.  TRY FOR A KILL";
+    730 GOSUB 1930
+    735 IF Z1=1 THEN 1130
+    740 PRINT "CAPE MOVE";
+    750 GOTO 800
+#else
+    760 PRINT "THE BULL IS CHARGING AT YOU!  YOU ARE THE MATADOR--"
+    770 PRINT "DO YOU WANT TO KILL THE BULL";
+    780 GOSUB 1930
+    785 IF Z1=1 THEN 1130
+    790 PRINT "WHAT MOVE DO YOU MAKE WITH THE CAPE";
+
 800 INPUT E
 810 IF E<>INT(ABS(E)) THEN 830
-820 IF E<3 THEN 850
-830 PRINT "DON'T PANIC, YOU IDIOT!  PUT DOWN A CORRECT NUMBER"
-840 GOTO 800
-850 REM
+    820 IF E<3 THEN 850
+        830 PRINT "DON'T PANIC, YOU IDIOT!  PUT DOWN A CORRECT NUMBER"
+        840 GOTO 800
+    850 REM
+
 860 IF E=0 THEN 920
-870 IF E=1 THEN 900
-880 M=.5
-890 GOTO 930
-900 M=2
-910 GOTO 930
-920 M=3
+    870 IF E=1 THEN 900
+        880 M=.5
+        890 GOTO 930
+    900 M=2
+    910 GOTO 930
+#else
+    920 M=3
+
 930 L=L+M
 940 F=(6-A+M/10)*RND(1)/((D(1)+D(2)+D(3)/10)*5)
 950 IF F<.51 THEN 660
@@ -119,6 +134,7 @@
 1280 GOTO 1320
 1290 IF K>.8 THEN 960
 1300 GOTO 1260
+
 1310 PRINT
 1320 PRINT
 1330 PRINT
@@ -149,37 +165,51 @@
 1580 PRINT
 1590 PRINT "ADIOS":PRINT:PRINT:PRINT
 1600 GOTO 2030
+
 1610 B=3/A*RND(1)
 1620 IF B<.37 THEN 1740
 1630 IF B<.5 THEN 1720
 1640 IF B<.63 THEN 1700
 1650 IF B<.87 THEN 1680
+
 1660 C=.1
 1670 GOTO 1750
+
 1680 C=.2
 1690 GOTO 1750
+
 1700 C=.3
 1710 GOTO 1750
+
 1720 C=.4
 1730 GOTO 1750
+
 1740 C=.5
+
 1750 T=INT(10*C+.2)
 1760 PRINT "THE ";A$;B$;" DID A ";L$(T);" JOB."
+
 1770 IF 4>T THEN 1900
-1780 IF 5=T THEN 1870
-1790 ON FNA(K) GOTO 1830,1850
+    1780 IF 5=T THEN 1870
+        1790 ON FNA(K) GOTO 1830,1850
+
+            REM Dead code
 1800 IF A$="TOREAD" THEN 1820
 1810 PRINT "ONE OF THE HORSES OF THE ";A$;B$;" WAS KILLED."
 1820 ON FNA(K) GOTO 1830,1850
-1830 PRINT "ONE OF THE ";A$;B$;" WAS KILLED."
-1840 GOTO 1900
-1850 PRINT "NO ";A$;B$;" WERE KILLED."
-1860 GOTO 1900
-1870 IF A$="TOREAD" THEN 1890
-1880 PRINT FNA(K);"OF THE HORSES OF THE ";A$;B$;" KILLED."
-1890 PRINT FNA(K);"OF THE ";A$;B$;" KILLED."
+
+        1830 PRINT "ONE OF THE ";A$;B$;" WAS KILLED."
+        1840 GOTO 1900
+
+        1850 PRINT "NO ";A$;B$;" WERE KILLED."
+        1860 GOTO 1900
+
+    1870 IF A$="TOREAD" THEN 1890
+        1880 PRINT FNA(K);"OF THE HORSES OF THE ";A$;B$;" KILLED."
+    1890 PRINT FNA(K);"OF THE ";A$;B$;" KILLED."
 1900 PRINT
 1910 RETURN
+
 1920 REM
 1930 INPUT A$
 1940 IF A$="YES" THEN 1990
diff --git a/17_Bullfight/kotlin/src/bullfight/Main.kt b/17_Bullfight/kotlin/src/bullfight/Main.kt
new file mode 100644
index 00000000..d885bce4
--- /dev/null
+++ b/17_Bullfight/kotlin/src/bullfight/Main.kt
@@ -0,0 +1,144 @@
+package bullfight
+
+import bullfight.Yorn.NO
+import kotlin.random.Random
+
+val fna: Int get() = Random.nextInt(1, 2)
+
+val l = listOf("SUPERB", "GOOD", "FAIR", "POOR", "AWFUL")
+var aInt: Int = 0
+
+fun main() {
+    val d = mutableListOf(0f,0f,0f,0f,0f,0f)
+    intro()
+    instructions()
+    d[5] = 1f
+    d[4] = 1f
+
+    aInt = Random.nextInt(1, 6)
+    println("YOU HAVE DRAWN A ${l[aInt - 1]} BULL.")
+    when {
+        aInt < 2 -> {
+            println("GOOD LUCK.  YOU'LL NEED IT.")
+        }
+
+        aInt > 4 -> {
+            println("YOU'RE LUCKY.")
+        }
+
+        else -> Unit
+    }
+
+    d[1] = fight(FirstAct.picadores)
+    d[2] = fight(FirstAct.toreadores)
+    repeat(2) { println() }
+
+    d[3]++
+    println("PASS NUMBER ${d[3]}")
+    if (d[3]>=3) {
+        print("HERE COMES THE BULL.  TRY FOR A KILL")
+        if (Yorn.input() == NO) {
+            print("CAPE MOVE")
+        }
+    }
+    else {
+        println("THE BULL IS CHARGING AT YOU!  YOU ARE THE MATADOR--")
+        print("DO YOU WANT TO KILL THE BULL")
+        if (Yorn.input() == NO) {
+            print("WHAT MOVE DO YOU MAKE WITH THE CAPE")
+        }
+    }
+
+
+}
+
+enum class Yorn(val s: String) {
+    YES("YES"),NO("NO");
+    override fun toString() = s
+
+    companion object {
+        fun input() : Yorn {
+            do {
+                print("? ")
+                val z1 = readln()
+                Yorn.values().firstOrNull { z1 == it.s }?.let { return it } ?: println("YES OR NO")
+            } while (true)
+        }
+    }
+}
+
+enum class FirstAct(val str: String) {
+    picadores("PICADORES"), toreadores("TOREADORES");
+    override fun toString() = str
+}
+
+fun fight(firstAct: FirstAct): Float {
+
+    val b = 3.0 / aInt * Random.nextFloat()
+    val c = when {
+        b < .37 -> .5f
+        b < .5 -> .4f
+        b < .63 -> .3f
+        b < .87 -> .2f
+        else -> .1f
+    }
+    val t = (10 * c + .2).toInt()
+    println("THE $firstAct DID A ${l[t - 1]} JOB.")
+
+    if (t >= 4) {
+        if (t == 5) {
+            if (firstAct != FirstAct.toreadores) {
+                println ("$fna OF THE HORSES OF THE $firstAct KILLED.")
+            }
+            println("$fna OF THE $firstAct KILLED.")
+        }
+        else {
+            println(
+                when (fna) {
+                    1 -> "ONE OF THE $firstAct WAS KILLED."
+                    2 -> "NO $firstAct WERE KILLED."
+                    else -> ""
+                }
+            )
+        }
+    }
+    println()
+
+    return c
+}
+
+private fun instructions() {
+    print("DO YOU WANT INSTRUCTIONS? ")
+    if (readln().trim() != "NO") {
+        println("HELLO, ALL YOU BLOODLOVERS AND AFICIONADOS.")
+        println("HERE IS YOUR BIG CHANCE TO KILL A BULL.")
+        println()
+        println("ON EACH PASS OF THE BULL, YOU MAY TRY")
+        println("0 - VERONICA (DANGEROUS INSIDE MOVE OF THE CAPE)")
+        println("1 - LESS DANGEROUS OUTSIDE MOVE OF THE CAPE")
+        println("2 - ORDINARY SWIRL OF THE CAPE.")
+        println()
+        println("INSTEAD OF THE ABOVE, YOU MAY TRY TO KILL THE BULL")
+        println("ON ANY TURN: 4 (OVER THE HORNS), 5 (IN THE CHEST).")
+        println("BUT IF I WERE YOU,")
+        println("I WOULDN'T TRY IT BEFORE THE SEVENTH PASS.")
+        println()
+        println("THE CROWD WILL DETERMINE WHAT AWARD YOU DESERVE")
+        println("(POSTHUMOUSLY IF NECESSARY).")
+        println("THE BRAVER YOU ARE, THE BETTER THE AWARD YOU RECEIVE.")
+        println()
+        println("THE BETTER THE JOB THE PICADORES AND TOREADORES DO,")
+        println("THE BETTER YOUR CHANCES ARE.")
+    }
+    repeat(2) {
+        println()
+    }
+}
+
+fun intro() {
+    println(" ".repeat(34) + "BULL")
+    println(" ".repeat(15) + "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
+    repeat(3) {
+        println()
+    }
+}

From 3dabd1d68dbde9839711f72d0b2d93630e4ecbe0 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Fri, 4 Nov 2022 23:46:47 +1100
Subject: [PATCH 084/198] bullfight added

---
 basic-computer-games-gradle | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 basic-computer-games-gradle

diff --git a/basic-computer-games-gradle b/basic-computer-games-gradle
new file mode 160000
index 00000000..367112cc
--- /dev/null
+++ b/basic-computer-games-gradle
@@ -0,0 +1 @@
+Subproject commit 367112cc067a3623bcca174e354ed671c73c8acb

From b5c4354e3dd317ced23ca0a0627aeffe850a60f5 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Mon, 7 Nov 2022 00:04:32 +1100
Subject: [PATCH 085/198] bullfight wip

---
 17_Bullfight/kotlin/src/bullfight/Main.kt | 222 ++++++++++++++++++----
 1 file changed, 187 insertions(+), 35 deletions(-)

diff --git a/17_Bullfight/kotlin/src/bullfight/Main.kt b/17_Bullfight/kotlin/src/bullfight/Main.kt
index d885bce4..c3f6b50e 100644
--- a/17_Bullfight/kotlin/src/bullfight/Main.kt
+++ b/17_Bullfight/kotlin/src/bullfight/Main.kt
@@ -1,22 +1,25 @@
 package bullfight
 
-import bullfight.Yorn.NO
+import bullfight.Yorn.*
+import kotlin.math.pow
 import kotlin.random.Random
 
-val fna: Int get() = Random.nextInt(1, 2)
+val fna: Boolean get() = Random.nextBoolean()
 
-val l = listOf("SUPERB", "GOOD", "FAIR", "POOR", "AWFUL")
+val quality = listOf("SUPERB", "GOOD", "FAIR", "POOR", "AWFUL")
 var aInt: Int = 0
+var l = 1f
+var momentOfTruth = false
+val d = mutableListOf(0f, 0f, 0f, 0f, 0f, 0f)
 
 fun main() {
-    val d = mutableListOf(0f,0f,0f,0f,0f,0f)
     intro()
     instructions()
     d[5] = 1f
     d[4] = 1f
 
     aInt = Random.nextInt(1, 6)
-    println("YOU HAVE DRAWN A ${l[aInt - 1]} BULL.")
+    println("YOU HAVE DRAWN A ${quality[aInt - 1]} BULL.")
     when {
         aInt < 2 -> {
             println("GOOD LUCK.  YOU'LL NEED IT.")
@@ -29,46 +32,197 @@ fun main() {
         else -> Unit
     }
 
+    momentOfTruth()
+
     d[1] = fight(FirstAct.picadores)
     d[2] = fight(FirstAct.toreadores)
     repeat(2) { println() }
+    var gored: Boolean
 
-    d[3]++
-    println("PASS NUMBER ${d[3]}")
-    if (d[3]>=3) {
-        print("HERE COMES THE BULL.  TRY FOR A KILL")
-        if (Yorn.input() == NO) {
-            print("CAPE MOVE")
+    gameLoop@ do {
+        d[3]++
+        println("PASS NUMBER ${d[3].toInt()}")
+        if (d[3] >= 3) {
+            print("HERE COMES THE BULL.  TRY FOR A KILL")
+            gored = killAttempt("CAPE MOVE")
+        } else {
+            println("THE BULL IS CHARGING AT YOU!  YOU ARE THE MATADOR--")
+            print("DO YOU WANT TO KILL THE BULL")
+            gored = killAttempt("WHAT MOVE DO YOU MAKE WITH THE CAPE")
         }
-    }
-    else {
-        println("THE BULL IS CHARGING AT YOU!  YOU ARE THE MATADOR--")
-        print("DO YOU WANT TO KILL THE BULL")
-        if (Yorn.input() == NO) {
-            print("WHAT MOVE DO YOU MAKE WITH THE CAPE")
-        }
-    }
 
+        if (!gored) {
+            val move = restrictedInput(
+                values = Cape.values(),
+                errorMessage = "DON'T PANIC, YOU IDIOT!  PUT DOWN A CORRECT NUMBER"
+            )
+            val m = when (move) {
+                Cape.Veronica -> 3f
+                Cape.Outside -> 2f
+                Cape.Swirl -> 0.5f
+            }
+
+            l += m
+            val f = (6 - aInt + m / 10f) * Random.nextFloat() / ((d[1] + d[2] + d[3] / 10f) * 5f)
+            if (f < 0.51)
+                continue
+        }
+
+        println("THE BULL HAS GORED YOU!")
+        goreLoop@ do {
+            when (fna) {
+                false -> {
+                    println("YOU ARE DEAD.")
+                    d[4] = 1.5f
+                }
+
+                true -> {
+                    println("YOU ARE STILL ALIVE.")
+                    println()
+                    print("DO YOU RUN FROM THE RING")
+                    when (Yorn.input()) {
+
+                        YES -> {
+                            println("COWARD")
+                            d[4] = 0f
+                        }
+
+                        NO -> {
+                            println("YOU ARE BRAVE.  STUPID, BUT BRAVE.")
+                            when (fna) {
+                                true -> {
+                                    d[4] = 2f
+                                    continue@gameLoop
+                                }
+
+                                false -> {
+                                    println("YOU ARE GORED AGAIN!")
+                                    continue@goreLoop
+                                }
+                            }
+                        }
+                    }
+
+                }
+            }
+        } while (true)
+
+    } while (true)
 
 }
 
-enum class Yorn(val s: String) {
-    YES("YES"),NO("NO");
-    override fun toString() = s
+fun fnd() = 4.5 +
+        l / 6 -
+        (d[1] + d[2]) * 2.5 +
+        4 * d[4] +
+        2 * d[5] -
+        d[3].toDouble().pow(2.0) / 120f -
+        aInt
+fun fnc() = fnd() * Random.nextFloat()
+
+private fun killAttempt(capeMessage: String): Boolean {
+    when (Yorn.input()) {
+        YES -> {
+            when (momentOfTruth()) {
+                KillResult.Success -> {
+                    println()
+                    println()
+                    if (d[4] == 0f) {
+                        println(
+                            """
+                            THE CROWD BOOS FOR TEN MINUTES.  IF YOU EVER DARE TO SHOW
+                            YOUR FACE IN A RING AGAIN, THEY SWEAR THEY WILL KILL YOU--
+                            UNLESS THE BULL DOES FIRST.
+                            """.trimIndent()
+                        )
+                    }
+                }
+
+                KillResult.Fail -> return true
+            }
+        }
+
+        NO -> {
+            print(capeMessage)
+        }
+    }
+    return false
+}
+
+enum class KillResult { Success, Fail }
+
+fun momentOfTruth(): KillResult {
+    momentOfTruth = true
+    print(
+        """
+        
+        IT IS THE MOMENT OF TRUTH.
+        
+        HOW DO YOU WANT TO KILL THE BULL
+    """.trimIndent()
+    )
+
+    val k = (6 - aInt) * 10 * Random.nextFloat() / ((d[1] + d[2]) * 5 * d[3])
+
+    val chance = when (stdInput(KillMethod.values())) {
+        KillMethod.OverHorns -> .8
+        KillMethod.Chest -> .2
+        null -> {
+            println("YOU PANICKED.  THE BULL GORED YOU.")
+            return KillResult.Fail
+        }
+    }
+    return if (k <= chance) {
+        println("YOU KILLED THE BULL!")
+        d[5] = 2f
+        KillResult.Success
+    } else {
+        println("THE BULL HAS GORED YOU!")
+        KillResult.Fail
+    }
+}
+
+interface InputOption {
+    val input: String
+}
+
+enum class Cape(override val input: String) : InputOption {
+    Veronica("0"),
+    Outside("1"),
+    Swirl("2"),
+}
+
+enum class KillMethod(override val input: String) : InputOption {
+    OverHorns("4"),
+    Chest("5"),
+}
+
+private fun <T : InputOption> stdInput(values: Array<T>): T? {
+    print("? ")
+    val z1 = readln()
+    return values.firstOrNull { z1 == it.input }
+}
+
+private fun <T : InputOption> restrictedInput(values: Array<T>, errorMessage: String): T {
+    do {
+        stdInput(values)?.let { return it }
+        println(errorMessage)
+    } while (true)
+}
+
+enum class Yorn(override val input: String) : InputOption {
+    YES("YES"), NO("NO");
 
     companion object {
-        fun input() : Yorn {
-            do {
-                print("? ")
-                val z1 = readln()
-                Yorn.values().firstOrNull { z1 == it.s }?.let { return it } ?: println("YES OR NO")
-            } while (true)
+        fun input(): Yorn {
+            return restrictedInput(values(), "YES OR NO")
         }
     }
 }
 
 enum class FirstAct(val str: String) {
     picadores("PICADORES"), toreadores("TOREADORES");
+
     override fun toString() = str
 }
 
@@ -83,21 +237,19 @@ fun fight(firstAct: FirstAct): Float {
         else -> .1f
     }
     val t = (10 * c + .2).toInt()
-    println("THE $firstAct DID A ${l[t - 1]} JOB.")
+    println("THE $firstAct DID A ${quality[t - 1]} JOB.")
 
     if (t >= 4) {
         if (t == 5) {
             if (firstAct != FirstAct.toreadores) {
-                println ("$fna OF THE HORSES OF THE $firstAct KILLED.")
+                println("$fna OF THE HORSES OF THE $firstAct KILLED.")
             }
             println("$fna OF THE $firstAct KILLED.")
-        }
-        else {
+        } else {
             println(
                 when (fna) {
-                    1 -> "ONE OF THE $firstAct WAS KILLED."
-                    2 -> "NO $firstAct WERE KILLED."
-                    else -> ""
+                    true -> "ONE OF THE $firstAct WAS KILLED."
+                    false -> "NO $firstAct WERE KILLED."
                 }
             )
         }

From 486ca64b553f81c131ddd250e462dfc549735fc1 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Sun, 13 Nov 2022 00:51:11 +1100
Subject: [PATCH 086/198] bullfight wip

---
 17_Bullfight/kotlin/src/bullfight/Main.kt | 42 ++++++++++++++++++-----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/17_Bullfight/kotlin/src/bullfight/Main.kt b/17_Bullfight/kotlin/src/bullfight/Main.kt
index c3f6b50e..582c8ac6 100644
--- a/17_Bullfight/kotlin/src/bullfight/Main.kt
+++ b/17_Bullfight/kotlin/src/bullfight/Main.kt
@@ -1,9 +1,11 @@
 package bullfight
 
 import bullfight.Yorn.*
-import kotlin.math.pow
 import kotlin.random.Random
+import kotlin.system.exitProcess
 
+private val Float.squared: Float
+    get() = this * this
 val fna: Boolean get() = Random.nextBoolean()
 
 val quality = listOf("SUPERB", "GOOD", "FAIR", "POOR", "AWFUL")
@@ -32,8 +34,6 @@ fun main() {
         else -> Unit
     }
 
-    momentOfTruth()
-
     d[1] = fight(FirstAct.picadores)
     d[2] = fight(FirstAct.toreadores)
     repeat(2) { println() }
@@ -116,13 +116,15 @@ fun fnd() = 4.5 +
         (d[1] + d[2]) * 2.5 +
         4 * d[4] +
         2 * d[5] -
-        d[3].toDouble().pow(2.0) / 120f -
+        d[3].squared / 120f -
         aInt
+
 fun fnc() = fnd() * Random.nextFloat()
 
 private fun killAttempt(capeMessage: String): Boolean {
     when (Yorn.input()) {
-        YES -> {
+
+        YES ->
             when (momentOfTruth()) {
                 KillResult.Success -> {
                     println()
@@ -135,16 +137,40 @@ private fun killAttempt(capeMessage: String): Boolean {
                             UNLESS THE BULL DOES FIRST.
                             """.trimIndent()
                         )
+                    } else {
+                        if (d[4] == 2f)
+                            println("THE CROWD CHEERS WILDLY!")
+                        else
+                            if (d[5] == 2f) {
+                                println("THE CROWD CHEERS!")
+                                println()
+                            }
+                        println("THE CROWD AWARDS YOU")
+                        if (fnc() < 2.4)
+                            println("NOTHING AT ALL.")
+                        else if (fnc() < 4.9)
+                            println("ONE EAR OF THE BULL.")
+                        else
+                            if (fnc() < 7.4)
+                                println("BOTH EARS OF THE BULL!")
+                            else
+                                println("OLE!  YOU ARE 'MUY HOMBRE'!! OLE!  OLE!")
+                        println()
                     }
+                    println()
+                    println("ADIOS")
+                    println()
+                    println()
+                    println()
+                    exitProcess(0)
                 }
 
                 KillResult.Fail -> return true
             }
-        }
 
-        NO -> {
+        NO ->
             print(capeMessage)
-        }
+
     }
     return false
 }

From b065179603b7599bbac2997d834cd13439f06f55 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Sun, 20 Nov 2022 08:56:55 +1100
Subject: [PATCH 087/198] Add bullfight.bas implementation in kotlin

---
 17_Bullfight/kotlin/src/bullfight/Main.kt | 230 +++++++++++++---------
 1 file changed, 132 insertions(+), 98 deletions(-)

diff --git a/17_Bullfight/kotlin/src/bullfight/Main.kt b/17_Bullfight/kotlin/src/bullfight/Main.kt
index 582c8ac6..7a1a0681 100644
--- a/17_Bullfight/kotlin/src/bullfight/Main.kt
+++ b/17_Bullfight/kotlin/src/bullfight/Main.kt
@@ -4,51 +4,80 @@ import bullfight.Yorn.*
 import kotlin.random.Random
 import kotlin.system.exitProcess
 
+private val Boolean.asInteger get() = if (this) 1 else 2
 private val Float.squared: Float
     get() = this * this
-val fna: Boolean get() = Random.nextBoolean()
+val fna: Boolean get() = RandomNumbers.nextBoolean()
+
+enum class Quality(private val typeName: String) {
+    Superb("SUPERB"),
+    Good("GOOD"),
+    Fair("FAIR"),
+    Poor("POOR"),
+    Awful("AWFUL");
+    override fun toString() = typeName
+
+    val level get() = (ordinal + 1).toFloat()
+}
+
+enum class BullDeath(val factor: Float) {
+    Alive(1f), Dead(2f);
+}
 
-val quality = listOf("SUPERB", "GOOD", "FAIR", "POOR", "AWFUL")
-var aInt: Int = 0
 var l = 1f
+lateinit var bullQuality: Quality
 var momentOfTruth = false
-val d = mutableListOf(0f, 0f, 0f, 0f, 0f, 0f)
+var picadoresSuccess = 0f
+var toreadoresSuccess = 0f
+var passNumber = 0f
+var honor = 0f
+var bullDeath = BullDeath.Alive
+
+
+interface RandomNumberSource {
+    fun nextBoolean(): Boolean
+    fun nextInt(from: Int, until: Int): Int
+    fun nextFloat(): Float
+}
+
+object RandomNumbers : RandomNumberSource {
+    override fun nextBoolean() = Random.nextBoolean()
+    override fun nextInt(from: Int, until: Int) = Random.nextInt(from, until)
+    override fun nextFloat() = Random.nextFloat()
+}
+
 
 fun main() {
     intro()
     instructions()
-    d[5] = 1f
-    d[4] = 1f
-
-    aInt = Random.nextInt(1, 6)
-    println("YOU HAVE DRAWN A ${quality[aInt - 1]} BULL.")
-    when {
-        aInt < 2 -> {
-            println("GOOD LUCK.  YOU'LL NEED IT.")
-        }
-
-        aInt > 4 -> {
-            println("YOU'RE LUCKY.")
-        }
+    bullDeath = BullDeath.Alive
+    honor = 1f
 
+    bullQuality = Quality.values()[RandomNumbers.nextInt(1, 6)]
+    println("YOU HAVE DRAWN A $bullQuality BULL.")
+    when (bullQuality) {
+        Quality.Superb -> println("GOOD LUCK.  YOU'LL NEED IT.")
+        Quality.Awful -> println("YOU'RE LUCKY.")
         else -> Unit
     }
 
-    d[1] = fight(FirstAct.picadores)
-    d[2] = fight(FirstAct.toreadores)
-    repeat(2) { println() }
+    picadoresSuccess = fight(FirstAct.picadores)
+    toreadoresSuccess = fight(FirstAct.toreadores)
+    println()
+    println()
+
     var gored: Boolean
 
     gameLoop@ do {
-        d[3]++
-        println("PASS NUMBER ${d[3].toInt()}")
-        if (d[3] >= 3) {
+        passNumber++
+        println("PASS NUMBER ${passNumber.toInt()}")
+        gored = if (passNumber >= 3) {
             print("HERE COMES THE BULL.  TRY FOR A KILL")
-            gored = killAttempt("CAPE MOVE")
+            killAttempt("CAPE MOVE")
         } else {
             println("THE BULL IS CHARGING AT YOU!  YOU ARE THE MATADOR--")
             print("DO YOU WANT TO KILL THE BULL")
-            gored = killAttempt("WHAT MOVE DO YOU MAKE WITH THE CAPE")
+            killAttempt("WHAT MOVE DO YOU MAKE WITH THE CAPE")
         }
 
         if (!gored) {
@@ -63,7 +92,8 @@ fun main() {
             }
 
             l += m
-            val f = (6 - aInt + m / 10f) * Random.nextFloat() / ((d[1] + d[2] + d[3] / 10f) * 5f)
+            val f =
+                (6 - bullQuality.level + m / 10f) * RandomNumbers.nextFloat() / ((picadoresSuccess + toreadoresSuccess + passNumber / 10f) * 5f)
             if (f < 0.51)
                 continue
         }
@@ -73,7 +103,8 @@ fun main() {
             when (fna) {
                 false -> {
                     println("YOU ARE DEAD.")
-                    d[4] = 1.5f
+                    honor = 1.5f
+                    gameResult()
                 }
 
                 true -> {
@@ -84,14 +115,14 @@ fun main() {
 
                         YES -> {
                             println("COWARD")
-                            d[4] = 0f
+                            honor = 0f
                         }
 
                         NO -> {
                             println("YOU ARE BRAVE.  STUPID, BUT BRAVE.")
                             when (fna) {
                                 true -> {
-                                    d[4] = 2f
+                                    honor = 2f
                                     continue@gameLoop
                                 }
 
@@ -113,58 +144,20 @@ fun main() {
 
 fun fnd() = 4.5 +
         l / 6 -
-        (d[1] + d[2]) * 2.5 +
-        4 * d[4] +
-        2 * d[5] -
-        d[3].squared / 120f -
-        aInt
+        (picadoresSuccess + toreadoresSuccess) * 2.5 +
+        4 * honor +
+        2 * bullDeath.factor -
+        passNumber.squared / 120f -
+        bullQuality.level
 
-fun fnc() = fnd() * Random.nextFloat()
+fun fnc() = fnd() * RandomNumbers.nextFloat()
 
 private fun killAttempt(capeMessage: String): Boolean {
     when (Yorn.input()) {
 
         YES ->
             when (momentOfTruth()) {
-                KillResult.Success -> {
-                    println()
-                    println()
-                    if (d[4] == 0f) {
-                        println(
-                            """
-                            THE CROWD BOOS FOR TEN MINUTES.  IF YOU EVER DARE TO SHOW
-                            YOUR FACE IN A RING AGAIN, THEY SWEAR THEY WILL KILL YOU--
-                            UNLESS THE BULL DOES FIRST.
-                            """.trimIndent()
-                        )
-                    } else {
-                        if (d[4] == 2f)
-                            println("THE CROWD CHEERS WILDLY!")
-                        else
-                            if (d[5] == 2f) {
-                                println("THE CROWD CHEERS!")
-                                println()
-                            }
-                        println("THE CROWD AWARDS YOU")
-                        if (fnc() < 2.4)
-                            println("NOTHING AT ALL.")
-                        else if (fnc() < 4.9)
-                            println("ONE EAR OF THE BULL.")
-                        else
-                            if (fnc() < 7.4)
-                                println("BOTH EARS OF THE BULL!")
-                            else
-                                println("OLE!  YOU ARE 'MUY HOMBRE'!! OLE!  OLE!")
-                        println()
-                    }
-                    println()
-                    println("ADIOS")
-                    println()
-                    println()
-                    println()
-                    exitProcess(0)
-                }
-
+                KillResult.Success -> gameResult()
                 KillResult.Fail -> return true
             }
 
@@ -175,6 +168,45 @@ private fun killAttempt(capeMessage: String): Boolean {
     return false
 }
 
+private fun gameResult() {
+    println()
+    println()
+    if (honor == 0f) {
+        println(
+            """
+                            THE CROWD BOOS FOR TEN MINUTES.  IF YOU EVER DARE TO SHOW
+                            YOUR FACE IN A RING AGAIN, THEY SWEAR THEY WILL KILL YOU--
+                            UNLESS THE BULL DOES FIRST.
+                            """.trimIndent()
+        )
+    } else {
+        if (honor == 2f)
+            println("THE CROWD CHEERS WILDLY!")
+        else
+            if (bullDeath == BullDeath.Dead) {
+                println("THE CROWD CHEERS!")
+                println()
+            }
+        println("THE CROWD AWARDS YOU")
+        if (fnc() < 2.4)
+            println("NOTHING AT ALL.")
+        else if (fnc() < 4.9)
+            println("ONE EAR OF THE BULL.")
+        else
+            if (fnc() < 7.4)
+                println("BOTH EARS OF THE BULL!")
+            else
+                println("OLE!  YOU ARE 'MUY HOMBRE'!! OLE!  OLE!")
+        println()
+    }
+    println()
+    println("ADIOS")
+    println()
+    println()
+    println()
+    exitProcess(0)
+}
+
 enum class KillResult { Success, Fail }
 
 fun momentOfTruth(): KillResult {
@@ -188,7 +220,8 @@ fun momentOfTruth(): KillResult {
     """.trimIndent()
     )
 
-    val k = (6 - aInt) * 10 * Random.nextFloat() / ((d[1] + d[2]) * 5 * d[3])
+    val k =
+        (6 - bullQuality.level) * 10 * RandomNumbers.nextFloat() / ((picadoresSuccess + toreadoresSuccess) * 5 * passNumber)
 
     val chance = when (stdInput(KillMethod.values())) {
         KillMethod.OverHorns -> .8
@@ -200,7 +233,7 @@ fun momentOfTruth(): KillResult {
     }
     return if (k <= chance) {
         println("YOU KILLED THE BULL!")
-        d[5] = 2f
+        bullDeath = BullDeath.Dead
         KillResult.Success
     } else {
         println("THE BULL HAS GORED YOU!")
@@ -223,12 +256,6 @@ enum class KillMethod(override val input: String) : InputOption {
     Chest("5"),
 }
 
-private fun <T : InputOption> stdInput(values: Array<T>): T? {
-    print("? ")
-    val z1 = readln()
-    return values.firstOrNull { z1 == it.input }
-}
-
 private fun <T : InputOption> restrictedInput(values: Array<T>, errorMessage: String): T {
     do {
         stdInput(values)?.let { return it }
@@ -236,6 +263,12 @@ private fun <T : InputOption> restrictedInput(values: Array<T>, errorMessage: St
     } while (true)
 }
 
+private fun <T : InputOption> stdInput(values: Array<T>): T? {
+    print("? ")
+    val z1 = readln()
+    return values.firstOrNull { z1 == it.input }
+}
+
 enum class Yorn(override val input: String) : InputOption {
     YES("YES"), NO("NO");
 
@@ -254,23 +287,24 @@ enum class FirstAct(val str: String) {
 
 fun fight(firstAct: FirstAct): Float {
 
-    val b = 3.0 / aInt * Random.nextFloat()
-    val c = when {
-        b < .37 -> .5f
-        b < .5 -> .4f
-        b < .63 -> .3f
-        b < .87 -> .2f
-        else -> .1f
+    val b = 3.0 / bullQuality.level * RandomNumbers.nextFloat()
+    val firstActQuality = when {
+        b < .37 -> Quality.Awful
+        b < .5 -> Quality.Poor
+        b < .63 -> Quality.Fair
+        b < .87 -> Quality.Good
+        else -> Quality.Superb
     }
-    val t = (10 * c + .2).toInt()
-    println("THE $firstAct DID A ${quality[t - 1]} JOB.")
+    val c = firstActQuality.level / 10f
+    val t = firstActQuality.level
+    println("THE $firstAct DID A $firstActQuality JOB.")
 
-    if (t >= 4) {
-        if (t == 5) {
+    if (t >= 4f) {
+        if (t == 5f) {
             if (firstAct != FirstAct.toreadores) {
-                println("$fna OF THE HORSES OF THE $firstAct KILLED.")
+                println("${fna.asInteger} OF THE HORSES OF THE $firstAct KILLED.")
             }
-            println("$fna OF THE $firstAct KILLED.")
+            println("${fna.asInteger} OF THE $firstAct KILLED.")
         } else {
             println(
                 when (fna) {
@@ -316,7 +350,7 @@ private fun instructions() {
 fun intro() {
     println(" ".repeat(34) + "BULL")
     println(" ".repeat(15) + "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY")
-    repeat(3) {
-        println()
-    }
+    println()
+    println()
+    println()
 }

From 0f169d8e0c948b08be616020f13d1225af7a7856 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Sun, 20 Nov 2022 08:57:35 +1100
Subject: [PATCH 088/198] Comments on strange logic behind bullfight.bas

---
 17_Bullfight/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/17_Bullfight/README.md b/17_Bullfight/README.md
index cf331235..c801b16e 100644
--- a/17_Bullfight/README.md
+++ b/17_Bullfight/README.md
@@ -27,3 +27,5 @@ http://www.vintage-basic.net/games.html
 #### Porting Notes
 
 (please note any difficulties or challenges in porting here)
+
+- There is a fundamental assumption in the pre-fight subroutine at line 1610, that the Picadores and Toreadores are more likely to do a bad job (and possibly get killed) with a low-quality bull. This appears to be a mistake in the original code, but should be retained.
\ No newline at end of file

From c9142a64bdead190224368eb1d1f3e7043550467 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Sun, 20 Nov 2022 09:09:25 +1100
Subject: [PATCH 089/198] Revert edits to bullfight.bas

---
 17_Bullfight/bullfight.bas | 140 +++++++++++++++----------------------
 1 file changed, 55 insertions(+), 85 deletions(-)

diff --git a/17_Bullfight/bullfight.bas b/17_Bullfight/bullfight.bas
index a2aa45b7..32b04b89 100644
--- a/17_Bullfight/bullfight.bas
+++ b/17_Bullfight/bullfight.bas
@@ -6,25 +6,25 @@
 205 PRINT "DO YOU WANT INSTRUCTIONS";
 206 INPUT Z$
 207 IF Z$="NO" THEN 400
-    println("HELLO, ALL YOU BLOODLOVERS AND AFICIONADOS.")
-    println("HERE IS YOUR BIG CHANCE TO KILL A BULL.")
-    println()
-    println("ON EACH PASS OF THE BULL, YOU MAY TRY")
-    println("0 - VERONICA (DANGEROUS INSIDE MOVE OF THE CAPE)")
-    println("1 - LESS DANGEROUS OUTSIDE MOVE OF THE CAPE")
-    println("2 - ORDINARY SWIRL OF THE CAPE.")
-    println()
-    println("INSTEAD OF THE ABOVE, YOU MAY TRY TO KILL THE BULL")
-    println("ON ANY TURN: 4 (OVER THE HORNS), 5 (IN THE CHEST).")
-    println("BUT IF I WERE YOU,")
-    println("I WOULDN'T TRY IT BEFORE THE SEVENTH PASS.")
-    println()
-    println("THE CROWD WILL DETERMINE WHAT AWARD YOU DESERVE")
-    println("(POSTHUMOUSLY IF NECESSARY).")
-    println("THE BRAVER YOU ARE, THE BETTER THE AWARD YOU RECEIVE.")
-    println()
-    println("THE BETTER THE JOB THE PICADORES AND TOREADORES DO,")
-    println("THE BETTER YOUR CHANCES ARE.")
+210 PRINT "HELLO, ALL YOU BLOODLOVERS AND AFICIONADOS."
+220 PRINT "HERE IS YOUR BIG CHANCE TO KILL A BULL."
+230 PRINT
+240 PRINT "ON EACH PASS OF THE BULL, YOU MAY TRY"
+250 PRINT "0 - VERONICA (DANGEROUS INSIDE MOVE OF THE CAPE)"
+260 PRINT "1 - LESS DANGEROUS OUTSIDE MOVE OF THE CAPE"
+270 PRINT "2 - ORDINARY SWIRL OF THE CAPE."
+280 PRINT
+290 PRINT "INSTEAD OF THE ABOVE, YOU MAY TRY TO KILL THE BULL"
+300 PRINT "ON ANY TURN: 4 (OVER THE HORNS), 5 (IN THE CHEST)."
+310 PRINT "BUT IF I WERE YOU,"
+320 PRINT "I WOULDN'T TRY IT BEFORE THE SEVENTH PASS."
+330 PRINT
+340 PRINT "THE CROWD WILL DETERMINE WHAT AWARD YOU DESERVE"
+350 PRINT "(POSTHUMOUSLY IF NECESSARY)."
+360 PRINT "THE BRAVER YOU ARE, THE BETTER THE AWARD YOU RECEIVE."
+370 PRINT
+380 PRINT "THE BETTER THE JOB THE PICADORES AND TOREADORES DO,"
+390 PRINT "THE BETTER YOUR CHANCES ARE."
 400 PRINT
 410 PRINT
 420 D(5)=1
@@ -32,70 +32,55 @@
 450 DIM L$(5)
 455 A=INT(RND(1)*5+1)
 460 FOR I=1 TO 5
-    463 READ L$(I)
+463 READ L$(I)
 467 NEXT I
 470 DATA "SUPERB","GOOD","FAIR","POOR","AWFUL"
 490 PRINT "YOU HAVE DRAWN A ";L$(A);" BULL."
 500 IF A>4 THEN 530
-
-    510 IF A<2 THEN 550
-    520 GOTO 570
-
-    530 PRINT "YOU'RE LUCKY."
-    540 GOTO 570
-
-    550 PRINT "GOOD LUCK.  YOU'LL NEED IT."
-    560 PRINT
-
+510 IF A<2 THEN 550
+520 GOTO 570
+530 PRINT "YOU'RE LUCKY."
+540 GOTO 570
+550 PRINT "GOOD LUCK.  YOU'LL NEED IT."
+560 PRINT
 570 PRINT
-
 590 A$="PICADO"
 595 B$="RES"
 600 GOSUB 1610
-
 610 D(1)=C
-
 630 A$="TOREAD"
 635 B$="ORES"
 640 GOSUB 1610
-
 650 D(2)=C
 660 PRINT
 670 PRINT
 680 IF Z=1 THEN 1310
-
 690 D(3)=D(3)+1
 700 PRINT "PASS NUMBER";D(3)
 710 IF D(3)<3 THEN 760
-
-    720 PRINT "HERE COMES THE BULL.  TRY FOR A KILL";
-    730 GOSUB 1930
-    735 IF Z1=1 THEN 1130
-    740 PRINT "CAPE MOVE";
-    750 GOTO 800
-#else
-    760 PRINT "THE BULL IS CHARGING AT YOU!  YOU ARE THE MATADOR--"
-    770 PRINT "DO YOU WANT TO KILL THE BULL";
-    780 GOSUB 1930
-    785 IF Z1=1 THEN 1130
-    790 PRINT "WHAT MOVE DO YOU MAKE WITH THE CAPE";
-
+720 PRINT "HERE COMES THE BULL.  TRY FOR A KILL";
+730 GOSUB 1930
+735 IF Z1=1 THEN 1130
+740 PRINT "CAPE MOVE";
+750 GOTO 800
+760 PRINT "THE BULL IS CHARGING AT YOU!  YOU ARE THE MATADOR--"
+770 PRINT "DO YOU WANT TO KILL THE BULL";
+780 GOSUB 1930
+785 IF Z1=1 THEN 1130
+790 PRINT "WHAT MOVE DO YOU MAKE WITH THE CAPE";
 800 INPUT E
 810 IF E<>INT(ABS(E)) THEN 830
-    820 IF E<3 THEN 850
-        830 PRINT "DON'T PANIC, YOU IDIOT!  PUT DOWN A CORRECT NUMBER"
-        840 GOTO 800
-    850 REM
-
+820 IF E<3 THEN 850
+830 PRINT "DON'T PANIC, YOU IDIOT!  PUT DOWN A CORRECT NUMBER"
+840 GOTO 800
+850 REM
 860 IF E=0 THEN 920
-    870 IF E=1 THEN 900
-        880 M=.5
-        890 GOTO 930
-    900 M=2
-    910 GOTO 930
-#else
-    920 M=3
-
+870 IF E=1 THEN 900
+880 M=.5
+890 GOTO 930
+900 M=2
+910 GOTO 930
+920 M=3
 930 L=L+M
 940 F=(6-A+M/10)*RND(1)/((D(1)+D(2)+D(3)/10)*5)
 950 IF F<.51 THEN 660
@@ -134,7 +119,6 @@
 1280 GOTO 1320
 1290 IF K>.8 THEN 960
 1300 GOTO 1260
-
 1310 PRINT
 1320 PRINT
 1330 PRINT
@@ -165,51 +149,37 @@
 1580 PRINT
 1590 PRINT "ADIOS":PRINT:PRINT:PRINT
 1600 GOTO 2030
-
 1610 B=3/A*RND(1)
 1620 IF B<.37 THEN 1740
 1630 IF B<.5 THEN 1720
 1640 IF B<.63 THEN 1700
 1650 IF B<.87 THEN 1680
-
 1660 C=.1
 1670 GOTO 1750
-
 1680 C=.2
 1690 GOTO 1750
-
 1700 C=.3
 1710 GOTO 1750
-
 1720 C=.4
 1730 GOTO 1750
-
 1740 C=.5
-
 1750 T=INT(10*C+.2)
 1760 PRINT "THE ";A$;B$;" DID A ";L$(T);" JOB."
-
 1770 IF 4>T THEN 1900
-    1780 IF 5=T THEN 1870
-        1790 ON FNA(K) GOTO 1830,1850
-
-            REM Dead code
+1780 IF 5=T THEN 1870
+1790 ON FNA(K) GOTO 1830,1850
 1800 IF A$="TOREAD" THEN 1820
 1810 PRINT "ONE OF THE HORSES OF THE ";A$;B$;" WAS KILLED."
 1820 ON FNA(K) GOTO 1830,1850
-
-        1830 PRINT "ONE OF THE ";A$;B$;" WAS KILLED."
-        1840 GOTO 1900
-
-        1850 PRINT "NO ";A$;B$;" WERE KILLED."
-        1860 GOTO 1900
-
-    1870 IF A$="TOREAD" THEN 1890
-        1880 PRINT FNA(K);"OF THE HORSES OF THE ";A$;B$;" KILLED."
-    1890 PRINT FNA(K);"OF THE ";A$;B$;" KILLED."
+1830 PRINT "ONE OF THE ";A$;B$;" WAS KILLED."
+1840 GOTO 1900
+1850 PRINT "NO ";A$;B$;" WERE KILLED."
+1860 GOTO 1900
+1870 IF A$="TOREAD" THEN 1890
+1880 PRINT FNA(K);"OF THE HORSES OF THE ";A$;B$;" KILLED."
+1890 PRINT FNA(K);"OF THE ";A$;B$;" KILLED."
 1900 PRINT
 1910 RETURN
-
 1920 REM
 1930 INPUT A$
 1940 IF A$="YES" THEN 1990

From 372eabc4a133ee1f8319752e12c10120de027ab2 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Sun, 20 Nov 2022 09:12:23 +1100
Subject: [PATCH 090/198] Revert "Added explicit request for a gradle build
 submodule"

This reverts commit 2d1911ff3d6015bfd9c633400e98d8454a998f34.
---
 .gitmodules | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index da9078ed..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "basic-computer-games-gradle"]
-	path = basic-computer-games-gradle
-	url = https://github.com/pcholt/basic-computer-games-gradle.git

From 9d8a4fbc93c1cdfa4fda0b9afbdfc1ad6239952c Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Tue, 29 Nov 2022 22:40:34 +1100
Subject: [PATCH 091/198] Add evaluation of deaths

---
 53_King/csharp/Country.cs                     | 71 ++++++++------
 53_King/csharp/IOExtensions.cs                |  2 +-
 53_King/csharp/Reign.cs                       | 25 ++---
 53_King/csharp/Resources/DeathsPollution.txt  |  1 +
 53_King/csharp/Resources/DeathsStarvation.txt |  1 +
 53_King/csharp/Resources/EndAlso.txt          |  3 +
 .../csharp/Resources/EndCongratulations.txt   | 10 ++
 53_King/csharp/Resources/EndConsequences.txt  |  3 +
 .../csharp/Resources/EndForeignWorkers.txt    |  7 ++
 53_King/csharp/Resources/EndManyDead.txt      |  5 +
 53_King/csharp/Resources/EndMoneyLeftOver.txt |  7 ++
 53_King/csharp/Resources/EndOneThirdDead.txt  |  7 ++
 53_King/csharp/Resources/FuneralExpenses.txt  |  1 +
 53_King/csharp/Resources/Goodbye.txt          |  1 -
 .../csharp/Resources/InsufficientReserves.txt |  0
 53_King/csharp/Resources/PollutionEffect.txt  |  5 +
 53_King/csharp/Resources/Resource.cs          | 24 +++++
 53_King/csharp/Year.cs                        | 93 +++++++++++++++++++
 53_King/king.bas                              |  1 -
 19 files changed, 226 insertions(+), 41 deletions(-)
 create mode 100644 53_King/csharp/Resources/DeathsPollution.txt
 create mode 100644 53_King/csharp/Resources/DeathsStarvation.txt
 create mode 100644 53_King/csharp/Resources/EndAlso.txt
 create mode 100644 53_King/csharp/Resources/EndCongratulations.txt
 create mode 100644 53_King/csharp/Resources/EndConsequences.txt
 create mode 100644 53_King/csharp/Resources/EndForeignWorkers.txt
 create mode 100644 53_King/csharp/Resources/EndManyDead.txt
 create mode 100644 53_King/csharp/Resources/EndMoneyLeftOver.txt
 create mode 100644 53_King/csharp/Resources/EndOneThirdDead.txt
 create mode 100644 53_King/csharp/Resources/FuneralExpenses.txt
 create mode 100644 53_King/csharp/Resources/InsufficientReserves.txt
 create mode 100644 53_King/csharp/Resources/PollutionEffect.txt
 create mode 100644 53_King/csharp/Year.cs

diff --git a/53_King/csharp/Country.cs b/53_King/csharp/Country.cs
index 5b47c50a..b1b473e7 100644
--- a/53_King/csharp/Country.cs
+++ b/53_King/csharp/Country.cs
@@ -2,14 +2,15 @@ namespace King;
 
 internal class Country
 {
+    private const int InitialLand = 1000;
+
     private readonly IReadWrite _io;
     private readonly IRandom _random;
     private float _rallods;
     private float _countrymen;
     private float _foreigners;
-    private float _land;
-    private float _plantingCost;
-    private float _landValue;
+    private float _arableLand;
+    private float _industryLand;
 
     public Country(IReadWrite io, IRandom random)
         : this(
@@ -18,7 +19,7 @@ internal class Country
             (int)(60000 + random.NextFloat(1000) - random.NextFloat(1000)),
             (int)(500 + random.NextFloat(10) - random.NextFloat(10)),
             0,
-            2000)
+            InitialLand)
     {
     }
 
@@ -29,35 +30,38 @@ internal class Country
         _rallods = rallods;
         _countrymen = countrymen;
         _foreigners = foreigners;
-        _land = land;
-
-        _plantingCost = random.Next(10, 15);
-        _landValue = random.Next(95, 105);
+        _arableLand = land;
     }
 
-    public string Status => Resource.Status(_rallods, _countrymen, _foreigners, _land, _landValue, _plantingCost);
-    private float FarmLand => _land - 1000;
+    public string GetStatus(int landValue, int plantingCost) 
+        => Resource.Status(_rallods, _countrymen, _foreigners, _arableLand, landValue, plantingCost);
+    
+    public float Countrymen => _countrymen;
+    private float FarmLand => _arableLand;
+    public bool HasRallods => _rallods > 0;
+    public float Rallods => _rallods;
+    public float IndustryLand => InitialLand - _arableLand;
 
-    public bool SellLand()
+    public bool SellLand(int landValue, out float landSold)
     {
         if (_io.TryReadValue(
                 SellLandPrompt, 
-                out var landSold, 
+                out landSold, 
                 new ValidityTest(v => v <= FarmLand, () => SellLandError(FarmLand))))
         {
-            _land = (int)(_land - landSold);
-            _rallods = (int)(_rallods + landSold * _landValue);
+            _arableLand = (int)(_arableLand - landSold);
+            _rallods = (int)(_rallods + landSold * landValue);
             return true;
         }
 
         return false;
     }
 
-    public bool DistributeRallods()
+    public bool DistributeRallods(out float rallodsGiven)
     {
         if (_io.TryReadValue(
                 GiveRallodsPrompt,
-                out var rallodsGiven, 
+                out rallodsGiven, 
                 new ValidityTest(v => v <= _rallods, () => GiveRallodsError(_rallods))))
         {
             _rallods = (int)(_rallods - rallodsGiven);
@@ -67,35 +71,48 @@ internal class Country
         return false;
     }
 
-    public bool PlantLand()
+    public bool PlantLand(int plantingCost, out float landPlanted)
     {
-        if (_rallods > 0 && 
-            _io.TryReadValue(
+        if (_io.TryReadValue(
                 PlantLandPrompt, 
-                out var landPlanted, 
+                out landPlanted, 
                 new ValidityTest(v => v <= _countrymen * 2, PlantLandError1),
                 new ValidityTest(v => v <= FarmLand, PlantLandError2(FarmLand)),
-                new ValidityTest(v => v * _plantingCost <= _rallods, PlantLandError3(_rallods))))
+                new ValidityTest(v => v * plantingCost <= _rallods, PlantLandError3(_rallods))))
         {
-            _rallods -= (int)(landPlanted * _plantingCost);
+            _rallods -= (int)(landPlanted * plantingCost);
             return true;
         }
 
         return false;
     }
 
-    public bool ControlPollution()
+    public bool ControlPollution(out float rallodsSpent)
     {
-        if (_rallods > 0 &&
-            _io.TryReadValue(
+        if (_io.TryReadValue(
                 PollutionPrompt,
-                out var rallodsGiven, 
+                out rallodsSpent, 
                 new ValidityTest(v => v <= _rallods, () => PollutionError(_rallods))))
         {
-            _rallods = (int)(_rallods - rallodsGiven);
+            _rallods = (int)(_rallods - rallodsSpent);
             return true;
         }
 
         return false;
     }
+
+    public bool TrySpend(float amount, float landValue)
+    {
+        if (_rallods >= amount)
+        {
+            _rallods -= amount;
+            return true;
+        }
+        
+        _arableLand = (int)(_arableLand - (int)(amount - _rallods) / landValue);
+        _rallods = 0;
+        return false;
+    }
+
+    public void RemoveTheDead(int deaths) => _countrymen = (int)(_countrymen - deaths);
 }
diff --git a/53_King/csharp/IOExtensions.cs b/53_King/csharp/IOExtensions.cs
index e59bf4c0..dbb3079a 100644
--- a/53_King/csharp/IOExtensions.cs
+++ b/53_King/csharp/IOExtensions.cs
@@ -13,7 +13,7 @@ internal static class IOExtensions
             io.TryReadValue(SavedWorkersPrompt, out var workers) &&
             io.TryReadValue(SavedLandPrompt, v => v is > 1000 and <= 2000, SavedLandError, out var land))
         {
-            reign = new Reign(io, new Country(io, random, rallods, countrymen, workers, land), years + 1);
+            reign = new Reign(io, random, new Country(io, random, rallods, countrymen, workers, land), years + 1);
             return true;
         }
 
diff --git a/53_King/csharp/Reign.cs b/53_King/csharp/Reign.cs
index 2bdc9b89..727f71d3 100644
--- a/53_King/csharp/Reign.cs
+++ b/53_King/csharp/Reign.cs
@@ -5,37 +5,40 @@ internal class Reign
     public const int MaxTerm = 8;
 
     private readonly IReadWrite _io;
+    private readonly IRandom _random;
     private readonly Country _country;
-    private float _year;
+    private float _yearNumber;
 
     public Reign(IReadWrite io, IRandom random)
-        : this(io, new Country(io, random), 1)
+        : this(io, random, new Country(io, random), 1)
     {
     }
 
-    public Reign(IReadWrite io, Country country, float year)
+    public Reign(IReadWrite io, IRandom random, Country country, float year)
     {
         _io = io;
+        _random = random;
         _country = country;
-        _year = year;
+        _yearNumber = year;
     }
 
     public bool PlayYear()
     {
-        _io.Write(_country.Status);
+        var year = new Year(_country, _random);
 
-        var playerSoldLand = _country.SellLand();
-        var playerDistributedRallods = _country.DistributeRallods();
-        var playerPlantedLand = _country.PlantLand();
-        var playerControlledPollution = _country.ControlPollution();
+        _io.Write(year.Status);
 
-        if (playerSoldLand || playerDistributedRallods || playerPlantedLand || playerControlledPollution)
+        if (year.GetPlayerActions())
         {
-            _year++;
+            _io.WriteLine();
+            _io.WriteLine();
+            year.EvaluateResults(_io, _random);
+            _yearNumber++;
             return true;
         }
         else
         {
+            _io.WriteLine();
             _io.Write(Goodbye);
             return false;
         }
diff --git a/53_King/csharp/Resources/DeathsPollution.txt b/53_King/csharp/Resources/DeathsPollution.txt
new file mode 100644
index 00000000..bf28d9a7
--- /dev/null
+++ b/53_King/csharp/Resources/DeathsPollution.txt
@@ -0,0 +1 @@
+ {0} countrymen died of carbon-monoxide and dust inhalation
\ No newline at end of file
diff --git a/53_King/csharp/Resources/DeathsStarvation.txt b/53_King/csharp/Resources/DeathsStarvation.txt
new file mode 100644
index 00000000..af275cf4
--- /dev/null
+++ b/53_King/csharp/Resources/DeathsStarvation.txt
@@ -0,0 +1 @@
+ {0} countrymen died of starvation
\ No newline at end of file
diff --git a/53_King/csharp/Resources/EndAlso.txt b/53_King/csharp/Resources/EndAlso.txt
new file mode 100644
index 00000000..084b9a82
--- /dev/null
+++ b/53_King/csharp/Resources/EndAlso.txt
@@ -0,0 +1,3 @@
+also had your left eye gouged out!
+;have also gained a very bad reputation.
+;have also been declared national fink.
diff --git a/53_King/csharp/Resources/EndCongratulations.txt b/53_King/csharp/Resources/EndCongratulations.txt
new file mode 100644
index 00000000..ef1ff203
--- /dev/null
+++ b/53_King/csharp/Resources/EndCongratulations.txt
@@ -0,0 +1,10 @@
+
+
+Congratulations!!!!!!!!!!!!!!!!!!
+You have successfully completed your {0} year term
+of office. You were, of course, extremely lucky, but
+nevertheless, it's quite an achievement. Goodbye and good
+luck - you'll probably need it if you're the type that
+plays this game.
+
+
diff --git a/53_King/csharp/Resources/EndConsequences.txt b/53_King/csharp/Resources/EndConsequences.txt
new file mode 100644
index 00000000..61ebfd25
--- /dev/null
+++ b/53_King/csharp/Resources/EndConsequences.txt
@@ -0,0 +1,3 @@
+You have been thrown out of office and are now
+residing in prison.;
+You have been assassinated.
diff --git a/53_King/csharp/Resources/EndForeignWorkers.txt b/53_King/csharp/Resources/EndForeignWorkers.txt
new file mode 100644
index 00000000..76c04c3d
--- /dev/null
+++ b/53_King/csharp/Resources/EndForeignWorkers.txt
@@ -0,0 +1,7 @@
+
+
+The number of foreign workers has exceeded the number
+of countrymen. As a minority, they have revolted and
+taken over the country.
+{0}
+
diff --git a/53_King/csharp/Resources/EndManyDead.txt b/53_King/csharp/Resources/EndManyDead.txt
new file mode 100644
index 00000000..70cd95f0
--- /dev/null
+++ b/53_King/csharp/Resources/EndManyDead.txt
@@ -0,0 +1,5 @@
+{0} countrymen died in one year!!!!!
+due to this extreme mismanagement, you have not only
+been impeached and thrown out of office, but you
+{1}
+
diff --git a/53_King/csharp/Resources/EndMoneyLeftOver.txt b/53_King/csharp/Resources/EndMoneyLeftOver.txt
new file mode 100644
index 00000000..e194a9fd
--- /dev/null
+++ b/53_King/csharp/Resources/EndMoneyLeftOver.txt
@@ -0,0 +1,7 @@
+
+Money was left over in the treasury which you did
+not spend. As a result, some of your countrymen died
+of starvation. The public is enraged and you have
+been forced to resign.
+
+
diff --git a/53_King/csharp/Resources/EndOneThirdDead.txt b/53_King/csharp/Resources/EndOneThirdDead.txt
new file mode 100644
index 00000000..e1761dfe
--- /dev/null
+++ b/53_King/csharp/Resources/EndOneThirdDead.txt
@@ -0,0 +1,7 @@
+
+
+Over one third of the population has died since you
+were elected to office. The people (remaining)
+hate your guts.
+{0}
+
diff --git a/53_King/csharp/Resources/FuneralExpenses.txt b/53_King/csharp/Resources/FuneralExpenses.txt
new file mode 100644
index 00000000..3aff58eb
--- /dev/null
+++ b/53_King/csharp/Resources/FuneralExpenses.txt
@@ -0,0 +1 @@
+   You were forced to spend {0} rallods on funeral expenses
\ No newline at end of file
diff --git a/53_King/csharp/Resources/Goodbye.txt b/53_King/csharp/Resources/Goodbye.txt
index 325890a5..67543c04 100644
--- a/53_King/csharp/Resources/Goodbye.txt
+++ b/53_King/csharp/Resources/Goodbye.txt
@@ -1,4 +1,3 @@
-
 Goodbye.
 (If you wish to continue this game at a later date, answer
 'again' when asked if you want instructions at the start
diff --git a/53_King/csharp/Resources/InsufficientReserves.txt b/53_King/csharp/Resources/InsufficientReserves.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/53_King/csharp/Resources/PollutionEffect.txt b/53_King/csharp/Resources/PollutionEffect.txt
new file mode 100644
index 00000000..b3535c3d
--- /dev/null
+++ b/53_King/csharp/Resources/PollutionEffect.txt
@@ -0,0 +1,5 @@
+fish population has dwindled due to water pollution.
+;air pollution is killing game bird population.
+;mineral baths are being ruined by water pollution.
+;unpleasant smog is discouraging sun bathers.
+;hotels are looking shabby due to smog grit.
diff --git a/53_King/csharp/Resources/Resource.cs b/53_King/csharp/Resources/Resource.cs
index cf555583..496bc250 100644
--- a/53_King/csharp/Resources/Resource.cs
+++ b/53_King/csharp/Resources/Resource.cs
@@ -51,6 +51,28 @@ internal static class Resource
     public static string PollutionPrompt => GetString();
     public static string PollutionError(float rallods) => string.Format(GetString(), rallods);
 
+    public static string DeathsStarvation(float deaths) => string.Format(GetString(), (int)deaths);
+    public static string DeathsPollution(int deaths) => string.Format(GetString(), deaths);
+    public static string FuneralExpenses(int expenses) => string.Format(GetString(), expenses);
+    public static string InsufficientReserves => GetString();
+
+    private static string PollutionEffect(IRandom random) => GetStrings()[random.Next(5)];
+
+    private static string EndAlso(IRandom random)
+        => random.Next(10) switch
+        {
+            <= 3 => GetStrings()[0],
+            <= 6 => GetStrings()[1],
+            _ => GetStrings()[2]
+        };
+
+    public static string EndCongratulations(int termLength) => string.Format(GetString(), termLength);
+    private static string EndConsequences(IRandom random) => GetStrings()[random.Next(2)];
+    public static string EndForeignWorkers(IRandom random) => string.Format(GetString(), EndConsequences(random));
+    public static string EndManyDead(int deaths, IRandom random) => string.Format(GetString(), deaths, EndAlso(random));
+    public static string EndMoneyLeftOver(int termLength) => string.Format(GetString(), termLength);
+    public static string EndOneThirdDead(IRandom random) => string.Format(GetString(), EndConsequences(random));
+    
     public static string SavedYearsPrompt => GetString();
     public static string SavedYearsError(int years) => string.Format(GetString(), years);
     public static string SavedTreasuryPrompt => GetString();
@@ -61,6 +83,8 @@ internal static class Resource
 
     public static string Goodbye => GetString();
 
+    private static string[] GetStrings([CallerMemberName] string? name = null) => GetString(name).Split(';');
+
     private static string GetString([CallerMemberName] string? name = null)
     {
         using var stream = GetStream(name);
diff --git a/53_King/csharp/Year.cs b/53_King/csharp/Year.cs
new file mode 100644
index 00000000..18f208e4
--- /dev/null
+++ b/53_King/csharp/Year.cs
@@ -0,0 +1,93 @@
+using System.Text;
+
+namespace King;
+
+internal class Year
+{
+    private readonly Country _country;
+    private readonly IRandom _random;
+    private readonly int _plantingCost;
+    private readonly int _landValue;
+
+    private float _landSold;
+    private float _rallodsDistributed;
+    private float _landPlanted;
+    private float _pollutionControlCost;
+
+    public Year(Country country, IRandom random)
+    {
+        _country = country;
+        _random = random;
+        
+        _plantingCost = random.Next(10, 15);
+        _landValue = random.Next(95, 105);
+    }
+
+    public string Status => _country.GetStatus(_landValue, _plantingCost);
+
+    public bool GetPlayerActions()
+    {
+        var playerSoldLand = _country.SellLand(_landValue, out _landSold);
+        var playerDistributedRallods = _country.DistributeRallods(out _rallodsDistributed);
+        var playerPlantedLand = _country.HasRallods && _country.PlantLand(_plantingCost, out _landPlanted);
+        var playerControlledPollution = _country.HasRallods && _country.ControlPollution(out _pollutionControlCost);
+
+        return playerSoldLand || playerDistributedRallods || playerPlantedLand || playerControlledPollution;
+    }
+
+    public Result EvaluateResults(IReadWrite io)
+    {
+        var unspentRallods = _country.Rallods;
+        var statusUpdate = new StringBuilder();
+
+        var result = EvaluateDeaths(statusUpdate, out var deaths);
+
+        io.Write(statusUpdate);
+
+        return Result.Continue;
+    }
+
+    public Result? EvaluateDeaths(StringBuilder statusUpdate, out int deaths)
+    {
+        deaths = default;
+
+        var supportedCountrymen = _rallodsDistributed / 100;
+        var starvationDeaths = _country.Countrymen - supportedCountrymen;
+        if (starvationDeaths > 0)
+        {
+            if (supportedCountrymen < 50) { return Result.GameOver(EndOneThirdDead(_random)); }
+            statusUpdate.AppendLine(DeathsStarvation(starvationDeaths));
+        }
+
+        var pollutionControl = _pollutionControlCost >= 25 ? _pollutionControlCost / 25 : 1;
+        var pollutionDeaths = (int)(_random.Next((int)_country.IndustryLand) / pollutionControl);
+        if (pollutionDeaths > 0)
+        {
+            statusUpdate.AppendLine(DeathsPollution(pollutionDeaths));
+        }
+
+        deaths = (int)(starvationDeaths + pollutionDeaths);
+        if (deaths > 0)
+        {
+            var funeralCosts = deaths * 9;
+            statusUpdate.AppendLine(FuneralExpenses(funeralCosts));
+
+            if (!_country.TrySpend(funeralCosts, _landValue))
+            {
+                statusUpdate.AppendLine(InsufficientReserves);
+            }
+
+            _country.RemoveTheDead(deaths);
+        }
+
+        return null;
+    }
+
+
+    internal record struct Result (bool IsGameOver, string Message)
+    {
+        internal static Result GameOver(string message) => new(true, message);
+        internal static Result Continue => new(false, "");
+    }
+}
+
diff --git a/53_King/king.bas b/53_King/king.bas
index 5e9ae163..7352fa58 100644
--- a/53_King/king.bas
+++ b/53_King/king.bas
@@ -99,7 +99,6 @@
 1000 GOTO 600
 1002 PRINT
 1003 PRINT
-1005 PRINT A
 1010 A=INT(A-K)
 1020 A4=A
 1100 IF INT(I/100-B)>=0 THEN 1120

From 5ddeeaa4a39a1a9ca79bf1e81d9c11cc8ea34c63 Mon Sep 17 00:00:00 2001
From: Timothy Johnston <QuarticSushi@gmail.com>
Date: Sun, 1 Jan 2023 08:31:01 +1100
Subject: [PATCH 092/198] Added Julia port of Dice

---
 00_Alternate_Languages/33_Dice/Julia/Dice.jl  | 75 +++++++++++++++++++
 .../33_Dice/Julia/README.md                   |  3 +
 2 files changed, 78 insertions(+)
 create mode 100644 00_Alternate_Languages/33_Dice/Julia/Dice.jl
 create mode 100644 00_Alternate_Languages/33_Dice/Julia/README.md

diff --git a/00_Alternate_Languages/33_Dice/Julia/Dice.jl b/00_Alternate_Languages/33_Dice/Julia/Dice.jl
new file mode 100644
index 00000000..8cc98292
--- /dev/null
+++ b/00_Alternate_Languages/33_Dice/Julia/Dice.jl
@@ -0,0 +1,75 @@
+#=
+Port of Dice from BASIC Computer Games (1978)
+
+This "game" simulates a given number of dice rolls, and returns the 
+count for each possible total.
+
+The only change that has been made from the original program, is that 
+when asking if the user wants to play again, any string starting with
+y or Y will be accepted, instead of only YES.
+=#
+
+function main()
+    # Array to store the counts for each total.
+    # There are 11 possible totals.
+    counts = [0 for i in 1:11]
+
+    # Print intro text
+    println("\n                   Dice")
+    println("Creative Computing  Morristown, New Jersey")
+    println("\n\n")
+    println("This program simulates the rolling of a")
+    println("pair of dice.")
+    println("You enter the number of times you want the computer to")
+    println("'roll' the dice.   Watch out, very large numbers take")
+    println("a long time.  In particular, numbers over 5000.")
+
+    still_playing = true
+    while still_playing
+        println()
+        print("How many rolls? ")
+
+        # Get user input for number of dice rolls
+        rolls = readline()
+        rolls = parse(Int64, rolls)
+
+        # Roll dice the specified number of times and update total count
+        for _ in 1:rolls
+            dice_roll = rand(1:6, 2)
+            dice_sum = sum(dice_roll)
+
+            # The index is one less than the sum, as a sum of 1 is impossible,
+            # the array will only have 11 values
+            counts[dice_sum-1] += 1
+        end
+
+        # Display results
+        println("\nTotal Spots   Number of Times")
+        for i in 1:8
+            print(" ")
+            print(i+1)
+            print("             ")
+            println(counts[i])
+        end
+        for i in 9:11
+            print(" ")
+            print(i+1)
+            print("            ")
+            println(counts[i])
+        end
+
+        # Ask try again
+        print("\nTry Again? ")
+        input = readline()
+        if length(input) > 0 && uppercase(input)[1] == 'Y'
+             # If game is continued, resets total counts
+            counts = [0 for i in 1:11]
+        else
+            still_playing = false
+        end
+    end
+end
+
+if abspath(PROGRAM_FILE) == @__FILE__
+    main()
+end
\ No newline at end of file
diff --git a/00_Alternate_Languages/33_Dice/Julia/README.md b/00_Alternate_Languages/33_Dice/Julia/README.md
new file mode 100644
index 00000000..fb77771d
--- /dev/null
+++ b/00_Alternate_Languages/33_Dice/Julia/README.md
@@ -0,0 +1,3 @@
+Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
+
+Conversion to [Python](https://www.julialang.org/)
\ No newline at end of file

From 051f3eb5d5d2595cb719fe7eea0c072166ac4fae Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Thu, 19 Jan 2023 07:36:00 +1100
Subject: [PATCH 093/198] Add evaluation of migration and agriculture

---
 53_King/README.md                            | 16 ++++-
 53_King/csharp/Country.cs                    |  7 ++
 53_King/csharp/Reign.cs                      |  4 +-
 53_King/csharp/Resources/Emigration.txt      |  1 +
 53_King/csharp/Resources/Harvest.txt         |  2 +
 53_King/csharp/Resources/HarvestReason.txt   |  1 +
 53_King/csharp/Resources/Immigration.txt     |  1 +
 53_King/csharp/Resources/LandPlanted.txt     |  1 +
 53_King/csharp/Resources/Resource.cs         | 12 ++++
 53_King/csharp/Resources/WorkerMigration.txt |  1 +
 53_King/csharp/Year.cs                       | 73 ++++++++++++++------
 11 files changed, 95 insertions(+), 24 deletions(-)
 create mode 100644 53_King/csharp/Resources/Emigration.txt
 create mode 100644 53_King/csharp/Resources/Harvest.txt
 create mode 100644 53_King/csharp/Resources/HarvestReason.txt
 create mode 100644 53_King/csharp/Resources/Immigration.txt
 create mode 100644 53_King/csharp/Resources/LandPlanted.txt
 create mode 100644 53_King/csharp/Resources/WorkerMigration.txt

diff --git a/53_King/README.md b/53_King/README.md
index a363a2be..14a66fe9 100644
--- a/53_King/README.md
+++ b/53_King/README.md
@@ -1,10 +1,10 @@
 ## King
 
-This is one of the most comprehensive, difficult, and interesting games. (If you’ve never played one of these games, start with HAMMURABI.)
+This is one of the most comprehensive, difficult, and interesting games. (If you've never played one of these games, start with HAMMURABI.)
 
 In this game, you are Premier of Setats Detinu, a small communist island 30 by 70 miles long. Your job is to decide upon the budget of your country and distribute money to your country from the communal treasury.
 
-The money system is Rollods; each person needs 100 Rallods per year to survive. Your country’s income comes from farm produce and tourists visiting your magnificent forests, hunting, fishing, etc. Part of your land is farm land but it also has an excellent mineral content and may be sold to foreign industry for strip mining. Industry import and support their own workers. Crops cost between 10 and 15 Rallods per square mile to plant, cultivate, and harvest. Your goal is to complete an eight-year term of office without major mishap. A word of warning: it isn’t easy!
+The money system is Rollods; each person needs 100 Rallods per year to survive. Your country's income comes from farm produce and tourists visiting your magnificent forests, hunting, fishing, etc. Part of your land is farm land but it also has an excellent mineral content and may be sold to foreign industry for strip mining. Industry import and support their own workers. Crops cost between 10 and 15 Rallods per square mile to plant, cultivate, and harvest. Your goal is to complete an eight-year term of office without major mishap. A word of warning: it isn't easy!
 
 The author of this program is James A. Storer who wrote it while a student at Lexington High School.
 
@@ -66,3 +66,15 @@ On basic line 1997 it is:
 but it should be:
 
     1997 PRINT "   AND 1,000 SQ. MILES OF FOREST LAND."
+
+### Bug 4
+
+On basic line 1310 we see this:
+
+    1310 IF C=0 THEN 1324
+    1320 PRINT "OF ";INT(J);"SQ. MILES PLANTED,";
+    1324 ...
+
+but it should probably be:
+
+    1310 IF J=0 THEN 1324
diff --git a/53_King/csharp/Country.cs b/53_King/csharp/Country.cs
index b1b473e7..d1ba9235 100644
--- a/53_King/csharp/Country.cs
+++ b/53_King/csharp/Country.cs
@@ -37,6 +37,7 @@ internal class Country
         => Resource.Status(_rallods, _countrymen, _foreigners, _arableLand, landValue, plantingCost);
     
     public float Countrymen => _countrymen;
+    public bool HasWorkers => _foreigners > 0;
     private float FarmLand => _arableLand;
     public bool HasRallods => _rallods > 0;
     public float Rallods => _rallods;
@@ -115,4 +116,10 @@ internal class Country
     }
 
     public void RemoveTheDead(int deaths) => _countrymen = (int)(_countrymen - deaths);
+
+    public void Migration(int migration) => _countrymen = (int)(_countrymen + migration);
+
+    public void AddWorkers(int newWorkers) => _foreigners = (int)(_foreigners + newWorkers);
+
+    public void SellCrops(int income) => _rallods = (int)(_rallods + income);
 }
diff --git a/53_King/csharp/Reign.cs b/53_King/csharp/Reign.cs
index 727f71d3..1955c81b 100644
--- a/53_King/csharp/Reign.cs
+++ b/53_King/csharp/Reign.cs
@@ -24,7 +24,7 @@ internal class Reign
 
     public bool PlayYear()
     {
-        var year = new Year(_country, _random);
+        var year = new Year(_country, _random, _io);
 
         _io.Write(year.Status);
 
@@ -32,7 +32,7 @@ internal class Reign
         {
             _io.WriteLine();
             _io.WriteLine();
-            year.EvaluateResults(_io, _random);
+            year.EvaluateResults();
             _yearNumber++;
             return true;
         }
diff --git a/53_King/csharp/Resources/Emigration.txt b/53_King/csharp/Resources/Emigration.txt
new file mode 100644
index 00000000..01f67094
--- /dev/null
+++ b/53_King/csharp/Resources/Emigration.txt
@@ -0,0 +1 @@
+ {0} countrymen left the island.
\ No newline at end of file
diff --git a/53_King/csharp/Resources/Harvest.txt b/53_King/csharp/Resources/Harvest.txt
new file mode 100644
index 00000000..7cedf658
--- /dev/null
+++ b/53_King/csharp/Resources/Harvest.txt
@@ -0,0 +1,2 @@
+ you harvested  {0} sq. miles of crops.
+{1}making {2} rallods.
\ No newline at end of file
diff --git a/53_King/csharp/Resources/HarvestReason.txt b/53_King/csharp/Resources/HarvestReason.txt
new file mode 100644
index 00000000..82faccb5
--- /dev/null
+++ b/53_King/csharp/Resources/HarvestReason.txt
@@ -0,0 +1 @@
+   (Due to increased air and water pollution from foreign industry.)
diff --git a/53_King/csharp/Resources/Immigration.txt b/53_King/csharp/Resources/Immigration.txt
new file mode 100644
index 00000000..30d8b6b3
--- /dev/null
+++ b/53_King/csharp/Resources/Immigration.txt
@@ -0,0 +1 @@
+ {0} countrymen came to the island.
\ No newline at end of file
diff --git a/53_King/csharp/Resources/LandPlanted.txt b/53_King/csharp/Resources/LandPlanted.txt
new file mode 100644
index 00000000..e52529aa
--- /dev/null
+++ b/53_King/csharp/Resources/LandPlanted.txt
@@ -0,0 +1 @@
+Of  {0} sq. miles planted,
\ No newline at end of file
diff --git a/53_King/csharp/Resources/Resource.cs b/53_King/csharp/Resources/Resource.cs
index 496bc250..9fd56b8d 100644
--- a/53_King/csharp/Resources/Resource.cs
+++ b/53_King/csharp/Resources/Resource.cs
@@ -56,6 +56,18 @@ internal static class Resource
     public static string FuneralExpenses(int expenses) => string.Format(GetString(), expenses);
     public static string InsufficientReserves => GetString();
 
+    public static string WorkerMigration(int newWorkers) => string.Format(GetString(), newWorkers);
+    public static string Migration(int migration) 
+        => string.Format(migration < 0 ? Emigration : Immigration, Math.Abs(migration));
+    public static string Emigration => GetString();
+    public static string Immigration => GetString();
+
+    public static string LandPlanted(float landPlanted) 
+        => landPlanted > 0 ? string.Format(GetString(), (int)landPlanted) : "";
+    public static string Harvest(int yield, int income, bool hasIndustry) 
+        => string.Format(GetString(), yield, HarvestReason(hasIndustry), income);
+    private static string HarvestReason(bool hasIndustry) => hasIndustry ? GetString() : "";
+
     private static string PollutionEffect(IRandom random) => GetStrings()[random.Next(5)];
 
     private static string EndAlso(IRandom random)
diff --git a/53_King/csharp/Resources/WorkerMigration.txt b/53_King/csharp/Resources/WorkerMigration.txt
new file mode 100644
index 00000000..d2f3b378
--- /dev/null
+++ b/53_King/csharp/Resources/WorkerMigration.txt
@@ -0,0 +1 @@
+ {0} workers came to the country and
\ No newline at end of file
diff --git a/53_King/csharp/Year.cs b/53_King/csharp/Year.cs
index 18f208e4..526db454 100644
--- a/53_King/csharp/Year.cs
+++ b/53_King/csharp/Year.cs
@@ -6,6 +6,7 @@ internal class Year
 {
     private readonly Country _country;
     private readonly IRandom _random;
+    private readonly IReadWrite _io;
     private readonly int _plantingCost;
     private readonly int _landValue;
 
@@ -14,7 +15,12 @@ internal class Year
     private float _landPlanted;
     private float _pollutionControlCost;
 
-    public Year(Country country, IRandom random)
+    private float _citizenSupport;
+    private int _deaths;
+    private int _pollutionDeaths;
+
+
+    public Year(Country country, IRandom random, IReadWrite io)
     {
         _country = country;
         _random = random;
@@ -35,54 +41,81 @@ internal class Year
         return playerSoldLand || playerDistributedRallods || playerPlantedLand || playerControlledPollution;
     }
 
-    public Result EvaluateResults(IReadWrite io)
+    public Result EvaluateResults()
     {
         var unspentRallods = _country.Rallods;
-        var statusUpdate = new StringBuilder();
 
-        var result = EvaluateDeaths(statusUpdate, out var deaths);
-
-        io.Write(statusUpdate);
+        var result = EvaluateDeaths();
 
         return Result.Continue;
     }
 
-    public Result? EvaluateDeaths(StringBuilder statusUpdate, out int deaths)
+    public Result? EvaluateDeaths()
     {
-        deaths = default;
-
         var supportedCountrymen = _rallodsDistributed / 100;
-        var starvationDeaths = _country.Countrymen - supportedCountrymen;
+        _citizenSupport = supportedCountrymen - _country.Countrymen;
+        var starvationDeaths = -_citizenSupport;
         if (starvationDeaths > 0)
         {
             if (supportedCountrymen < 50) { return Result.GameOver(EndOneThirdDead(_random)); }
-            statusUpdate.AppendLine(DeathsStarvation(starvationDeaths));
+            _io.WriteLine(DeathsStarvation(starvationDeaths));
         }
 
         var pollutionControl = _pollutionControlCost >= 25 ? _pollutionControlCost / 25 : 1;
-        var pollutionDeaths = (int)(_random.Next((int)_country.IndustryLand) / pollutionControl);
-        if (pollutionDeaths > 0)
+        _pollutionDeaths = (int)(_random.Next((int)_country.IndustryLand) / pollutionControl);
+        if (_pollutionDeaths > 0)
         {
-            statusUpdate.AppendLine(DeathsPollution(pollutionDeaths));
+            _io.WriteLine(DeathsPollution(_pollutionDeaths));
         }
 
-        deaths = (int)(starvationDeaths + pollutionDeaths);
-        if (deaths > 0)
+        _deaths = (int)(starvationDeaths + _pollutionDeaths);
+        if (_deaths > 0)
         {
-            var funeralCosts = deaths * 9;
-            statusUpdate.AppendLine(FuneralExpenses(funeralCosts));
+            var funeralCosts = _deaths * 9;
+            _io.WriteLine(FuneralExpenses(funeralCosts));
 
             if (!_country.TrySpend(funeralCosts, _landValue))
             {
-                statusUpdate.AppendLine(InsufficientReserves);
+                _io.WriteLine(InsufficientReserves);
             }
 
-            _country.RemoveTheDead(deaths);
+            _country.RemoveTheDead(_deaths);
         }
 
         return null;
     }
 
+    private Result? EvaluateMigration()
+    {
+        if (_landSold > 0)
+        {
+            var newWorkers = (int)(_landSold + _random.NextFloat(10) - _random.NextFloat(20));
+            if (!_country.HasWorkers) { newWorkers += 20; }
+            _io.Write(WorkerMigration(newWorkers));
+            _country.AddWorkers(newWorkers);
+        }
+
+        var migration = 
+            (int)(_citizenSupport / 10 + _pollutionControlCost / 25 - _country.IndustryLand / 50 - _pollutionDeaths / 2);
+        _io.WriteLine(Migration(migration));
+        _country.Migration(migration);
+
+        return null;
+    }
+
+    private Result? EvaluateAgriculture()
+    {
+        var ruinedCrops = (int)Math.Min(_country.IndustryLand * (_random.NextFloat() + 1.5f) / 2, _landPlanted);
+        var yield = (int)(_landPlanted - ruinedCrops);
+        var income = (int)(yield * _landValue / 2f);
+
+        _io.Write(LandPlanted(_landPlanted));
+        _io.Write(Harvest(yield, income, _country.IndustryLand > 0));
+
+        _country.SellCrops(income);
+
+        return null;
+    }
 
     internal record struct Result (bool IsGameOver, string Message)
     {

From 62db3a9c9a7994d468a2238fc618be7532b71afb Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Sat, 21 Jan 2023 22:24:20 +1100
Subject: [PATCH 094/198] Finish game

---
 53_King/csharp/Country.cs                     |  8 +++
 53_King/csharp/Game.cs                        |  6 +-
 53_King/csharp/Reign.cs                       | 21 +++---
 53_King/csharp/Resources/Harvest.txt          |  2 +-
 53_King/csharp/Resources/Resource.cs          |  7 +-
 53_King/csharp/Resources/TourismDecrease.txt  |  1 +
 53_King/csharp/Resources/TourismEarnings.txt  |  1 +
 ...{PollutionEffect.txt => TourismReason.txt} |  0
 53_King/csharp/Result.cs                      |  7 ++
 53_King/csharp/Year.cs                        | 64 +++++++++++++------
 10 files changed, 81 insertions(+), 36 deletions(-)
 create mode 100644 53_King/csharp/Resources/TourismDecrease.txt
 create mode 100644 53_King/csharp/Resources/TourismEarnings.txt
 rename 53_King/csharp/Resources/{PollutionEffect.txt => TourismReason.txt} (100%)
 create mode 100644 53_King/csharp/Result.cs

diff --git a/53_King/csharp/Country.cs b/53_King/csharp/Country.cs
index d1ba9235..1a37bcd8 100644
--- a/53_King/csharp/Country.cs
+++ b/53_King/csharp/Country.cs
@@ -37,11 +37,13 @@ internal class Country
         => Resource.Status(_rallods, _countrymen, _foreigners, _arableLand, landValue, plantingCost);
     
     public float Countrymen => _countrymen;
+    public float Workers => _foreigners;
     public bool HasWorkers => _foreigners > 0;
     private float FarmLand => _arableLand;
     public bool HasRallods => _rallods > 0;
     public float Rallods => _rallods;
     public float IndustryLand => InitialLand - _arableLand;
+    public int PreviousTourismIncome { get; private set; }
 
     public bool SellLand(int landValue, out float landSold)
     {
@@ -122,4 +124,10 @@ internal class Country
     public void AddWorkers(int newWorkers) => _foreigners = (int)(_foreigners + newWorkers);
 
     public void SellCrops(int income) => _rallods = (int)(_rallods + income);
+
+    public void EntertainTourists(int income)
+    {
+        PreviousTourismIncome = income;
+        _rallods = (int)(_rallods + income);
+    }
 }
diff --git a/53_King/csharp/Game.cs b/53_King/csharp/Game.cs
index 92d8063f..6a91010c 100644
--- a/53_King/csharp/Game.cs
+++ b/53_King/csharp/Game.cs
@@ -15,7 +15,7 @@ internal class Game
 
     public void Play()
     {
-        _io.Write(Resource.Title);
+        _io.Write(Title);
 
         var reign = SetUpReign();
         if (reign != null)
@@ -29,7 +29,7 @@ internal class Game
 
     private Reign? SetUpReign()
     {
-        var response = _io.ReadString(Resource.InstructionsPrompt).ToUpper();
+        var response = _io.ReadString(InstructionsPrompt).ToUpper();
 
         if (response.Equals("Again", StringComparison.InvariantCultureIgnoreCase))
         {
@@ -38,7 +38,7 @@ internal class Game
         
         if (!response.StartsWith("N", StringComparison.InvariantCultureIgnoreCase))
         {
-            _io.Write(Resource.InstructionsText(TermOfOffice));
+            _io.Write(InstructionsText(TermOfOffice));
         }
 
         _io.WriteLine();
diff --git a/53_King/csharp/Reign.cs b/53_King/csharp/Reign.cs
index 1955c81b..7a96a30f 100644
--- a/53_King/csharp/Reign.cs
+++ b/53_King/csharp/Reign.cs
@@ -28,19 +28,18 @@ internal class Reign
 
         _io.Write(year.Status);
 
-        if (year.GetPlayerActions())
+        var result = year.GetPlayerActions() ?? year.EvaluateResults() ?? IsAtEndOfTerm();
+        if (result.IsGameOver)
         {
-            _io.WriteLine();
-            _io.WriteLine();
-            year.EvaluateResults();
-            _yearNumber++;
-            return true;
-        }
-        else
-        {
-            _io.WriteLine();
-            _io.Write(Goodbye);
+            _io.WriteLine(result.Message);
             return false;
         }
+
+        return true;
     }
+
+    private Result IsAtEndOfTerm() 
+        => _yearNumber == MaxTerm 
+            ? Result.GameOver(EndCongratulations(MaxTerm)) 
+            : Result.Continue;
 }
diff --git a/53_King/csharp/Resources/Harvest.txt b/53_King/csharp/Resources/Harvest.txt
index 7cedf658..287e0c42 100644
--- a/53_King/csharp/Resources/Harvest.txt
+++ b/53_King/csharp/Resources/Harvest.txt
@@ -1,2 +1,2 @@
  you harvested  {0} sq. miles of crops.
-{1}making {2} rallods.
\ No newline at end of file
+{1}making {2} rallods.
diff --git a/53_King/csharp/Resources/Resource.cs b/53_King/csharp/Resources/Resource.cs
index 9fd56b8d..5ea09e1c 100644
--- a/53_King/csharp/Resources/Resource.cs
+++ b/53_King/csharp/Resources/Resource.cs
@@ -68,7 +68,9 @@ internal static class Resource
         => string.Format(GetString(), yield, HarvestReason(hasIndustry), income);
     private static string HarvestReason(bool hasIndustry) => hasIndustry ? GetString() : "";
 
-    private static string PollutionEffect(IRandom random) => GetStrings()[random.Next(5)];
+    public static string TourismEarnings(int income) => string.Format(GetString(), income);
+    public static string TourismDecrease(IRandom random) => string.Format(GetString(), TourismReason(random));
+    private static string TourismReason(IRandom random) => GetStrings()[random.Next(5)];
 
     private static string EndAlso(IRandom random)
         => random.Next(10) switch
@@ -82,7 +84,7 @@ internal static class Resource
     private static string EndConsequences(IRandom random) => GetStrings()[random.Next(2)];
     public static string EndForeignWorkers(IRandom random) => string.Format(GetString(), EndConsequences(random));
     public static string EndManyDead(int deaths, IRandom random) => string.Format(GetString(), deaths, EndAlso(random));
-    public static string EndMoneyLeftOver(int termLength) => string.Format(GetString(), termLength);
+    public static string EndMoneyLeftOver() => GetString();
     public static string EndOneThirdDead(IRandom random) => string.Format(GetString(), EndConsequences(random));
     
     public static string SavedYearsPrompt => GetString();
@@ -104,7 +106,6 @@ internal static class Resource
         return reader.ReadToEnd();
     }
 
-
     private static Stream GetStream([CallerMemberName] string? name = null) =>
         Assembly.GetExecutingAssembly().GetManifestResourceStream($"{typeof(Resource).Namespace}.{name}.txt")
             ?? throw new Exception($"Could not find embedded resource stream '{name}'.");
diff --git a/53_King/csharp/Resources/TourismDecrease.txt b/53_King/csharp/Resources/TourismDecrease.txt
new file mode 100644
index 00000000..dcb45fc7
--- /dev/null
+++ b/53_King/csharp/Resources/TourismDecrease.txt
@@ -0,0 +1 @@
+   Decrease because {0}
\ No newline at end of file
diff --git a/53_King/csharp/Resources/TourismEarnings.txt b/53_King/csharp/Resources/TourismEarnings.txt
new file mode 100644
index 00000000..db9251dd
--- /dev/null
+++ b/53_King/csharp/Resources/TourismEarnings.txt
@@ -0,0 +1 @@
+ You made {0} rallods from tourist trade.
\ No newline at end of file
diff --git a/53_King/csharp/Resources/PollutionEffect.txt b/53_King/csharp/Resources/TourismReason.txt
similarity index 100%
rename from 53_King/csharp/Resources/PollutionEffect.txt
rename to 53_King/csharp/Resources/TourismReason.txt
diff --git a/53_King/csharp/Result.cs b/53_King/csharp/Result.cs
new file mode 100644
index 00000000..185f4617
--- /dev/null
+++ b/53_King/csharp/Result.cs
@@ -0,0 +1,7 @@
+namespace King;
+
+internal record struct Result (bool IsGameOver, string Message)
+{
+    internal static Result GameOver(string message) => new(true, message);
+    internal static Result Continue => new(false, "");
+}
diff --git a/53_King/csharp/Year.cs b/53_King/csharp/Year.cs
index 526db454..8e6bb0b4 100644
--- a/53_King/csharp/Year.cs
+++ b/53_King/csharp/Year.cs
@@ -17,13 +17,15 @@ internal class Year
 
     private float _citizenSupport;
     private int _deaths;
+    private float _starvationDeaths;
     private int _pollutionDeaths;
-
+    private int _migration;
 
     public Year(Country country, IRandom random, IReadWrite io)
     {
         _country = country;
         _random = random;
+        _io = io;
         
         _plantingCost = random.Next(10, 15);
         _landValue = random.Next(95, 105);
@@ -31,34 +33,41 @@ internal class Year
 
     public string Status => _country.GetStatus(_landValue, _plantingCost);
 
-    public bool GetPlayerActions()
+    public Result? GetPlayerActions()
     {
         var playerSoldLand = _country.SellLand(_landValue, out _landSold);
         var playerDistributedRallods = _country.DistributeRallods(out _rallodsDistributed);
         var playerPlantedLand = _country.HasRallods && _country.PlantLand(_plantingCost, out _landPlanted);
         var playerControlledPollution = _country.HasRallods && _country.ControlPollution(out _pollutionControlCost);
 
-        return playerSoldLand || playerDistributedRallods || playerPlantedLand || playerControlledPollution;
+        return playerSoldLand || playerDistributedRallods || playerPlantedLand || playerControlledPollution
+            ? null
+            : Result.GameOver(Goodbye);
     }
 
-    public Result EvaluateResults()
+    public Result? EvaluateResults()
     {
-        var unspentRallods = _country.Rallods;
+        var rallodsUnspent = _country.Rallods;
 
-        var result = EvaluateDeaths();
+        _io.WriteLine();
+        _io.WriteLine();
 
-        return Result.Continue;
+        return EvaluateDeaths() 
+            ?? EvaluateMigration() 
+            ?? EvaluateAgriculture()
+            ?? EvaluateTourism()
+            ?? DetermineResult(rallodsUnspent);
     }
 
     public Result? EvaluateDeaths()
     {
         var supportedCountrymen = _rallodsDistributed / 100;
         _citizenSupport = supportedCountrymen - _country.Countrymen;
-        var starvationDeaths = -_citizenSupport;
-        if (starvationDeaths > 0)
+        _starvationDeaths = -_citizenSupport;
+        if (_starvationDeaths > 0)
         {
             if (supportedCountrymen < 50) { return Result.GameOver(EndOneThirdDead(_random)); }
-            _io.WriteLine(DeathsStarvation(starvationDeaths));
+            _io.WriteLine(DeathsStarvation(_starvationDeaths));
         }
 
         var pollutionControl = _pollutionControlCost >= 25 ? _pollutionControlCost / 25 : 1;
@@ -68,7 +77,7 @@ internal class Year
             _io.WriteLine(DeathsPollution(_pollutionDeaths));
         }
 
-        _deaths = (int)(starvationDeaths + _pollutionDeaths);
+        _deaths = (int)(_starvationDeaths + _pollutionDeaths);
         if (_deaths > 0)
         {
             var funeralCosts = _deaths * 9;
@@ -95,10 +104,10 @@ internal class Year
             _country.AddWorkers(newWorkers);
         }
 
-        var migration = 
+        _migration = 
             (int)(_citizenSupport / 10 + _pollutionControlCost / 25 - _country.IndustryLand / 50 - _pollutionDeaths / 2);
-        _io.WriteLine(Migration(migration));
-        _country.Migration(migration);
+        _io.WriteLine(Migration(_migration));
+        _country.Migration(_migration);
 
         return null;
     }
@@ -117,10 +126,29 @@ internal class Year
         return null;
     }
 
-    internal record struct Result (bool IsGameOver, string Message)
+    private Result? EvaluateTourism()
     {
-        internal static Result GameOver(string message) => new(true, message);
-        internal static Result Continue => new(false, "");
+        var reputationValue = (int)((_country.Countrymen - _migration) * 22 + _random.NextFloat(500));
+        var industryAdjustment = (int)(_country.IndustryLand * 15);
+        var tourismIncome = Math.Abs(reputationValue - industryAdjustment);
+
+        _io.WriteLine(TourismEarnings(tourismIncome));
+        if (industryAdjustment > 0 && tourismIncome < _country.PreviousTourismIncome)
+        {
+            _io.Write(TourismDecrease(_random));
+        }
+
+        _country.EntertainTourists(tourismIncome);
+
+        return null;
+    }
+
+    private Result? DetermineResult(float rallodsUnspent)
+    {
+        if (_deaths > 200) { return Result.GameOver(EndManyDead(_deaths, _random)); }
+        if (_country.Countrymen < 343) { return Result.GameOver(EndOneThirdDead(_random)); }
+        if (rallodsUnspent / 100 > 5 && _starvationDeaths >= 2) { return Result.GameOver(EndMoneyLeftOver()); }
+        if (_country.Workers > _country.Countrymen) { return Result.GameOver(EndForeignWorkers(_random)); }
+        return null;
     }
 }
-

From f6bde494744cbcff2bb46c8656ab3c2e9763dc2c Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Tue, 24 Jan 2023 07:40:15 +1100
Subject: [PATCH 095/198] Configure project

---
 72_Queen/csharp/Queen.csproj | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/72_Queen/csharp/Queen.csproj b/72_Queen/csharp/Queen.csproj
index d3fe4757..3870320c 100644
--- a/72_Queen/csharp/Queen.csproj
+++ b/72_Queen/csharp/Queen.csproj
@@ -6,4 +6,12 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources/*.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\00_Common\dotnet\Games.Common\Games.Common.csproj" />
+  </ItemGroup>
 </Project>

From 083a11f42ffbe9ddb95a864115099cb2d8170269 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Tue, 24 Jan 2023 17:47:34 +1100
Subject: [PATCH 096/198] Add string resources

---
 72_Queen/csharp/Program.cs                    |  3 ++
 72_Queen/csharp/Resources/AnyonePrompt.txt    |  1 +
 72_Queen/csharp/Resources/ComputerMove.txt    |  1 +
 72_Queen/csharp/Resources/Congratulations.txt |  7 +++
 72_Queen/csharp/Resources/Forfeit.txt         |  2 +
 72_Queen/csharp/Resources/IWin.txt            |  4 ++
 72_Queen/csharp/Resources/IllegalMove.txt     |  2 +
 72_Queen/csharp/Resources/IllegalStart.txt    |  3 ++
 72_Queen/csharp/Resources/Instructions.txt    | 16 +++++++
 .../csharp/Resources/InstructionsPrompt.txt   |  1 +
 72_Queen/csharp/Resources/MovePrompt.txt      |  1 +
 72_Queen/csharp/Resources/Resource.cs         | 47 +++++++++++++++++++
 72_Queen/csharp/Resources/StartPrompt.txt     |  1 +
 72_Queen/csharp/Resources/Thanks.txt          |  1 +
 72_Queen/csharp/Resources/Title.txt           |  5 ++
 72_Queen/csharp/Resources/YesyOrNo.txt        |  1 +
 16 files changed, 96 insertions(+)
 create mode 100644 72_Queen/csharp/Program.cs
 create mode 100644 72_Queen/csharp/Resources/AnyonePrompt.txt
 create mode 100644 72_Queen/csharp/Resources/ComputerMove.txt
 create mode 100644 72_Queen/csharp/Resources/Congratulations.txt
 create mode 100644 72_Queen/csharp/Resources/Forfeit.txt
 create mode 100644 72_Queen/csharp/Resources/IWin.txt
 create mode 100644 72_Queen/csharp/Resources/IllegalMove.txt
 create mode 100644 72_Queen/csharp/Resources/IllegalStart.txt
 create mode 100644 72_Queen/csharp/Resources/Instructions.txt
 create mode 100644 72_Queen/csharp/Resources/InstructionsPrompt.txt
 create mode 100644 72_Queen/csharp/Resources/MovePrompt.txt
 create mode 100644 72_Queen/csharp/Resources/Resource.cs
 create mode 100644 72_Queen/csharp/Resources/StartPrompt.txt
 create mode 100644 72_Queen/csharp/Resources/Thanks.txt
 create mode 100644 72_Queen/csharp/Resources/Title.txt
 create mode 100644 72_Queen/csharp/Resources/YesyOrNo.txt

diff --git a/72_Queen/csharp/Program.cs b/72_Queen/csharp/Program.cs
new file mode 100644
index 00000000..0733c377
--- /dev/null
+++ b/72_Queen/csharp/Program.cs
@@ -0,0 +1,3 @@
+using Games.Common.IO;
+
+var io = new ConsoleIO();
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/AnyonePrompt.txt b/72_Queen/csharp/Resources/AnyonePrompt.txt
new file mode 100644
index 00000000..a0289fd6
--- /dev/null
+++ b/72_Queen/csharp/Resources/AnyonePrompt.txt
@@ -0,0 +1 @@
+Anyone else care to try
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/ComputerMove.txt b/72_Queen/csharp/Resources/ComputerMove.txt
new file mode 100644
index 00000000..f31b8e32
--- /dev/null
+++ b/72_Queen/csharp/Resources/ComputerMove.txt
@@ -0,0 +1 @@
+Computer moves to square {0}
diff --git a/72_Queen/csharp/Resources/Congratulations.txt b/72_Queen/csharp/Resources/Congratulations.txt
new file mode 100644
index 00000000..9f1db232
--- /dev/null
+++ b/72_Queen/csharp/Resources/Congratulations.txt
@@ -0,0 +1,7 @@
+
+C O N G R A T U L A T I O N S . . .
+
+You have won--very well played.
+It looks like I have met my match.
+Thanks for playing--I can't win all the time.
+
diff --git a/72_Queen/csharp/Resources/Forfeit.txt b/72_Queen/csharp/Resources/Forfeit.txt
new file mode 100644
index 00000000..120da75d
--- /dev/null
+++ b/72_Queen/csharp/Resources/Forfeit.txt
@@ -0,0 +1,2 @@
+Looks like I have won by forfeit.
+
diff --git a/72_Queen/csharp/Resources/IWin.txt b/72_Queen/csharp/Resources/IWin.txt
new file mode 100644
index 00000000..ced5d716
--- /dev/null
+++ b/72_Queen/csharp/Resources/IWin.txt
@@ -0,0 +1,4 @@
+
+Nice try, but it looks like I have won.
+Thanks for playing.
+
diff --git a/72_Queen/csharp/Resources/IllegalMove.txt b/72_Queen/csharp/Resources/IllegalMove.txt
new file mode 100644
index 00000000..3d31638d
--- /dev/null
+++ b/72_Queen/csharp/Resources/IllegalMove.txt
@@ -0,0 +1,2 @@
+
+Y O U   C H E A T . . .  Try again
diff --git a/72_Queen/csharp/Resources/IllegalStart.txt b/72_Queen/csharp/Resources/IllegalStart.txt
new file mode 100644
index 00000000..25402bb6
--- /dev/null
+++ b/72_Queen/csharp/Resources/IllegalStart.txt
@@ -0,0 +1,3 @@
+Please read the instructions again.
+You have begun illegally.
+
diff --git a/72_Queen/csharp/Resources/Instructions.txt b/72_Queen/csharp/Resources/Instructions.txt
new file mode 100644
index 00000000..d440b335
--- /dev/null
+++ b/72_Queen/csharp/Resources/Instructions.txt
@@ -0,0 +1,16 @@
+We are going to play a game based on one of the chess
+moves.  Our queen will be able to move only to the left,
+down, or diagonally down and to the left.
+
+The object of the game is to place the queen in the lower
+left hand square by alternating moves between you and the
+computer.  The first one to place the queen there wins.
+
+You go first and place the queen in any one of the squares
+on the top row or right hand column.
+That will be your first move.
+We alternate moves.
+You may forfeit by typing '0' as your move.
+Be sure to press the return key after each response.
+
+
diff --git a/72_Queen/csharp/Resources/InstructionsPrompt.txt b/72_Queen/csharp/Resources/InstructionsPrompt.txt
new file mode 100644
index 00000000..0d311b60
--- /dev/null
+++ b/72_Queen/csharp/Resources/InstructionsPrompt.txt
@@ -0,0 +1 @@
+Do you want instructions
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/MovePrompt.txt b/72_Queen/csharp/Resources/MovePrompt.txt
new file mode 100644
index 00000000..8cb18999
--- /dev/null
+++ b/72_Queen/csharp/Resources/MovePrompt.txt
@@ -0,0 +1 @@
+What is your move
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/Resource.cs b/72_Queen/csharp/Resources/Resource.cs
new file mode 100644
index 00000000..5290766e
--- /dev/null
+++ b/72_Queen/csharp/Resources/Resource.cs
@@ -0,0 +1,47 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace Queen.Resources;
+
+internal static class Resource
+{
+    internal static class Streams
+    {
+        public static Stream Title => GetStream();
+        public static Stream Instructions => GetStream();
+        public static Stream YesOrNo => GetStream();
+        public static Stream IllegalStart => GetStream();
+        public static Stream ComputerMove => GetStream();
+        public static Stream IllegalMove => GetStream();
+        public static Stream Forfeit => GetStream();
+        public static Stream IWin => GetStream();
+        public static Stream Congratulations => GetStream();
+        public static Stream Thanks => GetStream();
+    }
+
+    internal static class Prompts
+    {
+        public static string Instructions => GetPrompt();
+        public static string Start => GetPrompt();
+        public static string Move => GetPrompt();
+        public static string Anyone => GetPrompt();
+    }
+
+    internal static class Formats
+    {
+        public static string Balance => GetString();
+    }
+
+    private static string GetPrompt([CallerMemberName] string? name = null) => GetString($"{name}Prompt");
+
+    private static string GetString([CallerMemberName] string? name = null)
+    {
+        using var stream = GetStream(name);
+        using var reader = new StreamReader(stream);
+        return reader.ReadToEnd();
+    }
+
+    private static Stream GetStream([CallerMemberName] string? name = null) =>
+        Assembly.GetExecutingAssembly().GetManifestResourceStream($"{typeof(Resource).Namespace}.{name}.txt")
+            ?? throw new Exception($"Could not find embedded resource stream '{name}'.");
+}
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/StartPrompt.txt b/72_Queen/csharp/Resources/StartPrompt.txt
new file mode 100644
index 00000000..0b6f395b
--- /dev/null
+++ b/72_Queen/csharp/Resources/StartPrompt.txt
@@ -0,0 +1 @@
+Where would you like to start
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/Thanks.txt b/72_Queen/csharp/Resources/Thanks.txt
new file mode 100644
index 00000000..53980b09
--- /dev/null
+++ b/72_Queen/csharp/Resources/Thanks.txt
@@ -0,0 +1 @@
+Ok --- thanks again.
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/Title.txt b/72_Queen/csharp/Resources/Title.txt
new file mode 100644
index 00000000..63549d09
--- /dev/null
+++ b/72_Queen/csharp/Resources/Title.txt
@@ -0,0 +1,5 @@
+                                  Queen
+               Creative Computing  Morristown, New Jersey
+
+
+
diff --git a/72_Queen/csharp/Resources/YesyOrNo.txt b/72_Queen/csharp/Resources/YesyOrNo.txt
new file mode 100644
index 00000000..657bf8aa
--- /dev/null
+++ b/72_Queen/csharp/Resources/YesyOrNo.txt
@@ -0,0 +1 @@
+Please answer 'Yes' or 'No'.

From 29636d5696c8fb97464a6c4d0a5d3add7df1a709 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Wed, 25 Jan 2023 23:01:36 +1100
Subject: [PATCH 097/198] CSHARP-72 Add game intro

---
 72_Queen/csharp/Games.cs                      | 34 +++++++++++++++++++
 72_Queen/csharp/Program.cs                    |  8 +++--
 .../Resources/{YesyOrNo.txt => YesOrNo.txt}   |  0
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 72_Queen/csharp/Games.cs
 rename 72_Queen/csharp/Resources/{YesyOrNo.txt => YesOrNo.txt} (100%)

diff --git a/72_Queen/csharp/Games.cs b/72_Queen/csharp/Games.cs
new file mode 100644
index 00000000..73a0b80b
--- /dev/null
+++ b/72_Queen/csharp/Games.cs
@@ -0,0 +1,34 @@
+namespace Queen;
+
+internal class Game
+{
+    private readonly IReadWrite _io;
+    private readonly IRandom _random;
+
+    public Game(IReadWrite io, IRandom random)
+    {
+        _io = io;
+        _random = random;
+    }
+
+    internal void Play()
+    {
+        _io.Write(Streams.Title);
+        if (_io.ShouldDisplayInstructions()) { _io.Write(Streams.Instructions); }
+    }
+}
+
+internal static class IOExtensions
+{
+    internal static bool ShouldDisplayInstructions(this IReadWrite io)
+    {
+        while (true)
+        {
+            var answer = io.ReadString(Prompts.Instructions).ToLower();
+            if (answer == "yes") { return true; }
+            if (answer == "no") { return false; }
+
+            io.Write(Streams.YesOrNo);
+        }
+    }
+}
diff --git a/72_Queen/csharp/Program.cs b/72_Queen/csharp/Program.cs
index 0733c377..a32aded0 100644
--- a/72_Queen/csharp/Program.cs
+++ b/72_Queen/csharp/Program.cs
@@ -1,3 +1,7 @@
-using Games.Common.IO;
+global using Games.Common.IO;
+global using Games.Common.Randomness;
+global using static Queen.Resources.Resource;
 
-var io = new ConsoleIO();
\ No newline at end of file
+using Queen;
+
+new Game(new ConsoleIO(), new RandomNumberGenerator()).Play();
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/YesyOrNo.txt b/72_Queen/csharp/Resources/YesOrNo.txt
similarity index 100%
rename from 72_Queen/csharp/Resources/YesyOrNo.txt
rename to 72_Queen/csharp/Resources/YesOrNo.txt

From 1c911e9b3055469c6ed1a1e7aad490fbb6a5fbf7 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Fri, 27 Jan 2023 08:32:16 +1100
Subject: [PATCH 098/198] Add replay loop

---
 72_Queen/csharp/Games.cs              | 72 +++++++++++++++++++++++++--
 72_Queen/csharp/Program.cs            |  2 +-
 72_Queen/csharp/Resources/Board.txt   | 26 ++++++++++
 72_Queen/csharp/Resources/Resource.cs |  1 +
 4 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 72_Queen/csharp/Resources/Board.txt

diff --git a/72_Queen/csharp/Games.cs b/72_Queen/csharp/Games.cs
index 73a0b80b..4504c771 100644
--- a/72_Queen/csharp/Games.cs
+++ b/72_Queen/csharp/Games.cs
@@ -1,11 +1,11 @@
 namespace Queen;
 
-internal class Game
+internal class Games
 {
     private readonly IReadWrite _io;
     private readonly IRandom _random;
 
-    public Game(IReadWrite io, IRandom random)
+    public Games(IReadWrite io, IRandom random)
     {
         _io = io;
         _random = random;
@@ -14,21 +14,83 @@ internal class Game
     internal void Play()
     {
         _io.Write(Streams.Title);
-        if (_io.ShouldDisplayInstructions()) { _io.Write(Streams.Instructions); }
+        if (_io.ReadYesNo(Prompts.Instructions)) { _io.Write(Streams.Instructions); }
+
+        while (true)
+        {
+            PlayGame();
+
+            if (!_io.ReadYesNo(Prompts.Anyone))
+            {
+                _io.Write(Streams.Thanks);
+                return;
+            }
+        }
+    }
+
+    internal void PlayGame()
+    {
+        _io.Write(Streams.Board);
+        var humanPosition = _io.ReadPosition(Prompts.Start, p => p.IsStart, Streams.IllegalStart, repeatPrompt: true)
+        if (humanPosition.IsZero)
+        {
+            _io.Write(Streams.Forfeit);
+            return;
+        }
+
+
     }
 }
 
 internal static class IOExtensions
 {
-    internal static bool ShouldDisplayInstructions(this IReadWrite io)
+    internal static bool ReadYesNo(this IReadWrite io, string prompt)
     {
         while (true)
         {
-            var answer = io.ReadString(Prompts.Instructions).ToLower();
+            var answer = io.ReadString(prompt).ToLower();
             if (answer == "yes") { return true; }
             if (answer == "no") { return false; }
 
             io.Write(Streams.YesOrNo);
         }
     }
+
+    internal static Position ReadPosition(
+        this IReadWrite io,
+        string prompt,
+        Predicate<Position> isValid,
+        Stream error,
+        bool repeatPrompt = false)
+    {
+        while (true)
+        {
+            var response = io.ReadNumber(prompt);
+            var number = (int)response;
+            var position = new Position(number);
+            if (number == response && (position.IsZero || isValid(position)))
+            {
+                return position;
+            }
+
+            io.Write(error);
+            if (!repeatPrompt) { prompt = ""; }
+        }
+    }
 }
+
+internal record struct Position(int Diagonal, int Row)
+{
+    public static readonly Position Zero = new(0);
+
+    public Position(int number)
+        : this(Diagonal: number / 10, Row: number % 10)
+    {
+    }
+
+    public bool IsZero => Row == 0 && Diagonal == 0;
+    public bool IsStart => Row == 1 || Row == Diagonal;
+    public bool IsEnd => Row == 8 && Diagonal == 15;
+
+    public override string ToString() => $"{Diagonal}{Row}";
+}
\ No newline at end of file
diff --git a/72_Queen/csharp/Program.cs b/72_Queen/csharp/Program.cs
index a32aded0..a03fe364 100644
--- a/72_Queen/csharp/Program.cs
+++ b/72_Queen/csharp/Program.cs
@@ -4,4 +4,4 @@ global using static Queen.Resources.Resource;
 
 using Queen;
 
-new Game(new ConsoleIO(), new RandomNumberGenerator()).Play();
\ No newline at end of file
+new Games(new ConsoleIO(), new RandomNumberGenerator()).Play();
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/Board.txt b/72_Queen/csharp/Resources/Board.txt
new file mode 100644
index 00000000..45a8ab0a
--- /dev/null
+++ b/72_Queen/csharp/Resources/Board.txt
@@ -0,0 +1,26 @@
+
+ 81  71  61  51  41  31  21  11
+
+
+ 92  82  72  62  52  42  32  22
+
+
+ 103  93  83  73  63  53  43  33
+
+
+ 114  104  94  84  74  64  54  44
+
+
+ 125  115  105  95  85  75  65  55
+
+
+ 136  126  116  106  96  86  76  66
+
+
+ 147  137  127  117  107  97  87  77
+
+
+ 158  148  138  128  118  108  98  88
+
+
+
diff --git a/72_Queen/csharp/Resources/Resource.cs b/72_Queen/csharp/Resources/Resource.cs
index 5290766e..9ff43842 100644
--- a/72_Queen/csharp/Resources/Resource.cs
+++ b/72_Queen/csharp/Resources/Resource.cs
@@ -10,6 +10,7 @@ internal static class Resource
         public static Stream Title => GetStream();
         public static Stream Instructions => GetStream();
         public static Stream YesOrNo => GetStream();
+        public static Stream Board => GetStream();
         public static Stream IllegalStart => GetStream();
         public static Stream ComputerMove => GetStream();
         public static Stream IllegalMove => GetStream();

From 3e88424a5216963e5d0c7c548aae21567d1a4ce0 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper@nearmap.com>
Date: Sat, 28 Jan 2023 15:25:52 +1100
Subject: [PATCH 099/198] Add computer strategy

---
 72_Queen/csharp/Computer.cs                |   0
 72_Queen/csharp/Game.cs                    | 164 +++++++++++++++++++++
 72_Queen/csharp/Games.cs                   |  96 ------------
 72_Queen/csharp/Program.cs                 |   2 +-
 72_Queen/csharp/Resources/Board.txt        |   1 +
 72_Queen/csharp/Resources/Forfeit.txt      |   3 +-
 72_Queen/csharp/Resources/Instructions.txt |   1 -
 72_Queen/csharp/Resources/Thanks.txt       |   2 +
 8 files changed, 170 insertions(+), 99 deletions(-)
 create mode 100644 72_Queen/csharp/Computer.cs
 create mode 100644 72_Queen/csharp/Game.cs
 delete mode 100644 72_Queen/csharp/Games.cs

diff --git a/72_Queen/csharp/Computer.cs b/72_Queen/csharp/Computer.cs
new file mode 100644
index 00000000..e69de29b
diff --git a/72_Queen/csharp/Game.cs b/72_Queen/csharp/Game.cs
new file mode 100644
index 00000000..220e4535
--- /dev/null
+++ b/72_Queen/csharp/Game.cs
@@ -0,0 +1,164 @@
+namespace Queen;
+
+internal class Game
+{
+    private readonly IReadWrite _io;
+    private readonly IRandom _random;
+    private readonly Computer _computer;
+
+    public Game(IReadWrite io, IRandom random)
+    {
+        _io = io;
+        _random = random;
+        _computer = new Computer(random);
+    }
+
+    internal void PlaySeries()
+    {
+        _io.Write(Streams.Title);
+        if (_io.ReadYesNo(Prompts.Instructions)) { _io.Write(Streams.Instructions); }
+
+        while (true)
+        {
+            var result = PlayGame();
+            _io.Write(result switch
+            {
+                Result.HumanForfeits => Streams.Forfeit,
+                Result.HumanWins => Streams.Congratulations,
+                Result.ComputerWins => Streams.IWin,
+                _ => throw new InvalidOperationException($"Unexpected result {result}")
+            });
+
+            if (!_io.ReadYesNo(Prompts.Anyone)) { break; }
+        }
+
+        _io.Write(Streams.Thanks);
+    }
+
+    private Result PlayGame()
+    {
+        _io.Write(Streams.Board);
+        var humanPosition = _io.ReadPosition(Prompts.Start, p => p.IsStart, Streams.IllegalStart, repeatPrompt: true);
+        if (humanPosition.IsZero) { return Result.HumanForfeits; }
+
+        while (true)
+        {
+            var computerPosition = _computer.GetMove(humanPosition);
+            if (computerPosition.IsEnd) { return Result.ComputerWins; }
+        }
+
+    }
+
+    private enum Result { ComputerWins, HumanWins, HumanForfeits };
+}
+
+internal class Computer
+{
+    private static readonly HashSet<Position> _randomiseFrom = new() { 41, 44, 73, 75, 126, 127 };
+    private static readonly HashSet<Position> _desirable = new() { 73, 75, 126, 127, 158 };
+    private readonly IRandom _random;
+
+    public Computer(IRandom random)
+    {
+        _random = random;
+    }
+
+    public Position GetMove(Position from)
+        => from + (_randomiseFrom.Contains(from) ? _random.NextMove() : FindMove(from));
+
+    private Move FindMove(Position from)
+    {
+        for (int i = 7; i > 0; i--)
+        {
+            if (IsOptimal(Move.Left, out var move)) { return move; }
+            if (IsOptimal(Move.Down, out move)) { return move; }
+            if (IsOptimal(Move.DownLeft, out move)) { return move; }
+
+            bool IsOptimal(Move direction, out Move move)
+            {
+                move = direction * i;
+                return _desirable.Contains(from + move);
+            }
+        }
+
+        return _random.NextMove();
+    }
+}
+
+internal static class IOExtensions
+{
+    internal static bool ReadYesNo(this IReadWrite io, string prompt)
+    {
+        while (true)
+        {
+            var answer = io.ReadString(prompt).ToLower();
+            if (answer == "yes") { return true; }
+            if (answer == "no") { return false; }
+
+            io.Write(Streams.YesOrNo);
+        }
+    }
+
+    internal static Position ReadPosition(
+        this IReadWrite io,
+        string prompt,
+        Predicate<Position> isValid,
+        Stream error,
+        bool repeatPrompt = false)
+    {
+        while (true)
+        {
+            var response = io.ReadNumber(prompt);
+            var number = (int)response;
+            var position = new Position(number);
+            if (number == response && (position.IsZero || isValid(position)))
+            {
+                return position;
+            }
+
+            io.Write(error);
+            if (!repeatPrompt) { prompt = ""; }
+        }
+    }
+}
+
+internal record struct Position(int Diagonal, int Row)
+{
+    public static readonly Position Zero = new(0);
+
+    public Position(int number)
+        : this(Diagonal: number / 10, Row: number % 10)
+    {
+    }
+
+    public bool IsZero => Row == 0 && Diagonal == 0;
+    public bool IsStart => Row == 1 || Row == Diagonal;
+    public bool IsEnd => Row == 8 && Diagonal == 15;
+
+    public override string ToString() => $"{Diagonal}{Row}";
+
+    public static implicit operator Position(int value) => new(value);
+
+    public static Position operator +(Position position, Move move)
+        => new(Diagonal: position.Diagonal + move.Diagonal, Row: position.Row + move.Row);
+}
+
+internal static class RandomExtensions
+{
+    internal static Move NextMove(this IRandom random)
+        => random.NextFloat() switch
+        {
+            > 0.6F => Move.Down,
+            > 0.3F => Move.DownLeft,
+            _ => Move.Left
+        };
+}
+
+internal record struct Move(int Diagonal, int Row)
+{
+    public static readonly Move Left = new(1, 0);
+    public static readonly Move DownLeft = new(2, 1);
+    public static readonly Move Down = new(1, 1);
+
+    public static Move operator *(Move move, int scale) => new(move.Diagonal * scale, move.Row * scale);
+}
\ No newline at end of file
diff --git a/72_Queen/csharp/Games.cs b/72_Queen/csharp/Games.cs
deleted file mode 100644
index 4504c771..00000000
--- a/72_Queen/csharp/Games.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-namespace Queen;
-
-internal class Games
-{
-    private readonly IReadWrite _io;
-    private readonly IRandom _random;
-
-    public Games(IReadWrite io, IRandom random)
-    {
-        _io = io;
-        _random = random;
-    }
-
-    internal void Play()
-    {
-        _io.Write(Streams.Title);
-        if (_io.ReadYesNo(Prompts.Instructions)) { _io.Write(Streams.Instructions); }
-
-        while (true)
-        {
-            PlayGame();
-
-            if (!_io.ReadYesNo(Prompts.Anyone))
-            {
-                _io.Write(Streams.Thanks);
-                return;
-            }
-        }
-    }
-
-    internal void PlayGame()
-    {
-        _io.Write(Streams.Board);
-        var humanPosition = _io.ReadPosition(Prompts.Start, p => p.IsStart, Streams.IllegalStart, repeatPrompt: true)
-        if (humanPosition.IsZero)
-        {
-            _io.Write(Streams.Forfeit);
-            return;
-        }
-
-
-    }
-}
-
-internal static class IOExtensions
-{
-    internal static bool ReadYesNo(this IReadWrite io, string prompt)
-    {
-        while (true)
-        {
-            var answer = io.ReadString(prompt).ToLower();
-            if (answer == "yes") { return true; }
-            if (answer == "no") { return false; }
-
-            io.Write(Streams.YesOrNo);
-        }
-    }
-
-    internal static Position ReadPosition(
-        this IReadWrite io,
-        string prompt,
-        Predicate<Position> isValid,
-        Stream error,
-        bool repeatPrompt = false)
-    {
-        while (true)
-        {
-            var response = io.ReadNumber(prompt);
-            var number = (int)response;
-            var position = new Position(number);
-            if (number == response && (position.IsZero || isValid(position)))
-            {
-                return position;
-            }
-
-            io.Write(error);
-            if (!repeatPrompt) { prompt = ""; }
-        }
-    }
-}
-
-internal record struct Position(int Diagonal, int Row)
-{
-    public static readonly Position Zero = new(0);
-
-    public Position(int number)
-        : this(Diagonal: number / 10, Row: number % 10)
-    {
-    }
-
-    public bool IsZero => Row == 0 && Diagonal == 0;
-    public bool IsStart => Row == 1 || Row == Diagonal;
-    public bool IsEnd => Row == 8 && Diagonal == 15;
-
-    public override string ToString() => $"{Diagonal}{Row}";
-}
\ No newline at end of file
diff --git a/72_Queen/csharp/Program.cs b/72_Queen/csharp/Program.cs
index a03fe364..5e017df6 100644
--- a/72_Queen/csharp/Program.cs
+++ b/72_Queen/csharp/Program.cs
@@ -4,4 +4,4 @@ global using static Queen.Resources.Resource;
 
 using Queen;
 
-new Games(new ConsoleIO(), new RandomNumberGenerator()).Play();
\ No newline at end of file
+new Game(new ConsoleIO(), new RandomNumberGenerator()).PlaySeries();
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/Board.txt b/72_Queen/csharp/Resources/Board.txt
index 45a8ab0a..854be1bb 100644
--- a/72_Queen/csharp/Resources/Board.txt
+++ b/72_Queen/csharp/Resources/Board.txt
@@ -1,4 +1,5 @@
 
+ 
  81  71  61  51  41  31  21  11
 
 
diff --git a/72_Queen/csharp/Resources/Forfeit.txt b/72_Queen/csharp/Resources/Forfeit.txt
index 120da75d..09858bc1 100644
--- a/72_Queen/csharp/Resources/Forfeit.txt
+++ b/72_Queen/csharp/Resources/Forfeit.txt
@@ -1,2 +1,3 @@
-Looks like I have won by forfeit.
+
+It looks like I have won by forfeit.
 
diff --git a/72_Queen/csharp/Resources/Instructions.txt b/72_Queen/csharp/Resources/Instructions.txt
index d440b335..fc2e85b0 100644
--- a/72_Queen/csharp/Resources/Instructions.txt
+++ b/72_Queen/csharp/Resources/Instructions.txt
@@ -13,4 +13,3 @@ We alternate moves.
 You may forfeit by typing '0' as your move.
 Be sure to press the return key after each response.
 
-
diff --git a/72_Queen/csharp/Resources/Thanks.txt b/72_Queen/csharp/Resources/Thanks.txt
index 53980b09..2e2e7b63 100644
--- a/72_Queen/csharp/Resources/Thanks.txt
+++ b/72_Queen/csharp/Resources/Thanks.txt
@@ -1 +1,3 @@
+
+
 Ok --- thanks again.
\ No newline at end of file

From 3f2dd9f0a90c86307cf2da0b9038d7021d653ae7 Mon Sep 17 00:00:00 2001
From: drewjcooper <drew.j.cooper@gmail.com>
Date: Sat, 28 Jan 2023 16:30:49 +1100
Subject: [PATCH 100/198] Complete game

---
 72_Queen/csharp/Computer.cs               |  34 +++++++
 72_Queen/csharp/Game.cs                   | 117 +---------------------
 72_Queen/csharp/IOExtensions.cs           |  38 +++++++
 72_Queen/csharp/Move.cs                   |  15 +++
 72_Queen/csharp/Position.cs               |  24 +++++
 72_Queen/csharp/RandomExtensions.cs       |  12 +++
 72_Queen/csharp/Resources/IllegalMove.txt |   2 +-
 72_Queen/csharp/Resources/Resource.cs     |   5 +-
 8 files changed, 131 insertions(+), 116 deletions(-)
 create mode 100644 72_Queen/csharp/IOExtensions.cs
 create mode 100644 72_Queen/csharp/Move.cs
 create mode 100644 72_Queen/csharp/Position.cs
 create mode 100644 72_Queen/csharp/RandomExtensions.cs

diff --git a/72_Queen/csharp/Computer.cs b/72_Queen/csharp/Computer.cs
index e69de29b..459c7337 100644
--- a/72_Queen/csharp/Computer.cs
+++ b/72_Queen/csharp/Computer.cs
@@ -0,0 +1,34 @@
+namespace Queen;
+
+internal class Computer
+{
+    private static readonly HashSet<Position> _randomiseFrom = new() { 41, 44, 73, 75, 126, 127 };
+    private static readonly HashSet<Position> _desirable = new() { 73, 75, 126, 127, 158 };
+    private readonly IRandom _random;
+
+    public Computer(IRandom random)
+    {
+        _random = random;
+    }
+
+    public Position GetMove(Position from)
+        => from + (_randomiseFrom.Contains(from) ? _random.NextMove() : FindMove(from));
+
+    private Move FindMove(Position from)
+    {
+        for (int i = 7; i > 0; i--)
+        {
+            if (IsOptimal(Move.Left, out var move)) { return move; }
+            if (IsOptimal(Move.Down, out move)) { return move; }
+            if (IsOptimal(Move.DownLeft, out move)) { return move; }
+
+            bool IsOptimal(Move direction, out Move move)
+            {
+                move = direction * i;
+                return _desirable.Contains(from + move);
+            }
+        }
+
+        return _random.NextMove();
+    }
+}
diff --git a/72_Queen/csharp/Game.cs b/72_Queen/csharp/Game.cs
index 220e4535..35b1dc9a 100644
--- a/72_Queen/csharp/Game.cs
+++ b/72_Queen/csharp/Game.cs
@@ -44,121 +44,14 @@ internal class Game
         while (true)
         {
             var computerPosition = _computer.GetMove(humanPosition);
+            _io.Write(Strings.ComputerMove(computerPosition));
             if (computerPosition.IsEnd) { return Result.ComputerWins; }
-        }
 
+            humanPosition = _io.ReadPosition(Prompts.Move, p => (p - computerPosition).IsValid, Streams.IllegalMove);
+            if (humanPosition.IsZero) { return Result.HumanForfeits; }
+            if (humanPosition.IsEnd) { return Result.HumanWins; }
+        }
     }
 
     private enum Result { ComputerWins, HumanWins, HumanForfeits };
 }
-
-internal class Computer
-{
-    private static readonly HashSet<Position> _randomiseFrom = new() { 41, 44, 73, 75, 126, 127 };
-    private static readonly HashSet<Position> _desirable = new() { 73, 75, 126, 127, 158 };
-    private readonly IRandom _random;
-
-    public Computer(IRandom random)
-    {
-        _random = random;
-    }
-
-    public Position GetMove(Position from)
-        => from + (_randomiseFrom.Contains(from) ? _random.NextMove() : FindMove(from));
-
-    private Move FindMove(Position from)
-    {
-        for (int i = 7; i > 0; i--)
-        {
-            if (IsOptimal(Move.Left, out var move)) { return move; }
-            if (IsOptimal(Move.Down, out move)) { return move; }
-            if (IsOptimal(Move.DownLeft, out move)) { return move; }
-
-            bool IsOptimal(Move direction, out Move move)
-            {
-                move = direction * i;
-                return _desirable.Contains(from + move);
-            }
-        }
-
-        return _random.NextMove();
-    }
-}
-
-internal static class IOExtensions
-{
-    internal static bool ReadYesNo(this IReadWrite io, string prompt)
-    {
-        while (true)
-        {
-            var answer = io.ReadString(prompt).ToLower();
-            if (answer == "yes") { return true; }
-            if (answer == "no") { return false; }
-
-            io.Write(Streams.YesOrNo);
-        }
-    }
-
-    internal static Position ReadPosition(
-        this IReadWrite io,
-        string prompt,
-        Predicate<Position> isValid,
-        Stream error,
-        bool repeatPrompt = false)
-    {
-        while (true)
-        {
-            var response = io.ReadNumber(prompt);
-            var number = (int)response;
-            var position = new Position(number);
-            if (number == response && (position.IsZero || isValid(position)))
-            {
-                return position;
-            }
-
-            io.Write(error);
-            if (!repeatPrompt) { prompt = ""; }
-        }
-    }
-}
-
-internal record struct Position(int Diagonal, int Row)
-{
-    public static readonly Position Zero = new(0);
-
-    public Position(int number)
-        : this(Diagonal: number / 10, Row: number % 10)
-    {
-    }
-
-    public bool IsZero => Row == 0 && Diagonal == 0;
-    public bool IsStart => Row == 1 || Row == Diagonal;
-    public bool IsEnd => Row == 8 && Diagonal == 15;
-
-    public override string ToString() => $"{Diagonal}{Row}";
-
-    public static implicit operator Position(int value) => new(value);
-
-    public static Position operator +(Position position, Move move)
-        => new(Diagonal: position.Diagonal + move.Diagonal, Row: position.Row + move.Row);
-}
-
-internal static class RandomExtensions
-{
-    internal static Move NextMove(this IRandom random)
-        => random.NextFloat() switch
-        {
-            > 0.6F => Move.Down,
-            > 0.3F => Move.DownLeft,
-            _ => Move.Left
-        };
-}
-
-internal record struct Move(int Diagonal, int Row)
-{
-    public static readonly Move Left = new(1, 0);
-    public static readonly Move DownLeft = new(2, 1);
-    public static readonly Move Down = new(1, 1);
-
-    public static Move operator *(Move move, int scale) => new(move.Diagonal * scale, move.Row * scale);
-}
\ No newline at end of file
diff --git a/72_Queen/csharp/IOExtensions.cs b/72_Queen/csharp/IOExtensions.cs
new file mode 100644
index 00000000..51959967
--- /dev/null
+++ b/72_Queen/csharp/IOExtensions.cs
@@ -0,0 +1,38 @@
+namespace Queen;
+
+internal static class IOExtensions
+{
+    internal static bool ReadYesNo(this IReadWrite io, string prompt)
+    {
+        while (true)
+        {
+            var answer = io.ReadString(prompt).ToLower();
+            if (answer == "yes") { return true; }
+            if (answer == "no") { return false; }
+
+            io.Write(Streams.YesOrNo);
+        }
+    }
+
+    internal static Position ReadPosition(
+        this IReadWrite io,
+        string prompt,
+        Predicate<Position> isValid,
+        Stream error,
+        bool repeatPrompt = false)
+    {
+        while (true)
+        {
+            var response = io.ReadNumber(prompt);
+            var number = (int)response;
+            var position = new Position(number);
+            if (number == response && (position.IsZero || isValid(position)))
+            {
+                return position;
+            }
+
+            io.Write(error);
+            if (!repeatPrompt) { prompt = ""; }
+        }
+    }
+}
diff --git a/72_Queen/csharp/Move.cs b/72_Queen/csharp/Move.cs
new file mode 100644
index 00000000..4e18647b
--- /dev/null
+++ b/72_Queen/csharp/Move.cs
@@ -0,0 +1,15 @@
+namespace Queen;
+
+internal record struct Move(int Diagonal, int Row)
+{
+    public static readonly Move Left = new(1, 0);
+    public static readonly Move DownLeft = new(2, 1);
+    public static readonly Move Down = new(1, 1);
+
+    public bool IsValid => Diagonal > 0 && (IsLeft || IsDown || IsDownLeft);
+    private bool IsLeft => Row == 0;
+    private bool IsDown => Row == Diagonal;
+    private bool IsDownLeft => Row * 2 == Diagonal;
+
+    public static Move operator *(Move move, int scale) => new(move.Diagonal * scale, move.Row * scale);
+}
\ No newline at end of file
diff --git a/72_Queen/csharp/Position.cs b/72_Queen/csharp/Position.cs
new file mode 100644
index 00000000..69971163
--- /dev/null
+++ b/72_Queen/csharp/Position.cs
@@ -0,0 +1,24 @@
+namespace Queen;
+
+internal record struct Position(int Diagonal, int Row)
+{
+    public static readonly Position Zero = new(0);
+
+    public Position(int number)
+        : this(Diagonal: number / 10, Row: number % 10)
+    {
+    }
+
+    public bool IsZero => Row == 0 && Diagonal == 0;
+    public bool IsStart => Row == 1 || Row == Diagonal;
+    public bool IsEnd => Row == 8 && Diagonal == 15;
+
+    public override string ToString() => $"{Diagonal}{Row}";
+
+    public static implicit operator Position(int value) => new(value);
+
+    public static Position operator +(Position position, Move move)
+        => new(Diagonal: position.Diagonal + move.Diagonal, Row: position.Row + move.Row);
+    public static Move operator -(Position to, Position from)
+        => new(Diagonal: to.Diagonal - from.Diagonal, Row: to.Row - from.Row);
+}
diff --git a/72_Queen/csharp/RandomExtensions.cs b/72_Queen/csharp/RandomExtensions.cs
new file mode 100644
index 00000000..b4e375fd
--- /dev/null
+++ b/72_Queen/csharp/RandomExtensions.cs
@@ -0,0 +1,12 @@
+namespace Queen;
+
+internal static class RandomExtensions
+{
+    internal static Move NextMove(this IRandom random)
+        => random.NextFloat() switch
+        {
+            > 0.6F => Move.Down,
+            > 0.3F => Move.DownLeft,
+            _ => Move.Left
+        };
+}
diff --git a/72_Queen/csharp/Resources/IllegalMove.txt b/72_Queen/csharp/Resources/IllegalMove.txt
index 3d31638d..ae4a3bbc 100644
--- a/72_Queen/csharp/Resources/IllegalMove.txt
+++ b/72_Queen/csharp/Resources/IllegalMove.txt
@@ -1,2 +1,2 @@
 
-Y O U   C H E A T . . .  Try again
+Y O U   C H E A T . . .  Try again
\ No newline at end of file
diff --git a/72_Queen/csharp/Resources/Resource.cs b/72_Queen/csharp/Resources/Resource.cs
index 9ff43842..e8297eca 100644
--- a/72_Queen/csharp/Resources/Resource.cs
+++ b/72_Queen/csharp/Resources/Resource.cs
@@ -12,7 +12,6 @@ internal static class Resource
         public static Stream YesOrNo => GetStream();
         public static Stream Board => GetStream();
         public static Stream IllegalStart => GetStream();
-        public static Stream ComputerMove => GetStream();
         public static Stream IllegalMove => GetStream();
         public static Stream Forfeit => GetStream();
         public static Stream IWin => GetStream();
@@ -28,9 +27,9 @@ internal static class Resource
         public static string Anyone => GetPrompt();
     }
 
-    internal static class Formats
+    internal static class Strings
     {
-        public static string Balance => GetString();
+        public static string ComputerMove(Position position) => string.Format(GetString(), position);
     }
 
     private static string GetPrompt([CallerMemberName] string? name = null) => GetString($"{name}Prompt");

From 487b7ded98a91ed1a716648210fec038a30183a7 Mon Sep 17 00:00:00 2001
From: drewjcooper <drew.j.cooper@gmail.com>
Date: Tue, 31 Jan 2023 07:40:47 +1100
Subject: [PATCH 101/198] Configure project

---
 75_Roulette/csharp/Roulette.csproj | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/75_Roulette/csharp/Roulette.csproj b/75_Roulette/csharp/Roulette.csproj
index d3fe4757..23d27b76 100644
--- a/75_Roulette/csharp/Roulette.csproj
+++ b/75_Roulette/csharp/Roulette.csproj
@@ -1,9 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>10</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources/*.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\00_Common\dotnet\Games.Common\Games.Common.csproj" />
+  </ItemGroup>
 </Project>

From 2d562f6051512b767225ea10bdb4a597926e22bf Mon Sep 17 00:00:00 2001
From: gilssonn <gilsonnyirimana@gmail.com>
Date: Sat, 4 Feb 2023 01:14:20 -0500
Subject: [PATCH 102/198] C++ Implementation of Sine Wave

---
 .../78_Sine_Wave/C++/README.md                |  3 +++
 .../78_Sine_Wave/C++/sinewave.cpp             | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 00_Alternate_Languages/78_Sine_Wave/C++/README.md
 create mode 100644 00_Alternate_Languages/78_Sine_Wave/C++/sinewave.cpp

diff --git a/00_Alternate_Languages/78_Sine_Wave/C++/README.md b/00_Alternate_Languages/78_Sine_Wave/C++/README.md
new file mode 100644
index 00000000..b62763ff
--- /dev/null
+++ b/00_Alternate_Languages/78_Sine_Wave/C++/README.md
@@ -0,0 +1,3 @@
+Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
+
+Conversion to [C++17](https://en.wikipedia.org/wiki/C%2B%2B17)
\ No newline at end of file
diff --git a/00_Alternate_Languages/78_Sine_Wave/C++/sinewave.cpp b/00_Alternate_Languages/78_Sine_Wave/C++/sinewave.cpp
new file mode 100644
index 00000000..9d274e56
--- /dev/null
+++ b/00_Alternate_Languages/78_Sine_Wave/C++/sinewave.cpp
@@ -0,0 +1,21 @@
+#include <iostream> // std::cout, std::endl
+#include <string>	// std::string(size_t n, char c)
+#include <cmath>	// std::sin(double x)
+
+int main()
+{
+	std::cout << std::string(30, ' ') << "SINE WAVE" << std::endl;
+	std::cout << std::string(15, ' ') << "CREATIVE COMPUTING MORRISTOWN, NEW JERSEY" << std::endl;
+	std::cout << std::string(5, '\n');
+
+	bool b = true;
+
+	for (double t = 0.0; t <= 40.0; t += 0.25)
+	{
+		int a = int(26 + 25 * std::sin(t));
+		std::cout << std::string(a, ' ') << (b ? "CREATIVE" : "COMPUTING") << std::endl;
+		b = !b;
+	}
+
+	return 0;
+}

From 3c9c04429d73109999eb17953d5084a6c168cc3c Mon Sep 17 00:00:00 2001
From: drewjcooper <drew.j.cooper@gmail.com>
Date: Sun, 5 Feb 2023 19:05:23 +1100
Subject: [PATCH 103/198] Add string resources

---
 75_Roulette/csharp/Resources/AgainPrompt.txt  |  0
 75_Roulette/csharp/Resources/BetAlready.txt   |  1 +
 75_Roulette/csharp/Resources/BetPrompt.txt    |  1 +
 75_Roulette/csharp/Resources/BrokeHouse.txt   |  1 +
 75_Roulette/csharp/Resources/Check.txt        | 14 +++++
 75_Roulette/csharp/Resources/CheckPrompt.txt  |  1 +
 .../csharp/Resources/HowManyBetsPrompt.txt    |  1 +
 75_Roulette/csharp/Resources/Instructions.txt | 48 +++++++++++++++
 .../csharp/Resources/InstructionsPrompt.txt   |  1 +
 75_Roulette/csharp/Resources/LastDollar.txt   |  1 +
 75_Roulette/csharp/Resources/Outcome.txt      |  1 +
 75_Roulette/csharp/Resources/Resource.cs      | 59 +++++++++++++++++++
 75_Roulette/csharp/Resources/Slot.txt         |  2 +
 75_Roulette/csharp/Resources/Spinning.txt     |  3 +
 75_Roulette/csharp/Resources/Thanks.txt       |  3 +
 75_Roulette/csharp/Resources/Title.txt        |  7 +++
 75_Roulette/csharp/Resources/Totals.txt       |  2 +
 17 files changed, 146 insertions(+)
 create mode 100644 75_Roulette/csharp/Resources/AgainPrompt.txt
 create mode 100644 75_Roulette/csharp/Resources/BetAlready.txt
 create mode 100644 75_Roulette/csharp/Resources/BetPrompt.txt
 create mode 100644 75_Roulette/csharp/Resources/BrokeHouse.txt
 create mode 100644 75_Roulette/csharp/Resources/Check.txt
 create mode 100644 75_Roulette/csharp/Resources/CheckPrompt.txt
 create mode 100644 75_Roulette/csharp/Resources/HowManyBetsPrompt.txt
 create mode 100644 75_Roulette/csharp/Resources/Instructions.txt
 create mode 100644 75_Roulette/csharp/Resources/InstructionsPrompt.txt
 create mode 100644 75_Roulette/csharp/Resources/LastDollar.txt
 create mode 100644 75_Roulette/csharp/Resources/Outcome.txt
 create mode 100644 75_Roulette/csharp/Resources/Resource.cs
 create mode 100644 75_Roulette/csharp/Resources/Slot.txt
 create mode 100644 75_Roulette/csharp/Resources/Spinning.txt
 create mode 100644 75_Roulette/csharp/Resources/Thanks.txt
 create mode 100644 75_Roulette/csharp/Resources/Title.txt
 create mode 100644 75_Roulette/csharp/Resources/Totals.txt

diff --git a/75_Roulette/csharp/Resources/AgainPrompt.txt b/75_Roulette/csharp/Resources/AgainPrompt.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/75_Roulette/csharp/Resources/BetAlready.txt b/75_Roulette/csharp/Resources/BetAlready.txt
new file mode 100644
index 00000000..be86cbea
--- /dev/null
+++ b/75_Roulette/csharp/Resources/BetAlready.txt
@@ -0,0 +1 @@
+You made that bet once already,dum-dum
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/BetPrompt.txt b/75_Roulette/csharp/Resources/BetPrompt.txt
new file mode 100644
index 00000000..50039840
--- /dev/null
+++ b/75_Roulette/csharp/Resources/BetPrompt.txt
@@ -0,0 +1 @@
+Number {0} 
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/BrokeHouse.txt b/75_Roulette/csharp/Resources/BrokeHouse.txt
new file mode 100644
index 00000000..638dafb4
--- /dev/null
+++ b/75_Roulette/csharp/Resources/BrokeHouse.txt
@@ -0,0 +1 @@
+You broke the house!
diff --git a/75_Roulette/csharp/Resources/Check.txt b/75_Roulette/csharp/Resources/Check.txt
new file mode 100644
index 00000000..f2be95cd
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Check.txt
@@ -0,0 +1,14 @@
+------------------------------------------------------------------------Check No.  {0}
+
+                                        {1:mmmm d',' yyyy}
+
+
+Pay to the order of-----{2}-----$  {3}
+
+
+              The Memory Bank of New YORK
+
+                                          The Computer
+                                        ----------X-----
+
+--------------------------------------------------------------Come back soon!
diff --git a/75_Roulette/csharp/Resources/CheckPrompt.txt b/75_Roulette/csharp/Resources/CheckPrompt.txt
new file mode 100644
index 00000000..16321fe9
--- /dev/null
+++ b/75_Roulette/csharp/Resources/CheckPrompt.txt
@@ -0,0 +1 @@
+To whom shall I make the check
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/HowManyBetsPrompt.txt b/75_Roulette/csharp/Resources/HowManyBetsPrompt.txt
new file mode 100644
index 00000000..0b6abdfa
--- /dev/null
+++ b/75_Roulette/csharp/Resources/HowManyBetsPrompt.txt
@@ -0,0 +1 @@
+How many bets
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/Instructions.txt b/75_Roulette/csharp/Resources/Instructions.txt
new file mode 100644
index 00000000..8ced724b
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Instructions.txt
@@ -0,0 +1,48 @@
+
+This is the betting layout
+  (*=RED)
+
+ 1*    2     3*
+ 4     5*    6 
+ 7*    8     9*
+10    11    12*
+---------------
+13    14*   15 
+16*   17    18*
+19*   20    21*
+22    23*   24 
+---------------
+25*   26    27*
+28    29    30*
+31    32*   33 
+34*   35    36*
+---------------
+    00    0    
+
+Types of bets
+
+The numbers 1 to 36 signify a straight bet
+on that number.
+These pay off 35:1
+
+The 2:1 bets are:
+ 37) 1-12     40) First column
+ 38) 13-24    41) Second column
+ 39) 25-36    42) Third column
+
+The even money bets are:
+ 43) 1-18     46) Odd
+ 44) 19-36    47) Red
+ 45) Even     48) Black
+
+49)0 and 50)00 pay off 35:1
+Note: 0 and 00 do not count under any
+      bets except their own.
+
+When I ask for each bet, type the number
+and the amount, separated by a comma.
+For example: to bet $500 on Black, type 48,500
+when I ask for a bet.
+
+The minimum bet is $5, the maximum is $500.
+
diff --git a/75_Roulette/csharp/Resources/InstructionsPrompt.txt b/75_Roulette/csharp/Resources/InstructionsPrompt.txt
new file mode 100644
index 00000000..0d311b60
--- /dev/null
+++ b/75_Roulette/csharp/Resources/InstructionsPrompt.txt
@@ -0,0 +1 @@
+Do you want instructions
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/LastDollar.txt b/75_Roulette/csharp/Resources/LastDollar.txt
new file mode 100644
index 00000000..632516de
--- /dev/null
+++ b/75_Roulette/csharp/Resources/LastDollar.txt
@@ -0,0 +1 @@
+Oops! you just spent your last dollar!
diff --git a/75_Roulette/csharp/Resources/Outcome.txt b/75_Roulette/csharp/Resources/Outcome.txt
new file mode 100644
index 00000000..7926cb87
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Outcome.txt
@@ -0,0 +1 @@
+You {0} {1} dollars on bet {2}
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/Resource.cs b/75_Roulette/csharp/Resources/Resource.cs
new file mode 100644
index 00000000..aca0aaf5
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Resource.cs
@@ -0,0 +1,59 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Games.Common.Randomness;
+
+namespace Roulette.Resources;
+
+internal static class Resource
+{
+    internal static class Streams
+    {
+        public static Stream Title => GetStream();
+        public static Stream Instructions => GetStream();
+        public static Stream BetAlready => GetStream();
+        public static Stream Spinning => GetStream();
+        public static Stream LastDollar => GetStream();
+        public static Stream BrokeHouse => GetStream();
+        public static Stream Thanks => GetStream();
+    }
+
+    internal static class Strings
+    {
+        public static string Black(int number) => Slot(number);
+        public static string Red(int number) => Slot(number);
+        private static string Slot(int number, [CallerMemberName] string? colour = null)
+            => string.Format(GetString(), number, colour);
+
+        public static string Lose(int amount, int bet) => Outcome(amount, bet);
+        public static string Win(int amount, int bet) => Outcome(amount, bet);
+        private static string Outcome(int amount, int bet, [CallerMemberName] string? winlose = null)
+            => string.Format(GetString(), winlose, amount, bet);
+
+        public static string Totals(int me, int you) => string.Format(GetString(), me, you);
+
+        public static string Check(IRandom random, string payee, int amount)
+            => string.Format(GetString(), random.Next(100), DateTime.Now, payee, amount);
+    }
+
+    internal static class Prompts
+    {
+        public static string Instructions => GetPrompt();
+        public static string HowManyBets => GetPrompt();
+        public static string Bet(int number) => string.Format(GetPrompt(), number);
+        public static string Again => GetPrompt();
+        public static string Check => GetPrompt();
+    }
+
+    private static string GetPrompt([CallerMemberName] string? name = null) => GetString($"{name}Prompt");
+
+    private static string GetString([CallerMemberName] string? name = null)
+    {
+        using var stream = GetStream(name);
+        using var reader = new StreamReader(stream);
+        return reader.ReadToEnd();
+    }
+
+    private static Stream GetStream([CallerMemberName] string? name = null) =>
+        Assembly.GetExecutingAssembly().GetManifestResourceStream($"{typeof(Resource).Namespace}.{name}.txt")
+            ?? throw new Exception($"Could not find embedded resource stream '{name}'.");
+}
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/Slot.txt b/75_Roulette/csharp/Resources/Slot.txt
new file mode 100644
index 00000000..d45e103b
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Slot.txt
@@ -0,0 +1,2 @@
+ {0} {1}
+ 
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/Spinning.txt b/75_Roulette/csharp/Resources/Spinning.txt
new file mode 100644
index 00000000..13514a0a
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Spinning.txt
@@ -0,0 +1,3 @@
+SPINNING
+
+
diff --git a/75_Roulette/csharp/Resources/Thanks.txt b/75_Roulette/csharp/Resources/Thanks.txt
new file mode 100644
index 00000000..0b835237
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Thanks.txt
@@ -0,0 +1,3 @@
+Thanks for you money.
+I'll use it to buy a solid gold roulette WHEEL
+
diff --git a/75_Roulette/csharp/Resources/Title.txt b/75_Roulette/csharp/Resources/Title.txt
new file mode 100644
index 00000000..0d53f1a8
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Title.txt
@@ -0,0 +1,7 @@
+                                Roulette
+               Creative Computing  Morristown, New Jersey
+
+
+
+Welcome to the roulette table
+
diff --git a/75_Roulette/csharp/Resources/Totals.txt b/75_Roulette/csharp/Resources/Totals.txt
new file mode 100644
index 00000000..26f35724
--- /dev/null
+++ b/75_Roulette/csharp/Resources/Totals.txt
@@ -0,0 +1,2 @@
+Totals        Me            You
+               {0,-14}{1}

From 9a1e8e88752b26c3b3e3c7c7d1adccd9806b4b1b Mon Sep 17 00:00:00 2001
From: drewjcooper <drew.j.cooper@gmail.com>
Date: Sun, 5 Feb 2023 21:28:51 +1100
Subject: [PATCH 104/198] Add game start

---
 75_Roulette/csharp/Game.cs    | 18 ++++++++++++++++++
 75_Roulette/csharp/Program.cs |  6 ++++++
 2 files changed, 24 insertions(+)
 create mode 100644 75_Roulette/csharp/Game.cs
 create mode 100644 75_Roulette/csharp/Program.cs

diff --git a/75_Roulette/csharp/Game.cs b/75_Roulette/csharp/Game.cs
new file mode 100644
index 00000000..efb4b966
--- /dev/null
+++ b/75_Roulette/csharp/Game.cs
@@ -0,0 +1,18 @@
+namespace Roulette;
+
+internal class Game
+{
+    private readonly IReadWrite _io;
+    private readonly IRandom _random;
+
+    public Game(IReadWrite io, IRandom random)
+    {
+        _io = io;
+        _random = random;
+    }
+
+    public void Play()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/75_Roulette/csharp/Program.cs b/75_Roulette/csharp/Program.cs
new file mode 100644
index 00000000..4be74962
--- /dev/null
+++ b/75_Roulette/csharp/Program.cs
@@ -0,0 +1,6 @@
+global using Games.Common.IO;
+global using Games.Common.Randomness;
+global using static Roulette.Resources.Resource;
+using Roulette;
+
+new Game(new ConsoleIO(), new RandomNumberGenerator()).Play();

From 25dba634c5f80d33d4d0af458ce2e288696a73b9 Mon Sep 17 00:00:00 2001
From: drewjcooper <drew.j.cooper@gmail.com>
Date: Sun, 5 Feb 2023 22:47:02 +1100
Subject: [PATCH 105/198] Add game loop and objects

---
 75_Roulette/csharp/Game.cs | 140 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 139 insertions(+), 1 deletion(-)

diff --git a/75_Roulette/csharp/Game.cs b/75_Roulette/csharp/Game.cs
index efb4b966..c9570ca1 100644
--- a/75_Roulette/csharp/Game.cs
+++ b/75_Roulette/csharp/Game.cs
@@ -1,18 +1,156 @@
+using System.Collections.Immutable;
+
 namespace Roulette;
 
 internal class Game
 {
     private readonly IReadWrite _io;
     private readonly IRandom _random;
+    private readonly Table _table;
 
     public Game(IReadWrite io, IRandom random)
     {
         _io = io;
         _random = random;
+        _table = new Table(io, random);
     }
 
     public void Play()
     {
-        
+        _io.Write(Streams.Title);
+        if (!_io.ReadString(Prompts.Instructions).ToLowerInvariant().StartsWith('n'))
+        {
+            _io.Write(Streams.Instructions);
+        }
+
+        while (_table.Play());
+
+        if (_table.Balance > 0)
+        {
+            var name = _io.ReadString(Prompts.Check);
+            _io.Write(Strings.Check(_random, name, _table.Balance));
+        }
+        else
+        {
+            _io.Write(Streams.Thanks);
+        }
     }
+}
+
+internal class Wheel
+{
+    private static readonly ImmutableArray<Slot> _slots = ImmutableArray.Create(
+        new Slot(Strings.Red(1)),
+        new Slot(Strings.Black(2)),
+        new Slot(Strings.Red(3)),
+        new Slot(Strings.Black(4)),
+        new Slot(Strings.Red(5)),
+        new Slot(Strings.Black(6)),
+        new Slot(Strings.Red(7)),
+        new Slot(Strings.Black(8)),
+        new Slot(Strings.Red(9)),
+        new Slot(Strings.Black(10)),
+        new Slot(Strings.Black(11)),
+        new Slot(Strings.Red(12)),
+        new Slot(Strings.Black(13)),
+        new Slot(Strings.Red(14)),
+        new Slot(Strings.Black(15)),
+        new Slot(Strings.Red(16)),
+        new Slot(Strings.Black(17)),
+        new Slot(Strings.Red(18)),
+        new Slot(Strings.Red(19)),
+        new Slot(Strings.Black(20)),
+        new Slot(Strings.Red(21)),
+        new Slot(Strings.Black(22)),
+        new Slot(Strings.Red(23)),
+        new Slot(Strings.Black(24)),
+        new Slot(Strings.Red(25)),
+        new Slot(Strings.Black(26)),
+        new Slot(Strings.Red(27)),
+        new Slot(Strings.Black(28)),
+        new Slot(Strings.Black(29)),
+        new Slot(Strings.Red(30)),
+        new Slot(Strings.Black(31)),
+        new Slot(Strings.Red(32)),
+        new Slot(Strings.Black(33)),
+        new Slot(Strings.Red(34)),
+        new Slot(Strings.Black(35)),
+        new Slot(Strings.Red(36)),
+        new Slot("0"),
+        new Slot("00"));
+    
+    private readonly IRandom _random;
+
+    public Wheel(IRandom random) => _random = random;
+
+    public Slot Spin() => _slots[_random.Next(_slots.Length)];
+}
+
+internal record struct Slot(string Name);
+
+internal record struct Bet(int Number, int Amount)
+{
+    public Bet(int number) : this(number, 0) { }
+
+    public bool Equals(Bet? other) => Number == other?.Number;
+}
+
+public class Table
+{
+    private readonly IReadWrite _io;
+    private readonly Wheel _wheel;
+
+    private int _houseBalance = 100_000;
+    private int _playerBalance = 1_000;
+
+    public Table(IReadWrite io, IRandom random)
+    {
+        _io = io;
+        _wheel = new(random);
+    }
+
+    public int Balance => _playerBalance;
+
+    public bool Play()
+    {
+        var betCount = _io.ReadBetCount();
+        var bets = new HashSet<Bet>();
+        for (int i = 0; i < betCount; i++)
+        {
+            while (!bets.Add(_io.ReadBet(i)))
+            {
+                _io.Write(Streams.BetAlready);
+            }
+        }
+        
+        return _io.ReadString(Prompts.Again).ToLowerInvariant().StartsWith('y');
+    }
+}
+
+internal static class IOExtensions
+{
+    internal static int ReadBetCount(this IReadWrite io)
+    {
+        while (true)
+        {
+            var betCount = io.ReadNumber(Prompts.HowManyBets);
+            if (betCount.IsValidInt(1)) { return (int)betCount; }
+        }
+    }
+
+    internal static Bet ReadBet(this IReadWrite io, int number)
+    {
+        while (true)
+        {
+            var (bet, amount) = io.Read2Numbers(Prompts.Bet(number));
+
+            if (bet.IsValidInt(1, 50) && amount.IsValidInt(5, 500))
+            {
+                return new((int)bet, (int)amount);
+            }
+        }
+    }
+
+    internal static bool IsValidInt(this float value, int minValue, int maxValue = int.MaxValue)
+        => value == (int)value && value >= minValue && value <= maxValue;
 }
\ No newline at end of file

From 2d9d890269b79e6177c3370fd2d431a0cf520cea Mon Sep 17 00:00:00 2001
From: drewjcooper <drew.j.cooper@gmail.com>
Date: Wed, 15 Feb 2023 17:49:22 +1100
Subject: [PATCH 106/198] Finish game logic

---
 75_Roulette/csharp/Game.cs                   | 243 ++++++++++++++-----
 75_Roulette/csharp/Resources/AgainPrompt.txt |   1 +
 75_Roulette/csharp/Resources/Check.txt       |   4 +-
 75_Roulette/csharp/Resources/Outcome.txt     |   2 +-
 75_Roulette/csharp/Resources/Resource.cs     |   8 +-
 75_Roulette/csharp/Resources/Slot.txt        |   2 +-
 75_Roulette/csharp/Resources/Spinning.txt    |   2 +-
 75_Roulette/csharp/Resources/Totals.txt      |   1 +
 8 files changed, 193 insertions(+), 70 deletions(-)

diff --git a/75_Roulette/csharp/Game.cs b/75_Roulette/csharp/Game.cs
index c9570ca1..4543737f 100644
--- a/75_Roulette/csharp/Game.cs
+++ b/75_Roulette/csharp/Game.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Roulette;
 
@@ -7,12 +8,14 @@ internal class Game
     private readonly IReadWrite _io;
     private readonly IRandom _random;
     private readonly Table _table;
+    private readonly House _house;
 
     public Game(IReadWrite io, IRandom random)
     {
         _io = io;
         _random = random;
-        _table = new Table(io, random);
+        _house = new();
+        _table = new(_house, io, random);
     }
 
     public void Play()
@@ -25,10 +28,9 @@ internal class Game
 
         while (_table.Play());
 
-        if (_table.Balance > 0)
+        if (!_house.PlayerIsBroke)
         {
-            var name = _io.ReadString(Prompts.Check);
-            _io.Write(Strings.Check(_random, name, _table.Balance));
+            _house.CutCheck(_io, _random);
         }
         else
         {
@@ -40,44 +42,44 @@ internal class Game
 internal class Wheel
 {
     private static readonly ImmutableArray<Slot> _slots = ImmutableArray.Create(
-        new Slot(Strings.Red(1)),
-        new Slot(Strings.Black(2)),
-        new Slot(Strings.Red(3)),
-        new Slot(Strings.Black(4)),
-        new Slot(Strings.Red(5)),
-        new Slot(Strings.Black(6)),
-        new Slot(Strings.Red(7)),
-        new Slot(Strings.Black(8)),
-        new Slot(Strings.Red(9)),
-        new Slot(Strings.Black(10)),
-        new Slot(Strings.Black(11)),
-        new Slot(Strings.Red(12)),
-        new Slot(Strings.Black(13)),
-        new Slot(Strings.Red(14)),
-        new Slot(Strings.Black(15)),
-        new Slot(Strings.Red(16)),
-        new Slot(Strings.Black(17)),
-        new Slot(Strings.Red(18)),
-        new Slot(Strings.Red(19)),
-        new Slot(Strings.Black(20)),
-        new Slot(Strings.Red(21)),
-        new Slot(Strings.Black(22)),
-        new Slot(Strings.Red(23)),
-        new Slot(Strings.Black(24)),
-        new Slot(Strings.Red(25)),
-        new Slot(Strings.Black(26)),
-        new Slot(Strings.Red(27)),
-        new Slot(Strings.Black(28)),
-        new Slot(Strings.Black(29)),
-        new Slot(Strings.Red(30)),
-        new Slot(Strings.Black(31)),
-        new Slot(Strings.Red(32)),
-        new Slot(Strings.Black(33)),
-        new Slot(Strings.Red(34)),
-        new Slot(Strings.Black(35)),
-        new Slot(Strings.Red(36)),
-        new Slot("0"),
-        new Slot("00"));
+        new Slot(Strings.Red(1), 1, 37, 40, 43, 46, 47),
+        new Slot(Strings.Black(2), 2, 37, 41, 43, 45, 48),
+        new Slot(Strings.Red(3), 3, 37, 42, 43, 46, 47),
+        new Slot(Strings.Black(4), 4, 37, 40, 43, 45, 48),
+        new Slot(Strings.Red(5), 5, 37, 41, 43, 46, 47),
+        new Slot(Strings.Black(6), 6, 37, 42, 43, 45, 48),
+        new Slot(Strings.Red(7), 7, 37, 40, 43, 46, 47),
+        new Slot(Strings.Black(8), 8, 37, 41, 43, 45, 48),
+        new Slot(Strings.Red(9), 9, 37, 42, 43, 46, 47),
+        new Slot(Strings.Black(10), 10, 37, 40, 43, 45, 48),
+        new Slot(Strings.Black(11), 11, 37, 41, 43, 46, 48),
+        new Slot(Strings.Red(12), 12, 37, 42, 43, 45, 47),
+        new Slot(Strings.Black(13), 13, 38, 40, 43, 46, 48),
+        new Slot(Strings.Red(14), 14, 38, 41, 43, 45, 47),
+        new Slot(Strings.Black(15), 15, 38, 42, 43, 46, 48),
+        new Slot(Strings.Red(16), 16, 38, 40, 43, 45, 47),
+        new Slot(Strings.Black(17), 17, 38, 41, 43, 46, 48),
+        new Slot(Strings.Red(18), 18, 38, 42, 43, 45, 47),
+        new Slot(Strings.Red(19), 19, 38, 40, 44, 46, 47),
+        new Slot(Strings.Black(20), 20, 38, 41, 44, 45, 48),
+        new Slot(Strings.Red(21), 21, 38, 42, 44, 46, 47),
+        new Slot(Strings.Black(22), 22, 38, 40, 44, 45, 48),
+        new Slot(Strings.Red(23), 23, 38, 41, 44, 46, 47),
+        new Slot(Strings.Black(24), 24, 38, 42, 44, 45, 48),
+        new Slot(Strings.Red(25), 25, 39, 40, 44, 46, 47),
+        new Slot(Strings.Black(26), 26, 39, 41, 44, 45, 48),
+        new Slot(Strings.Red(27), 27, 39, 42, 44, 46, 47),
+        new Slot(Strings.Black(28), 28, 39, 40, 44, 45, 48),
+        new Slot(Strings.Black(29), 29, 39, 41, 44, 46, 48),
+        new Slot(Strings.Red(30), 30, 39, 42, 44, 45, 47),
+        new Slot(Strings.Black(31), 31, 39, 40, 44, 46, 48),
+        new Slot(Strings.Red(32), 32, 39, 41, 44, 45, 47),
+        new Slot(Strings.Black(33), 33, 39, 42, 44, 46, 48),
+        new Slot(Strings.Red(34), 34, 39, 40, 44, 45, 47),
+        new Slot(Strings.Black(35), 35, 39, 41, 44, 46, 48),
+        new Slot(Strings.Red(36), 36, 39, 42, 44, 45, 47),
+        new Slot("0", 49),
+        new Slot("00", 50));
     
     private readonly IRandom _random;
 
@@ -86,44 +88,156 @@ internal class Wheel
     public Slot Spin() => _slots[_random.Next(_slots.Length)];
 }
 
-internal record struct Slot(string Name);
-
-internal record struct Bet(int Number, int Amount)
+internal class Slot
 {
-    public Bet(int number) : this(number, 0) { }
+    private readonly ImmutableHashSet<BetType> _coveringBets;
 
-    public bool Equals(Bet? other) => Number == other?.Number;
+    public Slot (string name, params BetType[] coveringBets)
+    {
+        Name = name;
+        _coveringBets = coveringBets.ToImmutableHashSet();
+    }
+
+    public string Name { get; }
+
+    public bool IsCoveredBy(Bet bet) => _coveringBets.Contains(bet.Type);
+}
+
+internal record struct BetType(int Value)
+{
+    public static implicit operator BetType(int value) => new(value);
+
+    public int Payout => Value switch
+        {
+            <= 36 or >= 49 => 35,
+            <= 42 => 2,
+            <= 48 => 1
+        };
+}
+
+internal record struct Bet(BetType Type, int Number, int Wager)
+{
+    public int Payout => Wager * Type.Payout;
 }
 
 public class Table
 {
     private readonly IReadWrite _io;
     private readonly Wheel _wheel;
+    private readonly House _house;
 
-    private int _houseBalance = 100_000;
-    private int _playerBalance = 1_000;
-
-    public Table(IReadWrite io, IRandom random)
+    public Table(House house, IReadWrite io, IRandom random)
     {
+        _house = house;
         _io = io;
         _wheel = new(random);
     }
 
-    public int Balance => _playerBalance;
-
     public bool Play()
     {
-        var betCount = _io.ReadBetCount();
-        var bets = new HashSet<Bet>();
-        for (int i = 0; i < betCount; i++)
+        var bets = AcceptBets();
+        var slot = SpinWheel();
+        SettleBets(bets, slot);
+
+        _io.Write(_house.Totals);
+
+        if (_house.PlayerIsBroke)
         {
-            while (!bets.Add(_io.ReadBet(i)))
+            _io.Write(Streams.LastDollar);
+            _io.Write(Streams.Thanks);
+            return false;
+        }
+
+        if (_house.HouseIsBroke)
+        {
+            _io.Write(Streams.BrokeHouse);
+            return false;
+        }
+
+        return _io.ReadString(Prompts.Again).ToLowerInvariant().StartsWith('y');
+    }
+
+    private Slot SpinWheel()
+    {
+        _io.Write(Streams.Spinning);
+        var slot = _wheel.Spin();
+        _io.Write(slot.Name);
+        return slot;
+    }
+
+    private IReadOnlyList<Bet> AcceptBets()
+    {
+        var betCount = _io.ReadBetCount();
+        var betTypes = new HashSet<BetType>();
+        var bets = new List<Bet>();
+        for (int i = 1; i <= betCount; i++)
+        {
+            while (!TryAdd(_io.ReadBet(i)))
             {
                 _io.Write(Streams.BetAlready);
             }
         }
-        
-        return _io.ReadString(Prompts.Again).ToLowerInvariant().StartsWith('y');
+
+        return bets.AsReadOnly();
+
+        bool TryAdd(Bet bet)
+        {
+            if (betTypes.Add(bet.Type))
+            {
+                bets.Add(bet);
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    private void SettleBets(IReadOnlyList<Bet> bets, Slot slot)
+    {
+        foreach (var bet in bets)
+        {
+            _io.Write(slot.IsCoveredBy(bet) ? _house.Pay(bet) : _house.Take(bet));
+        }
+    }
+}
+
+public class House
+{
+    private const int _initialHouse = 100_000;
+    private const int _initialPlayer = 1_000;
+
+    private int _balance = _initialHouse;
+    private int _player = _initialPlayer;
+
+    public string Totals => Strings.Totals(_balance, _player);
+    public bool PlayerIsBroke => _player <= 0;
+    public bool HouseIsBroke => _balance <= 0;
+
+    internal string Pay(Bet bet)
+    {
+        _balance -= bet.Payout;
+        _player += bet.Payout;
+
+        if (_balance <= 0)
+        {
+            _player = _initialHouse + _initialPlayer;
+        }
+
+        return Strings.Win(bet);
+    }
+
+    internal string Take(Bet bet)
+    {
+        _balance += bet.Wager;
+        _player -= bet.Wager;
+
+        return Strings.Lose(bet);
+    }
+
+    public void CutCheck(IReadWrite io, IRandom random)
+    {
+        var name = io.ReadString(Prompts.Check);
+        io.Write(Strings.Check(random, name, _player));
     }
 }
 
@@ -142,11 +256,16 @@ internal static class IOExtensions
     {
         while (true)
         {
-            var (bet, amount) = io.Read2Numbers(Prompts.Bet(number));
+            var (type, amount) = io.Read2Numbers(Prompts.Bet(number));
 
-            if (bet.IsValidInt(1, 50) && amount.IsValidInt(5, 500))
+            if (type.IsValidInt(1, 50) && amount.IsValidInt(5, 500))
             {
-                return new((int)bet, (int)amount);
+                return new()
+                {
+                    Type = (int)type, 
+                    Number = number, 
+                    Wager = (int)amount
+                };
             }
         }
     }
diff --git a/75_Roulette/csharp/Resources/AgainPrompt.txt b/75_Roulette/csharp/Resources/AgainPrompt.txt
index e69de29b..bd1d18b6 100644
--- a/75_Roulette/csharp/Resources/AgainPrompt.txt
+++ b/75_Roulette/csharp/Resources/AgainPrompt.txt
@@ -0,0 +1 @@
+Again
\ No newline at end of file
diff --git a/75_Roulette/csharp/Resources/Check.txt b/75_Roulette/csharp/Resources/Check.txt
index f2be95cd..ffdd640a 100644
--- a/75_Roulette/csharp/Resources/Check.txt
+++ b/75_Roulette/csharp/Resources/Check.txt
@@ -1,6 +1,7 @@
+
 ------------------------------------------------------------------------Check No.  {0}
 
-                                        {1:mmmm d',' yyyy}
+                                        {1:MMMM d',' yyyy}
 
 
 Pay to the order of-----{2}-----$  {3}
@@ -12,3 +13,4 @@ Pay to the order of-----{2}-----$  {3}
                                         ----------X-----
 
 --------------------------------------------------------------Come back soon!
+
diff --git a/75_Roulette/csharp/Resources/Outcome.txt b/75_Roulette/csharp/Resources/Outcome.txt
index 7926cb87..30e227f7 100644
--- a/75_Roulette/csharp/Resources/Outcome.txt
+++ b/75_Roulette/csharp/Resources/Outcome.txt
@@ -1 +1 @@
-You {0} {1} dollars on bet {2}
\ No newline at end of file
+You {0} {1} dollars on bet {2}
diff --git a/75_Roulette/csharp/Resources/Resource.cs b/75_Roulette/csharp/Resources/Resource.cs
index aca0aaf5..dd9c8672 100644
--- a/75_Roulette/csharp/Resources/Resource.cs
+++ b/75_Roulette/csharp/Resources/Resource.cs
@@ -24,10 +24,10 @@ internal static class Resource
         private static string Slot(int number, [CallerMemberName] string? colour = null)
             => string.Format(GetString(), number, colour);
 
-        public static string Lose(int amount, int bet) => Outcome(amount, bet);
-        public static string Win(int amount, int bet) => Outcome(amount, bet);
-        private static string Outcome(int amount, int bet, [CallerMemberName] string? winlose = null)
-            => string.Format(GetString(), winlose, amount, bet);
+        public static string Lose(Bet bet) => Outcome(bet.Wager, bet.Number);
+        public static string Win(Bet bet) => Outcome(bet.Payout, bet.Number);
+        private static string Outcome(int amount, int number, [CallerMemberName] string? winlose = null)
+            => string.Format(GetString(), winlose, amount, number);
 
         public static string Totals(int me, int you) => string.Format(GetString(), me, you);
 
diff --git a/75_Roulette/csharp/Resources/Slot.txt b/75_Roulette/csharp/Resources/Slot.txt
index d45e103b..de02695d 100644
--- a/75_Roulette/csharp/Resources/Slot.txt
+++ b/75_Roulette/csharp/Resources/Slot.txt
@@ -1,2 +1,2 @@
  {0} {1}
- 
\ No newline at end of file
+
diff --git a/75_Roulette/csharp/Resources/Spinning.txt b/75_Roulette/csharp/Resources/Spinning.txt
index 13514a0a..0d87fe39 100644
--- a/75_Roulette/csharp/Resources/Spinning.txt
+++ b/75_Roulette/csharp/Resources/Spinning.txt
@@ -1,3 +1,3 @@
-SPINNING
+Spinning
 
 
diff --git a/75_Roulette/csharp/Resources/Totals.txt b/75_Roulette/csharp/Resources/Totals.txt
index 26f35724..4cecae3f 100644
--- a/75_Roulette/csharp/Resources/Totals.txt
+++ b/75_Roulette/csharp/Resources/Totals.txt
@@ -1,2 +1,3 @@
+
 Totals        Me            You
                {0,-14}{1}

From 699412adb81c8524f435f6b4b3042a496847c60f Mon Sep 17 00:00:00 2001
From: drewjcooper <drew.j.cooper@gmail.com>
Date: Thu, 16 Feb 2023 12:22:59 +1100
Subject: [PATCH 107/198] Reorganise code

---
 75_Roulette/csharp/Bet.cs          |   6 +
 75_Roulette/csharp/BetType.cs      |  13 ++
 75_Roulette/csharp/Croupier.cs     |  41 +++++
 75_Roulette/csharp/Game.cs         | 238 +----------------------------
 75_Roulette/csharp/IOExtensions.cs |  34 +++++
 75_Roulette/csharp/Slot.cs         |  18 +++
 75_Roulette/csharp/Table.cs        |  82 ++++++++++
 75_Roulette/csharp/Wheel.cs        |  52 +++++++
 8 files changed, 247 insertions(+), 237 deletions(-)
 create mode 100644 75_Roulette/csharp/Bet.cs
 create mode 100644 75_Roulette/csharp/BetType.cs
 create mode 100644 75_Roulette/csharp/Croupier.cs
 create mode 100644 75_Roulette/csharp/IOExtensions.cs
 create mode 100644 75_Roulette/csharp/Slot.cs
 create mode 100644 75_Roulette/csharp/Table.cs
 create mode 100644 75_Roulette/csharp/Wheel.cs

diff --git a/75_Roulette/csharp/Bet.cs b/75_Roulette/csharp/Bet.cs
new file mode 100644
index 00000000..da0e31b7
--- /dev/null
+++ b/75_Roulette/csharp/Bet.cs
@@ -0,0 +1,6 @@
+namespace Roulette;
+
+internal record struct Bet(BetType Type, int Number, int Wager)
+{
+    public int Payout => Wager * Type.Payout;
+}
diff --git a/75_Roulette/csharp/BetType.cs b/75_Roulette/csharp/BetType.cs
new file mode 100644
index 00000000..79b3b67c
--- /dev/null
+++ b/75_Roulette/csharp/BetType.cs
@@ -0,0 +1,13 @@
+namespace Roulette;
+
+internal record struct BetType(int Value)
+{
+    public static implicit operator BetType(int value) => new(value);
+
+    public int Payout => Value switch
+        {
+            <= 36 or >= 49 => 35,
+            <= 42 => 2,
+            <= 48 => 1
+        };
+}
diff --git a/75_Roulette/csharp/Croupier.cs b/75_Roulette/csharp/Croupier.cs
new file mode 100644
index 00000000..32f76c33
--- /dev/null
+++ b/75_Roulette/csharp/Croupier.cs
@@ -0,0 +1,41 @@
+namespace Roulette;
+
+internal class Croupier
+{
+    private const int _initialHouse = 100_000;
+    private const int _initialPlayer = 1_000;
+
+    private int _house = _initialHouse;
+    private int _player = _initialPlayer;
+
+    public string Totals => Strings.Totals(_house, _player);
+    public bool PlayerIsBroke => _player <= 0;
+    public bool HouseIsBroke => _house <= 0;
+
+    internal string Pay(Bet bet)
+    {
+        _house -= bet.Payout;
+        _player += bet.Payout;
+
+        if (_house <= 0)
+        {
+            _player = _initialHouse + _initialPlayer;
+        }
+
+        return Strings.Win(bet);
+    }
+
+    internal string Take(Bet bet)
+    {
+        _house += bet.Wager;
+        _player -= bet.Wager;
+
+        return Strings.Lose(bet);
+    }
+
+    public void CutCheck(IReadWrite io, IRandom random)
+    {
+        var name = io.ReadString(Prompts.Check);
+        io.Write(Strings.Check(random, name, _player));
+    }
+}
diff --git a/75_Roulette/csharp/Game.cs b/75_Roulette/csharp/Game.cs
index 4543737f..aa077042 100644
--- a/75_Roulette/csharp/Game.cs
+++ b/75_Roulette/csharp/Game.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Roulette;
@@ -8,7 +7,7 @@ internal class Game
     private readonly IReadWrite _io;
     private readonly IRandom _random;
     private readonly Table _table;
-    private readonly House _house;
+    private readonly Croupier _house;
 
     public Game(IReadWrite io, IRandom random)
     {
@@ -38,238 +37,3 @@ internal class Game
         }
     }
 }
-
-internal class Wheel
-{
-    private static readonly ImmutableArray<Slot> _slots = ImmutableArray.Create(
-        new Slot(Strings.Red(1), 1, 37, 40, 43, 46, 47),
-        new Slot(Strings.Black(2), 2, 37, 41, 43, 45, 48),
-        new Slot(Strings.Red(3), 3, 37, 42, 43, 46, 47),
-        new Slot(Strings.Black(4), 4, 37, 40, 43, 45, 48),
-        new Slot(Strings.Red(5), 5, 37, 41, 43, 46, 47),
-        new Slot(Strings.Black(6), 6, 37, 42, 43, 45, 48),
-        new Slot(Strings.Red(7), 7, 37, 40, 43, 46, 47),
-        new Slot(Strings.Black(8), 8, 37, 41, 43, 45, 48),
-        new Slot(Strings.Red(9), 9, 37, 42, 43, 46, 47),
-        new Slot(Strings.Black(10), 10, 37, 40, 43, 45, 48),
-        new Slot(Strings.Black(11), 11, 37, 41, 43, 46, 48),
-        new Slot(Strings.Red(12), 12, 37, 42, 43, 45, 47),
-        new Slot(Strings.Black(13), 13, 38, 40, 43, 46, 48),
-        new Slot(Strings.Red(14), 14, 38, 41, 43, 45, 47),
-        new Slot(Strings.Black(15), 15, 38, 42, 43, 46, 48),
-        new Slot(Strings.Red(16), 16, 38, 40, 43, 45, 47),
-        new Slot(Strings.Black(17), 17, 38, 41, 43, 46, 48),
-        new Slot(Strings.Red(18), 18, 38, 42, 43, 45, 47),
-        new Slot(Strings.Red(19), 19, 38, 40, 44, 46, 47),
-        new Slot(Strings.Black(20), 20, 38, 41, 44, 45, 48),
-        new Slot(Strings.Red(21), 21, 38, 42, 44, 46, 47),
-        new Slot(Strings.Black(22), 22, 38, 40, 44, 45, 48),
-        new Slot(Strings.Red(23), 23, 38, 41, 44, 46, 47),
-        new Slot(Strings.Black(24), 24, 38, 42, 44, 45, 48),
-        new Slot(Strings.Red(25), 25, 39, 40, 44, 46, 47),
-        new Slot(Strings.Black(26), 26, 39, 41, 44, 45, 48),
-        new Slot(Strings.Red(27), 27, 39, 42, 44, 46, 47),
-        new Slot(Strings.Black(28), 28, 39, 40, 44, 45, 48),
-        new Slot(Strings.Black(29), 29, 39, 41, 44, 46, 48),
-        new Slot(Strings.Red(30), 30, 39, 42, 44, 45, 47),
-        new Slot(Strings.Black(31), 31, 39, 40, 44, 46, 48),
-        new Slot(Strings.Red(32), 32, 39, 41, 44, 45, 47),
-        new Slot(Strings.Black(33), 33, 39, 42, 44, 46, 48),
-        new Slot(Strings.Red(34), 34, 39, 40, 44, 45, 47),
-        new Slot(Strings.Black(35), 35, 39, 41, 44, 46, 48),
-        new Slot(Strings.Red(36), 36, 39, 42, 44, 45, 47),
-        new Slot("0", 49),
-        new Slot("00", 50));
-    
-    private readonly IRandom _random;
-
-    public Wheel(IRandom random) => _random = random;
-
-    public Slot Spin() => _slots[_random.Next(_slots.Length)];
-}
-
-internal class Slot
-{
-    private readonly ImmutableHashSet<BetType> _coveringBets;
-
-    public Slot (string name, params BetType[] coveringBets)
-    {
-        Name = name;
-        _coveringBets = coveringBets.ToImmutableHashSet();
-    }
-
-    public string Name { get; }
-
-    public bool IsCoveredBy(Bet bet) => _coveringBets.Contains(bet.Type);
-}
-
-internal record struct BetType(int Value)
-{
-    public static implicit operator BetType(int value) => new(value);
-
-    public int Payout => Value switch
-        {
-            <= 36 or >= 49 => 35,
-            <= 42 => 2,
-            <= 48 => 1
-        };
-}
-
-internal record struct Bet(BetType Type, int Number, int Wager)
-{
-    public int Payout => Wager * Type.Payout;
-}
-
-public class Table
-{
-    private readonly IReadWrite _io;
-    private readonly Wheel _wheel;
-    private readonly House _house;
-
-    public Table(House house, IReadWrite io, IRandom random)
-    {
-        _house = house;
-        _io = io;
-        _wheel = new(random);
-    }
-
-    public bool Play()
-    {
-        var bets = AcceptBets();
-        var slot = SpinWheel();
-        SettleBets(bets, slot);
-
-        _io.Write(_house.Totals);
-
-        if (_house.PlayerIsBroke)
-        {
-            _io.Write(Streams.LastDollar);
-            _io.Write(Streams.Thanks);
-            return false;
-        }
-
-        if (_house.HouseIsBroke)
-        {
-            _io.Write(Streams.BrokeHouse);
-            return false;
-        }
-
-        return _io.ReadString(Prompts.Again).ToLowerInvariant().StartsWith('y');
-    }
-
-    private Slot SpinWheel()
-    {
-        _io.Write(Streams.Spinning);
-        var slot = _wheel.Spin();
-        _io.Write(slot.Name);
-        return slot;
-    }
-
-    private IReadOnlyList<Bet> AcceptBets()
-    {
-        var betCount = _io.ReadBetCount();
-        var betTypes = new HashSet<BetType>();
-        var bets = new List<Bet>();
-        for (int i = 1; i <= betCount; i++)
-        {
-            while (!TryAdd(_io.ReadBet(i)))
-            {
-                _io.Write(Streams.BetAlready);
-            }
-        }
-
-        return bets.AsReadOnly();
-
-        bool TryAdd(Bet bet)
-        {
-            if (betTypes.Add(bet.Type))
-            {
-                bets.Add(bet);
-                return true;
-            }
-
-            return false;
-        }
-    }
-
-    private void SettleBets(IReadOnlyList<Bet> bets, Slot slot)
-    {
-        foreach (var bet in bets)
-        {
-            _io.Write(slot.IsCoveredBy(bet) ? _house.Pay(bet) : _house.Take(bet));
-        }
-    }
-}
-
-public class House
-{
-    private const int _initialHouse = 100_000;
-    private const int _initialPlayer = 1_000;
-
-    private int _balance = _initialHouse;
-    private int _player = _initialPlayer;
-
-    public string Totals => Strings.Totals(_balance, _player);
-    public bool PlayerIsBroke => _player <= 0;
-    public bool HouseIsBroke => _balance <= 0;
-
-    internal string Pay(Bet bet)
-    {
-        _balance -= bet.Payout;
-        _player += bet.Payout;
-
-        if (_balance <= 0)
-        {
-            _player = _initialHouse + _initialPlayer;
-        }
-
-        return Strings.Win(bet);
-    }
-
-    internal string Take(Bet bet)
-    {
-        _balance += bet.Wager;
-        _player -= bet.Wager;
-
-        return Strings.Lose(bet);
-    }
-
-    public void CutCheck(IReadWrite io, IRandom random)
-    {
-        var name = io.ReadString(Prompts.Check);
-        io.Write(Strings.Check(random, name, _player));
-    }
-}
-
-internal static class IOExtensions
-{
-    internal static int ReadBetCount(this IReadWrite io)
-    {
-        while (true)
-        {
-            var betCount = io.ReadNumber(Prompts.HowManyBets);
-            if (betCount.IsValidInt(1)) { return (int)betCount; }
-        }
-    }
-
-    internal static Bet ReadBet(this IReadWrite io, int number)
-    {
-        while (true)
-        {
-            var (type, amount) = io.Read2Numbers(Prompts.Bet(number));
-
-            if (type.IsValidInt(1, 50) && amount.IsValidInt(5, 500))
-            {
-                return new()
-                {
-                    Type = (int)type, 
-                    Number = number, 
-                    Wager = (int)amount
-                };
-            }
-        }
-    }
-
-    internal static bool IsValidInt(this float value, int minValue, int maxValue = int.MaxValue)
-        => value == (int)value && value >= minValue && value <= maxValue;
-}
\ No newline at end of file
diff --git a/75_Roulette/csharp/IOExtensions.cs b/75_Roulette/csharp/IOExtensions.cs
new file mode 100644
index 00000000..49326bef
--- /dev/null
+++ b/75_Roulette/csharp/IOExtensions.cs
@@ -0,0 +1,34 @@
+namespace Roulette;
+
+internal static class IOExtensions
+{
+    internal static int ReadBetCount(this IReadWrite io)
+    {
+        while (true)
+        {
+            var betCount = io.ReadNumber(Prompts.HowManyBets);
+            if (betCount.IsValidInt(1)) { return (int)betCount; }
+        }
+    }
+
+    internal static Bet ReadBet(this IReadWrite io, int number)
+    {
+        while (true)
+        {
+            var (type, amount) = io.Read2Numbers(Prompts.Bet(number));
+
+            if (type.IsValidInt(1, 50) && amount.IsValidInt(5, 500))
+            {
+                return new()
+                {
+                    Type = (int)type, 
+                    Number = number, 
+                    Wager = (int)amount
+                };
+            }
+        }
+    }
+
+    internal static bool IsValidInt(this float value, int minValue, int maxValue = int.MaxValue)
+        => value == (int)value && value >= minValue && value <= maxValue;
+}
\ No newline at end of file
diff --git a/75_Roulette/csharp/Slot.cs b/75_Roulette/csharp/Slot.cs
new file mode 100644
index 00000000..df30cea1
--- /dev/null
+++ b/75_Roulette/csharp/Slot.cs
@@ -0,0 +1,18 @@
+using System.Collections.Immutable;
+
+namespace Roulette;
+
+internal class Slot
+{
+    private readonly ImmutableHashSet<BetType> _coveringBets;
+
+    public Slot (string name, params BetType[] coveringBets)
+    {
+        Name = name;
+        _coveringBets = coveringBets.ToImmutableHashSet();
+    }
+
+    public string Name { get; }
+
+    public bool IsCoveredBy(Bet bet) => _coveringBets.Contains(bet.Type);
+}
diff --git a/75_Roulette/csharp/Table.cs b/75_Roulette/csharp/Table.cs
new file mode 100644
index 00000000..fbc6341e
--- /dev/null
+++ b/75_Roulette/csharp/Table.cs
@@ -0,0 +1,82 @@
+namespace Roulette;
+
+internal class Table
+{
+    private readonly IReadWrite _io;
+    private readonly Wheel _wheel;
+    private readonly Croupier _house;
+
+    public Table(Croupier house, IReadWrite io, IRandom random)
+    {
+        _house = house;
+        _io = io;
+        _wheel = new(random);
+    }
+
+    public bool Play()
+    {
+        var bets = AcceptBets();
+        var slot = SpinWheel();
+        SettleBets(bets, slot);
+
+        _io.Write(_house.Totals);
+
+        if (_house.PlayerIsBroke)
+        {
+            _io.Write(Streams.LastDollar);
+            _io.Write(Streams.Thanks);
+            return false;
+        }
+
+        if (_house.HouseIsBroke)
+        {
+            _io.Write(Streams.BrokeHouse);
+            return false;
+        }
+
+        return _io.ReadString(Prompts.Again).ToLowerInvariant().StartsWith('y');
+    }
+
+    private Slot SpinWheel()
+    {
+        _io.Write(Streams.Spinning);
+        var slot = _wheel.Spin();
+        _io.Write(slot.Name);
+        return slot;
+    }
+
+    private IReadOnlyList<Bet> AcceptBets()
+    {
+        var betCount = _io.ReadBetCount();
+        var betTypes = new HashSet<BetType>();
+        var bets = new List<Bet>();
+        for (int i = 1; i <= betCount; i++)
+        {
+            while (!TryAdd(_io.ReadBet(i)))
+            {
+                _io.Write(Streams.BetAlready);
+            }
+        }
+
+        return bets.AsReadOnly();
+
+        bool TryAdd(Bet bet)
+        {
+            if (betTypes.Add(bet.Type))
+            {
+                bets.Add(bet);
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    private void SettleBets(IReadOnlyList<Bet> bets, Slot slot)
+    {
+        foreach (var bet in bets)
+        {
+            _io.Write(slot.IsCoveredBy(bet) ? _house.Pay(bet) : _house.Take(bet));
+        }
+    }
+}
diff --git a/75_Roulette/csharp/Wheel.cs b/75_Roulette/csharp/Wheel.cs
new file mode 100644
index 00000000..dfcecd29
--- /dev/null
+++ b/75_Roulette/csharp/Wheel.cs
@@ -0,0 +1,52 @@
+using System.Collections.Immutable;
+
+namespace Roulette;
+
+internal class Wheel
+{
+    private static readonly ImmutableArray<Slot> _slots = ImmutableArray.Create(
+        new Slot(Strings.Red(1), 1, 37, 40, 43, 46, 47),
+        new Slot(Strings.Black(2), 2, 37, 41, 43, 45, 48),
+        new Slot(Strings.Red(3), 3, 37, 42, 43, 46, 47),
+        new Slot(Strings.Black(4), 4, 37, 40, 43, 45, 48),
+        new Slot(Strings.Red(5), 5, 37, 41, 43, 46, 47),
+        new Slot(Strings.Black(6), 6, 37, 42, 43, 45, 48),
+        new Slot(Strings.Red(7), 7, 37, 40, 43, 46, 47),
+        new Slot(Strings.Black(8), 8, 37, 41, 43, 45, 48),
+        new Slot(Strings.Red(9), 9, 37, 42, 43, 46, 47),
+        new Slot(Strings.Black(10), 10, 37, 40, 43, 45, 48),
+        new Slot(Strings.Black(11), 11, 37, 41, 43, 46, 48),
+        new Slot(Strings.Red(12), 12, 37, 42, 43, 45, 47),
+        new Slot(Strings.Black(13), 13, 38, 40, 43, 46, 48),
+        new Slot(Strings.Red(14), 14, 38, 41, 43, 45, 47),
+        new Slot(Strings.Black(15), 15, 38, 42, 43, 46, 48),
+        new Slot(Strings.Red(16), 16, 38, 40, 43, 45, 47),
+        new Slot(Strings.Black(17), 17, 38, 41, 43, 46, 48),
+        new Slot(Strings.Red(18), 18, 38, 42, 43, 45, 47),
+        new Slot(Strings.Red(19), 19, 38, 40, 44, 46, 47),
+        new Slot(Strings.Black(20), 20, 38, 41, 44, 45, 48),
+        new Slot(Strings.Red(21), 21, 38, 42, 44, 46, 47),
+        new Slot(Strings.Black(22), 22, 38, 40, 44, 45, 48),
+        new Slot(Strings.Red(23), 23, 38, 41, 44, 46, 47),
+        new Slot(Strings.Black(24), 24, 38, 42, 44, 45, 48),
+        new Slot(Strings.Red(25), 25, 39, 40, 44, 46, 47),
+        new Slot(Strings.Black(26), 26, 39, 41, 44, 45, 48),
+        new Slot(Strings.Red(27), 27, 39, 42, 44, 46, 47),
+        new Slot(Strings.Black(28), 28, 39, 40, 44, 45, 48),
+        new Slot(Strings.Black(29), 29, 39, 41, 44, 46, 48),
+        new Slot(Strings.Red(30), 30, 39, 42, 44, 45, 47),
+        new Slot(Strings.Black(31), 31, 39, 40, 44, 46, 48),
+        new Slot(Strings.Red(32), 32, 39, 41, 44, 45, 47),
+        new Slot(Strings.Black(33), 33, 39, 42, 44, 46, 48),
+        new Slot(Strings.Red(34), 34, 39, 40, 44, 45, 47),
+        new Slot(Strings.Black(35), 35, 39, 41, 44, 46, 48),
+        new Slot(Strings.Red(36), 36, 39, 42, 44, 45, 47),
+        new Slot("0", 49),
+        new Slot("00", 50));
+    
+    private readonly IRandom _random;
+
+    public Wheel(IRandom random) => _random = random;
+
+    public Slot Spin() => _slots[_random.Next(_slots.Length)];
+}

From 4722cbded8d3d39b76e74c839a9b8608a20812e6 Mon Sep 17 00:00:00 2001
From: drewjcooper <drew.j.cooper@gmail.com>
Date: Thu, 16 Feb 2023 18:02:04 +1100
Subject: [PATCH 108/198] Code cleanup

---
 75_Roulette/csharp/Game.cs  | 23 +++++++++++++----------
 75_Roulette/csharp/Table.cs | 23 ++++++-----------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/75_Roulette/csharp/Game.cs b/75_Roulette/csharp/Game.cs
index aa077042..75a6d7e5 100644
--- a/75_Roulette/csharp/Game.cs
+++ b/75_Roulette/csharp/Game.cs
@@ -1,5 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
-
 namespace Roulette;
 
 internal class Game
@@ -7,14 +5,14 @@ internal class Game
     private readonly IReadWrite _io;
     private readonly IRandom _random;
     private readonly Table _table;
-    private readonly Croupier _house;
+    private readonly Croupier _croupier;
 
     public Game(IReadWrite io, IRandom random)
     {
         _io = io;
         _random = random;
-        _house = new();
-        _table = new(_house, io, random);
+        _croupier = new();
+        _table = new(_croupier, io, random);
     }
 
     public void Play()
@@ -27,13 +25,18 @@ internal class Game
 
         while (_table.Play());
 
-        if (!_house.PlayerIsBroke)
-        {
-            _house.CutCheck(_io, _random);
-        }
-        else
+        if (_croupier.PlayerIsBroke)
         {
+            _io.Write(Streams.LastDollar);
             _io.Write(Streams.Thanks);
+            return;
         }
+
+        if (_croupier.HouseIsBroke)
+        {
+            _io.Write(Streams.BrokeHouse);
+        }
+
+        _croupier.CutCheck(_io, _random);
     }
 }
diff --git a/75_Roulette/csharp/Table.cs b/75_Roulette/csharp/Table.cs
index fbc6341e..026152d1 100644
--- a/75_Roulette/csharp/Table.cs
+++ b/75_Roulette/csharp/Table.cs
@@ -4,11 +4,11 @@ internal class Table
 {
     private readonly IReadWrite _io;
     private readonly Wheel _wheel;
-    private readonly Croupier _house;
+    private readonly Croupier _croupier;
 
-    public Table(Croupier house, IReadWrite io, IRandom random)
+    public Table(Croupier croupier, IReadWrite io, IRandom random)
     {
-        _house = house;
+        _croupier = croupier;
         _io = io;
         _wheel = new(random);
     }
@@ -19,20 +19,9 @@ internal class Table
         var slot = SpinWheel();
         SettleBets(bets, slot);
 
-        _io.Write(_house.Totals);
+        _io.Write(_croupier.Totals);
 
-        if (_house.PlayerIsBroke)
-        {
-            _io.Write(Streams.LastDollar);
-            _io.Write(Streams.Thanks);
-            return false;
-        }
-
-        if (_house.HouseIsBroke)
-        {
-            _io.Write(Streams.BrokeHouse);
-            return false;
-        }
+        if (_croupier.PlayerIsBroke || _croupier.HouseIsBroke) { return false; }
 
         return _io.ReadString(Prompts.Again).ToLowerInvariant().StartsWith('y');
     }
@@ -76,7 +65,7 @@ internal class Table
     {
         foreach (var bet in bets)
         {
-            _io.Write(slot.IsCoveredBy(bet) ? _house.Pay(bet) : _house.Take(bet));
+            _io.Write(slot.IsCoveredBy(bet) ? _croupier.Pay(bet) : _croupier.Take(bet));
         }
     }
 }

From c4b8da053bc37e940ab998593cf0fb8cd136eb11 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Tue, 28 Feb 2023 11:37:54 +1300
Subject: [PATCH 109/198] started work on a rust implementation of super star
 trek

---
 84_Super_Star_Trek/rust/Cargo.toml   |  8 ++++++
 84_Super_Star_Trek/rust/src/main.rs  | 34 ++++++++++++++++++++++
 84_Super_Star_Trek/rust/src/model.rs | 43 ++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 84_Super_Star_Trek/rust/Cargo.toml
 create mode 100644 84_Super_Star_Trek/rust/src/main.rs
 create mode 100644 84_Super_Star_Trek/rust/src/model.rs

diff --git a/84_Super_Star_Trek/rust/Cargo.toml b/84_Super_Star_Trek/rust/Cargo.toml
new file mode 100644
index 00000000..1ec69633
--- /dev/null
+++ b/84_Super_Star_Trek/rust/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "rust"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
new file mode 100644
index 00000000..673b6700
--- /dev/null
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -0,0 +1,34 @@
+use model::{Galaxy, GameStatus, Pos, Quadrant};
+
+mod model;
+
+fn main() {
+    let mut galaxy = Galaxy::generate_new();
+    // create the model
+    // start the loop
+    loop {
+        view(&galaxy);
+        galaxy = wait_for_command(&galaxy);
+    }
+    // rather than using a loop, recursion and passing the ownership might be better
+}
+
+fn view(model: &Galaxy) {
+    match model.game_status {
+        GameStatus::ShortRangeScan => {
+            let quadrant = &model.quadrants[model.enterprise.sector.as_index()];
+            render_quadrant(&model.enterprise.sector, quadrant)
+        }
+    }
+}
+
+fn render_quadrant(enterprise_sector: &Pos, quadrant: &Quadrant) {
+    
+}
+
+fn wait_for_command(galaxy: &Galaxy) -> Galaxy {
+    // listen for command from readline
+    // handle bad commands
+    // update model
+    Galaxy::generate_new()
+}
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
new file mode 100644
index 00000000..9ca50189
--- /dev/null
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -0,0 +1,43 @@
+
+pub struct Galaxy {
+    pub quadrants: Vec<Quadrant>,
+    pub enterprise: Enterprise,
+    pub game_status: GameStatus
+}
+
+pub struct Pos(u8, u8);
+
+impl Pos {
+    pub fn as_index(&self) -> usize {
+        (self.0 * 8 + self.1).into()
+    }
+}
+
+pub struct Quadrant {
+    pub stars: Vec<Pos>,
+    pub star_bases: Vec<Pos>,
+    pub klingons: Vec<Klingon>
+}
+
+pub struct Klingon {
+    pub sector: Pos
+}
+
+pub struct Enterprise {
+    pub quadrant: Pos,
+    pub sector: Pos,
+}
+
+pub enum GameStatus {
+    ShortRangeScan
+}
+
+impl Galaxy {
+    pub fn generate_new() -> Self {
+        Galaxy { 
+            quadrants: Vec::new(), 
+            enterprise: Enterprise { quadrant: Pos(0,0), sector: Pos(0,0) }, 
+            game_status: GameStatus::ShortRangeScan 
+        }
+    }    
+}
\ No newline at end of file

From 92b4d60e84da5f0c310c22a1a4550352623cfb5a Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Tue, 28 Feb 2023 12:36:29 +1300
Subject: [PATCH 110/198] work aligning with mvu, along with a render quadrant
 view function

---
 84_Super_Star_Trek/rust/src/main.rs   | 56 ++++++++++++++++++---------
 84_Super_Star_Trek/rust/src/model.rs  |  3 +-
 84_Super_Star_Trek/rust/src/update.rs | 15 +++++++
 84_Super_Star_Trek/rust/src/view.rs   | 35 +++++++++++++++++
 4 files changed, 90 insertions(+), 19 deletions(-)
 create mode 100644 84_Super_Star_Trek/rust/src/update.rs
 create mode 100644 84_Super_Star_Trek/rust/src/view.rs

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 673b6700..86bc2d85 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,34 +1,54 @@
-use model::{Galaxy, GameStatus, Pos, Quadrant};
+use std::io::stdin;
+
+use model::{Galaxy, GameStatus};
+use update::Message;
 
 mod model;
+mod view;
+mod update;
 
 fn main() {
     let mut galaxy = Galaxy::generate_new();
-    // create the model
-    // start the loop
     loop {
-        view(&galaxy);
-        galaxy = wait_for_command(&galaxy);
+        view::view(&galaxy);
+        let command = wait_for_command(&galaxy.game_status);
+        galaxy = update::update(command, galaxy)
     }
-    // rather than using a loop, recursion and passing the ownership might be better
 }
 
-fn view(model: &Galaxy) {
-    match model.game_status {
-        GameStatus::ShortRangeScan => {
-            let quadrant = &model.quadrants[model.enterprise.sector.as_index()];
-            render_quadrant(&model.enterprise.sector, quadrant)
+fn wait_for_command(game_status: &GameStatus) -> Message {
+    let stdin = stdin();
+    loop {
+        match game_status {
+            _ => {
+                println!("Command?");
+                let mut buffer = String::new();
+                if let Ok(_) = stdin.read_line(&mut buffer) {
+                    let text = buffer.trim_end();
+                    if let Some(msg) = as_message(text, game_status) {
+                        return msg
+                    }
+                    print_command_help();
+                }
+            }
         }
     }
 }
 
-fn render_quadrant(enterprise_sector: &Pos, quadrant: &Quadrant) {
-    
+fn as_message(text: &str, game_status: &GameStatus) -> Option<Message> {
+    if text == "" {
+        return None
+    }
+    match game_status {
+        _ => {
+            match text {
+                "SRS" => Some(Message::RequestShortRangeScan),
+                _ => None
+            }
+        }
+    }
 }
 
-fn wait_for_command(galaxy: &Galaxy) -> Galaxy {
-    // listen for command from readline
-    // handle bad commands
-    // update model
-    Galaxy::generate_new()
+fn print_command_help() {
+    println!("valid commands are just SRS at the mo")
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 9ca50189..2a03bbd9 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -5,7 +5,8 @@ pub struct Galaxy {
     pub game_status: GameStatus
 }
 
-pub struct Pos(u8, u8);
+#[derive(PartialEq)]
+pub struct Pos(pub u8, pub u8);
 
 impl Pos {
     pub fn as_index(&self) -> usize {
diff --git a/84_Super_Star_Trek/rust/src/update.rs b/84_Super_Star_Trek/rust/src/update.rs
new file mode 100644
index 00000000..cf30c83e
--- /dev/null
+++ b/84_Super_Star_Trek/rust/src/update.rs
@@ -0,0 +1,15 @@
+use crate::model::{Galaxy, GameStatus};
+
+pub enum Message {
+    RequestShortRangeScan
+}
+
+pub fn update(message: Message, model: Galaxy) -> Galaxy {
+    match message {
+        Message::RequestShortRangeScan => 
+            Galaxy { 
+                game_status: GameStatus::ShortRangeScan, 
+                ..model 
+            }
+    }
+}
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
new file mode 100644
index 00000000..2f6bdf22
--- /dev/null
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -0,0 +1,35 @@
+use crate::model::{Galaxy, GameStatus, Quadrant, Pos, Klingon};
+
+
+pub fn view(model: &Galaxy) {
+    match model.game_status {
+        GameStatus::ShortRangeScan => {
+            let quadrant = &model.quadrants[model.enterprise.sector.as_index()];
+            render_quadrant(&model.enterprise.sector, quadrant)
+        }
+    }
+}
+
+fn render_quadrant(enterprise_sector: &Pos, quadrant: &Quadrant) {
+    println!("{:-^33}", "");
+    for y in 0..=7 {
+        for x in 0..=7 {
+            let pos = Pos(x, y);
+            if &pos == enterprise_sector {
+                print!("<*> ")
+            } else if quadrant.stars.contains(&pos) {
+                print!(" *  ")
+            } else if quadrant.star_bases.contains(&pos) {
+                print!(">!< ")
+            } else if let Some(_) = find_klingon(&pos, &quadrant.klingons) {
+                print!("+K+ ")
+            }
+        }
+        print!("\n")
+    }
+    println!("{:-^33}", "");
+}
+
+fn find_klingon<'a>(sector: &Pos, klingons: &'a Vec<Klingon>) -> Option<&'a Klingon> {
+    klingons.into_iter().find(|k| &k.sector == sector)
+}
\ No newline at end of file

From c35736c5c8cc61f9bf070e65ab776f73fa92b297 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Tue, 28 Feb 2023 13:28:08 +1300
Subject: [PATCH 111/198] enterprise now starts in a random quadrant and empty
 sector

---
 84_Super_Star_Trek/rust/Cargo.toml   |  1 +
 84_Super_Star_Trek/rust/src/main.rs  |  7 ++-
 84_Super_Star_Trek/rust/src/model.rs | 85 +++++++++++++++++++++++++++-
 84_Super_Star_Trek/rust/src/view.rs  | 21 +++----
 4 files changed, 97 insertions(+), 17 deletions(-)

diff --git a/84_Super_Star_Trek/rust/Cargo.toml b/84_Super_Star_Trek/rust/Cargo.toml
index 1ec69633..3b1d02f5 100644
--- a/84_Super_Star_Trek/rust/Cargo.toml
+++ b/84_Super_Star_Trek/rust/Cargo.toml
@@ -6,3 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+rand = "0.8.5"
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 86bc2d85..20cd7ea3 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,4 +1,4 @@
-use std::io::stdin;
+use std::io::{stdin, stdout, Write};
 
 use model::{Galaxy, GameStatus};
 use update::Message;
@@ -18,10 +18,13 @@ fn main() {
 
 fn wait_for_command(game_status: &GameStatus) -> Message {
     let stdin = stdin();
+    let mut stdout = stdout();
     loop {
         match game_status {
             _ => {
-                println!("Command?");
+                print!("Command? ");
+                let _ = stdout.flush();
+
                 let mut buffer = String::new();
                 if let Ok(_) = stdin.read_line(&mut buffer) {
                     let text = buffer.trim_end();
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 2a03bbd9..4468e6f9 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -1,3 +1,4 @@
+use rand::Rng;
 
 pub struct Galaxy {
     pub quadrants: Vec<Quadrant>,
@@ -14,9 +15,14 @@ impl Pos {
     }
 }
 
+#[derive(PartialEq)]
+pub enum SectorStatus {
+    Empty, Star, StarBase, Klingon
+}
+
 pub struct Quadrant {
     pub stars: Vec<Pos>,
-    pub star_bases: Vec<Pos>,
+    pub star_base: Option<Pos>,
     pub klingons: Vec<Klingon>
 }
 
@@ -35,10 +41,83 @@ pub enum GameStatus {
 
 impl Galaxy {
     pub fn generate_new() -> Self {
+        let quadrants = Self::generate_quadrants();
+
+        let mut rng = rand::thread_rng();
+        let enterprise_quadrant = Pos(rng.gen_range(0..8), rng.gen_range(0..8));
+        let enterprise_sector = quadrants[enterprise_quadrant.as_index()].find_empty_sector();
+
         Galaxy { 
-            quadrants: Vec::new(), 
-            enterprise: Enterprise { quadrant: Pos(0,0), sector: Pos(0,0) }, 
+            quadrants: quadrants, 
+            enterprise: Enterprise { quadrant: enterprise_quadrant, sector: enterprise_sector }, 
             game_status: GameStatus::ShortRangeScan 
         }
     }    
+
+    fn generate_quadrants() -> Vec<Quadrant> {
+        let mut rng = rand::thread_rng();
+        let mut result = Vec::new();
+        for _ in 0..64 {
+
+            let mut quadrant = Quadrant { stars: Vec::new(), star_base: None, klingons: Vec::new() };
+            let star_count = rng.gen_range(0..=7);
+            for _ in 0..star_count {
+                quadrant.stars.push(quadrant.find_empty_sector());
+            }
+
+            if rng.gen::<f64>() > 0.96 {
+                quadrant.star_base = Some(quadrant.find_empty_sector());
+            }
+
+            let klingon_count = 
+                match rng.gen::<f64>() {
+                    n if n > 0.98 => 3,
+                    n if n > 0.95 => 2,
+                    n if n > 0.8 => 1,
+                    _ => 0
+                };
+                for _ in 0..klingon_count {
+                    quadrant.klingons.push(Klingon { sector: quadrant.find_empty_sector() });
+                }
+
+            result.push(quadrant);
+        }
+        result
+    }
+}
+
+impl Quadrant {
+    pub fn sector_status(&self, sector: &Pos) -> SectorStatus {
+        if self.stars.contains(&sector) {
+            SectorStatus::Star
+        } else if self.is_starbase(&sector) {
+            SectorStatus::StarBase
+        } else if self.has_klingon(&sector) {
+            SectorStatus::Klingon
+        } else {
+            SectorStatus::Empty
+        }
+    }
+
+    fn is_starbase(&self, sector: &Pos) -> bool {
+        match &self.star_base {
+            None => false,
+            Some(p) => p == sector
+        }
+    }
+
+    fn has_klingon(&self, sector: &Pos) -> bool {
+        let klingons = &self.klingons;
+        klingons.into_iter().find(|k| &k.sector == sector).is_some()
+    }
+
+    fn find_empty_sector(&self) -> Pos {
+        let mut rng = rand::thread_rng();
+        loop {
+            let pos = Pos(rng.gen_range(0..8), rng.gen_range(0..8));
+            if self.sector_status(&pos) == SectorStatus::Empty {
+                return pos
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 2f6bdf22..4f0975cf 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,4 +1,4 @@
-use crate::model::{Galaxy, GameStatus, Quadrant, Pos, Klingon};
+use crate::model::{Galaxy, GameStatus, Quadrant, Pos, SectorStatus};
 
 
 pub fn view(model: &Galaxy) {
@@ -17,19 +17,16 @@ fn render_quadrant(enterprise_sector: &Pos, quadrant: &Quadrant) {
             let pos = Pos(x, y);
             if &pos == enterprise_sector {
                 print!("<*> ")
-            } else if quadrant.stars.contains(&pos) {
-                print!(" *  ")
-            } else if quadrant.star_bases.contains(&pos) {
-                print!(">!< ")
-            } else if let Some(_) = find_klingon(&pos, &quadrant.klingons) {
-                print!("+K+ ")
-            }
+            } else {
+                match quadrant.sector_status(&pos) {
+                    SectorStatus::Star => print!(" *  "),
+                    SectorStatus::StarBase => print!(">!< "),
+                    SectorStatus::Klingon => print!("+K+ "),
+                    _ => print!("   "),
+                }                
+            } 
         }
         print!("\n")
     }
     println!("{:-^33}", "");
 }
-
-fn find_klingon<'a>(sector: &Pos, klingons: &'a Vec<Klingon>) -> Option<&'a Klingon> {
-    klingons.into_iter().find(|k| &k.sector == sector)
-}
\ No newline at end of file

From 31b9834a7c1967d56f5634329742c7bc9885a44f Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Tue, 28 Feb 2023 13:53:38 +1300
Subject: [PATCH 112/198] work on nav command this involves architectural
 shifts

---
 84_Super_Star_Trek/rust/src/main.rs   | 62 +++++++++++++++++++--------
 84_Super_Star_Trek/rust/src/model.rs  |  4 +-
 84_Super_Star_Trek/rust/src/update.rs | 23 +++++++++-
 84_Super_Star_Trek/rust/src/view.rs   |  5 ++-
 4 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 20cd7ea3..43e3045c 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -17,35 +17,63 @@ fn main() {
 }
 
 fn wait_for_command(game_status: &GameStatus) -> Message {
-    let stdin = stdin();
-    let mut stdout = stdout();
     loop {
         match game_status {
-            _ => {
-                print!("Command? ");
-                let _ = stdout.flush();
-
-                let mut buffer = String::new();
-                if let Ok(_) = stdin.read_line(&mut buffer) {
-                    let text = buffer.trim_end();
-                    if let Some(msg) = as_message(text, game_status) {
-                        return msg
-                    }
-                    print_command_help();
+            GameStatus::NeedDirectionForNav => {
+                let text = prompt("Course (1-9)?");
+                if let Some(msg) = as_message(&text, game_status) {
+                    return msg
                 }
+            },
+            GameStatus::NeedSpeedForNav(_) => {
+                let text = prompt("Warp Factor (0-8)?");
+                if let Some(msg) = as_message(&text, game_status) {
+                    return msg
+                }
+            },
+            _ => {
+                let text = prompt("Command?");
+                if let Some(msg) = as_message(&text, game_status) {
+                    return msg
+                }
+                print_command_help();
             }
         }
     }
 }
 
-fn as_message(text: &str, game_status: &GameStatus) -> Option<Message> {
-    if text == "" {
-        return None
+fn prompt(prompt: &str) -> String {
+    let stdin = stdin();
+    let mut stdout = stdout();
+
+    print!("{prompt} ");
+    let _ = stdout.flush();
+
+    let mut buffer = String::new();
+    if let Ok(_) = stdin.read_line(&mut buffer) {
+        return buffer.trim_end().into();
     }
+    "".into()
+}
+
+fn as_message(text: &str, game_status: &GameStatus) -> Option<Message> {
     match game_status {
+        GameStatus::NeedDirectionForNav => {
+            match text.parse::<u8>() {
+                Ok(n) if (n >= 1 && n <= 8) => Some(Message::DirectionForNav(n)),
+                _ => None
+            }
+        },
+        GameStatus::NeedSpeedForNav(dir) => {
+            match text.parse::<u8>() {
+                Ok(n) if (n >= 1 && n <= 8) => Some(Message::DirectionAndSpeedForNav(*dir, n)),
+                _ => None
+            }
+        }
         _ => {
             match text {
                 "SRS" => Some(Message::RequestShortRangeScan),
+                "NAV" => Some(Message::RequestNavigation),
                 _ => None
             }
         }
@@ -53,5 +81,5 @@ fn as_message(text: &str, game_status: &GameStatus) -> Option<Message> {
 }
 
 fn print_command_help() {
-    println!("valid commands are just SRS at the mo")
+    println!("valid commands are just SRS and NAV at the mo")
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 4468e6f9..a05d8566 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -36,7 +36,9 @@ pub struct Enterprise {
 }
 
 pub enum GameStatus {
-    ShortRangeScan
+    ShortRangeScan,
+    NeedDirectionForNav,
+    NeedSpeedForNav(u8),
 }
 
 impl Galaxy {
diff --git a/84_Super_Star_Trek/rust/src/update.rs b/84_Super_Star_Trek/rust/src/update.rs
index cf30c83e..5788c778 100644
--- a/84_Super_Star_Trek/rust/src/update.rs
+++ b/84_Super_Star_Trek/rust/src/update.rs
@@ -1,7 +1,10 @@
 use crate::model::{Galaxy, GameStatus};
 
 pub enum Message {
-    RequestShortRangeScan
+    RequestShortRangeScan,
+    RequestNavigation,
+    DirectionForNav (u8),
+    DirectionAndSpeedForNav (u8, u8),
 }
 
 pub fn update(message: Message, model: Galaxy) -> Galaxy {
@@ -10,6 +13,24 @@ pub fn update(message: Message, model: Galaxy) -> Galaxy {
             Galaxy { 
                 game_status: GameStatus::ShortRangeScan, 
                 ..model 
+            },
+        Message::RequestNavigation => {
+            Galaxy { 
+                game_status: GameStatus::NeedDirectionForNav, 
+                ..model 
             }
+        },
+        Message::DirectionForNav(dir) => {
+            Galaxy { 
+                game_status: GameStatus::NeedSpeedForNav(dir), 
+                ..model 
+            }
+        },
+        Message::DirectionAndSpeedForNav(dir, speed) => {
+            Galaxy { 
+                game_status: GameStatus::ShortRangeScan, 
+                ..model 
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 4f0975cf..9527289d 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -5,8 +5,9 @@ pub fn view(model: &Galaxy) {
     match model.game_status {
         GameStatus::ShortRangeScan => {
             let quadrant = &model.quadrants[model.enterprise.sector.as_index()];
-            render_quadrant(&model.enterprise.sector, quadrant)
-        }
+            render_quadrant(&model.enterprise.sector, quadrant);
+        },
+        _ => ()
     }
 }
 

From 8903e77d838e21c221a482a450a7a16ced314fca Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Tue, 28 Feb 2023 19:45:54 +1300
Subject: [PATCH 113/198] reduced down to command and response (collapsed MVU)

---
 84_Super_Star_Trek/rust/Cargo.toml            |  1 +
 .../rust/src/{view.rs => commands.rs}         | 17 +---
 84_Super_Star_Trek/rust/src/main.rs           | 80 +++++--------------
 84_Super_Star_Trek/rust/src/model.rs          | 12 +--
 84_Super_Star_Trek/rust/src/update.rs         | 36 ---------
 5 files changed, 29 insertions(+), 117 deletions(-)
 rename 84_Super_Star_Trek/rust/src/{view.rs => commands.rs} (54%)
 delete mode 100644 84_Super_Star_Trek/rust/src/update.rs

diff --git a/84_Super_Star_Trek/rust/Cargo.toml b/84_Super_Star_Trek/rust/Cargo.toml
index 3b1d02f5..01457249 100644
--- a/84_Super_Star_Trek/rust/Cargo.toml
+++ b/84_Super_Star_Trek/rust/Cargo.toml
@@ -6,4 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+ctrlc = "3.2.5"
 rand = "0.8.5"
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/commands.rs
similarity index 54%
rename from 84_Super_Star_Trek/rust/src/view.rs
rename to 84_Super_Star_Trek/rust/src/commands.rs
index 9527289d..264f7909 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,22 +1,13 @@
-use crate::model::{Galaxy, GameStatus, Quadrant, Pos, SectorStatus};
+use crate::model::{Galaxy, Pos, SectorStatus};
 
+pub fn short_range_scan(model: &Galaxy) {
+    let quadrant = &model.quadrants[model.enterprise.sector.as_index()];
 
-pub fn view(model: &Galaxy) {
-    match model.game_status {
-        GameStatus::ShortRangeScan => {
-            let quadrant = &model.quadrants[model.enterprise.sector.as_index()];
-            render_quadrant(&model.enterprise.sector, quadrant);
-        },
-        _ => ()
-    }
-}
-
-fn render_quadrant(enterprise_sector: &Pos, quadrant: &Quadrant) {
     println!("{:-^33}", "");
     for y in 0..=7 {
         for x in 0..=7 {
             let pos = Pos(x, y);
-            if &pos == enterprise_sector {
+            if &pos == &model.enterprise.sector {
                 print!("<*> ")
             } else {
                 match quadrant.sector_status(&pos) {
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 43e3045c..cc6948ac 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,44 +1,27 @@
-use std::io::{stdin, stdout, Write};
+use std::{io::{stdin, stdout, Write}, process::exit};
 
-use model::{Galaxy, GameStatus};
-use update::Message;
+use model::Galaxy;
 
 mod model;
-mod view;
-mod update;
+mod commands;
 
 fn main() {
-    let mut galaxy = Galaxy::generate_new();
-    loop {
-        view::view(&galaxy);
-        let command = wait_for_command(&galaxy.game_status);
-        galaxy = update::update(command, galaxy)
-    }
-}
+    ctrlc::set_handler(move || { exit(0) })
+    .expect("Error setting Ctrl-C handler");
+
+    let galaxy = Galaxy::generate_new();
+    // init ops, starting state and notes
+    commands::short_range_scan(&galaxy);
 
-fn wait_for_command(game_status: &GameStatus) -> Message {
     loop {
-        match game_status {
-            GameStatus::NeedDirectionForNav => {
-                let text = prompt("Course (1-9)?");
-                if let Some(msg) = as_message(&text, game_status) {
-                    return msg
-                }
-            },
-            GameStatus::NeedSpeedForNav(_) => {
-                let text = prompt("Warp Factor (0-8)?");
-                if let Some(msg) = as_message(&text, game_status) {
-                    return msg
-                }
-            },
-            _ => {
-                let text = prompt("Command?");
-                if let Some(msg) = as_message(&text, game_status) {
-                    return msg
-                }
-                print_command_help();
-            }
+        match prompt("Command?").as_str() {
+            "SRS" => commands::short_range_scan(&galaxy),
+            _ => print_command_help()
         }
+
+        // process the next command, based on it render something or update the galaxy or whatever
+        // this would be: read command, and based on it run dedicated function
+        // the function might get passed a mutable reference to the galaxy
     }
 }
 
@@ -56,30 +39,11 @@ fn prompt(prompt: &str) -> String {
     "".into()
 }
 
-fn as_message(text: &str, game_status: &GameStatus) -> Option<Message> {
-    match game_status {
-        GameStatus::NeedDirectionForNav => {
-            match text.parse::<u8>() {
-                Ok(n) if (n >= 1 && n <= 8) => Some(Message::DirectionForNav(n)),
-                _ => None
-            }
-        },
-        GameStatus::NeedSpeedForNav(dir) => {
-            match text.parse::<u8>() {
-                Ok(n) if (n >= 1 && n <= 8) => Some(Message::DirectionAndSpeedForNav(*dir, n)),
-                _ => None
-            }
-        }
-        _ => {
-            match text {
-                "SRS" => Some(Message::RequestShortRangeScan),
-                "NAV" => Some(Message::RequestNavigation),
-                _ => None
-            }
-        }
-    }
-}
-
 fn print_command_help() {
     println!("valid commands are just SRS and NAV at the mo")
-}
\ No newline at end of file
+}
+
+// match text.parse::<u8>() {
+//     Ok(n) if (n >= 1 && n <= 8) => Some(Message::DirectionForNav(n)),
+//     _ => None
+// }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index a05d8566..a0f80751 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -2,8 +2,7 @@ use rand::Rng;
 
 pub struct Galaxy {
     pub quadrants: Vec<Quadrant>,
-    pub enterprise: Enterprise,
-    pub game_status: GameStatus
+    pub enterprise: Enterprise
 }
 
 #[derive(PartialEq)]
@@ -35,12 +34,6 @@ pub struct Enterprise {
     pub sector: Pos,
 }
 
-pub enum GameStatus {
-    ShortRangeScan,
-    NeedDirectionForNav,
-    NeedSpeedForNav(u8),
-}
-
 impl Galaxy {
     pub fn generate_new() -> Self {
         let quadrants = Self::generate_quadrants();
@@ -51,8 +44,7 @@ impl Galaxy {
 
         Galaxy { 
             quadrants: quadrants, 
-            enterprise: Enterprise { quadrant: enterprise_quadrant, sector: enterprise_sector }, 
-            game_status: GameStatus::ShortRangeScan 
+            enterprise: Enterprise { quadrant: enterprise_quadrant, sector: enterprise_sector }
         }
     }    
 
diff --git a/84_Super_Star_Trek/rust/src/update.rs b/84_Super_Star_Trek/rust/src/update.rs
deleted file mode 100644
index 5788c778..00000000
--- a/84_Super_Star_Trek/rust/src/update.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::model::{Galaxy, GameStatus};
-
-pub enum Message {
-    RequestShortRangeScan,
-    RequestNavigation,
-    DirectionForNav (u8),
-    DirectionAndSpeedForNav (u8, u8),
-}
-
-pub fn update(message: Message, model: Galaxy) -> Galaxy {
-    match message {
-        Message::RequestShortRangeScan => 
-            Galaxy { 
-                game_status: GameStatus::ShortRangeScan, 
-                ..model 
-            },
-        Message::RequestNavigation => {
-            Galaxy { 
-                game_status: GameStatus::NeedDirectionForNav, 
-                ..model 
-            }
-        },
-        Message::DirectionForNav(dir) => {
-            Galaxy { 
-                game_status: GameStatus::NeedSpeedForNav(dir), 
-                ..model 
-            }
-        },
-        Message::DirectionAndSpeedForNav(dir, speed) => {
-            Galaxy { 
-                game_status: GameStatus::ShortRangeScan, 
-                ..model 
-            }
-        }
-    }
-}
\ No newline at end of file

From 7c8c420d4435f8afcc52c5aba0ddcfd1c84f8ee6 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Tue, 28 Feb 2023 20:15:46 +1300
Subject: [PATCH 114/198] work on nav command under new model

---
 84_Super_Star_Trek/rust/src/main.rs           | 44 +++++++++++++++----
 84_Super_Star_Trek/rust/src/text_constants.rs |  2 +
 2 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 84_Super_Star_Trek/rust/src/text_constants.rs

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index cc6948ac..3fcf9632 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,21 +1,25 @@
-use std::{io::{stdin, stdout, Write}, process::exit};
+use std::{io::{stdin, stdout, Write}, process::exit, str::FromStr};
 
 use model::Galaxy;
 
+use crate::text_constants::BAD_NAV;
+
 mod model;
 mod commands;
+mod text_constants;
 
 fn main() {
     ctrlc::set_handler(move || { exit(0) })
     .expect("Error setting Ctrl-C handler");
 
-    let galaxy = Galaxy::generate_new();
+    let mut galaxy = Galaxy::generate_new();
     // init ops, starting state and notes
     commands::short_range_scan(&galaxy);
 
     loop {
         match prompt("Command?").as_str() {
             "SRS" => commands::short_range_scan(&galaxy),
+            "NAV" => gather_dir_and_speed_then_move(&mut galaxy),
             _ => print_command_help()
         }
 
@@ -25,11 +29,31 @@ fn main() {
     }
 }
 
-fn prompt(prompt: &str) -> String {
+fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
+    let dir = prompt_value::<u8>("Course (1-9)?", 1, 9);
+    if dir.is_none() {
+        println!("{}", BAD_NAV); 
+        return;
+    }
+
+    let speed = prompt_value::<f32>("Course (1-9)?", 0.0, 8.0);
+    if speed.is_none() {
+        println!("{}", BAD_NAV); 
+        return;
+    }
+
+    let distance = (speed.unwrap() * 8.0) as i32;
+    // could be done with a step function - while distance > 0, move by digit.
+    // if passing a boundary, test for the next quadrant in that direction
+    // if present, change quadrant and move to border
+    // else stop.
+}
+
+fn prompt(prompt_text: &str) -> String {
     let stdin = stdin();
     let mut stdout = stdout();
 
-    print!("{prompt} ");
+    print!("{prompt_text} ");
     let _ = stdout.flush();
 
     let mut buffer = String::new();
@@ -39,11 +63,15 @@ fn prompt(prompt: &str) -> String {
     "".into()
 }
 
+fn prompt_value<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T) -> Option<T> {
+    let passed = prompt(prompt_text);
+    match passed.parse::<T>() {
+        Ok(n) if (n >= min && n <= max) => Some(n),
+        _ => None
+    }
+}
+
 fn print_command_help() {
     println!("valid commands are just SRS and NAV at the mo")
 }
 
-// match text.parse::<u8>() {
-//     Ok(n) if (n >= 1 && n <= 8) => Some(Message::DirectionForNav(n)),
-//     _ => None
-// }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/text_constants.rs b/84_Super_Star_Trek/rust/src/text_constants.rs
new file mode 100644
index 00000000..36339abe
--- /dev/null
+++ b/84_Super_Star_Trek/rust/src/text_constants.rs
@@ -0,0 +1,2 @@
+
+pub const BAD_NAV: &str = "   Lt. Sulu reports, 'Incorrect course data, sir!'";
\ No newline at end of file

From 183ec6fde3df1475622d32570491c710fdf4b4e0 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Tue, 28 Feb 2023 20:19:54 +1300
Subject: [PATCH 115/198] added a note on how to calculate

---
 84_Super_Star_Trek/rust/src/main.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 3fcf9632..46e932c3 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -47,6 +47,8 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
     // if passing a boundary, test for the next quadrant in that direction
     // if present, change quadrant and move to border
     // else stop.
+    // one way to sort this would be to convert current pos to a galaxy pos (e.g. sector.x, y * 8), 
+    // add dist, then mod/divide to get quadrant and new sector
 }
 
 fn prompt(prompt_text: &str) -> String {

From 615438a2676cf3e4dadf74e2a948d9f4b425b851 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 08:29:47 +1300
Subject: [PATCH 116/198] more work on nav, almost done basics!

---
 84_Super_Star_Trek/rust/src/main.rs           | 44 ++++++++++++++++---
 84_Super_Star_Trek/rust/src/model.rs          | 44 ++++++++++++++++++-
 84_Super_Star_Trek/rust/src/text_constants.rs |  2 -
 3 files changed, 82 insertions(+), 8 deletions(-)
 delete mode 100644 84_Super_Star_Trek/rust/src/text_constants.rs

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 46e932c3..481d2378 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,12 +1,9 @@
 use std::{io::{stdin, stdout, Write}, process::exit, str::FromStr};
 
-use model::Galaxy;
-
-use crate::text_constants::BAD_NAV;
+use model::{Galaxy, Pos};
 
 mod model;
 mod commands;
-mod text_constants;
 
 fn main() {
     ctrlc::set_handler(move || { exit(0) })
@@ -30,6 +27,8 @@ fn main() {
 }
 
 fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
+    const BAD_NAV: &str = "   Lt. Sulu reports, 'Incorrect course data, sir!'";
+    
     let dir = prompt_value::<u8>("Course (1-9)?", 1, 9);
     if dir.is_none() {
         println!("{}", BAD_NAV); 
@@ -42,7 +41,42 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
         return;
     }
 
-    let distance = (speed.unwrap() * 8.0) as i32;
+    let distance = (speed.unwrap() * 8.0) as u8;
+    let galaxy_pos = galaxy.enterprise.quadrant * 8u8 + galaxy.enterprise.sector;
+    let (mut nx, mut ny) = galaxy_pos.translate(dir.unwrap(), distance);
+
+    let mut hit_edge = false;
+    if nx < 0 {
+        nx = 0;
+        hit_edge = true;
+    }
+    if ny < 0 {
+        ny = 0;
+        hit_edge = true;
+    }
+    if nx >= 64 {
+        ny = 63;
+        hit_edge = true;
+    }
+    if nx >= 64 {
+        ny = 63;
+        hit_edge = true;
+    }
+    
+    let new_quadrant = Pos((nx / 8) as u8, (ny / 8) as u8);
+    let new_sector = Pos((nx % 8) as u8, (ny % 8) as u8);
+
+    if hit_edge {
+        println!("Lt. Uhura report message from Starfleet Command:
+        'Permission to attempt crossing of galactic perimeter
+        is hereby *Denied*. Shut down your engines.'
+      Chief Engineer Scott reports, 'Warp engines shut down
+        at sector {} of quadrant {}.'", new_quadrant, new_sector);
+    }
+
+    galaxy.enterprise.quadrant = new_quadrant;
+    galaxy.enterprise.sector = new_sector;
+        
     // could be done with a step function - while distance > 0, move by digit.
     // if passing a boundary, test for the next quadrant in that direction
     // if present, change quadrant and move to border
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index a0f80751..36ec9628 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -1,3 +1,5 @@
+use std::{ops::{Mul, Add}, fmt::Display};
+
 use rand::Rng;
 
 pub struct Galaxy {
@@ -5,13 +7,53 @@ pub struct Galaxy {
     pub enterprise: Enterprise
 }
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Clone, Copy)]
 pub struct Pos(pub u8, pub u8);
 
 impl Pos {
+    const DIRECTIONS : [(i8, i8); 8] = [
+        (1, 0),
+        (1, -1),
+        (0, -1),
+        (-1, -1),
+        (-1, 0),
+        (-1, 1),
+        (0, 1),
+        (1, 1),
+    ];
+
     pub fn as_index(&self) -> usize {
         (self.0 * 8 + self.1).into()
     }
+
+    pub fn translate(&self, dir: u8, dist: u8) -> (i8, i8) {
+        let (dx, dy): (i8, i8) = Self::DIRECTIONS[dir as usize];
+        let x = (self.0 as i8) + dx * dist as i8;
+        let y = (self.1 as i8) + dy * dist as i8;
+        (x, y)
+    }
+}
+
+impl Mul<u8> for Pos {
+    type Output = Self;
+
+    fn mul(self, rhs: u8) -> Self::Output {
+        Pos(self.0 * rhs, self.1 * rhs)
+    }
+}
+
+impl Add<Pos> for Pos {
+    type Output = Self;
+
+    fn add(self, rhs: Pos) -> Self::Output {
+        Pos(self.0 + rhs.0, self.1 + rhs.1)
+    }
+}
+
+impl Display for Pos {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        todo!()
+    }
 }
 
 #[derive(PartialEq)]
diff --git a/84_Super_Star_Trek/rust/src/text_constants.rs b/84_Super_Star_Trek/rust/src/text_constants.rs
deleted file mode 100644
index 36339abe..00000000
--- a/84_Super_Star_Trek/rust/src/text_constants.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-pub const BAD_NAV: &str = "   Lt. Sulu reports, 'Incorrect course data, sir!'";
\ No newline at end of file

From 80ac05e0053f9a38eba2b8e0177afe81077cc9fb Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 08:54:39 +1300
Subject: [PATCH 117/198] semi working nav (going weird directions)

---
 84_Super_Star_Trek/rust/src/main.rs  | 24 +++++++++++----------
 84_Super_Star_Trek/rust/src/model.rs | 31 +++++++++++-----------------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 481d2378..a7265116 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -2,6 +2,8 @@ use std::{io::{stdin, stdout, Write}, process::exit, str::FromStr};
 
 use model::{Galaxy, Pos};
 
+use crate::model::DIRECTIONS;
+
 mod model;
 mod commands;
 
@@ -14,7 +16,7 @@ fn main() {
     commands::short_range_scan(&galaxy);
 
     loop {
-        match prompt("Command?").as_str() {
+        match prompt("Command?").to_uppercase().as_str() {
             "SRS" => commands::short_range_scan(&galaxy),
             "NAV" => gather_dir_and_speed_then_move(&mut galaxy),
             _ => print_command_help()
@@ -28,22 +30,25 @@ fn main() {
 
 fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
     const BAD_NAV: &str = "   Lt. Sulu reports, 'Incorrect course data, sir!'";
-    
+
     let dir = prompt_value::<u8>("Course (1-9)?", 1, 9);
     if dir.is_none() {
         println!("{}", BAD_NAV); 
         return;
     }
 
-    let speed = prompt_value::<f32>("Course (1-9)?", 0.0, 8.0);
+    let speed = prompt_value::<f32>("Warp Factor (0-8)?", 0.0, 8.0);
     if speed.is_none() {
         println!("{}", BAD_NAV); 
         return;
     }
 
-    let distance = (speed.unwrap() * 8.0) as u8;
+    let distance = (speed.unwrap() * 8.0) as i8;
     let galaxy_pos = galaxy.enterprise.quadrant * 8u8 + galaxy.enterprise.sector;
-    let (mut nx, mut ny) = galaxy_pos.translate(dir.unwrap(), distance);
+
+    let (dx, dy): (i8, i8) = DIRECTIONS[(dir.unwrap() - 1) as usize];
+    let mut nx = (galaxy_pos.0 as i8) + dx * distance;
+    let mut ny = (galaxy_pos.1 as i8) + dy * distance;
 
     let mut hit_edge = false;
     if nx < 0 {
@@ -77,12 +82,9 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
     galaxy.enterprise.quadrant = new_quadrant;
     galaxy.enterprise.sector = new_sector;
         
-    // could be done with a step function - while distance > 0, move by digit.
-    // if passing a boundary, test for the next quadrant in that direction
-    // if present, change quadrant and move to border
-    // else stop.
-    // one way to sort this would be to convert current pos to a galaxy pos (e.g. sector.x, y * 8), 
-    // add dist, then mod/divide to get quadrant and new sector
+    // if new_quadrant isnt old quadrant print intro
+
+    commands::short_range_scan(&galaxy)
 }
 
 fn prompt(prompt_text: &str) -> String {
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 36ec9628..2e097b9c 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -11,27 +11,9 @@ pub struct Galaxy {
 pub struct Pos(pub u8, pub u8);
 
 impl Pos {
-    const DIRECTIONS : [(i8, i8); 8] = [
-        (1, 0),
-        (1, -1),
-        (0, -1),
-        (-1, -1),
-        (-1, 0),
-        (-1, 1),
-        (0, 1),
-        (1, 1),
-    ];
-
     pub fn as_index(&self) -> usize {
         (self.0 * 8 + self.1).into()
     }
-
-    pub fn translate(&self, dir: u8, dist: u8) -> (i8, i8) {
-        let (dx, dy): (i8, i8) = Self::DIRECTIONS[dir as usize];
-        let x = (self.0 as i8) + dx * dist as i8;
-        let y = (self.1 as i8) + dy * dist as i8;
-        (x, y)
-    }
 }
 
 impl Mul<u8> for Pos {
@@ -52,10 +34,21 @@ impl Add<Pos> for Pos {
 
 impl Display for Pos {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        todo!()
+        write!(f, "{} , {}", self.0, self.1)
     }
 }
 
+pub const DIRECTIONS : [(i8, i8); 8] = [
+    (1, 0),
+    (1, -1),
+    (0, -1),
+    (-1, -1),
+    (-1, 0),
+    (-1, 1),
+    (0, 1),
+    (1, 1),
+];
+
 #[derive(PartialEq)]
 pub enum SectorStatus {
     Empty, Star, StarBase, Klingon

From ab26776d61e60d20bf8fed252e60dc8f7453561d Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 09:16:00 +1300
Subject: [PATCH 118/198] moved nav function bulk to commands module

---
 84_Super_Star_Trek/rust/src/commands.rs | 48 ++++++++++++++++++++-
 84_Super_Star_Trek/rust/src/main.rs     | 57 +++----------------------
 84_Super_Star_Trek/rust/src/model.rs    |  2 +-
 3 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 264f7909..e87dd9c0 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,4 +1,4 @@
-use crate::model::{Galaxy, Pos, SectorStatus};
+use crate::model::{Galaxy, Pos, SectorStatus, COURSES};
 
 pub fn short_range_scan(model: &Galaxy) {
     let quadrant = &model.quadrants[model.enterprise.sector.as_index()];
@@ -22,3 +22,49 @@ pub fn short_range_scan(model: &Galaxy) {
     }
     println!("{:-^33}", "");
 }
+
+pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
+    let distance = (warp_speed * 8.0) as i8;
+    let galaxy_pos = galaxy.enterprise.quadrant * 8u8 + galaxy.enterprise.sector;
+
+    let (dx, dy): (i8, i8) = COURSES[(course - 1) as usize];
+
+    let mut nx = (galaxy_pos.0 as i8) + dx * distance;
+    let mut ny = (galaxy_pos.1 as i8) + dy * distance;
+
+    let mut hit_edge = false;
+    if nx < 0 {
+        nx = 0;
+        hit_edge = true;
+    }
+    if ny < 0 {
+        ny = 0;
+        hit_edge = true;
+    }
+    if nx >= 64 {
+        ny = 63;
+        hit_edge = true;
+    }
+    if nx >= 64 {
+        ny = 63;
+        hit_edge = true;
+    }
+    
+    let new_quadrant = Pos((nx / 8) as u8, (ny / 8) as u8);
+    let new_sector = Pos((nx % 8) as u8, (ny % 8) as u8);
+
+    if hit_edge {
+        println!("Lt. Uhura report message from Starfleet Command:
+        'Permission to attempt crossing of galactic perimeter
+        is hereby *Denied*. Shut down your engines.'
+      Chief Engineer Scott reports, 'Warp engines shut down
+        at sector {} of quadrant {}.'", new_quadrant, new_sector);
+    }
+
+    galaxy.enterprise.quadrant = new_quadrant;
+    galaxy.enterprise.sector = new_sector;
+        
+    // if new_quadrant isnt old quadrant print intro
+
+    short_range_scan(&galaxy)
+}
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index a7265116..a9b5f4ce 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,8 +1,6 @@
 use std::{io::{stdin, stdout, Write}, process::exit, str::FromStr};
 
-use model::{Galaxy, Pos};
-
-use crate::model::DIRECTIONS;
+use model::Galaxy;
 
 mod model;
 mod commands;
@@ -12,7 +10,7 @@ fn main() {
     .expect("Error setting Ctrl-C handler");
 
     let mut galaxy = Galaxy::generate_new();
-    // init ops, starting state and notes
+    // init options, starting state and notes
     commands::short_range_scan(&galaxy);
 
     loop {
@@ -21,18 +19,14 @@ fn main() {
             "NAV" => gather_dir_and_speed_then_move(&mut galaxy),
             _ => print_command_help()
         }
-
-        // process the next command, based on it render something or update the galaxy or whatever
-        // this would be: read command, and based on it run dedicated function
-        // the function might get passed a mutable reference to the galaxy
     }
 }
 
 fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
     const BAD_NAV: &str = "   Lt. Sulu reports, 'Incorrect course data, sir!'";
 
-    let dir = prompt_value::<u8>("Course (1-9)?", 1, 9);
-    if dir.is_none() {
+    let course = prompt_value::<u8>("Course (1-9)?", 1, 9);
+    if course.is_none() {
         println!("{}", BAD_NAV); 
         return;
     }
@@ -43,48 +37,7 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
         return;
     }
 
-    let distance = (speed.unwrap() * 8.0) as i8;
-    let galaxy_pos = galaxy.enterprise.quadrant * 8u8 + galaxy.enterprise.sector;
-
-    let (dx, dy): (i8, i8) = DIRECTIONS[(dir.unwrap() - 1) as usize];
-    let mut nx = (galaxy_pos.0 as i8) + dx * distance;
-    let mut ny = (galaxy_pos.1 as i8) + dy * distance;
-
-    let mut hit_edge = false;
-    if nx < 0 {
-        nx = 0;
-        hit_edge = true;
-    }
-    if ny < 0 {
-        ny = 0;
-        hit_edge = true;
-    }
-    if nx >= 64 {
-        ny = 63;
-        hit_edge = true;
-    }
-    if nx >= 64 {
-        ny = 63;
-        hit_edge = true;
-    }
-    
-    let new_quadrant = Pos((nx / 8) as u8, (ny / 8) as u8);
-    let new_sector = Pos((nx % 8) as u8, (ny % 8) as u8);
-
-    if hit_edge {
-        println!("Lt. Uhura report message from Starfleet Command:
-        'Permission to attempt crossing of galactic perimeter
-        is hereby *Denied*. Shut down your engines.'
-      Chief Engineer Scott reports, 'Warp engines shut down
-        at sector {} of quadrant {}.'", new_quadrant, new_sector);
-    }
-
-    galaxy.enterprise.quadrant = new_quadrant;
-    galaxy.enterprise.sector = new_sector;
-        
-    // if new_quadrant isnt old quadrant print intro
-
-    commands::short_range_scan(&galaxy)
+    commands::move_enterprise(course.unwrap(), speed.unwrap(), galaxy);
 }
 
 fn prompt(prompt_text: &str) -> String {
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 2e097b9c..2ea85548 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -38,7 +38,7 @@ impl Display for Pos {
     }
 }
 
-pub const DIRECTIONS : [(i8, i8); 8] = [
+pub const COURSES : [(i8, i8); 8] = [
     (1, 0),
     (1, -1),
     (0, -1),

From 09cb10eeb718528480f065744bf0bfc414007c28 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 09:39:08 +1300
Subject: [PATCH 119/198] added some unit tests for movement

---
 84_Super_Star_Trek/rust/src/commands.rs | 128 ++++++++++++++++++++----
 84_Super_Star_Trek/rust/src/model.rs    |   2 +-
 2 files changed, 111 insertions(+), 19 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index e87dd9c0..485f57af 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -24,11 +24,41 @@ pub fn short_range_scan(model: &Galaxy) {
 }
 
 pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
-    let distance = (warp_speed * 8.0) as i8;
-    let galaxy_pos = galaxy.enterprise.quadrant * 8u8 + galaxy.enterprise.sector;
+        
+    let end = find_end_quadrant_sector(galaxy.enterprise.quadrant, galaxy.enterprise.sector, course, warp_speed);
 
+    if end.hit_edge {
+        println!("Lt. Uhura report message from Starfleet Command:
+        'Permission to attempt crossing of galactic perimeter
+        is hereby *Denied*. Shut down your engines.'
+      Chief Engineer Scott reports, 'Warp engines shut down
+        at sector {} of quadrant {}.'", end.quadrant, end.sector);
+    }
+
+    galaxy.enterprise.quadrant = end.quadrant;
+    galaxy.enterprise.sector = end.sector;
+        
+    // if new_quadrant isnt old quadrant print intro
+
+    short_range_scan(&galaxy)
+}
+
+struct EndPosition {
+    quadrant: Pos,
+    sector: Pos,
+    hit_edge: bool
+}
+
+fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8, warp_speed: f32) -> EndPosition {
     let (dx, dy): (i8, i8) = COURSES[(course - 1) as usize];
 
+    let mut distance = (warp_speed * 8.0) as i8;
+    if distance == 0 {
+        distance = 1;
+    }
+
+    let galaxy_pos = start_quadrant * 8u8 + start_sector;
+
     let mut nx = (galaxy_pos.0 as i8) + dx * distance;
     let mut ny = (galaxy_pos.1 as i8) + dy * distance;
 
@@ -42,29 +72,91 @@ pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
         hit_edge = true;
     }
     if nx >= 64 {
-        ny = 63;
+        nx = 63;
         hit_edge = true;
     }
-    if nx >= 64 {
+    if ny >= 64 {
         ny = 63;
         hit_edge = true;
     }
     
-    let new_quadrant = Pos((nx / 8) as u8, (ny / 8) as u8);
-    let new_sector = Pos((nx % 8) as u8, (ny % 8) as u8);
+    let quadrant = Pos((nx / 8) as u8, (ny / 8) as u8);
+    let sector = Pos((nx % 8) as u8, (ny % 8) as u8);
 
-    if hit_edge {
-        println!("Lt. Uhura report message from Starfleet Command:
-        'Permission to attempt crossing of galactic perimeter
-        is hereby *Denied*. Shut down your engines.'
-      Chief Engineer Scott reports, 'Warp engines shut down
-        at sector {} of quadrant {}.'", new_quadrant, new_sector);
+    EndPosition { quadrant, sector, hit_edge }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_course_east() {
+        let start_quadrant = Pos(0,0);
+        let start_sector = Pos(0,0);
+        let end = find_end_quadrant_sector(start_quadrant, start_sector, 1, 0.1);
+        assert_eq!(end.quadrant, start_quadrant, "right quadrant");
+        assert_eq!(end.sector, Pos(1,0), "right sector");
+        assert!(!end.hit_edge)
     }
 
-    galaxy.enterprise.quadrant = new_quadrant;
-    galaxy.enterprise.sector = new_sector;
-        
-    // if new_quadrant isnt old quadrant print intro
+    #[test]
+    fn test_course_far_east() {
+        let start_quadrant = Pos(0,0);
+        let start_sector = Pos(0,0);
+        let end = find_end_quadrant_sector(start_quadrant, start_sector, 1, 1.0);
+        assert_eq!(end.quadrant, Pos(1,0), "right quadrant");
+        assert_eq!(end.sector, start_sector, "right sector");
+        assert!(!end.hit_edge)
+    }
 
-    short_range_scan(&galaxy)
-}
+    #[test]
+    fn test_course_too_far_east() {
+        let start_quadrant = Pos(0,0);
+        let start_sector = Pos(0,0);
+        let end = find_end_quadrant_sector(start_quadrant, start_sector, 1, 8.0);
+        assert_eq!(end.quadrant, Pos(7,0), "right quadrant");
+        assert_eq!(end.sector, Pos(7,0), "right sector");
+        assert!(end.hit_edge)
+    }
+
+    #[test]
+    fn test_course_south() {
+        let start_quadrant = Pos(0,0);
+        let start_sector = Pos(0,0);
+        let end = find_end_quadrant_sector(start_quadrant, start_sector, 7, 0.1);
+        assert_eq!(end.quadrant, start_quadrant, "right quadrant");
+        assert_eq!(end.sector, Pos(0,1), "right sector");
+        assert!(!end.hit_edge)
+    }
+
+    #[test]
+    fn test_course_far_south() {
+        let start_quadrant = Pos(0,0);
+        let start_sector = Pos(0,0);
+        let end = find_end_quadrant_sector(start_quadrant, start_sector, 7, 1.0);
+        assert_eq!(end.quadrant, Pos(0,1), "right quadrant");
+        assert_eq!(end.sector, start_sector, "right sector");
+        assert!(!end.hit_edge)
+    }
+
+    #[test]
+    fn test_course_too_far_south() {
+        let start_quadrant = Pos(0,0);
+        let start_sector = Pos(0,0);
+        let end = find_end_quadrant_sector(start_quadrant, start_sector, 7, 8.0);
+        assert_eq!(end.quadrant, Pos(0,7), "right quadrant");
+        assert_eq!(end.sector, Pos(0,7), "right sector");
+        assert!(end.hit_edge)
+    }
+
+    #[test]
+    fn test_course_north_east() {
+        let start_quadrant = Pos(0,0);
+        let start_sector = Pos(0,1);
+        let end = find_end_quadrant_sector(start_quadrant, start_sector, 2, 0.1);
+        assert_eq!(end.quadrant, start_quadrant, "right quadrant");
+        assert_eq!(end.sector, Pos(1,0), "right sector");
+        assert!(!end.hit_edge)
+    }
+}
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 2ea85548..fa0ca4c2 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -7,7 +7,7 @@ pub struct Galaxy {
     pub enterprise: Enterprise
 }
 
-#[derive(PartialEq, Clone, Copy)]
+#[derive(PartialEq, Clone, Copy, Debug)]
 pub struct Pos(pub u8, pub u8);
 
 impl Pos {

From bc4470999c7f9499a43c50b90e1cc9e2ea2ed331 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 09:42:44 +1300
Subject: [PATCH 120/198] bug fix - used sector instead of quadrant as index in
 srs

---
 84_Super_Star_Trek/rust/src/commands.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 485f57af..34c30136 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,7 +1,7 @@
 use crate::model::{Galaxy, Pos, SectorStatus, COURSES};
 
 pub fn short_range_scan(model: &Galaxy) {
-    let quadrant = &model.quadrants[model.enterprise.sector.as_index()];
+    let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
 
     println!("{:-^33}", "");
     for y in 0..=7 {

From c23449fac320c6ccf3b4d3b44615ab62c12a7645 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 09:44:14 +1300
Subject: [PATCH 121/198] just reorged some code

---
 84_Super_Star_Trek/rust/src/model.rs | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index fa0ca4c2..d1c937ab 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -7,6 +7,21 @@ pub struct Galaxy {
     pub enterprise: Enterprise
 }
 
+pub struct Quadrant {
+    pub stars: Vec<Pos>,
+    pub star_base: Option<Pos>,
+    pub klingons: Vec<Klingon>
+}
+
+pub struct Klingon {
+    pub sector: Pos
+}
+
+pub struct Enterprise {
+    pub quadrant: Pos,
+    pub sector: Pos,
+}
+
 #[derive(PartialEq, Clone, Copy, Debug)]
 pub struct Pos(pub u8, pub u8);
 
@@ -54,21 +69,6 @@ pub enum SectorStatus {
     Empty, Star, StarBase, Klingon
 }
 
-pub struct Quadrant {
-    pub stars: Vec<Pos>,
-    pub star_base: Option<Pos>,
-    pub klingons: Vec<Klingon>
-}
-
-pub struct Klingon {
-    pub sector: Pos
-}
-
-pub struct Enterprise {
-    pub quadrant: Pos,
-    pub sector: Pos,
-}
-
 impl Galaxy {
     pub fn generate_new() -> Self {
         let quadrants = Self::generate_quadrants();

From 60f0492c2814deaf619f1123e06c8f30417503c6 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 11:43:58 +1300
Subject: [PATCH 122/198] displaying stats properly aligned next to scan

---
 84_Super_Star_Trek/rust/src/commands.rs | 15 +++++++++++++--
 84_Super_Star_Trek/rust/src/model.rs    | 24 +++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 34c30136..100803a3 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -3,6 +3,17 @@ use crate::model::{Galaxy, Pos, SectorStatus, COURSES};
 pub fn short_range_scan(model: &Galaxy) {
     let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
 
+    let data : [String; 8] = [
+        format!("Stardate           {}", model.stardate),
+        format!("Condition          {:?}", model.enterprise.condition),
+        format!("Quadrant           {}", model.enterprise.quadrant),
+        format!("Sector             {}", model.enterprise.sector),
+        format!("Photon torpedoes   {}", model.enterprise.photon_torpedoes),
+        format!("Total energy       {}", model.enterprise.total_energy),
+        format!("Shields            {}", model.enterprise.shields),
+        format!("Klingons remaining {}", model.remaining_klingons()),
+    ];
+
     println!("{:-^33}", "");
     for y in 0..=7 {
         for x in 0..=7 {
@@ -14,11 +25,11 @@ pub fn short_range_scan(model: &Galaxy) {
                     SectorStatus::Star => print!(" *  "),
                     SectorStatus::StarBase => print!(">!< "),
                     SectorStatus::Klingon => print!("+K+ "),
-                    _ => print!("   "),
+                    _ => print!("    "),
                 }                
             } 
         }
-        print!("\n")
+        println!("{:>9}{}", "", data[y as usize])
     }
     println!("{:-^33}", "");
 }
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index d1c937ab..7fffd81f 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -3,6 +3,7 @@ use std::{ops::{Mul, Add}, fmt::Display};
 use rand::Rng;
 
 pub struct Galaxy {
+    pub stardate: f32,
     pub quadrants: Vec<Quadrant>,
     pub enterprise: Enterprise
 }
@@ -18,8 +19,17 @@ pub struct Klingon {
 }
 
 pub struct Enterprise {
+    pub condition: Condition,
     pub quadrant: Pos,
     pub sector: Pos,
+    pub photon_torpedoes: u8,
+    pub total_energy: u16,
+    pub shields: u16,
+}
+
+#[derive(Debug)]
+pub enum Condition {
+    Green, Yellow, Red
 }
 
 #[derive(PartialEq, Clone, Copy, Debug)]
@@ -70,6 +80,11 @@ pub enum SectorStatus {
 }
 
 impl Galaxy {
+    pub fn remaining_klingons(&self) -> u8 {
+        let quadrants = &self.quadrants;
+        quadrants.into_iter().map(|q| { q.klingons.len() as u8 }).sum::<u8>()
+    }
+
     pub fn generate_new() -> Self {
         let quadrants = Self::generate_quadrants();
 
@@ -78,8 +93,15 @@ impl Galaxy {
         let enterprise_sector = quadrants[enterprise_quadrant.as_index()].find_empty_sector();
 
         Galaxy { 
+            stardate: 3800.0,
             quadrants: quadrants, 
-            enterprise: Enterprise { quadrant: enterprise_quadrant, sector: enterprise_sector }
+            enterprise: Enterprise { 
+                condition: Condition::Green, 
+                quadrant: enterprise_quadrant, 
+                sector: enterprise_sector,
+                photon_torpedoes: 28,
+                total_energy: 3000,
+                shields: 0 }
         }
     }    
 

From 4b326547e4d4441bd3c1099d29ae0683e6c5527b Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 11:53:19 +1300
Subject: [PATCH 123/198] added a tasks tracking doc

---
 84_Super_Star_Trek/rust/tasks.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 84_Super_Star_Trek/rust/tasks.md

diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
new file mode 100644
index 00000000..3fcb826a
--- /dev/null
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -0,0 +1,7 @@
+# Tasks
+
+Started after movement and display of stats was finished (no energy management or collision detection or anything).
+
+- [ ] stop before hitting an object
+- [ ] remove energy on move
+- [ ] klingon movement
\ No newline at end of file

From b56819aadffe74fb53d3dd8ab7de51a1cb161045 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 15:36:42 +1300
Subject: [PATCH 124/198] implemented taking damage and dying

---
 84_Super_Star_Trek/rust/src/commands.rs |  4 +-
 84_Super_Star_Trek/rust/src/main.rs     | 27 ++++++++++++-
 84_Super_Star_Trek/rust/src/model.rs    | 50 ++++++++++++++++++++++---
 84_Super_Star_Trek/rust/tasks.md        |  9 ++++-
 4 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 100803a3..ffbdad61 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,4 +1,4 @@
-use crate::model::{Galaxy, Pos, SectorStatus, COURSES};
+use crate::model::{Galaxy, Pos, SectorStatus, COURSES, Quadrant};
 
 pub fn short_range_scan(model: &Galaxy) {
     let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
@@ -35,7 +35,7 @@ pub fn short_range_scan(model: &Galaxy) {
 }
 
 pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
-        
+
     let end = find_end_quadrant_sector(galaxy.enterprise.quadrant, galaxy.enterprise.sector, course, warp_speed);
 
     if end.hit_edge {
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index a9b5f4ce..9c2ea606 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -2,6 +2,8 @@ use std::{io::{stdin, stdout, Write}, process::exit, str::FromStr};
 
 use model::Galaxy;
 
+use crate::model::Condition;
+
 mod model;
 mod commands;
 
@@ -10,7 +12,7 @@ fn main() {
     .expect("Error setting Ctrl-C handler");
 
     let mut galaxy = Galaxy::generate_new();
-    // init options, starting state and notes
+    // todo: init options, starting state and notes
     commands::short_range_scan(&galaxy);
 
     loop {
@@ -19,6 +21,14 @@ fn main() {
             "NAV" => gather_dir_and_speed_then_move(&mut galaxy),
             _ => print_command_help()
         }
+
+        if galaxy.enterprise.condition == Condition::Destroyed { // todo: also check if stranded
+            println!("Is is stardate {}.
+            There were {} Klingon battle cruisers left at
+            the end of your mission.
+            ", galaxy.stardate, galaxy.remaining_klingons());
+            break;
+        }
     }
 }
 
@@ -37,6 +47,21 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
         return;
     }
 
+    let quadrant = &mut galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
+    for k in 0..quadrant.klingons.len() {
+        let new_sector = quadrant.find_empty_sector();
+        quadrant.klingons[k].sector = new_sector;
+    }
+
+    // todo: check if enterprise is protected by a starbase
+
+    for k in 0..quadrant.klingons.len() {
+        quadrant.klingons[k].fire_on(&mut galaxy.enterprise);
+    }
+
+    if galaxy.enterprise.condition == Condition::Destroyed {
+        return;
+    }
     commands::move_enterprise(course.unwrap(), speed.unwrap(), galaxy);
 }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 7fffd81f..94e9128f 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -15,7 +15,21 @@ pub struct Quadrant {
 }
 
 pub struct Klingon {
-    pub sector: Pos
+    pub sector: Pos,
+    energy: f32
+}
+
+impl Klingon {
+    pub fn fire_on(&mut self, enterprise: &mut Enterprise) {
+        let mut rng = rand::thread_rng();
+        let attack_strength = rng.gen::<f32>();
+        let dist_to_enterprise = self.sector.abs_diff(enterprise.sector) as f32;
+        let hit_strength = self.energy * (2.0 + attack_strength) / dist_to_enterprise;
+        
+        self.energy /= 3.0 + attack_strength;
+
+        enterprise.take_hit(self.sector, hit_strength as u16);
+    }
 }
 
 pub struct Enterprise {
@@ -26,10 +40,30 @@ pub struct Enterprise {
     pub total_energy: u16,
     pub shields: u16,
 }
+impl Enterprise {
+    fn take_hit(&mut self, sector: Pos, hit_strength: u16) {
+        if self.condition == Condition::Destroyed {
+            return;
+        }
+        
+        println!("{hit_strength} unit hit on Enterprise from sector {sector}");
 
-#[derive(Debug)]
+        // absorb into shields
+
+        if self.shields <= 0 {
+            println!("The Enterprise has been destroyed.  The Federation will be conquered.");
+            self.condition = Condition::Destroyed;
+        }
+
+        // report shields
+        // take damage if strength is greater than 20
+    }
+}
+
+#[derive(PartialEq, Debug)]
 pub enum Condition {
-    Green, Yellow, Red
+    Green, Yellow, Red,
+    Destroyed,
 }
 
 #[derive(PartialEq, Clone, Copy, Debug)]
@@ -39,6 +73,10 @@ impl Pos {
     pub fn as_index(&self) -> usize {
         (self.0 * 8 + self.1).into()
     }
+
+    fn abs_diff(&self, other: Pos) -> u8 {
+        self.0.abs_diff(other.0) + self.1.abs_diff(other.1)
+    }
 }
 
 impl Mul<u8> for Pos {
@@ -128,7 +166,7 @@ impl Galaxy {
                     _ => 0
                 };
                 for _ in 0..klingon_count {
-                    quadrant.klingons.push(Klingon { sector: quadrant.find_empty_sector() });
+                    quadrant.klingons.push(Klingon { sector: quadrant.find_empty_sector(), energy: rng.gen_range(100..=300) as f32 });
                 }
 
             result.push(quadrant);
@@ -162,7 +200,7 @@ impl Quadrant {
         klingons.into_iter().find(|k| &k.sector == sector).is_some()
     }
 
-    fn find_empty_sector(&self) -> Pos {
+    pub fn find_empty_sector(&self) -> Pos {
         let mut rng = rand::thread_rng();
         loop {
             let pos = Pos(rng.gen_range(0..8), rng.gen_range(0..8));
@@ -171,4 +209,4 @@ impl Quadrant {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 3fcb826a..8a9951b5 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -2,6 +2,11 @@
 
 Started after movement and display of stats was finished (no energy management or collision detection or anything).
 
-- [ ] stop before hitting an object
+- [x] klingon movement
+- [x] klingon firing, game over etc
 - [ ] remove energy on move
-- [ ] klingon movement
\ No newline at end of file
+- [ ] shields
+- [ ] stranded...
+- [ ] stop before hitting an object
+    - when moving across a sector, the enterprise should stop before it runs into something
+    - the current move is a jump, which makes this problematic. would need to rewrite it

From 1732d950328b0f2ec723c554db5b0753d6ce06fe Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 15:41:00 +1300
Subject: [PATCH 125/198] added proper help

---
 84_Super_Star_Trek/rust/src/commands.rs | 16 +++++++++++++++-
 84_Super_Star_Trek/rust/src/main.rs     | 25 ++++++++++++-------------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index ffbdad61..5cd90150 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -97,6 +97,20 @@ fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8,
     EndPosition { quadrant, sector, hit_edge }
 }
 
+pub fn move_klingons_and_fire(galaxy: &mut Galaxy) {
+    let quadrant = &mut galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
+    for k in 0..quadrant.klingons.len() {
+        let new_sector = quadrant.find_empty_sector();
+        quadrant.klingons[k].sector = new_sector;
+    }
+
+    // todo: check if enterprise is protected by a starbase
+
+    for k in 0..quadrant.klingons.len() {
+        quadrant.klingons[k].fire_on(&mut galaxy.enterprise);
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -170,4 +184,4 @@ mod tests {
         assert_eq!(end.sector, Pos(1,0), "right sector");
         assert!(!end.hit_edge)
     }
-}
\ No newline at end of file
+}
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 9c2ea606..c91ca8bc 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -47,18 +47,7 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
         return;
     }
 
-    let quadrant = &mut galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
-    for k in 0..quadrant.klingons.len() {
-        let new_sector = quadrant.find_empty_sector();
-        quadrant.klingons[k].sector = new_sector;
-    }
-
-    // todo: check if enterprise is protected by a starbase
-
-    for k in 0..quadrant.klingons.len() {
-        quadrant.klingons[k].fire_on(&mut galaxy.enterprise);
-    }
-
+    commands::move_klingons_and_fire(galaxy);
     if galaxy.enterprise.condition == Condition::Destroyed {
         return;
     }
@@ -88,6 +77,16 @@ fn prompt_value<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T) -> O
 }
 
 fn print_command_help() {
-    println!("valid commands are just SRS and NAV at the mo")
+    println!("Enter one of the following:
+  NAV  (To set course)
+  SRS  (For short range sensor scan)
+  LRS  (For long range sensor scan)
+  PHA  (To fire phasers)
+  TOR  (To fire photon torpedoes)
+  SHE  (To raise or lower shields)
+  DAM  (For damage control reports)
+  COM  (To call on library-computer)
+  XXX  (To resign your command)
+    ")
 }
 

From ec3b0697bb91927d8e94d1aee3f558d1cefa275f Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 19:05:38 +1300
Subject: [PATCH 126/198] moved blobs of text into text_display mod

---
 84_Super_Star_Trek/rust/src/commands.rs     | 14 +------
 84_Super_Star_Trek/rust/src/main.rs         | 28 +++-----------
 84_Super_Star_Trek/rust/src/model.rs        | 12 +++++-
 84_Super_Star_Trek/rust/src/text_display.rs | 42 +++++++++++++++++++++
 4 files changed, 59 insertions(+), 37 deletions(-)
 create mode 100644 84_Super_Star_Trek/rust/src/text_display.rs

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 5cd90150..5251109e 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,4 +1,4 @@
-use crate::model::{Galaxy, Pos, SectorStatus, COURSES, Quadrant};
+use crate::{model::{Galaxy, Pos, SectorStatus, COURSES, Quadrant, EndPosition}, text_display};
 
 pub fn short_range_scan(model: &Galaxy) {
     let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
@@ -39,11 +39,7 @@ pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
     let end = find_end_quadrant_sector(galaxy.enterprise.quadrant, galaxy.enterprise.sector, course, warp_speed);
 
     if end.hit_edge {
-        println!("Lt. Uhura report message from Starfleet Command:
-        'Permission to attempt crossing of galactic perimeter
-        is hereby *Denied*. Shut down your engines.'
-      Chief Engineer Scott reports, 'Warp engines shut down
-        at sector {} of quadrant {}.'", end.quadrant, end.sector);
+        text_display::hit_edge(&end);
     }
 
     galaxy.enterprise.quadrant = end.quadrant;
@@ -54,12 +50,6 @@ pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
     short_range_scan(&galaxy)
 }
 
-struct EndPosition {
-    quadrant: Pos,
-    sector: Pos,
-    hit_edge: bool
-}
-
 fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8, warp_speed: f32) -> EndPosition {
     let (dx, dy): (i8, i8) = COURSES[(course - 1) as usize];
 
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index c91ca8bc..bf6f5b96 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -6,6 +6,7 @@ use crate::model::Condition;
 
 mod model;
 mod commands;
+mod text_display;
 
 fn main() {
     ctrlc::set_handler(move || { exit(0) })
@@ -19,31 +20,27 @@ fn main() {
         match prompt("Command?").to_uppercase().as_str() {
             "SRS" => commands::short_range_scan(&galaxy),
             "NAV" => gather_dir_and_speed_then_move(&mut galaxy),
-            _ => print_command_help()
+            _ => text_display::print_command_help()
         }
 
         if galaxy.enterprise.condition == Condition::Destroyed { // todo: also check if stranded
-            println!("Is is stardate {}.
-            There were {} Klingon battle cruisers left at
-            the end of your mission.
-            ", galaxy.stardate, galaxy.remaining_klingons());
+            text_display::end_game_failure(&galaxy);
             break;
         }
     }
 }
 
 fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
-    const BAD_NAV: &str = "   Lt. Sulu reports, 'Incorrect course data, sir!'";
 
     let course = prompt_value::<u8>("Course (1-9)?", 1, 9);
     if course.is_none() {
-        println!("{}", BAD_NAV); 
+        text_display::bad_nav();
         return;
     }
 
     let speed = prompt_value::<f32>("Warp Factor (0-8)?", 0.0, 8.0);
     if speed.is_none() {
-        println!("{}", BAD_NAV); 
+        text_display::bad_nav();
         return;
     }
 
@@ -75,18 +72,3 @@ fn prompt_value<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T) -> O
         _ => None
     }
 }
-
-fn print_command_help() {
-    println!("Enter one of the following:
-  NAV  (To set course)
-  SRS  (For short range sensor scan)
-  LRS  (For long range sensor scan)
-  PHA  (To fire phasers)
-  TOR  (To fire photon torpedoes)
-  SHE  (To raise or lower shields)
-  DAM  (For damage control reports)
-  COM  (To call on library-computer)
-  XXX  (To resign your command)
-    ")
-}
-
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 94e9128f..5026bdd9 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -2,6 +2,8 @@ use std::{ops::{Mul, Add}, fmt::Display};
 
 use rand::Rng;
 
+use crate::text_display;
+
 pub struct Galaxy {
     pub stardate: f32,
     pub quadrants: Vec<Quadrant>,
@@ -46,12 +48,12 @@ impl Enterprise {
             return;
         }
         
-        println!("{hit_strength} unit hit on Enterprise from sector {sector}");
+        text_display::enterprise_hit(&hit_strength, &sector);
 
         // absorb into shields
 
         if self.shields <= 0 {
-            println!("The Enterprise has been destroyed.  The Federation will be conquered.");
+            text_display::enterprise_destroyed();
             self.condition = Condition::Destroyed;
         }
 
@@ -66,6 +68,12 @@ pub enum Condition {
     Destroyed,
 }
 
+pub struct EndPosition {
+    pub quadrant: Pos,
+    pub sector: Pos,
+    pub hit_edge: bool
+}
+
 #[derive(PartialEq, Clone, Copy, Debug)]
 pub struct Pos(pub u8, pub u8);
 
diff --git a/84_Super_Star_Trek/rust/src/text_display.rs b/84_Super_Star_Trek/rust/src/text_display.rs
new file mode 100644
index 00000000..17ffcab1
--- /dev/null
+++ b/84_Super_Star_Trek/rust/src/text_display.rs
@@ -0,0 +1,42 @@
+use crate::model::{Galaxy, Pos, EndPosition};
+
+pub fn print_command_help() {
+    println!("Enter one of the following:
+  NAV  (To set course)
+  SRS  (For short range sensor scan)
+  LRS  (For long range sensor scan)
+  PHA  (To fire phasers)
+  TOR  (To fire photon torpedoes)
+  SHE  (To raise or lower shields)
+  DAM  (For damage control reports)
+  COM  (To call on library-computer)
+  XXX  (To resign your command)
+    ")
+}
+
+pub fn end_game_failure(galaxy: &Galaxy) {
+    println!("Is is stardate {}.
+There were {} Klingon battle cruisers left at
+the end of your mission.
+", galaxy.stardate, galaxy.remaining_klingons());
+}
+
+pub fn enterprise_destroyed() {
+    println!("The Enterprise has been destroyed.  The Federation will be conquered.");
+}
+
+pub fn bad_nav() {
+    println!("   Lt. Sulu reports, 'Incorrect course data, sir!'")
+}
+
+pub fn enterprise_hit(hit_strength: &u16, from_sector: &Pos) {
+    println!("{hit_strength} unit hit on Enterprise from sector {from_sector}");
+}
+
+pub fn hit_edge(end: &EndPosition) {
+    println!("Lt. Uhura report message from Starfleet Command:
+        'Permission to attempt crossing of galactic perimeter
+        is hereby *Denied*. Shut down your engines.'
+      Chief Engineer Scott reports, 'Warp engines shut down
+        at sector {} of quadrant {}.'", end.quadrant, end.sector);
+}
\ No newline at end of file

From efba9423969af07b3a2eac360c028f1e90fc2379 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 19:07:46 +1300
Subject: [PATCH 127/198] renamed text_display to view, and moved srs into it

---
 84_Super_Star_Trek/rust/src/commands.rs     | 40 +----------
 84_Super_Star_Trek/rust/src/main.rs         | 14 ++--
 84_Super_Star_Trek/rust/src/model.rs        |  6 +-
 84_Super_Star_Trek/rust/src/text_display.rs | 42 ------------
 84_Super_Star_Trek/rust/src/view.rs         | 76 +++++++++++++++++++++
 5 files changed, 89 insertions(+), 89 deletions(-)
 delete mode 100644 84_Super_Star_Trek/rust/src/text_display.rs
 create mode 100644 84_Super_Star_Trek/rust/src/view.rs

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 5251109e..c27c6505 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,45 +1,11 @@
-use crate::{model::{Galaxy, Pos, SectorStatus, COURSES, Quadrant, EndPosition}, text_display};
-
-pub fn short_range_scan(model: &Galaxy) {
-    let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
-
-    let data : [String; 8] = [
-        format!("Stardate           {}", model.stardate),
-        format!("Condition          {:?}", model.enterprise.condition),
-        format!("Quadrant           {}", model.enterprise.quadrant),
-        format!("Sector             {}", model.enterprise.sector),
-        format!("Photon torpedoes   {}", model.enterprise.photon_torpedoes),
-        format!("Total energy       {}", model.enterprise.total_energy),
-        format!("Shields            {}", model.enterprise.shields),
-        format!("Klingons remaining {}", model.remaining_klingons()),
-    ];
-
-    println!("{:-^33}", "");
-    for y in 0..=7 {
-        for x in 0..=7 {
-            let pos = Pos(x, y);
-            if &pos == &model.enterprise.sector {
-                print!("<*> ")
-            } else {
-                match quadrant.sector_status(&pos) {
-                    SectorStatus::Star => print!(" *  "),
-                    SectorStatus::StarBase => print!(">!< "),
-                    SectorStatus::Klingon => print!("+K+ "),
-                    _ => print!("    "),
-                }                
-            } 
-        }
-        println!("{:>9}{}", "", data[y as usize])
-    }
-    println!("{:-^33}", "");
-}
+use crate::{model::{Galaxy, Pos, COURSES, EndPosition}, view};
 
 pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
 
     let end = find_end_quadrant_sector(galaxy.enterprise.quadrant, galaxy.enterprise.sector, course, warp_speed);
 
     if end.hit_edge {
-        text_display::hit_edge(&end);
+        view::hit_edge(&end);
     }
 
     galaxy.enterprise.quadrant = end.quadrant;
@@ -47,7 +13,7 @@ pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
         
     // if new_quadrant isnt old quadrant print intro
 
-    short_range_scan(&galaxy)
+    view::short_range_scan(&galaxy)
 }
 
 fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8, warp_speed: f32) -> EndPosition {
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index bf6f5b96..ec923c8c 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -6,7 +6,7 @@ use crate::model::Condition;
 
 mod model;
 mod commands;
-mod text_display;
+mod view;
 
 fn main() {
     ctrlc::set_handler(move || { exit(0) })
@@ -14,17 +14,17 @@ fn main() {
 
     let mut galaxy = Galaxy::generate_new();
     // todo: init options, starting state and notes
-    commands::short_range_scan(&galaxy);
+    view::short_range_scan(&galaxy);
 
     loop {
         match prompt("Command?").to_uppercase().as_str() {
-            "SRS" => commands::short_range_scan(&galaxy),
+            "SRS" => view::short_range_scan(&galaxy),
             "NAV" => gather_dir_and_speed_then_move(&mut galaxy),
-            _ => text_display::print_command_help()
+            _ => view::print_command_help()
         }
 
         if galaxy.enterprise.condition == Condition::Destroyed { // todo: also check if stranded
-            text_display::end_game_failure(&galaxy);
+            view::end_game_failure(&galaxy);
             break;
         }
     }
@@ -34,13 +34,13 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
 
     let course = prompt_value::<u8>("Course (1-9)?", 1, 9);
     if course.is_none() {
-        text_display::bad_nav();
+        view::bad_nav();
         return;
     }
 
     let speed = prompt_value::<f32>("Warp Factor (0-8)?", 0.0, 8.0);
     if speed.is_none() {
-        text_display::bad_nav();
+        view::bad_nav();
         return;
     }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 5026bdd9..2e54555c 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -2,7 +2,7 @@ use std::{ops::{Mul, Add}, fmt::Display};
 
 use rand::Rng;
 
-use crate::text_display;
+use crate::view;
 
 pub struct Galaxy {
     pub stardate: f32,
@@ -48,12 +48,12 @@ impl Enterprise {
             return;
         }
         
-        text_display::enterprise_hit(&hit_strength, &sector);
+        view::enterprise_hit(&hit_strength, &sector);
 
         // absorb into shields
 
         if self.shields <= 0 {
-            text_display::enterprise_destroyed();
+            view::enterprise_destroyed();
             self.condition = Condition::Destroyed;
         }
 
diff --git a/84_Super_Star_Trek/rust/src/text_display.rs b/84_Super_Star_Trek/rust/src/text_display.rs
deleted file mode 100644
index 17ffcab1..00000000
--- a/84_Super_Star_Trek/rust/src/text_display.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use crate::model::{Galaxy, Pos, EndPosition};
-
-pub fn print_command_help() {
-    println!("Enter one of the following:
-  NAV  (To set course)
-  SRS  (For short range sensor scan)
-  LRS  (For long range sensor scan)
-  PHA  (To fire phasers)
-  TOR  (To fire photon torpedoes)
-  SHE  (To raise or lower shields)
-  DAM  (For damage control reports)
-  COM  (To call on library-computer)
-  XXX  (To resign your command)
-    ")
-}
-
-pub fn end_game_failure(galaxy: &Galaxy) {
-    println!("Is is stardate {}.
-There were {} Klingon battle cruisers left at
-the end of your mission.
-", galaxy.stardate, galaxy.remaining_klingons());
-}
-
-pub fn enterprise_destroyed() {
-    println!("The Enterprise has been destroyed.  The Federation will be conquered.");
-}
-
-pub fn bad_nav() {
-    println!("   Lt. Sulu reports, 'Incorrect course data, sir!'")
-}
-
-pub fn enterprise_hit(hit_strength: &u16, from_sector: &Pos) {
-    println!("{hit_strength} unit hit on Enterprise from sector {from_sector}");
-}
-
-pub fn hit_edge(end: &EndPosition) {
-    println!("Lt. Uhura report message from Starfleet Command:
-        'Permission to attempt crossing of galactic perimeter
-        is hereby *Denied*. Shut down your engines.'
-      Chief Engineer Scott reports, 'Warp engines shut down
-        at sector {} of quadrant {}.'", end.quadrant, end.sector);
-}
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
new file mode 100644
index 00000000..5d8c1fd6
--- /dev/null
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -0,0 +1,76 @@
+use crate::model::{Galaxy, Pos, EndPosition, SectorStatus};
+
+pub fn short_range_scan(model: &Galaxy) {
+    let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
+
+    let data : [String; 8] = [
+        format!("Stardate           {}", model.stardate),
+        format!("Condition          {:?}", model.enterprise.condition),
+        format!("Quadrant           {}", model.enterprise.quadrant),
+        format!("Sector             {}", model.enterprise.sector),
+        format!("Photon torpedoes   {}", model.enterprise.photon_torpedoes),
+        format!("Total energy       {}", model.enterprise.total_energy),
+        format!("Shields            {}", model.enterprise.shields),
+        format!("Klingons remaining {}", model.remaining_klingons()),
+    ];
+
+    println!("{:-^33}", "");
+    for y in 0..=7 {
+        for x in 0..=7 {
+            let pos = Pos(x, y);
+            if &pos == &model.enterprise.sector {
+                print!("<*> ")
+            } else {
+                match quadrant.sector_status(&pos) {
+                    SectorStatus::Star => print!(" *  "),
+                    SectorStatus::StarBase => print!(">!< "),
+                    SectorStatus::Klingon => print!("+K+ "),
+                    _ => print!("    "),
+                }                
+            } 
+        }
+        println!("{:>9}{}", "", data[y as usize])
+    }
+    println!("{:-^33}", "");
+}
+
+pub fn print_command_help() {
+    println!("Enter one of the following:
+  NAV  (To set course)
+  SRS  (For short range sensor scan)
+  LRS  (For long range sensor scan)
+  PHA  (To fire phasers)
+  TOR  (To fire photon torpedoes)
+  SHE  (To raise or lower shields)
+  DAM  (For damage control reports)
+  COM  (To call on library-computer)
+  XXX  (To resign your command)
+    ")
+}
+
+pub fn end_game_failure(galaxy: &Galaxy) {
+    println!("Is is stardate {}.
+There were {} Klingon battle cruisers left at
+the end of your mission.
+", galaxy.stardate, galaxy.remaining_klingons());
+}
+
+pub fn enterprise_destroyed() {
+    println!("The Enterprise has been destroyed.  The Federation will be conquered.");
+}
+
+pub fn bad_nav() {
+    println!("   Lt. Sulu reports, 'Incorrect course data, sir!'")
+}
+
+pub fn enterprise_hit(hit_strength: &u16, from_sector: &Pos) {
+    println!("{hit_strength} unit hit on Enterprise from sector {from_sector}");
+}
+
+pub fn hit_edge(end: &EndPosition) {
+    println!("Lt. Uhura report message from Starfleet Command:
+        'Permission to attempt crossing of galactic perimeter
+        is hereby *Denied*. Shut down your engines.'
+      Chief Engineer Scott reports, 'Warp engines shut down
+        at sector {} of quadrant {}.'", end.quadrant, end.sector);
+}

From a18112767dfd0e587958623e5d0abe224ac439ac Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 19:51:50 +1300
Subject: [PATCH 128/198] added intro section with quadrant name

---
 84_Super_Star_Trek/rust/src/main.rs  |  8 +++--
 84_Super_Star_Trek/rust/src/model.rs | 10 ++++++-
 84_Super_Star_Trek/rust/src/view.rs  | 45 ++++++++++++++++++++++++++++
 84_Super_Star_Trek/rust/tasks.md     |  2 ++
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index ec923c8c..8af85b77 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,4 +1,4 @@
-use std::{io::{stdin, stdout, Write}, process::exit, str::FromStr};
+use std::{io::{stdin, stdout, Write, Read}, process::exit, str::FromStr};
 
 use model::Galaxy;
 
@@ -13,7 +13,11 @@ fn main() {
     .expect("Error setting Ctrl-C handler");
 
     let mut galaxy = Galaxy::generate_new();
-    // todo: init options, starting state and notes
+    
+    view::intro(&galaxy);
+    let _ = prompt("Press Enter when ready to accept command");
+
+    view::starting_quadrant(&galaxy.enterprise.quadrant);
     view::short_range_scan(&galaxy);
 
     loop {
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 2e54555c..dd959220 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -6,6 +6,7 @@ use crate::view;
 
 pub struct Galaxy {
     pub stardate: f32,
+    pub final_stardate: f32,
     pub quadrants: Vec<Quadrant>,
     pub enterprise: Enterprise
 }
@@ -131,15 +132,22 @@ impl Galaxy {
         quadrants.into_iter().map(|q| { q.klingons.len() as u8 }).sum::<u8>()
     }
 
+    pub fn remaining_starbases(&self) -> u8 {
+        let quadrants = &self.quadrants;
+        quadrants.into_iter().filter(|q| q.star_base.is_some()).count() as u8
+    }
+
     pub fn generate_new() -> Self {
         let quadrants = Self::generate_quadrants();
 
         let mut rng = rand::thread_rng();
         let enterprise_quadrant = Pos(rng.gen_range(0..8), rng.gen_range(0..8));
         let enterprise_sector = quadrants[enterprise_quadrant.as_index()].find_empty_sector();
+        let stardate = rng.gen_range(20..=40) as f32 * 100.0;
 
         Galaxy { 
-            stardate: 3800.0,
+            stardate,
+            final_stardate: stardate + rng.gen_range(25..=35) as f32,
             quadrants: quadrants, 
             enterprise: Enterprise { 
                 condition: Condition::Green, 
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 5d8c1fd6..62d22eea 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,5 +1,50 @@
 use crate::model::{Galaxy, Pos, EndPosition, SectorStatus};
 
+pub fn intro(model: &Galaxy) {
+    let star_bases = model.remaining_starbases();
+    let mut star_base_message: String = "There is 1 starbase".into();
+    if star_bases > 1 {
+        star_base_message = format!("There are {} starbases", star_bases);
+    }
+    println!("Your orders are as follows:
+    Destroy the {} Klingon warships which have invaded
+  the galaxy before they can attack federation headquarters
+  on stardate {}. This gives you {} days. {} in the galaxy for resupplying your ship.", 
+    model.remaining_klingons(), model.final_stardate, model.final_stardate - model.stardate, star_base_message)
+}
+
+const REGION_NAMES: [&str; 16] = [
+    "Antares",
+    "Sirius",
+    "Rigel",
+    "Deneb",
+    "Procyon",
+    "Capella",
+    "Vega",
+    "Betelgeuse",
+    "Canopus",
+    "Aldebaran",
+    "Altair",
+    "Regulus",
+    "Sagittarius",
+    "Arcturus",
+    "Pollux",
+    "Spica"
+];
+
+const SUB_REGION_NAMES: [&str; 4] = ["I", "II", "III", "IV"];
+
+fn quadrant_name(quadrant: &Pos) -> String {
+    format!("{} {}", 
+        REGION_NAMES[(quadrant.0 << 1 + quadrant.1 >> 1) as usize],
+        SUB_REGION_NAMES[(quadrant.1 % 4) as usize])
+}
+
+pub fn starting_quadrant(quadrant: &Pos) {
+    println!("Your mission begins with your starship located
+in the galactic quadrant, '{}'.", quadrant_name(quadrant))
+}
+
 pub fn short_range_scan(model: &Galaxy) {
     let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
 
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 8a9951b5..3da9cf93 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -4,6 +4,8 @@ Started after movement and display of stats was finished (no energy management o
 
 - [x] klingon movement
 - [x] klingon firing, game over etc
+- [ ] add intro
+- [ ] add entering (and starting in) sector headers
 - [ ] remove energy on move
 - [ ] shields
 - [ ] stranded...

From 41ca9c3c709425809668f7ff9fbedd4dafdf06a2 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 20:36:01 +1300
Subject: [PATCH 129/198] added enterprise to intro, entering quadrant names,
 and fixed bug in name indexing

---
 84_Super_Star_Trek/rust/src/commands.rs |  6 ++--
 84_Super_Star_Trek/rust/src/main.rs     |  1 +
 84_Super_Star_Trek/rust/src/model.rs    |  2 +-
 84_Super_Star_Trek/rust/src/view.rs     | 40 ++++++++++++++++++++++---
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index c27c6505..00ab1377 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -8,10 +8,12 @@ pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
         view::hit_edge(&end);
     }
 
+    if galaxy.enterprise.quadrant != end.quadrant {
+        view::enter_quadrant(&end.quadrant);
+    }
+
     galaxy.enterprise.quadrant = end.quadrant;
     galaxy.enterprise.sector = end.sector;
-        
-    // if new_quadrant isnt old quadrant print intro
 
     view::short_range_scan(&galaxy)
 }
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 8af85b77..2c1c06be 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -14,6 +14,7 @@ fn main() {
 
     let mut galaxy = Galaxy::generate_new();
     
+    view::enterprise();
     view::intro(&galaxy);
     let _ = prompt("Press Enter when ready to accept command");
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index dd959220..d79089dd 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -106,7 +106,7 @@ impl Add<Pos> for Pos {
 
 impl Display for Pos {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{} , {}", self.0, self.1)
+        write!(f, "{} , {}", self.0 + 1, self.1 + 1)
     }
 }
 
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 62d22eea..774505f5 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,5 +1,33 @@
 use crate::model::{Galaxy, Pos, EndPosition, SectorStatus};
 
+pub fn enterprise() {
+    println!("
+
+
+
+
+
+
+
+
+
+
+                                    ,------*------,
+                    ,-------------   '---  ------'
+                     '-------- --'      / /
+                         ,---' '-------/ /--,
+                          '----------------'
+
+                    THE USS ENTERPRISE --- NCC-1701
+
+
+
+
+
+
+")
+}
+
 pub fn intro(model: &Galaxy) {
     let star_bases = model.remaining_starbases();
     let mut star_base_message: String = "There is 1 starbase".into();
@@ -9,7 +37,7 @@ pub fn intro(model: &Galaxy) {
     println!("Your orders are as follows:
     Destroy the {} Klingon warships which have invaded
   the galaxy before they can attack federation headquarters
-  on stardate {}. This gives you {} days. {} in the galaxy for resupplying your ship.", 
+  on stardate {}. This gives you {} days. {} in the galaxy for resupplying your ship.\n", 
     model.remaining_klingons(), model.final_stardate, model.final_stardate - model.stardate, star_base_message)
 }
 
@@ -36,13 +64,17 @@ const SUB_REGION_NAMES: [&str; 4] = ["I", "II", "III", "IV"];
 
 fn quadrant_name(quadrant: &Pos) -> String {
     format!("{} {}", 
-        REGION_NAMES[(quadrant.0 << 1 + quadrant.1 >> 1) as usize],
+        REGION_NAMES[((quadrant.0 << 1) + (quadrant.1 >> 2)) as usize],
         SUB_REGION_NAMES[(quadrant.1 % 4) as usize])
 }
 
 pub fn starting_quadrant(quadrant: &Pos) {
-    println!("Your mission begins with your starship located
-in the galactic quadrant, '{}'.", quadrant_name(quadrant))
+    println!("\nYour mission begins with your starship located
+in the galactic quadrant, '{}'.\n", quadrant_name(quadrant))
+}
+
+pub fn enter_quadrant(quadrant: &Pos) {
+    println!("\nNow entering {} quadrant . . .\n", quadrant_name(quadrant))
 }
 
 pub fn short_range_scan(model: &Galaxy) {

From dee8a96f3cd46f88b8f6da461c30c5c2e1307759 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Wed, 1 Mar 2023 20:42:51 +1300
Subject: [PATCH 130/198] working on tasks

---
 84_Super_Star_Trek/rust/tasks.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 3da9cf93..2b532d48 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -4,8 +4,9 @@ Started after movement and display of stats was finished (no energy management o
 
 - [x] klingon movement
 - [x] klingon firing, game over etc
-- [ ] add intro
-- [ ] add entering (and starting in) sector headers
+- [x] add intro
+- [x] add entering (and starting in) sector headers
+- [ ] conditions and danger messages
 - [ ] remove energy on move
 - [ ] shields
 - [ ] stranded...

From 4cda6be184beea9568bebd542aec192574886b2d Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 10:02:56 +1300
Subject: [PATCH 131/198] added warning messages when entering a sector

---
 84_Super_Star_Trek/rust/src/commands.rs |  7 +++++++
 84_Super_Star_Trek/rust/src/main.rs     |  6 ++----
 84_Super_Star_Trek/rust/src/model.rs    | 16 ++++++----------
 84_Super_Star_Trek/rust/src/view.rs     | 16 +++++++++++++++-
 84_Super_Star_Trek/rust/tasks.md        |  8 +++++++-
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 00ab1377..d55b08ff 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -10,6 +10,13 @@ pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
 
     if galaxy.enterprise.quadrant != end.quadrant {
         view::enter_quadrant(&end.quadrant);
+        
+        if galaxy.quadrants[end.quadrant.as_index()].klingons.len() > 0 {
+            view::condition_red();
+            if galaxy.enterprise.shields <= 200 {
+                view::danger_shields();
+            }
+        }
     }
 
     galaxy.enterprise.quadrant = end.quadrant;
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 2c1c06be..498c5bd2 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -2,8 +2,6 @@ use std::{io::{stdin, stdout, Write, Read}, process::exit, str::FromStr};
 
 use model::Galaxy;
 
-use crate::model::Condition;
-
 mod model;
 mod commands;
 mod view;
@@ -28,7 +26,7 @@ fn main() {
             _ => view::print_command_help()
         }
 
-        if galaxy.enterprise.condition == Condition::Destroyed { // todo: also check if stranded
+        if galaxy.enterprise.destroyed { // todo: also check if stranded
             view::end_game_failure(&galaxy);
             break;
         }
@@ -50,7 +48,7 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
     }
 
     commands::move_klingons_and_fire(galaxy);
-    if galaxy.enterprise.condition == Condition::Destroyed {
+    if galaxy.enterprise.destroyed {
         return;
     }
     commands::move_enterprise(course.unwrap(), speed.unwrap(), galaxy);
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index d79089dd..9caa100a 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -36,7 +36,8 @@ impl Klingon {
 }
 
 pub struct Enterprise {
-    pub condition: Condition,
+    pub destroyed: bool,
+    pub damaged: bool, // later this could be by subsystem
     pub quadrant: Pos,
     pub sector: Pos,
     pub photon_torpedoes: u8,
@@ -45,7 +46,7 @@ pub struct Enterprise {
 }
 impl Enterprise {
     fn take_hit(&mut self, sector: Pos, hit_strength: u16) {
-        if self.condition == Condition::Destroyed {
+        if self.destroyed {
             return;
         }
         
@@ -55,7 +56,7 @@ impl Enterprise {
 
         if self.shields <= 0 {
             view::enterprise_destroyed();
-            self.condition = Condition::Destroyed;
+            self.destroyed = true
         }
 
         // report shields
@@ -63,12 +64,6 @@ impl Enterprise {
     }
 }
 
-#[derive(PartialEq, Debug)]
-pub enum Condition {
-    Green, Yellow, Red,
-    Destroyed,
-}
-
 pub struct EndPosition {
     pub quadrant: Pos,
     pub sector: Pos,
@@ -150,7 +145,8 @@ impl Galaxy {
             final_stardate: stardate + rng.gen_range(25..=35) as f32,
             quadrants: quadrants, 
             enterprise: Enterprise { 
-                condition: Condition::Green, 
+                destroyed: false,
+                damaged: false,
                 quadrant: enterprise_quadrant, 
                 sector: enterprise_sector,
                 photon_torpedoes: 28,
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 774505f5..320cb4eb 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -79,10 +79,16 @@ pub fn enter_quadrant(quadrant: &Pos) {
 
 pub fn short_range_scan(model: &Galaxy) {
     let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
+    let mut condition = "GREEN";
+    if quadrant.klingons.len() > 0 {
+        condition = "*RED*";
+    } else if model.enterprise.damaged {
+        condition = "YELLOW";
+    }
 
     let data : [String; 8] = [
         format!("Stardate           {}", model.stardate),
-        format!("Condition          {:?}", model.enterprise.condition),
+        format!("Condition          {}", condition),
         format!("Quadrant           {}", model.enterprise.quadrant),
         format!("Sector             {}", model.enterprise.sector),
         format!("Photon torpedoes   {}", model.enterprise.photon_torpedoes),
@@ -151,3 +157,11 @@ pub fn hit_edge(end: &EndPosition) {
       Chief Engineer Scott reports, 'Warp engines shut down
         at sector {} of quadrant {}.'", end.quadrant, end.sector);
 }
+
+pub fn condition_red() {
+    println!("COMBAT AREA      CONDITION RED")
+}
+
+pub fn danger_shields() {
+    println!("   SHIELDS DANGEROUSLY LOW    ")
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 2b532d48..374c1a29 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -6,10 +6,16 @@ Started after movement and display of stats was finished (no energy management o
 - [x] klingon firing, game over etc
 - [x] add intro
 - [x] add entering (and starting in) sector headers
-- [ ] conditions and danger messages
+- [x] conditions and danger messages
 - [ ] remove energy on move
 - [ ] shields
+    - [ ] shield control
+    - [ ] shield hit absorption
+- [ ] subsystem damage
+    - and support for reports
+- [ ] lrs?
 - [ ] stranded...
 - [ ] stop before hitting an object
     - when moving across a sector, the enterprise should stop before it runs into something
     - the current move is a jump, which makes this problematic. would need to rewrite it
+- [ ] better command reading - support entering multiple values on a line (e.g. nav 3 0.1)

From 7aec8284c03a866adff95e7040ee7e987d89d795 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 10:24:13 +1300
Subject: [PATCH 132/198] can now specify positional params on the nav command

---
 84_Super_Star_Trek/rust/src/main.rs | 36 +++++++++++++++++++++--------
 84_Super_Star_Trek/rust/tasks.md    |  2 +-
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 498c5bd2..4212c6a7 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -20,9 +20,13 @@ fn main() {
     view::short_range_scan(&galaxy);
 
     loop {
-        match prompt("Command?").to_uppercase().as_str() {
+        let command = prompt("Command?");
+        if command.len() == 0 {
+            continue;
+        }
+        match command[0].to_uppercase().as_str() {
             "SRS" => view::short_range_scan(&galaxy),
-            "NAV" => gather_dir_and_speed_then_move(&mut galaxy),
+            "NAV" => gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
             _ => view::print_command_help()
         }
 
@@ -33,15 +37,15 @@ fn main() {
     }
 }
 
-fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
+fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>) {
 
-    let course = prompt_value::<u8>("Course (1-9)?", 1, 9);
+    let course = param_or_prompt_value(&provided, 0, "Course (1-9)?", 1, 9);
     if course.is_none() {
         view::bad_nav();
         return;
     }
 
-    let speed = prompt_value::<f32>("Warp Factor (0-8)?", 0.0, 8.0);
+    let speed = param_or_prompt_value(&provided, 1, "Warp Factor (0-8)?", 0.0, 8.0);
     if speed.is_none() {
         view::bad_nav();
         return;
@@ -54,7 +58,7 @@ fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy) {
     commands::move_enterprise(course.unwrap(), speed.unwrap(), galaxy);
 }
 
-fn prompt(prompt_text: &str) -> String {
+fn prompt(prompt_text: &str) -> Vec<String> {
     let stdin = stdin();
     let mut stdout = stdout();
 
@@ -63,15 +67,29 @@ fn prompt(prompt_text: &str) -> String {
 
     let mut buffer = String::new();
     if let Ok(_) = stdin.read_line(&mut buffer) {
-        return buffer.trim_end().into();
+        return buffer.trim_end().split(" ").map(|s| s.to_string()).collect();
     }
-    "".into()
+    Vec::new()
 }
 
 fn prompt_value<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T) -> Option<T> {
     let passed = prompt(prompt_text);
-    match passed.parse::<T>() {
+    if passed.len() != 1 {
+        return None
+    }
+    match passed[0].parse::<T>() {
         Ok(n) if (n >= min && n <= max) => Some(n),
         _ => None
     }
 }
+
+fn param_or_prompt_value<T: FromStr + PartialOrd>(params: &Vec<String>, param_pos: usize, prompt_text: &str, min: T, max: T) -> Option<T> {
+    if params.len() > param_pos {
+        match params[param_pos].parse::<T>() {
+            Ok(n) => Some(n),
+            _ => None
+        }
+    } else {
+        return prompt_value::<T>(prompt_text, min, max);
+    }
+}
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 374c1a29..da2b9c1b 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -18,4 +18,4 @@ Started after movement and display of stats was finished (no energy management o
 - [ ] stop before hitting an object
     - when moving across a sector, the enterprise should stop before it runs into something
     - the current move is a jump, which makes this problematic. would need to rewrite it
-- [ ] better command reading - support entering multiple values on a line (e.g. nav 3 0.1)
+- [x] better command reading - support entering multiple values on a line (e.g. nav 3 0.1)

From ca89609c3e91470a959ac9a25533db80e8e4ce32 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 11:26:43 +1300
Subject: [PATCH 133/198] energy is now removed with travel

---
 84_Super_Star_Trek/rust/src/commands.rs | 31 ++++++++++++++++++++-----
 84_Super_Star_Trek/rust/src/model.rs    |  3 ++-
 84_Super_Star_Trek/rust/src/view.rs     |  9 +++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index d55b08ff..3cc4aff5 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -2,25 +2,43 @@ use crate::{model::{Galaxy, Pos, COURSES, EndPosition}, view};
 
 pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
 
-    let end = find_end_quadrant_sector(galaxy.enterprise.quadrant, galaxy.enterprise.sector, course, warp_speed);
+    let ship = &mut galaxy.enterprise;
+
+    // todo account for being blocked
+
+    let end = find_end_quadrant_sector(ship.quadrant, ship.sector, course, warp_speed);
+
+    // todo account for engine damage
+
+    if end.energy_cost > ship.total_energy {
+        view::insuffient_warp_energy(warp_speed);
+        return
+    }
 
     if end.hit_edge {
         view::hit_edge(&end);
     }
+    
 
-    if galaxy.enterprise.quadrant != end.quadrant {
+    if ship.quadrant != end.quadrant {
         view::enter_quadrant(&end.quadrant);
         
         if galaxy.quadrants[end.quadrant.as_index()].klingons.len() > 0 {
             view::condition_red();
-            if galaxy.enterprise.shields <= 200 {
+            if ship.shields <= 200 {
                 view::danger_shields();
             }
         }
     }
 
-    galaxy.enterprise.quadrant = end.quadrant;
-    galaxy.enterprise.sector = end.sector;
+    ship.quadrant = end.quadrant;
+    ship.sector = end.sector;
+
+    ship.total_energy = (ship.total_energy - end.energy_cost).max(0);
+    if ship.shields > ship.total_energy {
+        view::divert_energy_from_shields();
+        ship.shields = ship.total_energy;
+    }
 
     view::short_range_scan(&galaxy)
 }
@@ -58,8 +76,9 @@ fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8,
     
     let quadrant = Pos((nx / 8) as u8, (ny / 8) as u8);
     let sector = Pos((nx % 8) as u8, (ny % 8) as u8);
+    let energy_cost = distance as u16 + 10;
 
-    EndPosition { quadrant, sector, hit_edge }
+    EndPosition { quadrant, sector, hit_edge, energy_cost }
 }
 
 pub fn move_klingons_and_fire(galaxy: &mut Galaxy) {
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 9caa100a..103887f5 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -67,7 +67,8 @@ impl Enterprise {
 pub struct EndPosition {
     pub quadrant: Pos,
     pub sector: Pos,
-    pub hit_edge: bool
+    pub hit_edge: bool,
+    pub energy_cost: u16,
 }
 
 #[derive(PartialEq, Clone, Copy, Debug)]
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 320cb4eb..f460eaa7 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -165,3 +165,12 @@ pub fn condition_red() {
 pub fn danger_shields() {
     println!("   SHIELDS DANGEROUSLY LOW    ")
 }
+
+pub fn insuffient_warp_energy(warp_speed: f32) {
+    println!("Engineering reports, 'Insufficient energy available
+    for maneuvering at warp {warp_speed} !'")
+}
+
+pub fn divert_energy_from_shields() {
+    println!("Shield Control supplies energy to complete the maneuver.")
+}

From 2feb1a9c6532cd4c3dcbb93aa45aefc513989fad Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 11:37:58 +1300
Subject: [PATCH 134/198] implemented setting shields

---
 84_Super_Star_Trek/rust/src/main.rs | 22 ++++++++++++++++++++++
 84_Super_Star_Trek/rust/src/view.rs | 17 +++++++++++++++++
 84_Super_Star_Trek/rust/tasks.md    |  6 +++---
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 4212c6a7..477a0594 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -27,6 +27,7 @@ fn main() {
         match command[0].to_uppercase().as_str() {
             "SRS" => view::short_range_scan(&galaxy),
             "NAV" => gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
+            "SHE" => get_amount_and_set_shields(&mut galaxy, command[1..].into()),
             _ => view::print_command_help()
         }
 
@@ -37,6 +38,27 @@ fn main() {
     }
 }
 
+fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
+
+    // todo check for damaged module
+
+    view::energy_available(galaxy.enterprise.total_energy);
+    let value = param_or_prompt_value(&provided, 0, "Number of units to shields", 0, i32::MAX);
+    if value.is_none() {
+        view::shields_unchanged();
+        return;
+    }
+    let value = value.unwrap() as u16;
+    if value > galaxy.enterprise.total_energy {
+        view::ridiculous();
+        view::shields_unchanged();
+        return;
+    }
+
+    galaxy.enterprise.shields = value;
+    view::shields_set(value);
+}
+
 fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>) {
 
     let course = param_or_prompt_value(&provided, 0, "Course (1-9)?", 1, 9);
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index f460eaa7..95cad41d 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -174,3 +174,20 @@ pub fn insuffient_warp_energy(warp_speed: f32) {
 pub fn divert_energy_from_shields() {
     println!("Shield Control supplies energy to complete the maneuver.")
 }
+
+pub fn energy_available(total_energy: u16) {
+    println!("Energy available = {{{total_energy}}}")
+}
+
+pub fn shields_unchanged() {
+    println!("<SHIELDS UNCHANGED>")
+}
+
+pub fn ridiculous() {
+    println!("Shield Control reports, 'This is not the Federation Treasury.'")
+}
+
+pub fn shields_set(value: u16) {
+    println!("Deflector control room report:
+  'Shields now at {value} units per your command.'")
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index da2b9c1b..7c7e1df8 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -7,9 +7,9 @@ Started after movement and display of stats was finished (no energy management o
 - [x] add intro
 - [x] add entering (and starting in) sector headers
 - [x] conditions and danger messages
-- [ ] remove energy on move
-- [ ] shields
-    - [ ] shield control
+- [x] remove energy on move
+- [x] shields
+    - [x] shield control
     - [ ] shield hit absorption
 - [ ] subsystem damage
     - and support for reports

From 2898e701c3504192816172192e16c5c868e0cbd5 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 11:41:43 +1300
Subject: [PATCH 135/198] shield hit absorbtion

---
 84_Super_Star_Trek/rust/src/model.rs | 4 ++--
 84_Super_Star_Trek/rust/src/view.rs  | 4 ++++
 84_Super_Star_Trek/rust/tasks.md     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 103887f5..4f5a65ac 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -52,14 +52,14 @@ impl Enterprise {
         
         view::enterprise_hit(&hit_strength, &sector);
 
-        // absorb into shields
+        self.shields = (self.shields - hit_strength).max(0);
 
         if self.shields <= 0 {
             view::enterprise_destroyed();
             self.destroyed = true
         }
 
-        // report shields
+        view::shields_hit(self.shields);
         // take damage if strength is greater than 20
     }
 }
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 95cad41d..02c72815 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -191,3 +191,7 @@ pub fn shields_set(value: u16) {
     println!("Deflector control room report:
   'Shields now at {value} units per your command.'")
 }
+
+pub fn shields_hit(shields: u16) {
+    println!("      <Shields down to {shields} units>")
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 7c7e1df8..918a0395 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -10,7 +10,7 @@ Started after movement and display of stats was finished (no energy management o
 - [x] remove energy on move
 - [x] shields
     - [x] shield control
-    - [ ] shield hit absorption
+    - [x] shield hit absorption
 - [ ] subsystem damage
     - and support for reports
 - [ ] lrs?

From 5b560f929ce66cb0884f9df2b5eb2cb1864fa3e6 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 11:48:24 +1300
Subject: [PATCH 136/198] trimmed edge tests in nav, and removed no longer
 needed unit tests

---
 84_Super_Star_Trek/rust/src/commands.rs | 95 +------------------------
 1 file changed, 3 insertions(+), 92 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 3cc4aff5..2f42edd5 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -56,23 +56,9 @@ fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8,
     let mut nx = (galaxy_pos.0 as i8) + dx * distance;
     let mut ny = (galaxy_pos.1 as i8) + dy * distance;
 
-    let mut hit_edge = false;
-    if nx < 0 {
-        nx = 0;
-        hit_edge = true;
-    }
-    if ny < 0 {
-        ny = 0;
-        hit_edge = true;
-    }
-    if nx >= 64 {
-        nx = 63;
-        hit_edge = true;
-    }
-    if ny >= 64 {
-        ny = 63;
-        hit_edge = true;
-    }
+    let hit_edge = nx < 0 || ny < 0 || nx >= 64 || ny >= 64;
+    nx = nx.min(63).max(0);
+    ny = ny.min(63).max(0);
     
     let quadrant = Pos((nx / 8) as u8, (ny / 8) as u8);
     let sector = Pos((nx % 8) as u8, (ny % 8) as u8);
@@ -94,78 +80,3 @@ pub fn move_klingons_and_fire(galaxy: &mut Galaxy) {
         quadrant.klingons[k].fire_on(&mut galaxy.enterprise);
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_course_east() {
-        let start_quadrant = Pos(0,0);
-        let start_sector = Pos(0,0);
-        let end = find_end_quadrant_sector(start_quadrant, start_sector, 1, 0.1);
-        assert_eq!(end.quadrant, start_quadrant, "right quadrant");
-        assert_eq!(end.sector, Pos(1,0), "right sector");
-        assert!(!end.hit_edge)
-    }
-
-    #[test]
-    fn test_course_far_east() {
-        let start_quadrant = Pos(0,0);
-        let start_sector = Pos(0,0);
-        let end = find_end_quadrant_sector(start_quadrant, start_sector, 1, 1.0);
-        assert_eq!(end.quadrant, Pos(1,0), "right quadrant");
-        assert_eq!(end.sector, start_sector, "right sector");
-        assert!(!end.hit_edge)
-    }
-
-    #[test]
-    fn test_course_too_far_east() {
-        let start_quadrant = Pos(0,0);
-        let start_sector = Pos(0,0);
-        let end = find_end_quadrant_sector(start_quadrant, start_sector, 1, 8.0);
-        assert_eq!(end.quadrant, Pos(7,0), "right quadrant");
-        assert_eq!(end.sector, Pos(7,0), "right sector");
-        assert!(end.hit_edge)
-    }
-
-    #[test]
-    fn test_course_south() {
-        let start_quadrant = Pos(0,0);
-        let start_sector = Pos(0,0);
-        let end = find_end_quadrant_sector(start_quadrant, start_sector, 7, 0.1);
-        assert_eq!(end.quadrant, start_quadrant, "right quadrant");
-        assert_eq!(end.sector, Pos(0,1), "right sector");
-        assert!(!end.hit_edge)
-    }
-
-    #[test]
-    fn test_course_far_south() {
-        let start_quadrant = Pos(0,0);
-        let start_sector = Pos(0,0);
-        let end = find_end_quadrant_sector(start_quadrant, start_sector, 7, 1.0);
-        assert_eq!(end.quadrant, Pos(0,1), "right quadrant");
-        assert_eq!(end.sector, start_sector, "right sector");
-        assert!(!end.hit_edge)
-    }
-
-    #[test]
-    fn test_course_too_far_south() {
-        let start_quadrant = Pos(0,0);
-        let start_sector = Pos(0,0);
-        let end = find_end_quadrant_sector(start_quadrant, start_sector, 7, 8.0);
-        assert_eq!(end.quadrant, Pos(0,7), "right quadrant");
-        assert_eq!(end.sector, Pos(0,7), "right sector");
-        assert!(end.hit_edge)
-    }
-
-    #[test]
-    fn test_course_north_east() {
-        let start_quadrant = Pos(0,0);
-        let start_sector = Pos(0,1);
-        let end = find_end_quadrant_sector(start_quadrant, start_sector, 2, 0.1);
-        assert_eq!(end.quadrant, start_quadrant, "right quadrant");
-        assert_eq!(end.sector, Pos(1,0), "right sector");
-        assert!(!end.hit_edge)
-    }
-}

From d7e3feff54689f5830a5c39d25ec263dde26f108 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 11:53:33 +1300
Subject: [PATCH 137/198] some reorganisation of code

---
 84_Super_Star_Trek/rust/src/commands.rs | 48 ++++++++++++-
 84_Super_Star_Trek/rust/src/input.rs    | 37 ++++++++++
 84_Super_Star_Trek/rust/src/main.rs     | 92 +++----------------------
 3 files changed, 91 insertions(+), 86 deletions(-)
 create mode 100644 84_Super_Star_Trek/rust/src/input.rs

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 2f42edd5..3239b45e 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,6 +1,48 @@
-use crate::{model::{Galaxy, Pos, COURSES, EndPosition}, view};
+use crate::{model::{Galaxy, Pos, COURSES, EndPosition}, view, input};
 
-pub fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
+pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
+
+    // todo check for damaged module
+
+    view::energy_available(galaxy.enterprise.total_energy);
+    let value = input::param_or_prompt_value(&provided, 0, "Number of units to shields", 0, i32::MAX);
+    if value.is_none() {
+        view::shields_unchanged();
+        return;
+    }
+    let value = value.unwrap() as u16;
+    if value > galaxy.enterprise.total_energy {
+        view::ridiculous();
+        view::shields_unchanged();
+        return;
+    }
+
+    galaxy.enterprise.shields = value;
+    view::shields_set(value);
+}
+
+pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>) {
+
+    let course = input::param_or_prompt_value(&provided, 0, "Course (1-9)?", 1, 9);
+    if course.is_none() {
+        view::bad_nav();
+        return;
+    }
+
+    let speed = input::param_or_prompt_value(&provided, 1, "Warp Factor (0-8)?", 0.0, 8.0);
+    if speed.is_none() {
+        view::bad_nav();
+        return;
+    }
+
+    move_klingons_and_fire(galaxy);
+    if galaxy.enterprise.destroyed {
+        return;
+    }
+    move_enterprise(course.unwrap(), speed.unwrap(), galaxy);
+}
+
+fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
 
     let ship = &mut galaxy.enterprise;
 
@@ -67,7 +109,7 @@ fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8,
     EndPosition { quadrant, sector, hit_edge, energy_cost }
 }
 
-pub fn move_klingons_and_fire(galaxy: &mut Galaxy) {
+fn move_klingons_and_fire(galaxy: &mut Galaxy) {
     let quadrant = &mut galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
     for k in 0..quadrant.klingons.len() {
         let new_sector = quadrant.find_empty_sector();
diff --git a/84_Super_Star_Trek/rust/src/input.rs b/84_Super_Star_Trek/rust/src/input.rs
new file mode 100644
index 00000000..75f12102
--- /dev/null
+++ b/84_Super_Star_Trek/rust/src/input.rs
@@ -0,0 +1,37 @@
+use std::{io::{stdin, stdout, Write}, str::FromStr};
+
+pub fn prompt(prompt_text: &str) -> Vec<String> {
+    let stdin = stdin();
+    let mut stdout = stdout();
+
+    print!("{prompt_text} ");
+    let _ = stdout.flush();
+
+    let mut buffer = String::new();
+    if let Ok(_) = stdin.read_line(&mut buffer) {
+        return buffer.trim_end().split(" ").map(|s| s.to_string()).collect();
+    }
+    Vec::new()
+}
+
+pub fn prompt_value<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T) -> Option<T> {
+    let passed = prompt(prompt_text);
+    if passed.len() != 1 {
+        return None
+    }
+    match passed[0].parse::<T>() {
+        Ok(n) if (n >= min && n <= max) => Some(n),
+        _ => None
+    }
+}
+
+pub fn param_or_prompt_value<T: FromStr + PartialOrd>(params: &Vec<String>, param_pos: usize, prompt_text: &str, min: T, max: T) -> Option<T> {
+    if params.len() > param_pos {
+        match params[param_pos].parse::<T>() {
+            Ok(n) => Some(n),
+            _ => None
+        }
+    } else {
+        return prompt_value::<T>(prompt_text, min, max);
+    }
+}
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 477a0594..1b9a0522 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,7 +1,8 @@
-use std::{io::{stdin, stdout, Write, Read}, process::exit, str::FromStr};
+use std::process::exit;
 
 use model::Galaxy;
 
+mod input;
 mod model;
 mod commands;
 mod view;
@@ -14,104 +15,29 @@ fn main() {
     
     view::enterprise();
     view::intro(&galaxy);
-    let _ = prompt("Press Enter when ready to accept command");
+    let _ = input::prompt("Press Enter when ready to accept command");
 
     view::starting_quadrant(&galaxy.enterprise.quadrant);
     view::short_range_scan(&galaxy);
 
     loop {
-        let command = prompt("Command?");
+        let command = input::prompt("Command?");
         if command.len() == 0 {
             continue;
         }
         match command[0].to_uppercase().as_str() {
             "SRS" => view::short_range_scan(&galaxy),
-            "NAV" => gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
-            "SHE" => get_amount_and_set_shields(&mut galaxy, command[1..].into()),
+            "NAV" => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
+            "SHE" => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
             _ => view::print_command_help()
         }
 
         if galaxy.enterprise.destroyed { // todo: also check if stranded
             view::end_game_failure(&galaxy);
+            // todo check if can restart
             break;
         }
+
+        // todo check for victory
     }
 }
-
-fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
-
-    // todo check for damaged module
-
-    view::energy_available(galaxy.enterprise.total_energy);
-    let value = param_or_prompt_value(&provided, 0, "Number of units to shields", 0, i32::MAX);
-    if value.is_none() {
-        view::shields_unchanged();
-        return;
-    }
-    let value = value.unwrap() as u16;
-    if value > galaxy.enterprise.total_energy {
-        view::ridiculous();
-        view::shields_unchanged();
-        return;
-    }
-
-    galaxy.enterprise.shields = value;
-    view::shields_set(value);
-}
-
-fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>) {
-
-    let course = param_or_prompt_value(&provided, 0, "Course (1-9)?", 1, 9);
-    if course.is_none() {
-        view::bad_nav();
-        return;
-    }
-
-    let speed = param_or_prompt_value(&provided, 1, "Warp Factor (0-8)?", 0.0, 8.0);
-    if speed.is_none() {
-        view::bad_nav();
-        return;
-    }
-
-    commands::move_klingons_and_fire(galaxy);
-    if galaxy.enterprise.destroyed {
-        return;
-    }
-    commands::move_enterprise(course.unwrap(), speed.unwrap(), galaxy);
-}
-
-fn prompt(prompt_text: &str) -> Vec<String> {
-    let stdin = stdin();
-    let mut stdout = stdout();
-
-    print!("{prompt_text} ");
-    let _ = stdout.flush();
-
-    let mut buffer = String::new();
-    if let Ok(_) = stdin.read_line(&mut buffer) {
-        return buffer.trim_end().split(" ").map(|s| s.to_string()).collect();
-    }
-    Vec::new()
-}
-
-fn prompt_value<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T) -> Option<T> {
-    let passed = prompt(prompt_text);
-    if passed.len() != 1 {
-        return None
-    }
-    match passed[0].parse::<T>() {
-        Ok(n) if (n >= min && n <= max) => Some(n),
-        _ => None
-    }
-}
-
-fn param_or_prompt_value<T: FromStr + PartialOrd>(params: &Vec<String>, param_pos: usize, prompt_text: &str, min: T, max: T) -> Option<T> {
-    if params.len() > param_pos {
-        match params[param_pos].parse::<T>() {
-            Ok(n) => Some(n),
-            _ => None
-        }
-    } else {
-        return prompt_value::<T>(prompt_text, min, max);
-    }
-}
\ No newline at end of file

From bcb1c68cb54293090b77253071226c33a0745f53 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 11:55:55 +1300
Subject: [PATCH 138/198] added some tasks

---
 84_Super_Star_Trek/rust/tasks.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 918a0395..29f47cd3 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -19,3 +19,9 @@ Started after movement and display of stats was finished (no energy management o
     - when moving across a sector, the enterprise should stop before it runs into something
     - the current move is a jump, which makes this problematic. would need to rewrite it
 - [x] better command reading - support entering multiple values on a line (e.g. nav 3 0.1)
+- [ ] starbases
+    - [ ] repair
+- [ ] weapons
+    - [ ] phasers
+    - [ ] torpedoes
+- [ ] restarting the game

From 0581fe38f81b42bc81f8dd8d1b80b7ba80781aa8 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 13:36:30 +1300
Subject: [PATCH 139/198] basic damage to systems and restricted warp speed

---
 84_Super_Star_Trek/rust/src/commands.rs | 33 ++++++++++++++++++++++---
 84_Super_Star_Trek/rust/src/main.rs     |  6 ++---
 84_Super_Star_Trek/rust/src/model.rs    |  6 ++---
 84_Super_Star_Trek/rust/src/view.rs     | 25 ++++++++++++++++++-
 4 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 3239b45e..0675ee4f 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,8 +1,20 @@
 use crate::{model::{Galaxy, Pos, COURSES, EndPosition}, view, input};
 
+pub fn perform_short_range_scan(galaxy: &Galaxy) {
+    if galaxy.enterprise.damaged.contains_key(view::keys::SHORT_RANGE_SCAN) {
+        view::scanners_out();
+        return;
+    }
+
+    view::short_range_scan(&galaxy)
+}
+
 pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
 
-    // todo check for damaged module
+    if galaxy.enterprise.damaged.contains_key(view::keys::SHIELD_CONTROL) {
+        view::inoperable("Shield Control");
+        return;
+    }
 
     view::energy_available(galaxy.enterprise.total_energy);
     let value = input::param_or_prompt_value(&provided, 0, "Number of units to shields", 0, i32::MAX);
@@ -10,6 +22,7 @@ pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
         view::shields_unchanged();
         return;
     }
+
     let value = value.unwrap() as u16;
     if value > galaxy.enterprise.total_energy {
         view::ridiculous();
@@ -29,17 +42,31 @@ pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>
         return;
     }
 
-    let speed = input::param_or_prompt_value(&provided, 1, "Warp Factor (0-8)?", 0.0, 8.0);
+    let course = course.unwrap();
+
+    let mut max_warp = 8.0;
+    if galaxy.enterprise.damaged.contains_key(view::keys::NAVIGATION) {
+        max_warp = 0.2;
+    }
+
+    let speed = input::param_or_prompt_value(&provided, 1, format!("Warp Factor (0-{})?", max_warp).as_str(), 0.0, 8.0);
     if speed.is_none() {
         view::bad_nav();
         return;
     }
+    
+    let speed = speed.unwrap();
+
+    if speed > max_warp {
+        view::damaged_engines(max_warp, speed);
+        return;
+    }
 
     move_klingons_and_fire(galaxy);
     if galaxy.enterprise.destroyed {
         return;
     }
-    move_enterprise(course.unwrap(), speed.unwrap(), galaxy);
+    move_enterprise(course, speed, galaxy);
 }
 
 fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 1b9a0522..ecde0476 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -26,9 +26,9 @@ fn main() {
             continue;
         }
         match command[0].to_uppercase().as_str() {
-            "SRS" => view::short_range_scan(&galaxy),
-            "NAV" => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
-            "SHE" => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
+            view::keys::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
+            view::keys::NAVIGATION => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
+            view::keys::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
             _ => view::print_command_help()
         }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 4f5a65ac..a078df05 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -1,4 +1,4 @@
-use std::{ops::{Mul, Add}, fmt::Display};
+use std::{ops::{Mul, Add}, fmt::Display, collections::HashMap};
 
 use rand::Rng;
 
@@ -37,7 +37,7 @@ impl Klingon {
 
 pub struct Enterprise {
     pub destroyed: bool,
-    pub damaged: bool, // later this could be by subsystem
+    pub damaged: HashMap<String, f32>,
     pub quadrant: Pos,
     pub sector: Pos,
     pub photon_torpedoes: u8,
@@ -147,7 +147,7 @@ impl Galaxy {
             quadrants: quadrants, 
             enterprise: Enterprise { 
                 destroyed: false,
-                damaged: false,
+                damaged: HashMap::new(),
                 quadrant: enterprise_quadrant, 
                 sector: enterprise_sector,
                 photon_torpedoes: 28,
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 02c72815..68934549 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,5 +1,15 @@
 use crate::model::{Galaxy, Pos, EndPosition, SectorStatus};
 
+pub mod keys {
+    pub const SHORT_RANGE_SCAN: &str = "SRS";
+    pub const NAVIGATION: &str = "NAV";
+    pub const SHIELD_CONTROL: &str = "SHE";
+
+    pub const ALL_SYSTEMS: [&str; 3] = [
+        SHORT_RANGE_SCAN, NAVIGATION, SHIELD_CONTROL
+    ];
+}
+
 pub fn enterprise() {
     println!("
 
@@ -82,7 +92,7 @@ pub fn short_range_scan(model: &Galaxy) {
     let mut condition = "GREEN";
     if quadrant.klingons.len() > 0 {
         condition = "*RED*";
-    } else if model.enterprise.damaged {
+    } else if model.enterprise.damaged.len() > 0 {
         condition = "YELLOW";
     }
 
@@ -195,3 +205,16 @@ pub fn shields_set(value: u16) {
 pub fn shields_hit(shields: u16) {
     println!("      <Shields down to {shields} units>")
 }
+
+pub fn inoperable(arg: &str) {
+    println!("{} inoperable", arg)
+}
+
+pub fn scanners_out() {
+    println!("*** Short Range Sensors are out ***")
+}
+
+pub fn damaged_engines(max_warp: f32, warp_factor: f32) {
+    println!("Warp engines are damaged.  Maximum speed = warp {max_warp}
+    Chief Engineer Scott reports, 'The engines won't take warp {warp_factor} !'")
+}

From f253ff7155a140c5903f1a1bd742ad46f175d585 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 13:39:12 +1300
Subject: [PATCH 140/198] moved where system keys are defined

---
 84_Super_Star_Trek/rust/src/commands.rs | 10 ++++------
 84_Super_Star_Trek/rust/src/main.rs     |  6 +++---
 84_Super_Star_Trek/rust/src/model.rs    | 10 ++++++++++
 84_Super_Star_Trek/rust/src/view.rs     | 10 ----------
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 0675ee4f..86c72f98 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,7 +1,7 @@
-use crate::{model::{Galaxy, Pos, COURSES, EndPosition}, view, input};
+use crate::{model::{Galaxy, Pos, COURSES, EndPosition, self}, view, input};
 
 pub fn perform_short_range_scan(galaxy: &Galaxy) {
-    if galaxy.enterprise.damaged.contains_key(view::keys::SHORT_RANGE_SCAN) {
+    if galaxy.enterprise.damaged.contains_key(model::systems::SHORT_RANGE_SCAN) {
         view::scanners_out();
         return;
     }
@@ -11,7 +11,7 @@ pub fn perform_short_range_scan(galaxy: &Galaxy) {
 
 pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
 
-    if galaxy.enterprise.damaged.contains_key(view::keys::SHIELD_CONTROL) {
+    if galaxy.enterprise.damaged.contains_key(model::systems::SHIELD_CONTROL) {
         view::inoperable("Shield Control");
         return;
     }
@@ -45,7 +45,7 @@ pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>
     let course = course.unwrap();
 
     let mut max_warp = 8.0;
-    if galaxy.enterprise.damaged.contains_key(view::keys::NAVIGATION) {
+    if galaxy.enterprise.damaged.contains_key(model::systems::WARP_ENGINES) {
         max_warp = 0.2;
     }
 
@@ -77,8 +77,6 @@ fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
 
     let end = find_end_quadrant_sector(ship.quadrant, ship.sector, course, warp_speed);
 
-    // todo account for engine damage
-
     if end.energy_cost > ship.total_energy {
         view::insuffient_warp_energy(warp_speed);
         return
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index ecde0476..5db8350c 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -26,9 +26,9 @@ fn main() {
             continue;
         }
         match command[0].to_uppercase().as_str() {
-            view::keys::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
-            view::keys::NAVIGATION => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
-            view::keys::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
+            model::systems::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
+            model::systems::WARP_ENGINES => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
+            model::systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
             _ => view::print_command_help()
         }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index a078df05..f46cc548 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -64,6 +64,16 @@ impl Enterprise {
     }
 }
 
+pub mod systems {
+    pub const SHORT_RANGE_SCAN: &str = "SRS";
+    pub const WARP_ENGINES: &str = "NAV";
+    pub const SHIELD_CONTROL: &str = "SHE";
+
+    pub const ALL: [&str; 3] = [
+        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL
+    ];
+}
+
 pub struct EndPosition {
     pub quadrant: Pos,
     pub sector: Pos,
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 68934549..e7bc5516 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,15 +1,5 @@
 use crate::model::{Galaxy, Pos, EndPosition, SectorStatus};
 
-pub mod keys {
-    pub const SHORT_RANGE_SCAN: &str = "SRS";
-    pub const NAVIGATION: &str = "NAV";
-    pub const SHIELD_CONTROL: &str = "SHE";
-
-    pub const ALL_SYSTEMS: [&str; 3] = [
-        SHORT_RANGE_SCAN, NAVIGATION, SHIELD_CONTROL
-    ];
-}
-
 pub fn enterprise() {
     println!("
 

From cb685efe0cc32112242d4f657ee802505d2e6dc4 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 13:48:42 +1300
Subject: [PATCH 141/198] random system damage on hit

---
 84_Super_Star_Trek/rust/src/commands.rs |  1 -
 84_Super_Star_Trek/rust/src/model.rs    | 17 +++++++++++++++++
 84_Super_Star_Trek/rust/tasks.md        |  5 +++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 86c72f98..c5e59c12 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -86,7 +86,6 @@ fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
         view::hit_edge(&end);
     }
     
-
     if ship.quadrant != end.quadrant {
         view::enter_quadrant(&end.quadrant);
         
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index f46cc548..c968c08a 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -60,7 +60,24 @@ impl Enterprise {
         }
 
         view::shields_hit(self.shields);
+        
         // take damage if strength is greater than 20
+        if hit_strength >= 20 {
+            self.take_damage(hit_strength)
+        }
+    }
+
+    fn take_damage(&mut self, hit_strength: u16) {
+        let mut rng = rand::thread_rng();
+
+        let hit_past_shield = hit_strength as f32 / self.shields as f32;
+        if rng.gen::<f32>() > 0.6 || hit_past_shield < 0.02 {
+            return
+        }
+
+        let system = systems::ALL[rng.gen_range(0..systems::ALL.len())].to_string();
+        let damage = hit_past_shield + rng.gen::<f32>() * 0.5;
+        self.damaged.entry(system).and_modify(|d| *d += damage).or_insert(damage);
     }
 }
 
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 29f47cd3..c55914df 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -11,8 +11,9 @@ Started after movement and display of stats was finished (no energy management o
 - [x] shields
     - [x] shield control
     - [x] shield hit absorption
-- [ ] subsystem damage
-    - and support for reports
+- [x] subsystem damage
+    - [ ] and support for reports
+- [ ] random system damage on move
 - [ ] lrs?
 - [ ] stranded...
 - [ ] stop before hitting an object

From 33fc2b4c5a9a833fe73794e74a8c1c071c72afb5 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 14:11:49 +1300
Subject: [PATCH 142/198] implemented damage command

---
 84_Super_Star_Trek/rust/src/commands.rs | 16 +++++++++++++++-
 84_Super_Star_Trek/rust/src/main.rs     |  1 +
 84_Super_Star_Trek/rust/src/model.rs    | 14 ++++++++++----
 84_Super_Star_Trek/rust/tasks.md        |  2 +-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index c5e59c12..2bc5f4f6 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,4 +1,4 @@
-use crate::{model::{Galaxy, Pos, COURSES, EndPosition, self}, view, input};
+use crate::{model::{Galaxy, Pos, COURSES, EndPosition, self, Enterprise, systems}, view, input};
 
 pub fn perform_short_range_scan(galaxy: &Galaxy) {
     if galaxy.enterprise.damaged.contains_key(model::systems::SHORT_RANGE_SCAN) {
@@ -146,3 +146,17 @@ fn move_klingons_and_fire(galaxy: &mut Galaxy) {
         quadrant.klingons[k].fire_on(&mut galaxy.enterprise);
     }
 }
+
+pub fn display_damage_control(enterprise: &Enterprise) {
+    if enterprise.damaged.contains_key(model::systems::DAMAGE_CONTROL) {
+        view::inoperable("Damage Control");
+        return;
+    }
+
+    println!("Device             State of Repair");
+    for i in 0..systems::NAMES.len() {
+        let damage = enterprise.damaged.get(systems::ALL[i]).unwrap_or(&0.0);
+        println!("{:<25}{}", systems::NAMES[i], damage)
+    }
+    println!();
+}
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 5db8350c..0809ec23 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -29,6 +29,7 @@ fn main() {
             model::systems::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
             model::systems::WARP_ENGINES => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
             model::systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
+            model::systems::DAMAGE_CONTROL => commands::display_damage_control(&galaxy.enterprise),
             _ => view::print_command_help()
         }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index c968c08a..675ac8ec 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -61,7 +61,6 @@ impl Enterprise {
 
         view::shields_hit(self.shields);
         
-        // take damage if strength is greater than 20
         if hit_strength >= 20 {
             self.take_damage(hit_strength)
         }
@@ -77,17 +76,24 @@ impl Enterprise {
 
         let system = systems::ALL[rng.gen_range(0..systems::ALL.len())].to_string();
         let damage = hit_past_shield + rng.gen::<f32>() * 0.5;
-        self.damaged.entry(system).and_modify(|d| *d += damage).or_insert(damage);
+        self.damaged.entry(system).and_modify(|d| *d -= damage).or_insert(-damage);
     }
 }
 
 pub mod systems {
+    use std::collections::HashMap;
+
     pub const SHORT_RANGE_SCAN: &str = "SRS";
     pub const WARP_ENGINES: &str = "NAV";
     pub const SHIELD_CONTROL: &str = "SHE";
+    pub const DAMAGE_CONTROL: &str = "DAM";
 
-    pub const ALL: [&str; 3] = [
-        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL
+    pub const ALL: [&str; 4] = [
+        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL
+    ];
+
+    pub const NAMES: [&str; 4] = [
+        "Short Range Scanners", "Warp Engines", "Shield Control", "Damage Control"
     ];
 }
 
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index c55914df..e6c68ce1 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -12,7 +12,7 @@ Started after movement and display of stats was finished (no energy management o
     - [x] shield control
     - [x] shield hit absorption
 - [x] subsystem damage
-    - [ ] and support for reports
+    - [x] and support for reports
 - [ ] random system damage on move
 - [ ] lrs?
 - [ ] stranded...

From 51663ea0b168b2ee6915b9b198a6b74ec864c9fb Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 17:13:52 +1300
Subject: [PATCH 143/198] implemented random system movement changes damage and
 repair, with changes to how this is implemented / reported

---
 84_Super_Star_Trek/rust/src/commands.rs | 52 +++++++++++++++++++++++--
 84_Super_Star_Trek/rust/src/model.rs    | 34 ++++++++++++----
 84_Super_Star_Trek/rust/src/view.rs     | 16 ++++++++
 84_Super_Star_Trek/rust/tasks.md        |  2 +-
 4 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 2bc5f4f6..3b14e4cf 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,3 +1,5 @@
+use rand::Rng;
+
 use crate::{model::{Galaxy, Pos, COURSES, EndPosition, self, Enterprise, systems}, view, input};
 
 pub fn perform_short_range_scan(galaxy: &Galaxy) {
@@ -66,9 +68,53 @@ pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>
     if galaxy.enterprise.destroyed {
         return;
     }
+
+    repair_systems(&mut galaxy.enterprise, speed);
+    repair_or_damage_random_system(&mut galaxy.enterprise);
+
     move_enterprise(course, speed, galaxy);
 }
 
+fn repair_systems(enterprise: &mut Enterprise, amount: f32) {
+
+    let keys: Vec<String> = enterprise.damaged.keys().map(|k| k.to_string()).collect();
+    let mut repaired = Vec::new();
+    for key in keys {
+        let fully_fixed = enterprise.repair_system(&key, amount);
+        if fully_fixed {
+            repaired.push(systems::name_for(&key));
+        }
+    }
+
+    if repaired.len() <= 0 {
+        return;
+    }
+
+    view::damage_control_report();
+    for name in repaired {
+        view::system_repair_completed(name);
+    }
+}
+
+fn repair_or_damage_random_system(enterprise: &mut Enterprise) {
+    let mut rng = rand::thread_rng();
+
+    if rng.gen::<f32>() > 0.2 {
+        return;
+    }
+
+    let system = systems::KEYS[rng.gen_range(0..systems::KEYS.len())].to_string();
+    let system_name = &systems::name_for(&system);
+
+    if rng.gen::<f32>() >= 0.6 {
+        enterprise.repair_system(&system, rng.gen::<f32>() * 3.0 + 1.0);
+        view::random_repair_report_for(system_name, false);
+    } else {
+        enterprise.damage_system(&system, rng.gen::<f32>() * 5.0 + 1.0);
+        view::random_repair_report_for(system_name, true);
+    }
+}
+
 fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
 
     let ship = &mut galaxy.enterprise;
@@ -154,9 +200,9 @@ pub fn display_damage_control(enterprise: &Enterprise) {
     }
 
     println!("Device             State of Repair");
-    for i in 0..systems::NAMES.len() {
-        let damage = enterprise.damaged.get(systems::ALL[i]).unwrap_or(&0.0);
-        println!("{:<25}{}", systems::NAMES[i], damage)
+    for key in systems::KEYS {
+        let damage = enterprise.damaged.get(key).unwrap_or(&0.0);
+        println!("{:<25}{}", systems::name_for(key), damage)
     }
     println!();
 }
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 675ac8ec..515b7fb2 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -74,27 +74,47 @@ impl Enterprise {
             return
         }
 
-        let system = systems::ALL[rng.gen_range(0..systems::ALL.len())].to_string();
+        let system = systems::KEYS[rng.gen_range(0..systems::KEYS.len())].to_string();
         let damage = hit_past_shield + rng.gen::<f32>() * 0.5;
-        self.damaged.entry(system).and_modify(|d| *d -= damage).or_insert(-damage);
+        self.damage_system(&system, damage);
+    }
+
+    pub fn damage_system(&mut self, system: &str, damage: f32) {
+        self.damaged.entry(system.to_string()).and_modify(|d| *d -= damage).or_insert(-damage);
+    }
+
+    pub fn repair_system(&mut self, system: &str, amount: f32) -> bool {
+        let existing_damage = self.damaged[system];
+        if existing_damage + amount >= 0.0 {
+            self.damaged.remove(system);
+            return true;
+        }
+    
+        self.damaged.entry(system.to_string()).and_modify(|d| *d += amount);
+        return false;
     }
 }
 
 pub mod systems {
-    use std::collections::HashMap;
 
     pub const SHORT_RANGE_SCAN: &str = "SRS";
     pub const WARP_ENGINES: &str = "NAV";
     pub const SHIELD_CONTROL: &str = "SHE";
     pub const DAMAGE_CONTROL: &str = "DAM";
 
-    pub const ALL: [&str; 4] = [
+    pub const KEYS: [&str; 4] = [
         SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL
     ];
 
-    pub const NAMES: [&str; 4] = [
-        "Short Range Scanners", "Warp Engines", "Shield Control", "Damage Control"
-    ];
+    pub fn name_for(key: &str) -> String {
+        match key {
+            SHORT_RANGE_SCAN => "Short Range Scanners".into(),
+            WARP_ENGINES => "Warp Engines".into(),
+            SHIELD_CONTROL => "Shield Control".into(),
+            DAMAGE_CONTROL => "Damage Control".into(),
+            _ => "Unknown".into()
+        }
+    }
 }
 
 pub struct EndPosition {
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index e7bc5516..e34c44d4 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -208,3 +208,19 @@ pub fn damaged_engines(max_warp: f32, warp_factor: f32) {
     println!("Warp engines are damaged.  Maximum speed = warp {max_warp}
     Chief Engineer Scott reports, 'The engines won't take warp {warp_factor} !'")
 }
+
+pub fn damage_control_report() {
+    println!("Damage Control report:")
+}
+
+pub fn random_repair_report_for(name: &str, damaged: bool) {
+    let mut message = "state of repair improved";
+    if damaged {
+        message = "damaged";
+    }
+    println!("Damage Control report:  {name} {message}")
+}
+
+pub fn system_repair_completed(name: String) {
+    println!("        {name} repair completed.")
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index e6c68ce1..0c81bce1 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -13,7 +13,7 @@ Started after movement and display of stats was finished (no energy management o
     - [x] shield hit absorption
 - [x] subsystem damage
     - [x] and support for reports
-- [ ] random system damage on move
+- [x] random system damage or repairs on move
 - [ ] lrs?
 - [ ] stranded...
 - [ ] stop before hitting an object

From 4644a91024b2e0d5dfd70d68bf8b3cca61e01b66 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 18:56:47 +1300
Subject: [PATCH 144/198] implemented long range scanners

---
 84_Super_Star_Trek/rust/src/commands.rs |  9 +++++++++
 84_Super_Star_Trek/rust/src/main.rs     |  3 ++-
 84_Super_Star_Trek/rust/src/model.rs    |  6 ++++--
 84_Super_Star_Trek/rust/src/view.rs     | 27 +++++++++++++++++++++++++
 84_Super_Star_Trek/rust/tasks.md        |  3 +++
 5 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 3b14e4cf..25c2954d 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -206,3 +206,12 @@ pub fn display_damage_control(enterprise: &Enterprise) {
     }
     println!();
 }
+
+pub fn perform_long_range_scan(galaxy: &Galaxy) {
+    if galaxy.enterprise.damaged.contains_key(model::systems::SHORT_RANGE_SCAN) {
+        view::inoperable("Long Range Scanners");
+        return;
+    }
+
+    view::long_range_scan(galaxy);
+}
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 0809ec23..fd01b9b5 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -25,11 +25,12 @@ fn main() {
         if command.len() == 0 {
             continue;
         }
-        match command[0].to_uppercase().as_str() {
+        match command[0].to_uppercase().as_str() { // order is weird because i built it in this order :)
             model::systems::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
             model::systems::WARP_ENGINES => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
             model::systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
             model::systems::DAMAGE_CONTROL => commands::display_damage_control(&galaxy.enterprise),
+            model::systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&galaxy),
             _ => view::print_command_help()
         }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 515b7fb2..f502a13f 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -101,9 +101,10 @@ pub mod systems {
     pub const WARP_ENGINES: &str = "NAV";
     pub const SHIELD_CONTROL: &str = "SHE";
     pub const DAMAGE_CONTROL: &str = "DAM";
+    pub const LONG_RANGE_SCAN: &str = "LRS";
 
-    pub const KEYS: [&str; 4] = [
-        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL
+    pub const KEYS: [&str; 5] = [
+        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL, LONG_RANGE_SCAN
     ];
 
     pub fn name_for(key: &str) -> String {
@@ -112,6 +113,7 @@ pub mod systems {
             WARP_ENGINES => "Warp Engines".into(),
             SHIELD_CONTROL => "Shield Control".into(),
             DAMAGE_CONTROL => "Damage Control".into(),
+            LONG_RANGE_SCAN => "Long Range Scanners".into(),
             _ => "Unknown".into()
         }
     }
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index e34c44d4..26daf070 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -224,3 +224,30 @@ pub fn random_repair_report_for(name: &str, damaged: bool) {
 pub fn system_repair_completed(name: String) {
     println!("        {name} repair completed.")
 }
+
+pub fn long_range_scan(galaxy: &Galaxy) {
+
+    let cx = galaxy.enterprise.quadrant.0 as i8;
+    let cy = galaxy.enterprise.quadrant.1 as i8;
+
+    println!("Long range scan for quadrant {}", galaxy.enterprise.quadrant);
+    println!("{:-^19}", "");
+    for y in cy - 1..=cy + 1 {
+        for x in cx - 1..=cx + 1 {
+            let mut klingons = "*".into();
+            let mut star_bases = "*".into();
+            let mut stars = "*".into();
+
+            if y >= 0 && y < 8 && x >= 0 && x < 8 {
+                let quadrant = &galaxy.quadrants[Pos(x as u8, y as u8).as_index()];
+                klingons = format!("{}", quadrant.klingons.len());
+                star_bases = quadrant.star_base.map_or("0", |_| "1");
+                stars = format!("{}", quadrant.stars.len());
+            }
+
+            print!(": {}{}{} ", klingons, stars, star_bases)
+        }
+        println!(":");
+        println!("{:-^19}", "");
+    } 
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 0c81bce1..8dd2d166 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -19,6 +19,7 @@ Started after movement and display of stats was finished (no energy management o
 - [ ] stop before hitting an object
     - when moving across a sector, the enterprise should stop before it runs into something
     - the current move is a jump, which makes this problematic. would need to rewrite it
+    - also, movement courses could be floats, according to the instructions, allowing for more precise movement and aiming
 - [x] better command reading - support entering multiple values on a line (e.g. nav 3 0.1)
 - [ ] starbases
     - [ ] repair
@@ -26,3 +27,5 @@ Started after movement and display of stats was finished (no energy management o
     - [ ] phasers
     - [ ] torpedoes
 - [ ] restarting the game
+- [ ] time progression
+    - check all areas where time should move, and adjust accordingly

From 460dcd7ab44ca6c3df435b33a43e698f17335c3b Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 18:57:53 +1300
Subject: [PATCH 145/198] slight tweak to allow close to fixed to be fixed

---
 84_Super_Star_Trek/rust/src/model.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index f502a13f..a55eb62f 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -85,7 +85,7 @@ impl Enterprise {
 
     pub fn repair_system(&mut self, system: &str, amount: f32) -> bool {
         let existing_damage = self.damaged[system];
-        if existing_damage + amount >= 0.0 {
+        if existing_damage + amount >= -0.1 {
             self.damaged.remove(system);
             return true;
         }

From d76b0482369cff2c82a83ac9804d78f3aaad6835 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 19:01:48 +1300
Subject: [PATCH 146/198] revised random repair or damage to only repair
 damaged systems

---
 84_Super_Star_Trek/rust/src/commands.rs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 25c2954d..099b5496 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -103,16 +103,25 @@ fn repair_or_damage_random_system(enterprise: &mut Enterprise) {
         return;
     }
 
+    if rng.gen::<f32>() >= 0.6 {
+        if enterprise.damaged.len() == 0 {
+            return;
+        }
+
+        let damaged: Vec<String> = enterprise.damaged.keys().map(|k| k.to_string()).collect();
+        let system = damaged[rng.gen_range(0..damaged.len())].to_string();
+        let system_name = &systems::name_for(&system);
+
+        enterprise.repair_system(&system, rng.gen::<f32>() * 3.0 + 1.0);
+        view::random_repair_report_for(system_name, false);
+        return;
+    }
+    
     let system = systems::KEYS[rng.gen_range(0..systems::KEYS.len())].to_string();
     let system_name = &systems::name_for(&system);
 
-    if rng.gen::<f32>() >= 0.6 {
-        enterprise.repair_system(&system, rng.gen::<f32>() * 3.0 + 1.0);
-        view::random_repair_report_for(system_name, false);
-    } else {
-        enterprise.damage_system(&system, rng.gen::<f32>() * 5.0 + 1.0);
-        view::random_repair_report_for(system_name, true);
-    }
+    enterprise.damage_system(&system, rng.gen::<f32>() * 5.0 + 1.0);
+    view::random_repair_report_for(system_name, true);
 }
 
 fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {

From 2360bfd0c2dd869025a4ff46490852178f785ac7 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 19:08:21 +1300
Subject: [PATCH 147/198] implemented getting stranded

---
 84_Super_Star_Trek/rust/src/main.rs  | 2 +-
 84_Super_Star_Trek/rust/src/model.rs | 8 ++++++++
 84_Super_Star_Trek/rust/src/view.rs  | 6 ++++++
 84_Super_Star_Trek/rust/tasks.md     | 5 +++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index fd01b9b5..385d122c 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -34,7 +34,7 @@ fn main() {
             _ => view::print_command_help()
         }
 
-        if galaxy.enterprise.destroyed { // todo: also check if stranded
+        if galaxy.enterprise.destroyed || galaxy.enterprise.check_stranded() {
             view::end_game_failure(&galaxy);
             // todo check if can restart
             break;
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index a55eb62f..f231124c 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -93,6 +93,14 @@ impl Enterprise {
         self.damaged.entry(system.to_string()).and_modify(|d| *d += amount);
         return false;
     }
+
+    pub fn check_stranded(&self) -> bool {
+        if self.total_energy < 10 || (self.total_energy - self.shields < 10 && self.damaged.contains_key(systems::SHIELD_CONTROL)) {
+            view::stranded();
+            return true;
+        }
+        return false;
+    }
 }
 
 pub mod systems {
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 26daf070..fc4a4735 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -251,3 +251,9 @@ pub fn long_range_scan(galaxy: &Galaxy) {
         println!("{:-^19}", "");
     } 
 }
+
+pub fn stranded() {
+    println!("** FATAL ERROR **   You've just stranded your ship in space
+You have insufficient maneuvering energy, and shield control
+is presently incapable of cross-circuiting to engine room!!")
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 8dd2d166..a2729d9b 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -14,8 +14,8 @@ Started after movement and display of stats was finished (no energy management o
 - [x] subsystem damage
     - [x] and support for reports
 - [x] random system damage or repairs on move
-- [ ] lrs?
-- [ ] stranded...
+- [x] lrs?
+- [x] stranded...
 - [ ] stop before hitting an object
     - when moving across a sector, the enterprise should stop before it runs into something
     - the current move is a jump, which makes this problematic. would need to rewrite it
@@ -29,3 +29,4 @@ Started after movement and display of stats was finished (no energy management o
 - [ ] restarting the game
 - [ ] time progression
     - check all areas where time should move, and adjust accordingly
+- [ ] intro instructions

From 134b17f77e1feb2bc5d1f56452605d69fc9b5490 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 19:59:57 +1300
Subject: [PATCH 148/198] implemented computer with region map

---
 84_Super_Star_Trek/rust/src/commands.rs |  31 ++++-
 84_Super_Star_Trek/rust/src/main.rs     |   1 +
 84_Super_Star_Trek/rust/src/model.rs    |   6 +-
 84_Super_Star_Trek/rust/src/view.rs     | 166 ++++++++++++++++++++++--
 84_Super_Star_Trek/rust/tasks.md        |   9 ++
 5 files changed, 194 insertions(+), 19 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 099b5496..db3d4a32 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -14,7 +14,7 @@ pub fn perform_short_range_scan(galaxy: &Galaxy) {
 pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
 
     if galaxy.enterprise.damaged.contains_key(model::systems::SHIELD_CONTROL) {
-        view::inoperable("Shield Control");
+        view::inoperable(&systems::name_for(systems::SHIELD_CONTROL));
         return;
     }
 
@@ -204,7 +204,7 @@ fn move_klingons_and_fire(galaxy: &mut Galaxy) {
 
 pub fn display_damage_control(enterprise: &Enterprise) {
     if enterprise.damaged.contains_key(model::systems::DAMAGE_CONTROL) {
-        view::inoperable("Damage Control");
+        view::inoperable(&systems::name_for(systems::DAMAGE_CONTROL));
         return;
     }
 
@@ -217,10 +217,33 @@ pub fn display_damage_control(enterprise: &Enterprise) {
 }
 
 pub fn perform_long_range_scan(galaxy: &Galaxy) {
-    if galaxy.enterprise.damaged.contains_key(model::systems::SHORT_RANGE_SCAN) {
-        view::inoperable("Long Range Scanners");
+    if galaxy.enterprise.damaged.contains_key(model::systems::LONG_RANGE_SCAN) {
+        view::inoperable(&systems::name_for(systems::LONG_RANGE_SCAN));
         return;
     }
 
     view::long_range_scan(galaxy);
+}
+
+pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
+    if galaxy.enterprise.damaged.contains_key(model::systems::COMPUTER) {
+        view::inoperable(&systems::name_for(systems::COMPUTER));
+        return;
+    }
+
+    let operation : i32;
+    loop {
+        let entered = input::param_or_prompt_value(&provided, 0, "Computer active and waiting command?", 0, 5);
+        if entered.is_none() {
+            view::computer_options();
+        } else {
+            operation = entered.unwrap();
+            break;
+        }
+    } 
+    
+    match operation {
+        5 => view::galaxy_region_map(),
+        _ => todo!() // todo implement others
+    }
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 385d122c..f7db0845 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -31,6 +31,7 @@ fn main() {
             model::systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
             model::systems::DAMAGE_CONTROL => commands::display_damage_control(&galaxy.enterprise),
             model::systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&galaxy),
+            model::systems::COMPUTER => commands::access_computer(&galaxy, command[1..].into()),
             _ => view::print_command_help()
         }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index f231124c..549031db 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -110,9 +110,10 @@ pub mod systems {
     pub const SHIELD_CONTROL: &str = "SHE";
     pub const DAMAGE_CONTROL: &str = "DAM";
     pub const LONG_RANGE_SCAN: &str = "LRS";
+    pub const COMPUTER: &str = "COM";
 
-    pub const KEYS: [&str; 5] = [
-        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL, LONG_RANGE_SCAN
+    pub const KEYS: [&str; 6] = [
+        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL, LONG_RANGE_SCAN, COMPUTER
     ];
 
     pub fn name_for(key: &str) -> String {
@@ -122,6 +123,7 @@ pub mod systems {
             SHIELD_CONTROL => "Shield Control".into(),
             DAMAGE_CONTROL => "Damage Control".into(),
             LONG_RANGE_SCAN => "Long Range Scanners".into(),
+            COMPUTER => "Library-Computer".into(),
             _ => "Unknown".into()
         }
     }
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index fc4a4735..e4fbed20 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,5 +1,114 @@
 use crate::model::{Galaxy, Pos, EndPosition, SectorStatus};
 
+pub fn full_instructions() {
+    println!(
+"        INSTRUCTIONS FOR 'SUPER STAR TREK'
+
+    1. When you see \"Command ?\" printed, enter one of the legal
+         commands (NAV, SRS, LRS, PHA, TOR, SHE, DAM, COM, OR XXX).
+    2. If you should type in an illegal command, you'll get a short
+         list of the legal commands printed out.
+    3. Some commands require you to enter data (for example, the
+         'NAV' command comes back with 'Course (1-9) ?'.)  If you
+         type in illegal data (like negative numbers), then command
+         will be aborted.
+    
+         The galaxy is divided into an 8 X 8 quadrant grid,
+    and each quadrant is further divided into an 8 X 8 sector grid.
+    
+         You will be assigned a starting point somewhere in the
+    galaxy to begin a tour of duty as commander of the starship
+    Enterprise; your mission: to seek and destroy the fleet of
+    Klingon warships which are menacing the United Federation of
+    Planets.
+    
+         You have the following commands available to you as captain
+    of the starship Enterprise:
+    
+    NAV command = Warp Engine Control
+         Course is in a circular numerical      4  3  2
+         vector arrangement as shown             . . .
+         integer and real values may be           ...
+         used.  (Thus course 1.5 is half-     5 ---*--- 1
+         way between 1 and 2.                     ...
+                                                 . . .
+         Values may approach 9.0, which         6  7  8
+         itself is equivalent to 1.0
+                                                COURSE
+         One warp factor is the size of
+         one quadrant.  Therefore, to get
+         from quadrant 6,5 to 5,5, you WOULD
+         use course 3, warp factor 1.
+    
+    SRS command = Short Range Sensor Scan
+         Shows you a scan of your present quadrant.
+    
+         Symbology on your sensor screen is as follows:
+            <*> = Your starship's position
+            +K+ = Klingon battle cruiser
+            >!< = Federation starbase (refuel/repair/re-arm here!)
+             *  = Star
+    
+         A condensed 'status report' will also be presented.
+    
+    LRS command = Long Range Sensor Scan
+         Shows conditions in space for one quadrant on each side
+         of the Enterprise (which is in the middle of the scan).
+         The scan is coded in the form ###, where the units digit
+         is the number of stars, the tens digit is the number of
+         starbases, and the hundreds digit is the number of
+         Klingons.
+    
+         Example - 207 = 2 Klingons, No starbases, & 7 stars.
+    
+    PHA command = Phaser Control
+         Allows you to destroy the Klingon battle cruisers by
+         zapping them with suitably large units of energy to
+         deplete their shield power.  (Remember, Klingons have
+         phasers, too!)
+    
+    TOR command = Photon Torpedo Control
+         Torpedo course is the same as used in warp engine control.
+         If you hit the Klingon vessel, he is destroyed and
+         cannot fire back at you.  If you miss, you are subject to
+         his phaser fire.  In either case, you are also subject to
+         the phaser fire of all other Klingons in the quadrant.
+    
+         The library-computer (COM command) has an option to
+         compute torpedo trajectory for you (Option 2).
+    
+    SHE command = Shield Control
+         Defines the number of energy units to be assigned to the
+         shields.  Energy is taken from total ship's energy.  Note
+         that the status display total energy includes shield energy.
+    
+    DAM command = Damage Control Report
+         Gives the state of repair of all devices.  Where a negative
+         'state of repair' shows that the device is temporarily
+         damaged.
+    
+    COM command = Library-Computer
+         The library-computer contains six options:
+         Option 0 = Cumulative Galactic Record
+            This option shows computer memory of the results of all
+            previous short and long range sensor scans.
+         Option 1 = Status Report
+            This option shows the number of Klingons, Stardates,
+            and starbases remaining in the game.
+         Option 2 = Photon Torpedo Data
+            Which gives directions and distance from the Enterprise
+            to all Klingons in your quadrant.
+         Option 3 = Starbase Nav Data
+            This option gives direction and distance to any
+            starbase within your quadrant.
+         Option 4 = Direction/Distance Calculator
+            This option allows you to enter coordinates for
+            direction/distance calculations.
+         Option 5 = Galactic Region Name Map
+            This option prints the names of the sixteen major
+            galactic regions referred to in the game.")
+}
+
 pub fn enterprise() {
     println!("
 
@@ -34,10 +143,11 @@ pub fn intro(model: &Galaxy) {
     if star_bases > 1 {
         star_base_message = format!("There are {} starbases", star_bases);
     }
-    println!("Your orders are as follows:
+    println!(
+"Your orders are as follows:
     Destroy the {} Klingon warships which have invaded
-  the galaxy before they can attack federation headquarters
-  on stardate {}. This gives you {} days. {} in the galaxy for resupplying your ship.\n", 
+    the galaxy before they can attack federation headquarters
+    on stardate {}. This gives you {} days. {} in the galaxy for resupplying your ship.\n", 
     model.remaining_klingons(), model.final_stardate, model.final_stardate - model.stardate, star_base_message)
 }
 
@@ -69,7 +179,8 @@ fn quadrant_name(quadrant: &Pos) -> String {
 }
 
 pub fn starting_quadrant(quadrant: &Pos) {
-    println!("\nYour mission begins with your starship located
+    println!(
+"\nYour mission begins with your starship located
 in the galactic quadrant, '{}'.\n", quadrant_name(quadrant))
 }
 
@@ -118,7 +229,8 @@ pub fn short_range_scan(model: &Galaxy) {
 }
 
 pub fn print_command_help() {
-    println!("Enter one of the following:
+    println!(
+"Enter one of the following:
   NAV  (To set course)
   SRS  (For short range sensor scan)
   LRS  (For long range sensor scan)
@@ -132,7 +244,8 @@ pub fn print_command_help() {
 }
 
 pub fn end_game_failure(galaxy: &Galaxy) {
-    println!("Is is stardate {}.
+    println!(
+"Is is stardate {}.
 There were {} Klingon battle cruisers left at
 the end of your mission.
 ", galaxy.stardate, galaxy.remaining_klingons());
@@ -151,10 +264,11 @@ pub fn enterprise_hit(hit_strength: &u16, from_sector: &Pos) {
 }
 
 pub fn hit_edge(end: &EndPosition) {
-    println!("Lt. Uhura report message from Starfleet Command:
-        'Permission to attempt crossing of galactic perimeter
+    println!(
+"Lt. Uhura report message from Starfleet Command:
+    'Permission to attempt crossing of galactic perimeter
         is hereby *Denied*. Shut down your engines.'
-      Chief Engineer Scott reports, 'Warp engines shut down
+    Chief Engineer Scott reports, 'Warp engines shut down
         at sector {} of quadrant {}.'", end.quadrant, end.sector);
 }
 
@@ -167,7 +281,8 @@ pub fn danger_shields() {
 }
 
 pub fn insuffient_warp_energy(warp_speed: f32) {
-    println!("Engineering reports, 'Insufficient energy available
+    println!(
+"Engineering reports, 'Insufficient energy available
     for maneuvering at warp {warp_speed} !'")
 }
 
@@ -188,7 +303,8 @@ pub fn ridiculous() {
 }
 
 pub fn shields_set(value: u16) {
-    println!("Deflector control room report:
+    println!(
+"Deflector control room report:
   'Shields now at {value} units per your command.'")
 }
 
@@ -205,7 +321,8 @@ pub fn scanners_out() {
 }
 
 pub fn damaged_engines(max_warp: f32, warp_factor: f32) {
-    println!("Warp engines are damaged.  Maximum speed = warp {max_warp}
+    println!(
+"Warp engines are damaged.  Maximum speed = warp {max_warp}
     Chief Engineer Scott reports, 'The engines won't take warp {warp_factor} !'")
 }
 
@@ -253,7 +370,30 @@ pub fn long_range_scan(galaxy: &Galaxy) {
 }
 
 pub fn stranded() {
-    println!("** FATAL ERROR **   You've just stranded your ship in space
+    println!(
+"** FATAL ERROR **   You've just stranded your ship in space
 You have insufficient maneuvering energy, and shield control
 is presently incapable of cross-circuiting to engine room!!")
 }
+
+pub fn computer_options() {
+    println!(
+"   0 = Cumulative galactic record
+    1 = Status report
+    2 = Photon torpedo data
+    3 = Starbase nav data
+    4 = Direction/distance calculator
+    5 = Galaxy 'region name' map")
+}
+
+pub fn galaxy_region_map() {
+    println!(
+"                        The Galaxy
+      1     2     3     4     5     6     7     8
+    ----- ----- ----- ----- ----- ----- ----- -----");
+    for i in (0..REGION_NAMES.len()-1).step_by(2) {
+        println!(
+"{} {:^23} {:^23}
+    ----- ----- ----- ----- ----- ----- ----- -----", (i/2)+1, REGION_NAMES[i], REGION_NAMES[i+1]);
+    }    
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index a2729d9b..46ba7d6a 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -26,7 +26,16 @@ Started after movement and display of stats was finished (no energy management o
 - [ ] weapons
     - [ ] phasers
     - [ ] torpedoes
+- [ ] computer
+    - [ ] 0 - output of all short and long range scans (requires tracking if a system has been scanned)
+    - [ ] 1 - klingons, starbases, stardate and damage control
+    - [ ] 2 - photon torpedo data: direction and distance to all local klingons
+    - [ ] 3 - starbase distance and dir locally
+    - [ ] 4 - direction/distance calculator (useful for nav actions I guess)
+    - [x] 5 - galactic name map
+ 
 - [ ] restarting the game
 - [ ] time progression
     - check all areas where time should move, and adjust accordingly
 - [ ] intro instructions
+- [ ] victory

From 765fa239018778d22995f185845dfe82100680c3 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 20:29:08 +1300
Subject: [PATCH 149/198] implemented scan history

---
 84_Super_Star_Trek/rust/src/commands.rs |  9 +++++--
 84_Super_Star_Trek/rust/src/main.rs     |  2 +-
 84_Super_Star_Trek/rust/src/model.rs    |  9 +++++--
 84_Super_Star_Trek/rust/src/view.rs     | 34 ++++++++++++++++++++++---
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index db3d4a32..20e694e0 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -143,6 +143,7 @@ fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
     
     if ship.quadrant != end.quadrant {
         view::enter_quadrant(&end.quadrant);
+        galaxy.scanned.insert(end.quadrant);
         
         if galaxy.quadrants[end.quadrant.as_index()].klingons.len() > 0 {
             view::condition_red();
@@ -216,13 +217,16 @@ pub fn display_damage_control(enterprise: &Enterprise) {
     println!();
 }
 
-pub fn perform_long_range_scan(galaxy: &Galaxy) {
+pub fn perform_long_range_scan(galaxy: &mut Galaxy) {
     if galaxy.enterprise.damaged.contains_key(model::systems::LONG_RANGE_SCAN) {
         view::inoperable(&systems::name_for(systems::LONG_RANGE_SCAN));
         return;
     }
 
-    view::long_range_scan(galaxy);
+    let seen = view::long_range_scan(galaxy);
+    for pos in seen {
+        galaxy.scanned.insert(pos);
+    }
 }
 
 pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
@@ -243,6 +247,7 @@ pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
     } 
     
     match operation {
+        0 => view::galaxy_scanned_map(galaxy),
         5 => view::galaxy_region_map(),
         _ => todo!() // todo implement others
     }
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index f7db0845..4b809b97 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -30,7 +30,7 @@ fn main() {
             model::systems::WARP_ENGINES => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
             model::systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
             model::systems::DAMAGE_CONTROL => commands::display_damage_control(&galaxy.enterprise),
-            model::systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&galaxy),
+            model::systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&mut galaxy),
             model::systems::COMPUTER => commands::access_computer(&galaxy, command[1..].into()),
             _ => view::print_command_help()
         }
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 549031db..9bb386f1 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -1,4 +1,4 @@
-use std::{ops::{Mul, Add}, fmt::Display, collections::HashMap};
+use std::{ops::{Mul, Add}, fmt::Display, collections::{HashMap, HashSet}};
 
 use rand::Rng;
 
@@ -8,6 +8,7 @@ pub struct Galaxy {
     pub stardate: f32,
     pub final_stardate: f32,
     pub quadrants: Vec<Quadrant>,
+    pub scanned: HashSet<Pos>,
     pub enterprise: Enterprise
 }
 
@@ -136,7 +137,7 @@ pub struct EndPosition {
     pub energy_cost: u16,
 }
 
-#[derive(PartialEq, Clone, Copy, Debug)]
+#[derive(PartialEq, Clone, Copy, Debug, Hash, Eq)]
 pub struct Pos(pub u8, pub u8);
 
 impl Pos {
@@ -206,10 +207,14 @@ impl Galaxy {
         let enterprise_sector = quadrants[enterprise_quadrant.as_index()].find_empty_sector();
         let stardate = rng.gen_range(20..=40) as f32 * 100.0;
 
+        let mut scanned = HashSet::new();
+        scanned.insert(enterprise_quadrant);
+
         Galaxy { 
             stardate,
             final_stardate: stardate + rng.gen_range(25..=35) as f32,
             quadrants: quadrants, 
+            scanned: scanned,
             enterprise: Enterprise { 
                 destroyed: false,
                 damaged: HashMap::new(),
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index e4fbed20..fec5434c 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -174,7 +174,7 @@ const SUB_REGION_NAMES: [&str; 4] = ["I", "II", "III", "IV"];
 
 fn quadrant_name(quadrant: &Pos) -> String {
     format!("{} {}", 
-        REGION_NAMES[((quadrant.0 << 1) + (quadrant.1 >> 2)) as usize],
+        REGION_NAMES[((quadrant.1 << 1) + (quadrant.0 >> 2)) as usize],
         SUB_REGION_NAMES[(quadrant.1 % 4) as usize])
 }
 
@@ -342,11 +342,13 @@ pub fn system_repair_completed(name: String) {
     println!("        {name} repair completed.")
 }
 
-pub fn long_range_scan(galaxy: &Galaxy) {
+pub fn long_range_scan(galaxy: &Galaxy) -> Vec<Pos> {
 
     let cx = galaxy.enterprise.quadrant.0 as i8;
     let cy = galaxy.enterprise.quadrant.1 as i8;
 
+    let mut seen = Vec::new();
+
     println!("Long range scan for quadrant {}", galaxy.enterprise.quadrant);
     println!("{:-^19}", "");
     for y in cy - 1..=cy + 1 {
@@ -356,7 +358,10 @@ pub fn long_range_scan(galaxy: &Galaxy) {
             let mut stars = "*".into();
 
             if y >= 0 && y < 8 && x >= 0 && x < 8 {
-                let quadrant = &galaxy.quadrants[Pos(x as u8, y as u8).as_index()];
+                let pos = Pos(x as u8, y as u8);
+                seen.push(pos);
+                
+                let quadrant = &galaxy.quadrants[pos.as_index()];
                 klingons = format!("{}", quadrant.klingons.len());
                 star_bases = quadrant.star_base.map_or("0", |_| "1");
                 stars = format!("{}", quadrant.stars.len());
@@ -367,6 +372,8 @@ pub fn long_range_scan(galaxy: &Galaxy) {
         println!(":");
         println!("{:-^19}", "");
     } 
+
+    seen
 }
 
 pub fn stranded() {
@@ -397,3 +404,24 @@ pub fn galaxy_region_map() {
     ----- ----- ----- ----- ----- ----- ----- -----", (i/2)+1, REGION_NAMES[i], REGION_NAMES[i+1]);
     }    
 }
+
+pub(crate) fn galaxy_scanned_map(galaxy: &Galaxy) {
+    println!(
+"Computer record of galaxy for quadrant {}
+      1     2     3     4     5     6     7     8
+    ----- ----- ----- ----- ----- ----- ----- -----", galaxy.enterprise.quadrant);
+    for y in 0..8 {
+        print!("{}   ", y+1);
+        for x in 0..8 {
+            let pos = Pos(x, y);
+            if galaxy.scanned.contains(&pos) {
+                let quadrant = &galaxy.quadrants[pos.as_index()];
+                print!(" {}{}{}  ", quadrant.klingons.len(), quadrant.stars.len(), quadrant.star_base.map_or("0", |_| "1"))
+            } else {
+                print!(" ***  ");
+            }
+        }
+        println!(
+"\n    ----- ----- ----- ----- ----- ----- ----- -----")
+    }
+}

From 873b974473d94dfdc7941f8e5baacbd95d189ddd Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 21:34:04 +1300
Subject: [PATCH 150/198] work on phaser control everything but destruction of
 klingons

---
 84_Super_Star_Trek/rust/src/commands.rs | 62 ++++++++++++++++++++++---
 84_Super_Star_Trek/rust/src/main.rs     | 15 +++---
 84_Super_Star_Trek/rust/src/model.rs    |  8 +++-
 84_Super_Star_Trek/rust/src/view.rs     | 14 ++++++
 84_Super_Star_Trek/rust/tasks.md        |  6 ++-
 5 files changed, 87 insertions(+), 18 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 20e694e0..52ca5daf 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,9 +1,9 @@
 use rand::Rng;
 
-use crate::{model::{Galaxy, Pos, COURSES, EndPosition, self, Enterprise, systems}, view, input};
+use crate::{model::{Galaxy, Pos, COURSES, EndPosition, self, Enterprise, systems}, view, input::{self, prompt_value, param_or_prompt_value}};
 
 pub fn perform_short_range_scan(galaxy: &Galaxy) {
-    if galaxy.enterprise.damaged.contains_key(model::systems::SHORT_RANGE_SCAN) {
+    if galaxy.enterprise.damaged.contains_key(systems::SHORT_RANGE_SCAN) {
         view::scanners_out();
         return;
     }
@@ -13,7 +13,7 @@ pub fn perform_short_range_scan(galaxy: &Galaxy) {
 
 pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
 
-    if galaxy.enterprise.damaged.contains_key(model::systems::SHIELD_CONTROL) {
+    if galaxy.enterprise.damaged.contains_key(systems::SHIELD_CONTROL) {
         view::inoperable(&systems::name_for(systems::SHIELD_CONTROL));
         return;
     }
@@ -47,7 +47,7 @@ pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>
     let course = course.unwrap();
 
     let mut max_warp = 8.0;
-    if galaxy.enterprise.damaged.contains_key(model::systems::WARP_ENGINES) {
+    if galaxy.enterprise.damaged.contains_key(systems::WARP_ENGINES) {
         max_warp = 0.2;
     }
 
@@ -204,7 +204,7 @@ fn move_klingons_and_fire(galaxy: &mut Galaxy) {
 }
 
 pub fn display_damage_control(enterprise: &Enterprise) {
-    if enterprise.damaged.contains_key(model::systems::DAMAGE_CONTROL) {
+    if enterprise.damaged.contains_key(systems::DAMAGE_CONTROL) {
         view::inoperable(&systems::name_for(systems::DAMAGE_CONTROL));
         return;
     }
@@ -218,7 +218,7 @@ pub fn display_damage_control(enterprise: &Enterprise) {
 }
 
 pub fn perform_long_range_scan(galaxy: &mut Galaxy) {
-    if galaxy.enterprise.damaged.contains_key(model::systems::LONG_RANGE_SCAN) {
+    if galaxy.enterprise.damaged.contains_key(systems::LONG_RANGE_SCAN) {
         view::inoperable(&systems::name_for(systems::LONG_RANGE_SCAN));
         return;
     }
@@ -230,7 +230,7 @@ pub fn perform_long_range_scan(galaxy: &mut Galaxy) {
 }
 
 pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
-    if galaxy.enterprise.damaged.contains_key(model::systems::COMPUTER) {
+    if galaxy.enterprise.damaged.contains_key(systems::COMPUTER) {
         view::inoperable(&systems::name_for(systems::COMPUTER));
         return;
     }
@@ -251,4 +251,52 @@ pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
         5 => view::galaxy_region_map(),
         _ => todo!() // todo implement others
     }
+}
+
+pub fn get_power_and_fire_phasers(galaxy: &mut Galaxy, provided: Vec<String>) {
+    if galaxy.enterprise.damaged.contains_key(systems::PHASERS) {
+        view::inoperable(&systems::name_for(systems::PHASERS));
+        return;
+    }
+
+    let quadrant = &mut galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
+    if quadrant.klingons.len() == 0 {
+        view::no_local_enemies();
+        return;
+    }
+
+    let computer_damaged = galaxy.enterprise.damaged.contains_key(systems::COMPUTER);
+    if computer_damaged {
+        view::computer_accuracy_issue();
+    }
+
+    let available_energy = galaxy.enterprise.total_energy - galaxy.enterprise.shields;
+    view::phasers_locked(available_energy);
+    let mut power: f32;
+    loop {
+        let setting = param_or_prompt_value(&provided, 0, "Number of units to fire", 0, available_energy);
+        if setting.is_some() {
+            power = setting.unwrap() as f32;
+            break;
+        }
+    }
+
+    if power == 0.0 {
+        return;
+    }
+
+    galaxy.enterprise.total_energy -= power as u16;
+    
+    let mut rng = rand::thread_rng();
+    if computer_damaged {
+        power *= rng.gen::<f32>();
+    }
+
+    let per_enemy = power / quadrant.klingons.len() as f32;
+
+    // fire on each klingon
+
+    for klingon in &mut quadrant.klingons {
+        klingon.fire_on(&mut galaxy.enterprise)
+    }
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 4b809b97..1bd1d652 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,6 +1,6 @@
 use std::process::exit;
 
-use model::Galaxy;
+use model::{Galaxy, systems};
 
 mod input;
 mod model;
@@ -26,12 +26,13 @@ fn main() {
             continue;
         }
         match command[0].to_uppercase().as_str() { // order is weird because i built it in this order :)
-            model::systems::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
-            model::systems::WARP_ENGINES => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
-            model::systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
-            model::systems::DAMAGE_CONTROL => commands::display_damage_control(&galaxy.enterprise),
-            model::systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&mut galaxy),
-            model::systems::COMPUTER => commands::access_computer(&galaxy, command[1..].into()),
+            systems::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
+            systems::WARP_ENGINES => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
+            systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
+            systems::DAMAGE_CONTROL => commands::display_damage_control(&galaxy.enterprise),
+            systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&mut galaxy),
+            systems::COMPUTER => commands::access_computer(&galaxy, command[1..].into()),
+            systems::PHASERS => commands::get_power_and_fire_phasers(&mut galaxy, command[1..].into()),
             _ => view::print_command_help()
         }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 9bb386f1..dbd23522 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -25,6 +25,8 @@ pub struct Klingon {
 
 impl Klingon {
     pub fn fire_on(&mut self, enterprise: &mut Enterprise) {
+        // todo check if enterprise is protected
+
         let mut rng = rand::thread_rng();
         let attack_strength = rng.gen::<f32>();
         let dist_to_enterprise = self.sector.abs_diff(enterprise.sector) as f32;
@@ -112,9 +114,10 @@ pub mod systems {
     pub const DAMAGE_CONTROL: &str = "DAM";
     pub const LONG_RANGE_SCAN: &str = "LRS";
     pub const COMPUTER: &str = "COM";
+    pub const PHASERS: &str = "PHA";
 
-    pub const KEYS: [&str; 6] = [
-        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL, LONG_RANGE_SCAN, COMPUTER
+    pub const KEYS: [&str; 7] = [
+        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL, LONG_RANGE_SCAN, COMPUTER, PHASERS
     ];
 
     pub fn name_for(key: &str) -> String {
@@ -125,6 +128,7 @@ pub mod systems {
             DAMAGE_CONTROL => "Damage Control".into(),
             LONG_RANGE_SCAN => "Long Range Scanners".into(),
             COMPUTER => "Library-Computer".into(),
+            PHASERS => "Phaser Control".into(),
             _ => "Unknown".into()
         }
     }
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index fec5434c..1c904958 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -425,3 +425,17 @@ pub(crate) fn galaxy_scanned_map(galaxy: &Galaxy) {
 "\n    ----- ----- ----- ----- ----- ----- ----- -----")
     }
 }
+
+pub fn no_local_enemies() {
+    println!(
+"Science Officer Spock reports, 'Sensors show no enemy ships
+                                 in this quadrant'")
+}
+
+pub fn computer_accuracy_issue() {
+    println!("Computer failure hampers accuracy")
+}
+
+pub fn phasers_locked(available_energy: u16) {
+    println!("Phasers locked on target;  Energy available = {available_energy} units")
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 46ba7d6a..8f5b3bab 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -22,12 +22,14 @@ Started after movement and display of stats was finished (no energy management o
     - also, movement courses could be floats, according to the instructions, allowing for more precise movement and aiming
 - [x] better command reading - support entering multiple values on a line (e.g. nav 3 0.1)
 - [ ] starbases
-    - [ ] repair
+    - [ ] proximity detection for docking
+    - [ ] repair on damage control
+    - [ ] protection from shots
 - [ ] weapons
     - [ ] phasers
     - [ ] torpedoes
 - [ ] computer
-    - [ ] 0 - output of all short and long range scans (requires tracking if a system has been scanned)
+    - [x] 0 - output of all short and long range scans (requires tracking if a system has been scanned)
     - [ ] 1 - klingons, starbases, stardate and damage control
     - [ ] 2 - photon torpedo data: direction and distance to all local klingons
     - [ ] 3 - starbase distance and dir locally

From 5973d97a16ed00a94e786a8e79557ed6125c6065 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Thu, 2 Mar 2023 21:35:45 +1300
Subject: [PATCH 151/198] some more reorg

---
 84_Super_Star_Trek/rust/src/commands.rs |  7 +------
 84_Super_Star_Trek/rust/src/view.rs     | 11 ++++++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 52ca5daf..911f88f5 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -209,12 +209,7 @@ pub fn display_damage_control(enterprise: &Enterprise) {
         return;
     }
 
-    println!("Device             State of Repair");
-    for key in systems::KEYS {
-        let damage = enterprise.damaged.get(key).unwrap_or(&0.0);
-        println!("{:<25}{}", systems::name_for(key), damage)
-    }
-    println!();
+    view::damage_control(enterprise);
 }
 
 pub fn perform_long_range_scan(galaxy: &mut Galaxy) {
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 1c904958..290fa37b 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,4 +1,4 @@
-use crate::model::{Galaxy, Pos, EndPosition, SectorStatus};
+use crate::model::{Galaxy, Pos, EndPosition, SectorStatus, Enterprise, systems};
 
 pub fn full_instructions() {
     println!(
@@ -342,6 +342,15 @@ pub fn system_repair_completed(name: String) {
     println!("        {name} repair completed.")
 }
 
+pub fn damage_control(enterprise: &Enterprise) {
+    println!("Device             State of Repair");
+    for key in systems::KEYS {
+        let damage = enterprise.damaged.get(key).unwrap_or(&0.0);
+        println!("{:<25}{}", systems::name_for(key), damage)
+    }
+    println!();
+}
+
 pub fn long_range_scan(galaxy: &Galaxy) -> Vec<Pos> {
 
     let cx = galaxy.enterprise.quadrant.0 as i8;

From 21ccbc0f9b8a7510300c054c62bc819cfa25833b Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Fri, 3 Mar 2023 07:14:25 +1300
Subject: [PATCH 152/198] work on starbases

---
 84_Super_Star_Trek/rust/src/commands.rs | 54 ++++++++++++++++++-------
 84_Super_Star_Trek/rust/src/main.rs     |  2 +-
 84_Super_Star_Trek/rust/src/model.rs    | 15 ++++---
 84_Super_Star_Trek/rust/src/view.rs     |  9 ++++-
 4 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 911f88f5..255ced43 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,6 +1,6 @@
 use rand::Rng;
 
-use crate::{model::{Galaxy, Pos, COURSES, EndPosition, self, Enterprise, systems}, view, input::{self, prompt_value, param_or_prompt_value}};
+use crate::{model::*, view, input::{self, param_or_prompt_value}};
 
 pub fn perform_short_range_scan(galaxy: &Galaxy) {
     if galaxy.enterprise.damaged.contains_key(systems::SHORT_RANGE_SCAN) {
@@ -64,7 +64,9 @@ pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>
         return;
     }
 
-    move_klingons_and_fire(galaxy);
+    klingons_move(galaxy);
+    klingons_fire(galaxy);
+
     if galaxy.enterprise.destroyed {
         return;
     }
@@ -156,10 +158,17 @@ fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
     ship.quadrant = end.quadrant;
     ship.sector = end.sector;
 
-    ship.total_energy = (ship.total_energy - end.energy_cost).max(0);
-    if ship.shields > ship.total_energy {
-        view::divert_energy_from_shields();
-        ship.shields = ship.total_energy;
+    let quadrant = &galaxy.quadrants[end.quadrant.as_index()];
+    if quadrant.docked_at_starbase(ship.sector) {
+        ship.shields = 0;
+        ship.photon_torpedoes = MAX_PHOTON_TORPEDOES;
+        ship.total_energy = MAX_ENERGY;
+    } else {
+        ship.total_energy = (ship.total_energy - end.energy_cost).max(0);
+        if ship.shields > ship.total_energy {
+            view::divert_energy_from_shields();
+            ship.shields = ship.total_energy;
+        }
     }
 
     view::short_range_scan(&galaxy)
@@ -189,27 +198,46 @@ fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8,
     EndPosition { quadrant, sector, hit_edge, energy_cost }
 }
 
-fn move_klingons_and_fire(galaxy: &mut Galaxy) {
+fn klingons_move(galaxy: &mut Galaxy) {
     let quadrant = &mut galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
     for k in 0..quadrant.klingons.len() {
         let new_sector = quadrant.find_empty_sector();
         quadrant.klingons[k].sector = new_sector;
     }
+}
 
-    // todo: check if enterprise is protected by a starbase
+fn klingons_fire(galaxy: &mut Galaxy) {
+    let quadrant = &mut galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
+    if quadrant.docked_at_starbase(galaxy.enterprise.sector) {
+        view::starbase_shields();
+        return;
+    }
 
     for k in 0..quadrant.klingons.len() {
         quadrant.klingons[k].fire_on(&mut galaxy.enterprise);
     }
 }
 
-pub fn display_damage_control(enterprise: &Enterprise) {
-    if enterprise.damaged.contains_key(systems::DAMAGE_CONTROL) {
+pub fn run_damage_control(galaxy: &mut Galaxy) {
+
+    let ship = &mut galaxy.enterprise;
+
+    if ship.damaged.contains_key(systems::DAMAGE_CONTROL) {
         view::inoperable(&systems::name_for(systems::DAMAGE_CONTROL));
         return;
     }
 
-    view::damage_control(enterprise);
+    view::damage_control(&ship);
+
+    if ship.damaged.len() == 0 || !galaxy.quadrants[ship.quadrant.as_index()].docked_at_starbase(ship.sector) {
+        return;
+    }
+
+    // try repeair
+    // if so write dam report
+    // and increment elapsed time
+
+    view::damage_control(&ship);
 }
 
 pub fn perform_long_range_scan(galaxy: &mut Galaxy) {
@@ -291,7 +319,5 @@ pub fn get_power_and_fire_phasers(galaxy: &mut Galaxy, provided: Vec<String>) {
 
     // fire on each klingon
 
-    for klingon in &mut quadrant.klingons {
-        klingon.fire_on(&mut galaxy.enterprise)
-    }
+    klingons_fire(galaxy);
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 1bd1d652..589e43e0 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -29,7 +29,7 @@ fn main() {
             systems::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
             systems::WARP_ENGINES => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
             systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
-            systems::DAMAGE_CONTROL => commands::display_damage_control(&galaxy.enterprise),
+            systems::DAMAGE_CONTROL => commands::run_damage_control(&mut galaxy),
             systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&mut galaxy),
             systems::COMPUTER => commands::access_computer(&galaxy, command[1..].into()),
             systems::PHASERS => commands::get_power_and_fire_phasers(&mut galaxy, command[1..].into()),
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index dbd23522..31fb3191 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -25,8 +25,6 @@ pub struct Klingon {
 
 impl Klingon {
     pub fn fire_on(&mut self, enterprise: &mut Enterprise) {
-        // todo check if enterprise is protected
-
         let mut rng = rand::thread_rng();
         let attack_strength = rng.gen::<f32>();
         let dist_to_enterprise = self.sector.abs_diff(enterprise.sector) as f32;
@@ -149,7 +147,7 @@ impl Pos {
         (self.0 * 8 + self.1).into()
     }
 
-    fn abs_diff(&self, other: Pos) -> u8 {
+    pub fn abs_diff(&self, other: Pos) -> u8 {
         self.0.abs_diff(other.0) + self.1.abs_diff(other.1)
     }
 }
@@ -192,6 +190,9 @@ pub enum SectorStatus {
     Empty, Star, StarBase, Klingon
 }
 
+pub const MAX_PHOTON_TORPEDOES: u8 = 28;
+pub const MAX_ENERGY: u16 = 3000;
+
 impl Galaxy {
     pub fn remaining_klingons(&self) -> u8 {
         let quadrants = &self.quadrants;
@@ -224,8 +225,8 @@ impl Galaxy {
                 damaged: HashMap::new(),
                 quadrant: enterprise_quadrant, 
                 sector: enterprise_sector,
-                photon_torpedoes: 28,
-                total_energy: 3000,
+                photon_torpedoes: MAX_PHOTON_TORPEDOES,
+                total_energy: MAX_ENERGY,
                 shields: 0 }
         }
     }    
@@ -296,4 +297,8 @@ impl Quadrant {
             }
         }
     }
+
+    pub fn docked_at_starbase(&self, enterprise_sector: Pos) -> bool {
+        self.star_base.is_some() && self.star_base.unwrap().abs_diff(enterprise_sector) == 1
+    }
 }
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 290fa37b..c7cc836d 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -191,7 +191,10 @@ pub fn enter_quadrant(quadrant: &Pos) {
 pub fn short_range_scan(model: &Galaxy) {
     let quadrant = &model.quadrants[model.enterprise.quadrant.as_index()];
     let mut condition = "GREEN";
-    if quadrant.klingons.len() > 0 {
+    if quadrant.docked_at_starbase(model.enterprise.sector) {
+        println!("Shields dropped for docking purposes");
+        condition = "DOCKED";
+    } else if quadrant.klingons.len() > 0 {
         condition = "*RED*";
     } else if model.enterprise.damaged.len() > 0 {
         condition = "YELLOW";
@@ -448,3 +451,7 @@ pub fn computer_accuracy_issue() {
 pub fn phasers_locked(available_energy: u16) {
     println!("Phasers locked on target;  Energy available = {available_energy} units")
 }
+
+pub fn starbase_shields() {
+    println!("Starbase shields protect the Enterprise")
+}

From 5b58b37ad1f1caf95dfcfd6f236f945069a50244 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Fri, 3 Mar 2023 07:59:12 +1300
Subject: [PATCH 153/198] finished implementing starbases

---
 84_Super_Star_Trek/rust/src/commands.rs | 15 +++++++++++----
 84_Super_Star_Trek/rust/src/input.rs    | 16 ++++++++++++++++
 84_Super_Star_Trek/rust/src/model.rs    | 21 +++++++++++++--------
 84_Super_Star_Trek/rust/src/view.rs     | 12 +++++++++---
 84_Super_Star_Trek/rust/tasks.md        |  8 ++++----
 5 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 255ced43..60dcb9b9 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -229,14 +229,21 @@ pub fn run_damage_control(galaxy: &mut Galaxy) {
 
     view::damage_control(&ship);
 
-    if ship.damaged.len() == 0 || !galaxy.quadrants[ship.quadrant.as_index()].docked_at_starbase(ship.sector) {
+    let quadrant = &galaxy.quadrants[ship.quadrant.as_index()];
+    if ship.damaged.len() == 0 || !quadrant.docked_at_starbase(ship.sector) {
         return;
     }
 
-    // try repeair
-    // if so write dam report
-    // and increment elapsed time
+    let repair_delay = quadrant.star_base.as_ref().unwrap().repair_delay;
+    let repair_time = (ship.damaged.len() as f32 * 0.1 + repair_delay).max(0.9);
 
+    view::repair_estimate(repair_time);
+    if !input::prompt_yes_no("Will you authorize the repair order") {
+        return;
+    }
+
+    ship.damaged.clear();
+    galaxy.stardate += repair_time;
     view::damage_control(&ship);
 }
 
diff --git a/84_Super_Star_Trek/rust/src/input.rs b/84_Super_Star_Trek/rust/src/input.rs
index 75f12102..5bd35fb3 100644
--- a/84_Super_Star_Trek/rust/src/input.rs
+++ b/84_Super_Star_Trek/rust/src/input.rs
@@ -14,6 +14,22 @@ pub fn prompt(prompt_text: &str) -> Vec<String> {
     Vec::new()
 }
 
+pub fn prompt_yes_no(prompt_text: &str) -> bool {
+    loop {
+        let response = prompt(&format!("{prompt_text} (Y/N)"));
+        if response.len() == 0 {
+            continue;
+        }
+        let first_word = response[0].to_uppercase();
+        if first_word.starts_with("Y") {
+            return true;
+        }
+        if first_word.starts_with("N") {
+            return false;
+        }
+    }
+}
+
 pub fn prompt_value<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T) -> Option<T> {
     let passed = prompt(prompt_text);
     if passed.len() != 1 {
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 31fb3191..a12673af 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -14,10 +14,15 @@ pub struct Galaxy {
 
 pub struct Quadrant {
     pub stars: Vec<Pos>,
-    pub star_base: Option<Pos>,
+    pub star_base: Option<StarBase>,
     pub klingons: Vec<Klingon>
 }
 
+pub struct StarBase {
+    pub sector: Pos,
+    pub repair_delay: f32,
+}
+
 pub struct Klingon {
     pub sector: Pos,
     energy: f32
@@ -243,7 +248,7 @@ impl Galaxy {
             }
 
             if rng.gen::<f64>() > 0.96 {
-                quadrant.star_base = Some(quadrant.find_empty_sector());
+                quadrant.star_base = Some(StarBase { sector: quadrant.find_empty_sector(), repair_delay: rng.gen::<f32>() * 0.5 });
             }
 
             let klingon_count = 
@@ -264,10 +269,10 @@ impl Galaxy {
 }
 
 impl Quadrant {
-    pub fn sector_status(&self, sector: &Pos) -> SectorStatus {
+    pub fn sector_status(&self, sector: Pos) -> SectorStatus {
         if self.stars.contains(&sector) {
             SectorStatus::Star
-        } else if self.is_starbase(&sector) {
+        } else if self.is_starbase(sector) {
             SectorStatus::StarBase
         } else if self.has_klingon(&sector) {
             SectorStatus::Klingon
@@ -276,10 +281,10 @@ impl Quadrant {
         }
     }
 
-    fn is_starbase(&self, sector: &Pos) -> bool {
+    fn is_starbase(&self, sector: Pos) -> bool {
         match &self.star_base {
             None => false,
-            Some(p) => p == sector
+            Some(p) => p.sector == sector
         }
     }
 
@@ -292,13 +297,13 @@ impl Quadrant {
         let mut rng = rand::thread_rng();
         loop {
             let pos = Pos(rng.gen_range(0..8), rng.gen_range(0..8));
-            if self.sector_status(&pos) == SectorStatus::Empty {
+            if self.sector_status(pos) == SectorStatus::Empty {
                 return pos
             }
         }
     }
 
     pub fn docked_at_starbase(&self, enterprise_sector: Pos) -> bool {
-        self.star_base.is_some() && self.star_base.unwrap().abs_diff(enterprise_sector) == 1
+        self.star_base.is_some() && self.star_base.as_ref().unwrap().sector.abs_diff(enterprise_sector) == 1
     }
 }
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index c7cc836d..77b70057 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -218,7 +218,7 @@ pub fn short_range_scan(model: &Galaxy) {
             if &pos == &model.enterprise.sector {
                 print!("<*> ")
             } else {
-                match quadrant.sector_status(&pos) {
+                match quadrant.sector_status(pos) {
                     SectorStatus::Star => print!(" *  "),
                     SectorStatus::StarBase => print!(">!< "),
                     SectorStatus::Klingon => print!("+K+ "),
@@ -375,7 +375,7 @@ pub fn long_range_scan(galaxy: &Galaxy) -> Vec<Pos> {
                 
                 let quadrant = &galaxy.quadrants[pos.as_index()];
                 klingons = format!("{}", quadrant.klingons.len());
-                star_bases = quadrant.star_base.map_or("0", |_| "1");
+                star_bases = quadrant.star_base.as_ref().map_or("0", |_| "1");
                 stars = format!("{}", quadrant.stars.len());
             }
 
@@ -428,7 +428,7 @@ pub(crate) fn galaxy_scanned_map(galaxy: &Galaxy) {
             let pos = Pos(x, y);
             if galaxy.scanned.contains(&pos) {
                 let quadrant = &galaxy.quadrants[pos.as_index()];
-                print!(" {}{}{}  ", quadrant.klingons.len(), quadrant.stars.len(), quadrant.star_base.map_or("0", |_| "1"))
+                print!(" {}{}{}  ", quadrant.klingons.len(), quadrant.stars.len(), quadrant.star_base.as_ref().map_or("0", |_| "1"))
             } else {
                 print!(" ***  ");
             }
@@ -455,3 +455,9 @@ pub fn phasers_locked(available_energy: u16) {
 pub fn starbase_shields() {
     println!("Starbase shields protect the Enterprise")
 }
+
+pub fn repair_estimate(repair_time: f32) {
+    println!(
+"Technicians standing by to effect repairs to your ship;
+Estimated time to repair: {repair_time} stardates.")
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 8f5b3bab..bdd44481 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -21,10 +21,10 @@ Started after movement and display of stats was finished (no energy management o
     - the current move is a jump, which makes this problematic. would need to rewrite it
     - also, movement courses could be floats, according to the instructions, allowing for more precise movement and aiming
 - [x] better command reading - support entering multiple values on a line (e.g. nav 3 0.1)
-- [ ] starbases
-    - [ ] proximity detection for docking
-    - [ ] repair on damage control
-    - [ ] protection from shots
+- [x] starbases
+    - [x] proximity detection for docking
+    - [x] repair on damage control
+    - [x] protection from shots
 - [ ] weapons
     - [ ] phasers
     - [ ] torpedoes

From 188b17d1523db62761716dd8cddbd97bd62ca0d2 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Fri, 3 Mar 2023 08:04:32 +1300
Subject: [PATCH 154/198] small fix so klingons can't move on top of enterprise

---
 84_Super_Star_Trek/rust/src/commands.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 60dcb9b9..3cc68cbc 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -201,7 +201,14 @@ fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8,
 fn klingons_move(galaxy: &mut Galaxy) {
     let quadrant = &mut galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
     for k in 0..quadrant.klingons.len() {
-        let new_sector = quadrant.find_empty_sector();
+        let new_sector: Pos;
+        loop {
+            let candidate = quadrant.find_empty_sector();
+            if candidate != galaxy.enterprise.sector {
+                new_sector = candidate;
+                break;
+            }
+        }
         quadrant.klingons[k].sector = new_sector;
     }
 }

From a8c55988ade850b8294782d0603007f58752d016 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Fri, 3 Mar 2023 14:49:06 +1300
Subject: [PATCH 155/198] phasers! completed this

---
 84_Super_Star_Trek/rust/src/commands.rs | 18 +++++++++++++++++-
 84_Super_Star_Trek/rust/src/model.rs    |  2 +-
 84_Super_Star_Trek/rust/src/view.rs     | 16 ++++++++++++++++
 84_Super_Star_Trek/rust/tasks.md        |  2 +-
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 3cc68cbc..6b2d4b08 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -331,7 +331,23 @@ pub fn get_power_and_fire_phasers(galaxy: &mut Galaxy, provided: Vec<String>) {
 
     let per_enemy = power / quadrant.klingons.len() as f32;
 
-    // fire on each klingon
+    for k in &mut quadrant.klingons {
+        let dist = k.sector.abs_diff(galaxy.enterprise.sector) as f32;
+        let hit_strength = per_enemy / dist * (2.0 + rng.gen::<f32>());
+        if hit_strength < 0.15 * k.energy {
+            view::no_damage(k.sector);
+        } else {
+            k.energy -= hit_strength;
+            view::hit_on_klingon(hit_strength, k.sector);
+            if k.energy > 0.0 {
+                view::klingon_remaining_energy(k.energy);
+            } else {
+                view::klingon_destroyed();
+            }
+        }
+    }
+
+    quadrant.klingons.retain(|k| k.energy > 0.0);
 
     klingons_fire(galaxy);
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index a12673af..151b85d3 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -25,7 +25,7 @@ pub struct StarBase {
 
 pub struct Klingon {
     pub sector: Pos,
-    energy: f32
+    pub energy: f32
 }
 
 impl Klingon {
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 77b70057..5372cc6b 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -461,3 +461,19 @@ pub fn repair_estimate(repair_time: f32) {
 "Technicians standing by to effect repairs to your ship;
 Estimated time to repair: {repair_time} stardates.")
 }
+
+pub fn no_damage(sector: Pos) {
+    println!("Sensors show no damage to enemy at {sector}")
+}
+
+pub fn hit_on_klingon(hit_strength: f32, sector: Pos) {
+    println!("{hit_strength} unit hit on Klingon at sector {sector}")
+}
+
+pub fn klingon_remaining_energy(energy: f32) {
+    println!("   (sensors show {energy} units remaining)")
+}
+
+pub fn klingon_destroyed() {
+    println!("   Target Destroyed!") // not standard for game but feedback is good. Sorry Mr. Roddenberry
+}
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index bdd44481..06bcf57a 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -26,7 +26,7 @@ Started after movement and display of stats was finished (no energy management o
     - [x] repair on damage control
     - [x] protection from shots
 - [ ] weapons
-    - [ ] phasers
+    - [x] phasers
     - [ ] torpedoes
 - [ ] computer
     - [x] 0 - output of all short and long range scans (requires tracking if a system has been scanned)

From f7afb36cc7f67b651b34ba7f05b3f4dfdb399884 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Fri, 3 Mar 2023 16:16:01 +1300
Subject: [PATCH 156/198] work on victory and retry conditions

---
 84_Super_Star_Trek/rust/src/main.rs  | 20 +++++++++++++----
 84_Super_Star_Trek/rust/src/model.rs | 33 +++++++++++++++++-----------
 84_Super_Star_Trek/rust/src/view.rs  | 19 +++++++++++++++-
 84_Super_Star_Trek/rust/tasks.md     |  3 +++
 4 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 589e43e0..2afded1c 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,5 +1,6 @@
 use std::process::exit;
 
+use input::prompt;
 use model::{Galaxy, systems};
 
 mod input;
@@ -12,6 +13,8 @@ fn main() {
     .expect("Error setting Ctrl-C handler");
 
     let mut galaxy = Galaxy::generate_new();
+    let initial_klingons = galaxy.remaining_klingons();
+    let initial_stardate = galaxy.stardate;
     
     view::enterprise();
     view::intro(&galaxy);
@@ -36,12 +39,21 @@ fn main() {
             _ => view::print_command_help()
         }
 
-        if galaxy.enterprise.destroyed || galaxy.enterprise.check_stranded() {
+        if galaxy.enterprise.destroyed || galaxy.enterprise.check_stranded() || galaxy.stardate >= galaxy.final_stardate {
             view::end_game_failure(&galaxy);
-            // todo check if can restart
+            if galaxy.remaining_klingons() > 0 && galaxy.remaining_starbases() > 0 && galaxy.stardate < galaxy.final_stardate {
+                view::replay();
+                let result = prompt("");
+                if result.len() > 0 && result[0].to_uppercase() == "AYE" {
+                    galaxy.enterprise = Galaxy::new_captain(&galaxy.quadrants);
+                    continue;
+                }
+            }
+            break;
+        } else if galaxy.remaining_klingons() == 0 {
+            let efficiency = 1000.0 * f32::powi(initial_klingons as f32 / (galaxy.stardate - initial_stardate), 2);
+            view::congratulations(efficiency);
             break;
         }
-
-        // todo check for victory
     }
 }
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 151b85d3..2985f28a 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -101,7 +101,7 @@ impl Enterprise {
     }
 
     pub fn check_stranded(&self) -> bool {
-        if self.total_energy < 10 || (self.total_energy - self.shields < 10 && self.damaged.contains_key(systems::SHIELD_CONTROL)) {
+        if self.total_energy < 10 || (self.shields + 10 > self.total_energy && self.damaged.contains_key(systems::SHIELD_CONTROL)) {
             view::stranded();
             return true;
         }
@@ -213,28 +213,35 @@ impl Galaxy {
         let quadrants = Self::generate_quadrants();
 
         let mut rng = rand::thread_rng();
-        let enterprise_quadrant = Pos(rng.gen_range(0..8), rng.gen_range(0..8));
-        let enterprise_sector = quadrants[enterprise_quadrant.as_index()].find_empty_sector();
         let stardate = rng.gen_range(20..=40) as f32 * 100.0;
 
+        let enterprise = Self::new_captain(&quadrants);
+
         let mut scanned = HashSet::new();
-        scanned.insert(enterprise_quadrant);
+        scanned.insert(enterprise.quadrant);
 
         Galaxy { 
             stardate,
             final_stardate: stardate + rng.gen_range(25..=35) as f32,
             quadrants: quadrants, 
             scanned: scanned,
-            enterprise: Enterprise { 
-                destroyed: false,
-                damaged: HashMap::new(),
-                quadrant: enterprise_quadrant, 
-                sector: enterprise_sector,
-                photon_torpedoes: MAX_PHOTON_TORPEDOES,
-                total_energy: MAX_ENERGY,
-                shields: 0 }
+            enterprise: enterprise
         }
-    }    
+    } 
+
+    pub fn new_captain(quadrants: &Vec<Quadrant>) -> Enterprise {
+        let mut rng = rand::thread_rng();
+        let enterprise_quadrant = Pos(rng.gen_range(0..8), rng.gen_range(0..8));
+        let enterprise_sector = quadrants[enterprise_quadrant.as_index()].find_empty_sector();
+        Enterprise { 
+            destroyed: false,
+            damaged: HashMap::new(),
+            quadrant: enterprise_quadrant, 
+            sector: enterprise_sector,
+            photon_torpedoes: MAX_PHOTON_TORPEDOES,
+            total_energy: MAX_ENERGY,
+            shields: 0 }
+    }   
 
     fn generate_quadrants() -> Vec<Quadrant> {
         let mut rng = rand::thread_rng();
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 5372cc6b..f54bd4cc 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -417,7 +417,7 @@ pub fn galaxy_region_map() {
     }    
 }
 
-pub(crate) fn galaxy_scanned_map(galaxy: &Galaxy) {
+pub fn galaxy_scanned_map(galaxy: &Galaxy) {
     println!(
 "Computer record of galaxy for quadrant {}
       1     2     3     4     5     6     7     8
@@ -477,3 +477,20 @@ pub fn klingon_remaining_energy(energy: f32) {
 pub fn klingon_destroyed() {
     println!("   Target Destroyed!") // not standard for game but feedback is good. Sorry Mr. Roddenberry
 }
+
+pub fn congratulations(efficiency: f32) {
+    println!("
+Congratulations, Captain!  The last Klingon battle cruiser
+menacing the Federation has been destroyed.
+
+Your efficiency rating is {efficiency}.
+    ")
+}
+
+pub fn replay() {
+    println!("
+
+The Federation is in need of a new starship commander
+for a similar mission -- if there is a volunteer
+let him step forward and enter 'Aye'")
+}
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 06bcf57a..5dc79803 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -37,7 +37,10 @@ Started after movement and display of stats was finished (no energy management o
     - [x] 5 - galactic name map
  
 - [ ] restarting the game
+    - after defeat
+    - and by resigning
 - [ ] time progression
     - check all areas where time should move, and adjust accordingly
+    - [ ] defeat due to time expired
 - [ ] intro instructions
 - [ ] victory

From 7008127806f5ae4d52290ecc0a044fa57445c5fb Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Fri, 3 Mar 2023 16:17:09 +1300
Subject: [PATCH 157/198] made it so you can still repair at starbases with a
 broken damage control

---
 84_Super_Star_Trek/rust/src/commands.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 6b2d4b08..c878ae26 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -231,11 +231,10 @@ pub fn run_damage_control(galaxy: &mut Galaxy) {
 
     if ship.damaged.contains_key(systems::DAMAGE_CONTROL) {
         view::inoperable(&systems::name_for(systems::DAMAGE_CONTROL));
-        return;
+    } else {
+        view::damage_control(&ship);
     }
 
-    view::damage_control(&ship);
-
     let quadrant = &galaxy.quadrants[ship.quadrant.as_index()];
     if ship.damaged.len() == 0 || !quadrant.docked_at_starbase(ship.sector) {
         return;

From 51cfce4fb8dfc965eb52058bd05b3e92cfdbdf2c Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sat, 4 Mar 2023 09:07:51 +1300
Subject: [PATCH 158/198] minor tweak to fix another underflow issue

---
 84_Super_Star_Trek/rust/src/main.rs  | 2 +-
 84_Super_Star_Trek/rust/src/model.rs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 2afded1c..5c9e1058 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -39,7 +39,7 @@ fn main() {
             _ => view::print_command_help()
         }
 
-        if galaxy.enterprise.destroyed || galaxy.enterprise.check_stranded() || galaxy.stardate >= galaxy.final_stardate {
+        if galaxy.enterprise.destroyed || galaxy.enterprise.is_stranded() || galaxy.stardate >= galaxy.final_stardate {
             view::end_game_failure(&galaxy);
             if galaxy.remaining_klingons() > 0 && galaxy.remaining_starbases() > 0 && galaxy.stardate < galaxy.final_stardate {
                 view::replay();
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 2985f28a..144a7e93 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -58,13 +58,13 @@ impl Enterprise {
         
         view::enterprise_hit(&hit_strength, &sector);
 
-        self.shields = (self.shields - hit_strength).max(0);
-
-        if self.shields <= 0 {
+        if self.shields <= hit_strength {
             view::enterprise_destroyed();
             self.destroyed = true
         }
 
+        self.shields -= hit_strength;
+
         view::shields_hit(self.shields);
         
         if hit_strength >= 20 {
@@ -100,7 +100,7 @@ impl Enterprise {
         return false;
     }
 
-    pub fn check_stranded(&self) -> bool {
+    pub fn is_stranded(&self) -> bool {
         if self.total_energy < 10 || (self.shields + 10 > self.total_energy && self.damaged.contains_key(systems::SHIELD_CONTROL)) {
             view::stranded();
             return true;

From 32c1508a5138dba883cb6b09cea42734abc02664 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sat, 4 Mar 2023 09:10:43 +1300
Subject: [PATCH 159/198] can now resign

---
 84_Super_Star_Trek/rust/src/main.rs |  1 +
 84_Super_Star_Trek/rust/src/view.rs |  1 -
 84_Super_Star_Trek/rust/tasks.md    | 10 +++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 5c9e1058..a7f11d2a 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -36,6 +36,7 @@ fn main() {
             systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&mut galaxy),
             systems::COMPUTER => commands::access_computer(&galaxy, command[1..].into()),
             systems::PHASERS => commands::get_power_and_fire_phasers(&mut galaxy, command[1..].into()),
+            "XXX" => galaxy.enterprise.destroyed = true,
             _ => view::print_command_help()
         }
 
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index f54bd4cc..73ec39d7 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -489,7 +489,6 @@ Your efficiency rating is {efficiency}.
 
 pub fn replay() {
     println!("
-
 The Federation is in need of a new starship commander
 for a similar mission -- if there is a volunteer
 let him step forward and enter 'Aye'")
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 5dc79803..7a663304 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -36,11 +36,11 @@ Started after movement and display of stats was finished (no energy management o
     - [ ] 4 - direction/distance calculator (useful for nav actions I guess)
     - [x] 5 - galactic name map
  
-- [ ] restarting the game
-    - after defeat
-    - and by resigning
+- [x] restarting the game
+    - [x] after defeat
+    - [x] and by resigning
 - [ ] time progression
     - check all areas where time should move, and adjust accordingly
-    - [ ] defeat due to time expired
+    - [x] defeat due to time expired
 - [ ] intro instructions
-- [ ] victory
+- [x] victory

From 7fb940f18ec7d97f394f2d22668c1e41f7537cbd Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sat, 4 Mar 2023 09:26:24 +1300
Subject: [PATCH 160/198] started work on photon torpedoes (final system) also
 moved all prompt text into views submodule

---
 84_Super_Star_Trek/rust/src/commands.rs | 24 ++++++++++++++++++------
 84_Super_Star_Trek/rust/src/main.rs     |  7 ++++---
 84_Super_Star_Trek/rust/src/model.rs    |  8 ++++++--
 84_Super_Star_Trek/rust/src/view.rs     | 18 ++++++++++++++++++
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index c878ae26..98b9e0d8 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -19,7 +19,7 @@ pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
     }
 
     view::energy_available(galaxy.enterprise.total_energy);
-    let value = input::param_or_prompt_value(&provided, 0, "Number of units to shields", 0, i32::MAX);
+    let value = input::param_or_prompt_value(&provided, 0, view::prompts::SHIELDS, 0, i32::MAX);
     if value.is_none() {
         view::shields_unchanged();
         return;
@@ -38,7 +38,7 @@ pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
 
 pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>) {
 
-    let course = input::param_or_prompt_value(&provided, 0, "Course (1-9)?", 1, 9);
+    let course = input::param_or_prompt_value(&provided, 0, view::prompts::COURSE, 1, 9);
     if course.is_none() {
         view::bad_nav();
         return;
@@ -51,7 +51,7 @@ pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>
         max_warp = 0.2;
     }
 
-    let speed = input::param_or_prompt_value(&provided, 1, format!("Warp Factor (0-{})?", max_warp).as_str(), 0.0, 8.0);
+    let speed = input::param_or_prompt_value(&provided, 1, &view::prompts::warp_factor(max_warp), 0.0, 8.0);
     if speed.is_none() {
         view::bad_nav();
         return;
@@ -244,7 +244,7 @@ pub fn run_damage_control(galaxy: &mut Galaxy) {
     let repair_time = (ship.damaged.len() as f32 * 0.1 + repair_delay).max(0.9);
 
     view::repair_estimate(repair_time);
-    if !input::prompt_yes_no("Will you authorize the repair order") {
+    if !input::prompt_yes_no(view::prompts::REPAIR) {
         return;
     }
 
@@ -273,7 +273,7 @@ pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
 
     let operation : i32;
     loop {
-        let entered = input::param_or_prompt_value(&provided, 0, "Computer active and waiting command?", 0, 5);
+        let entered = input::param_or_prompt_value(&provided, 0, view::prompts::COMPUTER, 0, 5);
         if entered.is_none() {
             view::computer_options();
         } else {
@@ -310,7 +310,7 @@ pub fn get_power_and_fire_phasers(galaxy: &mut Galaxy, provided: Vec<String>) {
     view::phasers_locked(available_energy);
     let mut power: f32;
     loop {
-        let setting = param_or_prompt_value(&provided, 0, "Number of units to fire", 0, available_energy);
+        let setting = param_or_prompt_value(&provided, 0, view::prompts::PHASERS, 0, available_energy);
         if setting.is_some() {
             power = setting.unwrap() as f32;
             break;
@@ -349,4 +349,16 @@ pub fn get_power_and_fire_phasers(galaxy: &mut Galaxy, provided: Vec<String>) {
     quadrant.klingons.retain(|k| k.energy > 0.0);
 
     klingons_fire(galaxy);
+}
+
+pub fn gather_dir_and_launch_torpedo(galaxy: &mut Galaxy, provided: Vec<String>) {
+    if galaxy.enterprise.damaged.contains_key(systems::TORPEDOES) {
+        view::inoperable(&systems::name_for(systems::TORPEDOES));
+        return;
+    }
+
+    if galaxy.enterprise.photon_torpedoes == 0 {
+        view::no_torpedoes_remaining();
+        return;
+    }
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index a7f11d2a..58be1f18 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -18,13 +18,13 @@ fn main() {
     
     view::enterprise();
     view::intro(&galaxy);
-    let _ = input::prompt("Press Enter when ready to accept command");
+    let _ = input::prompt(view::prompts::WHEN_READY);
 
     view::starting_quadrant(&galaxy.enterprise.quadrant);
     view::short_range_scan(&galaxy);
 
     loop {
-        let command = input::prompt("Command?");
+        let command = input::prompt(view::prompts::COMMAND);
         if command.len() == 0 {
             continue;
         }
@@ -36,7 +36,8 @@ fn main() {
             systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&mut galaxy),
             systems::COMPUTER => commands::access_computer(&galaxy, command[1..].into()),
             systems::PHASERS => commands::get_power_and_fire_phasers(&mut galaxy, command[1..].into()),
-            "XXX" => galaxy.enterprise.destroyed = true,
+            systems::TORPEDOES => commands::gather_dir_and_launch_torpedo(&mut galaxy, command[1..].into()),
+            systems::RESIGN => galaxy.enterprise.destroyed = true,
             _ => view::print_command_help()
         }
 
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 144a7e93..58251919 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -118,9 +118,12 @@ pub mod systems {
     pub const LONG_RANGE_SCAN: &str = "LRS";
     pub const COMPUTER: &str = "COM";
     pub const PHASERS: &str = "PHA";
+    pub const TORPEDOES: &str = "TOR";
 
-    pub const KEYS: [&str; 7] = [
-        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL, LONG_RANGE_SCAN, COMPUTER, PHASERS
+    pub const RESIGN: &str = "XXX";
+
+    pub const KEYS: [&str; 8] = [
+        SHORT_RANGE_SCAN, WARP_ENGINES, SHIELD_CONTROL, DAMAGE_CONTROL, LONG_RANGE_SCAN, COMPUTER, PHASERS, TORPEDOES
     ];
 
     pub fn name_for(key: &str) -> String {
@@ -132,6 +135,7 @@ pub mod systems {
             LONG_RANGE_SCAN => "Long Range Scanners".into(),
             COMPUTER => "Library-Computer".into(),
             PHASERS => "Phaser Control".into(),
+            TORPEDOES => "Photon Tubes".into(),
             _ => "Unknown".into()
         }
     }
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 73ec39d7..b087a949 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,5 +1,19 @@
 use crate::model::{Galaxy, Pos, EndPosition, SectorStatus, Enterprise, systems};
 
+pub mod prompts {
+    pub const COURSE: &str = "Course (1-9)?";
+    pub const SHIELDS: &str = "Number of units to shields";
+    pub const REPAIR: &str = "Will you authorize the repair order";
+    pub const COMPUTER: &str = "Computer active and waiting command?";
+    pub const PHASERS: &str = "Number of units to fire";
+    pub const WHEN_READY: &str = "Press Enter when ready to accept command";
+    pub const COMMAND: &str = "Command?";
+
+    pub fn warp_factor(max_warp: f32) -> String {
+        format!("Warp Factor (0-{})?", max_warp)
+    }
+}
+
 pub fn full_instructions() {
     println!(
 "        INSTRUCTIONS FOR 'SUPER STAR TREK'
@@ -492,4 +506,8 @@ pub fn replay() {
 The Federation is in need of a new starship commander
 for a similar mission -- if there is a volunteer
 let him step forward and enter 'Aye'")
+}
+
+pub fn no_torpedoes_remaining() {
+    println!("All photon torpedoes expended")
 }
\ No newline at end of file

From 3344649ed4a35f579529f12271a29ee6b05c619d Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sat, 4 Mar 2023 11:36:42 +1300
Subject: [PATCH 161/198] changed nav function to calculate a path

---
 84_Super_Star_Trek/rust/src/commands.rs | 86 +++++++++++++++++--------
 84_Super_Star_Trek/rust/src/model.rs    | 19 +++---
 84_Super_Star_Trek/rust/src/view.rs     |  9 +++
 3 files changed, 79 insertions(+), 35 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 98b9e0d8..b3ca531e 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -38,7 +38,7 @@ pub fn get_amount_and_set_shields(galaxy: &mut Galaxy, provided: Vec<String>) {
 
 pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>) {
 
-    let course = input::param_or_prompt_value(&provided, 0, view::prompts::COURSE, 1, 9);
+    let course = input::param_or_prompt_value(&provided, 0, view::prompts::COURSE, 1.0, 9.0);
     if course.is_none() {
         view::bad_nav();
         return;
@@ -126,28 +126,28 @@ fn repair_or_damage_random_system(enterprise: &mut Enterprise) {
     view::random_repair_report_for(system_name, true);
 }
 
-fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
+fn move_enterprise(course: f32, warp_speed: f32, galaxy: &mut Galaxy) {
 
     let ship = &mut galaxy.enterprise;
 
     // todo account for being blocked
 
-    let end = find_end_quadrant_sector(ship.quadrant, ship.sector, course, warp_speed);
+    let path = find_path(ship.quadrant, ship.sector, course, warp_speed);
 
-    if end.energy_cost > ship.total_energy {
+    if path.energy_cost > ship.total_energy {
         view::insuffient_warp_energy(warp_speed);
         return
     }
 
-    if end.hit_edge {
-        view::hit_edge(&end);
+    if path.hit_edge {
+        view::hit_edge(&path);
     }
     
-    if ship.quadrant != end.quadrant {
-        view::enter_quadrant(&end.quadrant);
-        galaxy.scanned.insert(end.quadrant);
+    if ship.quadrant != path.quadrant {
+        view::enter_quadrant(&path.quadrant);
+        galaxy.scanned.insert(path.quadrant);
         
-        if galaxy.quadrants[end.quadrant.as_index()].klingons.len() > 0 {
+        if galaxy.quadrants[path.quadrant.as_index()].klingons.len() > 0 {
             view::condition_red();
             if ship.shields <= 200 {
                 view::danger_shields();
@@ -155,16 +155,16 @@ fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
         }
     }
 
-    ship.quadrant = end.quadrant;
-    ship.sector = end.sector;
+    ship.quadrant = path.quadrant;
+    ship.sector = path.sector;
 
-    let quadrant = &galaxy.quadrants[end.quadrant.as_index()];
+    let quadrant = &galaxy.quadrants[path.quadrant.as_index()];
     if quadrant.docked_at_starbase(ship.sector) {
         ship.shields = 0;
         ship.photon_torpedoes = MAX_PHOTON_TORPEDOES;
         ship.total_energy = MAX_ENERGY;
     } else {
-        ship.total_energy = (ship.total_energy - end.energy_cost).max(0);
+        ship.total_energy = (ship.total_energy - path.energy_cost).max(0);
         if ship.shields > ship.total_energy {
             view::divert_energy_from_shields();
             ship.shields = ship.total_energy;
@@ -174,26 +174,45 @@ fn move_enterprise(course: u8, warp_speed: f32, galaxy: &mut Galaxy) {
     view::short_range_scan(&galaxy)
 }
 
-fn find_end_quadrant_sector(start_quadrant: Pos, start_sector: Pos, course: u8, warp_speed: f32) -> EndPosition {
-    let (dx, dy): (i8, i8) = COURSES[(course - 1) as usize];
+fn find_path(start_quadrant: Pos, start_sector: Pos, course: f32, warp_speed: f32) -> EndPosition {
+
+    // this course delta stuff is a translation (of a translation, of a translation...) of the original basic calcs
+    let dir = (course - 1.0) % 8.0;
+    let (dx1, dy1) = COURSES[dir as usize];
+    let (dx2, dy2) = COURSES[(dir + 1.0) as usize];
+    let frac = dir - (dir as i32) as f32;
+
+    let dx = dx1 + (dx2 - dx1) * frac;
+    let dy = dy1 + (dy2 - dy1) * frac;
 
     let mut distance = (warp_speed * 8.0) as i8;
     if distance == 0 {
         distance = 1;
     }
 
-    let galaxy_pos = start_quadrant * 8u8 + start_sector;
+    let mut last_sector = start_quadrant * 8 + start_sector;
+    let mut path = Vec::new();
+    let mut hit_edge;
 
-    let mut nx = (galaxy_pos.0 as i8) + dx * distance;
-    let mut ny = (galaxy_pos.1 as i8) + dy * distance;
+    loop {
+        let nx = (last_sector.0 as f32 + dx) as i8;
+        let ny = (last_sector.1 as f32 + dy) as i8;
+        hit_edge = nx < 0 || ny < 0 || nx >= 64 || ny >= 64;
+        if hit_edge {
+            break;
+        }
+        last_sector = Pos(nx as u8, ny as u8);
+        path.push(last_sector);
 
-    let hit_edge = nx < 0 || ny < 0 || nx >= 64 || ny >= 64;
-    nx = nx.min(63).max(0);
-    ny = ny.min(63).max(0);
-    
-    let quadrant = Pos((nx / 8) as u8, (ny / 8) as u8);
-    let sector = Pos((nx % 8) as u8, (ny % 8) as u8);
-    let energy_cost = distance as u16 + 10;
+        distance -= 1;
+        if distance == 0 {
+            break;
+        }
+    }
+  
+    let quadrant = Pos((last_sector.0 / 8) as u8, (last_sector.1 / 8) as u8);
+    let sector = Pos((last_sector.0 % 8) as u8, (last_sector.1 % 8) as u8);
+    let energy_cost = path.len() as u16 + 10;
 
     EndPosition { quadrant, sector, hit_edge, energy_cost }
 }
@@ -361,4 +380,19 @@ pub fn gather_dir_and_launch_torpedo(galaxy: &mut Galaxy, provided: Vec<String>)
         view::no_torpedoes_remaining();
         return;
     }
+
+    let course = input::param_or_prompt_value(&provided, 0, view::prompts::TORPEDO_COURSE, 1.0, 9.0);
+    if course.is_none() {
+        view::bad_torpedo_course();
+        return;
+    }
+
+    galaxy.enterprise.photon_torpedoes -= 1;
+    view::torpedo_track();
+
+    // calculate direction
+    // step through sectors
+    // test for hits or final miss
+
+    klingons_fire(galaxy);
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 58251919..a8919b5e 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -183,15 +183,16 @@ impl Display for Pos {
     }
 }
 
-pub const COURSES : [(i8, i8); 8] = [
-    (1, 0),
-    (1, -1),
-    (0, -1),
-    (-1, -1),
-    (-1, 0),
-    (-1, 1),
-    (0, 1),
-    (1, 1),
+pub const COURSES : [(f32, f32); 9] = [
+    (1., 0.),
+    (1., -1.),
+    (0., -1.),
+    (-1., -1.),
+    (-1., 0.),
+    (-1., 1.),
+    (0., 1.),
+    (1., 1.),
+    (1., 0.), // course 9 is equal to course 1
 ];
 
 #[derive(PartialEq)]
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index b087a949..38e307df 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -2,6 +2,7 @@ use crate::model::{Galaxy, Pos, EndPosition, SectorStatus, Enterprise, systems};
 
 pub mod prompts {
     pub const COURSE: &str = "Course (1-9)?";
+    pub const TORPEDO_COURSE: &str = "Photon torpedo course (1-9)?";
     pub const SHIELDS: &str = "Number of units to shields";
     pub const REPAIR: &str = "Will you authorize the repair order";
     pub const COMPUTER: &str = "Computer active and waiting command?";
@@ -276,6 +277,10 @@ pub fn bad_nav() {
     println!("   Lt. Sulu reports, 'Incorrect course data, sir!'")
 }
 
+pub fn bad_torpedo_course() {
+    println!("   Ensign Chekov reports, 'Incorrect course data, sir!'")
+}
+
 pub fn enterprise_hit(hit_strength: &u16, from_sector: &Pos) {
     println!("{hit_strength} unit hit on Enterprise from sector {from_sector}");
 }
@@ -510,4 +515,8 @@ let him step forward and enter 'Aye'")
 
 pub fn no_torpedoes_remaining() {
     println!("All photon torpedoes expended")
+}
+
+pub fn torpedo_track() {
+    println!("Torpedo track:")
 }
\ No newline at end of file

From 5c25a83eafe9a8c062c0aed79e30262206cad81a Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sat, 4 Mar 2023 11:37:32 +1300
Subject: [PATCH 162/198] bug fix

---
 84_Super_Star_Trek/rust/src/view.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 38e307df..267fc91b 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -291,7 +291,7 @@ pub fn hit_edge(end: &EndPosition) {
     'Permission to attempt crossing of galactic perimeter
         is hereby *Denied*. Shut down your engines.'
     Chief Engineer Scott reports, 'Warp engines shut down
-        at sector {} of quadrant {}.'", end.quadrant, end.sector);
+        at sector {} of quadrant {}.'", end.sector, end.quadrant);
 }
 
 pub fn condition_red() {

From 781d0566f8d351e38ba273854ba0fb1c624df180 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sat, 4 Mar 2023 15:24:05 +1300
Subject: [PATCH 163/198] implemented torpedoes!

---
 84_Super_Star_Trek/rust/src/commands.rs | 127 ++++++++++++++++++------
 84_Super_Star_Trek/rust/src/main.rs     |   2 +-
 84_Super_Star_Trek/rust/src/model.rs    |  29 ++++--
 84_Super_Star_Trek/rust/src/view.rs     |  39 ++++++--
 84_Super_Star_Trek/rust/tasks.md        |   4 +-
 5 files changed, 148 insertions(+), 53 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index b3ca531e..cc79dffb 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -132,22 +132,24 @@ fn move_enterprise(course: f32, warp_speed: f32, galaxy: &mut Galaxy) {
 
     // todo account for being blocked
 
-    let path = find_path(ship.quadrant, ship.sector, course, warp_speed);
+    let (path, hit_edge) = find_nav_path(ship.quadrant, ship.sector, course, warp_speed);
+    let energy_cost = path.len() as u16 + 10;
 
-    if path.energy_cost > ship.total_energy {
+    if energy_cost > ship.total_energy {
         view::insuffient_warp_energy(warp_speed);
         return
     }
 
-    if path.hit_edge {
-        view::hit_edge(&path);
+    let (end_quadrant, end_sector) = path[path.len() - 1].to_local_quadrant_sector();
+    if hit_edge {
+        view::hit_edge(end_quadrant, end_sector);
     }
     
-    if ship.quadrant != path.quadrant {
-        view::enter_quadrant(&path.quadrant);
-        galaxy.scanned.insert(path.quadrant);
+    if ship.quadrant != end_quadrant {
+        view::enter_quadrant(end_quadrant);
+        galaxy.scanned.insert(end_quadrant);
         
-        if galaxy.quadrants[path.quadrant.as_index()].klingons.len() > 0 {
+        if galaxy.quadrants[end_quadrant.as_index()].klingons.len() > 0 {
             view::condition_red();
             if ship.shields <= 200 {
                 view::danger_shields();
@@ -155,16 +157,16 @@ fn move_enterprise(course: f32, warp_speed: f32, galaxy: &mut Galaxy) {
         }
     }
 
-    ship.quadrant = path.quadrant;
-    ship.sector = path.sector;
+    ship.quadrant = end_quadrant;
+    ship.sector = end_sector;
 
-    let quadrant = &galaxy.quadrants[path.quadrant.as_index()];
+    let quadrant = &galaxy.quadrants[end_quadrant.as_index()];
     if quadrant.docked_at_starbase(ship.sector) {
         ship.shields = 0;
         ship.photon_torpedoes = MAX_PHOTON_TORPEDOES;
         ship.total_energy = MAX_ENERGY;
     } else {
-        ship.total_energy = (ship.total_energy - path.energy_cost).max(0);
+        ship.total_energy = ship.total_energy - energy_cost;
         if ship.shields > ship.total_energy {
             view::divert_energy_from_shields();
             ship.shields = ship.total_energy;
@@ -174,23 +176,16 @@ fn move_enterprise(course: f32, warp_speed: f32, galaxy: &mut Galaxy) {
     view::short_range_scan(&galaxy)
 }
 
-fn find_path(start_quadrant: Pos, start_sector: Pos, course: f32, warp_speed: f32) -> EndPosition {
+fn find_nav_path(start_quadrant: Pos, start_sector: Pos, course: f32, warp_speed: f32) -> (Vec<Pos>, bool) {
 
-    // this course delta stuff is a translation (of a translation, of a translation...) of the original basic calcs
-    let dir = (course - 1.0) % 8.0;
-    let (dx1, dy1) = COURSES[dir as usize];
-    let (dx2, dy2) = COURSES[(dir + 1.0) as usize];
-    let frac = dir - (dir as i32) as f32;
-
-    let dx = dx1 + (dx2 - dx1) * frac;
-    let dy = dy1 + (dy2 - dy1) * frac;
+    let (dx, dy) = calculate_delta(course);
 
     let mut distance = (warp_speed * 8.0) as i8;
     if distance == 0 {
         distance = 1;
     }
 
-    let mut last_sector = start_quadrant * 8 + start_sector;
+    let mut last_sector = start_sector.as_galactic_sector(start_quadrant);
     let mut path = Vec::new();
     let mut hit_edge;
 
@@ -210,11 +205,20 @@ fn find_path(start_quadrant: Pos, start_sector: Pos, course: f32, warp_speed: f3
         }
     }
   
-    let quadrant = Pos((last_sector.0 / 8) as u8, (last_sector.1 / 8) as u8);
-    let sector = Pos((last_sector.0 % 8) as u8, (last_sector.1 % 8) as u8);
-    let energy_cost = path.len() as u16 + 10;
+    (path, hit_edge)
+}
 
-    EndPosition { quadrant, sector, hit_edge, energy_cost }
+fn calculate_delta(course: f32) -> (f32, f32) {
+    // this course delta stuff is a translation (of a translation, of a translation...) of the original basic calcs
+    let dir = (course - 1.0) % 8.0;
+    let (dx1, dy1) = COURSES[dir as usize];
+    let (dx2, dy2) = COURSES[(dir + 1.0) as usize];
+    let frac = dir - (dir as i32) as f32;
+
+    let dx = dx1 + (dx2 - dx1) * frac;
+    let dy = dy1 + (dy2 - dy1) * frac;
+
+    (dx, dy)
 }
 
 fn klingons_move(galaxy: &mut Galaxy) {
@@ -371,12 +375,15 @@ pub fn get_power_and_fire_phasers(galaxy: &mut Galaxy, provided: Vec<String>) {
 }
 
 pub fn gather_dir_and_launch_torpedo(galaxy: &mut Galaxy, provided: Vec<String>) {
-    if galaxy.enterprise.damaged.contains_key(systems::TORPEDOES) {
+    let star_bases = galaxy.remaining_starbases();
+    let ship = &mut galaxy.enterprise;
+
+    if ship.damaged.contains_key(systems::TORPEDOES) {
         view::inoperable(&systems::name_for(systems::TORPEDOES));
         return;
     }
 
-    if galaxy.enterprise.photon_torpedoes == 0 {
+    if ship.photon_torpedoes == 0 {
         view::no_torpedoes_remaining();
         return;
     }
@@ -387,12 +394,68 @@ pub fn gather_dir_and_launch_torpedo(galaxy: &mut Galaxy, provided: Vec<String>)
         return;
     }
 
-    galaxy.enterprise.photon_torpedoes -= 1;
+    ship.photon_torpedoes -= 1;
     view::torpedo_track();
 
-    // calculate direction
-    // step through sectors
-    // test for hits or final miss
+    let path = find_torpedo_path(ship.sector, course.unwrap());
+    let quadrant = &mut galaxy.quadrants[ship.quadrant.as_index()];
+    let mut hit = false;
+    for p in path {
+        view::torpedo_path(p);
+        match quadrant.sector_status(p) {
+            SectorStatus::Empty => continue,
+            SectorStatus::Star => {
+                hit = true;
+                view::star_absorbed_torpedo(p);
+                break;
+            },
+            SectorStatus::Klingon => {
+                hit = true;
+                quadrant.get_klingon(p).unwrap().energy = 0.0;
+                quadrant.klingons.retain(|k| k.energy > 0.0);
+                view::klingon_destroyed();
+                break;
+            },
+            SectorStatus::StarBase => {
+                hit = true;
+                quadrant.star_base = None;
+                let remaining = star_bases - 1;
+                view::destroyed_starbase(remaining > 0);
+                if remaining == 0 {
+                    ship.destroyed = true;
+                }
+                break;
+            }
+        }
+    }
+
+    if ship.destroyed { // if you wiped out the last starbase, trigger game over
+        return;
+    }
+
+    if !hit {
+        view::torpedo_missed();
+    }
 
     klingons_fire(galaxy);
+}
+
+fn find_torpedo_path(start_sector: Pos, course: f32) -> Vec<Pos> {
+
+    let (dx, dy) = calculate_delta(course);
+
+    let mut last_sector = start_sector;
+    let mut path = Vec::new();
+
+    loop {
+        let nx = (last_sector.0 as f32 + dx) as i8;
+        let ny = (last_sector.1 as f32 + dy) as i8;
+        if nx < 0 || ny < 0 || nx >= 8 || ny >= 8 {
+            break;
+        }
+        last_sector = Pos(nx as u8, ny as u8);
+        path.push(last_sector);
+    }
+  
+    path
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 58be1f18..78e59531 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -20,7 +20,7 @@ fn main() {
     view::intro(&galaxy);
     let _ = input::prompt(view::prompts::WHEN_READY);
 
-    view::starting_quadrant(&galaxy.enterprise.quadrant);
+    view::starting_quadrant(galaxy.enterprise.quadrant);
     view::short_range_scan(&galaxy);
 
     loop {
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index a8919b5e..9b2f1118 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -60,7 +60,8 @@ impl Enterprise {
 
         if self.shields <= hit_strength {
             view::enterprise_destroyed();
-            self.destroyed = true
+            self.destroyed = true;
+            return;
         }
 
         self.shields -= hit_strength;
@@ -141,13 +142,6 @@ pub mod systems {
     }
 }
 
-pub struct EndPosition {
-    pub quadrant: Pos,
-    pub sector: Pos,
-    pub hit_edge: bool,
-    pub energy_cost: u16,
-}
-
 #[derive(PartialEq, Clone, Copy, Debug, Hash, Eq)]
 pub struct Pos(pub u8, pub u8);
 
@@ -159,6 +153,14 @@ impl Pos {
     pub fn abs_diff(&self, other: Pos) -> u8 {
         self.0.abs_diff(other.0) + self.1.abs_diff(other.1)
     }
+
+    pub fn as_galactic_sector(&self, containing_quadrant: Pos) -> Self {
+        Pos(containing_quadrant.0 * 8 + self.0, containing_quadrant.1 * 8 + self.1)
+    }
+
+    pub fn to_local_quadrant_sector(&self) -> (Self, Self) {
+        (Pos(self.0 / 8, self.1 / 8), Pos(self.0 % 8, self.1 % 8))
+    }
 }
 
 impl Mul<u8> for Pos {
@@ -286,7 +288,7 @@ impl Quadrant {
             SectorStatus::Star
         } else if self.is_starbase(sector) {
             SectorStatus::StarBase
-        } else if self.has_klingon(&sector) {
+        } else if self.has_klingon(sector) {
             SectorStatus::Klingon
         } else {
             SectorStatus::Empty
@@ -300,9 +302,14 @@ impl Quadrant {
         }
     }
 
-    fn has_klingon(&self, sector: &Pos) -> bool {
+    fn has_klingon(&self, sector: Pos) -> bool {
         let klingons = &self.klingons;
-        klingons.into_iter().find(|k| &k.sector == sector).is_some()
+        klingons.into_iter().find(|k| k.sector == sector).is_some()
+    }
+
+    pub fn get_klingon(&mut self, sector: Pos) -> Option<&mut Klingon> {
+        let klingons = &mut self.klingons;
+        klingons.into_iter().find(|k| k.sector == sector)
     }
 
     pub fn find_empty_sector(&self) -> Pos {
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 267fc91b..f7bac4db 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,4 +1,4 @@
-use crate::model::{Galaxy, Pos, EndPosition, SectorStatus, Enterprise, systems};
+use crate::model::{Galaxy, Pos, SectorStatus, Enterprise, systems};
 
 pub mod prompts {
     pub const COURSE: &str = "Course (1-9)?";
@@ -187,19 +187,19 @@ const REGION_NAMES: [&str; 16] = [
 
 const SUB_REGION_NAMES: [&str; 4] = ["I", "II", "III", "IV"];
 
-fn quadrant_name(quadrant: &Pos) -> String {
+fn quadrant_name(quadrant: Pos) -> String {
     format!("{} {}", 
         REGION_NAMES[((quadrant.1 << 1) + (quadrant.0 >> 2)) as usize],
         SUB_REGION_NAMES[(quadrant.1 % 4) as usize])
 }
 
-pub fn starting_quadrant(quadrant: &Pos) {
+pub fn starting_quadrant(quadrant: Pos) {
     println!(
 "\nYour mission begins with your starship located
 in the galactic quadrant, '{}'.\n", quadrant_name(quadrant))
 }
 
-pub fn enter_quadrant(quadrant: &Pos) {
+pub fn enter_quadrant(quadrant: Pos) {
     println!("\nNow entering {} quadrant . . .\n", quadrant_name(quadrant))
 }
 
@@ -285,13 +285,13 @@ pub fn enterprise_hit(hit_strength: &u16, from_sector: &Pos) {
     println!("{hit_strength} unit hit on Enterprise from sector {from_sector}");
 }
 
-pub fn hit_edge(end: &EndPosition) {
+pub fn hit_edge(quadrant: Pos, sector: Pos) {
     println!(
 "Lt. Uhura report message from Starfleet Command:
     'Permission to attempt crossing of galactic perimeter
         is hereby *Denied*. Shut down your engines.'
     Chief Engineer Scott reports, 'Warp engines shut down
-        at sector {} of quadrant {}.'", end.sector, end.quadrant);
+        at sector {} of quadrant {}.'", sector, quadrant);
 }
 
 pub fn condition_red() {
@@ -494,7 +494,7 @@ pub fn klingon_remaining_energy(energy: f32) {
 }
 
 pub fn klingon_destroyed() {
-    println!("   Target Destroyed!") // not standard for game but feedback is good. Sorry Mr. Roddenberry
+    println!("*** Klingon destroyed ***")
 }
 
 pub fn congratulations(efficiency: f32) {
@@ -519,4 +519,29 @@ pub fn no_torpedoes_remaining() {
 
 pub fn torpedo_track() {
     println!("Torpedo track:")
+}
+
+pub fn torpedo_path(sector: Pos) {
+    println!("{:<16}{}", "", sector)
+}
+
+pub fn torpedo_missed() {
+    println!("Torpedo missed!")
+}
+
+pub fn star_absorbed_torpedo(sector: Pos) {
+    println!("Star at {sector} absorbed torpedo energy.")
+}
+
+pub fn destroyed_starbase(not_the_last_starbase: bool) {
+    println!("*** Starbase destroyed ***");
+    if not_the_last_starbase {
+        println!("
+Starfleet Command reviewing your record to consider
+court martial!")
+    } else {
+        println!("
+That does it, Captain!!  You are hereby relieved of command
+and sentenced to 99 stardates at hard labor on Cygnus 12!!")
+    }
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 7a663304..2ddea3df 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -25,9 +25,9 @@ Started after movement and display of stats was finished (no energy management o
     - [x] proximity detection for docking
     - [x] repair on damage control
     - [x] protection from shots
-- [ ] weapons
+- [x] weapons
     - [x] phasers
-    - [ ] torpedoes
+    - [x] torpedoes
 - [ ] computer
     - [x] 0 - output of all short and long range scans (requires tracking if a system has been scanned)
     - [ ] 1 - klingons, starbases, stardate and damage control

From f5bcacb399c8886b09604c03db3bda28eb2c12df Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sat, 4 Mar 2023 21:35:00 +1300
Subject: [PATCH 164/198] update to tasks

---
 84_Super_Star_Trek/rust/tasks.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 2ddea3df..7d31efd7 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -39,8 +39,9 @@ Started after movement and display of stats was finished (no energy management o
 - [x] restarting the game
     - [x] after defeat
     - [x] and by resigning
-- [ ] time progression
-    - check all areas where time should move, and adjust accordingly
+- [x] time progression
+    - [x] check all areas where time should move, and adjust accordingly
+        - looks to only be on nav and repair
     - [x] defeat due to time expired
 - [ ] intro instructions
 - [x] victory

From 217e76071b11717ac0ad6a8b01c9659678480339 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sat, 4 Mar 2023 21:36:29 +1300
Subject: [PATCH 165/198] added pre-game text blobs

---
 84_Super_Star_Trek/rust/src/view.rs | 33 +++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index f7bac4db..a838922b 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -1,6 +1,7 @@
 use crate::model::{Galaxy, Pos, SectorStatus, Enterprise, systems};
 
 pub mod prompts {
+    pub const INSTRUCTIONS: &str = "Do you need instructions";
     pub const COURSE: &str = "Course (1-9)?";
     pub const TORPEDO_COURSE: &str = "Photon torpedo course (1-9)?";
     pub const SHIELDS: &str = "Number of units to shields";
@@ -15,6 +16,38 @@ pub mod prompts {
     }
 }
 
+pub fn title() {
+    println!("
+
+
+
+
+
+
+
+
+
+
+
+          *************************************
+          *                                   *
+          *                                   *
+          *      * * SUPER STAR TREK * *      *
+          *                                   *
+          *                                   *
+          *************************************
+
+
+
+
+
+
+
+
+
+    ");
+}
+
 pub fn full_instructions() {
     println!(
 "        INSTRUCTIONS FOR 'SUPER STAR TREK'

From 15cf7b31ff26d7dc32da696d85efb5d41fc39678 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 06:33:59 +1300
Subject: [PATCH 166/198] implemented input instructions

---
 84_Super_Star_Trek/rust/src/main.rs | 8 +++++++-
 84_Super_Star_Trek/rust/src/view.rs | 4 +++-
 84_Super_Star_Trek/rust/tasks.md    | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index 78e59531..e51b179e 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -1,6 +1,6 @@
 use std::process::exit;
 
-use input::prompt;
+use input::{prompt, prompt_yes_no};
 use model::{Galaxy, systems};
 
 mod input;
@@ -12,6 +12,12 @@ fn main() {
     ctrlc::set_handler(move || { exit(0) })
     .expect("Error setting Ctrl-C handler");
 
+    view::title();
+    if prompt_yes_no(view::prompts::INSTRUCTIONS) {
+        view::full_instructions();
+        let _ = input::prompt(view::prompts::WHEN_READY);
+    }
+
     let mut galaxy = Galaxy::generate_new();
     let initial_klingons = galaxy.remaining_klingons();
     let initial_stardate = galaxy.stardate;
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index a838922b..22f397ef 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -154,7 +154,9 @@ pub fn full_instructions() {
             direction/distance calculations.
          Option 5 = Galactic Region Name Map
             This option prints the names of the sixteen major
-            galactic regions referred to in the game.")
+            galactic regions referred to in the game.
+
+")
 }
 
 pub fn enterprise() {
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 7d31efd7..20f9a5c1 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -43,5 +43,5 @@ Started after movement and display of stats was finished (no energy management o
     - [x] check all areas where time should move, and adjust accordingly
         - looks to only be on nav and repair
     - [x] defeat due to time expired
-- [ ] intro instructions
+- [x] intro instructions
 - [x] victory

From c4d4f820ac72a42d903d90bc33f3e29b16befd08 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 07:49:25 +1300
Subject: [PATCH 167/198] work on some computer functions

---
 84_Super_Star_Trek/rust/src/commands.rs | 16 ++++++++++++++++
 84_Super_Star_Trek/rust/src/view.rs     |  8 ++++++++
 2 files changed, 24 insertions(+)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index cc79dffb..cf427310 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -307,11 +307,27 @@ pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
     
     match operation {
         0 => view::galaxy_scanned_map(galaxy),
+        3 => show_starbase_data(galaxy),
         5 => view::galaxy_region_map(),
         _ => todo!() // todo implement others
     }
 }
 
+fn show_starbase_data(galaxy: &Galaxy) {
+    let quadrant = &galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
+    match &quadrant.star_base {
+        None => {
+            view::no_local_starbase();
+            return;
+        },
+        Some(s) => {
+            view::starbase_report();
+            let pos = s.sector;
+            // calulcate direction and distance then print
+        }
+    }
+}
+
 pub fn get_power_and_fire_phasers(galaxy: &mut Galaxy, provided: Vec<String>) {
     if galaxy.enterprise.damaged.contains_key(systems::PHASERS) {
         view::inoperable(&systems::name_for(systems::PHASERS));
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 22f397ef..75ad1924 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -579,4 +579,12 @@ court martial!")
 That does it, Captain!!  You are hereby relieved of command
 and sentenced to 99 stardates at hard labor on Cygnus 12!!")
     }
+}
+
+pub fn no_local_starbase() {
+    println!("Mr. Spock reports, 'Sensors show no starbases in this quadrant.'")
+}
+
+pub fn starbase_report() {
+    println!("From Enterprise to Starbase:'")
 }
\ No newline at end of file

From 5542e2fe59c7fa4837d65c31c54dd8988acb279b Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 08:11:24 +1300
Subject: [PATCH 168/198] first cut of dir / dist to local objects also bug fix
 for param reading, where the param wasnt bound by min max

---
 84_Super_Star_Trek/rust/src/commands.rs |  5 +++--
 84_Super_Star_Trek/rust/src/input.rs    | 11 ++++++----
 84_Super_Star_Trek/rust/src/model.rs    | 27 +++++++++++++++++++++++++
 84_Super_Star_Trek/rust/src/view.rs     |  7 +++++++
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index cf427310..60ffcb21 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -322,8 +322,9 @@ fn show_starbase_data(galaxy: &Galaxy) {
         },
         Some(s) => {
             view::starbase_report();
-            let pos = s.sector;
-            // calulcate direction and distance then print
+            let origin = galaxy.enterprise.sector;
+            let target = s.sector;
+            view::direction_distance(origin.direction(target), origin.dist(target))
         }
     }
 }
diff --git a/84_Super_Star_Trek/rust/src/input.rs b/84_Super_Star_Trek/rust/src/input.rs
index 5bd35fb3..68ab7006 100644
--- a/84_Super_Star_Trek/rust/src/input.rs
+++ b/84_Super_Star_Trek/rust/src/input.rs
@@ -42,12 +42,15 @@ pub fn prompt_value<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T)
 }
 
 pub fn param_or_prompt_value<T: FromStr + PartialOrd>(params: &Vec<String>, param_pos: usize, prompt_text: &str, min: T, max: T) -> Option<T> {
+    let mut res: Option<T> = None;
     if params.len() > param_pos {
         match params[param_pos].parse::<T>() {
-            Ok(n) => Some(n),
-            _ => None
+            Ok(n) if (n >= min && n <= max) => res = Some(n),
+            _ => ()
         }
-    } else {
-        return prompt_value::<T>(prompt_text, min, max);
     }
+    if res.is_some() {
+        return res;
+    }
+    return prompt_value::<T>(prompt_text, min, max);    
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 9b2f1118..dd2b8dd8 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -154,6 +154,33 @@ impl Pos {
         self.0.abs_diff(other.0) + self.1.abs_diff(other.1)
     }
 
+    pub fn dist(&self, other: Pos) -> f32 {
+        let dx = other.0 as f32 - self.0 as f32;
+        let dy = other.1 as f32 - self.1 as f32;
+        (f32::powi(dx, 2) + f32::powi(dy, 2)).sqrt()
+    }
+
+    pub fn direction(&self, other: Pos) -> f32 {
+        // this is a replication of the original BASIC code
+        let dx = other.0 as f32 - self.0 as f32;
+        let dy = other.1 as f32 - self.1 as f32;
+        let dx_dominant = dx.abs() > dy.abs();
+
+        let frac = if dx_dominant { dy / dx } else { -dx / dy };
+        let nearest_cardinal = 
+            if dx_dominant {
+                if dx > 0. { 7. } else { 3. }
+            } else {
+                if dy > 0. { 1. } else { 5. }
+            };
+        
+        let mut dir = nearest_cardinal + frac;
+        if dir < 1. {
+            dir += 8.
+        }
+        dir
+    }
+
     pub fn as_galactic_sector(&self, containing_quadrant: Pos) -> Self {
         Pos(containing_quadrant.0 * 8 + self.0, containing_quadrant.1 * 8 + self.1)
     }
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 75ad1924..19cc7a57 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -587,4 +587,11 @@ pub fn no_local_starbase() {
 
 pub fn starbase_report() {
     println!("From Enterprise to Starbase:'")
+}
+
+pub fn direction_distance(dir: f32, dist: f32) {
+    println!(
+"Direction = {dir}
+Distance = {dist}"
+    )
 }
\ No newline at end of file

From 2dba25c4eef4d4ad1563b8aa1192221e53b5a500 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 11:05:43 +1300
Subject: [PATCH 169/198] fixed calculation for direction

---
 84_Super_Star_Trek/rust/src/model.rs | 9 +++++----
 84_Super_Star_Trek/rust/src/view.rs  | 6 +++---
 84_Super_Star_Trek/rust/tasks.md     | 1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index dd2b8dd8..1bb5ef8e 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -154,16 +154,17 @@ impl Pos {
         self.0.abs_diff(other.0) + self.1.abs_diff(other.1)
     }
 
-    pub fn dist(&self, other: Pos) -> f32 {
+    pub fn dist(&self, other: Pos) -> u8 {
         let dx = other.0 as f32 - self.0 as f32;
         let dy = other.1 as f32 - self.1 as f32;
-        (f32::powi(dx, 2) + f32::powi(dy, 2)).sqrt()
+        (f32::powi(dx, 2) + f32::powi(dy, 2)).sqrt() as u8
     }
 
     pub fn direction(&self, other: Pos) -> f32 {
         // this is a replication of the original BASIC code
-        let dx = other.0 as f32 - self.0 as f32;
-        let dy = other.1 as f32 - self.1 as f32;
+        let dy = other.0 as f32 - self.0 as f32;
+        let dx = other.1 as f32 - self.1 as f32;
+        // note i actually use x,y, but the calculation assumes y,x so they're flipped above
         let dx_dominant = dx.abs() > dy.abs();
 
         let frac = if dx_dominant { dy / dx } else { -dx / dy };
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 19cc7a57..00598b58 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -433,7 +433,7 @@ pub fn long_range_scan(galaxy: &Galaxy) -> Vec<Pos> {
                 stars = format!("{}", quadrant.stars.len());
             }
 
-            print!(": {}{}{} ", klingons, stars, star_bases)
+            print!(": {}{}{} ", klingons, star_bases, stars)
         }
         println!(":");
         println!("{:-^19}", "");
@@ -482,7 +482,7 @@ pub fn galaxy_scanned_map(galaxy: &Galaxy) {
             let pos = Pos(x, y);
             if galaxy.scanned.contains(&pos) {
                 let quadrant = &galaxy.quadrants[pos.as_index()];
-                print!(" {}{}{}  ", quadrant.klingons.len(), quadrant.stars.len(), quadrant.star_base.as_ref().map_or("0", |_| "1"))
+                print!(" {}{}{}  ", quadrant.klingons.len(), quadrant.star_base.as_ref().map_or("0", |_| "1"), quadrant.stars.len())
             } else {
                 print!(" ***  ");
             }
@@ -589,7 +589,7 @@ pub fn starbase_report() {
     println!("From Enterprise to Starbase:'")
 }
 
-pub fn direction_distance(dir: f32, dist: f32) {
+pub fn direction_distance(dir: f32, dist: u8) {
     println!(
 "Direction = {dir}
 Distance = {dist}"
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 20f9a5c1..f3350bd6 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -45,3 +45,4 @@ Started after movement and display of stats was finished (no energy management o
     - [x] defeat due to time expired
 - [x] intro instructions
 - [x] victory
+- [ ] switch from x,y to y,x
\ No newline at end of file

From e593bfd39aa817a921480aa32d9ec35f0c8041a1 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 11:59:16 +1300
Subject: [PATCH 170/198] general status from computer

---
 84_Super_Star_Trek/rust/src/commands.rs | 19 ++++++++++++-------
 84_Super_Star_Trek/rust/src/main.rs     |  5 ++++-
 84_Super_Star_Trek/rust/src/view.rs     | 16 ++++++++++++++++
 84_Super_Star_Trek/rust/tasks.md        |  4 ++--
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 60ffcb21..cfbc77e1 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -248,16 +248,17 @@ fn klingons_fire(galaxy: &mut Galaxy) {
     }
 }
 
-pub fn run_damage_control(galaxy: &mut Galaxy) {
-
-    let ship = &mut galaxy.enterprise;
-
-    if ship.damaged.contains_key(systems::DAMAGE_CONTROL) {
+pub fn run_damage_control(galaxy: &Galaxy) {
+    if galaxy.enterprise.damaged.contains_key(systems::DAMAGE_CONTROL) {
         view::inoperable(&systems::name_for(systems::DAMAGE_CONTROL));
-    } else {
-        view::damage_control(&ship);
+        return;
     }
+    
+    view::damage_control(&galaxy.enterprise);
+}
 
+pub fn try_starbase_ship_repair(galaxy: &mut Galaxy) {
+    let ship = &mut galaxy.enterprise;
     let quadrant = &galaxy.quadrants[ship.quadrant.as_index()];
     if ship.damaged.len() == 0 || !quadrant.docked_at_starbase(ship.sector) {
         return;
@@ -307,6 +308,10 @@ pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
     
     match operation {
         0 => view::galaxy_scanned_map(galaxy),
+        1 => {
+            view::status_report(galaxy);
+            run_damage_control(galaxy);
+        },
         3 => show_starbase_data(galaxy),
         5 => view::galaxy_region_map(),
         _ => todo!() // todo implement others
diff --git a/84_Super_Star_Trek/rust/src/main.rs b/84_Super_Star_Trek/rust/src/main.rs
index e51b179e..4c1a277e 100644
--- a/84_Super_Star_Trek/rust/src/main.rs
+++ b/84_Super_Star_Trek/rust/src/main.rs
@@ -38,7 +38,10 @@ fn main() {
             systems::SHORT_RANGE_SCAN => commands::perform_short_range_scan(&galaxy),
             systems::WARP_ENGINES => commands::gather_dir_and_speed_then_move(&mut galaxy, command[1..].into()),
             systems::SHIELD_CONTROL => commands::get_amount_and_set_shields(&mut galaxy, command[1..].into()),
-            systems::DAMAGE_CONTROL => commands::run_damage_control(&mut galaxy),
+            systems::DAMAGE_CONTROL => {
+                commands::run_damage_control(&galaxy);
+                commands::try_starbase_ship_repair(&mut galaxy);
+            }
             systems::LONG_RANGE_SCAN => commands::perform_long_range_scan(&mut galaxy),
             systems::COMPUTER => commands::access_computer(&galaxy, command[1..].into()),
             systems::PHASERS => commands::get_power_and_fire_phasers(&mut galaxy, command[1..].into()),
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 00598b58..34568bf3 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -594,4 +594,20 @@ pub fn direction_distance(dir: f32, dist: u8) {
 "Direction = {dir}
 Distance = {dist}"
     )
+}
+
+pub fn status_report(galaxy: &Galaxy) {
+    let klingon_count = galaxy.remaining_klingons();
+    let star_bases = galaxy.remaining_starbases();
+    let time_remaining = galaxy.final_stardate - galaxy.stardate;
+    let mut plural_starbase = "";
+    if star_bases > 1 {
+        plural_starbase = "s";
+    }
+
+    println!("   Status report:
+Klingons left:  {klingon_count}
+Mission must be completed in {time_remaining} stardates.
+The Federation is maintaining {star_bases} starbase{plural_starbase} in the galaxy.
+")
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index f3350bd6..9fcd937d 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -30,9 +30,9 @@ Started after movement and display of stats was finished (no energy management o
     - [x] torpedoes
 - [ ] computer
     - [x] 0 - output of all short and long range scans (requires tracking if a system has been scanned)
-    - [ ] 1 - klingons, starbases, stardate and damage control
+    - [x] 1 - klingons, starbases, stardate and damage control
     - [ ] 2 - photon torpedo data: direction and distance to all local klingons
-    - [ ] 3 - starbase distance and dir locally
+    - [x] 3 - starbase distance and dir locally
     - [ ] 4 - direction/distance calculator (useful for nav actions I guess)
     - [x] 5 - galactic name map
  

From 50a4ddbcdc382c4c694b52e26128dfc7d2ccd737 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 14:02:39 +1300
Subject: [PATCH 171/198] direction distance calculator

---
 84_Super_Star_Trek/rust/src/commands.rs | 21 ++++++++++++++++++++-
 84_Super_Star_Trek/rust/src/input.rs    | 19 ++++++++++++++++++-
 84_Super_Star_Trek/rust/src/view.rs     | 10 ++++++++++
 84_Super_Star_Trek/rust/tasks.md        |  2 +-
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index cfbc77e1..2848b039 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -1,6 +1,6 @@
 use rand::Rng;
 
-use crate::{model::*, view, input::{self, param_or_prompt_value}};
+use crate::{model::*, view, input::{self, param_or_prompt_value, prompt_two_values}};
 
 pub fn perform_short_range_scan(galaxy: &Galaxy) {
     if galaxy.enterprise.damaged.contains_key(systems::SHORT_RANGE_SCAN) {
@@ -313,6 +313,7 @@ pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
             run_damage_control(galaxy);
         },
         3 => show_starbase_data(galaxy),
+        4 => direction_dist_calculator(galaxy),
         5 => view::galaxy_region_map(),
         _ => todo!() // todo implement others
     }
@@ -334,6 +335,24 @@ fn show_starbase_data(galaxy: &Galaxy) {
     }
 }
 
+fn direction_dist_calculator(galaxy: &Galaxy) {
+    view::direction_dist_intro(&galaxy.enterprise);
+    loop {
+        let coords1 = prompt_two_values(view::prompts::INITIAL_COORDS, 1, 8).map(|(x, y)| Pos(x, y));
+        if coords1.is_none() {
+            continue;
+        }
+        let coords2 = prompt_two_values(view::prompts::TARGET_COORDS, 1, 8).map(|(x, y)| Pos(x, y));
+        if coords2.is_none() {
+            continue;
+        }
+        let dir = coords1.unwrap().direction(coords2.unwrap());
+        let dist = coords1.unwrap().dist(coords2.unwrap());
+        view::direction_distance(dir, dist);
+        break;
+    }
+}
+
 pub fn get_power_and_fire_phasers(galaxy: &mut Galaxy, provided: Vec<String>) {
     if galaxy.enterprise.damaged.contains_key(systems::PHASERS) {
         view::inoperable(&systems::name_for(systems::PHASERS));
diff --git a/84_Super_Star_Trek/rust/src/input.rs b/84_Super_Star_Trek/rust/src/input.rs
index 68ab7006..62d4daee 100644
--- a/84_Super_Star_Trek/rust/src/input.rs
+++ b/84_Super_Star_Trek/rust/src/input.rs
@@ -9,7 +9,7 @@ pub fn prompt(prompt_text: &str) -> Vec<String> {
 
     let mut buffer = String::new();
     if let Ok(_) = stdin.read_line(&mut buffer) {
-        return buffer.trim_end().split(" ").map(|s| s.to_string()).collect();
+        return buffer.trim_end().split([' ', ',']).map(|s| s.to_string()).collect();
     }
     Vec::new()
 }
@@ -53,4 +53,21 @@ pub fn param_or_prompt_value<T: FromStr + PartialOrd>(params: &Vec<String>, para
         return res;
     }
     return prompt_value::<T>(prompt_text, min, max);    
+}
+
+pub fn prompt_two_values<T: FromStr + PartialOrd>(prompt_text: &str, min: T, max: T) -> Option<(T, T)> {
+    let passed = prompt(prompt_text);
+    if passed.len() != 2 {
+        return None
+    }
+    match passed[0].parse::<T>() {
+        Ok(n1) if (n1 >= min && n1 <= max) => {
+            match passed[1].parse::<T>() {
+                Ok(n2) if (n2 >= min && n2 <= max) => 
+                    Some((n1, n2)),
+                _ => None
+            }
+        }
+        _ => None
+    }
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 34568bf3..282e6dc4 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -10,6 +10,8 @@ pub mod prompts {
     pub const PHASERS: &str = "Number of units to fire";
     pub const WHEN_READY: &str = "Press Enter when ready to accept command";
     pub const COMMAND: &str = "Command?";
+    pub const INITIAL_COORDS: &str = "  Initial coordinates (X/Y)";
+    pub const TARGET_COORDS: &str = "  Final coordinates (X/Y)";
 
     pub fn warp_factor(max_warp: f32) -> String {
         format!("Warp Factor (0-{})?", max_warp)
@@ -610,4 +612,12 @@ Klingons left:  {klingon_count}
 Mission must be completed in {time_remaining} stardates.
 The Federation is maintaining {star_bases} starbase{plural_starbase} in the galaxy.
 ")
+}
+
+pub fn direction_dist_intro(enterprise: &Enterprise) {
+    let quadrant = enterprise.quadrant;
+    let sector = enterprise.sector;
+    println!("Direction/distance calculator:
+You are at quadrant {quadrant} sector {sector}
+Please enter")
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 9fcd937d..1871b317 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -33,7 +33,7 @@ Started after movement and display of stats was finished (no energy management o
     - [x] 1 - klingons, starbases, stardate and damage control
     - [ ] 2 - photon torpedo data: direction and distance to all local klingons
     - [x] 3 - starbase distance and dir locally
-    - [ ] 4 - direction/distance calculator (useful for nav actions I guess)
+    - [x] 4 - direction/distance calculator (useful for nav actions I guess)
     - [x] 5 - galactic name map
  
 - [x] restarting the game

From d973dec62d26e0688dd548ad32d0feb7c0f57440 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 14:09:28 +1300
Subject: [PATCH 172/198] implemented klongon data, final computer program

---
 84_Super_Star_Trek/rust/src/commands.rs | 20 ++++++++++++++++++--
 84_Super_Star_Trek/rust/src/view.rs     |  8 ++++++++
 84_Super_Star_Trek/rust/tasks.md        |  4 ++--
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 2848b039..2bc28da8 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -312,14 +312,30 @@ pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
             view::status_report(galaxy);
             run_damage_control(galaxy);
         },
-        3 => show_starbase_data(galaxy),
+        2 => show_klingon_direction_data(galaxy),
+        3 => show_starbase_direction_data(galaxy),
         4 => direction_dist_calculator(galaxy),
         5 => view::galaxy_region_map(),
         _ => todo!() // todo implement others
     }
 }
 
-fn show_starbase_data(galaxy: &Galaxy) {
+fn show_klingon_direction_data(galaxy: &Galaxy) {
+    let quadrant = &galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
+    if quadrant.klingons.len() == 0 {
+        view::no_local_enemies();
+        return;
+    }
+
+    view::klingon_report(quadrant.klingons.len() > 1);
+    let origin = galaxy.enterprise.sector;
+    for k in &quadrant.klingons {
+        let target = k.sector;
+        view::direction_distance(origin.direction(target), origin.dist(target))
+    }
+}
+
+fn show_starbase_direction_data(galaxy: &Galaxy) {
     let quadrant = &galaxy.quadrants[galaxy.enterprise.quadrant.as_index()];
     match &quadrant.star_base {
         None => {
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 282e6dc4..7e8aa399 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -620,4 +620,12 @@ pub fn direction_dist_intro(enterprise: &Enterprise) {
     println!("Direction/distance calculator:
 You are at quadrant {quadrant} sector {sector}
 Please enter")
+}
+
+pub fn klingon_report(more_than_one: bool) {
+    let mut plural = "";
+    if more_than_one {
+        plural = "s";
+    }
+    println!("From Enterprise to Klingon battle cruiser{}", plural)
 }
\ No newline at end of file
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index 1871b317..c4406208 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -28,10 +28,10 @@ Started after movement and display of stats was finished (no energy management o
 - [x] weapons
     - [x] phasers
     - [x] torpedoes
-- [ ] computer
+- [x] computer
     - [x] 0 - output of all short and long range scans (requires tracking if a system has been scanned)
     - [x] 1 - klingons, starbases, stardate and damage control
-    - [ ] 2 - photon torpedo data: direction and distance to all local klingons
+    - [x] 2 - photon torpedo data: direction and distance to all local klingons
     - [x] 3 - starbase distance and dir locally
     - [x] 4 - direction/distance calculator (useful for nav actions I guess)
     - [x] 5 - galactic name map

From b9947f69b515d675f7c0f4be65a1f264adeb0688 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 15:05:25 +1300
Subject: [PATCH 173/198] switched from x/y system to y/x (y is horizontal, x
 is vertical

---
 84_Super_Star_Trek/rust/src/model.rs | 19 +++++++++----------
 84_Super_Star_Trek/rust/src/view.rs  | 18 +++++++++---------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 1bb5ef8e..1e4359ed 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -162,9 +162,8 @@ impl Pos {
 
     pub fn direction(&self, other: Pos) -> f32 {
         // this is a replication of the original BASIC code
-        let dy = other.0 as f32 - self.0 as f32;
-        let dx = other.1 as f32 - self.1 as f32;
-        // note i actually use x,y, but the calculation assumes y,x so they're flipped above
+        let dx = other.0 as f32 - self.0 as f32;
+        let dy = other.1 as f32 - self.1 as f32;
         let dx_dominant = dx.abs() > dy.abs();
 
         let frac = if dx_dominant { dy / dx } else { -dx / dy };
@@ -214,15 +213,15 @@ impl Display for Pos {
 }
 
 pub const COURSES : [(f32, f32); 9] = [
-    (1., 0.),
-    (1., -1.),
-    (0., -1.),
-    (-1., -1.),
-    (-1., 0.),
-    (-1., 1.),
     (0., 1.),
+    (-1., 1.),
+    (-1., 0.),
+    (-1., -1.),
+    (0., -1.),
+    (1., -1.),
+    (1., 0.),
     (1., 1.),
-    (1., 0.), // course 9 is equal to course 1
+    (0., 1.), // course 9 is equal to course 1
 ];
 
 #[derive(PartialEq)]
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 7e8aa399..1cc2d202 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -226,7 +226,7 @@ const SUB_REGION_NAMES: [&str; 4] = ["I", "II", "III", "IV"];
 
 fn quadrant_name(quadrant: Pos) -> String {
     format!("{} {}", 
-        REGION_NAMES[((quadrant.1 << 1) + (quadrant.0 >> 2)) as usize],
+        REGION_NAMES[((quadrant.0 << 1) + (quadrant.1 >> 2)) as usize],
         SUB_REGION_NAMES[(quadrant.1 % 4) as usize])
 }
 
@@ -264,8 +264,8 @@ pub fn short_range_scan(model: &Galaxy) {
     ];
 
     println!("{:-^33}", "");
-    for y in 0..=7 {
-        for x in 0..=7 {
+    for x in 0..=7 {
+        for y in 0..=7 {
             let pos = Pos(x, y);
             if &pos == &model.enterprise.sector {
                 print!("<*> ")
@@ -278,7 +278,7 @@ pub fn short_range_scan(model: &Galaxy) {
                 }                
             } 
         }
-        println!("{:>9}{}", "", data[y as usize])
+        println!("{:>9}{}", "", data[x as usize])
     }
     println!("{:-^33}", "");
 }
@@ -419,8 +419,8 @@ pub fn long_range_scan(galaxy: &Galaxy) -> Vec<Pos> {
 
     println!("Long range scan for quadrant {}", galaxy.enterprise.quadrant);
     println!("{:-^19}", "");
-    for y in cy - 1..=cy + 1 {
-        for x in cx - 1..=cx + 1 {
+    for x in cx - 1..=cx + 1 {
+        for y in cy - 1..=cy + 1 {
             let mut klingons = "*".into();
             let mut star_bases = "*".into();
             let mut stars = "*".into();
@@ -478,9 +478,9 @@ pub fn galaxy_scanned_map(galaxy: &Galaxy) {
 "Computer record of galaxy for quadrant {}
       1     2     3     4     5     6     7     8
     ----- ----- ----- ----- ----- ----- ----- -----", galaxy.enterprise.quadrant);
-    for y in 0..8 {
-        print!("{}   ", y+1);
-        for x in 0..8 {
+    for x in 0..8 {
+        print!("{}   ", x+1);
+        for y in 0..8 {
             let pos = Pos(x, y);
             if galaxy.scanned.contains(&pos) {
                 let quadrant = &galaxy.quadrants[pos.as_index()];

From 8c1e7257163ecdcee5512c141bf707be0d6f79c4 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 15:05:49 +1300
Subject: [PATCH 174/198] updated tasks

---
 84_Super_Star_Trek/rust/tasks.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
index c4406208..da9e49c9 100644
--- a/84_Super_Star_Trek/rust/tasks.md
+++ b/84_Super_Star_Trek/rust/tasks.md
@@ -45,4 +45,5 @@ Started after movement and display of stats was finished (no energy management o
     - [x] defeat due to time expired
 - [x] intro instructions
 - [x] victory
-- [ ] switch from x,y to y,x
\ No newline at end of file
+- [x] switch from x,y to y,x
+- [ ] uppercase prompts?
\ No newline at end of file

From 9f4f04582610c50340c35304554ff16c8349b7b9 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 15:30:17 +1300
Subject: [PATCH 175/198] implemented collision detection

---
 84_Super_Star_Trek/rust/src/commands.rs | 26 +++++++++++--
 84_Super_Star_Trek/rust/src/model.rs    |  2 +-
 84_Super_Star_Trek/rust/src/view.rs     |  8 +++-
 84_Super_Star_Trek/rust/tasks.md        | 49 -------------------------
 4 files changed, 29 insertions(+), 56 deletions(-)
 delete mode 100644 84_Super_Star_Trek/rust/tasks.md

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 2bc28da8..38bc3508 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -40,7 +40,7 @@ pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>
 
     let course = input::param_or_prompt_value(&provided, 0, view::prompts::COURSE, 1.0, 9.0);
     if course.is_none() {
-        view::bad_nav();
+        view::bad_course_data();
         return;
     }
 
@@ -53,7 +53,7 @@ pub fn gather_dir_and_speed_then_move(galaxy: &mut Galaxy, provided: Vec<String>
 
     let speed = input::param_or_prompt_value(&provided, 1, &view::prompts::warp_factor(max_warp), 0.0, 8.0);
     if speed.is_none() {
-        view::bad_nav();
+        view::bad_course_data();
         return;
     }
     
@@ -130,9 +130,27 @@ fn move_enterprise(course: f32, warp_speed: f32, galaxy: &mut Galaxy) {
 
     let ship = &mut galaxy.enterprise;
 
-    // todo account for being blocked
+    let (mut path, mut hit_edge) = find_nav_path(ship.quadrant, ship.sector, course, warp_speed);
+    for i in 0..path.len() {
+        let (quadrant, sector) = path[i].to_local_quadrant_sector();
+        if quadrant != ship.quadrant {
+            break; // have left current quadrant, so collision checks removed. if there is a collision at the dest... /shrug?
+        }
+        let quadrant = &galaxy.quadrants[quadrant.as_index()];
+        if quadrant.sector_status(sector) != SectorStatus::Empty {
+            path = path[..i].into();
+            hit_edge = false;
+            if i > 0 {
+                let (_, last_sector) = path[path.len() - 1].to_local_quadrant_sector();
+                view::bad_nav(last_sector);
+            } else {
+                view::bad_nav(ship.sector);
+                return;
+            }
+            break;
+        }
+    }
 
-    let (path, hit_edge) = find_nav_path(ship.quadrant, ship.sector, course, warp_speed);
     let energy_cost = path.len() as u16 + 10;
 
     if energy_cost > ship.total_energy {
diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 1e4359ed..10b97a4d 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -56,7 +56,7 @@ impl Enterprise {
             return;
         }
         
-        view::enterprise_hit(&hit_strength, &sector);
+        view::enterprise_hit(&hit_strength, sector);
 
         if self.shields <= hit_strength {
             view::enterprise_destroyed();
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index 1cc2d202..c276dee2 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -310,15 +310,19 @@ pub fn enterprise_destroyed() {
     println!("The Enterprise has been destroyed.  The Federation will be conquered.");
 }
 
-pub fn bad_nav() {
+pub fn bad_course_data() {
     println!("   Lt. Sulu reports, 'Incorrect course data, sir!'")
 }
 
+pub fn bad_nav(current_sector: Pos) {
+    println!("Warp engines shut down at sector {current_sector} dues to bad navigation")
+}
+
 pub fn bad_torpedo_course() {
     println!("   Ensign Chekov reports, 'Incorrect course data, sir!'")
 }
 
-pub fn enterprise_hit(hit_strength: &u16, from_sector: &Pos) {
+pub fn enterprise_hit(hit_strength: &u16, from_sector: Pos) {
     println!("{hit_strength} unit hit on Enterprise from sector {from_sector}");
 }
 
diff --git a/84_Super_Star_Trek/rust/tasks.md b/84_Super_Star_Trek/rust/tasks.md
deleted file mode 100644
index da9e49c9..00000000
--- a/84_Super_Star_Trek/rust/tasks.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Tasks
-
-Started after movement and display of stats was finished (no energy management or collision detection or anything).
-
-- [x] klingon movement
-- [x] klingon firing, game over etc
-- [x] add intro
-- [x] add entering (and starting in) sector headers
-- [x] conditions and danger messages
-- [x] remove energy on move
-- [x] shields
-    - [x] shield control
-    - [x] shield hit absorption
-- [x] subsystem damage
-    - [x] and support for reports
-- [x] random system damage or repairs on move
-- [x] lrs?
-- [x] stranded...
-- [ ] stop before hitting an object
-    - when moving across a sector, the enterprise should stop before it runs into something
-    - the current move is a jump, which makes this problematic. would need to rewrite it
-    - also, movement courses could be floats, according to the instructions, allowing for more precise movement and aiming
-- [x] better command reading - support entering multiple values on a line (e.g. nav 3 0.1)
-- [x] starbases
-    - [x] proximity detection for docking
-    - [x] repair on damage control
-    - [x] protection from shots
-- [x] weapons
-    - [x] phasers
-    - [x] torpedoes
-- [x] computer
-    - [x] 0 - output of all short and long range scans (requires tracking if a system has been scanned)
-    - [x] 1 - klingons, starbases, stardate and damage control
-    - [x] 2 - photon torpedo data: direction and distance to all local klingons
-    - [x] 3 - starbase distance and dir locally
-    - [x] 4 - direction/distance calculator (useful for nav actions I guess)
-    - [x] 5 - galactic name map
- 
-- [x] restarting the game
-    - [x] after defeat
-    - [x] and by resigning
-- [x] time progression
-    - [x] check all areas where time should move, and adjust accordingly
-        - looks to only be on nav and repair
-    - [x] defeat due to time expired
-- [x] intro instructions
-- [x] victory
-- [x] switch from x,y to y,x
-- [ ] uppercase prompts?
\ No newline at end of file

From c59dea8e21c9719bf5dd673765961df22b77bc81 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 15:48:53 +1300
Subject: [PATCH 176/198] removed final todo

---
 84_Super_Star_Trek/rust/src/commands.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index 38bc3508..d2eefc61 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -334,7 +334,7 @@ pub fn access_computer(galaxy: &Galaxy, provided: Vec<String>) {
         3 => show_starbase_direction_data(galaxy),
         4 => direction_dist_calculator(galaxy),
         5 => view::galaxy_region_map(),
-        _ => todo!() // todo implement others
+        _ => () // unreachable
     }
 }
 

From e6118b4622ad91ad0594403bbd59cdb55d437764 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 15:55:54 +1300
Subject: [PATCH 177/198] added a readme

---
 84_Super_Star_Trek/rust/readme.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 84_Super_Star_Trek/rust/readme.md

diff --git a/84_Super_Star_Trek/rust/readme.md b/84_Super_Star_Trek/rust/readme.md
new file mode 100644
index 00000000..7889ddf3
--- /dev/null
+++ b/84_Super_Star_Trek/rust/readme.md
@@ -0,0 +1,10 @@
+# Super Star Trek - Rust version
+
+Explanation of modules:
+
+- main.rs - creates the galaxy (generation functions are in model.rs as impl methods) then loops listening for commands. after each command checks for victory or defeat condtions.
+- model.rs - all the structs and enums that represent the galaxy. key methods in here (as impl methods) are generation functions on galaxy and quadrant, and various comparison methods on the 'Pos' tuple type.
+- commands.rs - most of the code that implements instructions given by the player (some code logic is in the model impls, and some in view.rs if its view only).
+- view.rs - all text printed to the output, mostly called by command.rs (like view::bad_nav for example). also contains the prompts printed to the user (e.g. view::prompts::COMMAND).
+- input.rs - utility methods for getting input from the user, including logic for parsing numbers, repeating prompts until a correct value is provided etc.
+

From 790e36611fe90e66f7bd6ef949d909a60cbd5015 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 16:02:59 +1300
Subject: [PATCH 178/198] more detail in the readme

---
 84_Super_Star_Trek/rust/readme.md | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/84_Super_Star_Trek/rust/readme.md b/84_Super_Star_Trek/rust/readme.md
index 7889ddf3..ae2f58dc 100644
--- a/84_Super_Star_Trek/rust/readme.md
+++ b/84_Super_Star_Trek/rust/readme.md
@@ -2,9 +2,18 @@
 
 Explanation of modules:
 
-- main.rs - creates the galaxy (generation functions are in model.rs as impl methods) then loops listening for commands. after each command checks for victory or defeat condtions.
-- model.rs - all the structs and enums that represent the galaxy. key methods in here (as impl methods) are generation functions on galaxy and quadrant, and various comparison methods on the 'Pos' tuple type.
-- commands.rs - most of the code that implements instructions given by the player (some code logic is in the model impls, and some in view.rs if its view only).
-- view.rs - all text printed to the output, mostly called by command.rs (like view::bad_nav for example). also contains the prompts printed to the user (e.g. view::prompts::COMMAND).
-- input.rs - utility methods for getting input from the user, including logic for parsing numbers, repeating prompts until a correct value is provided etc.
+- [main.rs](./src/main.rs) - creates the galaxy (generation functions are in model.rs as impl methods) then loops listening for commands. after each command checks for victory or defeat condtions.
+- [model.rs](./src/model.rs) - all the structs and enums that represent the galaxy. key methods in here (as impl methods) are generation functions on galaxy and quadrant, and various comparison methods on the 'Pos' tuple type.
+- [commands.rs](./src/commands.rs) - most of the code that implements instructions given by the player (some code logic is in the model impls, and some in view.rs if its view only).
+- [view.rs](./src/view.rs) - all text printed to the output, mostly called by command.rs (like view::bad_nav for example). also contains the prompts printed to the user (e.g. view::prompts::COMMAND).
+- [input.rs](./src/input.rs) - utility methods for getting input from the user, including logic for parsing numbers, repeating prompts until a correct value is provided etc.
 
+Basically the user is asked for the next command, this runs a function that usually checks if the command system is working, and if so will gather additional input (see next note for a slight change here), then either the model is read and info printed, or its mutated in some way (e.g. firing a torpedo, which reduces the torpedo count on the enterprise and can destroy klingons and star bases; finally the klingons fire back and can destroy the enterprise). Finally the win/lose conditions are checked before the loop repeats.
+
+## Changes from the original
+
+I have tried to keep it as close as possible. Notable changes are:
+
+- commands can be given with parameters in line. e.g. while 'nav' will ask for course and then warp speed in the original, here you can *optionally* also do this as one line, e.g. `nav 1 0.1` to move one sector east. I'm sorry - it was driving me insane in its original form (which is still sorted, as is partial application e.g. nav 1 to preset direction and then provide speed).
+- text is mostly not uppercase, as text was in the basic version. this would be easy to change however as all text is in view.rs, but I chose not to.
+- the navigation system (plotting direction, paths and collision detection) is as close as I could make it to the basic version (by using other language conversions as specification sources) but I suspect is not perfect. seems to work well enough however.
\ No newline at end of file

From 371b72fc36733a6881782cf7670788ec3262b4f6 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Sun, 5 Mar 2023 16:04:42 +1300
Subject: [PATCH 179/198] small cleanup

---
 84_Super_Star_Trek/rust/src/model.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/model.rs b/84_Super_Star_Trek/rust/src/model.rs
index 10b97a4d..aa08d734 100644
--- a/84_Super_Star_Trek/rust/src/model.rs
+++ b/84_Super_Star_Trek/rust/src/model.rs
@@ -257,9 +257,9 @@ impl Galaxy {
         Galaxy { 
             stardate,
             final_stardate: stardate + rng.gen_range(25..=35) as f32,
-            quadrants: quadrants, 
-            scanned: scanned,
-            enterprise: enterprise
+            quadrants, 
+            scanned,
+            enterprise
         }
     } 
 

From 050765e89f084d2f0e6fb470ebe31a92772403b8 Mon Sep 17 00:00:00 2001
From: Christopher <chris@grislygrotto.nz>
Date: Mon, 6 Mar 2023 09:37:45 +1300
Subject: [PATCH 180/198] minor bug fix for 0 path trying to exit the perimeter

---
 84_Super_Star_Trek/rust/src/commands.rs |  7 +++++++
 84_Super_Star_Trek/rust/src/view.rs     | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/84_Super_Star_Trek/rust/src/commands.rs b/84_Super_Star_Trek/rust/src/commands.rs
index d2eefc61..c1c4bc8d 100644
--- a/84_Super_Star_Trek/rust/src/commands.rs
+++ b/84_Super_Star_Trek/rust/src/commands.rs
@@ -151,6 +151,13 @@ fn move_enterprise(course: f32, warp_speed: f32, galaxy: &mut Galaxy) {
         }
     }
 
+    if path.len() == 0 {
+        if hit_edge {
+            view::hit_edge(ship.quadrant, ship.sector);
+        }
+        return;   
+    }
+
     let energy_cost = path.len() as u16 + 10;
 
     if energy_cost > ship.total_energy {
diff --git a/84_Super_Star_Trek/rust/src/view.rs b/84_Super_Star_Trek/rust/src/view.rs
index c276dee2..caf6b74d 100644
--- a/84_Super_Star_Trek/rust/src/view.rs
+++ b/84_Super_Star_Trek/rust/src/view.rs
@@ -199,7 +199,7 @@ pub fn intro(model: &Galaxy) {
 "Your orders are as follows:
     Destroy the {} Klingon warships which have invaded
     the galaxy before they can attack federation headquarters
-    on stardate {}. This gives you {} days. {} in the galaxy for resupplying your ship.\n", 
+    on stardate {:.1}. This gives you {} days. {} in the galaxy for resupplying your ship.\n", 
     model.remaining_klingons(), model.final_stardate, model.final_stardate - model.stardate, star_base_message)
 }
 
@@ -253,7 +253,7 @@ pub fn short_range_scan(model: &Galaxy) {
     }
 
     let data : [String; 8] = [
-        format!("Stardate           {}", model.stardate),
+        format!("Stardate           {:.1}", model.stardate),
         format!("Condition          {}", condition),
         format!("Quadrant           {}", model.enterprise.quadrant),
         format!("Sector             {}", model.enterprise.sector),
@@ -300,7 +300,7 @@ pub fn print_command_help() {
 
 pub fn end_game_failure(galaxy: &Galaxy) {
     println!(
-"Is is stardate {}.
+"Is is stardate {:.1}.
 There were {} Klingon battle cruisers left at
 the end of your mission.
 ", galaxy.stardate, galaxy.remaining_klingons());
@@ -519,7 +519,7 @@ pub fn starbase_shields() {
 pub fn repair_estimate(repair_time: f32) {
     println!(
 "Technicians standing by to effect repairs to your ship;
-Estimated time to repair: {repair_time} stardates.")
+Estimated time to repair: {repair_time:.1} stardates.")
 }
 
 pub fn no_damage(sector: Pos) {
@@ -613,7 +613,7 @@ pub fn status_report(galaxy: &Galaxy) {
 
     println!("   Status report:
 Klingons left:  {klingon_count}
-Mission must be completed in {time_remaining} stardates.
+Mission must be completed in {time_remaining:.1} stardates.
 The Federation is maintaining {star_bases} starbase{plural_starbase} in the galaxy.
 ")
 }

From 192a6e7e6263451c351b20cc01d5b1d16d56ac17 Mon Sep 17 00:00:00 2001
From: Jack Boyce <jboyce@gmail.com>
Date: Sun, 2 Apr 2023 00:02:24 -0700
Subject: [PATCH 181/198] remove author name from header

---
 84_Super_Star_Trek/python/superstartrek.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/84_Super_Star_Trek/python/superstartrek.py b/84_Super_Star_Trek/python/superstartrek.py
index 21e03e45..2a86efba 100644
--- a/84_Super_Star_Trek/python/superstartrek.py
+++ b/84_Super_Star_Trek/python/superstartrek.py
@@ -8,7 +8,6 @@
 **** LEEDOM - APRIL & DECEMBER 1974,
 **** WITH A LITTLE HELP FROM HIS FRIENDS . . .
 
-Python translation by Jack Boyce - February 2021
   Output is identical to BASIC version except for a few
   fixes (as noted, search `bug`) and minor cleanup.
 """

From 223422b94ac9e8ec73ad86ad2f8faf21172bf50c Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Fri, 7 Apr 2023 22:57:07 -0500
Subject: [PATCH 182/198] added 06_banner for perl

---
 06_Banner/perl/banner.pl | 150 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 06_Banner/perl/banner.pl

diff --git a/06_Banner/perl/banner.pl b/06_Banner/perl/banner.pl
new file mode 100644
index 00000000..2524ef00
--- /dev/null
+++ b/06_Banner/perl/banner.pl
@@ -0,0 +1,150 @@
+#!/usr/bin/perl
+
+# Banner program in Perl
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+sub print_lines
+{
+    my $lines = shift;
+    print "\n" x $lines;
+}
+
+# each letter is made of 7 slices (or rows);
+# the initial & unused 0 is to allow for Perl arrays being 0-based
+#   but allow the algorithm to be 1-based (like Basic arrays);
+# the numbers are essentially the dots/columns per slice in powers of 2.
+my %data = (
+    " " => [ 0,  0, 0, 0, 0, 0, 0, 0 ], 
+    "." => [ 0,  1, 1, 129, 449, 129, 1, 1 ], 
+    "!" => [ 0,  1, 1, 1, 384, 1, 1, 1 ], 
+    "=" => [ 0,  41, 41, 41, 41, 41, 41, 41 ], 
+    "?" => [ 0,  5, 3, 2, 354, 18, 11, 5 ], 
+    "*" => [ 0,  69, 41, 17, 512, 17, 41, 69 ], 
+    "0" => [ 0,  57, 69, 131, 258, 131, 69, 57 ], 
+    "1" => [ 0,  0, 0, 261, 259, 512, 257, 257 ], 
+    "2" => [ 0,  261, 387, 322, 290, 274, 267, 261 ], 
+    "3" => [ 0,  66, 130, 258, 274, 266, 150, 100 ], 
+    "4" => [ 0,  33, 49, 41, 37, 35, 512, 33 ], 
+    "5" => [ 0,  160, 274, 274, 274, 274, 274, 226 ], 
+    "6" => [ 0,  194, 291, 293, 297, 305, 289, 193 ], 
+    "7" => [ 0,  258, 130, 66, 34, 18, 10, 8 ], 
+    "8" => [ 0,  69, 171, 274, 274, 274, 171, 69 ], 
+    "9" => [ 0,  263, 138, 74, 42, 26, 10, 7 ], 
+    "A" => [ 0,  505, 37, 35, 34, 35, 37, 505 ], 
+    "B" => [ 0,  512, 274, 274, 274, 274, 274, 239 ], 
+    "C" => [ 0,  125, 131, 258, 258, 258, 131, 69 ], 
+    "D" => [ 0,  512, 258, 258, 258, 258, 131, 125 ], 
+    "E" => [ 0,  512, 274, 274, 274, 274, 258, 258 ], 
+    "F" => [ 0,  512, 18, 18, 18, 18, 2, 2 ], 
+    "G" => [ 0,  125, 131, 258, 258, 290, 163, 101 ], 
+    "H" => [ 0,  512, 17, 17, 17, 17, 17, 512 ], 
+    "I" => [ 0,  258, 258, 258, 512, 258, 258, 258 ], 
+    "J" => [ 0,  65, 129, 257, 257, 257, 129, 128 ], 
+    "K" => [ 0,  512, 17, 17, 41, 69, 131, 258 ], 
+    "L" => [ 0,  512, 257, 257, 257, 257, 257, 257 ], 
+    "M" => [ 0,  512, 7, 13, 25, 13, 7, 512 ], 
+    "N" => [ 0,  512, 7, 9, 17, 33, 193, 512 ], 
+    "O" => [ 0,  125, 131, 258, 258, 258, 131, 125 ], 
+    "P" => [ 0,  512, 18, 18, 18, 18, 18, 15 ], 
+    "Q" => [ 0,  125, 131, 258, 258, 322, 131, 381 ], 
+    "R" => [ 0,  512, 18, 18, 50, 82, 146, 271 ], 
+    "S" => [ 0,  69, 139, 274, 274, 274, 163, 69 ], 
+    "T" => [ 0,  2, 2, 2, 512, 2, 2, 2 ], 
+    "U" => [ 0,  128, 129, 257, 257, 257, 129, 128 ], 
+    "V" => [ 0,  64, 65, 129, 257, 129, 65, 64 ], 
+    "W" => [ 0,  256, 257, 129, 65, 129, 257, 256 ], 
+    "X" => [ 0,  388, 69, 41, 17, 41, 69, 388 ], 
+    "Y" => [ 0,  8, 9, 17, 481, 17, 9, 8 ], 
+    "Z" => [ 0,  386, 322, 290, 274, 266, 262, 260 ], 
+);
+
+my ($horz, $vert, $center, $char, $msg) = (0, 0, '', '', '');
+
+# get args to run with
+while ($horz < 1)
+{
+    print "HORIZONTAL (1 or more): ";
+    chomp($horz = <>);
+    $horz = int($horz);
+}
+
+while ($vert < 1)
+{
+    print "VERTICAL (1 or more): ";
+    chomp($vert = <>);
+    $vert = int($vert);
+}
+
+print "CENTERED (Y/N): ";
+chomp($center = <>);
+$center = ($center =~ m/^Y/i) ? 1 : 0;
+
+# note you can enter multiple chars and the program will do the right thing
+# thanks to the length() calls below, which was in the original Basic
+print "CHARACTER TO PRINT (TYPE 'ALL' IF YOU WANT CHARACTER BEING PRINTED): ";
+chomp($char = uc(<>));
+
+while (!$msg)
+{
+    print "STATEMENT: ";
+    chomp($msg = uc(<>));
+}
+
+print "SET PAGE TO PRINT, HIT RETURN WHEN READY";
+$_ = <>;
+print_lines(2 * $horz);
+
+# print the message
+for my $letter ( split(//, $msg) )
+{
+    if (!exists($data{$letter}))
+    {
+        die "Cannot use letter '$letter'!";
+    }
+    my @s = @{$data{$letter}};
+    #if ($letter eq " ") { print_lines(7 * $horz); next; }
+
+    my $print_letter = ($char eq "ALL") ? $letter : $char;
+    for my $slice (1 .. 7)
+    {
+        my (@j, @f);
+        for (my $k = 8; $k >= 0; $k--)
+        {
+            if (2**$k < $s[$slice])
+            {
+                $j[9 - $k] = 1;
+                $s[$slice] = $s[$slice] - 2**$k;
+                if ($s[$slice] == 1)
+                {
+                    $f[$slice] = 9 - $k;
+                }
+            }
+            else
+            {
+                $j[9 - $k] = 0;
+            }
+        }
+
+        for my $t1 (1 .. $horz)
+        {
+            print " " x int((63 - 4.5 * $vert) * $center / (length($print_letter)) + 1);
+            for my $b (1 .. (defined($f[$slice]) ? $f[$slice] : 0))
+            {
+                my $str = $j[$b] ? $print_letter : (" " x length($print_letter));
+                print $str for (1 .. $vert);
+            }
+            print "\n";
+        }
+    }
+
+    # space between letters
+    print_lines(2 * $horz);
+}
+
+# while in the original code, this seems pretty excessive
+#print_lines(75);
+
+exit(0);

From a5584b401481b26ceaf575a7aeff612209cf816a Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Thu, 20 Apr 2023 12:23:44 -0500
Subject: [PATCH 183/198] Added 2 versions of the perl 07-basketball game.

Also updated the README.
---
 07_Basketball/perl/README.md          |  18 ++
 07_Basketball/perl/basketball-orig.pl | 415 ++++++++++++++++++++++++++
 07_Basketball/perl/basketball.pl      | 394 ++++++++++++++++++++++++
 3 files changed, 827 insertions(+)
 create mode 100755 07_Basketball/perl/basketball-orig.pl
 create mode 100755 07_Basketball/perl/basketball.pl

diff --git a/07_Basketball/perl/README.md b/07_Basketball/perl/README.md
index e69c8b81..51373c0c 100644
--- a/07_Basketball/perl/README.md
+++ b/07_Basketball/perl/README.md
@@ -1,3 +1,21 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
 Conversion to [Perl](https://www.perl.org/)
+
+There are two version of the code here, a "faithful" translation (basketball-orig.pl) and
+a "modern" translation (basketball.pl). The main difference between the 2 are is that the
+faithful translation has 3 GOTOs in it while the modern version has no GOTO. I have added
+a "TIME" print when the score is shown so the Clock is visible. Halftime is at "50" and
+end of game is at 100 (per the Basic code).
+
+The 3 GOTOs in the faitful version are because of the way the original code jumped into
+the "middle of logic" that has no obivious way to avoid ... that I can see, at least while
+still maintaining something of the look and structure of the original Basic.
+
+The modern version avoided the GOTOs by restructuring the program in the 2 "play()" subs.
+Despite the change, this should play the same way as the faithful version.
+
+All of the percentages remain the same. If writing this from scratch, we really should
+have only a single play() sub which uses the same code for both teams, which would also
+make the game more fair ... but that wasn't done so the percent edge to Darmouth has been
+maintained here.
diff --git a/07_Basketball/perl/basketball-orig.pl b/07_Basketball/perl/basketball-orig.pl
new file mode 100755
index 00000000..14627ffc
--- /dev/null
+++ b/07_Basketball/perl/basketball-orig.pl
@@ -0,0 +1,415 @@
+#!/usr/bin/perl
+
+# Basketball program in Perl
+#   This is fairly faithful translation from the original Basic.
+#   This becomes apparent because there are actually 3 GOTOs still present
+#   because of the way the original code jumped into the "middle of logic"
+#   that has no obivious way to avoid ... that I can see.
+#   For better structure and no GOTOs, see the other version of this program.
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# globals
+my $Defense=0;      # dartmouth defense value
+my $Opponent;       # name of opponent
+my @Score = (0, 0); # scores, dart is [0], opponent is [1]
+my $Player = 0;     # player, 0 = dart, 1 = opp
+my $Timer = 0;      # time tick, 100 ticks per game, 50 is end of first half, if tie at end then back to T=93
+my $DoPlay = 1;     # true if game is still being played
+my $ConTeam;        # controlling team, "dart" or "opp"
+my $ShotType = 0;   # current shot type
+
+
+print "\n";
+print " " x 31, "BASKETBALL";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY";
+print "\n\n\n";
+
+print "THIS IS DARTMOUTH COLLEGE BASKETBALL.  YOU WILL BE DARTMOUTH\n";
+print "CAPTAIN AND PLAYMAKER.  CALL SHOTS AS FOLLOWS:\n";
+print "   1. LONG (30 FT.) JUMP SHOT;\n";
+print "   2. SHORT (15 FT.) JUMP SHOT;\n";
+print "   3. LAY UP;\n";
+print "   4. SET SHOT.\n";
+print "BOTH TEAMS WILL USE THE SAME DEFENSE.  CALL DEFENSE AS FOLLOWS:\n";
+print "   6. PRESS;\n";
+print "   6.5 MAN-TO MAN;\n";
+print "   7. ZONE;\n";
+print "   7.5 NONE.\n";
+print "TO CHANGE DEFENSE, JUST TYPE 0 AS YOUR NEXT SHOT.\n\n";
+get_defense();
+print "\n";
+print "CHOOSE YOUR OPPONENT: ";
+chomp($Opponent = <>);
+
+$ConTeam = center_jump();
+while ($DoPlay)
+{
+    print "\n";
+    if ($ConTeam eq "dart")
+    {
+        $Player = 0;
+        get_your_shot();
+        dartmouth_play();
+    }
+    else
+    {
+        opponent_play();
+    }
+    if ($Timer >= 100)
+    {
+        check_end_game();
+        last if (!$DoPlay);
+        $Timer = 93;
+        $ConTeam = center_jump();
+    }
+}
+exit(0);
+
+###############################################################
+
+sub dartmouth_play
+{
+    if ($ShotType == 1 || $ShotType == 2)
+    {
+        $Timer++;
+        if ($Timer == 50)
+        {
+            end_first_half();
+            return;
+        }
+        if ($Timer == 92)
+        {
+            two_min_left();
+        }
+
+        print "JUMP SHOT\n";
+        if (rand(1) <= 0.341 * $Defense / 8)
+        {
+            print "SHOT IS GOOD.\n";
+            dartmouth_score();
+            $ConTeam = "opp";
+            return;
+        }
+
+        if (rand(1) <= 0.682*$Defense/8)
+        {
+            print "SHOT IS OFF TARGET.\n";
+            if ($Defense/6*rand(1) > 0.45)
+            {
+                print "REBOUND TO ", $Opponent, "\n";
+                $ConTeam = "opp";
+                return;
+            }
+
+            print "DARTMOUTH CONTROLS THE REBOUND.\n";
+            if (rand(1) <= 0.4) { goto L1300; }
+            if ($Defense == 6)
+            {
+                if (rand(1) <= 0.6)
+                {
+                    print "PASS STOLEN BY $Opponent, EASY LAYUP.\n";
+                    opp_score();
+                    $ConTeam = "dart"; return;
+                    return;
+                }
+            }
+            print "BALL PASSED BACK TO YOU.\n";
+            $ConTeam = "dart";
+            return;
+        }
+
+        if (rand(1) <= 0.782*$Defense/8)
+        {
+            print "SHOT IS BLOCKED.  BALL CONTROLLED BY "; # no NL
+            if (rand(1) > 0.5)
+            {
+                print "$Opponent.\n";
+                $ConTeam = "opp";
+                return;
+            }
+            else
+            {
+                print "DARTMOUTH.\n";
+                $ConTeam = "dart";
+                return;
+            }
+        }
+
+        if (rand(1) > 0.843*$Defense/8)
+        {
+            print "CHARGING FOUL.  DARTMOUTH LOSES BALL.\n";
+            $ConTeam = "opp";
+            return;
+        }
+        else
+        {
+            print "SHOOTER IS FOULED.  TWO SHOTS.\n";
+            foul_shooting();
+            $ConTeam = "opp";
+            return;
+        }
+    }
+
+    L1300:
+    while (1)
+    {
+        $Timer++;
+        if ($Timer == 50)
+        {
+            end_first_half();
+            return;
+        }
+        if ($Timer == 92) { two_min_left(); }
+        if ($ShotType == 0) 
+        {
+            get_defense();
+            return;
+        }
+        print '', ($ShotType > 3 ? "SET SHOT." : "LAY UP."), "\n";
+        if (7 / $Defense * rand(1) <= 0.4)
+        {
+            print "SHOT IS GOOD.  TWO POINTS.\n";
+            dartmouth_score();
+            $ConTeam = "opp";
+            return;
+        }
+
+        if (7 / $Defense * rand(1) <= 0.7)
+        {
+            print "SHOT IS OFF THE RIM.\n";
+            if (rand(1) <= 0.667)
+            {
+                print "$Opponent CONTROLS THE REBOUND.\n";
+                $ConTeam = "opp";
+                return;
+            }
+
+            print "DARTMOUTH CONTROLS THE REBOUND.\n";
+            next if (rand(1) <= 0.4);
+
+            print "BALL PASSED BACK TO YOU.\n";
+            $ConTeam = "dart";
+            return;
+        }
+
+        if (7 / $Defense * rand(1) <= 0.875)
+        {
+            print "SHOOTER FOULED.  TWO SHOTS.\n";
+            foul_shooting();
+            $ConTeam = "opp";
+            return;
+        }
+
+        if (7 / $Defense * rand(1) <= 0.925)
+        {
+            print "SHOT BLOCKED. $Opponent\'S BALL.\n";
+            $ConTeam = "opp";
+            return;
+        }
+
+        print "CHARGING FOUL.  DARTMOUTH LOSES THE BALL.\n";
+        $ConTeam = "opp";
+        return;
+    }
+}
+
+sub get_defense
+{
+    $Defense = 0;
+    while ($Defense < 6 || $Defense > 7.5)
+    {
+        print "YOUR NEW DEFENSIVE ALLIGNMENT IS (6, 6.5, 7. 7.5): ";
+        chomp($Defense = <>);
+        ($Defense) =~ m/(\d(\.\d)?)/;
+    }
+}
+
+sub opponent_play
+{
+    $Player = 1;
+    $Timer++;
+    if ($Timer == 50)
+    {
+        end_first_half();
+        $ConTeam = center_jump();
+        return;
+    }
+
+    print "\n";
+    while (1)
+    {
+        my $shot = 10.0 / 4 * rand(1) + 1;
+        if ($shot <= 2.0)
+        {
+            print "JUMP SHOT.\n";
+            if (8.0 / $Defense * rand(1) <= 0.35)
+            {
+                print "SHOT IS GOOD.\n";
+                opp_score();
+                $ConTeam = "dart";
+                return;
+            }
+
+            if (8.0 / $Defense * rand(1) <=  0.75)
+            {
+                print "SHOT IS OFF RIM.\n";
+
+                L3110:
+                if ($Defense / 6.0 * rand(1) <= 0.5)
+                {
+                    print "DARTMOUTH CONTROLS THE REBOUND.\n";
+                    $ConTeam = "dart";
+                    return;
+                }
+                print "$Opponent CONTROLS THE REBOUND.\n";
+                if ($Defense == 6)
+                {
+                    if (rand(1) <= 0.75)
+                    {
+                        print "BALL STOLEN.  EASY LAY UP FOR DARTMOUTH.\n";
+                        dartmouth_score();
+                        $ConTeam = "opp";
+                        return;
+                    }
+                }
+                if (rand(1) <= 0.5)
+                {
+                    print "PASS BACK TO $Opponent GUARD.\n";
+                    $ConTeam = "opp";
+                    return;
+                }
+                goto L3500;
+            }
+
+            if (8.0 / $Defense * rand(1) <= 0.9)
+            {
+                print "PLAYER FOULED.  TWO SHOTS.\n";
+                foul_shooting();
+                $ConTeam = "dart";
+                return;
+            }
+            print "OFFENSIVE FOUL.  DARTMOUTH'S BALL.\n";
+            $ConTeam = "dart";
+            return;
+        }
+
+        L3500:
+        print ($shot > 3 ? "SET SHOT.\n" : "LAY UP.\n");
+        if (7.0 / $Defense * rand(1) > 0.413)
+        {
+            print "SHOT IS MISSED.\n";
+            {
+            no warnings;
+            goto L3110;
+            }
+        }
+        else
+        {
+            print "SHOT IS GOOD.\n";
+            opp_score();
+            $ConTeam = "dart";
+            return;
+        }
+    }
+}
+
+sub opp_score
+{
+    $Score[0] += 2;
+    print_score();
+}
+
+sub dartmouth_score
+{
+    $Score[1] += 2;
+    print_score();
+}
+
+sub print_score
+{
+    print "SCORE: $Score[1] TO $Score[0]\n";
+    print "TIME: $Timer\n";
+}
+
+sub end_first_half
+{
+    print "\n   ***** END OF FIRST HALF *****\n\n";
+    print "SCORE: DARTMOUTH: $Score[1]   $Opponent: $Score[0]\n\n\n";
+    center_jump();
+}
+
+sub get_your_shot
+{
+    $ShotType = -1;
+    while ($ShotType < 0 || $ShotType > 4)
+    {
+        print "YOUR SHOT (0-4): ";
+        chomp($ShotType = <>);
+        $ShotType = int($ShotType);
+        if ($ShotType < 0 || $ShotType > 4)
+        {
+            print "INCORRECT ANSWER.  RETYPE IT. ";
+        }
+    }
+}
+
+sub center_jump
+{
+    print "CENTER JUMP\n";
+    if (rand(1) <= 0.6)
+    {
+        print "$Opponent CONTROLS THE TAP.\n";
+        return "opp";
+    }
+    print "DARTMOUTH CONTROLS THE TAP.\n";
+    return "dart";
+}
+
+sub check_end_game
+{
+    print "\n";
+    if ($Score[1] != $Score[0])
+    {
+        print "   ***** END OF GAME *****\n";
+        print "FINAL SCORE: DARTMOUTH: $Score[1]    $Opponent: $Score[0]\n\n";
+        $DoPlay = 0;
+    }
+    else
+    {
+        print "\n   ***** END OF SECOND HALF *****\n";
+        print "SCORE AT END OF REGULATION TIME:\n";
+        print "        DARTMOUTH: $Score[1]    $Opponent: $Score[0]\n\n";
+        print "BEGIN TWO MINUTE OVERTIME PERIOD\n";
+    }
+}
+
+sub two_min_left
+{
+    print "\n   *** TWO MINUTES LEFT IN THE GAME ***\n\n";
+}
+
+sub foul_shooting
+{
+    if (rand(1) > 0.49)
+    {
+        if (rand(1) > 0.75)
+        {
+            print "BOTH SHOTS MISSED.\n";
+        }
+        else
+        {
+            print "SHOOTER MAKES ONE SHOT AND MISSES ONE.\n";
+            $Score[1 - $Player]++;
+        }
+    }
+    else
+    {
+        print "SHOOTER MAKES BOTH SHOTS.\n";
+        $Score[1 - $Player] += 2;
+    }
+
+    print_score();
+}
diff --git a/07_Basketball/perl/basketball.pl b/07_Basketball/perl/basketball.pl
new file mode 100755
index 00000000..a6f98041
--- /dev/null
+++ b/07_Basketball/perl/basketball.pl
@@ -0,0 +1,394 @@
+#!/usr/bin/perl
+
+# Basketball program in Perl
+#   While this should play the same way as the fairly faithful translation version,
+#   there are no GOTOs in this code. That was achieved by restructuring the program
+#   in the 2 *_play() subs. All of the percentages remain the same. If writing this
+#   from scratch, we really should have only a play() sub which uses the same code
+#   for both teams, but the percent edge to Darmouth has been maintained here.
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# globals
+my $Defense=0;      # dartmouth defense value
+my $Opponent;       # name of opponent
+my @Score = (0, 0); # scores, dart is [0], opponent is [1]
+my $Player = 0;     # player, 0 = dart, 1 = opp
+my $Timer = 0;      # time tick, 100 ticks per game, 50 is end of first half, if tie at end then back to T=93
+my $DoPlay = 1;     # true if game is still being played
+my $ConTeam;        # controlling team, "dart" or "opp"
+my $ShotType = 0;   # current shot type
+
+
+print "\n";
+print " " x 31, "BASKETBALL";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY";
+print "\n\n\n";
+
+print "THIS IS DARTMOUTH COLLEGE BASKETBALL.  YOU WILL BE DARTMOUTH\n";
+print "CAPTAIN AND PLAYMAKER.  CALL SHOTS AS FOLLOWS:\n";
+print "   1. LONG (30 FT.) JUMP SHOT;\n";
+print "   2. SHORT (15 FT.) JUMP SHOT;\n";
+print "   3. LAY UP;\n";
+print "   4. SET SHOT.\n";
+print "BOTH TEAMS WILL USE THE SAME DEFENSE.  CALL DEFENSE AS FOLLOWS:\n";
+print "   6. PRESS;\n";
+print "   6.5 MAN-TO MAN;\n";
+print "   7. ZONE;\n";
+print "   7.5 NONE.\n";
+print "TO CHANGE DEFENSE, JUST TYPE 0 AS YOUR NEXT SHOT.\n\n";
+get_defense();
+print "\n";
+print "CHOOSE YOUR OPPONENT: ";
+chomp($Opponent = <>);
+
+$ConTeam = center_jump();
+while ($DoPlay)
+{
+    print "\n";
+    if ($ConTeam eq "dart")
+    {
+        $Player = 0;
+        get_your_shot();
+        dartmouth_play();
+    }
+    else
+    {
+        $ShotType = 10.0 / 4 * rand(1) + 1;
+        opponent_play();
+    }
+    if ($Timer >= 100)
+    {
+        check_end_game();
+        last if (!$DoPlay);
+        $Timer = 93;
+        $ConTeam = center_jump();
+    }
+}
+exit(0);
+
+###############################################################
+
+sub dartmouth_play
+{
+    $Player = 0;
+    print "\n";
+    while (1)
+    {
+        $Timer++;
+        if ($Timer == 50) { end_first_half(); return; }
+        if ($Timer == 92) { two_min_left(); }
+
+        if ($ShotType == 0) 
+        {
+            get_defense();
+            return; # for new ShotType
+        }
+        elsif ($ShotType == 1 || $ShotType == 2)
+        {
+            print "JUMP SHOT\n";
+            if (rand(1) <= 0.341 * $Defense / 8)
+            {
+                print "SHOT IS GOOD.\n";
+                dartmouth_score();
+                last;
+            }
+
+            if (rand(1) <= 0.682*$Defense/8)
+            {
+                print "SHOT IS OFF TARGET.\n";
+                if ($Defense/6*rand(1) > 0.45)
+                {
+                    print "REBOUND TO $Opponent\n";
+                    last;
+                }
+
+                print "DARTMOUTH CONTROLS THE REBOUND.\n";
+                if (rand(1) <= 0.4)
+                {
+                    $ShotType = (rand(1) <= 0.5) ? 3 : 4;
+                    next;
+                }
+                if ($Defense == 6)
+                {
+                    if (rand(1) <= 0.6)
+                    {
+                        print "PASS STOLEN BY $Opponent, EASY LAYUP.\n";
+                        opp_score();
+                        next;
+                    }
+                }
+                print "BALL PASSED BACK TO YOU.\n";
+                next;
+            }
+
+            if (rand(1) <= 0.782*$Defense/8)
+            {
+                print "SHOT IS BLOCKED.  BALL CONTROLLED BY "; # no NL
+                if (rand(1) > 0.5)
+                {
+                    print "$Opponent.\n";
+                    last;
+                }
+                else
+                {
+                    print "DARTMOUTH.\n";
+                    next;
+                }
+            }
+
+            if (rand(1) > 0.843*$Defense/8)
+            {
+                print "CHARGING FOUL.  DARTMOUTH LOSES BALL.\n";
+                last;
+            }
+            else
+            {
+                print "SHOOTER IS FOULED.  TWO SHOTS.\n";
+                foul_shooting();
+                last;
+            }
+        }
+        else # elsif ($ShotType >= 3)
+        {
+            print '', ($ShotType > 3 ? "SET SHOT." : "LAY UP."), "\n";
+            if (7 / $Defense * rand(1) <= 0.4)
+            {
+                print "SHOT IS GOOD.  TWO POINTS.\n";
+                dartmouth_score();
+                last;
+            }
+
+            if (7 / $Defense * rand(1) <= 0.7)
+            {
+                print "SHOT IS OFF THE RIM.\n";
+                if (rand(1) <= 0.667)
+                {
+                    print "$Opponent CONTROLS THE REBOUND.\n";
+                    last;
+                }
+
+                print "DARTMOUTH CONTROLS THE REBOUND.\n";
+                next if (rand(1) <= 0.4);
+
+                print "BALL PASSED BACK TO YOU.\n";
+                next;
+            }
+
+            if (7 / $Defense * rand(1) <= 0.875)
+            {
+                print "SHOOTER FOULED.  TWO SHOTS.\n";
+                foul_shooting();
+                last;
+            }
+
+            if (7 / $Defense * rand(1) <= 0.925)
+            {
+                print "SHOT BLOCKED. $Opponent\'S BALL.\n";
+                last;
+            }
+
+            print "CHARGING FOUL.  DARTMOUTH LOSES THE BALL.\n";
+            last;
+        }
+    }
+    $ConTeam = "opp";
+}
+
+sub get_defense
+{
+    $Defense = 0;
+    do {
+        print "YOUR NEW DEFENSIVE ALLIGNMENT IS (6, 6.5, 7. 7.5): ";
+        chomp($Defense = <>);
+        ($Defense) =~ m/(\d(\.\d)?)/;
+    } while ($Defense < 6.0 || $Defense > 7.5)
+}
+
+sub opponent_play
+{
+    $Player = 1;
+    print "\n";
+    while (1)
+    {
+        $Timer++;
+        if ($Timer == 50) { end_first_half(); return; }
+        if ($Timer == 92) { two_min_left(); }
+
+        if ($ShotType <= 2.0)
+        {
+            print "JUMP SHOT.\n";
+            if (8.0 / $Defense * rand(1) <= 0.35)
+            {
+                print "SHOT IS GOOD.\n";
+                opp_score();
+                last;
+            }
+
+            if (8.0 / $Defense * rand(1) <=  0.75)
+            {
+                print "SHOT IS OFF RIM.\n";
+                opp_missed();
+                return; # for possible new ShotType or team change
+            }
+
+            if (8.0 / $Defense * rand(1) <= 0.9)
+            {
+                print "PLAYER FOULED.  TWO SHOTS.\n";
+                foul_shooting();
+                last;
+            }
+            print "OFFENSIVE FOUL.  DARTMOUTH'S BALL.\n";
+            last;
+        }
+        else # ShotType >= 3
+        {
+            print ($ShotType > 3 ? "SET SHOT.\n" : "LAY UP.\n");
+            if (7.0 / $Defense * rand(1) > 0.413)
+            {
+                print "SHOT IS MISSED.\n";
+                {
+                    opp_missed();
+                    return; # for possible new ShotType or team change
+                }
+            }
+            else
+            {
+                print "SHOT IS GOOD.\n";
+                opp_score();
+                last;
+            }
+        }
+    }
+    $ConTeam = "dart";
+}
+
+sub opp_missed
+{
+    if ($Defense / 6.0 * rand(1) <= 0.5)
+    {
+        print "DARTMOUTH CONTROLS THE REBOUND.\n";
+        $ConTeam = "dart";
+    }
+    else
+    {
+        print "$Opponent CONTROLS THE REBOUND.\n";
+        if ($Defense == 6)
+        {
+            if (rand(1) <= 0.75)
+            {
+                print "BALL STOLEN.  EASY LAY UP FOR DARTMOUTH.\n";
+                dartmouth_score();
+                #$ConTeam = "opp";
+                return; # for possible new ShotType
+            }
+        }
+        if (rand(1) <= 0.5)
+        {
+            print "PASS BACK TO $Opponent GUARD.\n";
+            #$ConTeam = "opp";
+            return; # for possible new ShotType
+        }
+        $ShotType = (rand(1) <= 0.5) ? 3 : 4;
+    }
+}
+
+sub opp_score
+{
+    $Score[0] += 2;
+    print_score();
+}
+
+sub dartmouth_score
+{
+    $Score[1] += 2;
+    print_score();
+}
+
+sub print_score
+{
+    print "SCORE: $Score[1] TO $Score[0]\n";
+    print "TIME: $Timer\n";
+}
+
+sub end_first_half
+{
+    print "\n   ***** END OF FIRST HALF *****\n\n";
+    print "SCORE: DARTMOUTH: $Score[1]   $Opponent: $Score[0]\n\n\n";
+    $ConTeam = center_jump();
+}
+
+sub get_your_shot
+{
+    $ShotType = -1;
+    while ($ShotType < 0 || $ShotType > 4)
+    {
+        print "YOUR SHOT (0-4): ";
+        chomp($ShotType = <>);
+        $ShotType = int($ShotType);
+        if ($ShotType < 0 || $ShotType > 4)
+        {
+            print "INCORRECT ANSWER.  RETYPE IT. ";
+        }
+    }
+}
+
+sub center_jump
+{
+    print "CENTER JUMP\n";
+    if (rand(1) <= 0.6)
+    {
+        print "$Opponent CONTROLS THE TAP.\n";
+        return "opp";
+    }
+    print "DARTMOUTH CONTROLS THE TAP.\n";
+    return "dart";
+}
+
+sub check_end_game
+{
+    print "\n";
+    if ($Score[1] != $Score[0])
+    {
+        print "   ***** END OF GAME *****\n";
+        print "FINAL SCORE: DARTMOUTH: $Score[1]    $Opponent: $Score[0]\n\n";
+        $DoPlay = 0;
+    }
+    else
+    {
+        print "\n   ***** END OF SECOND HALF *****\n";
+        print "SCORE AT END OF REGULATION TIME:\n";
+        print "        DARTMOUTH: $Score[1]    $Opponent: $Score[0]\n\n";
+        print "BEGIN TWO MINUTE OVERTIME PERIOD\n";
+    }
+}
+
+sub two_min_left
+{
+    print "\n   *** TWO MINUTES LEFT IN THE GAME ***\n\n";
+}
+
+sub foul_shooting
+{
+    if (rand(1) > 0.49)
+    {
+        if (rand(1) > 0.75)
+        {
+            print "BOTH SHOTS MISSED.\n";
+        }
+        else
+        {
+            print "SHOOTER MAKES ONE SHOT AND MISSES ONE.\n";
+            $Score[1 - $Player]++;
+        }
+    }
+    else
+    {
+        print "SHOOTER MAKES BOTH SHOTS.\n";
+        $Score[1 - $Player] += 2;
+    }
+
+    print_score();
+}

From f6693474682500052255953a10253b13277679ed Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Thu, 20 Apr 2023 12:33:38 -0500
Subject: [PATCH 184/198] removed uneeded line

---
 07_Basketball/perl/basketball.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/07_Basketball/perl/basketball.pl b/07_Basketball/perl/basketball.pl
index a6f98041..ac348309 100755
--- a/07_Basketball/perl/basketball.pl
+++ b/07_Basketball/perl/basketball.pl
@@ -50,7 +50,6 @@ while ($DoPlay)
     print "\n";
     if ($ConTeam eq "dart")
     {
-        $Player = 0;
         get_your_shot();
         dartmouth_play();
     }

From d300d2d851a72fce9470cd8386eec94e38d96a3b Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Fri, 21 Apr 2023 00:25:47 -0500
Subject: [PATCH 185/198] added 13-bounce for Perl

---
 13_Bounce/perl/README.md |  3 ++
 13_Bounce/perl/bounce.pl | 91 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100755 13_Bounce/perl/bounce.pl

diff --git a/13_Bounce/perl/README.md b/13_Bounce/perl/README.md
index e69c8b81..6d213dba 100644
--- a/13_Bounce/perl/README.md
+++ b/13_Bounce/perl/README.md
@@ -1,3 +1,6 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
 Conversion to [Perl](https://www.perl.org/)
+
+Added feature so that if "TIME" value is "0" then it will quit,
+so you don't have to hit Control-C. Also added a little error checking of the input.
diff --git a/13_Bounce/perl/bounce.pl b/13_Bounce/perl/bounce.pl
new file mode 100755
index 00000000..023f6f04
--- /dev/null
+++ b/13_Bounce/perl/bounce.pl
@@ -0,0 +1,91 @@
+#!/usr/bin/perl
+
+# Bounce program in Perl
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+print "\n";
+print " " x 31,"BOUNCE\n";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n";
+print "\n\n\n";
+
+print "THIS SIMULATION LETS YOU SPECIFY THE INITIAL VELOCITY\n";
+print "OF A BALL THROWN STRAIGHT UP, AND THE COEFFICIENT OF\n";
+print "ELASTICITY OF THE BALL.  PLEASE USE A DECIMAL FRACTION\n";
+print "COEFFICIENCY (LESS THAN 1).\n\n";
+print "YOU ALSO SPECIFY THE TIME INCREMENT TO BE USED IN\n";
+print "'STROBING' THE BALL'S FLIGHT (TRY .1 INITIALLY).\n\n";
+
+# deal with basic's tab() for line positioning
+#   line = line string we're starting with
+#   pos = position to start writing
+#   s = string to write
+# returns the resultant string, which might not have been changed
+sub line_tab
+{
+    my ($line, $pos, $s) = @_;
+    my $len = length($line);
+    # if curser is past position, do nothing
+    if ($len <= $pos) { $line .= " " x ($pos - $len) . $s; }
+    return $line;
+}
+
+while (1)
+{
+    my @T;          # time slice?
+    my $time_inc;   # time increment, probably in fractions of seconds
+    my $velocity;   # velocity in feet/sec
+    my $coeff_elas; # coeeficent of elasticity
+    my $L;          # position on line
+
+    # get input
+    print "TIME INCREMENT (SEC, 0=QUIT): "; chomp($time_inc = <>);
+    last if ($time_inc == 0);
+    print "VELOCITY (FPS): "; chomp($velocity = <>);
+    print "COEFFICIENT: "; chomp($coeff_elas = <>);
+    if ($coeff_elas >= 1.0 || $coeff_elas <= 0)
+    {
+        print "COEFFICIENT MUST BE > 0 AND < 1.0\n\n\n";
+        next;
+    }
+
+    print "\nFEET\n";
+    my $S1 = int(70.0 / ($velocity / (16.0 * $time_inc)));
+    for my $i (1 .. $S1)
+    {
+        $T[$i] = $velocity * $coeff_elas ** ($i - 1) / 16.0;
+    }
+
+    # draw graph
+    for (my $height=int(-16.0 * ($velocity / 32.0) ** 2.0 + $velocity ** 2.0 / 32.0 + .5) ; $height >= 0 ; $height -= .5)
+    {
+        #print "h=$height\n"; # kevin
+        if (int($height) == $height) { print sprintf("%2d", $height); }
+        else                         { print "  "; }
+        $L = 0;
+        my $curr_line = "";
+        for my $i (1 .. $S1)
+        {
+            my $time;
+            for ($time=0 ; $time <= $T[$i] ; $time += $time_inc)
+            {
+                $L += $time_inc;
+                next if (abs($height - (.5 * (-32) * $time ** 2.0 + $velocity * $coeff_elas ** ($i - 1) * $time)) > .25);
+                $curr_line = line_tab($curr_line, ($L / $time_inc), "0");
+            }
+            $time = ($T[$i + 1] // 0) / 2;
+            last if (-16.0 * $time ** 2.0 + $velocity * $coeff_elas ** ($i - 1) * $time < $height);
+        }
+        print "$curr_line\n";
+    }
+
+    print "  .";
+    print "." x (int($L + 1) / $time_inc + 1), "\n";
+    print "  0";
+    my $cl = "";
+    for my $i (1 .. int($L + .9995)) { $cl = line_tab($cl, int($i / $time_inc), $i); }
+    print "$cl\n";
+    print " " x (int($L + 1) / (2 * $time_inc) - 2), "SECONDS\n\n";
+}

From d24a5feb6b4e72f15016452844884c3355b48620 Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Fri, 21 Apr 2023 00:31:04 -0500
Subject: [PATCH 186/198] fixed a var name

---
 13_Bounce/perl/bounce.pl | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/13_Bounce/perl/bounce.pl b/13_Bounce/perl/bounce.pl
index 023f6f04..0d799514 100755
--- a/13_Bounce/perl/bounce.pl
+++ b/13_Bounce/perl/bounce.pl
@@ -38,7 +38,8 @@ while (1)
     my $time_inc;   # time increment, probably in fractions of seconds
     my $velocity;   # velocity in feet/sec
     my $coeff_elas; # coeeficent of elasticity
-    my $L;          # position on line
+    my $line_pos;   # position on line
+    my $S1          # duration in full seconds?
 
     # get input
     print "TIME INCREMENT (SEC, 0=QUIT): "; chomp($time_inc = <>);
@@ -52,7 +53,7 @@ while (1)
     }
 
     print "\nFEET\n";
-    my $S1 = int(70.0 / ($velocity / (16.0 * $time_inc)));
+    $S1 = int(70.0 / ($velocity / (16.0 * $time_inc)));
     for my $i (1 .. $S1)
     {
         $T[$i] = $velocity * $coeff_elas ** ($i - 1) / 16.0;
@@ -64,28 +65,28 @@ while (1)
         #print "h=$height\n"; # kevin
         if (int($height) == $height) { print sprintf("%2d", $height); }
         else                         { print "  "; }
-        $L = 0;
+        $line_pos = 0;
         my $curr_line = "";
         for my $i (1 .. $S1)
         {
             my $time;
             for ($time=0 ; $time <= $T[$i] ; $time += $time_inc)
             {
-                $L += $time_inc;
+                $line_pos += $time_inc;
                 next if (abs($height - (.5 * (-32) * $time ** 2.0 + $velocity * $coeff_elas ** ($i - 1) * $time)) > .25);
-                $curr_line = line_tab($curr_line, ($L / $time_inc), "0");
+                $curr_line = line_tab($curr_line, ($line_pos / $time_inc), "0");
             }
-            $time = ($T[$i + 1] // 0) / 2;
+            $time = ($T[$i + 1] // 0) / 2; # we can reach 1 past the end, use 0 if that happens
             last if (-16.0 * $time ** 2.0 + $velocity * $coeff_elas ** ($i - 1) * $time < $height);
         }
         print "$curr_line\n";
     }
 
     print "  .";
-    print "." x (int($L + 1) / $time_inc + 1), "\n";
+    print "." x (int($line_pos + 1) / $time_inc + 1), "\n";
     print "  0";
-    my $cl = "";
-    for my $i (1 .. int($L + .9995)) { $cl = line_tab($cl, int($i / $time_inc), $i); }
-    print "$cl\n";
-    print " " x (int($L + 1) / (2 * $time_inc) - 2), "SECONDS\n\n";
+    my $curr_line = "";
+    for my $i (1 .. int($line_pos + .9995)) { $curr_line = line_tab($curr_line, int($i / $time_inc), $i); }
+    print "$curr_line\n";
+    print " " x (int($line_pos + 1) / (2 * $time_inc) - 2), "SECONDS\n\n";
 }

From 5ae3fe8774d845079591056ed71033162081e3a1 Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Fri, 21 Apr 2023 00:37:09 -0500
Subject: [PATCH 187/198] small fixes to make code look better

---
 13_Bounce/perl/bounce.pl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/13_Bounce/perl/bounce.pl b/13_Bounce/perl/bounce.pl
index 0d799514..4aeacf1f 100755
--- a/13_Bounce/perl/bounce.pl
+++ b/13_Bounce/perl/bounce.pl
@@ -62,7 +62,6 @@ while (1)
     # draw graph
     for (my $height=int(-16.0 * ($velocity / 32.0) ** 2.0 + $velocity ** 2.0 / 32.0 + .5) ; $height >= 0 ; $height -= .5)
     {
-        #print "h=$height\n"; # kevin
         if (int($height) == $height) { print sprintf("%2d", $height); }
         else                         { print "  "; }
         $line_pos = 0;
@@ -73,8 +72,10 @@ while (1)
             for ($time=0 ; $time <= $T[$i] ; $time += $time_inc)
             {
                 $line_pos += $time_inc;
-                next if (abs($height - (.5 * (-32) * $time ** 2.0 + $velocity * $coeff_elas ** ($i - 1) * $time)) > .25);
-                $curr_line = line_tab($curr_line, ($line_pos / $time_inc), "0");
+                if (abs($height - (.5 * (-32) * $time ** 2.0 + $velocity * $coeff_elas ** ($i - 1) * $time)) <= .25)
+                {
+                    $curr_line = line_tab($curr_line, ($line_pos / $time_inc), "0");
+                }
             }
             $time = ($T[$i + 1] // 0) / 2; # we can reach 1 past the end, use 0 if that happens
             last if (-16.0 * $time ** 2.0 + $velocity * $coeff_elas ** ($i - 1) * $time < $height);
@@ -82,11 +83,15 @@ while (1)
         print "$curr_line\n";
     }
 
+    # draw scale
     print "  .";
     print "." x (int($line_pos + 1) / $time_inc + 1), "\n";
     print "  0";
     my $curr_line = "";
-    for my $i (1 .. int($line_pos + .9995)) { $curr_line = line_tab($curr_line, int($i / $time_inc), $i); }
+    for my $i (1 .. int($line_pos + .9995))
+    {
+        $curr_line = line_tab($curr_line, int($i / $time_inc), $i);
+    }
     print "$curr_line\n";
     print " " x (int($line_pos + 1) / (2 * $time_inc) - 2), "SECONDS\n\n";
 }

From e0791fa39576832b86b2d1775cf22c2007ce5b33 Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Sun, 23 Apr 2023 13:50:49 -0500
Subject: [PATCH 188/198] added 14_bowling for perl

---
 14_Bowling/perl/README.md  |  19 +++
 14_Bowling/perl/bowling.pl | 254 +++++++++++++++++++++++++++++++++++++
 2 files changed, 273 insertions(+)
 create mode 100755 14_Bowling/perl/bowling.pl

diff --git a/14_Bowling/perl/README.md b/14_Bowling/perl/README.md
index e69c8b81..9e030cb0 100644
--- a/14_Bowling/perl/README.md
+++ b/14_Bowling/perl/README.md
@@ -1,3 +1,22 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
 Conversion to [Perl](https://www.perl.org/)
+
+###Bowling program in Perl
+
+Run normally, this is a fairly faithful translation of the Basic game.
+The only real differences are a few trivial fix-ups on the prints to make it
+look better, and the player/frame/ball line was put before the "get the ball
+going" line to make it more obvious who's turn it is.
+
+However, if you run it with "-a" on the command line, it will go into
+"advanced" mode, which means that "." is used to show pin down and "!" for
+pin up, current running scores are shown at the end of each frame, and the
+scoring also looks more normal at the end. This is all done because I think it
+looks better and I wanted to see a score. Having a flag says you can play
+whichever version of the game you like.
+
+Note, the original code doesn't do the 10th frame correctly, in that it will
+never do more than 2 balls, so the best score you can get is a 290.
+This is true in both modes. That being said, it will always give you a mediocre
+game; I don't think I've ever seen a score over 140.
diff --git a/14_Bowling/perl/bowling.pl b/14_Bowling/perl/bowling.pl
new file mode 100755
index 00000000..1a00cd6b
--- /dev/null
+++ b/14_Bowling/perl/bowling.pl
@@ -0,0 +1,254 @@
+#!/usr/bin/perl
+
+# Bowling program in Perl
+#   Run normally, this is a fairly faithful translation of the Basic game.
+#   The only real differences are a few trivial fix-ups on the prints to make it
+#   look better, and the player/frame/ball line was put before the "get the ball
+#   going" line to make it more obvious who's turn it is.
+#
+#   However, if you run it with "-a" on the command line, it will go into
+#   'advanced' mode, which means that "." is used to show pin down and "!" for
+#   pin up, current running scores are shown at the end of each frame, and the
+#   scoring also looks more normal at the end. This is all done because I think it
+#   looks better and I wanted to see a score. Having a flag says you can play
+#   whichever version of the game you like.
+#
+#   Note, the original code doesn't do the 10th frame correctly, in that it will
+#   never do more than 2 balls, so the best score you can get is a 290.
+#   This is true in both modes. That being said, it will always give you a mediocre game.
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+print "\n";
+print " " x 34, "BASKETBALL\n";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+
+# globals
+my @C;              # pin position matraix?
+my @Scores;         # scores: [player num][frame][ball] # ball3 is end-result, ball4 is frame score (advanced mode)
+my $Answer;         # get answers
+my $Num_players;    # number of players
+my $Advanced = 0;   # flag, 1 to use advanced code, 0 for original code
+my $char_down = '0'; # char to show pin is down
+my $char_up = '+';   # char to show pin is standing
+
+if ($ARGV[0] && $ARGV[0] eq "-a")
+{
+    shift;
+    $Advanced = 1;
+    $char_down = '.';
+    $char_up = '!';
+}
+
+print "WELCOME TO THE ALLEY\n";
+print "BRING YOUR FRIENDS\n";
+print "OKAY LET'S FIRST GET ACQUAINTED\n\n";
+print "SEE THE INSTRUCTIONS (Y/N): ";
+chomp($Answer = uc(<>));
+if ($Answer eq "Y")
+{
+    print "THE GAME OF BOWLING TAKES MIND AND SKILL. DURING THE GAME\n";
+    print "THE COMPUTER WILL KEEP SCORE.YOU MAY COMPETE WITH\n";
+    print "OTHER PLAYERS[UP TO FOUR]. YOU WILL BE PLAYING TEN FRAMES\n";
+    print "ON THE PIN DIAGRAM 'O' MEANS THE PIN IS DOWN...'+' MEANS THE\n";
+    print "PIN IS STANDING. AFTER THE GAME THE COMPUTER WILL SHOW YOUR SCORES.\n";
+}
+
+do {
+    print "FIRST OF ALL...HOW MANY ARE PLAYING (1-4): ";
+    $Num_players = int(<>);
+} while ($Num_players < 1 || $Num_players > 4);
+
+print "\nVERY GOOD...\n";
+
+while (1)
+{
+    # reset all scores
+    for my $p (1 .. $Num_players) # players
+    {
+        for my $f (1 .. 10) # frames
+        {
+            for my $b (1 .. 3) # balls
+            {
+                $Scores[$p][$f][$b] = 0;
+            }
+        }
+    }
+
+    # play the game
+    for my $frame (1 .. 10) # frame
+    {
+        for my $curr_player (1 .. $Num_players) # player
+        {
+            my $last_pins=0;    # pins down for last ball
+            my $ball=1;         # ball number, 1 or 2
+            my $end_result=0;   # result at end of turn: 3=strike, 2=spare, 1=pins-left
+            for my $i (1 .. 15) { $C[$i] = 0 }
+
+            while (1) # another ball
+            {
+                # ARK BALL GENERATOR USING MOD '15' SYSTEM
+                my $K=0;
+                my $curr_pins=0; # pins down for this ball
+                for my $i (1 .. 20)
+                {
+                    my $x = int(rand(1) * 100);
+                    my $j;
+                    for ($j=1 ; $j <= 10 ; $j++)
+                    {
+                        last if ($x < 15 * $j);
+                    }
+                    $C[15 * $j - $x] = 1;
+                }
+
+                # ARK PIN DIAGRAM
+                print "PLAYER: $curr_player  FRAME: $frame  BALL: $ball\n";
+                print "PRESS ENTER TO GET THE BALL GOING.";
+                $Answer = <>; # not used, just need an enter
+                for my $i (0 .. 3)
+                {
+                    print "\n";
+                    print " " x $i; # avoid the TAB(), just shift each row over for the triangle
+                    for my $j (1 .. 4 - $i)
+                    {
+                        $K++;
+                        print ($C[$K] == 1 ? " $char_down" : " $char_up");
+                    }
+                }
+                print "\n";
+
+                # ARK ROLL ANALYSIS
+                for my $i (1 .. 10)
+                {
+                    $curr_pins += $C[$i];
+                }
+                if ($curr_pins - $last_pins == 0)
+                {
+                    print "GUTTER!!\n";
+                }
+                if ($ball == 1 && $curr_pins == 10)
+                {
+                    print "STRIKE!!!!!\a\a\a\a\n"; # \a is for bell
+                    $end_result = 3;
+                }
+                elsif ($ball == 2 && $curr_pins == 10)
+                {
+                    print "SPARE!!!!\n";
+                    $end_result = 2;
+                }
+                elsif ($ball == 2 && $curr_pins < 10)
+                {
+                    if ($Advanced) { print 10 - $curr_pins, " PENS LEFT!!!\n"; }
+                    else           { print "ERROR!!!\n"; }
+                    $end_result = 1;
+                }
+                if ($ball == 1 && $curr_pins < 10)
+                {
+                    print "ROLL YOUR 2ND BALL\n";
+                }
+                print "\n";
+
+                # ARK STORAGE OF THE SCORES
+                if ($Advanced) { $Scores[$curr_player][$frame][$ball] = $curr_pins - $last_pins; }
+                else           { $Scores[$curr_player][$frame][$ball] = $curr_pins; }
+                if ($ball == 1)
+                {
+                    $ball = 2;
+                    $last_pins = $curr_pins;
+
+                    if ($end_result == 3) # strike, no more rolls, goto last
+                    {
+                        $Scores[$curr_player][$frame][$ball] = $curr_pins;
+                    }
+                    else
+                    {
+                        $Scores[$curr_player][$frame][$ball] = $curr_pins - $last_pins;
+                        next if ($end_result == 0); # next roll
+                    }
+                }
+                last;
+            }
+            $Scores[$curr_player][$frame][3] = $end_result;
+        } # next player
+        if ($Advanced)
+        {
+            print "Scores:\n";
+            for my $p (1 .. $Num_players)
+            {
+                my $total = calc_score($p);
+                print "\tPlayer $p: $total\n";
+            }
+            print "\n";
+        }
+    } # next frame
+
+    # end of game, show full scoreboard
+    show_scoreboard();
+
+    print "DO YOU WANT ANOTHER GAME (Y/N): ";
+    chomp($Answer = uc(<>));
+    print "\n";
+    last if ($Answer ne "Y");
+}
+exit(0);
+
+sub show_scoreboard
+{
+    print "FRAMES\n";
+    for my $i (1 .. 10)
+    {
+        print " $i ";
+    }
+    print "\n";
+    my @results = ( "-", ".", "/", "X" );
+    for my $p (1 .. $Num_players)
+    {
+        print "Player $p\n" if ($Advanced);
+        my $ball_max = ($Advanced ? 4 : 3);
+        for my $b (1 .. $ball_max)
+        {
+            for my $f (1 .. 10)
+            {
+                if ($b != 3) { print sprintf("%2d ", $Scores[$p][$f][$b]); }
+                else         { print sprintf("%2s ", $results[$Scores[$p][$f][$b]]); }
+            }
+            print "\n";
+        }
+        print "\n";
+    }
+}
+
+sub calc_score
+{
+    my $player = shift;
+    my $total = 0;
+    for my $frame (1 .. 10)
+    {
+        my $score = 0;
+        if ($frame == 10 || $Scores[$player][$frame][3] == 1) # pins
+        {
+            $score = $Scores[$player][$frame][1] + $Scores[$player][$frame][2];
+        }
+        elsif ($Scores[$player][$frame][3] == 2) # spare
+        {
+            $score = 10 + $Scores[$player][$frame+1][1];
+        }
+        elsif ($Scores[$player][$frame][3] == 3) # strike
+        {
+            $score = 10 + $Scores[$player][$frame+1][1];
+            if ($Scores[$player][$frame+1][1] == 10)
+            {
+                $score += ($frame < 9 ? $Scores[$player][$frame+2][1] : $Scores[$player][$frame+1][2]);
+            }
+            else
+            {
+                $score += $Scores[$player][$frame+1][2];
+            }
+        }
+        $Scores[$player][$frame][4] = $score;
+        $total += $score;
+    }
+    return $total;
+}

From 35124a2287831019710e726713b92bc65214eb4a Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Sun, 23 Apr 2023 15:39:00 -0500
Subject: [PATCH 189/198] added 34_Digits for perl

---
 34_Digits/perl/digits.pl | 125 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100755 34_Digits/perl/digits.pl

diff --git a/34_Digits/perl/digits.pl b/34_Digits/perl/digits.pl
new file mode 100755
index 00000000..2f49bd0e
--- /dev/null
+++ b/34_Digits/perl/digits.pl
@@ -0,0 +1,125 @@
+#!/usr/bin/perl
+
+# Digits program in Perl
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# globals
+my $Answer;
+
+print "\n";
+print " " x 33, "DIGITS";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+
+print "THIS IS A GAME OF GUESSING.\n";
+print "FOR INSTRUCTIONS, TYPE '1', ELSE TYPE '0': ";
+chomp($Answer = <>);
+if ($Answer == 1)
+{
+    print "\nPLEASE TAKE A PIECE OF PAPER AND WRITE DOWN\n";
+    print "THE DIGITS '0', '1', OR '2' THIRTY TIMES AT RANDOM.\n";
+    print "ARRANGE THEM IN THREE LINES OF TEN DIGITS EACH.\n";
+    print "I WILL ASK FOR THEN TEN AT A TIME.\n";
+    print "I WILL ALWAYS GUESS THEM FIRST AND THEN LOOK AT YOUR\n";
+    print "NEXT NUMBER TO SEE IF I WAS RIGHT. BY PURE LUCK,\n";
+    print "I OUGHT TO BE RIGHT TEN TIMES. BUT I HOPE TO DO BETTER\n";
+    print "THAN THAT. *****\n\n\n";
+}
+
+my ($A, $B, $C) = (0, 1, 3);
+my (@M, @K, @L); # DIM M(26,2),K(2,2),L(8,2)
+while (1)
+{
+    for my $i (0 .. 26) { for my $j (0 .. 2) { $M[$i][$j] = 1; } }
+    for my $i (0 .. 2)  { for my $j (0 .. 2) { $K[$i][$j] = 9; } }
+    for my $i (0 .. 8)  { for my $j (0 .. 2) { $L[$i][$j] = 3; } }
+    $L[0][0] = $L[4][1] = $L[8][2] = 2;
+    my $Z = 26;
+    my $Z1 = 8;
+    my $Z2 = 2;
+    my $X = 0;
+    my @N;
+
+    for my $T (1 .. 3)
+    {
+        my $have_input = 0;
+        while (!$have_input)
+        {
+            $have_input = 1;
+            print "\nTEN NUMBERS, PLEASE: ";
+            chomp($Answer = <>);
+            $Answer = "0 " . $Answer; # need to be 1-based, so prepend a throw-away value for [0]
+            @N = split(/\s+/, $Answer);
+            for my $i (1 .. 10)
+            {
+                if (!defined($N[$i]) || ($N[$i] != 0 && $N[$i] != 1 && $N[$i] != 2))
+                {
+                    print "ONLY USE THE DIGITS '0', '1', OR '2'.\n";
+                    print "LET'S TRY AGAIN.";
+                    $have_input = 0;
+                    last;
+                }
+            }
+        }
+
+        print "\nMY GUESS\tYOUR NO.\tRESULT\tNO. RIGHT\n\n";
+        for my $U (1 .. 10)
+        {
+            my $num = $N[$U];
+            my $S = 0;
+            my $G;
+            for my $J (0 .. 2)
+            {
+                my $S1 = $A * $K[$Z2][$J] + $B * $L[$Z1][$J] + $C * $M[$Z][$J];
+                next if ($S > $S1);
+                if ($S >= $S1)
+                {
+                    next if (rand(1) < .5);
+                }
+                $S = $S1;
+                $G = $J;
+            } # NEXT J
+            print "  $G\t\t$N[$U]\t\t";
+            if ($G == $N[$U])
+            {
+                $X++;
+                print "RIGHT\t$X\n";
+                $M[$Z][$num]++;
+                $L[$Z1][$num]++;
+                $K[$Z2][$num]++;
+                $Z -= int($Z / 9) * 9;
+                $Z = 3 * $Z + $N[$U];
+            }
+            else
+            {
+                print "WRONG\t$X\n";
+            }
+            $Z1 = $Z - int($Z / 9) * 9;
+            $Z2 = $N[$U];
+        } # NEXT U
+    } # NEXT T
+
+    print "\n";
+    if ($X == 10)
+    {
+        print "I GUESSED EXACTLY 1/3 OF YOUR NUMBERS.\n";
+        print "IT'S A TIE GAME.\n";
+    }
+    elsif ($X > 10)
+    {
+        print "I GUESSED MORE THAN 1/3, OR $X, OF YOUR NUMBERS.\n";
+        print "I WIN.\a\a\a\a\a\a\a\a\a\a"
+    }
+    else
+    {
+        print "I GUESSED LESS THAN 1/3, OR $X, OF YOUR NUMBERS.\n";
+        print "YOU BEAT ME.  CONGRATULATIONS *****\n";
+    }
+
+    print "\nDO YOU WANT TO TRY AGAIN (1 FOR YES, 0 FOR NO): ";
+    chomp($Answer = <>);
+    last if ($Answer != 1);
+}
+print "\nTHANKS FOR THE GAME.\n";

From 4a26fcc95568ad7772297e019da5142b18cfcd8b Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Sun, 23 Apr 2023 22:02:16 -0500
Subject: [PATCH 190/198] added 35-flipflop for perl

---
 36_Flip_Flop/perl/flipflop.pl | 124 ++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100755 36_Flip_Flop/perl/flipflop.pl

diff --git a/36_Flip_Flop/perl/flipflop.pl b/36_Flip_Flop/perl/flipflop.pl
new file mode 100755
index 00000000..63e3f84e
--- /dev/null
+++ b/36_Flip_Flop/perl/flipflop.pl
@@ -0,0 +1,124 @@
+#!/usr/bin/perl
+
+# Flip Flop program in Perl
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+use Math::Trig;
+
+print "\n";
+print " " x 32, "FLIPFLOP";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+# *** CREATED BY MICHAEL CASS
+
+print "THE OBJECT OF THIS PUZZLE IS TO CHANGE THIS:\n\n";
+print "X X X X X X X X X X\n\n";
+print "TO THIS:\n\n";
+print "O O O O O O O O O O\n\n";
+print "BY TYPING THE NUMBER CORRESPONDING TO THE POSITION OF THE\n";
+print "LETTER ON SOME NUMBERS, ONE POSITION WILL CHANGE, ON\n";
+print "OTHERS, TWO WILL CHANGE.  TO RESET LINE TO ALL X'S, TYPE 0\n";
+print "(ZERO) AND TO START OVER IN THE MIDDLE OF A GAME, TYPE \n";
+print "11 (ELEVEN).\n\n";
+
+sub initialize
+{
+    my @a;
+    print "1 2 3 4 5 6 7 8 9 10\n";
+    print "X X X X X X X X X X\n";
+    for my $i (0 .. 10) { $a[$i] = "X"; } # make sure [0] has a value just in case
+    return @a;
+}
+
+while (1)
+{
+    my $Q = rand(1);
+    my $C = 0;
+    print "HERE IS THE STARTING LINE OF X'S.\n\n";
+    my @A = initialize();
+
+    while (1)
+    {
+        my $M = 0;
+        my $N;
+        while (1)
+        {
+            print "\nINPUT THE NUMBER: ";
+            chomp($N = <>);
+            if ($N != int($N) || $N < 0 ||  $N > 11)
+            {
+                print "ILLEGAL ENTRY--TRY AGAIN.\n";
+                next;
+            }
+            last;
+        }
+        if ($N == 11) # start a new game
+        {
+            print "\n\n";
+            last;
+        }
+        if ($N == 0) # reset line
+        {
+            @A = initialize();
+            next;
+        }
+
+        if ($M != $N)
+        {
+            $M = $N;
+            $A[$N] = ($A[$N] eq "O") ? "X" : "O";
+            while ($M == $N)
+            {
+                my $R = tan($Q + $N / $Q - $N) - sin($Q / $N) + 336 * sin(8 * $N);
+                $N = $R - int($R);
+                $N = int(10 * $N);
+                if ($A[$N] eq "O")
+                {
+                    $A[$N] = "X";
+                    next;
+                }
+                $A[$N] = "O";
+                last; # GOTO 610
+
+                $A[$N] = "X";
+            }
+        }
+        else
+        {
+            if ($A[$N] ne "O") { $A[$N] = "O"; }
+            while ($M == $N)
+            {
+                my $R = .592 * (1 / tan($Q / $N + $Q)) / sin( $N * 2 + $Q) - cos($N);
+                $N = $R - int($R);
+                $N = int(10 * $N);
+                if ($A[$N] eq "O")
+                {
+                    $A[$N] = "X";
+                    next;
+                }
+                $A[$N] = "O";
+                last;
+            }
+        }
+
+        print "1 2 3 4 5 6 7 8 9 10\n";
+        for my $i (1 .. 10) { print "$A[$i] "; }
+        print "\n";
+        $C++;
+        my $i;
+        for ($i=1 ; $i <= 10 ; $i++) {
+            last if ($A[$i] ne "O");
+        }
+        if ($i == 11)
+        {
+            if ($C <= 12) { print "VERY GOOD.  YOU GUESSED IT IN ONLY $C GUESSES.\n"; }
+            else          { print "TRY HARDER NEXT TIME.  IT TOOK YOU $C GUESSES.\n"; }
+            last;
+        }
+    }
+    print "DO YOU WANT TO TRY ANOTHER PUZZLE (Y/N): ";
+    $_ = <>;
+    print "\n";
+    last if (m/^n/i);
+}

From fbd8aa72e1cc1c8ca5241ac13a1b630755573bc7 Mon Sep 17 00:00:00 2001
From: Chuck Jordan <solgrundy@gmail.com>
Date: Sat, 29 Apr 2023 19:40:42 -0700
Subject: [PATCH 191/198] Add Lua port of 03_Animal

---
 03_Animal/lua/Animal.lua | 181 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 181 insertions(+)
 create mode 100644 03_Animal/lua/Animal.lua

diff --git a/03_Animal/lua/Animal.lua b/03_Animal/lua/Animal.lua
new file mode 100644
index 00000000..293c53e4
--- /dev/null
+++ b/03_Animal/lua/Animal.lua
@@ -0,0 +1,181 @@
+--
+-- Animal.lua
+--
+
+-- maintain a flat table/list of all the known animals
+local animals = {
+    "FISH",
+    "BIRD"
+}
+
+-- store the questions as a binary tree with each node having a 
+-- "y" or "n" branch
+-- if the node has a member named "a" it's an answer, with an index
+-- into the animals list.
+-- Otherwise, it's a question that leads to more nodes.
+local questionTree = {
+    q = "DOES IT SWIM",
+    y = { a = 1 },
+    n = { a = 2 }
+}
+
+-- print the given prompt string and then wait for input
+-- loops until a non-empty input is given
+-- returns the input as an upper-case string
+function askPrompt(promptString)
+    local answered = false 
+    local a
+    while (not answered) do 
+        print(promptString)
+        a = io.read()
+        a = string.upper(a)
+        if (string.len(a) > 0) then 
+            answered = true 
+        end
+    end
+    return a
+end
+
+-- print the given prompt string and then wait for the
+-- user to enter a string beginning with "Y" or "N"
+function askYesOrNo(promptString)
+    local a
+    while ((a ~= "Y") and (a ~= "N")) do 
+        a = askPrompt(promptString)
+        a = a:sub(1,1)
+    end
+    return a
+end
+
+-- prints the introductory text from the original BASIC program
+function printIntro()
+    print(string.format("%32s", " ") .. "ANIMAL")
+    print(string.format("%15s", " ") .. "CREATIVE COMPUTING   MORRISTOWN, NEW JERSEY")
+    print()
+    print()
+    print()
+    print("PLAY 'GUESS THE ANIMAL'")
+    print("THINK OF AN ANIMAL AND THE COMPUTER WILL TRY TO GUESS IT.")
+    print()
+end
+
+-- prints the animals known in the source list
+function listKnownAnimals()
+    print()
+    print("ANIMALS I ALREADY KNOW ARE:")
+
+    local x
+    local item
+    for x = 1,#animals do 
+        -- use string.format to space each animal in a 12-character-wide "cell"
+        item = string.format("%-12s", animals[x])
+
+        -- io.write() works like print(), but doesn't automatically add a carriage return/newline
+        io.write(item)
+
+        -- every fifth item, start a new line
+        if ((x % 5) == 0) then 
+            io.write("\n")
+        end
+    end
+
+    print()
+    print()
+end
+
+-- Prompts the user for info about the animal they were thinking of, then
+-- uses that to add a new branch to the tree
+--      curNode: the node in the tree where the computer made a wrong guess
+--      branch: the answer the user gave to curNode's question
+function addAnimalToTree(curNode, branch)
+    local newAnimal 
+    local curResponse = curNode[branch]
+    local guessedIndex = curResponse.a
+    local guessedAnimal = animals[guessedIndex]
+    local newQuestion, newAnswer, newIndex
+    local newNode
+
+    newAnimal = askPrompt("THE ANIMAL YOU WERE THINKING OF WAS A ?")
+    newQuestion = askPrompt("PLEASE TYPE IN A QUESTION THAT WOULD DISTINGUISH A "..
+        tostring(newAnimal).." FROM A "..tostring(guessedAnimal))
+    newAnswer = askYesOrNo("FOR A "..tostring(newAnimal).." THE ANSWER WOULD BE?")
+
+    -- add the new animal to the master list at the end, and
+    -- save off its index in the list
+    table.insert(animals, newAnimal)
+    newIndex = #animals
+
+    -- create a new node for the question we just learned
+    newNode = {}
+    newNode.q = newQuestion
+    if (newAnswer == "Y") then 
+        newNode.y = { a = newIndex }
+        newNode.n = { a = guessedIndex }
+    else 
+        newNode.y = { a = guessedIndex }
+        newNode.n = { a = newIndex }
+    end 
+
+    -- replace the previous answer with our new node
+    curNode[branch] = newNode
+end
+
+-- Starts at the root of the question tree and asks questions about
+-- the user's animal until the computer hits an "a" answer node and tries
+-- to make a guess
+function askAboutAnimal()
+    local curNode = questionTree
+    local finished = false
+    local response, responseIndex
+    local nextNode, animalName
+    while (not finished) do 
+        response = askYesOrNo(curNode.q .. "?")
+        
+        -- convert the response "Y" or "N" to the lowercase "y" or "n" that we use to name our branches
+        branch = string.lower(response)
+        nextNode = curNode[branch]
+        
+        -- is the next node an answer node, or another question?
+        if (nextNode.a ~= nil) then 
+            -- it's an answer, so make a guess
+            animalName = animals[nextNode.a]
+            response = askYesOrNo("IS IT A "..tostring(animalName).."?")
+            if (response == "Y") then
+                -- we got the correct answer, so prompt for a new animal
+                print()
+                print("WHY NOT TRY ANOTHER ANIMAL?")
+            else 
+                -- incorrect answer, so add a new entry at this point in the tree
+                addAnimalToTree(curNode, branch)
+            end
+
+            -- whether we were right or wrong, we're finished with this round
+            finished = true
+        else 
+            -- it's another question, so advance down the tree
+            curNode = nextNode
+        end
+    end
+end
+
+-- MAIN CONTROL SECTION
+
+printIntro()
+
+-- loop forever until the player requests an exit by entering a blank line
+local exitRequested = false
+local answer 
+
+while (not exitRequested) do
+    print("ARE YOU THINKING OF AN ANIMAL?")
+    answer = io.read()
+    answer = string.upper(answer)
+
+    if (string.len(answer) == 0) then
+        exitRequested = true
+    elseif (answer:sub(1,4) == "LIST") then
+        listKnownAnimals()
+    elseif (answer:sub(1,1) == "Y") then
+        askAboutAnimal()
+    end
+end

From edb3acd3edf24eb4cee7c2008c2308e9d2c3767f Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Sat, 6 May 2023 02:42:07 -0500
Subject: [PATCH 192/198] added 38-furtrader for perl

---
 38_Fur_Trader/perl/README.md    |   2 +
 38_Fur_Trader/perl/furtrader.pl | 265 ++++++++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)
 create mode 100755 38_Fur_Trader/perl/furtrader.pl

diff --git a/38_Fur_Trader/perl/README.md b/38_Fur_Trader/perl/README.md
index e69c8b81..c7001be7 100644
--- a/38_Fur_Trader/perl/README.md
+++ b/38_Fur_Trader/perl/README.md
@@ -1,3 +1,5 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
 Conversion to [Perl](https://www.perl.org/)
+
+You can answer yes/no questions in lower case if desired.
diff --git a/38_Fur_Trader/perl/furtrader.pl b/38_Fur_Trader/perl/furtrader.pl
new file mode 100755
index 00000000..f1e6b01a
--- /dev/null
+++ b/38_Fur_Trader/perl/furtrader.pl
@@ -0,0 +1,265 @@
+#!/usr/bin/perl
+
+# Fur Trader program in Perl
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# globals
+my @Pelts = (qw(0 MINK BEAVER ERMINE FOX ));
+my $Num_pelts = 4;
+my @Quantity; # how many of each fur
+my $Money;
+my $Max_pelts = 190;
+my $Ermine_price;  # like we have @Pelts and @Quantity we could have @Prices
+my $Beaver_price;  # then have 4 constants as index into the arrays to avoid
+my $Fox_price;     # the magic numbers 1-4, or better have a array of objects (really a hash)
+my $Mink_price;    # with the 3 keys (name, number, price), but well keep it
+                   # with 4 vars like the basic program did
+
+print "\n";
+print " " x 31, "FUR TRADER\n";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+
+init();
+while (1)
+{
+    my $ans = get_yesno();
+    last if ($ans ne "YES");
+
+    $Ermine_price = new_price(.15, 0.95);
+    $Beaver_price = new_price(.25, 1.00);
+
+    print "\nYOU HAVE \$$Money SAVINGS.\n";
+    print "AND $Max_pelts FURS TO BEGIN THE EXPEDITION.\n";
+    print "\nYOUR $Max_pelts FURS ARE DISTRIBUTED AMONG THE FOLLOWING\n";
+    print "KINDS OF PELTS: MINK, BEAVER, ERMINE AND FOX.\n";
+    reset_furs();
+
+    my $total = 0;
+    for my $j ( 1 .. $Num_pelts)
+    {
+        print "\nHOW MANY $Pelts[$j] PELTS DO YOU HAVE? ";
+        chomp(my $ans = <>);
+        $Quantity[$j] = int($ans);
+        $total += $Quantity[$j];
+    }
+    if ($total > $Max_pelts)
+    {
+        print "\nYOU MAY NOT HAVE THAT MANY FURS.\n";
+        print "DO NOT TRY TO CHEAT.  I CAN ADD.\n";
+        print "YOU MUST START AGAIN.\n";
+        init();
+        next;
+    }
+
+    print "\nYOU MAY TRADE YOUR FURS AT FORT 1, FORT 2,\n";
+    print "OR FORT 3.  FORT 1 IS FORT HOCHELAGA (MONTREAL)\n";
+    print "AND IS UNDER THE PROTECTION OF THE FRENCH ARMY.\n";
+    print "FORT 2 IS FORT STADACONA (QUEBEC) AND IS UNDER THE\n";
+    print "PROTECTION OF THE FRENCH ARMY.  HOWEVER, YOU MUST\n";
+    print "MAKE A PORTAGE AND CROSS THE LACHINE RAPIDS.\n";
+    print "FORT 3 IS FORT NEW YORK AND IS UNDER DUTCH CONTROL.\n";
+    print "YOU MUST CROSS THROUGH IROQUOIS LAND.\n";
+    my $done = 0;
+    while (!$done)
+    {
+        $ans = 0;
+        while ($ans < 1 || $ans > 3)
+        {
+            no warnings; # in case user enters alpha chars, then int() will return 0 with no warnings
+            print "ANSWER 1, 2, OR 3: ";
+            $ans = int(<>);
+        }
+        # returns 0 if they want to go somewhere else;
+        # or returns the old basic line number to show what to do
+        if ($ans == 1)    { $done = fort1(); }
+        elsif ($ans == 2) { $done = fort2(); }
+        elsif ($ans == 3) { $done = fort3(); }
+    }
+
+    if ($done == 1410)
+    {
+        print "YOUR BEAVER SOLD FOR \$", $Beaver_price * $Quantity[2], "\t";
+    }
+
+    if ($done <= 1414)
+    {
+        print "YOUR FOX SOLD FOR \$", $Fox_price * $Quantity[4], "\n";
+        print "YOUR ERMINE SOLD FOR \$", $Ermine_price * $Quantity[3], "\t";
+        print "YOUR MINK SOLD FOR \$", $Mink_price * $Quantity[1], "\n";
+    }
+
+    # 1418 is always done
+    $Money += $Mink_price * $Quantity[1] + $Beaver_price * $Quantity[2] + $Ermine_price * $Quantity[3] + $Fox_price * $Quantity[4];
+    print "\nYOU NOW HAVE \$$Money INCLUDING YOUR PREVIOUS SAVINGS\n";
+    print "\nDO YOU WANT TO TRADE FURS NEXT YEAR? ";
+}
+exit(0);
+
+###############################################################
+
+sub init
+{
+    print "YOU ARE THE LEADER OF A FRENCH FUR TRADING EXPEDITION IN\n";
+    print "1776 LEAVING THE LAKE ONTARIO AREA TO SELL FURS AND GET\n";
+    print "SUPPLIES FOR THE NEXT YEAR.  YOU HAVE A CHOICE OF THREE\n";
+    print "FORTS AT WHICH YOU MAY TRADE.  THE COST OF SUPPLIES\n";
+    print "AND THE AMOUNT YOU RECEIVE FOR YOUR FURS WILL DEPEND\n";
+    print "ON THE FORT THAT YOU CHOOSE.\n";
+
+    $Money = 600;
+    print "DO YOU WISH TO TRADE FURS?\n";
+}
+
+sub new_price
+{
+    my ($base, $factor) = @_;
+    return int(($base * rand(1) + $factor) * 100 + .5) / 100;
+}
+
+sub supplies_fs
+{
+    print "SUPPLIES AT FORT STADACONA COST \$125.00.\n";
+    print "YOUR TRAVEL EXPENSES TO STADACONA WERE \$15.00.\n";
+}
+
+sub supplies_ny
+{
+    print "SUPPLIES AT NEW YORK COST \$80.00.\n";
+    print "YOUR TRAVEL EXPENSES TO NEW YORK WERE \$25.00.\n";
+}
+
+sub reset_furs
+{
+    for my $j (1 .. $Num_pelts) { $Quantity[$j] = 0; }
+}
+
+sub get_yesno
+{
+    my $ans;
+    print "ANSWER YES OR NO: ";
+    chomp($ans = uc(<>));
+    return $ans;
+}
+
+sub trade_elsewhere
+{
+    print "DO YOU WANT TO TRADE AT ANOTHER FORT? ";
+    my $ans = get_yesno();
+    return $ans;
+}
+
+sub fort1
+{
+    print "\nYOU HAVE CHOSEN THE EASIEST ROUTE.  HOWEVER, THE FORT\n";
+    print "IS FAR FROM ANY SEAPORT.  THE VALUE\n";
+    print "YOU RECEIVE FOR YOUR FURS WILL BE LOW AND THE COST\n";
+    print "OF SUPPLIES HIGHER THAN AT FORTS STADACONA OR NEW YORK.\n";
+    my $ans = trade_elsewhere();
+    if ($ans eq "YES") { return 0; }
+    
+    $Money -= 160;
+    $Mink_price = new_price(.2, .7 );
+    $Ermine_price = new_price(.2, .65);
+    $Beaver_price = new_price(.2, .75);
+    $Fox_price = new_price(.2, .8 );
+    print "\nSUPPLIES AT FORT HOCHELAGA COST \$150.00.\n";
+    print "YOUR TRAVEL EXPENSES TO HOCHELAGA WERE \$10.00.\n";
+    return 1410;
+}
+
+sub fort2
+{
+    print "\nYOU HAVE CHOSEN A HARD ROUTE.  IT IS, IN COMPARSION,\n";
+    print "HARDER THAN THE ROUTE TO HOCHELAGA BUT EASIER THAN\n";
+    print "THE ROUTE TO NEW YORK.  YOU WILL RECEIVE AN AVERAGE VALUE\n";
+    print "FOR YOUR FURS AND THE COST OF YOUR SUPPLIES WILL BE AVERAGE.\n";
+    my $ans = trade_elsewhere();
+    if ($ans eq "YES") { return 0; }
+
+    $Money -= 140;
+    print "\n";
+    $Mink_price = new_price(.3,  .85);
+    $Ermine_price = new_price(.15, .8);
+    $Beaver_price = new_price(.2,  .9);
+    my $P = int(10 * rand(1)) + 1;
+    if ($P <= 2)
+    {
+        $Quantity[2] = 0;
+        print "YOUR BEAVER WERE TOO HEAVY TO CARRY ACROSS\n";
+        print "THE PORTAGE.  YOU HAD TO LEAVE THE PELTS, BUT FOUND\n";
+        print "THEM STOLEN WHEN YOU RETURNED.\n";
+        supplies_fs();
+        return 1414;
+    }
+    elsif ($P <= 6)
+    {
+        print "YOU ARRIVED SAFELY AT FORT STADACONA.\n";
+        supplies_fs();
+    }
+    elsif ($P <= 8)
+    {
+        reset_furs();
+        print "YOUR CANOE UPSET IN THE LACHINE RAPIDS.  YOU\n";
+        print "LOST ALL YOUR FURS.\n";
+        supplies_fs();
+        return 1418;
+    }
+    elsif ($P <= 10)
+    {
+        $Quantity[4] = 0;
+        print "YOUR FOX PELTS WERE NOT CURED PROPERLY.\n";
+        print "NO ONE WILL BUY THEM.\n";
+        supplies_fs();
+    }
+    return 1410;
+}
+
+sub fort3
+{
+    print "\nYOU HAVE CHOSEN THE MOST DIFFICULT ROUTE.  AT\n";
+    print "FORT NEW YORK YOU WILL RECEIVE THE HIGHEST VALUE\n";
+    print "FOR YOUR FURS.  THE COST OF YOUR SUPPLIES\n";
+    print "WILL BE LOWER THAN AT ALL THE OTHER FORTS.\n";
+    my $ans = trade_elsewhere();
+    if ($ans eq "YES") { return 0; }
+
+    $Money -= 105;
+    print "\n";
+    $Mink_price = new_price(.15, 1.05);
+    $Fox_price = new_price(.25, 1.1);
+    $Fox_price = new_price(.25, 1.1);
+    my $P = int(10 * rand(1)) + 1;
+    if ($P <= 2)
+    {
+        print "YOU WERE ATTACKED BY A PARTY OF IROQUOIS.\n";
+        print "ALL PEOPLE IN YOUR TRADING GROUP WERE\n";
+        print "KILLED.  THIS ENDS THE GAME.\n";
+        exit(0);
+    }
+    elsif ($P <= 6)
+    {
+        print "YOU WERE LUCKY.  YOU ARRIVED SAFELY\n";
+        print "AT FORT NEW YORK.\n";
+        supplies_ny();
+    }
+    elsif ($P <= 8)
+    {
+        reset_furs();
+        print "YOU NARROWLY ESCAPED AN IROQUOIS RAIDING PARTY.\n";
+        print "HOWEVER, YOU HAD TO LEAVE ALL YOUR FURS BEHIND.\n";
+        supplies_ny();
+        return 1418;
+    }
+    elsif ($P <= 10)
+    {
+        $Beaver_price /= 2;
+        $Mink_price /= 2;
+        print "YOUR MINK AND BEAVER WERE DAMAGED ON YOUR TRIP.\n";
+        print "YOU RECEIVE ONLY HALF THE CURRENT PRICE FOR THESE FURS.\n";
+        supplies_ny();
+    }
+    return 1410;
+}

From 698eff07585d7a227783e875a6d3276fff063f9b Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Mon, 15 May 2023 01:11:36 -0500
Subject: [PATCH 193/198] added 96-Target for perl

---
 86_Target/perl/target.pl | 107 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 86_Target/perl/target.pl

diff --git a/86_Target/perl/target.pl b/86_Target/perl/target.pl
new file mode 100644
index 00000000..cb552a39
--- /dev/null
+++ b/86_Target/perl/target.pl
@@ -0,0 +1,107 @@
+#!/usr/bin/perl
+
+# Target program in Perl
+#   Modified so that if the user enters "quit" or "stop" for the input, the program will exit.
+#   Values can be space and/or comma separated.
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# globals
+my $R = 1;
+my $R1 = 57.296;
+my $Pi = 3.14159;
+
+print "\n";
+print " " x 33, "TARGET\n";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+
+print "YOU ARE THE WEAPONS OFFICER ON THE STARSHIP ENTERPRISE\n";
+print "AND THIS IS A TEST TO SEE HOW ACCURATE A SHOT YOU\n";
+print "ARE IN A THREE-DIMENSIONAL RANGE.  YOU WILL BE TOLD\n";
+print "THE RADIAN OFFSET FOR THE X AND Z AXES, THE LOCATION\n";
+print "OF THE TARGET IN THREE DIMENSIONAL RECTANGULAR COORDINATES,\n";
+print "THE APPROXIMATE NUMBER OF DEGREES FROM THE X AND Z\n";
+print "AXES, AND THE APPROXIMATE DISTANCE TO THE TARGET.\n";
+print "YOU WILL THEN PROCEEED TO SHOOT AT THE TARGET UNTIL IT IS\n";
+print "DESTROYED!\n\n";
+print "GOOD LUCK!!\n\n";
+
+while (1)
+{
+    my $A = rand(1) * 2 * $Pi;
+    my $B = rand(1) * 2 * $Pi;
+    my $P1 = 100000 * rand(1) + rand(1);
+    my $X = sin($B) * cos($A) * $P1;
+    my $Y = sin($B) * sin($A) * $P1;
+    my $Z = cos($B) * $P1;
+    print "RADIANS FROM X AXIS = $A   FROM Z AXIS = $B\n";
+    print "TARGET SIGHTED: APPROXIMATE COORDINATES:  X=$X  Y=$Y  Z=$Z\n";
+
+    while (1)
+    {
+        my $P3;
+        $R++;
+
+        if    ($R == 1) { $P3 = int($P1 * .05) * 20; }
+        elsif ($R == 2) { $P3 = int($P1 * .1) * 10; }
+        elsif ($R == 3) { $P3 = int($P1 * .5) * 2; }
+        elsif ($R == 4) { $P3 = int($P1); }
+        else            { $P3 = $P1; }
+
+        print "     ESTIMATED DISTANCE: $P3\n\n";
+        print "INPUT ANGLE DEVIATION FROM X, DEVIATION FROM Z, DISTANCE: ";
+        chomp(my $ans = lc(<>));
+        exit(0) if ($ans eq "quit" || $ans eq "stop");
+
+        my ($A1, $B1, $P2) = split(/[,\s]+/, $ans);
+        print "\n";
+
+        if ($P2 >= 20)
+        {
+            $A1 /= $R1;
+            $B1 /= $R1;
+            print "RADIANS FROM X AXIS = $A1  FROM Z AXIS = $B1\n";
+            my $X1 = $P2 * sin($B1) * cos($A1);
+            my $Y1 = $P2 * sin($B1) * sin($A1);
+            my $Z1 = $P2 * cos($B1);
+            my $D = (($X1 - $X) ** 2 + ($Y1 - $Y) ** 2 + ($Z1 - $Z) ** 2) ** (0.5);
+
+            if ($D <= 20)
+            {
+                print "\n * * * HIT * * *   TARGET IS NON-FUNCTIONAL\n";
+                print "\nDISTANCE OF EXPLOSION FROM TARGET WAS $D KILOMETERS.\n";
+                print "\nMISSION ACCOMPLISHED IN $R SHOTS.\n";
+                last;
+            }
+            else
+            {
+                my $X2 = $X1 - $X;
+                my $Y2 = $Y1 - $Y;
+                my $Z2 = $Z1 - $Z;
+
+                if ($X2 < 0) { print "SHOT BEHIND TARGET ", -$X2, " KILOMETERS.\n"; }
+                else         { print "SHOT IN FRONT OF TARGET $X2 KILOMETERS.\n"; }
+
+                if ($Y2 < 0) { print "SHOT TO RIGHT OF TARGET ", -$Y2, " KILOMETERS.\n"; }
+                else         { print "SHOT TO LEFT OF TARGET $Y2 KILOMETERS.\n"; }
+
+                if ($Z2 < 0) { print "SHOT BELOW TARGET ", -$Z2, " KILOMETERS.\n"; }
+                else         { print "SHOT ABOVE TARGET $Z2 KILOMETERS.\n"; }
+
+                print "APPROX POSITION OF EXPLOSION:  X=$X1   Y=$Y1   Z=$Z1\n";
+                print "     DISTANCE FROM TARGET = $D\n\n\n";
+                next;
+            }
+        }
+        else
+        {
+            print "YOU BLEW YOURSELF UP!!\n";
+            last;
+        }
+    }
+
+    $R = 0;
+    print "\n\n\n\n\nNEXT TARGET...\n\n";
+}

From 1e5a0454998fedd10d7583937643974f3d2ddbf6 Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Mon, 15 May 2023 01:16:01 -0500
Subject: [PATCH 194/198] updated README

---
 86_Target/perl/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/86_Target/perl/README.md b/86_Target/perl/README.md
index e69c8b81..eca6b9fa 100644
--- a/86_Target/perl/README.md
+++ b/86_Target/perl/README.md
@@ -1,3 +1,9 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
 Conversion to [Perl](https://www.perl.org/)
+
+Modified so that if the user enters "quit" or "stop" for the input, the program will exit.
+This way the user doesn't have to enter Contorl-C to quit.
+
+Target values can be space and/or comma separated, so "1 2 3" is valid, as is "1,2,3" or even "1, 2, 3".
+I believe the original Basic program wanted "1,2,3" or else each on a separate line.

From abf052017e6e808c2c260c680ce0613a99fc2866 Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Mon, 15 May 2023 12:16:12 -0500
Subject: [PATCH 195/198] added 42-gunner for perl

---
 42_Gunner/perl/gunner.pl | 81 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100755 42_Gunner/perl/gunner.pl

diff --git a/42_Gunner/perl/gunner.pl b/42_Gunner/perl/gunner.pl
new file mode 100755
index 00000000..9df20deb
--- /dev/null
+++ b/42_Gunner/perl/gunner.pl
@@ -0,0 +1,81 @@
+#!/usr/bin/perl
+
+# Gunner program in Perl
+#   Required extensive restructuring to remove all of the GOTO's.
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# globals
+my $Max_range = int(40000*rand(1)+20000);
+my $Total_shots = 0;
+my $Games = 0;
+
+print "\n";
+print " " x 30, "GUNNER\n";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+
+print "YOU ARE THE OFFICER-IN-CHARGE, GIVING ORDERS TO A GUN\n";
+print "CREW, TELLING THEM THE DEGREES OF ELEVATION YOU ESTIMATE\n";
+print "WILL PLACE A PROJECTILE ON TARGET.  A HIT WITHIN 100 YARDS\n";
+print "OF THE TARGET WILL DESTROY IT.\n\n";
+print "MAXIMUM RANGE OF YOUR GUN IS $Max_range YARDS.\n\n";
+
+GAME: while (1)
+{
+    my $target_dist = int($Max_range * (.1 + .8 * rand(1)));
+    my $shots = 0;
+    print "DISTANCE TO THE TARGET IS $target_dist YARDS.\n\n";
+    while (1)
+    {
+        my $elevation = get_elevation(); # in degrees
+        $shots++;
+        my $dist = int($target_dist - ($Max_range * sin(2 * $elevation / 57.3)));
+        if (abs($dist) < 100)
+        {
+            print "*** TARGET DESTROYED ***  $shots ROUNDS OF AMMUNITION EXPENDED.\n";
+            $Total_shots += $shots;
+            if ($Games++ == 4)
+            {
+                print "\n\nTOTAL ROUNDS EXPENDED WERE: $Total_shots\n";
+                if ($Total_shots > 18) { print "BETTER GO BACK TO FORT SILL FOR REFRESHER TRAINING!\n"; }
+                else                   { print "NICE SHOOTING !!\n"; }
+                last;
+            }
+            print "\nTHE FORWARD OBSERVER HAS SIGHTED MORE ENEMY ACTIVITY...\n";
+            next GAME;
+        }
+        if ($dist > 100) { print "SHORT OF TARGET BY ", abs($dist)," YARDS.\n"; }
+        else             { print "OVER TARGET BY ", abs($dist), " YARDS.\n"; }
+
+        if ($shots >= 5)
+        {
+            print "\nBOOM !!!!   YOU HAVE JUST BEEN DESTROYED BY THE ENEMY.\n\n\n\n"; 
+            print "BETTER GO BACK TO FORT SILL FOR REFRESHER TRAINING!\n";
+            last;
+        }
+    }
+
+    print "\nTRY AGAIN (Y OR N): ";
+    chomp(my $ans=uc(<>));
+    if ($ans ne "Y") { last; }
+    else             { $Games = 0; $Total_shots = 0; }
+}
+
+print "\nOK.  RETURN TO BASE CAMP.\n";
+
+####################################
+
+sub get_elevation
+{
+    my $elevation;
+    while (1)
+    {
+        print "\nELEVATION: ";
+        chomp($elevation = <>);
+        if    ($elevation > 89) { print "MAXIMUM ELEVATION IS 89 DEGREES.\n"; }
+        elsif ($elevation < 1)  { print "MINIMUM ELEVATION IS ONE DEGREE.\n"; }
+        else                    { return $elevation; }
+    }
+}

From 46f98ca01d565fdd2675694c418833e2bf4acf59 Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Fri, 19 May 2023 02:11:02 -0500
Subject: [PATCH 196/198] added 56-life2 for perl

added a perl version for the game;
fixed a bug in the basic code;
updated the game's README;
updated perl's README.
---
 56_Life_for_Two/README.md          |  14 ++
 56_Life_for_Two/lifefortwo.bas     |   4 +-
 56_Life_for_Two/perl/README.md     |  18 +++
 56_Life_for_Two/perl/lifefortwo.pl | 215 +++++++++++++++++++++++++++++
 4 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 56_Life_for_Two/perl/lifefortwo.pl

diff --git a/56_Life_for_Two/README.md b/56_Life_for_Two/README.md
index 3d906342..e68c8d64 100644
--- a/56_Life_for_Two/README.md
+++ b/56_Life_for_Two/README.md
@@ -48,3 +48,17 @@ http://www.vintage-basic.net/games.html
 #### Porting Notes
 
 (please note any difficulties or challenges in porting here)
+
+Note: The original program has a bug. The instructions say that if both players
+enter the same cell that the cell is set to 0 or empty. However, the original
+Basic program tells the player "ILLEGAL COORDINATES" and makes another cell be entered,
+giving a slightly unfair advantage to the 2nd player.
+
+The Perl verson of the program fixes the bug and follows the instructions.
+
+Note: The original code had "GOTO 800" but label 800 didn't exist; it should have gone to label 999.
+The Basic program has been fixed.
+
+Note: The Basic program is written to assume it's being played on a Teletype, i.e. output is printed
+on paper. To play on a terminal the input must not be echoed, which can be a challenge to do portably
+and without tying the solution to a specific OS. Some versions may tell you how to do this, others might not.
diff --git a/56_Life_for_Two/lifefortwo.bas b/56_Life_for_Two/lifefortwo.bas
index e970ef6d..4faf1f12 100644
--- a/56_Life_for_Two/lifefortwo.bas
+++ b/56_Life_for_Two/lifefortwo.bas
@@ -60,8 +60,8 @@
 571 IF M3=0 THEN B=1: GOTO 575
 572 IF M2=0 THEN B=2: GOTO 575
 573 GOTO 580
-574 PRINT: PRINT "A DRAW":GOTO 800
-575 PRINT: PRINT "PLAYER";B;"IS THE WINNER":GOTO 800
+574 PRINT: PRINT "A DRAW":GOTO 999
+575 PRINT: PRINT "PLAYER";B;"IS THE WINNER":GOTO 999
 580 FOR B=1 TO 2: PRINT: PRINT: PRINT "PLAYER";B;: GOSUB 700
 581 IF B=99 THEN 560
 582 NEXT B
diff --git a/56_Life_for_Two/perl/README.md b/56_Life_for_Two/perl/README.md
index e69c8b81..7b3b41a3 100644
--- a/56_Life_for_Two/perl/README.md
+++ b/56_Life_for_Two/perl/README.md
@@ -1,3 +1,21 @@
 Original source downloaded [from Vintage Basic](http://www.vintage-basic.net/games.html)
 
 Conversion to [Perl](https://www.perl.org/)
+
+Note: The original program has a bug (see the README in the above dir). This Perl version fixes it.
+
+Note: For input, the X value is to the right while the Y value is down.
+Therefore, the top right cell is "5,1", not "1,5".
+
+The original program was made to be played on a Teletype, i.e. a printer on paper.
+That allowed the program to "black out" the input line to hide a user's input from his/her
+opponent, assuming the opponent was at least looking away. To do the equivalent on a
+terminal would require a Perl module that isn't installed by default (i.e. it is not
+part of CORE and would also require a C compiler to install), nor do I want to issue a
+shell command to "stty" to hide the input because that would restrict the game to Linux/Unix.
+This means it would have to be played on the honor system.
+
+However, if you want to try it, install the module "Term::ReadKey" ("sudo cpan -i Term::ReadKey"
+if on Linux/Unix and you have root access). If the code finds that module, it will automatically
+use it and hide the input ... and restore echoing input again when the games ends. If the module
+is not found, input will be visible.
diff --git a/56_Life_for_Two/perl/lifefortwo.pl b/56_Life_for_Two/perl/lifefortwo.pl
new file mode 100644
index 00000000..0c50cdef
--- /dev/null
+++ b/56_Life_for_Two/perl/lifefortwo.pl
@@ -0,0 +1,215 @@
+#!/usr/bin/perl
+
+# Life_For_Two program in Perl
+#   Required extensive restructuring to remove all of the GOTO's.
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# try to load module to hide input, set RKey to true if found
+my $Rkey = eval { require Term::ReadKey } // 0;
+END { Term::ReadKey::ReadMode('normal') if ($Rkey); }
+
+# globals
+my @Board;      # 2D board
+my @X;          # ?
+my @Y;          # ?
+my $Player;     # 1 or 2
+my $M2 = 0;     # ?
+my $M3 = 0;     # ?
+
+# add 0 on front to make data 1 based
+my @K = (0,3,102,103,120,130,121,112,111,12,21,30,1020,1030,1011,1021,1003,1002,1012);
+my @A = (0,-1,0,1,0,0,-1,0,1,-1,-1,1,-1,-1,1,1,1);
+
+print "\n";
+print " " x 33, "LIFE2\n";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+print " " x 10, "U.B. LIFE GAME\n";
+for my $j (1 .. 5) { for my $k (1 .. 5) { $Board[$j][$k] = 0; } }
+
+for (1 .. 2)
+{
+    $Player = $_; # if we make $Player the loop var, the global isn't set
+    my $p1 = ($Player == 2) ? 30 : 3;
+    print "\nPLAYER $Player - 3 LIVE PIECES.\n";
+    for (1 .. 3)
+    {
+        get_input();
+        $Board[$X[$Player]][$Y[$Player]] = $p1 if ($Player != 99);
+    }
+}
+print_board(); # print board after initial input
+
+while (1)
+{
+    print "\n";
+    calc_board();  # calc new positions
+    print_board(); # print current board after calc
+
+    if ($M2 == 0 && $M3 == 0)
+    {
+        print "\nA DRAW\n";
+        last;
+    }
+    if ($M3 == 0)
+    {
+        win(1);
+        last;
+    }
+    if ($M2 == 0)
+    {
+        win(2);
+        last;
+    }
+
+    for (1 .. 2)
+    {
+        $Player = $_; # if we make $Player the loop var, the global isn't set
+        print "\n\nPLAYER $Player ";
+        get_input();
+        last if ($Player == 99);
+    }
+    next if ($Player == 99);
+
+    $Board[$X[1]][$Y[1]] = 100;
+    $Board[$X[2]][$Y[2]] = 1000;
+}
+exit(0);
+
+###########################################################
+
+sub win
+{
+    my $p = shift;
+    print "\nPLAYER $p IS THE WINNER\n";
+}
+
+sub calc_board
+{
+    for my $j (1 .. 5)
+    {
+        for my $k (1 .. 5)
+        {
+            if ($Board[$j][$k] > 99)
+            {
+                $Player = $Board[$j][$k] > 999 ? 10 : 1;
+                for (my $c = 1 ; $c <= 15 ; $c += 2)
+                {
+                    $Board[$j+$A[$c]][$k+$A[$c+1]] = ($Board[$j+$A[$c]][$k+$A[$c+1]] // 0) + $Player;
+                }
+            }
+        }
+    }
+}
+
+sub print_board
+{
+    $M2 = 0;
+    $M3 = 0;
+    for my $j (0 .. 6)
+    {
+        print "\n";
+        for my $k (0 .. 6)
+        {
+            if ($j != 0 && $j != 6)
+            {
+                if ($k != 0 && $k != 6)
+                {
+                    print_row($j, $k);
+                    next;
+                }
+                if ($j == 6)
+                {
+                    print "0\n";
+                    return;
+                }
+                print " $j ";
+            }
+            else
+            {
+                if ($k == 6)
+                {
+                    print " 0 ";
+                    last;
+                }
+                print " $k ";
+            }
+        }
+    }
+}
+
+sub print_row
+{
+    my ($j, $k) = @_;
+
+    if ($Board[$j][$k] >= 3)
+    {
+        my $c;
+        for $c (1 .. 18)
+        {
+            if ($Board[$j][$k] == $K[$c])
+            {
+                if ($c <= 9)
+                {
+                    $Board[$j][$k] = 100;
+                    $M2++;
+                    print " * ";
+                }
+                else
+                {
+                    $Board[$j][$k] = 1000;
+                    $M3++;
+                    print " # ";
+                }
+                return;
+            }
+        }
+    }
+    $Board[$j][$k] = 0;
+    print "   ";
+}
+
+sub get_input
+{
+    while (1)
+    {
+        print "X,Y\n";
+        my $ans;
+
+        if ($Rkey)
+        {
+            # code to hide input
+            Term::ReadKey::ReadMode('noecho');
+            $ans = Term::ReadKey::ReadLine(0);
+            Term::ReadKey::ReadMode('restore');
+            print "\n"; # do this since the one entered was hidden
+        }
+        else
+        {
+            # normal, input visible
+            chomp($ans = <>);
+        }
+
+        ($Y[$Player], $X[$Player]) = split(/[,\s]+/, $ans, 2);
+        if ($X[$Player] > 5 || $X[$Player] < 1 || $Y[$Player] > 5 || $Y[$Player] < 1)
+        {
+            print "ILLEGAL COORDS. RETYPE\n";
+            next;
+        }
+        # this tells you the cell was already taken not zero it out, bug!
+        #if ($Board[$X[$Player]][$Y[$Player]] != 0)
+        #{
+        #    print "ILLEGAL COORDS. RETYPE\n";
+        #    next;
+        #}
+        last;
+    }
+
+    return if ($Player == 1 || $X[1] != $X[2] || $Y[1] != $Y[2]);
+
+    print "SAME COORD.  SET TO 0\n";
+    $Board[$X[$Player]+1][$Y[$Player]+1] = 0;
+    $Player = 99;
+}

From 728e6ebaf8f1d242ac9e38dd96d22029904cc781 Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Sat, 20 May 2023 00:16:22 -0500
Subject: [PATCH 197/198] added 28-combat for perl

---
 28_Combat/perl/combat.pl | 202 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100755 28_Combat/perl/combat.pl

diff --git a/28_Combat/perl/combat.pl b/28_Combat/perl/combat.pl
new file mode 100755
index 00000000..fc44a0e4
--- /dev/null
+++ b/28_Combat/perl/combat.pl
@@ -0,0 +1,202 @@
+#!/usr/bin/perl
+
+# Combat program in Perl
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# globals
+my $User_army;
+my $User_navy;
+my $User_AF;
+my $Comp_army = 30000;
+my $Comp_navy = 20000;
+my $Comp_AF = 22000;
+my $Attack_type;
+my $Attack_num;
+
+print "\n";
+print " " x 33, "COMBAT\n";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+
+print "I AM AT WAR WITH YOU.\nWE HAVE 72000 SOLDIERS APIECE.\n\n";
+
+do {
+    print "DISTRIBUTE YOUR FORCES.\n";
+    print "\tME\t  YOU\n";
+    print "ARMY\t$Comp_army\t";
+    chomp($User_army = <>);
+    print "NAVY\t$Comp_navy\t";
+    chomp($User_navy = <>);
+    print "A. F.\t$Comp_AF\t";
+    chomp($User_AF = <>);
+} while ($User_army + $User_navy + $User_AF > 72000);
+
+do {
+    print "YOU ATTACK FIRST. TYPE (1) FOR ARMY; (2) FOR NAVY;\n";
+    print "AND (3) FOR AIR FORCE.\n";
+    chomp($Attack_num = <>);
+} while ($Attack_type < 1 && $Attack_type > 3);
+do {
+    print "HOW MANY MEN\n";
+    chomp($Attack_type = <>);
+} while ($Attack_type < 0
+         || ($Attack_num == 1 && $Attack_type > $User_army)
+         || ($Attack_num == 2 && $Attack_type > $User_navy)
+         || ($Attack_num == 3 && $Attack_type > $User_AF));
+
+if ($Attack_num == 1)
+{
+    if ($Attack_type<$User_army/3)
+    {
+        print "YOU LOST $Attack_type MEN FROM YOUR ARMY.\n";
+        $User_army = int($User_army-$Attack_type);
+    }
+    if ($Attack_type<2*$User_army/3)
+    {
+        print "YOU LOST ", int($Attack_type/3), " MEN, BUT I LOST ", int(2*$Comp_army/3), "\n";
+        $User_army = int($User_army-$Attack_type/3);
+        $Comp_army = int(2*$Comp_army/3);
+    }
+    else
+    {
+        s270();
+    }
+}
+elsif ($Attack_num == 2)
+{
+    if ($Attack_type < $Comp_navy/3)
+    {
+        print "YOUR ATTACK WAS STOPPED!\n";
+        $User_navy = int($User_navy-$Attack_type);
+    }
+    if ($Attack_type < 2*$Comp_navy/3)
+    {
+        print "YOU DESTROYED ", int(2*$Comp_navy/3), " OF MY ARMY.\n";
+        $Comp_navy = int(2*$Comp_navy/3);
+    }
+    else
+    {
+        s270();
+    }
+}
+else # $Attack_num == 3
+{
+    if ($Attack_type < $User_AF/3)
+    {
+        print "YOUR ATTACK WAS WIPED OUT.\n";
+        $User_AF = int($User_AF-$Attack_type);
+    }
+    if ($Attack_type < 2*$User_AF/3)
+    {
+        print "WE HAD A DOGFIGHT. YOU WON - AND FINISHED YOUR MISSION.\n";
+        $Comp_army = int(2*$Comp_army/3);
+        $Comp_navy = int($Comp_navy/3);
+        $Comp_AF = int($Comp_AF/3);
+    }
+    else
+    {
+        print "YOU WIPED OUT ONE OF MY ARMY PATROLS, BUT I DESTROYED\n";
+        print "TWO NAVY BASES AND BOMBED THREE ARMY BASES.\n";
+        $User_army = int($User_army/4);
+        $User_navy = int($User_navy/3);
+        $User_AF = int(2*$User_AF/3);
+    }
+}
+
+print "\n\tYOU\tME\n";
+print "ARMY\t$User_army\t$Comp_army\n";
+print "NAVY\t$User_navy\t$Comp_navy\n";
+print "A. F.\t$User_AF\t$Comp_AF\n";
+do {
+    print "WHAT IS YOUR NEXT MOVE?\n";
+    print "ARMY=1  NAVY=2  AIR FORCE=3\n";
+    chomp($Attack_type = <>);
+} while ($Attack_type < 1 && $Attack_type > 3);
+do {
+    print "HOW MANY MEN\n";
+    chomp($Attack_num = <>);
+} while ($Attack_num < 0
+         || ($Attack_type == 1 && $Attack_num > $User_army)
+         || ($Attack_type == 2 && $Attack_num > $User_navy)
+         || ($Attack_type == 3 && $Attack_num > $User_AF));
+
+if ($Attack_num == 1)
+{
+    if ($Attack_num < $Comp_army/2)
+    {
+        print "I WIPED OUT YOUR ATTACK!\n";
+        $User_army -= $Attack_num;
+    }
+    else
+    {
+        print "YOU DESTROYED MY ARMY!\n";
+        $Comp_army = 0;
+    }
+}
+elsif ($Attack_num == 2)
+{
+    if ($Attack_num < $Comp_navy/2)
+    {
+        print "I SUNK TWO OF YOUR BATTLESHIPS, AND MY AIR FORCE\n";
+        print "WIPED OUT YOUR UNGAURDED CAPITOL.\n";
+        $User_army /= 4;
+        $User_navy /= 2;
+    }
+    else
+    {
+        print "YOUR NAVY SHOT DOWN THREE OF MY XIII PLANES,\n";
+        print "AND SUNK THREE BATTLESHIPS.\n";
+        $Comp_AF = 2*$Comp_AF/3;
+        $Comp_navy /= 2;
+    }
+}
+else # $Attack_num == 3
+{
+    if ($Attack_num > $Comp_AF/2)
+    {
+        print "MY NAVY AND AIR FORCE IN A COMBINED ATTACK LEFT\n";
+        print "YOUR COUNTRY IN SHAMBLES.\n";
+        $User_army /= 3;
+        $User_navy /= 3;
+        $User_AF /= 3;
+    }
+    else
+    {
+        print "ONE OF YOUR PLANES CRASHED INTO MY HOUSE. I AM DEAD.\n";
+        print "MY COUNTRY FELL APART.\n";
+        $Comp_army = $Comp_navy = $Comp_AF = 0;
+    }
+}
+
+print "\nFROM THE RESULTS OF BOTH OF YOUR ATTACKS,\n";
+my $total_user = $User_army+$User_navy+$User_AF;
+my $total_comp = $Comp_army+$Comp_navy+$Comp_AF;
+if ($total_user > 3/2*($total_comp))
+{
+    print "YOU WON, OH! SHUCKS!!!!\n";
+}
+elsif ($total_user < 2/3*($total_comp))
+{
+    print "YOU LOST-I CONQUERED YOUR COUNTRY.  IT SERVES YOU\n";
+    print "RIGHT FOR PLAYING THIS STUPID GAME!!!\n";
+}
+else
+{
+    print "THE TREATY OF PARIS CONCLUDED THAT WE TAKE OUR\n";
+    print "RESPECTIVE COUNTRIES AND LIVE IN PEACE.\n";
+}
+print "\n";
+exit(0);
+
+#######################################################
+
+sub s270
+{
+    print "YOU SUNK ONE OF MY PATROL BOATS, BUT I WIPED OUT TWO\n";
+    print "OF YOUR AIR FORCE BASES AND 3 ARMY BASES.\n";
+    $User_army = int($User_army/3);
+    $User_AF = int($User_AF/3);
+    $Comp_navy = int(2*$Comp_navy/3);
+}

From 345584819531546f9beccc110b0fe02eb44011f5 Mon Sep 17 00:00:00 2001
From: kbrannen <kbrannen@hrsmart.com>
Date: Sat, 20 May 2023 02:34:58 -0500
Subject: [PATCH 198/198] added 15-boxing for perl

---
 15_Boxing/perl/boxing.pl | 252 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 252 insertions(+)
 create mode 100644 15_Boxing/perl/boxing.pl

diff --git a/15_Boxing/perl/boxing.pl b/15_Boxing/perl/boxing.pl
new file mode 100644
index 00000000..5068e58a
--- /dev/null
+++ b/15_Boxing/perl/boxing.pl
@@ -0,0 +1,252 @@
+#!/usr/bin/perl
+
+# Boxing program in Perl
+#   Required extensive restructuring to remove all of the GOTO's.
+# Translated by Kevin Brannen (kbrannen)
+
+use strict;
+use warnings;
+
+# globals
+my $Opp_won = 0;    # num rounds opponent has won
+my $You_won = 0;    # num rounds you have won
+my $Opp_name = "";  # opponent name
+my $Your_name = ""; # your name
+my $Your_best = 0;  # your best punch
+my $Your_worst = 0; # your worst punch
+my $Opp_best;       # opponent best punch
+my $Opp_worst;      # opponent worst punch
+my $Opp_damage;     # opponent damage ?
+my $Your_damage;    # your damage ?
+
+sub get_punch
+{
+    my $prompt = shift;
+    my $p;
+    while (1)
+    {
+        print "$prompt: ";
+        chomp($p = int(<>));
+        last if ($p >= 1 && $p <= 4);
+        print "DIFFERENT PUNCHES ARE: (1) FULL SWING; (2) HOOK; (3) UPPERCUT; (4) JAB.\n";
+    }
+    return $p;
+}
+
+print "\n";
+print " " x 33, "BOXING\n";
+print " " x 15, "CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY\n\n\n";
+
+print "BOXING OLYMPIC STYLE (3 ROUNDS -- 2 OUT OF 3 WINS)\n\n";
+print "WHAT IS YOUR OPPONENT'S NAME: ";
+chomp($Opp_name = <>);
+print "INPUT YOUR MAN'S NAME: ";
+chomp($Your_name = <>);
+print "DIFFERENT PUNCHES ARE: (1) FULL SWING; (2) HOOK; (3) UPPERCUT; (4) JAB.\n";
+$Your_best = get_punch("WHAT IS YOUR MANS BEST");
+$Your_worst = get_punch("WHAT IS HIS VULNERABILITY");
+
+do {
+    $Opp_best = int(4*rand(1)+1);
+    $Opp_worst = int(4*rand(1)+1);
+} while ($Opp_best == $Opp_worst);
+print "$Opp_name\'S ADVANTAGE IS $Opp_best AND VULNERABILITY IS SECRET.\n\n";
+
+for my $R (1 .. 3) # rounds
+{
+    last if ($Opp_won >= 2 || $You_won >= 2);
+    $Opp_damage = 0;
+    $Your_damage = 0;
+    print "ROUND $R BEGINS...\n";
+    for my $R1 (1 .. 7) # 7 events per round?
+    {
+        if (int(10*rand(1)+1) <= 5)
+        {
+            my $your_punch = get_punch("$Your_name\'S PUNCH");
+            $Opp_damage += 2 if ($your_punch == $Your_best);
+
+            if    ($your_punch == 1) { punch1(); }
+            elsif ($your_punch == 2) { punch2(); }
+            elsif ($your_punch == 3) { punch3(); }
+            else                     { punch4(); }
+            next;
+        }
+
+        my $Opp_punch = int(4*rand(1)+1);
+        $Your_damage += 2 if ($Opp_punch  == $Opp_best);
+            
+        if    ($Opp_punch == 1) { opp1(); }
+        elsif ($Opp_punch == 2) { opp2(); }
+        elsif ($Opp_punch == 3) { opp3(); }
+        else                    { opp4(); }
+    }
+
+    if ($Opp_damage > $Your_damage)
+    {
+        print "\n$Your_name WINS ROUND $R\n\n";
+        $You_won++;
+    }
+    else
+    {
+        print "\n$Opp_name WINS ROUND $R\n\n";
+        $Opp_won++;
+    }
+}
+
+if ($Opp_won >= 2)
+{
+    done("$Opp_name WINS (NICE GOING, $Opp_name).");
+}
+
+#else # if ($You_won >= 2)
+done("$Your_name AMAZINGLY WINS!!");
+
+###################################################
+
+sub done
+{
+    my $msg = shift;
+    print $msg;
+    print "\n\nAND NOW GOODBYE FROM THE OLYMPIC ARENA.\n\n";
+    exit(0);
+}
+
+sub punch1
+{
+    # $your_punch == 1, full swing
+    print "$Your_name SWINGS AND ";
+    if ($Opp_worst == 4 || int(30*rand(1)+1) < 10)
+    {
+        print "HE CONNECTS!\n";
+        if ($Opp_damage > 35)
+        {
+            done("$Opp_name IS KNOCKED COLD AND $Your_name IS THE WINNER AND CHAMP! ");
+        }
+        $Opp_damage += 15;
+    }
+    else
+    {
+        print "HE MISSES\n";
+        print "\n\n" if ($Opp_damage != 1);
+    }
+}
+
+sub punch2
+{
+    # $your_punch == 2, hook
+    print "$Your_name GIVES THE HOOK... ";
+    if ($Opp_worst == 2)
+    {
+        $Opp_damage += 7;
+        return;
+    }
+    if (int(2*rand(1)+1) == 1)
+    {
+        print "BUT IT'S BLOCKED!!!!!!!!!!!!!\n";
+    }
+    else
+    {
+        print "CONNECTS...\n";
+        $Opp_damage += 7;
+    }
+}
+
+sub punch3
+{
+    # $your_punch == 3, uppercut
+    print "$Your_name TRIES AN UPPERCUT ";
+    if ($Opp_worst == 3 || int(100*rand(1)+1) < 51)
+    {
+        print "AND HE CONNECTS!\n";
+        $Opp_damage += 4;
+    }
+    else
+    {
+        print "AND IT'S BLOCKED (LUCKY BLOCK!)\n";
+    }
+}
+
+sub punch4
+{
+    # $your_punch == 4, jab
+    print "$Your_name JABS AT $Opp_name\'S HEAD ";
+    if ($Opp_worst == 4 || (int(8*rand(1)+1)) >= 4)
+    {
+        $Opp_damage += 3;
+        print "\n";
+    }
+    else
+    {
+        print "IT'S BLOCKED.\n";
+    }
+}
+
+sub opp1
+{
+    # opp_punch == 1
+    print "$Opp_name TAKES A FULL SWING AND ";
+    if ($Your_worst == 1 || int(60*rand(1)+1) < 30)
+    {
+        print " POW!!!!! HE HITS HIM RIGHT IN THE FACE!\n";
+        if ($Your_damage > 35)
+        {
+            done("$Your_name IS KNOCKED COLD AND $Opp_name IS THE WINNER AND CHAMP!");
+        }
+        $Your_damage += 15;
+    }
+    else
+    {
+        print " IT'S BLOCKED!\n";
+    }
+}
+
+sub opp2
+{
+    # opp_punch == 2
+    print "$Opp_name GETS $Your_name IN THE JAW (OUCH!)\n";
+    $Your_damage += 7;
+    print "....AND AGAIN!\n";
+    $Your_damage += 5;
+    if ($Your_damage > 35)
+    {
+        done("$Your_name IS KNOCKED COLD AND $Opp_name IS THE WINNER AND CHAMP!");
+    }
+    print "\n";
+    # 2 continues into opp_punch == 3
+    opp3();
+}
+
+sub opp3()
+{
+    # opp_punch == 3
+    print "$Your_name IS ATTACKED BY AN UPPERCUT (OH,OH)...\n";
+    if ($Your_worst != 3 && int(200*rand(1)+1) > 75)
+    {
+        print " BLOCKS AND HITS $Opp_name WITH A HOOK.\n";
+        $Opp_damage += 5;
+    }
+    else
+    {
+        print "AND $Opp_name CONNECTS...\n";
+        $Your_damage += 8;
+    }
+}
+
+sub opp4
+{
+    # opp_punch == 4
+    print "$Opp_name JABS AND ";
+    if ($Your_worst == 4)
+    {
+        $Your_damage += 5;
+    }
+    elsif (int(7*rand(1)+1) > 4)
+    {
+        print " BLOOD SPILLS !!!\n";
+        $Your_damage += 5;
+    }
+    else
+    {
+        print "IT'S BLOCKED!\n";
+    }
+}