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
2 changes: 1 addition & 1 deletion OpenPolytopia.Common/Gameplay/Game.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public partial class Game {
/// than once, or a player's tribe isn't registered in <paramref name="tribeManager"/>
/// </exception>
public Game(Grid grid, CityManager cityManager, TroopManager troopManager, TribeManager tribeManager,
BuildingManager buildingManager, TechTreeDefinition techTreeDefinition, IReadOnlyList<Player> players,
BuildingManager buildingManager, TechTreeDefinition techTreeDefinition, IReadOnlyList<IPlayer> players,
GameSettings? settings = null) {
ArgumentNullException.ThrowIfNull(grid);
ArgumentNullException.ThrowIfNull(cityManager);
Expand Down
10 changes: 9 additions & 1 deletion OpenPolytopia.Common/Player.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
namespace OpenPolytopia.Common;

public record Player(TribeType Tribe, int Id) {
/// <summary>A participant independent of its human or future bot controller.</summary>
public interface IPlayer {
/// <summary>The participant's tribe.</summary>
TribeType Tribe { get; }
/// <summary>The participant's id within a game.</summary>
int Id { get; }
}

/// <summary>A human participant in a game.</summary>
public record Player(TribeType Tribe, int Id) : IPlayer;
2 changes: 1 addition & 1 deletion OpenPolytopia.Common/TerrainGeneration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class TerrainGeneration(
Grid grid,
CityManager cityManager,
TribeManager tribeManager,
Player[] players,
IPlayer[] players,
int? seed = null) {
// base terrain rates, multiplied by every tribe's TerrainRate
private const float BASE_FOREST_RATE = 0.38f;
Expand Down
27 changes: 27 additions & 0 deletions OpenPolytopia.UnitTest/PlayerAbstractionTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
namespace OpenPolytopia;

using Common;
using Common.Gameplay;
using Shouldly;
using Xunit;

public class PlayerAbstractionTest {
private sealed record TestBot(TribeType Tribe, int Id) : IPlayer;

[Fact]
public async System.Threading.Tasks.Task AlternateParticipantCanGenerateAndPlay() {
var pieces = GameTestFixture.BuildPieces();
IPlayer[] players = [new Player(TribeType.Imperius, 1), new TestBot(TribeType.Imperius, 2)];
var grid = new Grid(16);
var cities = new CityManager(grid);
await new TerrainGeneration(grid, cities, pieces.Tribes, players, 42).GenerateMapAsync();
var troops = new TroopManager(16);
troops.RegisterTroops(EmbeddedResources.LoadTroops()!);
var game = new Common.Gameplay.Game(grid, cities, troops, pieces.Tribes, pieces.Buildings,
pieces.TechTree, players);
game.Start();
game.EndTurn(1).Result.ShouldBe(GameActionResult.Ok);
game.CurrentPlayer.ShouldBe(2);
game.EndTurn(2).Result.ShouldBe(GameActionResult.Ok);
}
}
Loading