Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manual Move Undo and Human vs Human Mode: See #202 #204 #305

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Manual Move Undo and Human vs Human Mode: See #202 #204 #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
930ba57
add human vs human button
harrisi Jul 22, 2023
ad1b714
Merge pull request #2 from harrisi/human-vs-human
dudecon Jul 24, 2023
166d2ba
Undo implemented
dudecon Jul 25, 2023
4511eb7
Undo improved
dudecon Jul 25, 2023
2a34ba0
Merge branch 'main' of https://github.com/SebLague/Chess-Challenge in…
dudecon Jul 26, 2023
4910c3c
Complete manual code merge
dudecon Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Chess-Challenge/src/Framework/Application/Core/ChallengeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Generic;
using static ChessChallenge.Application.Settings;
using static ChessChallenge.Application.ConsoleHelper;

Expand Down Expand Up @@ -75,6 +76,22 @@ public ChallengeController()
StartNewGame(PlayerType.Human, PlayerType.MyBot);
}

public void UndoMoves(uint numToUndo)
{
List<Move> allMoves = board.AllGameMoves;
numToUndo = Math.Min((uint)allMoves.Count, numToUndo);

for (int i = 0; i < numToUndo; i++)
{
Move moveToUndo = allMoves.Last();
board.UndoMove(moveToUndo, false);
}

var lastMove = (allMoves.Count == 0) ? new Move(0) : allMoves.Last() ;
boardUI.UpdatePosition(board, lastMove);
NotifyTurnToMove();
}

public void StartNewGame(PlayerType whiteType, PlayerType blackType)
{
// End any ongoing game
Expand Down Expand Up @@ -167,6 +184,12 @@ void NotifyTurnToMove()
{
PlayerToMove.Human.SetPosition(FenUtility.CurrentFen(board));
PlayerToMove.Human.NotifyTurnToMove();

if (PlayerNotOnMove.IsHuman)
{
// for the case of a human vs human match when a manual undo fires
PlayerNotOnMove.Human.CancelTurnToMove();
}
}
else
{
Expand Down
5 changes: 5 additions & 0 deletions Chess-Challenge/src/Framework/Application/Players/HumanPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ public void NotifyTurnToMove()
{
isTurnToMove = true;
}

public void CancelTurnToMove()
{
isTurnToMove = false;
}

public void SetPosition(string fen)
{
Expand Down
21 changes: 20 additions & 1 deletion Chess-Challenge/src/Framework/Application/UI/MenuUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,31 @@ public static class MenuUI
{
public static void DrawButtons(ChallengeController controller)
{
Vector2 buttonPos = UIHelper.Scale(new Vector2(260, 210));
Vector2 buttonPos = UIHelper.Scale(new Vector2(260, 144));
Vector2 buttonSize = UIHelper.Scale(new Vector2(260, 55));
float spacing = buttonSize.Y * 1.2f;
float breakSpacing = spacing * 0.6f;

// Undo Button
if (controller.PlayerWhite.IsHuman || controller.PlayerBlack.IsHuman)
{
var undoNum = (controller.PlayerWhite.IsBot || controller.PlayerBlack.IsBot) ? 2 : 1 ;
if (NextButtonInRow("Undo Move", ref buttonPos, spacing, buttonSize))
{
controller.UndoMoves((uint)undoNum);
}
} else {
buttonPos = UIHelper.Scale(new Vector2(260, 210));
}


// Game Buttons
buttonPos.Y += breakSpacing;

if (NextButtonInRow("Human vs Human", ref buttonPos, spacing, buttonSize))
{
controller.StartNewGame(ChallengeController.PlayerType.Human, ChallengeController.PlayerType.Human);
}
if (NextButtonInRow("Human vs MyBot", ref buttonPos, spacing, buttonSize))
{
var whiteType = controller.HumanWasWhiteLastGame ? ChallengeController.PlayerType.MyBot : ChallengeController.PlayerType.Human;
Expand Down