ECL cards, 6th January, batch 1 (Card-Forge#9422)

Fulgur14 · web-flow · commit 107c31cc08bf · 2026-01-06T11:45:33.000Z
diff --git a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java
@@ -544,10 +544,8 @@ protected boolean cantRegenerateCheckStack(Card host) {
                     if (subAbility.getTargets().contains(host)) {
                         return true;
                     }
-                } else {
-                    if (AbilityUtils.getDefinedObjects(subAbility.getHostCard(), subAbility.getParam("Defined"), subAbility).contains(host)) {
-                        return true;
-                    }
+                } else if (AbilityUtils.getDefinedObjects(subAbility.getHostCard(), subAbility.getParam("Defined"), subAbility).contains(host)) {
+                    return true;
                 }
 
                 if (CardUtil.getRadiance(subAbility).contains(host)) {
@@ -603,10 +601,8 @@ protected boolean cantRegenerateCheckStack(Card host) {
                     if (subAbility.getTargets().contains(host)) {
                         targeting = true;
                     }
-                } else {
-                    if (AbilityUtils.getDefinedObjects(subAbility.getHostCard(), subAbility.getParam("Defined"), subAbility).contains(host)) {
-                        targeting = true;
-                    }
+                } else if (AbilityUtils.getDefinedObjects(subAbility.getHostCard(), subAbility.getParam("Defined"), subAbility).contains(host)) {
+                    targeting = true;
                 }
 
                 for (Card source : definedSources) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
@@ -304,8 +304,8 @@ protected void resolvePerType(SpellAbility sa, Player placer, CounterType counte
                         options = options.replace(ct.getName(), "");
                     }
                     for (CounterType ct : typesToAdd) {
-                        if (obj instanceof Player) {
-                            ((Player) obj).addCounter(ct, counterAmount, placer, table);
+                        if (obj instanceof Player p) {
+                            p.addCounter(ct, counterAmount, placer, table);
                         }
                         if (obj instanceof Card) {
                             if (etbcounter) {
@@ -367,8 +367,8 @@ protected void resolvePerType(SpellAbility sa, Player placer, CounterType counte
                                 counterAmount = remaining;
                             }
                         }
-                        if (obj instanceof Player) {
-                            ((Player) obj).addCounter(ct, counterAmount, placer, table);
+                        if (obj instanceof Player p) {
+                            p.addCounter(ct, counterAmount, placer, table);
                         }
                         if (obj instanceof Card) {
                             if (etbcounter) {
@@ -393,8 +393,8 @@ protected void resolvePerType(SpellAbility sa, Player placer, CounterType counte
 
                     if (eachExistingCounter) {
                         for (CounterType ct : choices) {
-                            if (obj instanceof Player) {
-                                ((Player) obj).addCounter(ct, counterAmount, placer, table);
+                            if (obj instanceof Player p) {
+                                p.addCounter(ct, counterAmount, placer, table);
                             }
                             if (obj instanceof Card) {
                                 gameCard.addCounter(ct, counterAmount, placer, table);
@@ -600,8 +600,7 @@ public void resolve(SpellAbility sa) {
                 counterMapValue = Integer.valueOf(sa.getParam("CounterMapValues"));
             }
             @SuppressWarnings("unchecked")
-            Map<CounterType, Integer> counterMap = (Map<CounterType, Integer>) sa
-                    .getTriggeringObject(AbilityKey.CounterMap);
+            Map<CounterType, Integer> counterMap = (Map<CounterType, Integer>) sa.getTriggeringObject(AbilityKey.CounterMap);
             for (Map.Entry<CounterType, Integer> e : counterMap.entrySet()) {
                 resolvePerType(sa, placer, e.getKey(), counterMapValue == null ? e.getValue() : counterMapValue, table, false);
             }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
@@ -68,8 +68,10 @@ public void resolve(SpellAbility sa) {
 
             if (abMana.isComboMana()) {
                 int amount = sa.hasParam("Amount") ? AbilityUtils.calculateAmount(host, sa.getParam("Amount"), sa) : 1;
-                if (amount <= 0)
+                int each = sa.hasParam("Each") ? AbilityUtils.calculateAmount(host, sa.getParam("Each"), sa) : 1;
+                if (amount <= 0 || each <= 0) {
                     continue;
+                }
 
                 String combo = abMana.getComboColors(sa);
                 if (combo.isBlank()) {
@@ -84,7 +86,7 @@ public void resolve(SpellAbility sa) {
                 final StringBuilder choiceString = new StringBuilder();
                 final StringBuilder choiceSymbols = new StringBuilder();
                 // Use specifyManaCombo if possible
-                if (colorsNeeded == null && amount > 1 && !sa.hasParam("TwoEach")) {
+                if (colorsNeeded == null && amount > 1 && !sa.hasParam("Each")) {
                     Map<Byte, Integer> choices = chooser.getController().specifyManaCombo(sa, colorOptions, amount, differentChoice);
                     for (Map.Entry<Byte, Integer> e : choices.entrySet()) {
                         Byte chosenColor = e.getKey();
@@ -123,14 +125,15 @@ public void resolve(SpellAbility sa) {
                             choice = MagicColor.toShortString(chosenColor);
                         }
 
-                        if (nMana > 0) {
-                            choiceString.append(" ");
-                        }
-                        choiceString.append(choice);
-                        choiceSymbols.append(MagicColor.toSymbol(choice));
-                        if (sa.hasParam("TwoEach")) {
-                            choiceString.append(" ").append(choice);
-                            choiceSymbols.append(MagicColor.toSymbol(choice));
+                        String symbol = MagicColor.toSymbol(choice);
+                        int count = each;
+                        while (count > 0) {
+                            if (choiceString.length() > 0) {
+                                choiceString.append(" ");
+                            }
+                            choiceString.append(choice);
+                            choiceSymbols.append(symbol);
+                            --count;
                         }
                     }
                 }
@@ -148,13 +151,12 @@ else if (abMana.isAnyMana()) {
 
                 String colorsNeeded = abMana.getExpressChoice();
 
-                ColorSet colorMenu = null;
                 byte mask = 0;
                 //loop through colors to make menu
                 for (int nChar = 0; nChar < colorsNeeded.length(); nChar++) {
                     mask |= MagicColor.fromName(colorsNeeded.charAt(nChar));
                 }
-                colorMenu = mask == 0 ? ColorSet.WUBRG : ColorSet.fromMask(mask);
+                ColorSet colorMenu = mask == 0 ? ColorSet.WUBRG : ColorSet.fromMask(mask);
                 byte val = chooser.getController().chooseColor(Localizer.getInstance().getMessage("lblSelectManaProduce"), sa, colorMenu);
                 if (0 == val) {
                     throw new RuntimeException("ManaEffect::resolve() /*any mana*/ - " + p + " color mana choice is empty for " + host.getName());
diff --git a/forge-gui/res/cardsfolder/n/nexos.txt b/forge-gui/res/cardsfolder/n/nexos.txt
@@ -3,6 +3,6 @@ ManaCost:1 G
 Types:Creature Human Tyranid Advisor
 PT:2/2
 S:Mode$ Continuous | Affected$ Land.Basic+YouCtrl | AddAbility$ Mana | Description$ Strategic Coordinator — Basic lands you control have "{T}: Add {C}{C}. Spend this mana only on costs that contain {X}."
-SVar:Mana:AB$ Mana | Cost$ T | Produced$ Any | Produced$ C | Amount$ 2 | RestrictValid$ CostContainsX | SpellDescription$ Add {C}{C}. Spend this mana only on costs that contain {X}.
+SVar:Mana:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ CostContainsX | SpellDescription$ Add {C}{C}. Spend this mana only on costs that contain {X}.
 AI:RemoveDeck:Random
 Oracle:Strategic Coordinator — Basic lands you control have "{T}: Add {C}{C}. Spend this mana only on costs that contain {X}."
diff --git a/forge-gui/res/cardsfolder/o/open_the_omenpaths.txt b/forge-gui/res/cardsfolder/o/open_the_omenpaths.txt
@@ -2,7 +2,7 @@ Name:Open the Omenpaths
 ManaCost:2 R
 Types:Instant
 A:SP$ Charm | Choices$ Mana,Pump
-SVar:Mana:DB$ Mana | Amount$ 2 | TwoEach$ True | Produced$ Combo AnyDifferent | RestrictValid$ Spell.Creature,Spell.Enchantment | SpellDescription$ Add two mana of any one color and two mana of any other color. Spend this mana only to cast creature or enchantment spells.
+SVar:Mana:DB$ Mana | Amount$ 2 | Each$ 2 | Produced$ Combo AnyDifferent | RestrictValid$ Spell.Creature,Spell.Enchantment | SpellDescription$ Add two mana of any one color and two mana of any other color. Spend this mana only to cast creature or enchantment spells.
 SVar:Pump:DB$ PumpAll | NumAtt$ +1 | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control get +1/+0 until end of turn.
 DeckHints:Type$Enchantment|Creature
 Oracle:Choose one —\n• Add two mana of any one color and two mana of any other color. Spend this mana only to cast creature or enchantment spells.\n• Creatures you control get +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sygg_wanderwine_wisdom_sygg_wanderbrine_shield.txt b/forge-gui/res/cardsfolder/s/sygg_wanderwine_wisdom_sygg_wanderbrine_shield.txt
@@ -2,7 +2,7 @@ Name:Sygg, Wanderwine Wisdom
 ManaCost:1 U
 Types:Legendary Creature Merfolk Wizard
 PT:2/2
-S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ NICKNAME can't be blocked.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ Whenever this creature enters or transforms into CARDNAME, target creature gains "Whenever this creature deals combat damage to a player or planeswalker, draw a card" until end of turn.
 T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ TrigAnimate | Secondary$ True | TriggerDescription$ Whenever this creature enters or transforms into CARDNAME, target creature gains "Whenever this creature deals combat damage to a player or planeswalker, draw a card" until end of turn.
 SVar:TrigAnimate:DB$ Animate | ValidTgts$ Creature | Triggers$ DamageTrig
@@ -20,7 +20,7 @@ ManaCost:no cost
 Colors:white
 Types:Legendary Creature Merfolk Rogue
 PT:2/2
-S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ NICKNAME can't be blocked.
 T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ TrigProt | TriggerDescription$ Whenever this creature transforms into CARDNAME, target creature you control gains protection from each color until your next turn.
 SVar:TrigProt:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Protection from each color | Duration$ UntilYourNextTurn
 T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of your first main phase, you may pay {U}. If you do, transform NICKNAME.
diff --git a/forge-gui/res/cardsfolder/upcoming/aurora_awakener.txt b/forge-gui/res/cardsfolder/upcoming/aurora_awakener.txt
@@ -0,0 +1,9 @@
+Name:Aurora Awakener
+ManaCost:6 G
+Types:Creature Giant Druid
+PT:7/7
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDigUntil | TriggerDescription$ Vivid — When this creature enters, reveal cards from the top of your library until you reveal X permanent cards, where X is the number of colors among permanents you control. Put any number of those permanents onto the battlefield, then put the rest of the revealed cards on the bottom of your libray in a random order.
+SVar:TrigDigUntil:DB$ DigUntil | Amount$ X | Valid$ Permanent | ValidDescription$ permanent | RevealedDestination$ Library | OptionalFoundMove$ True | RevealedLibraryPosition$ -1 | FoundDestination$ Battlefield | RevealRandomOrder$ True
+SVar:X:Count$Valid Permanent.YouCtrl$Colors
+Oracle:Trample\nVivid — When this creature enters, reveal cards from the top of your library until you reveal X permanent cards, where X is the number of colors among permanents you control. Put any number of those permanents onto the battlefield, then put the rest of the revealed cards on the bottom of your libray in a random order.
diff --git a/forge-gui/res/cardsfolder/upcoming/bloodline_bidding.txt b/forge-gui/res/cardsfolder/upcoming/bloodline_bidding.txt
@@ -0,0 +1,7 @@
+Name:Bloodline Bidding
+ManaCost:6 B B
+Types:Sorcery
+K:Convoke
+A:SP$ ChooseType | Defined$ You | Type$ Creature | SubAbility$ DBChangeZoneAll | AILogic$ MostProminentInComputerGraveyard | SpellDescription$ Choose a creature type. Return all creature cards of the chosen type from your graveyard to the battlefield.
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Creature.ChosenType+YouOwn | Origin$ Graveyard | Destination$ Battlefield
+Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nChoose a creature type. Return all creature cards of the chosen type from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/blossombind.txt b/forge-gui/res/cardsfolder/upcoming/blossombind.txt
@@ -0,0 +1,10 @@
+Name:Blossombind
+ManaCost:1 U
+Types:Enchantment Aura
+K:Enchant:Creature
+SVar:AttachAILogic:Curse
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When this Aura enters, tap enchanted creature.
+SVar:TrigTap:DB$ Tap | Defined$ Enchanted
+R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy | Layer$ CantHappen | Description$ Enchanted creature can't become untapped and can't have counters put on it.
+S:Mode$ CantPutCounter | ValidCard$ Card.EnchantedBy | Secondary$ True | Description$ Enchanted creature can't become untapped and can't have counters put on it.
+Oracle:Enchant creature\nWhen this Aura enters, tap enchanted creature.\nEnchanted creature can't become untapped and can't have counters put on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/boggart_cursecrafter.txt b/forge-gui/res/cardsfolder/upcoming/boggart_cursecrafter.txt
@@ -0,0 +1,9 @@
+Name:Boggart Cursecrafter
+ManaCost:B R
+Types:Creature Goblin Warlock
+PT:2/3
+K:Deathtouch
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Goblin.Other+YouCtrl | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever another Goblin you control dies, this creature deals 1 damage to each opponent.
+SVar:TrigDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 1
+DeckHints:Type$Goblin
+Oracle:Deathtouch\nWhenever another Goblin you control dies, this creature deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/boggart_mischief.txt b/forge-gui/res/cardsfolder/upcoming/boggart_mischief.txt
@@ -0,0 +1,10 @@
+Name:Boggart Mischief
+ManaCost:2 B
+Types:Kindred Enchantment Goblin
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this enchantment enters, you may blight 1. If you do, create two 1/1 black and red Goblin creature tokens. (To blight 1, put a -1/-1 counter on a creature you control.)
+SVar:TrigToken:AB$ Token | Cost$ Blight<1> | TokenAmount$ 2 | TokenScript$ br_1_1_goblin | TokenOwner$ You
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Goblin+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a Goblin creature you control dies, each opponent loses 1 life and you gain 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+AI:RemoveDeck:Random
+Oracle:When this enchantment enters, you may blight 1. If you do, create two 1/1 black and red Goblin creature tokens. (To blight 1, put a -1/-1 counter on a creature you control.)\nWhenever a Goblin creature you control dies, each opponent loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/boggart_prankster.txt b/forge-gui/res/cardsfolder/upcoming/boggart_prankster.txt
@@ -0,0 +1,8 @@
+Name:Boggart Prankster
+ManaCost:1 B
+Types:Creature Goblin Warrior
+PT:1/1
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target attacking Goblin you control gets +1/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Goblin.attacking+YouCtrl | TgtPrompt$ Select target attacking Goblin you control | NumAtt$ +1
+DeckHints:Type$Goblin
+Oracle:Whenever you attack, target attacking Goblin you control gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/bogslithers_embrace.txt b/forge-gui/res/cardsfolder/upcoming/bogslithers_embrace.txt
@@ -0,0 +1,7 @@
+Name:Bogslither's Embrace
+ManaCost:1 B
+Types:Sorcery
+K:AlternateAdditionalCost:Blight<1>:3
+A:SP$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
+DeckHas:Ability$Counters
+Oracle:As an additional cost to cast this spell, blight 1 or pay {3}. (To blight 1, put a -1/-1 counter on a creature you control.)\nExile target creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/boneclub_berserker.txt b/forge-gui/res/cardsfolder/upcoming/boneclub_berserker.txt
@@ -0,0 +1,8 @@
+Name:Boneclub Berserker
+ManaCost:3 R
+Types:Creature Goblin Berserker
+PT:2/4
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | Description$ This creature gets +2/+0 for each other Goblin you control.
+SVar:X:Count$Valid Goblin.Other+YouCtrl/Twice
+DeckHints:Type$Goblin
+Oracle:This creature gets +2/+0 for each other Goblin you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/brambleback_brute.txt b/forge-gui/res/cardsfolder/upcoming/brambleback_brute.txt
@@ -0,0 +1,7 @@
+Name:Brambleback Brute
+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.
+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.
diff --git a/forge-gui/res/cardsfolder/upcoming/bre_of_clan_stoutarm.txt b/forge-gui/res/cardsfolder/upcoming/bre_of_clan_stoutarm.txt
@@ -0,0 +1,13 @@
+Name:Bre of Clan Stoutarm
+ManaCost:2 R W
+Types:Legendary Creature Giant Warrior
+PT:4/4
+A:AB$ Pump | Cost$ 1 W T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | KW$ Flying & Lifelink | SpellDescription$ Another target creature you control gains flying and lifelink until end of turn.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | Execute$ TrigChangeZone | TriggerDescription$ At the beginning of your end step, if you gained life this turn, exile cards from the top of your library until you exile a nonland card. You may cast that card without paying its mana cost if the spell's mana value is less than or equal to the amount of life you gained this turn. Otherwise, put it into your hand.
+SVar:TrigDigUntil:DB$ DigUntil | Valid$ Card.nonLand | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBPlay
+SVar:DBPlay:DB$ Play | Defined$ Remembered | ValidSA$ Spell.cmcLEX | WithoutManaCost$ True | Optional$ True | ForgetPlayed$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ Remembered | DefinedDesc$ that card | ForgetChanged$ True | ConditionDescription$ If not,
+SVar:X:Count$LifeYouGainedThisTurn
+DeckHas:Ability$LifeGain
+DeckHints:Ability$LifeGain
+Oracle:{1}{W}, {T}: Another target creature you control gains flying and lifelink until end of turn.\nAt the beginning of your end step, if you gained life this turn, exile cards from the top of your library until you exile a nonland card. You may cast that card without paying its mana cost if the spell's mana value is less than or equal to the amount of life you gained this turn. Otherwise, put it into your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/brigid_clachans_heart_brigid_douns_mind.txt b/forge-gui/res/cardsfolder/upcoming/brigid_clachans_heart_brigid_douns_mind.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/bristlebane_battler.txt b/forge-gui/res/cardsfolder/upcoming/bristlebane_battler.txt
diff --git a/forge-gui/res/tokenscripts/br_1_1_goblin.txt b/forge-gui/res/tokenscripts/br_1_1_goblin.txt
diff --git a/forge-gui/res/tokenscripts/gw_1_1_kithkin.txt b/forge-gui/res/tokenscripts/gw_1_1_kithkin.txt
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java

Original file line number	Diff line number	Diff line change
`@@ -544,10 +544,8 @@ protected boolean cantRegenerateCheckStack(Card host) {`
`544`	`544`	`if (subAbility.getTargets().contains(host)) {`
`545`	`545`	`return true;`
`546`	`546`	`}`
`547`		`- } else {`
`548`		`- if (AbilityUtils.getDefinedObjects(subAbility.getHostCard(), subAbility.getParam("Defined"), subAbility).contains(host)) {`
`549`		`- return true;`
`550`		`- }`
	`547`	`+ } else if (AbilityUtils.getDefinedObjects(subAbility.getHostCard(), subAbility.getParam("Defined"), subAbility).contains(host)) {`
	`548`	`+ return true;`
`551`	`549`	`}`
`552`	`550`
`553`	`551`	`if (CardUtil.getRadiance(subAbility).contains(host)) {`
`@@ -603,10 +601,8 @@ protected boolean cantRegenerateCheckStack(Card host) {`
`603`	`601`	`if (subAbility.getTargets().contains(host)) {`
`604`	`602`	`targeting = true;`
`605`	`603`	`}`
`606`		`- } else {`
`607`		`- if (AbilityUtils.getDefinedObjects(subAbility.getHostCard(), subAbility.getParam("Defined"), subAbility).contains(host)) {`
`608`		`- targeting = true;`
`609`		`- }`
	`604`	`+ } else if (AbilityUtils.getDefinedObjects(subAbility.getHostCard(), subAbility.getParam("Defined"), subAbility).contains(host)) {`
	`605`	`+ targeting = true;`
`610`	`606`	`}`
`611`	`607`
`612`	`608`	`for (Card source : definedSources) {`
Original file line number	Diff line number	Diff line change
`@@ -304,8 +304,8 @@ protected void resolvePerType(SpellAbility sa, Player placer, CounterType counte`
`304`	`304`	`options = options.replace(ct.getName(), "");`
`305`	`305`	`}`
`306`	`306`	`for (CounterType ct : typesToAdd) {`
`307`		`- if (obj instanceof Player) {`
`308`		`- ((Player) obj).addCounter(ct, counterAmount, placer, table);`
	`307`	`+ if (obj instanceof Player p) {`
	`308`	`+ p.addCounter(ct, counterAmount, placer, table);`
`309`	`309`	`}`
`310`	`310`	`if (obj instanceof Card) {`
`311`	`311`	`if (etbcounter) {`
`@@ -367,8 +367,8 @@ protected void resolvePerType(SpellAbility sa, Player placer, CounterType counte`
`367`	`367`	`counterAmount = remaining;`
`368`	`368`	`}`
`369`	`369`	`}`
`370`		`- if (obj instanceof Player) {`
`371`		`- ((Player) obj).addCounter(ct, counterAmount, placer, table);`
	`370`	`+ if (obj instanceof Player p) {`
	`371`	`+ p.addCounter(ct, counterAmount, placer, table);`
`372`	`372`	`}`
`373`	`373`	`if (obj instanceof Card) {`
`374`	`374`	`if (etbcounter) {`
`@@ -393,8 +393,8 @@ protected void resolvePerType(SpellAbility sa, Player placer, CounterType counte`
`393`	`393`
`394`	`394`	`if (eachExistingCounter) {`
`395`	`395`	`for (CounterType ct : choices) {`
`396`		`- if (obj instanceof Player) {`
`397`		`- ((Player) obj).addCounter(ct, counterAmount, placer, table);`
	`396`	`+ if (obj instanceof Player p) {`
	`397`	`+ p.addCounter(ct, counterAmount, placer, table);`
`398`	`398`	`}`
`399`	`399`	`if (obj instanceof Card) {`
`400`	`400`	`gameCard.addCounter(ct, counterAmount, placer, table);`
`@@ -600,8 +600,7 @@ public void resolve(SpellAbility sa) {`
`600`	`600`	`counterMapValue = Integer.valueOf(sa.getParam("CounterMapValues"));`
`601`	`601`	`}`
`602`	`602`	`@SuppressWarnings("unchecked")`
`603`		`- Map<CounterType, Integer> counterMap = (Map<CounterType, Integer>) sa`
`604`		`- .getTriggeringObject(AbilityKey.CounterMap);`
	`603`	`+ Map<CounterType, Integer> counterMap = (Map<CounterType, Integer>) sa.getTriggeringObject(AbilityKey.CounterMap);`
`605`	`604`	`for (Map.Entry<CounterType, Integer> e : counterMap.entrySet()) {`
`606`	`605`	`resolvePerType(sa, placer, e.getKey(), counterMapValue == null ? e.getValue() : counterMapValue, table, false);`
`607`	`606`	`}`