github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed that Daretti, Ingenious Iconoclast's -1 ability targeted an artifact creature instead of artifact or creature. Fixed that Order of Succession's choosing of creatures was targeted.

Browse source
This commit is contained in:
fireshoes 2016-10-09 23:39:11 -05:00
parent 5dd06d22d8
commit 5009c2c149
2 changed files with 147 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

282
Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java
View file

@ -1,136 +1,146 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.cards.d; package mage.cards.d;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility; import mage.abilities.LoyaltyAbility;
import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility;
import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DoIfCostPaid;
import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect; import mage.abilities.effects.common.PutTokenOntoBattlefieldCopyTargetEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.filter.StaticFilters; import mage.filter.FilterPermanent;
import mage.filter.common.FilterArtifactCard; import mage.filter.common.FilterArtifactCard;
import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledArtifactPermanent;
import mage.game.Game; import mage.filter.predicate.Predicates;
import mage.game.permanent.token.Token; import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.target.TargetPermanent; import mage.game.Game;
import mage.target.common.TargetCardInGraveyardOrBattlefield; import mage.game.permanent.token.Token;
import mage.target.common.TargetControlledPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCardInGraveyardOrBattlefield;
/** import mage.target.common.TargetControlledPermanent;
*
* @author LevelX2 /**
*/ *
public class DarettiIngeniousIconoclast extends CardImpl { * @author LevelX2
*/
public DarettiIngeniousIconoclast(UUID ownerId, CardSetInfo setInfo) { public class DarettiIngeniousIconoclast extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{1}{B}{R}");
this.subtype.add("Daretti"); private static final FilterPermanent filter = new FilterPermanent("artifact or creature");
this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); static {
filter.add(Predicates.or(
// +1: Put a 1/1 colorless Construct artifact creature token with defender onto the battlefield. new CardTypePredicate(CardType.ARTIFACT),
LoyaltyAbility ability = new LoyaltyAbility(new CreateTokenEffect(new DarettiConstructToken()), 1); new CardTypePredicate(CardType.CREATURE)));
this.addAbility(ability); }
// -1: You may sacrifice an artifact. If you do, destroy target artifact or creature. public DarettiIngeniousIconoclast(UUID ownerId, CardSetInfo setInfo) {
ability = new LoyaltyAbility( super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{1}{B}{R}");
new DoIfCostPaid(new DestroyTargetEffect(""), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))), this.subtype.add("Daretti");
-1);
ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ARTIFACT_CREATURE_PERMANENT)); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3));
this.addAbility(ability);
// +1: Put a 1/1 colorless Construct artifact creature token with defender onto the battlefield.
// -6: Choose target artifact card in a graveyard or artifact on the battlefield. Put three tokens that are copies of it onto the battlefield. LoyaltyAbility ability = new LoyaltyAbility(new CreateTokenEffect(new DarettiConstructToken()), 1);
ability = new LoyaltyAbility( this.addAbility(ability);
new PutTokenOntoBattlefieldCopyTargetEffect(null, null, false, 3),
-6); // -1: You may sacrifice an artifact. If you do, destroy target artifact or creature.
ability.addTarget(new TargetCardInGraveyardOrBattlefield(new FilterArtifactCard("artifact card in a graveyard or artifact on the battlefield"))); ability = new LoyaltyAbility(
this.addAbility(ability); new DoIfCostPaid(new DestroyTargetEffect(""), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))),
-1);
} ability.addTarget(new TargetPermanent(filter));
this.addAbility(ability);
public DarettiIngeniousIconoclast(final DarettiIngeniousIconoclast card) {
super(card); // -6: Choose target artifact card in a graveyard or artifact on the battlefield. Put three tokens that are copies of it onto the battlefield.
} ability = new LoyaltyAbility(
new PutTokenOntoBattlefieldCopyTargetEffect(null, null, false, 3),
@Override -6);
public DarettiIngeniousIconoclast copy() { ability.addTarget(new TargetCardInGraveyardOrBattlefield(new FilterArtifactCard("artifact card in a graveyard or artifact on the battlefield")));
return new DarettiIngeniousIconoclast(this); this.addAbility(ability);
}
} }
class DarettiIngeniousIconoclastEffect extends OneShotEffect { public DarettiIngeniousIconoclast(final DarettiIngeniousIconoclast card) {
super(card);
public DarettiIngeniousIconoclastEffect() { }
super(Outcome.Benefit);
this.staticText = "Choose target artifact card in a graveyard or artifact on the battlefield. Put three tokens that are copies of it onto the battlefield"; @Override
} public DarettiIngeniousIconoclast copy() {
return new DarettiIngeniousIconoclast(this);
public DarettiIngeniousIconoclastEffect(final DarettiIngeniousIconoclastEffect effect) { }
super(effect); }
}
class DarettiIngeniousIconoclastEffect extends OneShotEffect {
@Override
public DarettiIngeniousIconoclastEffect copy() { public DarettiIngeniousIconoclastEffect() {
return new DarettiIngeniousIconoclastEffect(this); super(Outcome.Benefit);
} this.staticText = "Choose target artifact card in a graveyard or artifact on the battlefield. Put three tokens that are copies of it onto the battlefield";
}
@Override
public boolean apply(Game game, Ability source) { public DarettiIngeniousIconoclastEffect(final DarettiIngeniousIconoclastEffect effect) {
return false; super(effect);
} }
}
@Override
class DarettiConstructToken extends Token { public DarettiIngeniousIconoclastEffect copy() {
return new DarettiIngeniousIconoclastEffect(this);
public DarettiConstructToken() { }
this("CNS");
} @Override
public boolean apply(Game game, Ability source) {
public DarettiConstructToken(String setCode) { return false;
super("Construct", "1/1 colorless Construct artifact creature token with defender"); }
this.setOriginalExpansionSetCode(setCode); }
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE); class DarettiConstructToken extends Token {
subtype.add("Construct");
power = new MageInt(1); public DarettiConstructToken() {
toughness = new MageInt(1); this("CNS");
}
addAbility(DefenderAbility.getInstance());
} public DarettiConstructToken(String setCode) {
} super("Construct", "1/1 colorless Construct artifact creature token with defender");
this.setOriginalExpansionSetCode(setCode);
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add("Construct");
power = new MageInt(1);
toughness = new MageInt(1);
addAbility(DefenderAbility.getInstance());
}
}

2
Mage.Sets/src/mage/cards/o/OrderOfSuccession.java
View file

@ -125,7 +125,7 @@ class OrderOfSuccessionEffect extends OneShotEffect {
FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature controlled by ").append(nextPlayer.getLogName()).toString()); FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature controlled by ").append(nextPlayer.getLogName()).toString());
filter.add(new ControllerIdPredicate(nextPlayer.getId())); filter.add(new ControllerIdPredicate(nextPlayer.getId()));
Target target = new TargetCreaturePermanent(filter); Target target = new TargetCreaturePermanent(filter);
target.setNotTarget(false); target.setNotTarget(true);
if (target.canChoose(source.getSourceId(), currentPlayer.getId(), game)) { if (target.canChoose(source.getSourceId(), currentPlayer.getId(), game)) {
if (currentPlayer.chooseTarget(outcome, target, source, game)) { if (currentPlayer.chooseTarget(outcome, target, source, game)) {
playerCreature.put(currentPlayer.getId(), target.getFirstTarget()); playerCreature.put(currentPlayer.getId(), target.getFirstTarget());