lucas/Shogi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

it fricken works!

Browse Source
This commit is contained in:
Lucas Morgan
2021-03-02 19:08:10 -06:00
parent 3da187be17
commit 2e976c01e9
6 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gameboard.ShogiUI.BoardState/Direction.cs
View File

@@ -8,8 +8,8 @@ namespace Gameboard.ShogiUI.BoardState
public static readonly Vector2 Down = new Vector2(0, -1);
public static readonly Vector2 Left = new Vector2(-1, 0);
public static readonly Vector2 Right = new Vector2(1, 0);
public static readonly Vector2 UpLeft = new Vector2(1, 1);
public static readonly Vector2 UpRight = new Vector2(-1, 1);
public static readonly Vector2 UpLeft = new Vector2(-1, 1);
public static readonly Vector2 UpRight = new Vector2(1, 1);
public static readonly Vector2 DownLeft = new Vector2(-1, -1);
public static readonly Vector2 DownRight = new Vector2(1, -1);
public static readonly Vector2 KnightLeft = new Vector2(-1, 2);

5
Gameboard.ShogiUI.BoardState/Pieces/King.cs
View File

@@ -28,8 +28,7 @@ namespace Gameboard.ShogiUI.BoardState.Pieces
if (IsPromoted) clone.Promote();
return clone;
}
public override ICollection<Path> GetPaths() => Owner == WhichPlayer.Player1
? MoveSet
: MoveSet.Select(_ => new Path(Vector2.Negate(_.Direction), _.Distance)).ToList();
// The move set for a King is the same regardless of orientation.
public override ICollection<Path> GetPaths() => MoveSet;
}
}

39
Gameboard.ShogiUI.BoardState/ShogiBoard.cs
View File

@@ -15,10 +15,10 @@ namespace Gameboard.ShogiUI.BoardState
public class ShogiBoard
{
private delegate void MoveSetCallback(Piece piece, Vector2 position);
private ShogiBoard validationBoard;
private readonly PathFinder2D<Piece> pathFinder;
public ShogiBoard validationBoard;
private Vector2 player1King;
private Vector2 player2King;
private PathFinder2D<Piece> pathFinder;
public IReadOnlyDictionary<WhichPlayer, List<Piece>> Hands { get; }
public Array2D<Piece> Board { get; }
public List<Move> MoveHistory { get; }
@@ -44,15 +44,11 @@ namespace Gameboard.ShogiUI.BoardState
{
for (var i = 0; i < moves.Count; i++)
{
if (!TryMove(moves[i]))
if (!Move(moves[i]))
{
throw new InvalidOperationException($"Unable to construct ShogiBoard with the given move at index {i}.");
}
}
if (EvaluateCheckAfterMove(WhoseTurn))
{
InCheck = WhoseTurn;
}
}
private ShogiBoard(ShogiBoard toCopy)
@@ -75,7 +71,7 @@ namespace Gameboard.ShogiUI.BoardState
public bool Move(Move move)
{
var otherPlayer = WhoseTurn == WhichPlayer.Player1 ? WhichPlayer.Player2 : WhichPlayer.Player1;
var moveSuccess = TryMove(move);
if (!moveSuccess)
@@ -84,13 +80,10 @@ namespace Gameboard.ShogiUI.BoardState
}
// Evaluate check
if (EvaluateCheckAfterMove(WhoseTurn))
if (EvaluateCheckAfterMove(move, otherPlayer))
{
InCheck = WhoseTurn;
if (InCheck.HasValue)
{
//IsCheckmate = EvaluateCheckmate();
}
InCheck = otherPlayer;
IsCheckmate = EvaluateCheckmate();
}
return true;
}
@@ -114,12 +107,15 @@ namespace Gameboard.ShogiUI.BoardState
validationBoard = null;
return false;
}
// Assert that this move does not put the moving player in check.
if (validationBoard.EvaluateCheckAfterMove(WhoseTurn))
// If already in check, assert the move that resulted in check no longer results in check.
if (InCheck == WhoseTurn)
{
if (validationBoard.EvaluateCheckAfterMove(MoveHistory[^1], WhoseTurn))
{
// Sneakily using this.WhoseTurn instead of validationBoard.WhoseTurn;
return false;
}
}
// The move is valid and legal; update board state.
if (move.PieceFromCaptured.HasValue) PlaceFromHand(move);
@@ -251,13 +247,11 @@ namespace Gameboard.ShogiUI.BoardState
Console.WriteLine(builder.ToString());
}
#region Rules Validation
private bool EvaluateCheckAfterMove(WhichPlayer whichPlayer)
private bool EvaluateCheckAfterMove(Move move, WhichPlayer whichPlayer)
{
var isCheck = false;
var kingPosition = whichPlayer == WhichPlayer.Player1 ? player1King : player2King;
// Get last move.
var move = MoveHistory[^1];
// Check if the move put the king in check.
if (pathFinder.PathTo(move.To, kingPosition)) return true;
@@ -327,11 +321,16 @@ namespace Gameboard.ShogiUI.BoardState
pathFinder.PathEvery(from, (other, position) =>
{
if (validationBoard == null) validationBoard = new ShogiBoard(this);
var moveSuccess = validationBoard.TryMove(new Move { From = from, To = position });
var moveToTry = new Move { From = from, To = position };
var moveSuccess = validationBoard.TryMove(moveToTry);
if (moveSuccess)
{
validationBoard = null;
if (!EvaluateCheckAfterMove(moveToTry, InCheck.Value))
{
isCheckmate = false;
}
}
});
}
});

10
Gameboard.ShogiUI.UnitTests/BoardState/ShogiBoardShould.cs
View File

@@ -1,6 +1,7 @@
using FluentAssertions;
using Gameboard.ShogiUI.BoardState;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Linq;
using System.Numerics;
@@ -304,15 +305,22 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
new Move { From = new Vector2(4, 4), To = new Vector2(4, 5) },
// P2 King
new Move { From = new Vector2(4, 8), To = new Vector2(4, 7) },
// P1 Pawn promotes
// P1 Pawn promotes, threatens P2 King
new Move { From = new Vector2(4, 5), To = new Vector2(4, 6), IsPromotion = true },
// P2 King retreat
new Move { From = new Vector2(4, 7), To = new Vector2(4, 8) },
};
var shogi = new ShogiBoard(moves);
Console.WriteLine("Prereq");
shogi.PrintStateAsAscii();
// Act - P1 Pawn wins by checkmate.
var moveSuccess = shogi.Move(new Move { From = new Vector2(4, 6), To = new Vector2(4, 7) });
Console.WriteLine("Checkmate");
shogi.PrintStateAsAscii();
shogi.Move(new Move { From = new Vector2(4, 8), To = new Vector2(4, 7) });
shogi.PrintStateAsAscii();
// Assert
moveSuccess.Should().BeTrue();

4
PathFinding/Path.cs
View File

@@ -1,7 +1,9 @@
using System.Numerics;
using System.Diagnostics;
using System.Numerics;
namespace PathFinding
{
[DebuggerDisplay("{Direction} - {Distance}")]
public class Path
{
public Vector2 Direction { get; }

5
PathFinding/PathFinder2D.cs
View File

@@ -72,19 +72,20 @@ namespace PathFinding
foreach (var path in element.GetPaths())
{
var shouldPath = true;
var next = Vector2.Add(from, path.Direction);
var next = Vector2.Add(from, path.Direction); ;
while (shouldPath && next.X < width && next.Y < height && next.X >= 0 && next.Y >= 0)
{
var collider = collection[(int)next.X, (int)next.Y];
if (collider != null)
{
callback(collider, next);
shouldPath = false;
}
next = Vector2.Add(from, path.Direction);
if (path.Distance == Distance.OneStep)
{
shouldPath = false;
}
next = Vector2.Add(next, path.Direction);
}
}
}