word search fixes

dotnet · Dec 12, 2023 · f8e25d6 · f8e25d6
1 parent c861969
commit f8e25d6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/Projects/Website/Games/Word Search/Word Search.cs b/Projects/Website/Games/Word Search/Word Search.cs
@@ -74,26 +74,26 @@ Here is where "{currentWord}" was hiding.
  if (!selections.Remove(cursor))
  {
  selections.Add(cursor);
- selections.Sort();
- if (UserFoundTheWord())
- {
- await Console.Clear();
- await RenderBoard();
- await Console.Write($"""
+ }
+ selections.Sort();
+ if (UserFoundTheWord())
+ {
+ await Console.Clear();
+ await RenderBoard();
+ await Console.Write($"""
 
  You found "{currentWord}"! You win!
 
  Controls:
  - enter/home: play again
  - escape: close game
  """);
- while (true)
+ while (true)
+ {
+ switch ((await Console.ReadKey(true)).Key)
  {
- switch ((await Console.ReadKey(true)).Key)
- {
- case ConsoleKey.Enter or ConsoleKey.Home: goto PlayAgain;
- case ConsoleKey.Escape: goto Close;
- }
+ case ConsoleKey.Enter or ConsoleKey.Home: goto PlayAgain;
+ case ConsoleKey.Escape: goto Close;
  }
  }
  }
@@ -107,7 +107,7 @@ You found "{currentWord}"! You win!
 
  void InitializeWords()
  {
- wordArray = Resources.Words!.Select(word => word.ToUpper()).ToArray();
+ wordArray = Resources.Words!.Where(word => word.Length < board.GetLength(1) && word.Length < board.GetLength(0)).Select(word => word.ToUpper()).ToArray();
  }
 
  void InitializeBoard()

diff --git a/Projects/Website/Pages/Word Search.razor b/Projects/Website/Pages/Word Search.razor
@@ -46,7 +46,7 @@
  {
  Game = new();
  Console = Game.Console;
- Console.WindowWidth = 60;
+ Console.WindowWidth = 50;
  Console.WindowHeight = 31;
  Console.TriggerRefresh = StateHasChanged;
  }

diff --git a/Projects/Word Search/Program.cs b/Projects/Word Search/Program.cs
@@ -67,26 +67,26 @@ Here is where "{currentWord}" was hiding.
  if (!selections.Remove(cursor))
  {
  selections.Add(cursor);
- selections.Sort();
- if (UserFoundTheWord())
- {
- Console.Clear();
- RenderBoard();
- Console.Write($"""
+ }
+ selections.Sort();
+ if (UserFoundTheWord())
+ {
+ Console.Clear();
+ RenderBoard();
+ Console.Write($"""
 
  You found "{currentWord}"! You win!
 
  Controls:
  - enter/home: play again
  - escape: close game
  """);
- while (true)
+ while (true)
+ {
+ switch (Console.ReadKey(true).Key)
  {
- switch (Console.ReadKey(true).Key)
- {
- case ConsoleKey.Enter or ConsoleKey.Home: goto PlayAgain;
- case ConsoleKey.Escape: goto Close;
- }
+ case ConsoleKey.Enter or ConsoleKey.Home: goto PlayAgain;
+ case ConsoleKey.Escape: goto Close;
  }
  }
  }