CostRemoveAnyCounter: cleanup description (Card-Forge#9997)

* CostRemoveAnyCounter: cleanup description

* refactor mapMultiToInt into flatMap

Author: Hanmac

forge-ai/src/main/java/forge/ai/AiCostDecision.java

@@ -589,7 +589,12 @@ public PaymentDecision visit(CostRemoveAnyCounter cost) {
             return null;
         }
 
-        CardCollectionView typeList = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), cost.getType().split(";"), player, source, ability);
+        CardCollectionView typeList;
+        if (cost.payCostFromSource()) {
+            typeList = new CardCollection(ability.getHostCard());
+        } else {
+            typeList = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), cost.getType().split(";"), player, source, ability);
+        }
         // only cards with counters are of interest
         typeList = CardLists.filter(typeList, CardPredicates.hasCounters());
 

forge-core/src/main/java/forge/util/Lang.java

@@ -221,7 +221,10 @@ public String getNickName(final String name) {
     }
 
     public String buildValidDesc(Collection<String> valid, boolean multiple) {
-        return joinHomogenous(valid.stream().map(s -> formatValidDesc(s)).collect(Collectors.toList()), null, multiple ? "and/or" : "or");
+        return buildValidDesc(valid, multiple ? "and/or" : "or");
+    }
+    public String buildValidDesc(Collection<String> valid, String join) {
+        return joinHomogenous(valid.stream().map(s -> formatValidDesc(s)).collect(Collectors.toList()), null, join);
     }
 
     public String formatValidDesc(String valid) {

forge-game/src/main/java/forge/game/cost/CostPart.java

@@ -106,7 +106,7 @@ public final String getTypeDescription() {
         return this.typeDescription;
     }
 
-    public final String getDescriptiveType() {
+    public String getDescriptiveType() {
         String typeDesc = this.getTypeDescription();
         if (typeDesc == null) {
             String typeS = this.getType();

forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java

@@ -17,19 +17,25 @@
  */
 package forge.game.cost;
 
+import forge.card.CardType;
 import forge.game.GameEntity;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardCollection;
 import forge.game.card.CardCollectionView;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
+import forge.util.Lang;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * The Class CostRemoveAnyCounter.
@@ -65,24 +71,19 @@ public CostRemoveAnyCounter(final String amount, final CounterType counter, fina
     public Integer getMaxAmountX(final SpellAbility ability, final Player payer, final boolean effect) {
         final Card source = ability.getHostCard();
 
-        CardCollectionView validCards = CardLists.getValidCards(payer.getCardsIn(ZoneType.Battlefield), this.getType().split(";"), payer, source, ability);
-        int allCounters = 0;
-        for (Card c : validCards) {
-            if (this.counter != null) {
-                if (!c.canRemoveCounters(this.counter)) {
-                    continue;
-                }
-                allCounters += c.getCounters(this.counter);
-            } else {
-                for (Map.Entry<CounterType, Integer> entry : c.getCounters().entrySet()) {
-                    if (!c.canRemoveCounters(entry.getKey())) {
-                        continue;
-                    }
-                    allCounters += entry.getValue();
-                }
-            }
+        CardCollectionView validCards;
+        if (payCostFromSource()) {
+            validCards = new CardCollection(source);
+        } else {
+            validCards = CardLists.getValidCards(payer.getCardsIn(ZoneType.Battlefield), this.getType().split(";"), payer, source, ability);
         }
-        return allCounters;
+        if (this.counter != null) {
+            return validCards.stream().mapToInt(c -> c.canRemoveCounters(this.counter) ? c.getCounters(this.counter) : 0).sum();
+        }
+        // use flatMap instead of mapMulti for Android 13 and below
+        //https://developer.android.com/reference/java/util/stream/Stream#mapMulti
+        return validCards.stream().flatMap(c -> c.getCounters().entrySet().stream().filter(e -> c.canRemoveCounters(e.getKey())))
+                .collect(Collectors.summingInt(e -> e.getValue()));
     }
 
     /*
@@ -107,16 +108,24 @@ public final String toString() {
         final StringBuilder sb = new StringBuilder();
 
         final String counters =  this.counter == null ? "counter" : this.counter.getName().toLowerCase() + " counter";
-        final String desc = this.getTypeDescription() == null ? this.getType() : this.getTypeDescription();
+        boolean multiple = !"1".equals(getAmount());
 
         sb.append("Remove ");
         if (oneOrMore) {
-            sb.append("one or more ").append(counters).append("s");
+            sb.append("one or more ").append(Lang.getPlural(counters));
         } else {
             sb.append(Cost.convertAmountTypeToWords(this.convertAmount(), this.getAmount(), counters));
-            sb.append(this.getAmount().equals("1") ? "" : "s");
         }
-        sb.append(" from ").append(desc).append(" you control");
+        sb.append(" from ");
+        if (payCostFromSource()) { // TODO use THISTYPE
+            sb.append(getDescriptiveType(multiple));
+        } else {
+            if (multiple) {
+                sb.append(" among ");
+            }
+            sb.append(getDescriptiveType(multiple));
+            sb.append(" you control");
+        }
 
         return sb.toString();
     }
@@ -138,8 +147,26 @@ public boolean payAsDecided(Player ai, PaymentDecision decision, SpellAbility ab
         return true;
     }
 
+
+    public String getDescriptiveType(boolean multiple) {
+        String typeDesc = this.getTypeDescription();
+        if (typeDesc == null) {
+            if (payCostFromSource()) {
+                return getType();
+            }
+            Collection<String> types = Arrays.asList(getType().split(";"));
+            if (multiple)
+                types = types.stream().map(CardType::getPluralType).collect(Collectors.toList());
+            typeDesc = Lang.getInstance().buildValidDesc(types, multiple);
+        }
+        if (!multiple && !typeDesc.startsWith("an")) { // skip adding to "another"
+            typeDesc = (Lang.startsWithVowel(typeDesc) ? "an " : "a ") + typeDesc;
+        }
+        return typeDesc;
+    }
+
+    @Override
     public <T> T accept(ICostVisitor<T> visitor) {
         return visitor.visit(this);
     }
-
 }

forge-gui/res/cardsfolder/b/brambleback_brute.txt

@@ -3,5 +3,5 @@ ManaCost:2 R
 Types:Creature Giant Warrior
 PT:4/5
 K:etbCounter:M1M1:2
-A:AB$ Pump | Cost$ 1 R RemoveAnyCounter<1/Any/Card.Self/this creature> | ValidTgts$ Creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SorcerySpeed$ True | SpellDescription$ Target creature can't block this turn. Activate only as a sorcery.
+A:AB$ Pump | Cost$ 1 R RemoveAnyCounter<1/Any/CARDNAME/this creature> | ValidTgts$ Creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SorcerySpeed$ True | SpellDescription$ Target creature can't block this turn. Activate only as a sorcery.
 Oracle:This creature enters with two -1/-1 counters on it.\n{1}{R}, Remove a counter from this creature: Target creature can't block this turn. Activate only as a sorcery.

forge-gui/res/cardsfolder/b/burdened_stoneback.txt

@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Giant Warrior
 PT:4/4
 K:etbCounter:M1M1:2
-A:AB$ Pump | Cost$ 1 W RemoveAnyCounter<1/Any/Card.Self/this creature> | ValidTgts$ Creature | KW$ Indestructible | SorcerySpeed$ True | SpellDescription$ Target creature gains indestructible until end of turn. Activate only as a sorcery. (Damage and effects that say "destroy" don't destroy it. If its toughness is 0 or less, it still dies.)
+A:AB$ Pump | Cost$ 1 W RemoveAnyCounter<1/Any/CARDNAME/this creature> | ValidTgts$ Creature | KW$ Indestructible | SorcerySpeed$ True | SpellDescription$ Target creature gains indestructible until end of turn. Activate only as a sorcery. (Damage and effects that say "destroy" don't destroy it. If its toughness is 0 or less, it still dies.)
 Oracle:This creature enters with two -1/-1 counters on it.\n{1}{W}, Remove a counter from this creature: Target creature gains indestructible until end of turn. Activate only as a sorcery. (Damage and effects that say "destroy" don't destroy it. If its toughness is 0 or less, it still dies.)

forge-gui/res/cardsfolder/c/chisei_heart_of_oceans.txt

@@ -4,7 +4,7 @@ Types:Legendary Creature Spirit
 PT:4/4
 K:Flying
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you remove a counter from a permanent you control.
-SVar:TrigSac:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ RemoveAnyCounter<1/Any/Permanent.YouCtrl/a permanent you control>
+SVar:TrigSac:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ RemoveAnyCounter<1/Any/Permanent>
 SVar:NeedsToPlay:Creature.YouCtrl+HasCounters
 SVar:AIRemoveCounterCostPriority:ANY
 DeckNeeds:Ability$Counters

forge-gui/res/cardsfolder/d/dawnhand_dissident.txt

@@ -4,5 +4,5 @@ Types:Creature Elf Warlock
 PT:1/2
 A:AB$ Surveil | Cost$ T Blight<1> | Amount$ 1 | SpellDescription$ Surveil 1.
 A:AB$ ChangeZone | Cost$ T Blight<2> | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
-S:Mode$ Continuous | Affected$ Creature.YouOwn+ExiledWithSource | Condition$ PlayerTurn | MayPlay$ True | EffectZone$ Battlefield | AffectedZone$ Exile | RaiseCost$ RemoveAnyCounter<3/Any/Creature.YouCtrl/among creatures you control> | Description$ During your turn, you may cast creature spells from among cards you own exiled with this creature by removing three counters from among creatures you control in addition to paying their other costs.
+S:Mode$ Continuous | Affected$ Creature.YouOwn+ExiledWithSource | Condition$ PlayerTurn | MayPlay$ True | EffectZone$ Battlefield | AffectedZone$ Exile | RaiseCost$ RemoveAnyCounter<3/Any/Creature> | Description$ During your turn, you may cast creature spells from among cards you own exiled with this creature by removing three counters from among creatures you control in addition to paying their other costs.
 Oracle:{T}, Blight 1: Surveil 1.\n{T}, Blight 2: Exile target card from a graveyard.\nDuring your turn, you may cast creature spells from among cards you own exiled with this creature by removing three counters from among creatures you control in addition to paying their other costs.

forge-gui/res/cardsfolder/d/duchess_wayward_tavernkeep.txt

@@ -4,6 +4,6 @@ Types:Legendary Creature Human Citizen
 PT:4/3
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Hunters for Hire — Whenever a creature you control deals combat damage to a player, put a quest counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ QUEST | CounterNum$ 1
-A:AB$ Token | Cost$ 1 RemoveAnyCounter<1/QUEST/Permanent.YouCtrl/among permanents you control> | TokenScript$ c_a_junk_sac_exileplay | SpellDescription$ Create a Junk token. (It's an artifact with "{T}, Sacrifice this artifact: Exile the top card of your library. You may play that card this turn. Activate only as a sorcery.")
+A:AB$ Token | Cost$ 1 RemoveAnyCounter<1/QUEST/Permanent> | TokenScript$ c_a_junk_sac_exileplay | SpellDescription$ Create a Junk token. (It's an artifact with "{T}, Sacrifice this artifact: Exile the top card of your library. You may play that card this turn. Activate only as a sorcery.")
 DeckHas:Ability$Counters|Token & Type$Junk|Artifact
 Oracle:Hunters for Hire — Whenever a creature you control deals combat damage to a player, put a quest counter on it.\n{1}, Remove a quest counter from a permanent you control: Create a Junk token. (It's an artifact with "{T}, Sacrifice this artifact: Exile the top card of your library. You may play that card this turn. Activate only as a sorcery.")

forge-gui/res/cardsfolder/f/fain_the_broker.txt

@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Legendary Creature Human Warlock
 PT:3/3
 A:AB$ PutCounter | Cost$ T Sac<1/Creature> | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature.
-A:AB$ Token | Cost$ T RemoveAnyCounter<1/Any/Creature.YouCtrl/a creature you control> | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token.
+A:AB$ Token | Cost$ T RemoveAnyCounter<1/Any/Creature> | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token.
 A:AB$ Token | Cost$ T Sac<1/Artifact> | TokenScript$ wb_2_1_inkling_flying | SpellDescription$ Create a 2/1 white and black Inkling creature token with flying.
 A:AB$ Untap | Cost$ 3 B | SpellDescription$ Untap CARDNAME.
 DeckHas:Ability$Sacrifice|Counters|Token