Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 62 additions & 0 deletions MooSharp.Tests/Commands/Meta/WaitCommandTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
using MooSharp.Actors.Players;
using MooSharp.Commands.Commands.Meta;
using MooSharp.Commands.Machinery;
using MooSharp.Commands.Presentation;
using MooSharp.Tests.Handlers;
using MooSharp.Tests.TestDoubles;
using NSubstitute;

namespace MooSharp.Tests.Commands.Meta;

public class WaitCommandTests
{
private readonly World.World _world;
private readonly Player _player;
private readonly Player _observer;
private readonly WaitHandler _handler;

public WaitCommandTests()
{
var origin = HandlerTestHelpers.CreateRoom("origin");

var repository = new InMemoryWorldRepository();
_world = new World.World(repository, Microsoft.Extensions.Logging.Abstractions.NullLogger<World.World>.Instance);
_world.Initialize([origin]);

_player = HandlerTestHelpers.CreatePlayer("Tester");
_world.RegisterPlayer(_player);
_world.MovePlayer(_player, origin);

_observer = HandlerTestHelpers.CreatePlayer("Observer");
_world.RegisterPlayer(_observer);
_world.MovePlayer(_observer, origin);

_handler = new WaitHandler(_world);
}

[Fact]
public async Task Handle_ReturnsTimePassesForActor()
{
var cmd = new WaitCommand { Player = _player };
var result = await _handler.Handle(cmd);

var actorEvents = result.Messages.Where(m => m.Player == _player).Select(m => m.Event).ToList();
Assert.Single(actorEvents);

var formatter = new PlayerWaitsEventFormatter();
Assert.Equal("Time passes...", formatter.FormatForActor((PlayerWaitsEvent)actorEvents[0]));
}

[Fact]
public async Task Handle_ReturnsWaitMessageForObserver()
{
var cmd = new WaitCommand { Player = _player };
var result = await _handler.Handle(cmd);

var observerEvents = result.Messages.Where(m => m.Player == _observer).Select(m => m.Event).ToList();
Assert.Single(observerEvents);

var formatter = new PlayerWaitsEventFormatter();
Assert.Equal("Tester waits.", formatter.FormatForObserver((PlayerWaitsEvent)observerEvents[0]));
}
}
2 changes: 1 addition & 1 deletion MooSharp/Agents/SystemPrompt.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ You will be fed a feed of the game's output.
Respond to it as you see fit.
If nothing happens in the game for a while, you will be prompted to act autonomously by the system.

You may emit the special command `<skip>` to indicate you don't want to do anything.
You may emit the command `wait` to indicate you don't want to do anything.

Besides that, you will be given no special tools beyond what a human player has access to.

Expand Down
51 changes: 51 additions & 0 deletions MooSharp/Commands/Commands/Meta/WaitCommand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
using MooSharp.Actors.Players;
using MooSharp.Commands.Machinery;
using MooSharp.Commands.Parsing;
using MooSharp.Commands.Presentation;

namespace MooSharp.Commands.Commands.Meta;

public class WaitCommand : CommandBase<WaitCommand>
{
public required Player Player { get; init; }
}

public class WaitCommandDefinition : ICommandDefinition
{
public IReadOnlyCollection<string> Verbs { get; } = ["wait", "z"];
public CommandCategory Category => CommandCategory.Meta;
public string Description => "Pass a turn without acting.";

public string? TryCreateCommand(ParsingContext ctx, ArgumentBinder binder, out ICommand? command)
{
command = new WaitCommand
{
Player = ctx.Player
};

return null;
}
}

public class WaitHandler(World.World world) : IHandler<WaitCommand>
{
public Task<CommandResult> Handle(WaitCommand cmd, CancellationToken cancellationToken = default)
{
var result = new CommandResult();
var room = world.GetLocationOrThrow(cmd.Player);
var gameEvent = new PlayerWaitsEvent(cmd.Player);

result.Add(cmd.Player, gameEvent);
result.BroadcastToAllButPlayer(room, cmd.Player, gameEvent);

return Task.FromResult(result);
}
}

public record PlayerWaitsEvent(Player Player) : IGameEvent;

public class PlayerWaitsEventFormatter : IGameEventFormatter<PlayerWaitsEvent>
{
public string FormatForActor(PlayerWaitsEvent gameEvent) => "Time passes...";
public string FormatForObserver(PlayerWaitsEvent gameEvent) => $"{gameEvent.Player.Username} waits.";
}
Loading