From a4dc6a12b807f3146b44bde211ad8f1663e8e8fe Mon Sep 17 00:00:00 2001 From: drmDev Date: Sun, 3 Jul 2016 21:27:33 -0400 Subject: [PATCH 1/4] Soul Separator (EMN) --- .../mage/sets/eldritchmoon/SoulSeparator.java | 117 ++++++++++++++++++ Mage/src/main/java/mage/MageObjectImpl.java | 4 +- ...tTokenOntoBattlefieldCopyTargetEffect.java | 28 ++++- 3 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java b/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java new file mode 100644 index 0000000000..2705925dd0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java @@ -0,0 +1,117 @@ +/* + * 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.eldritchmoon; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.SacrificeSourceCost; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect; +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.common.FilterCreatureCard; +import mage.game.Game; +import mage.game.permanent.token.ZombieToken; +import mage.players.Player; +import mage.target.common.TargetCardInYourGraveyard; + +/** + * + * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) + */ +public class SoulSeparator extends CardImpl { + + public SoulSeparator(UUID ownerId) { + super(ownerId, 199, "Soul Separator", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); + this.expansionSetCode = "EMN"; + + // {5}, {T}, Sacrifice Soul Separator: Exile target creature card from your graveyard. + // Put a token onto the battlefield that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. + // Put a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal that card's toughness. + PutTokenOntoBattlefieldCopyTargetEffect copyEffect = new PutTokenOntoBattlefieldCopyTargetEffect(null, null, false, 1, false, false, null, 1, 1, true); + copyEffect.setAdditionalSubType("Spirit"); + copyEffect.setText("Put a token onto the battlefield that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying."); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, copyEffect, new ManaCostsImpl("{5}")); + ability.addCost(new TapSourceCost()); + ability.addCost(new SacrificeSourceCost()); + ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); + ability.addEffect(new SoulSeparatorEffect()); + this.addAbility(ability); + } + + public SoulSeparator(final SoulSeparator card) { + super(card); + } + + @Override + public SoulSeparator copy() { + return new SoulSeparator(this); + } +} + +class SoulSeparatorEffect extends OneShotEffect { + + public SoulSeparatorEffect() { + super(Outcome.PutCreatureInPlay); + this.staticText = "Put a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal that card's toughness."; + } + + public SoulSeparatorEffect(final SoulSeparatorEffect effect) { + super(effect); + } + + @Override + public SoulSeparatorEffect copy() { + return new SoulSeparatorEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Card creatureCard = game.getCard(this.getTargetPointer().getFirst(game, source)); + Player controller = game.getPlayer(source.getControllerId()); + if (creatureCard != null && controller != null) { + boolean result = false; + if (game.getState().getZone(creatureCard.getId()).equals(Zone.GRAVEYARD)) { + result = controller.moveCardToExileWithInfo(creatureCard, null, "", source.getSourceId(), game, Zone.GRAVEYARD, true); + ZombieToken token = new ZombieToken(); + token.power.setValue(creatureCard.getPower().getValue()); + token.toughness.setValue(creatureCard.getToughness().getValue()); + token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); + } + return result; + } + return false; + } +} \ No newline at end of file diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index ebb8fc674f..e5f25bb552 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -54,8 +54,8 @@ public abstract class MageObjectImpl implements MageObject { protected List supertype = new ArrayList<>(); protected Abilities abilities; protected String text; - protected MageInt power; - protected MageInt toughness; + public MageInt power; + public MageInt toughness; protected boolean copy; public MageObjectImpl() { diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java index 58732f5a40..179f22349d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java @@ -35,6 +35,7 @@ import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; +import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.constants.CardType; @@ -62,6 +63,9 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { private boolean tapped; private boolean attacking; private UUID attackedPlayer; + private final int tokenPower; + private final int tokenToughness; + private boolean gainsFlying; public PutTokenOntoBattlefieldCopyTargetEffect() { super(Outcome.PutCreatureInPlay); @@ -71,6 +75,9 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { this.number = 1; this.additionalSubType = null; this.attackedPlayer = null; + this.tokenPower = 0; + this.tokenToughness = 0; + this.gainsFlying = false; } public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId) { @@ -100,6 +107,10 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { } public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId, CardType additionalCardType, boolean gainsHaste, int number, boolean tapped, boolean attacking, UUID attackedPlayer) { + this(playerId, additionalCardType, gainsHaste, number, tapped, attacking, null, 0, 0, false); + } + + public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId, CardType additionalCardType, boolean gainsHaste, int number, boolean tapped, boolean attacking, UUID attackedPlayer, int power, int toughness, boolean gainsFlying) { super(Outcome.PutCreatureInPlay); this.playerId = playerId; this.additionalCardType = additionalCardType; @@ -108,8 +119,11 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { this.number = number; this.tapped = tapped; this.attacking = attacking; - this.attackedPlayer = attackedPlayer; - } + this.attackedPlayer = attackedPlayer; + this.tokenPower = power; + this.tokenToughness = toughness; + this.gainsFlying = gainsFlying; + } public PutTokenOntoBattlefieldCopyTargetEffect(final PutTokenOntoBattlefieldCopyTargetEffect effect) { super(effect); @@ -122,6 +136,9 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { this.tapped = effect.tapped; this.attacking = effect.attacking; this.attackedPlayer = effect.attackedPlayer; + this.tokenPower = effect.tokenPower; + this.tokenToughness = effect.tokenToughness; + this.gainsFlying = effect.gainsFlying; } @Override @@ -171,6 +188,13 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { if (gainsHaste) { token.addAbility(HasteAbility.getInstance()); } + if (gainsFlying) { + token.addAbility(FlyingAbility.getInstance()); + } + if (tokenPower != 0 || tokenToughness != 0) { + token.power.setValue(tokenPower); + token.toughness.setValue(tokenToughness); + } if (additionalSubType != null && !token.getSubtype().contains(additionalSubType)) { token.getSubtype().add(additionalSubType); } From 8a4a1933b106444d3235f4c13e053b597c7b58fb Mon Sep 17 00:00:00 2001 From: drmDev Date: Mon, 4 Jul 2016 06:26:26 -0400 Subject: [PATCH 2/4] Soul Separator fixes --- .../mage/sets/eldritchmoon/SoulSeparator.java | 8 ++- Mage/src/main/java/mage/MageObjectImpl.java | 4 +- ...tTokenOntoBattlefieldCopyTargetEffect.java | 8 +-- .../java/mage/game/permanent/token/Token.java | 14 +++++ .../game/permanent/token/ZombieToken2.java | 52 +++++++++++++++++++ 5 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java b/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java index 2705925dd0..96577bcd9d 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java @@ -43,7 +43,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.game.Game; -import mage.game.permanent.token.ZombieToken; +import mage.game.permanent.token.ZombieToken2; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -105,13 +105,11 @@ class SoulSeparatorEffect extends OneShotEffect { boolean result = false; if (game.getState().getZone(creatureCard.getId()).equals(Zone.GRAVEYARD)) { result = controller.moveCardToExileWithInfo(creatureCard, null, "", source.getSourceId(), game, Zone.GRAVEYARD, true); - ZombieToken token = new ZombieToken(); - token.power.setValue(creatureCard.getPower().getValue()); - token.toughness.setValue(creatureCard.getToughness().getValue()); + ZombieToken2 token = new ZombieToken2(creatureCard.getPower().getValue(), creatureCard.getToughness().getValue()); token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); } return result; } return false; } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index e5f25bb552..ebb8fc674f 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -54,8 +54,8 @@ public abstract class MageObjectImpl implements MageObject { protected List supertype = new ArrayList<>(); protected Abilities abilities; protected String text; - public MageInt power; - public MageInt toughness; + protected MageInt power; + protected MageInt toughness; protected boolean copy; public MageObjectImpl() { diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java index 179f22349d..27150755bd 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java @@ -179,9 +179,10 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { return false; } - EmptyToken token = new EmptyToken(); + EmptyToken token = new EmptyToken(); CardUtil.copyTo(token).from(copyFrom); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer) applier.apply(game, token); + if (additionalCardType != null && !token.getCardType().contains(additionalCardType)) { token.getCardType().add(additionalCardType); } @@ -192,12 +193,13 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { token.addAbility(FlyingAbility.getInstance()); } if (tokenPower != 0 || tokenToughness != 0) { - token.power.setValue(tokenPower); - token.toughness.setValue(tokenToughness); + token.setPower(tokenPower); + token.setToughness(tokenToughness); } if (additionalSubType != null && !token.getSubtype().contains(additionalSubType)) { token.getSubtype().add(additionalSubType); } + token.putOntoBattlefield(number, game, source.getSourceId(), playerId == null ? source.getControllerId() : playerId, tapped, attacking, attackedPlayer); for (UUID tokenId : token.getLastAddedTokenIds()) { // by cards like Doubling Season multiple tokens can be added to the battlefield Permanent tokenPermanent = game.getPermanent(tokenId); diff --git a/Mage/src/main/java/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java index 172cc354d3..984f9a7e88 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Token.java @@ -81,6 +81,12 @@ public class Token extends MageObjectImpl { this.name = name; this.description = description; } + + public Token(String name, String description, int power, int toughness) { + this(name, description); + this.power.setValue(power); + this.toughness.setValue(toughness); + } public Token(String name, String description, ObjectColor color, List subtype, int power, int toughness, Abilities abilities) { this(name, description); @@ -212,6 +218,14 @@ public class Token extends MageObjectImpl { } return false; } + + public void setPower(int power) { + this.power.setValue(power); + } + + public void setToughness(int toughness) { + this.toughness.setValue(toughness); + } public int getTokenType() { return tokenType; diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java new file mode 100644 index 0000000000..0b6967692e --- /dev/null +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java @@ -0,0 +1,52 @@ +/* + * 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.game.permanent.token; + +import mage.MageInt; +import mage.constants.CardType; + +/** + * + * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) + */ +public class ZombieToken2 extends Token { + + public ZombieToken2() { + super("", ""); + } + + public ZombieToken2(int zPower, int zToughness) { + super("Zombie", String.valueOf(zPower) + "/" + String.valueOf(zToughness) + " black Zombie creature token"); + cardType.add(CardType.CREATURE); + color.setBlack(true); + subtype.add("Zombie"); + power = new MageInt(zPower); + toughness = new MageInt(zToughness); + setOriginalExpansionSetCode("EMN"); + } +} From 0c747a1d41a5075e7e6c84747b0b2f7b5de52757 Mon Sep 17 00:00:00 2001 From: drmDev Date: Mon, 4 Jul 2016 10:08:30 -0400 Subject: [PATCH 3/4] adjusted default values for power and toughness --- .../common/PutTokenOntoBattlefieldCopyTargetEffect.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java index 27150755bd..e0547d5d77 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java @@ -75,8 +75,8 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { this.number = 1; this.additionalSubType = null; this.attackedPlayer = null; - this.tokenPower = 0; - this.tokenToughness = 0; + this.tokenPower = Integer.MIN_VALUE; + this.tokenToughness = Integer.MIN_VALUE; this.gainsFlying = false; } @@ -192,8 +192,10 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { if (gainsFlying) { token.addAbility(FlyingAbility.getInstance()); } - if (tokenPower != 0 || tokenToughness != 0) { + if (tokenPower != Integer.MIN_VALUE) { token.setPower(tokenPower); + } + if (tokenToughness != Integer.MIN_VALUE){ token.setToughness(tokenToughness); } if (additionalSubType != null && !token.getSubtype().contains(additionalSubType)) { From dfece2d26871b9579043b86368ba1a6d8a339ac8 Mon Sep 17 00:00:00 2001 From: drmDev Date: Mon, 4 Jul 2016 10:11:34 -0400 Subject: [PATCH 4/4] small fix on default values --- .../effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java index e0547d5d77..455c504667 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java @@ -107,7 +107,7 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect { } public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId, CardType additionalCardType, boolean gainsHaste, int number, boolean tapped, boolean attacking, UUID attackedPlayer) { - this(playerId, additionalCardType, gainsHaste, number, tapped, attacking, null, 0, 0, false); + this(playerId, additionalCardType, gainsHaste, number, tapped, attacking, null, Integer.MIN_VALUE, Integer.MIN_VALUE, false); } public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId, CardType additionalCardType, boolean gainsHaste, int number, boolean tapped, boolean attacking, UUID attackedPlayer, int power, int toughness, boolean gainsFlying) {