Mostly finished implementation of the new deck? ALso added some tests

src/Nadeko.Econ/Deck/Deck.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using Nadeko.Common;
-
 namespace Nadeko.Econ;
 
 public class Deck

src/Nadeko.Econ/Deck/NewCard.cs

@@ -0,0 +1,15 @@
+namespace Nadeko.Econ;
+
+public abstract class NewCard<TSuit, TValue>
+    where TSuit : struct, Enum
+    where TValue : struct, Enum
+{
+    public TSuit Suit { get; }
+    public TValue Value { get; }
+
+    public NewCard(TSuit suit, TValue value)
+    {
+        Suit = suit;
+        Value = value;
+    }
+}

src/Nadeko.Econ/Deck/NewDeck.cs

@@ -0,0 +1,51 @@
+namespace Nadeko.Econ;
+
+public abstract class NewDeck<TCard, TSuit, TValue> 
+    where TCard: NewCard<TSuit, TValue>
+    where TSuit : struct, Enum
+    where TValue : struct, Enum
+{
+    public virtual int CurrentCount
+        => _cards.Count;
+    
+    public virtual int TotalCount { get; }
+
+    private readonly LinkedList<TCard> _cards = new();
+    public NewDeck()
+    {
+        var suits = Enum.GetValues<TSuit>();
+        var values = Enum.GetValues<TValue>();
+
+        TotalCount =  suits.Length * values.Length;
+        
+        foreach (var suit in suits)
+        {
+            foreach (var val in values)
+            {
+                _cards.AddLast((TCard)Activator.CreateInstance(typeof(TCard), suit, val)!);
+            }
+        }
+    }
+
+    public virtual TCard? Draw()
+    {
+        var first = _cards.First;
+        if (first is not null)
+        {
+            _cards.RemoveFirst();
+            return first.Value;
+        }
+
+        return null;
+    }
+
+    public virtual void Shuffle()
+    {
+        var cards = _cards.ToList();
+        cards.Shuffle();
+        
+        _cards.Clear();
+        foreach (var card in cards)
+            _cards.AddFirst(card);
+    }
+}

src/Nadeko.Econ/Deck/Regular/RegularCard.cs

@@ -0,0 +1,17 @@
+namespace Nadeko.Econ;
+
+public sealed class RegularCard : NewCard<RegularSuit, RegularValue>
+{
+    public RegularCard(RegularSuit suit, RegularValue value) : base(suit, value)
+    {
+    }
+
+    private bool Equals(RegularCard other)
+        => other.Suit == this.Suit && other.Value == this.Value;
+
+    public override bool Equals(object? obj)
+        => ReferenceEquals(this, obj) || obj is RegularCard other && Equals(other);
+
+    public override int GetHashCode()
+        => Suit.GetHashCode() * 17 + Value.GetHashCode();
+}

src/Nadeko.Econ/Deck/Regular/RegularDeck.cs

@@ -0,0 +1,5 @@
+namespace Nadeko.Econ;
+
+public sealed class RegularDeck : NewDeck<RegularCard, RegularSuit, RegularValue>
+{
+}

src/Nadeko.Econ/Deck/Regular/RegularSuit.cs

@@ -0,0 +1,9 @@
+namespace Nadeko.Econ;
+
+public enum RegularSuit
+{
+    Hearts,
+    Diamonds,
+    Clubs,
+    Spades
+}

src/Nadeko.Econ/Deck/Regular/RegularValue.cs

@@ -0,0 +1,18 @@
+namespace Nadeko.Econ;
+
+public enum RegularValue
+{
+    A = 1,
+    Two = 2,
+    Three = 3,
+    Four = 4,
+    Five = 5,
+    Six = 6,
+    Seven = 7,
+    Eight = 8,
+    Nine = 9,
+    Ten = 10,
+    Jack = 12,
+    Queen = 13,
+    King = 14,
+}

src/Nadeko.Econ/NewDeck.cs

@@ -1,35 +0,0 @@
-namespace Nadeko.Econ;
-
-public abstract class NewDeck<TCard, TSuit> 
-    where TCard: NewCard<TSuit> 
-    where TSuit : Enum
-{
-    public int CurrentCount { get; }
-    public int TotalCount { get; }
-
-    public abstract TCard Draw();
-}
-
-public abstract class NewCard<TSuit>
-    where TSuit: Enum
-{
-    
-}
-
-public sealed class RegularCard : NewCard<RegularSuit>
-{
-    
-}
-
-public enum RegularSuit
-{
-    
-}
-
-public sealed class RegularDeck : NewDeck<RegularCard, RegularSuit>
-{
-    public override RegularCard Draw()
-        => throw new NotImplementedException();
-}
-
-

src/NadekoBot.Tests/NadekoBot.Tests.csproj

@@ -15,6 +15,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />
+      <ProjectReference Include="..\Nadeko.Econ\Nadeko.Econ.csproj" />
       <ProjectReference Include="..\NadekoBot\NadekoBot.csproj" />
     </ItemGroup>
 

src/NadekoBot.Tests/NewDeckTests.cs

@@ -0,0 +1,51 @@
+using Nadeko.Econ;
+using NUnit.Framework;
+
+namespace NadekoBot.Tests;
+
+public class NewDeckTests
+{
+    private RegularDeck _deck;
+
+    [SetUp]
+    public void Setup()
+    {
+        _deck = new RegularDeck();
+    }
+
+    [Test]
+    public void TestCount()
+    {
+        Assert.AreEqual(52, _deck.TotalCount);
+        Assert.AreEqual(52, _deck.CurrentCount);
+    }
+    
+    [Test]
+    public void TestDeckDraw()
+    {
+        var card = _deck.Draw();
+        
+        Assert.IsNotNull(card);
+        Assert.AreEqual(card.Suit, RegularSuit.Hearts);
+        Assert.AreEqual(card.Value, RegularValue.A);
+        Assert.AreEqual(_deck.CurrentCount, _deck.TotalCount - 1);
+    }
+
+    [Test]
+    public void TestDeckSpent()
+    {
+        for (var i = 0; i < _deck.TotalCount - 1; ++i)
+        {
+            _deck.Draw();
+        }
+
+        var lastCard = _deck.Draw();
+        
+        Assert.IsNotNull(lastCard);
+        Assert.AreEqual(lastCard, new RegularCard(RegularSuit.Spades, RegularValue.King));
+
+        var noCard = _deck.Draw();
+        
+        Assert.IsNull(noCard);
+    }
+}