From ab6345e7cf05bc1dbd801d12472751aa91db88f3 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 5 Jul 2015 12:49:36 +0200 Subject: [PATCH] [ORI] Added Touch of Moonglove and Thornbow Archer. --- .../sets/magicorigins/ThornbowArcher.java | 110 ++++++++++++ .../sets/magicorigins/TouchOfMoonglove.java | 167 ++++++++++++++++++ .../mage/sets/urzassaga/VampiricEmbrace.java | 23 ++- 3 files changed, 288 insertions(+), 12 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/magicorigins/ThornbowArcher.java create mode 100644 Mage.Sets/src/mage/sets/magicorigins/TouchOfMoonglove.java diff --git a/Mage.Sets/src/mage/sets/magicorigins/ThornbowArcher.java b/Mage.Sets/src/mage/sets/magicorigins/ThornbowArcher.java new file mode 100644 index 0000000000..e1ae93705b --- /dev/null +++ b/Mage.Sets/src/mage/sets/magicorigins/ThornbowArcher.java @@ -0,0 +1,110 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.magicorigins; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.AttacksTriggeredAbility; +import mage.abilities.effects.OneShotEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.Game; +import mage.players.Player; + +/** + * + * @author LevelX2 + */ +public class ThornbowArcher extends CardImpl { + + public ThornbowArcher(UUID ownerId) { + super(ownerId, 121, "Thornbow Archer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); + this.expansionSetCode = "ORI"; + this.subtype.add("Elf"); + this.subtype.add("Archer"); + this.power = new MageInt(1); + this.toughness = new MageInt(2); + + // Whenever Thornbow Archer attacks, each opponent who doesn't control an Elf loses 1 life. + this.addAbility(new AttacksTriggeredAbility(new ThornbowArcherEffect(), false)); + } + + public ThornbowArcher(final ThornbowArcher card) { + super(card); + } + + @Override + public ThornbowArcher copy() { + return new ThornbowArcher(this); + } +} + +class ThornbowArcherEffect extends OneShotEffect { + + private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); + + static { + filter.add(new SubtypePredicate("Elf")); + } + + public ThornbowArcherEffect() { + super(Outcome.LoseLife); + this.staticText = "each opponent who doesn't control an Elf loses 1 life"; + } + + public ThornbowArcherEffect(final ThornbowArcherEffect effect) { + super(effect); + } + + @Override + public ThornbowArcherEffect copy() { + return new ThornbowArcherEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + for (UUID opponentId : game.getOpponents(controller.getId())) { + Player opponent = game.getPlayer(opponentId); + if (opponent != null) { + if (game.getBattlefield().countAll(filter, opponentId, game) == 0) { + opponent.loseLife(1, game); + } + } + } + return true; + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/magicorigins/TouchOfMoonglove.java b/Mage.Sets/src/mage/sets/magicorigins/TouchOfMoonglove.java new file mode 100644 index 0000000000..b5faf222d0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magicorigins/TouchOfMoonglove.java @@ -0,0 +1,167 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.magicorigins; + +import java.util.UUID; +import mage.MageObjectReference; +import mage.abilities.Ability; +import mage.abilities.DelayedTriggeredAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; +import mage.abilities.keyword.DeathtouchAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.game.events.ZoneChangeEvent; +import mage.game.permanent.Permanent; +import mage.target.common.TargetControlledCreaturePermanent; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author LevelX2 + */ +public class TouchOfMoonglove extends CardImpl { + + public TouchOfMoonglove(UUID ownerId) { + super(ownerId, 123, "Touch of Moonglove", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); + this.expansionSetCode = "ORI"; + + // Target creature you control gets +1/+0 and gains deathtouch until end of turn. + Effect effect = new BoostTargetEffect(1, 0, Duration.EndOfTurn); + effect.setText("Target creature you control gets +1/+0"); + this.getSpellAbility().addEffect(effect); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect( + DeathtouchAbility.getInstance(), Duration.EndOfTurn, "and gains deathtouch until end of turn")); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + // Whenever a creature dealt damage by that creature this turn dies, its controller loses 2 life. + // this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(null)); + this.getSpellAbility().addEffect(new TouchOfMoongloveAddTriggerEffect()); + + } + + public TouchOfMoonglove(final TouchOfMoonglove card) { + super(card); + } + + @Override + public TouchOfMoonglove copy() { + return new TouchOfMoonglove(this); + } +} + +class TouchOfMoongloveAddTriggerEffect extends OneShotEffect { + + public TouchOfMoongloveAddTriggerEffect() { + super(Outcome.Damage); + this.staticText = "Whenever a creature dealt damage by that creature this turn dies, its controller loses 2 life"; + } + + public TouchOfMoongloveAddTriggerEffect(final TouchOfMoongloveAddTriggerEffect effect) { + super(effect); + } + + @Override + public TouchOfMoongloveAddTriggerEffect copy() { + return new TouchOfMoongloveAddTriggerEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); + if (permanent != null) { + DelayedTriggeredAbility delayedAbility = new TouchOfMoongloveDelayedTriggeredAbility(new MageObjectReference(permanent, game)); + delayedAbility.setSourceId(source.getSourceId()); + delayedAbility.setControllerId(source.getControllerId()); + delayedAbility.setSourceObject(source.getSourceObject(game), game); + game.addDelayedTriggeredAbility(delayedAbility); + } + return true; + } +} + +class TouchOfMoongloveDelayedTriggeredAbility extends DelayedTriggeredAbility { + + private final MageObjectReference creatureToCheck; + + public TouchOfMoongloveDelayedTriggeredAbility(MageObjectReference creatureToCheck) { + super(new DamageTargetEffect(2), Duration.EndOfTurn); + this.creatureToCheck = creatureToCheck; + } + + public TouchOfMoongloveDelayedTriggeredAbility(TouchOfMoongloveDelayedTriggeredAbility ability) { + super(ability); + this.creatureToCheck = ability.creatureToCheck; + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == EventType.ZONE_CHANGE; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + ZoneChangeEvent zEvent = (ZoneChangeEvent) event; + if (zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() == Zone.GRAVEYARD + && zEvent.getTarget().getCardType().contains(CardType.CREATURE)) { + boolean damageDealt = false; + for (MageObjectReference mor : zEvent.getTarget().getDealtDamageByThisTurn()) { + if (mor.equals(creatureToCheck)) { + damageDealt = true; + break; + } + } + if (damageDealt) { + for (Effect effect : getEffects()) { + effect.setTargetPointer(new FixedTarget(zEvent.getTarget().getControllerId())); + } + return true; + } + } + return false; + } + + @Override + public TouchOfMoongloveDelayedTriggeredAbility copy() { + return new TouchOfMoongloveDelayedTriggeredAbility(this); + } + + @Override + public String getRule() { + return "Whenever a creature dealt damage by that creature this turn dies, its controller loses 2 life."; + } +} diff --git a/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java index 6aebd11671..e8157d73dc 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java @@ -28,12 +28,6 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -44,6 +38,12 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.constants.AttachmentType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.counters.CounterType; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -59,19 +59,18 @@ public class VampiricEmbrace extends CardImpl { this.expansionSetCode = "USG"; this.subtype.add("Aura"); - // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - - // Enchanted creature gets +2/+2 and has flying. + + // Enchanted creature gets +2/+2 and has flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); - - // Whenever a creature dealt damage by enchanted creature this turn dies, put a +1/+1 counter on that creature. + + // Whenever a creature dealt damage by enchanted creature this turn dies, put a +1/+1 counter on that creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new DiesAndDealtDamageThisTurnTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), AttachmentType.AURA))); }