temp
All checks were successful
dotnet package / build (8.0.x) (push) Successful in 1m29s

temp

fin de l'ajout de données au match
This commit was merged in pull request #7.
This commit is contained in:
2024-06-03 09:16:17 +02:00
parent 35e046a4bb
commit bf41b9f2e4
10 changed files with 267 additions and 3 deletions

View File

@@ -5,6 +5,7 @@ root = true
[*.cs]
dotnet_diagnostic.IDE1006.severity = warning
dotnet_diagnostic.IDE0005.severity = error
dotnet_diagnostic.CA5394.severity = none
# Exclude generated code
[src/**/Migrations/*.cs]

View File

@@ -10,6 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

View File

@@ -1,3 +1,4 @@
using LittleTown.Core.Enums;
using LittleTown.StaticDataAcces;
namespace LittleTown.Core.Tests;
@@ -20,8 +21,17 @@ public class MatchTesting
}
[Fact]
public void CheckBoardBoundaries()
public void TwoPlayerInitMatchTest()
{
StaticDataGetter getter = new();
Match match = new Match(2, getter);
PlayerZone player1 = match.GetPlayerZone(0);
PlayerZone player1_3 = match.GetPlayerZone(0);
Assert.Equal(3, player1.Ressources[Enums.ResourceType.Piece]);
player1.AddRessources(ResourceType.Piece, 1);
Assert.Equal(3, player1_3.Ressources[Enums.ResourceType.Piece]);
Assert.Equal(4, player1.Objectives.Count);
}
}

View File

@@ -1,3 +1,4 @@
using LittleTown.Core.Exceptions;
using LittleTown.Core.Ports;
namespace LittleTown.Core;
@@ -9,8 +10,23 @@ public class Match
{
private const int _minPlayerCount = 2;
private const int _maxPlayerCount = 4;
private int _maxWorkerPerPlayer;
private int _maxBuidingPerPlayer;
private readonly Board _board;
private ICollection<Building> _buildings;
private ICollection<Objective> _objectives;
private Random _random = new Random();
private Dictionary<int, PlayerZone> _playersZones = new Dictionary<int, PlayerZone>();
/// <summary> LE numero du tour en cours (Partant de 1) </summary>
public int CurrentTurn { get; private set; } = 1;
/// <summary>la liste indiquant l'ordre des joueurs, _playerTurnsOrder[0] donne l'index du 1er joueur, _playerTurnsOrder[1] du second..... </summary>
private List<int> _playerTurnsOrder = new List<int>();
/// <summary>
/// Constructeur d'une nouvelle partie avec un nombre de joueurs données en parametres
@@ -24,7 +40,73 @@ public class Match
ArgumentOutOfRangeException.ThrowIfGreaterThan(nbPlayer, _maxPlayerCount);
_board = staticData.GetBoard(1);
_buildings = staticData.GetBuildings();
_objectives = staticData.GetObjectives();
List<int> freeObjectiveIndexs = Enumerable.Range(0, _objectives.Count).ToList();
for (int i = 0; i < nbPlayer; i++)
{
PlayerZone zone = new PlayerZone()
{
Objectives = GetRandomObjectives(nbPlayer switch
{
2 => 4,
3 => 3,
4 => 2,
_ => throw new MatchConfigException("Mauvais nombre de joueurs lors des objectifs")
}, freeObjectiveIndexs)
};
zone.AddRessources(Enums.ResourceType.Piece, 3);
_playersZones.Add(i, zone);
}
_maxWorkerPerPlayer = nbPlayer switch
{
2 => 5,
3 => 4,
4 => 3,
_ => throw new MatchConfigException("Mauvais nombre de joueurs lors Workers")
};
_maxBuidingPerPlayer = nbPlayer switch
{
2 => 7,
3 => 6,
4 => 6,
_ => throw new MatchConfigException("Mauvais nombre de joueurs lors building")
};
// preparer l'ordre des joueurs
int index = _random.Next(nbPlayer);
for (int i = 0; i < nbPlayer; ++i)
{
_playerTurnsOrder.Add(index++);
if (index >= nbPlayer)
index = 0;
}
}
/// <summary> Permet de récuperer une player zone(une copie) </summary>
/// <param name="playerId"></param>
/// <returns></returns>
public PlayerZone GetPlayerZone(int playerId)
{
ArgumentOutOfRangeException.ThrowIfLessThan(playerId, 0);
ArgumentOutOfRangeException.ThrowIfGreaterThan(playerId, _playersZones.Count - 1);
return _playersZones[playerId].Clone() as PlayerZone ?? throw new ArgumentException("playerID is out of bound");
}
private List<Objective> GetRandomObjectives(int number, List<int> freeIndex)
{
List<Objective> result = new List<Objective>();
for (int i = 0; i < number; i++)
{
int randomIndex = _random.Next(freeIndex.Count);
int cardIndex = freeIndex[randomIndex];
freeIndex.RemoveAt(randomIndex);
result.Add(_objectives.ElementAt(randomIndex));
}
return result;
}
}

View File

@@ -0,0 +1,18 @@
namespace LittleTown.Core;
/// <summary>
/// Représente une carte objectif dans le jeu, les objectif sont des conditions qui une fois remplie accordent des points au joueur
/// </summary>
public class Objective
{
/// <summary> la description, une clé pour la traduction </summary>
public string Description { get; init; }
/// <summary> la condition de l'objectif sous forme de formule </summary>
public string Formula { get; init; } = string.Empty;
/// <summary> le nombre de points que procure cet objectif </summary>
public int Points { get; init; }
/// <summary> indique si l'objectif a deja été atteint ou non, un objectif ne peut etre atteint qu'une fois </summary>
public bool Filled { get; init; }
}

View File

@@ -0,0 +1,45 @@
using LittleTown.Core.Enums;
namespace LittleTown.Core;
/// <summary> Représente les données propre à un joueur </summary>
public class PlayerZone : ICloneable
{
/// <summary> Les ressources que possede le joueur </summary>
public IDictionary<ResourceType, int> Ressources { get; init; } = new Dictionary<ResourceType, int>();
/// <summary> La liste des objectifs que le joueur possede/// </summary>
public IReadOnlyCollection<Objective> Objectives { get; init; } = new List<Objective>();
/// <summary> Le marqueur de score pendant le match </summary>
public int ScoreMarker { get; init; }
/// <summary> Permet d'ajouter d'une type de ressources au stock du joueur </summary>
/// <param name="res">le type de ressources</param>
/// <param name="qte">la quantité non nulle non négative</param>
public void AddRessources(ResourceType res, int qte)
{
ArgumentOutOfRangeException.ThrowIfLessThan(qte, 1);
if (Ressources.ContainsKey(res))
{
Ressources[res] += qte;
}
else
{
Ressources.Add(res, qte);
}
}
/// <summary> Cloner ce playerZone </summary>
/// <returns>Une copie de l'objet</returns>
public object Clone()
{
PlayerZone result = new PlayerZone()
{
Ressources = new Dictionary<ResourceType, int>(Ressources),
Objectives = new List<Objective>(Objectives),
ScoreMarker = ScoreMarker
};
return result;
}
}

View File

@@ -13,4 +13,9 @@ public interface IStaticDataGetter
/// <summary> Recupérer la liste des batiments et leurs données statiques </summary>
/// <returns></returns>
public ICollection<Building> GetBuildings();
}
/// <summary> Récupérer la liste des objectifs du jeu </summary>
/// <returns></returns>
public ICollection<Objective> GetObjectives();
}

View File

@@ -0,0 +1,92 @@
[
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
}
]

View File

@@ -29,4 +29,14 @@ public class StaticDataGetter : IStaticDataGetter
return buildings;
}
/// <inheritdoc/>
public ICollection<Objective> GetObjectives()
{
string path = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Objectives.json");
string data = System.IO.File.ReadAllText(path);
List<Objective> objectives = JsonSerializer.Deserialize<List<Objective>>(data) ?? throw new JsonException("Cannot deserialize Objectives");
return objectives;
}
}