[#9]: update interface for dice, catan & player

3k-dome · May 8, 2023 · b5c5e22 · b5c5e22
1 parent 23b3975
commit b5c5e22
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 41 deletions.
diff --git a/catan-lib/Interfaces/Components/ICatan.cs b/catan-lib/Interfaces/Components/ICatan.cs
@@ -4,6 +4,7 @@ namespace CatanLib.Interfaces.Components;
 public interface ICatan
 {
     IDice Dice { get; }
+    IBank Bank { get; }
     Board Board { get; }
     IEnumerable<IPlayer> Players { get; }
     IPlayer CurrentPlayer { get; }

diff --git a/catan-lib/Interfaces/Components/IDice.cs b/catan-lib/Interfaces/Components/IDice.cs
@@ -1,6 +1,8 @@
-namespace CatanLib.Interfaces.Components
+using CatanLib.Interfaces.Interaction;
+
+namespace CatanLib.Interfaces.Components
 {
-    public interface IDice
+    public interface IDice : IVectorizableComponent
     {
         Random Random { get; init; }
         int Rolled { get; }

diff --git a/catan-lib/Interfaces/Components/IPlayer.cs b/catan-lib/Interfaces/Components/IPlayer.cs
@@ -3,45 +3,7 @@
 
 namespace CatanLib.Interfaces.Components;
 
-public interface IPlayer : IVectorizableComponent
+public interface IPlayer : IResourceCollection, IPieceCollection, IVectorizableComponent
 {
     PlayerNumber Number { get; set; }
-    Dictionary<ResourceType, int> Resources { get; }
-
-    void UseResource(ResourceType resource)
-    {
-        if (Resources[resource] <= 0)
-        {
-            throw new Exception("Player can't spend any more of this Resource!");
-        }
-
-        Resources[resource]--;
-    }
-
-    void UseResources(IEnumerable<ResourceType> resources)
-    {
-        foreach (ResourceType resource in resources)
-        {
-            UseResource(resource);
-        }
-    }
-
-    void GainResource(ResourceType resource)
-    {
-        Resources[resource]++;
-    }
-
-    void GainResources(IEnumerable<ResourceType> resources)
-    {
-        foreach (ResourceType resource in resources)
-        {
-            GainResource(resource);
-        }
-    }
-
-    bool HasResources(IEnumerable<ResourceType> resources)
-    {
-        return resources.GroupBy(resource => resource)
-             .All(group => Resources[group.Key] >= group.Count());
-    }
 }