From df7ace556824648668c7edeb96ea4b165d1b7a49 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 2 Sep 2015 16:31:32 +0200 Subject: [PATCH 1/2] * Marauding Maulhorn - Fixed that attacking was not forced. --- .../src/mage/sets/magic2014/MaraudingMaulhorn.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magic2014/MaraudingMaulhorn.java b/Mage.Sets/src/mage/sets/magic2014/MaraudingMaulhorn.java index a43e8d31670..3a4ab14bfe0 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MaraudingMaulhorn.java +++ b/Mage.Sets/src/mage/sets/magic2014/MaraudingMaulhorn.java @@ -41,14 +41,16 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; +import mage.watchers.common.AttackedThisTurnWatcher; /** * * @author jeffwadsworth */ public class MaraudingMaulhorn extends CardImpl { - - private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature named Advocate of the Beast"); + + private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature named Advocate of the Beast"); + static { filter.add(new NamePredicate("Advocate of the Beast")); } @@ -67,8 +69,8 @@ public class MaraudingMaulhorn extends CardImpl { new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.FEWER_THAN, 1)); effect.setText("{this} attacks each combat if able unless you control a creature named Advocate of the Beast"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), new AttackedThisTurnWatcher()); + } public MaraudingMaulhorn(final MaraudingMaulhorn card) { From b9e005c5564e7ebbee6c54d93402bd298d182345 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 2 Sep 2015 16:33:00 +0200 Subject: [PATCH 2/2] * Deathbellow Raider - Fixed that attacking was not forced. --- .../src/mage/sets/bornofthegods/ImpetuousSunchaser.java | 2 -- Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java | 7 +++---- Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java | 9 ++++----- .../abilities/common/AttacksEachCombatStaticAbility.java | 1 - 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ImpetuousSunchaser.java b/Mage.Sets/src/mage/sets/bornofthegods/ImpetuousSunchaser.java index 3e50e54d85d..2a8c1ac7024 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/ImpetuousSunchaser.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/ImpetuousSunchaser.java @@ -30,12 +30,10 @@ package mage.sets.bornofthegods; import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksEachTurnStaticAbility; -import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.constants.CardType; -import mage.constants.Duration; import mage.constants.Rarity; /** diff --git a/Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java b/Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java index f239c663691..a9851f4fe18 100644 --- a/Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java +++ b/Mage.Sets/src/mage/sets/theros/DeathbellowRaider.java @@ -29,14 +29,12 @@ package mage.sets.theros; import java.util.UUID; import mage.MageInt; +import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; -import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; @@ -56,7 +54,8 @@ public class DeathbellowRaider extends CardImpl { this.toughness = new MageInt(3); // Deathbellow Raider attacks each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new AttacksEachTurnStaticAbility()); + // {2}{B}: Regenerate Deathbellow Raider. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{B}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java b/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java index 21b6a651688..856e29d1943 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ShowAndTell.java @@ -55,7 +55,6 @@ public class ShowAndTell extends CardImpl { super(ownerId, 96, "Show and Tell", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "USG"; - // Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield. this.getSpellAbility().addEffect(new ShowAndTellEffect()); } @@ -105,8 +104,8 @@ class ShowAndTellEffect extends OneShotEffect { } List cardsToPutIntoPlay = new ArrayList<>(); TargetCardInHand target = new TargetCardInHand(filter); - - for(UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) { + + for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { Player player = game.getPlayer(playerId); if (player != null) { if (player.chooseUse(outcome, "Put an artifact, creature, enchantment, or land card from hand onto the battlefield?", source, game)) { @@ -117,10 +116,10 @@ class ShowAndTellEffect extends OneShotEffect { cardsToPutIntoPlay.add(card); } } - } + } } } - for (Card card: cardsToPutIntoPlay) { + for (Card card : cardsToPutIntoPlay) { Player player = game.getPlayer(card.getOwnerId()); if (player != null) { player.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId()); diff --git a/Mage/src/mage/abilities/common/AttacksEachCombatStaticAbility.java b/Mage/src/mage/abilities/common/AttacksEachCombatStaticAbility.java index adb4be894b1..9f520471526 100644 --- a/Mage/src/mage/abilities/common/AttacksEachCombatStaticAbility.java +++ b/Mage/src/mage/abilities/common/AttacksEachCombatStaticAbility.java @@ -14,7 +14,6 @@ import mage.constants.Zone; * * @author LevelX2 */ - public class AttacksEachCombatStaticAbility extends StaticAbility { public AttacksEachCombatStaticAbility() {