From fd709bcd289c34a451205f40828018f96b21f19b Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 4 Jan 2019 20:58:02 -0500 Subject: [PATCH] Implemented Verity Circle --- Mage.Sets/src/mage/cards/v/VerityCircle.java | 74 +++++++++++++++++++ .../src/mage/sets/RavnicaAllegiance.java | 1 + .../main/java/mage/game/combat/Combat.java | 2 +- .../java/mage/game/permanent/Permanent.java | 2 + .../mage/game/permanent/PermanentImpl.java | 7 +- 5 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 Mage.Sets/src/mage/cards/v/VerityCircle.java diff --git a/Mage.Sets/src/mage/cards/v/VerityCircle.java b/Mage.Sets/src/mage/cards/v/VerityCircle.java new file mode 100644 index 00000000000..12625671137 --- /dev/null +++ b/Mage.Sets/src/mage/cards/v/VerityCircle.java @@ -0,0 +1,74 @@ +package mage.cards.v; + +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; +import mage.players.Player; + +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class VerityCircle extends CardImpl { + + public VerityCircle(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); + + // Whenever a creature an opponent controls becomes tapped, if it isn't being declared as an attacker, you may draw a card. + this.addAbility(new VerityCircleTriggeredAbility()); + } + + private VerityCircle(final VerityCircle card) { + super(card); + } + + @Override + public VerityCircle copy() { + return new VerityCircle(this); + } +} + +class VerityCircleTriggeredAbility extends TriggeredAbilityImpl { + + VerityCircleTriggeredAbility() { + super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true); + } + + private VerityCircleTriggeredAbility(final VerityCircleTriggeredAbility ability) { + super(ability); + } + + @Override + public VerityCircleTriggeredAbility copy() { + return new VerityCircleTriggeredAbility(this); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.TAPPED; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (event.getFlag()) { + return false; + } + Permanent permanent = game.getPermanent(event.getTargetId()); + Player player = game.getPlayer(controllerId); + return permanent != null && player != null && permanent.isCreature() + && player.hasOpponent(permanent.getControllerId(), game); + } + + @Override + public String getRule() { + return "Whenever a creature an opponent controls becomes tapped, " + + "if it isn't being declared as an attacker, you may draw a card."; + } +} diff --git a/Mage.Sets/src/mage/sets/RavnicaAllegiance.java b/Mage.Sets/src/mage/sets/RavnicaAllegiance.java index d2c4dd40c3d..e926d7523b2 100644 --- a/Mage.Sets/src/mage/sets/RavnicaAllegiance.java +++ b/Mage.Sets/src/mage/sets/RavnicaAllegiance.java @@ -114,6 +114,7 @@ public final class RavnicaAllegiance extends ExpansionSet { cards.add(new SetCardInfo("The Haunt of Hightower", 273, Rarity.MYTHIC, mage.cards.t.TheHauntOfHightower.class)); cards.add(new SetCardInfo("Titanic Brawl", 146, Rarity.COMMON, mage.cards.t.TitanicBrawl.class)); cards.add(new SetCardInfo("Tithe Taker", 27, Rarity.RARE, mage.cards.t.TitheTaker.class)); + cards.add(new SetCardInfo("Verity Circle", 58, Rarity.RARE, mage.cards.v.VerityCircle.class)); cards.add(new SetCardInfo("Wilderness Reclamation", 149, Rarity.UNCOMMON, mage.cards.w.WildernessReclamation.class)); cards.add(new SetCardInfo("Zegana, Utopian Speaker", 214, Rarity.RARE, mage.cards.z.ZeganaUtopianSpeaker.class)); cards.add(new SetCardInfo("Zhur-Taa Goblin", 215, Rarity.UNCOMMON, mage.cards.z.ZhurTaaGoblin.class)); diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index 08157890e1f..1f0e73e9509 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -275,7 +275,7 @@ public class Combat implements Serializable, Copyable { Permanent attackingPermanent = game.getPermanent(attacker); if (attackingPermanent != null) { attackingPermanent.setTapped(false); - attackingPermanent.tap(game); // to tap with event finally here is needed to prevent abusing of Vampire Envoy like cards + attackingPermanent.tap(true,game); // to tap with event finally here is needed to prevent abusing of Vampire Envoy like cards } } handleBanding(attacker, game); diff --git a/Mage/src/main/java/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java index b23e848f305..8ebdc1f6481 100644 --- a/Mage/src/main/java/mage/game/permanent/Permanent.java +++ b/Mage/src/main/java/mage/game/permanent/Permanent.java @@ -25,6 +25,8 @@ public interface Permanent extends Card, Controllable { boolean tap(Game game); + boolean tap(boolean forCombat, Game game); + /** * use tap(game) *

diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index c0794f0ca06..ed908b5e146 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -390,11 +390,16 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { @Override public boolean tap(Game game) { + return tap(false, game); + } + + @Override + public boolean tap(boolean forCombat, Game game) { //20091005 - 701.15a if (!tapped) { if (!replaceEvent(EventType.TAP, game)) { this.tapped = true; - fireEvent(EventType.TAPPED, game); + game.fireEvent(new GameEvent(EventType.TAPPED, objectId, ownerId, controllerId, 0, forCombat)); return true; } }