From b4bd10727570c8aaae2ca7d31b96abfb3c47ff87 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Thu, 12 Sep 2024 19:56:58 -0400 Subject: [PATCH] correction on Arabella, Abandoned Doll --- .../src/mage/cards/a/ArabellaAbandonedDoll.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/ArabellaAbandonedDoll.java b/Mage.Sets/src/mage/cards/a/ArabellaAbandonedDoll.java index 56ed1e66ca7..2c27141f7f5 100644 --- a/Mage.Sets/src/mage/cards/a/ArabellaAbandonedDoll.java +++ b/Mage.Sets/src/mage/cards/a/ArabellaAbandonedDoll.java @@ -11,11 +11,10 @@ import mage.abilities.hint.Hint; import mage.abilities.hint.ValueHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.TargetController; +import mage.constants.*; +import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; import java.util.UUID; @@ -24,8 +23,13 @@ import java.util.UUID; */ public final class ArabellaAbandonedDoll extends CardImpl { + private static final FilterPermanent filter = new FilterControlledCreaturePermanent("creatures you control with power 2 or less"); + static { + filter.add(new PowerPredicate(ComparisonType.OR_LESS, 2)); + } + private static final DynamicValue xValue = new PermanentsOnBattlefieldCount( - new FilterControlledCreaturePermanent("creatures you control with power 2 or less"), null + filter, null ); private static final Hint hint = new ValueHint("Creatures you control with power 2 or less", xValue); @@ -42,7 +46,7 @@ public final class ArabellaAbandonedDoll extends CardImpl { new DamagePlayersEffect(xValue, TargetController.OPPONENT) .setText("it deals X damage to each opponent") ); - ability.addEffect(new GainLifeEffect(xValue)); + ability.addEffect(new GainLifeEffect(xValue).concatBy("and")); this.addAbility(ability.addHint(hint)); }