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

Better communication

Browse Source
This commit is contained in:
Lucas Morgan
2021-02-19 20:19:11 -06:00
parent d76e4f7a8b
commit 8d79c75616
11 changed files with 156 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gameboard.ShogiUI.Sockets/Managers/BoardManager.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Gameboard.ShogiUI.Sockets.Managers
{
public class BoardManager
{
}
}

10
Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/LoadGameHandler.cs
View File

@@ -41,13 +41,11 @@ namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
}
else
{
var session = new Session(getGameResponse.Session);
communicationManager.SubscribeToGame(socket, session, userName);
var sessionModel = new Session(getGameResponse.Session);
communicationManager.SubscribeToGame(socket, sessionModel, userName);
response.Game = session.ToServiceModel();
response.Moves = userName.Equals(session.Player1)
? getMovesResponse.Moves.Select(_ => Mapper.Map(_))
: getMovesResponse.Moves.Select(_ => Move.ConvertPerspective(Mapper.Map(_)));
response.Game = sessionModel.ToServiceModel();
response.Moves = getMovesResponse.Moves.Select(_ => Mapper.Map(_).ToServiceModel());
}
var serialized = JsonConvert.SerializeObject(response);

26
Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/MoveHandler.cs
View File

@@ -2,11 +2,11 @@
using Gameboard.ShogiUI.Sockets.Extensions;
using Gameboard.ShogiUI.Sockets.Managers.Utility;
using Gameboard.ShogiUI.Sockets.Repositories;
using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages;
using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
using Service = Gameboard.ShogiUI.Sockets.ServiceModels.Socket;
using Newtonsoft.Json;
using System.Net.WebSockets;
using System.Threading.Tasks;
using Gameboard.ShogiUI.Sockets.Models;
namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
{
@@ -24,12 +24,12 @@ namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
public async Task Handle(WebSocket socket, string json, string userName)
{
var request = JsonConvert.DeserializeObject<MoveRequest>(json);
var request = JsonConvert.DeserializeObject<Service.Messages.MoveRequest>(json);
// Basic move validation
if (request.Move.To.Equals(request.Move.From))
{
var serialized = JsonConvert.SerializeObject(
new ErrorResponse(ClientAction.Move)
new Service.Messages.ErrorResponse(Service.Types.ClientAction.Move)
{
Error = "Error: moving piece from tile to the same tile."
});
@@ -37,25 +37,17 @@ namespace Gameboard.ShogiUI.Sockets.Managers.ClientActionHandlers
return;
}
var moveModel = new Move(request.Move);
var session = (await gameboardRepository.GetGame(request.GameName)).Session;
var isPlayer2 = userName == session.Player2;
// Shogi.Api expects the move coordinates from the perspective of player 1.
var move = isPlayer2 ? Move.ConvertPerspective(request.Move) : request.Move;
await gameboardRepository.PostMove(request.GameName, new PostMove(Mapper.Map(move)));
await gameboardRepository.PostMove(request.GameName, new PostMove(Mapper.Map(moveModel)));
var responseForPlayer1 = new MoveResponse(ClientAction.Move)
var response = new Service.Messages.MoveResponse(Service.Types.ClientAction.Move)
{
GameName = request.GameName,
PlayerName = userName,
Move = isPlayer2 ? Move.ConvertPerspective(request.Move) : request.Move
Move = moveModel.ToServiceModel()
};
var responseForPlayer2 = new MoveResponse(ClientAction.Move)
{
GameName = request.GameName,
PlayerName = userName,
Move = isPlayer2 ? request.Move : Move.ConvertPerspective(request.Move)
};
await communicationManager.BroadcastToGame(session.Name, responseForPlayer1, responseForPlayer2);
await communicationManager.BroadcastToGame(session.Name, response);
}
}
}

6
Gameboard.ShogiUI.Sockets/Managers/Utility/Mapper.cs
View File

@@ -1,4 +1,4 @@
using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
using Gameboard.ShogiUI.Sockets.Models;
using Microsoft.FSharp.Core;
using ShogiApi = Gameboard.Shogi.Api.ServiceModels.Types;
@@ -55,8 +55,8 @@ namespace Gameboard.ShogiUI.Sockets.Managers.Utility
var target = new Move
{
From = new Coords { X = origin.X, Y = origin.Y },
To = new Coords { X = destination.X, Y = destination.Y },
From = new Coords(origin.X, origin.Y),
To = new Coords(destination.X, destination.Y),
IsPromotion = source.IsPromotion,
PieceFromCaptured = pieceFromCaptured
};