Make GameRunner implement the IManager interface
continuous-integration/drone/push Build is passing Details

since it already did (pretty much)
pull/92/head
Alexis Drai 3 years ago
parent 7e4f18f924
commit 9d92f3b84f

@ -48,7 +48,7 @@ namespace App
case "l":
string loadName = ChooseGame(gameRunner);
if (gameRunner.GetOneGameByName(loadName) != null)
if (gameRunner.GetOneByName(loadName) != null)
{
Play(gameRunner, loadName);
}
@ -75,7 +75,7 @@ namespace App
case "d":
string deleteName = ChooseGame(gameRunner);
gameRunner.DeleteGame(gameRunner.GetOneGameByName(deleteName));
gameRunner.Remove(gameRunner.GetOneByName(deleteName));
break;
case "c":
@ -130,7 +130,7 @@ namespace App
string menuChoicePlay = "";
while (menuChoicePlay != "q")
{
Game game = gameRunner.GetOneGameByName(name);
Game game = gameRunner.GetOneByName(name);
Console.WriteLine($"{game.GetWhoPlaysNow()}'s turn\n" +
"q... quit\n" +
"h... show history\n" +
@ -158,7 +158,7 @@ namespace App
{
string name;
Console.WriteLine("which of these games?\n(choose by name)\n>");
foreach (Game game in gameRunner.GetAllGames())
foreach (Game game in gameRunner.GetAll())
{
Console.WriteLine(game);
}

@ -9,7 +9,7 @@ using Model.Players;
namespace Model.Games
{
public class GameRunner
public class GameRunner : IManager<Game>
{
private readonly IManager<Player> globalPlayerManager;
private readonly IManager<KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>>> globalDieManager;
@ -22,7 +22,7 @@ namespace Model.Games
this.games = games ?? new();
}
public IEnumerable<Game> GetAllGames() => games.AsEnumerable();
public IEnumerable<Game> GetAll() => games.AsEnumerable();
/// <summary>
/// finds the game with that name and returns it
@ -31,7 +31,7 @@ namespace Model.Games
/// </summary>
/// <param name="name">a games's name</param>
/// <returns>game with said name, <em>or null</em> if no such game was found</returns>
public Game GetOneGameByName(string name)
public Game GetOneByName(string name)
{
if (!string.IsNullOrWhiteSpace(name))
{
@ -46,15 +46,16 @@ namespace Model.Games
/// </summary>
/// <param name="game">a game to save</param>
/// <exception cref="NotSupportedException"></exception>
public void SaveGame(Game game)
public Game Add(Game game)
{
if (game != null)
{
games.Remove(games.FirstOrDefault(g => g.Name == game.Name));
// will often be an update: if game with that name exists, it is removed, else, nothing happens above
games.Add(game);
return game;
}
return null;
}
/// <summary>
@ -64,14 +65,19 @@ namespace Model.Games
public void StartNewGame(string name, PlayerManager playerManager, IEnumerable<AbstractDie<AbstractDieFace>> dice)
{
Game game = new(name, playerManager, dice);
SaveGame(game);
Add(game);
}
public void DeleteGame(Game game)
public void Remove(Game game)
{
games.Remove(game);
}
public Game Update(Game oldGame, Game newGame)
{
return Add(newGame);
}
/// <summary>
/// plays one turn of the game
/// </summary>

Loading…
Cancel
Save