Fixed bug in CardDeck card count when including muck

Author: Nydauron

src/core/carddeck.rs

@@ -266,7 +266,7 @@ impl CardDeck {
     pub fn check_deal_cards(&self, cards_to_deal: usize, include_muck: bool) -> bool {
         let mut total_cards = self.deck.len();
         if include_muck {
-            total_cards = self.muck.len();
+            total_cards += self.muck.len();
         }
         total_cards >= cards_to_deal
     }
@@ -495,6 +495,46 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_calculate_cards_left_without_muck() {
+        let mut deck = CardDeck::new(None).expect("Deck could not be created");
+
+        deck.shuffle(None).expect("Deck could not be shuffled");
+
+        let enough_cards = [true, true, true, true, true, false];
+        const CARDS_TO_DEAL: usize = 10;
+        const INCLUDE_MUCK: bool = false;
+        for expect_enough_cards in enough_cards {
+            assert!(deck.check_deal_cards(CARDS_TO_DEAL, INCLUDE_MUCK) == expect_enough_cards);
+            if expect_enough_cards {
+                let drawn_cards = deck
+                    .deal_cards(CARDS_TO_DEAL, INCLUDE_MUCK)
+                    .expect("Cards could not be drawn");
+                deck.muck_cards(drawn_cards);
+            }
+        }
+    }
+
+    #[test]
+    fn test_calculate_cards_left_with_muck() {
+        let mut deck = CardDeck::new(None).expect("Deck could not be created");
+
+        deck.shuffle(None).expect("Deck could not be shuffled");
+
+        let enough_cards = [true, true, true, true, true, true];
+        const CARDS_TO_DEAL: usize = 10;
+        const INCLUDE_MUCK: bool = true;
+        for expect_enough_cards in enough_cards {
+            assert!(deck.check_deal_cards(CARDS_TO_DEAL, INCLUDE_MUCK) == expect_enough_cards);
+            if expect_enough_cards {
+                let drawn_cards = deck
+                    .deal_cards(CARDS_TO_DEAL, INCLUDE_MUCK)
+                    .expect("Cards could not be drawn");
+                deck.muck_cards(drawn_cards);
+            }
+        }
+    }
+
     // This test relies on random entropy seeding. By the very nature of random numbers and normal
     // curves, there will be a subset of runs that will fail since the actual percentage lands
     // outside if the bounds of the expected percentage (+/- 0.2%).