diff --git a/Mage.Sets/src/mage/cards/c/Capricopian.java b/Mage.Sets/src/mage/cards/c/Capricopian.java new file mode 100644 index 0000000000..95019c260e --- /dev/null +++ b/Mage.Sets/src/mage/cards/c/Capricopian.java @@ -0,0 +1,127 @@ +package mage.cards.c; + +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.ActivatedAbilityImpl; +import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.condition.common.IsStepCondition; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.*; +import mage.counters.CounterType; +import mage.filter.FilterPlayer; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.other.PlayerIdPredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.TargetPlayer; + +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class Capricopian extends CardImpl { + + public Capricopian(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{X}{G}"); + + this.subtype.add(SubType.GOAT); + this.subtype.add(SubType.HYDRA); + this.power = new MageInt(0); + this.toughness = new MageInt(0); + + // Capricopian enters the battlefield with X +1/+1 counters on it. + this.addAbility(new EntersBattlefieldAbility( + new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()) + )); + + // {2}: Put a +1/+1 counter on Capricopian, then you may reselect which player Capricopian is attacking. Only the player Capricopian is attacking may activate this ability and only during the declare attackers step. + this.addAbility(new CapricopianActivatedAbility()); + } + + private Capricopian(final Capricopian card) { + super(card); + } + + @Override + public Capricopian copy() { + return new Capricopian(this); + } +} + +class CapricopianActivatedAbility extends ActivatedAbilityImpl { + + CapricopianActivatedAbility() { + super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + this.addEffect(new CapricopianEffect()); + this.setMayActivate(TargetController.ANY); + this.condition = new IsStepCondition(PhaseStep.DECLARE_ATTACKERS); + } + + private CapricopianActivatedAbility(final CapricopianActivatedAbility ability) { + super(ability); + } + + @Override + public CapricopianActivatedAbility copy() { + return new CapricopianActivatedAbility(this); + } + + @Override + public String getRule() { + return "{2}: Put a +1/+1 counter on {this}, then you may reselect which player {this} is attacking. " + + "Only the player {this} is attacking may activate this ability " + + "and only during the declare attackers step. (It can’t attack its controller.)"; + } + + @Override + protected boolean checkTargetController(UUID playerId, Game game) { + return super.checkTargetController(playerId, game) + && playerId != null + && playerId.equals(game.getCombat().getDefenderId(this.getSourceId())); + } +} + +class CapricopianEffect extends OneShotEffect { + + CapricopianEffect() { + super(Outcome.Benefit); + } + + private CapricopianEffect(final CapricopianEffect effect) { + super(effect); + } + + @Override + public CapricopianEffect copy() { + return new CapricopianEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(source.getControllerId()); + Permanent permanent = game.getPermanent(source.getSourceId()); + if (player == null || permanent == null) { + return false; + } + if (!player.chooseUse(outcome, "Reselect attacker for " + permanent.getIdName() + "?", source, game)) { + return false; + } + FilterPlayer filterPlayer = new FilterPlayer(); + filterPlayer.add(Predicates.not(new PlayerIdPredicate(permanent.getControllerId()))); + filterPlayer.add(Predicates.not(new PlayerIdPredicate(game.getCombat().getDefenderId(permanent.getId())))); + TargetPlayer targetPlayer = new TargetPlayer(0, 1, true, filterPlayer); + player.choose(outcome, targetPlayer, source.getSourceId(), game); + Player newPlayer = game.getPlayer(targetPlayer.getFirstTarget()); + if (newPlayer == null) { + return false; + } + return game.getCombat().addAttackingCreature(permanent.getId(), game, newPlayer.getId()); + } +} diff --git a/Mage.Sets/src/mage/sets/Commander2020Edition.java b/Mage.Sets/src/mage/sets/Commander2020Edition.java index e3aa032990..e4f1358b9b 100644 --- a/Mage.Sets/src/mage/sets/Commander2020Edition.java +++ b/Mage.Sets/src/mage/sets/Commander2020Edition.java @@ -67,6 +67,7 @@ public final class Commander2020Edition extends ExpansionSet { cards.add(new SetCardInfo("Cairn Wanderer", 130, Rarity.RARE, mage.cards.c.CairnWanderer.class)); cards.add(new SetCardInfo("Call the Coppercoats", 23, Rarity.RARE, mage.cards.c.CallTheCoppercoats.class)); cards.add(new SetCardInfo("Canopy Vista", 261, Rarity.RARE, mage.cards.c.CanopyVista.class)); + cards.add(new SetCardInfo("Capricopian", 58, Rarity.RARE, mage.cards.c.Capricopian.class)); cards.add(new SetCardInfo("Captivating Crew", 144, Rarity.RARE, mage.cards.c.CaptivatingCrew.class)); cards.add(new SetCardInfo("Cartographer's Hawk", 24, Rarity.RARE, mage.cards.c.CartographersHawk.class)); cards.add(new SetCardInfo("Cast Out", 79, Rarity.UNCOMMON, mage.cards.c.CastOut.class)); diff --git a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java index d54e2f27eb..4f98229b5b 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java @@ -1,6 +1,5 @@ package mage.abilities; -import java.util.UUID; import mage.MageObject; import mage.MageObjectReference; import mage.abilities.condition.Condition; @@ -12,11 +11,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; import mage.abilities.mana.ManaOptions; import mage.cards.Card; -import mage.constants.AbilityType; -import mage.constants.AsThoughEffectType; -import mage.constants.TargetController; -import mage.constants.TimingRule; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.command.Commander; import mage.game.command.Emblem; @@ -24,8 +19,9 @@ import mage.game.command.Plane; import mage.game.permanent.Permanent; import mage.util.CardUtil; +import java.util.UUID; + /** - * * @author BetaSteward_at_googlemail.com */ public abstract class ActivatedAbilityImpl extends AbilityImpl implements ActivatedAbility { @@ -148,6 +144,34 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa @Override public abstract ActivatedAbilityImpl copy(); + protected boolean checkTargetController(UUID playerId, Game game) { + switch (mayActivate) { + case ANY: + return true; + case ACTIVE: + return game.getActivePlayerId() == playerId; + case NOT_YOU: + return !controlsAbility(playerId, game); + case TEAM: + return !game.getPlayer(controllerId).hasOpponent(playerId, game); + case OPPONENT: + return game.getPlayer(controllerId).hasOpponent(playerId, game); + case OWNER: + Permanent permanent = game.getPermanent(getSourceId()); + return permanent != null && permanent.isOwnedBy(playerId); + case YOU: + return controlsAbility(playerId, game); + case CONTROLLER_ATTACHED_TO: + Permanent enchantment = game.getPermanent(getSourceId()); + if (enchantment == null || enchantment.getAttachedTo() == null) { + return false; + } + Permanent enchanted = game.getPermanent(enchantment.getAttachedTo()); + return enchanted != null && enchanted.isControlledBy(playerId); + } + return true; + } + @Override public ActivationStatus canActivate(UUID playerId, Game game) { //20091005 - 602.2 @@ -156,49 +180,8 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa || condition.apply(game, this)))) { return ActivationStatus.getFalse(); } - switch (mayActivate) { - case ANY: - break; - case ACTIVE: - if (game.getActivePlayerId() != playerId) { - return ActivationStatus.getFalse(); - } - break; - case NOT_YOU: - if (controlsAbility(playerId, game)) { - return ActivationStatus.getFalse(); - } - break; - case TEAM: - if (game.getPlayer(controllerId).hasOpponent(playerId, game)) { - return ActivationStatus.getFalse(); - } - break; - case OPPONENT: - if (!game.getPlayer(controllerId).hasOpponent(playerId, game)) { - return ActivationStatus.getFalse(); - } - break; - case OWNER: - Permanent permanent = game.getPermanent(getSourceId()); - if (!permanent.isOwnedBy(playerId)) { - return ActivationStatus.getFalse(); - } - break; - case YOU: - if (!controlsAbility(playerId, game)) { - return ActivationStatus.getFalse(); - } - break; - case CONTROLLER_ATTACHED_TO: - Permanent enchantment = game.getPermanent(getSourceId()); - if (enchantment != null && enchantment.getAttachedTo() != null) { - Permanent enchanted = game.getPermanent(enchantment.getAttachedTo()); - if (enchanted != null && enchanted.isControlledBy(playerId)) { - break; - } - } - return ActivationStatus.getFalse(); + if (!this.checkTargetController(playerId, game)) { + return ActivationStatus.getFalse(); } //20091005 - 602.5d/602.5e MageObjectReference permittingObject = game.getContinuousEffects() @@ -227,17 +210,16 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa protected boolean controlsAbility(UUID playerId, Game game) { if (this.controllerId != null && this.controllerId.equals(playerId)) { return true; - } else { - MageObject mageObject = game.getObject(this.sourceId); - if (mageObject instanceof Emblem) { - return ((Emblem) mageObject).isControlledBy(playerId); - } else if (mageObject instanceof Plane) { - return ((Plane) mageObject).isControlledBy(playerId); - } else if (mageObject instanceof Commander) { - return ((Commander) mageObject).isControlledBy(playerId); - } else if (game.getState().getZone(this.sourceId) != Zone.BATTLEFIELD) { - return ((Card) mageObject).isOwnedBy(playerId); - } + } + MageObject mageObject = game.getObject(this.sourceId); + if (mageObject instanceof Emblem) { + return ((Emblem) mageObject).isControlledBy(playerId); + } else if (mageObject instanceof Plane) { + return ((Plane) mageObject).isControlledBy(playerId); + } else if (mageObject instanceof Commander) { + return ((Commander) mageObject).isControlledBy(playerId); + } else if (game.getState().getZone(this.sourceId) != Zone.BATTLEFIELD) { + return ((Card) mageObject).isOwnedBy(playerId); } return false; } @@ -271,22 +253,20 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa @Override public boolean activate(Game game, boolean noMana) { - if (hasMoreActivationsThisTurn(game)) { - if (super.activate(game, noMana)) { - ActivationInfo activationInfo = getActivationInfo(game); - if (activationInfo == null) { - activationInfo = new ActivationInfo(game.getTurnNum(), 1); - } else if (activationInfo.turnNum != game.getTurnNum()) { - activationInfo.turnNum = game.getTurnNum(); - activationInfo.activationCounter = 1; - } else { - activationInfo.activationCounter++; - } - setActivationInfo(activationInfo, game); - return true; - } + if (!hasMoreActivationsThisTurn(game) || !super.activate(game, noMana)) { + return false; } - return false; + ActivationInfo activationInfo = getActivationInfo(game); + if (activationInfo == null) { + activationInfo = new ActivationInfo(game.getTurnNum(), 1); + } else if (activationInfo.turnNum != game.getTurnNum()) { + activationInfo.turnNum = game.getTurnNum(); + activationInfo.activationCounter = 1; + } else { + activationInfo.activationCounter++; + } + setActivationInfo(activationInfo, game); + return true; } @Override