alexis.drai
/
dice_app
0
0
Fork 0
Code Issues 60 Pull Requests Packages Projects 1 Releases Wiki Activity

Merge pull request 'fix-gamerunner-interface' (#92) from fix-gamerunner-interface into main
continuous-integration/drone/push Build is passing Details

Browse Source 
Reviewed-on: #92
pull/94/head
Alexis Drai 3 years ago
parent 497534e722 c59eaceaff
commit 0298360c6b
2 changed files with 28 additions and 83 deletions
Show Stats Download Patch File Download Diff File

22
Sources/App/Program.cs
Unescape View File

@ -48,7 +48,7 @@ namespace App
case "l": case "l":
string loadName = ChooseGame(gameRunner); string loadName = ChooseGame(gameRunner);
if (gameRunner.GetOneGameByName(loadName) != null) if (gameRunner.GetOneByName(loadName) != null)
{ {
Play(gameRunner, loadName); Play(gameRunner, loadName);
} }
@ -56,7 +56,7 @@ namespace App
case "n": case "n":
if (!gameRunner.GetGlobalDiceGroups().Any()) if (!gameRunner.GlobalDieManager.GetAll().Any())
{ {
Console.WriteLine("make at least one dice group first, then try again"); Console.WriteLine("make at least one dice group first, then try again");
break; break;
@ -75,7 +75,7 @@ namespace App
case "d": case "d":
string deleteName = ChooseGame(gameRunner); string deleteName = ChooseGame(gameRunner);
gameRunner.DeleteGame(gameRunner.GetOneGameByName(deleteName)); gameRunner.Remove(gameRunner.GetOneByName(deleteName));
break; break;
case "c": case "c":
@ -114,7 +114,7 @@ namespace App
newGroupDice.Add(die); newGroupDice.Add(die);
} }
} }
gameRunner.AddGlobalDiceGroup(newGroupName, newGroupDice); gameRunner.GlobalDieManager.Add(new KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>>(newGroupName, newGroupDice));
break; break;
default: default:
@ -130,7 +130,7 @@ namespace App
string menuChoicePlay = ""; string menuChoicePlay = "";
while (menuChoicePlay != "q") while (menuChoicePlay != "q")
{ {
Game game = gameRunner.GetOneGameByName(name); Game game = gameRunner.GetOneByName(name);
Console.WriteLine($"{game.GetWhoPlaysNow()}'s turn\n" + Console.WriteLine($"{game.GetWhoPlaysNow()}'s turn\n" +
"q... quit\n" + "q... quit\n" +
"h... show history\n" + "h... show history\n" +
@ -158,7 +158,7 @@ namespace App
{ {
string name; string name;
Console.WriteLine("which of these games?\n(choose by name)\n>"); 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); Console.WriteLine(game);
} }
@ -227,7 +227,7 @@ namespace App
List<AbstractDie<AbstractDieFace>> result = new(); List<AbstractDie<AbstractDieFace>> result = new();
Console.WriteLine("add dice to the game"); Console.WriteLine("add dice to the game");
Console.WriteLine("all known dice or groups of dice:"); Console.WriteLine("all known dice or groups of dice:");
foreach ((string name, IEnumerable<AbstractDie<AbstractDieFace>> dice) in gameRunner.GetGlobalDiceGroups()) foreach ((string name, IEnumerable<AbstractDie<AbstractDieFace>> dice) in gameRunner.GlobalDieManager.GetAll())
{ {
Console.WriteLine($"{name} -- {dice}"); Console.WriteLine($"{name} -- {dice}");
} }
@ -239,7 +239,7 @@ namespace App
// no checks, this is temporary // no checks, this is temporary
if (!menuChoiceDice.Equals("ok")) if (!menuChoiceDice.Equals("ok"))
{ {
IEnumerable<AbstractDie<AbstractDieFace>> chosenDice = gameRunner.GetOneGlobalDiceGroupByName(menuChoiceDice).Value; IEnumerable<AbstractDie<AbstractDieFace>> chosenDice = gameRunner.GlobalDieManager.GetOneByName(menuChoiceDice).Value;
foreach (AbstractDie<AbstractDieFace> die in chosenDice) foreach (AbstractDie<AbstractDieFace> die in chosenDice)
{ {
result.Add(die); result.Add(die);
@ -253,7 +253,7 @@ namespace App
PlayerManager result = new(); PlayerManager result = new();
Console.WriteLine("add players to the game"); Console.WriteLine("add players to the game");
Console.WriteLine("all known players:"); Console.WriteLine("all known players:");
foreach (Player player in gameRunner.GetGlobalPlayers()) foreach (Player player in gameRunner.GlobalPlayerManager.GetAll())
{ {
Console.WriteLine(player); Console.WriteLine(player);
} }
@ -265,10 +265,10 @@ namespace App
if (!menuChoicePlayers.Equals("ok")) if (!menuChoicePlayers.Equals("ok"))
{ {
Player player = new(menuChoicePlayers); Player player = new(menuChoicePlayers);
if (!gameRunner.GetGlobalPlayers().Contains(player)) if (!gameRunner.GlobalPlayerManager.GetAll().Contains(player))
{ {
// if the player didn't exist, now it does... this is temporary // if the player didn't exist, now it does... this is temporary
gameRunner.AddGlobalPlayer(player); gameRunner.GlobalPlayerManager.Add(player);
} }
// almost no checks, this is temporary // almost no checks, this is temporary
result.Add(player); result.Add(player);

89
Sources/Model/Games/GameRunner.cs
Unescape View File

@ -9,20 +9,20 @@ using Model.Players;
namespace Model.Games namespace Model.Games
{ {
public class GameRunner public class GameRunner : IManager<Game>
{ {
private readonly IManager<Player> globalPlayerManager; public IManager<Player> GlobalPlayerManager { get; private set; }
private readonly IManager<KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>>> globalDieManager; public IManager<KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>>> GlobalDieManager { get; private set; }
private readonly List<Game> games; private readonly List<Game> games;
public GameRunner(IManager<Player> globalPlayerManager, IManager<KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>>> globalDieManager, List<Game> games) public GameRunner(IManager<Player> globalPlayerManager, IManager<KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>>> globalDieManager, List<Game> games)
{ {
this.globalPlayerManager = globalPlayerManager; GlobalPlayerManager = globalPlayerManager;
this.globalDieManager = globalDieManager; GlobalDieManager = globalDieManager;
this.games = games ?? new(); this.games = games ?? new();
} }
public IEnumerable<Game> GetAllGames() => games.AsEnumerable(); public IEnumerable<Game> GetAll() => games.AsEnumerable();
/// <summary> /// <summary>
/// finds the game with that name and returns it /// finds the game with that name and returns it
@ -31,7 +31,7 @@ namespace Model.Games
/// </summary> /// </summary>
/// <param name="name">a games's name</param> /// <param name="name">a games's name</param>
/// <returns>game with said name, <em>or null</em> if no such game was found</returns> /// <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)) if (!string.IsNullOrWhiteSpace(name))
{ {
@ -46,15 +46,16 @@ namespace Model.Games
/// </summary> /// </summary>
/// <param name="game">a game to save</param> /// <param name="game">a game to save</param>
/// <exception cref="NotSupportedException"></exception> /// <exception cref="NotSupportedException"></exception>
public void SaveGame(Game game) public Game Add(Game game)
{ {
if (game != null) if (game != null)
{ {
games.Remove(games.FirstOrDefault(g => g.Name == game.Name)); 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 // will often be an update: if game with that name exists, it is removed, else, nothing happens above
games.Add(game); games.Add(game);
return game;
} }
return null;
} }
/// <summary> /// <summary>
@ -64,14 +65,19 @@ namespace Model.Games
public void StartNewGame(string name, PlayerManager playerManager, IEnumerable<AbstractDie<AbstractDieFace>> dice) public void StartNewGame(string name, PlayerManager playerManager, IEnumerable<AbstractDie<AbstractDieFace>> dice)
{ {
Game game = new(name, playerManager, dice); Game game = new(name, playerManager, dice);
SaveGame(game); Add(game);
} }
public void DeleteGame(Game game) public void Remove(Game game)
{ {
games.Remove(game); games.Remove(game);
} }
public Game Update(Game oldGame, Game newGame)
{
return Add(newGame);
}
/// <summary> /// <summary>
/// plays one turn of the game /// plays one turn of the game
/// </summary> /// </summary>
@ -82,66 +88,5 @@ namespace Model.Games
game.PerformTurn(current); game.PerformTurn(current);
game.PrepareNextPlayer(current); game.PrepareNextPlayer(current);
} }
public void AddGlobalPlayer(Player player)
{
globalPlayerManager.Add(player);
}
public IEnumerable<Player> GetGlobalPlayers()
{
return globalPlayerManager.GetAll();
}
public Player GetOneGlobalPlayerByName(string name)
{
return globalPlayerManager.GetOneByName(name);
}
public void UpdateGlobalPlayer(Player oldPlayer, Player newPlayer)
{
globalPlayerManager.Update(oldPlayer, newPlayer);
}
public void DeleteGlobalPlayer(Player oldPlayer)
{
globalPlayerManager.Remove(oldPlayer);
}
public void AddGlobalDiceGroup(string name, IEnumerable<AbstractDie<AbstractDieFace>> dice)
{
globalDieManager.Add(new KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>>(name, dice));
}
public IEnumerable<KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>>> GetGlobalDiceGroups()
{
return globalDieManager.GetAll();
}
public KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>> GetOneGlobalDiceGroupByName(string name)
{
return globalDieManager.GetOneByName(name);
}
/// <summary>
/// only updates names
/// </summary>
/// <param name="oldName">old name</param>
/// <param name="newName">new name</param>
public void UpdateGlobalDiceGroup(string oldName, string newName)
{
KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>> oldDiceGroup = GetOneGlobalDiceGroupByName(oldName);
KeyValuePair<string, IEnumerable<AbstractDie<AbstractDieFace>>> newDiceGroup = new(newName, oldDiceGroup.Value);
globalDieManager.Update(oldDiceGroup, newDiceGroup);
}
/// <summary>
/// will remove those dice groups from other games, potentially breaking them
/// </summary>
/// <param name="oldDiceGroup"></param>
public void DeleteGlobalDiceGroup(string oldName)
{
globalDieManager.Remove(GetOneGlobalDiceGroupByName(oldName));
}
} }
} }

Write Preview
Loading…
Cancel
Save