From c4f8d93cb958b3932b8d22c14fad806d89172843 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Sun, 6 Sep 2020 20:17:25 -0400
Subject: [PATCH] added count to card type hints

---
 Mage.Sets/src/mage/cards/n/NighthawkScavenger.java | 14 ++++++++++----
 Mage.Sets/src/mage/cards/t/Tarmogoyf.java          | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/n/NighthawkScavenger.java b/Mage.Sets/src/mage/cards/n/NighthawkScavenger.java
index 3a9cf514f22..421a07b3a34 100644
--- a/Mage.Sets/src/mage/cards/n/NighthawkScavenger.java
+++ b/Mage.Sets/src/mage/cards/n/NighthawkScavenger.java
@@ -21,6 +21,7 @@ import mage.game.Game;
 import mage.players.Player;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -101,7 +102,7 @@ enum NighthawkScavengerHint implements Hint {
 
     @Override
     public String getText(Game game, Ability ability) {
-        String types = game
+        List<String> types = game
                 .getOpponents(ability.getControllerId())
                 .stream()
                 .map(game::getPlayer)
@@ -114,9 +115,14 @@ enum NighthawkScavengerHint implements Hint {
                 .distinct()
                 .map(CardType::toString)
                 .sorted()
-                .reduce((s1, s2) -> s1 + ", " + s2)
-                .orElse("None");
-        return "Card types in opponents' graveyards: " + types;
+                .collect(Collectors.toList());
+        String message = "" + types.size();
+        if (types.size() > 0) {
+            message += " (";
+            message += types.stream().reduce((a, b) -> a + ", " + b);
+            message += ')';
+        }
+        return "Card types in opponents' graveyards: " + message;
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/t/Tarmogoyf.java b/Mage.Sets/src/mage/cards/t/Tarmogoyf.java
index 335b00fbe2e..ba3933ab39c 100644
--- a/Mage.Sets/src/mage/cards/t/Tarmogoyf.java
+++ b/Mage.Sets/src/mage/cards/t/Tarmogoyf.java
@@ -14,6 +14,7 @@ import mage.game.Game;
 import mage.players.Player;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author Plopman
@@ -89,7 +90,7 @@ enum TarmogoyfHint implements Hint {
 
     @Override
     public String getText(Game game, Ability ability) {
-        String types = game.getState()
+        List<String> types = game.getState()
                 .getPlayersInRange(ability.getControllerId(), game)
                 .stream()
                 .map(game::getPlayer)
@@ -102,9 +103,14 @@ enum TarmogoyfHint implements Hint {
                 .distinct()
                 .map(CardType::toString)
                 .sorted()
-                .reduce((s1, s2) -> s1 + ", " + s2)
-                .orElse("None");
-        return "Card types in graveyards: " + types;
+                .collect(Collectors.toList());
+        String message = "" + types.size();
+        if (types.size() > 0) {
+            message += " (";
+            message += types.stream().reduce((a, b) -> a + ", " + b);
+            message += ')';
+        }
+        return "Card types in graveyards: " + message;
     }
 
     @Override