mirror of
https://github.com/correl/mage.git
synced 2024-11-14 19:19:32 +00:00
latest
This commit is contained in:
parent
4326bc4ddf
commit
648352aedc
8 changed files with 12 additions and 5 deletions
|
@ -46,6 +46,7 @@ public class Conflux extends ExpansionSet {
|
|||
private Conflux() {
|
||||
this.name = "Conflux";
|
||||
this.cards.add(FontOfMythos.class);
|
||||
this.cards.add(HellsparkElemental.class);
|
||||
this.cards.add(KnightOfTheReliquary.class);
|
||||
this.cards.add(MartialCoup.class);
|
||||
this.cards.add(NobleHierarch.class);
|
||||
|
|
|
@ -45,11 +45,14 @@ public class Magic2010 extends ExpansionSet {
|
|||
|
||||
private Magic2010() {
|
||||
this.name = "Magic 2010";
|
||||
this.cards.add(BallLightning.class);
|
||||
this.cards.add(BaneslayerAngel.class);
|
||||
this.cards.add(BirdsOfParadise.class);
|
||||
this.cards.add(Cancel.class);
|
||||
this.cards.add(CelestialPurge.class);
|
||||
this.cards.add(DragonskullSummit.class);
|
||||
this.cards.add(Earthquake.class);
|
||||
this.cards.add(EliteVanguard.class);
|
||||
this.cards.add(Flashfreeze.class);
|
||||
this.cards.add(GargoyleCastle.class);
|
||||
this.cards.add(GarrukWildspeaker.class);
|
||||
|
|
|
@ -51,6 +51,7 @@ public class ShardsOfAlara extends ExpansionSet {
|
|||
this.cards.add(BroodmateDragon.class);
|
||||
this.cards.add(CrumblingNecropolis.class);
|
||||
this.cards.add(ElspethKnightErrant.class);
|
||||
this.cards.add(HellsThunder.class);
|
||||
this.cards.add(JundPanorama.class);
|
||||
this.cards.add(KnightOfTheWhiteOrchid.class);
|
||||
this.cards.add(RafiqOfTheMany.class);
|
||||
|
|
|
@ -48,6 +48,7 @@ public class Worldwake extends ExpansionSet {
|
|||
this.cards.add(BasiliskCollar.class);
|
||||
this.cards.add(CelestialColonnade.class);
|
||||
this.cards.add(RagingRavine.class);
|
||||
this.cards.add(SearingBlaze.class);
|
||||
this.cards.add(SejiriSteppe.class);
|
||||
this.cards.add(StirringWildwood.class);
|
||||
this.cards.add(StoneforgeMystic.class);
|
||||
|
|
|
@ -52,6 +52,7 @@ public class Zendikar extends ExpansionSet {
|
|||
this.cards.add(ConquerorsPledge.class);
|
||||
this.cards.add(DayOfJudgment.class);
|
||||
this.cards.add(EmeriaAngel.class);
|
||||
this.cards.add(GoblinGuide.class);
|
||||
this.cards.add(GoblinRuinblaster.class);
|
||||
this.cards.add(KabiraCrossroads.class);
|
||||
this.cards.add(LotusCobra.class);
|
||||
|
|
|
@ -32,7 +32,7 @@ import java.util.UUID;
|
|||
import mage.Constants.CardType;
|
||||
import mage.Constants.Outcome;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.abilities.effects.common.ExileSourceEffect;
|
||||
import mage.abilities.effects.common.ExileSpellEffect;
|
||||
import mage.cards.Card;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.game.Game;
|
||||
|
@ -57,7 +57,7 @@ public class VengefulRebirth extends CardImpl {
|
|||
this.getSpellAbility().addTarget(new TargetCardInGraveyard());
|
||||
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
|
||||
this.getSpellAbility().addEffect(new VengefulRebirthEffect());
|
||||
this.getSpellAbility().addEffect(ExileSourceEffect.getInstance());
|
||||
this.getSpellAbility().addEffect(ExileSpellEffect.getInstance());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -54,6 +54,7 @@ import mage.game.permanent.Permanent;
|
|||
import mage.sets.Conflux;
|
||||
import mage.target.common.TargetCardInLibrary;
|
||||
import mage.target.common.TargetLandPermanent;
|
||||
import mage.target.common.TargetSacrificePermanent;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -80,10 +81,9 @@ public class KnightOfTheReliquary extends CardImpl {
|
|||
this.power = new MageInt(2);
|
||||
this.toughness = new MageInt(2);
|
||||
TargetCardInLibrary target = new TargetCardInLibrary(new FilterLandCard());
|
||||
TargetLandPermanent sac = new TargetLandPermanent(1, 1, filter, TargetController.YOU);
|
||||
Costs costs = new CostsImpl();
|
||||
costs.add(new TapSourceCost());
|
||||
costs.add(new SacrificeTargetCost(sac));
|
||||
costs.add(new SacrificeTargetCost(new TargetSacrificePermanent(1, 1, filter)));
|
||||
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KnightOfTheReliquaryEffect()));
|
||||
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, false, Outcome.PutLandInPlay), costs));
|
||||
}
|
||||
|
|
|
@ -84,7 +84,7 @@ class ArchiveTrapAlternativeCost extends AlternativeCost {
|
|||
|
||||
@Override
|
||||
public boolean isAvailable(Game game) {
|
||||
Watcher watcher = game.getState().getWatchers().get("LibrarySearched");
|
||||
Watcher watcher = game.getState().getWatchers().get(this.ability.getControllerId(), "LibrarySearched");
|
||||
if (watcher != null && watcher.conditionMet())
|
||||
return true;
|
||||
return false;
|
||||
|
|
Loading…
Reference in a new issue