From 383b05534cf0f6942a98365531dd7b579d9eaa5d Mon Sep 17 00:00:00 2001 From: spjspj Date: Wed, 16 Mar 2016 01:05:24 +1100 Subject: [PATCH 1/4] spjspj - Change to '{this}'. Also add checks for if in graveyard of owner and whether it can return to the battlefield --- .../sets/darksteel/ScreamsFromWithin.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/darksteel/ScreamsFromWithin.java b/Mage.Sets/src/mage/sets/darksteel/ScreamsFromWithin.java index 7533efcdbe..bd126e45a8 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ScreamsFromWithin.java +++ b/Mage.Sets/src/mage/sets/darksteel/ScreamsFromWithin.java @@ -42,8 +42,11 @@ import mage.cards.Card; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; +import mage.game.permanent.Permanent; import mage.players.Player; +import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -86,7 +89,7 @@ class ScreamsFromWithinEffect extends OneShotEffect { public ScreamsFromWithinEffect() { super(Outcome.PutCardInPlay); - staticText = "return Screams from Within from your graveyard to the battlefield"; + staticText = "return {this} from your graveyard to the battlefield"; } public ScreamsFromWithinEffect(final ScreamsFromWithinEffect effect) { @@ -95,10 +98,16 @@ class ScreamsFromWithinEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Card sourceEnchantmentCard = game.getCard(source.getSourceId()); + Card aura = game.getCard(source.getSourceId()); Player player = game.getPlayer(source.getControllerId()); - if (sourceEnchantmentCard != null && player != null) { - return player.moveCards(sourceEnchantmentCard, Zone.BATTLEFIELD, source, game); + if (aura != null && game.getState().getZone(source.getSourceId()) == Zone.GRAVEYARD && player != null && player.getGraveyard().contains(source.getSourceId())) { + for (Permanent creaturePermanent : game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), game)) { + for (Target target : aura.getSpellAbility().getTargets()) { + if (target.canTarget(creaturePermanent.getId(), game)) { + return player.moveCards(aura, Zone.BATTLEFIELD, source, game); + } + } + } } return false; } @@ -107,4 +116,4 @@ class ScreamsFromWithinEffect extends OneShotEffect { public ScreamsFromWithinEffect copy() { return new ScreamsFromWithinEffect(this); } -} \ No newline at end of file +} From 4c8ca577bd9e016cd5d1b2c40a26aaecddafd86a Mon Sep 17 00:00:00 2001 From: rkfg Date: Tue, 15 Mar 2016 18:37:32 +0300 Subject: [PATCH 2/4] Fix transformable card being shown non-transformed on the battlefield. --- Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java index 8bf5bd192c..b310a074f3 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java @@ -880,7 +880,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti updateImage(); if (card.canTransform()) { BufferedImage transformIcon; - if (transformed) { + if (transformed || card.isTransformed()) { transformIcon = ImageManagerImpl.getInstance().getNightImage(); } else { transformIcon = ImageManagerImpl.getInstance().getDayImage(); From 8834965979634b7bc11f81449f9096dba5dbd09a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 15 Mar 2016 17:18:59 +0100 Subject: [PATCH 3/4] [SOI] Flameblade Angel and Relentless Dead. --- .../shadowsoverinnistrad/FlamebladeAngel.java | 123 +++++++++++++++++ .../shadowsoverinnistrad/RelentlessDead.java | 129 ++++++++++++++++++ 2 files changed, 252 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/shadowsoverinnistrad/FlamebladeAngel.java create mode 100644 Mage.Sets/src/mage/sets/shadowsoverinnistrad/RelentlessDead.java diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/FlamebladeAngel.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/FlamebladeAngel.java new file mode 100644 index 0000000000..7c03974f59 --- /dev/null +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/FlamebladeAngel.java @@ -0,0 +1,123 @@ +/* + * 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.shadowsoverinnistrad; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.DamageEvent; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author LevelX2 + */ +public class FlamebladeAngel extends CardImpl { + + public FlamebladeAngel(UUID ownerId) { + super(ownerId, 157, "Flameblade Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{R}"); + this.expansionSetCode = "SOI"; + this.subtype.add("Angel"); + this.power = new MageInt(4); + this.toughness = new MageInt(4); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + // Whenever a source an opponent controls deals damage to you or a permanent you control, you may have Flameblade Angel deal 1 damage to that source's controller. + this.addAbility(new FlamebladeAngelTriggeredAbility()); + + } + + public FlamebladeAngel(final FlamebladeAngel card) { + super(card); + } + + @Override + public FlamebladeAngel copy() { + return new FlamebladeAngel(this); + } +} + +class FlamebladeAngelTriggeredAbility extends TriggeredAbilityImpl { + + public FlamebladeAngelTriggeredAbility() { + super(Zone.BATTLEFIELD, new DamageTargetEffect(1), true); + } + + public FlamebladeAngelTriggeredAbility(final FlamebladeAngelTriggeredAbility ability) { + super(ability); + } + + @java.lang.Override + public FlamebladeAngelTriggeredAbility copy() { + return new FlamebladeAngelTriggeredAbility(this); + } + + @java.lang.Override + public boolean checkEventType(GameEvent event, Game game) { + return event instanceof DamageEvent; + } + + @java.lang.Override + public boolean checkTrigger(GameEvent event, Game game) { + boolean result = false; + UUID sourceControllerId = game.getControllerId(event.getSourceId()); + if (sourceControllerId != null && game.getOpponents(getControllerId()).contains(sourceControllerId)) { + + if (event.getTargetId().equals(getControllerId())) { + result = true; + } else { + Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId()); + if (permanent != null && getControllerId().equals(permanent.getControllerId())) { + result = true; + } + } + if (result) { + for (Effect effect : getEffects()) { + effect.setTargetPointer(new FixedTarget(sourceControllerId)); + } + } + } + return result; + } + + @java.lang.Override + public String getRule() { + return "Whenever a source an opponent controls deals damage to you or a permanent you control, you may have {this} deal 1 damage to that source's controller."; + } +} diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/RelentlessDead.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/RelentlessDead.java new file mode 100644 index 0000000000..f768d83ec1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/RelentlessDead.java @@ -0,0 +1,129 @@ +/* + * 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.shadowsoverinnistrad; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.costs.Cost; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.DoIfCostPaid; +import mage.abilities.effects.common.ReturnToHandSourceEffect; +import mage.abilities.keyword.MenaceAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.Filter; +import mage.filter.FilterCard; +import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.Game; +import mage.players.Player; +import mage.target.common.TargetCardInYourGraveyard; + +/** + * + * @author LevelX2 + */ +public class RelentlessDead extends CardImpl { + + public RelentlessDead(UUID ownerId) { + super(ownerId, 131, "Relentless Dead", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{B}{B}"); + this.expansionSetCode = "SOI"; + this.subtype.add("Zombie"); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // Menace + this.addAbility(new MenaceAbility()); + + // When Relentless Dead dies, you may pay {B}. If you do, return it to its owner's hand. + this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new ReturnToHandSourceEffect(), new ManaCostsImpl("{B}")))); + + // When Relentless Dead dies, you may pay {X}. If you do, return another target Zombie creature card with converted mana cost X from your graveyard to the battlefield. + this.addAbility(new DiesTriggeredAbility(new RelentlessDeadEffect())); + } + + public RelentlessDead(final RelentlessDead card) { + super(card); + } + + @Override + public RelentlessDead copy() { + return new RelentlessDead(this); + } +} + +class RelentlessDeadEffect extends OneShotEffect { + + public RelentlessDeadEffect() { + super(Outcome.PutCardInPlay); + this.staticText = "you may pay {X}. If you do, return another target Zombie creature card with converted mana cost X from your graveyard to the battlefield"; + } + + public RelentlessDeadEffect(final RelentlessDeadEffect effect) { + super(effect); + } + + @Override + public RelentlessDeadEffect copy() { + return new RelentlessDeadEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + if (controller.chooseUse(Outcome.BoostCreature, "Do you want to to pay {X}?", source, game)) { + int costX = controller.announceXMana(0, Integer.MAX_VALUE, "Announce the value for {X}", game, source); + Cost cost = new GenericManaCost(costX); + if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false, null)) { + FilterCard filter = new FilterCard("Zombie card with converted mana cost " + costX); + filter.add(new SubtypePredicate("Zombie")); + filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, costX)); + TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filter); + if (controller.chooseTarget(outcome, target, source, game)) { + Card card = game.getCard(target.getFirstTarget()); + if (card != null) { + controller.moveCards(card, Zone.BATTLEFIELD, source, game); + } + } + } + } + return true; + } + return false; + + } +} From dc37ff079318a13bf9d2a81122e2129f7f5febb6 Mon Sep 17 00:00:00 2001 From: drmDev Date: Tue, 15 Mar 2016 13:32:46 -0400 Subject: [PATCH 4/4] Card implementation Clergy of the Holy Nimbus --- .../sets/legends/ClergyOfTheHolyNimbus.java | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/legends/ClergyOfTheHolyNimbus.java diff --git a/Mage.Sets/src/mage/sets/legends/ClergyOfTheHolyNimbus.java b/Mage.Sets/src/mage/sets/legends/ClergyOfTheHolyNimbus.java new file mode 100644 index 0000000000..dfdc854f41 --- /dev/null +++ b/Mage.Sets/src/mage/sets/legends/ClergyOfTheHolyNimbus.java @@ -0,0 +1,119 @@ +/* + * 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.legends; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.ActivateOnlyByOpponentActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.ReplacementEffectImpl; +import mage.abilities.effects.common.CantBeRegeneratedSourceEffect; +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.permanent.Permanent; + +/** + * + * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) + */ +public class ClergyOfTheHolyNimbus extends CardImpl { + + public ClergyOfTheHolyNimbus(UUID ownerId) { + super(ownerId, 175, "Clergy of the Holy Nimbus", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); + this.expansionSetCode = "LEG"; + this.subtype.add("Human"); + this.subtype.add("Cleric"); + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + // If Clergy of the Holy Nimbus would be destroyed, regenerate it. + this.addAbility(new SimpleStaticAbility(Zone.ALL, new ClergyOfTheHolyNimbusReplacementEffect())); + + // {1}: Clergy of the Holy Nimbus can't be regenerated this turn. Only any opponent may activate this ability. + this.addAbility(new ActivateOnlyByOpponentActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}"))); + } + + public ClergyOfTheHolyNimbus(final ClergyOfTheHolyNimbus card) { + super(card); + } + + @Override + public ClergyOfTheHolyNimbus copy() { + return new ClergyOfTheHolyNimbus(this); + } +} + +class ClergyOfTheHolyNimbusReplacementEffect extends ReplacementEffectImpl { + + ClergyOfTheHolyNimbusReplacementEffect() { + super(Duration.Custom, Outcome.Regenerate); + staticText = "If {this} would be destroyed, regenerate it"; + } + + ClergyOfTheHolyNimbusReplacementEffect(ClergyOfTheHolyNimbusReplacementEffect effect) { + super(effect); + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + Permanent ClergyOfTheHolyNimbus = game.getPermanent(event.getTargetId()); + if (ClergyOfTheHolyNimbus != null + && event.getAmount() == 0) { // 1=noRegen + if (ClergyOfTheHolyNimbus.regenerate(source.getSourceId(), game)) { + game.informPlayers(source.getSourceObject(game).getName() + " has been regenerated."); + return true; + } + } + return false; + } + + @Override + public boolean checksEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.DESTROY_PERMANENT; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + return event.getTargetId() != null + && event.getTargetId().equals(source.getSourceId()); + } + + @Override + public ClergyOfTheHolyNimbusReplacementEffect copy() { + return new ClergyOfTheHolyNimbusReplacementEffect(this); + } + +} \ No newline at end of file