diff --git a/Mage.Sets/src/mage/cards/a/Aggravate.java b/Mage.Sets/src/mage/cards/a/Aggravate.java index 8446a129a5c..a7e3ab8968f 100644 --- a/Mage.Sets/src/mage/cards/a/Aggravate.java +++ b/Mage.Sets/src/mage/cards/a/Aggravate.java @@ -26,7 +26,7 @@ public final class Aggravate extends CardImpl { // Aggravate deals 1 damage to each creature target player controls. - this.getSpellAbility().addEffect(new DamageAllControlledTargetEffect(1, new FilterCreaturePermanent())); + this.getSpellAbility().addEffect(new DamageAllControlledTargetEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); // Each creature dealt damage this way attacks this turn if able. this.getSpellAbility().addEffect(new AggravateRequirementEffect()); diff --git a/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java b/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java index 5f1dadc61a5..22ff5e81756 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java +++ b/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java @@ -39,7 +39,7 @@ public final class AngrathMinotaurPirate extends CardImpl { // +2: Angrath, Minotaur Pirate deals 1 damage to target opponent and each creature that player controls. LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(1), +2); - ability1.addEffect(new DamageAllControlledTargetEffect(1, new FilterCreaturePermanent()) + ability1.addEffect(new DamageAllControlledTargetEffect(1) .setText("and each creature that player or that planeswalker's controller controls")); ability1.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/b/BalefireDragon.java b/Mage.Sets/src/mage/cards/b/BalefireDragon.java index 61468c3d7dd..df130bc1bf4 100644 --- a/Mage.Sets/src/mage/cards/b/BalefireDragon.java +++ b/Mage.Sets/src/mage/cards/b/BalefireDragon.java @@ -10,6 +10,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; +import mage.filter.StaticFilters; /** * @@ -29,7 +30,7 @@ public final class BalefireDragon extends CardImpl { // Whenever Balefire Dragon deals combat damage to a player, // it deals that much damage to each creature that player controls. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( - new DamageAllControlledTargetEffect(SavedDamageValue.MUCH, "it"), + new DamageAllControlledTargetEffect(SavedDamageValue.MUCH, StaticFilters.FILTER_PERMANENT_CREATURE), false, true)); } diff --git a/Mage.Sets/src/mage/cards/c/ChandraNalaar.java b/Mage.Sets/src/mage/cards/c/ChandraNalaar.java index 79b396c1996..1964fb95ad2 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraNalaar.java +++ b/Mage.Sets/src/mage/cards/c/ChandraNalaar.java @@ -39,7 +39,7 @@ public final class ChandraNalaar extends CardImpl { // -8: Chandra Nalaar deals 10 damage to target player or planeswalker and each creature that player or that planeswalker’s controller controls. LoyaltyAbility ability3 = new LoyaltyAbility(new DamageTargetEffect(10), -8); - ability3.addEffect(new DamageAllControlledTargetEffect(10, new FilterCreaturePermanent()) + ability3.addEffect(new DamageAllControlledTargetEffect(10) .setText("and each creature that player or that planeswalker's controller controls") ); ability3.addTarget(new TargetPlayerOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/c/ChandraPyrogenius.java b/Mage.Sets/src/mage/cards/c/ChandraPyrogenius.java index 532e512caac..728f2042d37 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraPyrogenius.java +++ b/Mage.Sets/src/mage/cards/c/ChandraPyrogenius.java @@ -40,7 +40,7 @@ public final class ChandraPyrogenius extends CardImpl { // -10: Chandra, Pyrogenius deals 6 damage to target player and each creature they control. ability = new LoyaltyAbility(new DamageTargetEffect(6), -10); - ability.addEffect(new DamageAllControlledTargetEffect(6, new FilterCreaturePermanent()) + ability.addEffect(new DamageAllControlledTargetEffect(6) .setText("and each creature that player or that planeswalker's controller controls")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlameWave.java b/Mage.Sets/src/mage/cards/f/FlameWave.java index 56f86115db3..38b38c2c395 100644 --- a/Mage.Sets/src/mage/cards/f/FlameWave.java +++ b/Mage.Sets/src/mage/cards/f/FlameWave.java @@ -22,7 +22,7 @@ public final class FlameWave extends CardImpl { // Flame Wave deals 4 damage to target player and each creature they control. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); - this.getSpellAbility().addEffect(new DamageAllControlledTargetEffect(4, new FilterCreaturePermanent()) + this.getSpellAbility().addEffect(new DamageAllControlledTargetEffect(4) .setText("and each creature that player or that planeswalker's controller controls") ); } diff --git a/Mage.Sets/src/mage/cards/s/ShockmawDragon.java b/Mage.Sets/src/mage/cards/s/ShockmawDragon.java index 54ff2020af1..565f366efa7 100644 --- a/Mage.Sets/src/mage/cards/s/ShockmawDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShockmawDragon.java @@ -28,7 +28,7 @@ public final class ShockmawDragon extends CardImpl { // Whenever Shockmaw Dragon deals combat damage to a player, // it deals 1 damage to each creature that player controls. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( - new DamageAllControlledTargetEffect(1, "it"), + new DamageAllControlledTargetEffect(1), false, true)); } diff --git a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java index 1439f533e76..ef298ac5997 100644 --- a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java +++ b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java @@ -359,7 +359,7 @@ class UrzaAcademyHeadmasterRandomEffect extends OneShotEffect { case 6: // CHANDRA NALAAR 3 sb.append("Urza deals 10 damage to target player and each creature they control."); effects.add(new DamageTargetEffect(10)); - effects.add(new DamageAllControlledTargetEffect(10, new FilterCreaturePermanent())); + effects.add(new DamageAllControlledTargetEffect(10)); target = new TargetPlayerOrPlaneswalker(); break; case 7: // DOMRI RADE 3 diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java index 2ea8d78495f..cdca2540918 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java @@ -19,26 +19,11 @@ public class DamageAllControlledTargetEffect extends OneShotEffect { private final DynamicValue amount; private final FilterPermanent filter; - private String sourceName = "{this}"; public DamageAllControlledTargetEffect(int amount) { this(amount, StaticFilters.FILTER_PERMANENT_CREATURE); } - public DamageAllControlledTargetEffect(int amount, String whoDealDamageName) { - this(amount, StaticFilters.FILTER_PERMANENT_CREATURE); - this.sourceName = whoDealDamageName; - } - - public DamageAllControlledTargetEffect(DynamicValue amount) { - this(amount, StaticFilters.FILTER_PERMANENT_CREATURE); - } - - public DamageAllControlledTargetEffect(DynamicValue amount, String whoDealDamageName) { - this(amount, StaticFilters.FILTER_PERMANENT_CREATURE); - this.sourceName = whoDealDamageName; - } - public DamageAllControlledTargetEffect(int amount, FilterPermanent filter) { this(StaticValue.get(amount), filter); } @@ -53,7 +38,6 @@ public class DamageAllControlledTargetEffect extends OneShotEffect { super(effect); this.amount = effect.amount.copy(); this.filter = effect.filter.copy(); - this.sourceName = effect.sourceName; } @Override @@ -78,14 +62,8 @@ public class DamageAllControlledTargetEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - StringBuilder sb = new StringBuilder(sourceName); - sb.append(" deals ").append(amount).append(" damage to each ").append(filter.getMessage()); - if (mode.getTargets().isEmpty()) { - sb.append(" that player"); - } else { - sb.append(" target ").append(mode.getTargets().get(0).getTargetName()); - } - sb.append(" controls"); - return sb.toString(); + return "{this} deals " + amount + " damage to each " + filter.getMessage() + ' ' + + getTargetPointer().describeTargets(mode.getTargets(), "that player") + + " controls"; } }