From b9fa82f602ef138e16d5779cabf0da27496d1d14 Mon Sep 17 00:00:00 2001 From: jmlundeen Date: Sat, 22 Feb 2025 14:13:08 -0600 Subject: [PATCH] Replace unnecessary custom hint class with ValueHint --- .../common/CardsInExileCount.java | 35 ++----------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInExileCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInExileCount.java index 6db633c0c2f..851747f81a8 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInExileCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsInExileCount.java @@ -4,16 +4,14 @@ import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.hint.Hint; +import mage.abilities.hint.ValueHint; import mage.cards.Card; -import mage.constants.CardType; import mage.game.Game; import java.util.Collection; import java.util.Collections; -import java.util.List; import java.util.Objects; import java.util.UUID; -import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -25,11 +23,11 @@ public enum CardsInExileCount implements DynamicValue { OPPONENTS("your opponents'"); private final String message; - private final CardsInExileHint hint; + private final ValueHint hint; CardsInExileCount(String message) { this.message = "The number of cards owned by " + message + " in exile"; - this.hint = new CardsInExileHint(this); + this.hint = new ValueHint(this.message, this); } @Override @@ -80,31 +78,4 @@ public enum CardsInExileCount implements DynamicValue { .flatMap(Collection::stream) .filter(Objects::nonNull); } -} - -class CardsInExileHint implements Hint { - - CardsInExileCount value; - - CardsInExileHint(CardsInExileCount value) { - this.value = value; - } - - private CardsInExileHint(final CardsInExileHint hint) { - this.value = hint.value; - } - - @Override - public String getText(Game game, Ability ability) { - int count = value.getExileCards(game, ability) - .mapToInt(x -> 1) - .sum(); - - return this.value.getMessage() + ": " + count; - } - - @Override - public CardsInExileHint copy() { - return new CardsInExileHint(this); - } } \ No newline at end of file