diff --git a/.gitignore b/.gitignore index ebb5e59..e231f06 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ obj/ riderModule.iml /_ReSharper.Caches/ .aider* +.dotnet/ diff --git a/MooSharp.Tests/Handlers/YellHandlerTests.cs b/MooSharp.Tests/Handlers/YellHandlerTests.cs new file mode 100644 index 0000000..433facd --- /dev/null +++ b/MooSharp.Tests/Handlers/YellHandlerTests.cs @@ -0,0 +1,67 @@ +using MooSharp.Actors.Rooms; +using MooSharp.Commands.Commands.Social; +using MooSharp.Commands.Presentation; + +namespace MooSharp.Tests.Handlers; + +public class YellHandlerTests +{ + [Fact] + public async Task YellHandler_BroadcastsToRoomAndConnectedRooms() + { + var room1 = HandlerTestHelpers.CreateRoom("room1"); + var room2 = HandlerTestHelpers.CreateRoom("room2"); + var room3 = HandlerTestHelpers.CreateRoom("room3"); + + // Setup connections + room1.Exits.Add(new Exit + { + Name = "north", + Description = "To room 2", + Destination = room2.Id + }); + + // Room 3 is not connected to Room 1 + + var world = await HandlerTestHelpers.CreateWorld([room1, room2, room3]); + + var yeller = HandlerTestHelpers.CreatePlayer("Yeller"); + var listenerInSameRoom = HandlerTestHelpers.CreatePlayer("ListenerInSameRoom"); + var listenerInConnectedRoom = HandlerTestHelpers.CreatePlayer("ListenerInConnectedRoom"); + var listenerInDisconnectedRoom = HandlerTestHelpers.CreatePlayer("ListenerInDisconnectedRoom"); + + world.MovePlayer(yeller, room1); + world.MovePlayer(listenerInSameRoom, room1); + world.MovePlayer(listenerInConnectedRoom, room2); + world.MovePlayer(listenerInDisconnectedRoom, room3); + + var handler = new YellHandler(world); + + var result = await handler.Handle(new() + { + Player = yeller, + Message = "Hello World" + }); + + // Yeller gets feedback + var actorMessage = Assert.Single(result.Messages, m => m.Player == yeller); + Assert.Equal(MessageAudience.Actor, actorMessage.Audience); + Assert.IsType(actorMessage.Event); + Assert.Equal("Hello World", ((PlayerYelledEvent)actorMessage.Event).Message); + + // Listener in same room gets message + var sameRoomMessage = Assert.Single(result.Messages, m => m.Player == listenerInSameRoom); + Assert.Equal(MessageAudience.Observer, sameRoomMessage.Audience); + Assert.IsType(sameRoomMessage.Event); + Assert.Equal("Hello World", ((PlayerYelledEvent)sameRoomMessage.Event).Message); + + // Listener in connected room gets message + var connectedRoomMessage = Assert.Single(result.Messages, m => m.Player == listenerInConnectedRoom); + Assert.Equal(MessageAudience.Observer, connectedRoomMessage.Audience); + Assert.IsType(connectedRoomMessage.Event); + Assert.Equal("Hello World", ((PlayerHeardYellEvent)connectedRoomMessage.Event).Message); + + // Listener in disconnected room gets nothing + Assert.DoesNotContain(result.Messages, m => m.Player == listenerInDisconnectedRoom); + } +} diff --git a/MooSharp/Commands/Commands/Social/YellCommand.cs b/MooSharp/Commands/Commands/Social/YellCommand.cs new file mode 100644 index 0000000..52d8d13 --- /dev/null +++ b/MooSharp/Commands/Commands/Social/YellCommand.cs @@ -0,0 +1,87 @@ +using MooSharp.Actors.Players; +using MooSharp.Commands.Machinery; +using MooSharp.Commands.Parsing; +using MooSharp.Commands.Presentation; + +namespace MooSharp.Commands.Commands.Social; + +public class YellCommand : CommandBase +{ + public required Player Player { get; init; } + public required string Message { get; init; } +} + +public class YellCommandDefinition : ICommandDefinition +{ + public IReadOnlyCollection Verbs { get; } = ["yell"]; + public CommandCategory Category => CommandCategory.Social; + public string Description => "Yell a message to everyone in your current room and connected rooms. Usage: yell ."; + + public string? TryCreateCommand(ParsingContext ctx, ArgumentBinder binder, out ICommand? command) + { + command = null; + + var message = ctx.GetRemainingText(); + + if (string.IsNullOrWhiteSpace(message)) + { + return "Yell what?"; + } + + command = new YellCommand + { + Player = ctx.Player, + Message = message + }; + + return null; + } +} + +public class YellHandler(World.World world) : IHandler +{ + public Task Handle(YellCommand cmd, CancellationToken cancellationToken = default) + { + var result = new CommandResult(); + var room = world.GetLocationOrThrow(cmd.Player); + + // Event for the yeller and people in the same room + var yelledEvent = new PlayerYelledEvent(cmd.Player, cmd.Message); + + result.Add(cmd.Player, yelledEvent); + result.BroadcastToAllButPlayer(room, cmd.Player, yelledEvent); + + // Broadcast to connected rooms + var heardYellEvent = new PlayerHeardYellEvent(cmd.Message); + + foreach (var exit in room.Exits) + { + if (world.Rooms.TryGetValue(exit.Destination, out var destinationRoom)) + { + result.Broadcast(destinationRoom.PlayersInRoom, heardYellEvent); + } + } + + return Task.FromResult(result); + } +} + +public record PlayerYelledEvent(Player Player, string Message) : IGameEvent; + +public class PlayerYelledEventFormatter : IGameEventFormatter +{ + public string FormatForActor(PlayerYelledEvent gameEvent) => $"You yell, \"{gameEvent.Message}\""; + public string FormatForObserver(PlayerYelledEvent gameEvent) => $"{gameEvent.Player.Username} yells, \"{gameEvent.Message}\""; +} + +public record PlayerHeardYellEvent(string Message) : IGameEvent; + +public class PlayerHeardYellEventFormatter : IGameEventFormatter +{ + // FormatForActor and FormatForObserver should probably be the same here since the player receiving this is observing the yell from afar + // The "Actor" concept here usually applies to the person initiating the event, but for this event, the audience are all observers in connected rooms. + // However, IGameEventFormatter requires both methods. + + public string FormatForActor(PlayerHeardYellEvent gameEvent) => $"Someone yells from nearby, \"{gameEvent.Message}\""; + public string FormatForObserver(PlayerHeardYellEvent gameEvent) => $"Someone yells from nearby, \"{gameEvent.Message}\""; +}