External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 12:49:39 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some changes/fixes to conspire ability.

Browse source
This commit is contained in:
LevelX2 2015-10-03 13:33:22 +02:00
parent 8e50c18d8c
commit 7b68604471
14 changed files with 234 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/shadowmoor/AEthertow.java
View file

@ -58,7 +58,7 @@ public class AEthertow extends CardImpl {
this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE));
}
public AEthertow(final AEthertow card) {

8
Mage.Sets/src/mage/sets/shadowmoor/BarkshellBlessing.java
View file

@ -41,7 +41,7 @@ import mage.target.common.TargetCreaturePermanent;
* @author jeffwadsworth
*/
public class BarkshellBlessing extends CardImpl {
public BarkshellBlessing(UUID ownerId) {
super(ownerId, 224, "Barkshell Blessing", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G/W}");
this.expansionSetCode = "SHM";
@ -51,13 +51,13 @@ public class BarkshellBlessing extends CardImpl {
this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn));
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE));
}
public BarkshellBlessing(final BarkshellBlessing card) {
super(card);
}
@Override
public BarkshellBlessing copy() {
return new BarkshellBlessing(this);

4
Mage.Sets/src/mage/sets/shadowmoor/BurnTrail.java
View file

@ -48,9 +48,9 @@ public class BurnTrail extends CardImpl {
// Burn Trail deals 3 damage to target creature or player.
this.getSpellAbility().addEffect(new DamageTargetEffect(3));
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE));
}
public BurnTrail(final BurnTrail card) {

2
Mage.Sets/src/mage/sets/shadowmoor/DisturbingPlot.java
View file

@ -51,7 +51,7 @@ public class DisturbingPlot extends CardImpl {
this.getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")));
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE));
}

2
Mage.Sets/src/mage/sets/shadowmoor/GhastlyDiscovery.java
View file

@ -52,7 +52,7 @@ public class GhastlyDiscovery extends CardImpl {
this.getSpellAbility().addEffect(new GhastlyDiscoveryEffect());
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.NONE));
}
public GhastlyDiscovery(final GhastlyDiscovery card) {

2
Mage.Sets/src/mage/sets/shadowmoor/Giantbaiting.java
View file

@ -58,7 +58,7 @@ public class Giantbaiting extends CardImpl {
this.getSpellAbility().addEffect(new GiantbaitingEffect());
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.NONE));
}

4
Mage.Sets/src/mage/sets/shadowmoor/GleefulSabotage.java
View file

@ -49,9 +49,9 @@ public class GleefulSabotage extends CardImpl {
// Destroy target artifact or enchantment.
this.getSpellAbility().addEffect(new DestroyTargetEffect());
this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactOrEnchantmentPermanent()));
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE));
}
public GleefulSabotage(final GleefulSabotage card) {

6
Mage.Sets/src/mage/sets/shadowmoor/MemorySluice.java
View file

@ -48,10 +48,10 @@ public class MemorySluice extends CardImpl {
// Target player puts the top four cards of his or her library into his or her graveyard.
this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(4));
this.getSpellAbility().addTarget(new TargetPlayer());
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE));
}
public MemorySluice(final MemorySluice card) {

8
Mage.Sets/src/mage/sets/shadowmoor/MineExcavation.java
View file

@ -43,9 +43,9 @@ import mage.target.common.TargetCardInGraveyard;
* @author jeffwadsworth
*/
public class MineExcavation extends CardImpl {
private static final FilterCard filter = new FilterCard("artifact or enchantment card in a graveyard");
static {
filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT),
new CardTypePredicate(CardType.ENCHANTMENT)));
@ -58,9 +58,9 @@ public class MineExcavation extends CardImpl {
// Return target artifact or enchantment card from a graveyard to its owner's hand.
this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect());
this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter));
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE));
}
public MineExcavation(final MineExcavation card) {

2
Mage.Sets/src/mage/sets/shadowmoor/TraitorsRoar.java
View file

@ -64,7 +64,7 @@ public class TraitorsRoar extends CardImpl {
this.getSpellAbility().addEffect(new TraitorsRoarEffect());
// Conspire
this.addAbility(new ConspireAbility(this));
this.addAbility(new ConspireAbility(getId(), ConspireAbility.ConspireTargets.ONE));
}