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

Merge branch 'master' of github.com:mnapoleon/mage

Browse source
This commit is contained in:
Michael Napoleon 2015-03-03 18:22:27 -05:00
commit 9f378710ed
327 changed files with 346 additions and 360 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/ajanivsnicolbolas/DimirCutpurse.java
View file

@ -34,7 +34,7 @@ import java.util.UUID;
* @author jeffwadsworth
*/
public class DimirCutpurse extends mage.sets.ravnika.DimirCutpurse {
public class DimirCutpurse extends mage.sets.ravnica.DimirCutpurse {
public DimirCutpurse(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/ajanivsnicolbolas/FiremaneAngel.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class FiremaneAngel extends mage.sets.ravnika.FiremaneAngel {
public class FiremaneAngel extends mage.sets.ravnica.FiremaneAngel {
public FiremaneAngel(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/ajanivsnicolbolas/LightningHelix.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class LightningHelix extends mage.sets.ravnika.LightningHelix {
public class LightningHelix extends mage.sets.ravnica.LightningHelix {
public LightningHelix(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/ajanivsnicolbolas/LoxodonHierarch.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author dustinconrad
*/
public class LoxodonHierarch extends mage.sets.ravnika.LoxodonHierarch {
public class LoxodonHierarch extends mage.sets.ravnica.LoxodonHierarch {
public LoxodonHierarch(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/ajanivsnicolbolas/Moroii.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class Moroii extends mage.sets.ravnika.Moroii {
public class Moroii extends mage.sets.ravnica.Moroii {
public Moroii(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/ajanivsnicolbolas/SearingMeditation.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SearingMeditation extends mage.sets.ravnika.SearingMeditation {
public class SearingMeditation extends mage.sets.ravnica.SearingMeditation {
public SearingMeditation(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/ajanivsnicolbolas/SurveillingSprite.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SurveillingSprite extends mage.sets.ravnika.SurveillingSprite {
public class SurveillingSprite extends mage.sets.ravnica.SurveillingSprite {
public SurveillingSprite(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/ajanivsnicolbolas/VituGhaziTheCityTree.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class VituGhaziTheCityTree extends mage.sets.ravnika.VituGhaziTheCityTree {
public class VituGhaziTheCityTree extends mage.sets.ravnica.VituGhaziTheCityTree {
public VituGhaziTheCityTree(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/archenemy/DimirSignet.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class DimirSignet extends mage.sets.ravnika.DimirSignet {
public class DimirSignet extends mage.sets.ravnica.DimirSignet {
public DimirSignet(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/archenemy/SelesnyaGuildmage.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaGuildmage extends mage.sets.ravnika.SelesnyaGuildmage {
public class SelesnyaGuildmage extends mage.sets.ravnica.SelesnyaGuildmage {
public SelesnyaGuildmage(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/archenemy/VituGhaziTheCityTree.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class VituGhaziTheCityTree extends mage.sets.ravnika.VituGhaziTheCityTree {
public class VituGhaziTheCityTree extends mage.sets.ravnica.VituGhaziTheCityTree {
public VituGhaziTheCityTree(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/archenemy/Watchwolf.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class Watchwolf extends mage.sets.ravnika.Watchwolf {
public class Watchwolf extends mage.sets.ravnica.Watchwolf {
public Watchwolf(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/BorosGuildmage.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class BorosGuildmage extends mage.sets.ravnika.BorosGuildmage {
public class BorosGuildmage extends mage.sets.ravnica.BorosGuildmage {
public BorosGuildmage(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/BorosSignet.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class BorosSignet extends mage.sets.ravnika.BorosSignet {
public class BorosSignet extends mage.sets.ravnica.BorosSignet {
public BorosSignet(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/DimirAqueduct.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class DimirAqueduct extends mage.sets.ravnika.DimirAqueduct {
public class DimirAqueduct extends mage.sets.ravnica.DimirAqueduct {
public DimirAqueduct(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/DimirSignet.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class DimirSignet extends mage.sets.ravnika.DimirSignet {
public class DimirSignet extends mage.sets.ravnica.DimirSignet {
public DimirSignet(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/FistsOfIronwood.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class FistsOfIronwood extends mage.sets.ravnika.FistsOfIronwood {
public class FistsOfIronwood extends mage.sets.ravnica.FistsOfIronwood {
public FistsOfIronwood(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/GolgariGuildmage.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariGuildmage extends mage.sets.ravnika.GolgariGuildmage {
public class GolgariGuildmage extends mage.sets.ravnica.GolgariGuildmage {
public GolgariGuildmage(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/GolgariRotFarm.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariRotFarm extends mage.sets.ravnika.GolgariRotFarm {
public class GolgariRotFarm extends mage.sets.ravnica.GolgariRotFarm {
public GolgariRotFarm(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/GolgariSignet.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariSignet extends mage.sets.ravnika.GolgariSignet {
public class GolgariSignet extends mage.sets.ravnica.GolgariSignet {
public GolgariSignet(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/Hex.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class Hex extends mage.sets.ravnika.Hex {
public class Hex extends mage.sets.ravnica.Hex {
public Hex(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/SelesnyaEvangel.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaEvangel extends mage.sets.ravnika.SelesnyaEvangel {
public class SelesnyaEvangel extends mage.sets.ravnica.SelesnyaEvangel {
public SelesnyaEvangel(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/SelesnyaGuildmage.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaGuildmage extends mage.sets.ravnika.SelesnyaGuildmage {
public class SelesnyaGuildmage extends mage.sets.ravnica.SelesnyaGuildmage {
public SelesnyaGuildmage(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/SelesnyaSanctuary.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaSanctuary extends mage.sets.ravnika.SelesnyaSanctuary {
public class SelesnyaSanctuary extends mage.sets.ravnica.SelesnyaSanctuary {
public SelesnyaSanctuary(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander/SelesnyaSignet.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaSignet extends mage.sets.ravnika.SelesnyaSignet {
public class SelesnyaSignet extends mage.sets.ravnica.SelesnyaSignet {
public SelesnyaSignet(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2013/ElvishSkysweeper.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class ElvishSkysweeper extends mage.sets.ravnika.ElvishSkysweeper {
public class ElvishSkysweeper extends mage.sets.ravnica.ElvishSkysweeper {
public ElvishSkysweeper(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2013/GolgariGuildmage.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariGuildmage extends mage.sets.ravnika.GolgariGuildmage {
public class GolgariGuildmage extends mage.sets.ravnica.GolgariGuildmage {
public GolgariGuildmage(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2013/GolgariRotFarm.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariRotFarm extends mage.sets.ravnika.GolgariRotFarm {
public class GolgariRotFarm extends mage.sets.ravnica.GolgariRotFarm {
public GolgariRotFarm(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2013/HuntedTroll.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class HuntedTroll extends mage.sets.ravnika.HuntedTroll {
public class HuntedTroll extends mage.sets.ravnica.HuntedTroll {
public HuntedTroll(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2013/SelesnyaGuildmage.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaGuildmage extends mage.sets.ravnika.SelesnyaGuildmage {
public class SelesnyaGuildmage extends mage.sets.ravnica.SelesnyaGuildmage {
public SelesnyaGuildmage(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2013/SelesnyaSanctuary.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaSanctuary extends mage.sets.ravnika.SelesnyaSanctuary {
public class SelesnyaSanctuary extends mage.sets.ravnica.SelesnyaSanctuary {
public SelesnyaSanctuary(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2013/SelesnyaSignet.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaSignet extends mage.sets.ravnika.SelesnyaSignet {
public class SelesnyaSignet extends mage.sets.ravnica.SelesnyaSignet {
public SelesnyaSignet(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2013/VituGhaziTheCityTree.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class VituGhaziTheCityTree extends mage.sets.ravnika.VituGhaziTheCityTree {
public class VituGhaziTheCityTree extends mage.sets.ravnica.VituGhaziTheCityTree {
public VituGhaziTheCityTree(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2014/CompulsiveResearch.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class CompulsiveResearch extends mage.sets.ravnika.CompulsiveResearch {
public class CompulsiveResearch extends mage.sets.ravnica.CompulsiveResearch {
public CompulsiveResearch(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2014/ElvishSkysweeper.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class ElvishSkysweeper extends mage.sets.ravnika.ElvishSkysweeper {
public class ElvishSkysweeper extends mage.sets.ravnica.ElvishSkysweeper {
public ElvishSkysweeper(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/commander2014/PrimordialSage.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class PrimordialSage extends mage.sets.ravnika.PrimordialSage {
public class PrimordialSage extends mage.sets.ravnica.PrimordialSage {
public PrimordialSage(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/conspiracy/CompulsiveResearch.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class CompulsiveResearch extends mage.sets.ravnika.CompulsiveResearch {
public class CompulsiveResearch extends mage.sets.ravnica.CompulsiveResearch {
public CompulsiveResearch(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/conspiracy/CourierHawk.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class CourierHawk extends mage.sets.ravnika.CourierHawk {
public class CourierHawk extends mage.sets.ravnica.CourierHawk {
public CourierHawk(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/conspiracy/DimirDoppelganger.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class DimirDoppelganger extends mage.sets.ravnika.DimirDoppelganger {
public class DimirDoppelganger extends mage.sets.ravnica.DimirDoppelganger {
public DimirDoppelganger(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/divinevsdemonic/StinkweedImp.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class StinkweedImp extends mage.sets.ravnika.StinkweedImp {
public class StinkweedImp extends mage.sets.ravnica.StinkweedImp {
public StinkweedImp(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/dragonsmaze/Putrefy.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class Putrefy extends mage.sets.ravnika.Putrefy {
public class Putrefy extends mage.sets.ravnica.Putrefy {
public Putrefy(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/fridaynightmagic/ElvesOfDeepShadow.java
View file

@ -34,7 +34,7 @@ import mage.constants.Rarity;
*
* @author fireshoes
*/
public class ElvesOfDeepShadow extends mage.sets.ravnika.ElvesOfDeepShadow {
public class ElvesOfDeepShadow extends mage.sets.ravnica.ElvesOfDeepShadow {
public ElvesOfDeepShadow(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/fridaynightmagic/Farseek.java
View file

@ -34,7 +34,7 @@ import mage.constants.Rarity;
*
* @author fireshoes
*/
public class Farseek extends mage.sets.ravnika.Farseek {
public class Farseek extends mage.sets.ravnica.Farseek {
public Farseek(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/fridaynightmagic/Remand.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author fireshoes
*/
public class Remand extends mage.sets.ravnika.Remand {
public class Remand extends mage.sets.ravnica.Remand {
public Remand(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/fridaynightmagic/Watchwolf.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author fireshoes
*/
public class Watchwolf extends mage.sets.ravnika.Watchwolf {
public class Watchwolf extends mage.sets.ravnica.Watchwolf {
public Watchwolf(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/garrukvsliliana/KeeningBanshee.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class KeeningBanshee extends mage.sets.ravnika.KeeningBanshee {
public class KeeningBanshee extends mage.sets.ravnica.KeeningBanshee {
public KeeningBanshee(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/gatecrash/SacredFoundry.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SacredFoundry extends mage.sets.ravnika.SacredFoundry {
public class SacredFoundry extends mage.sets.ravnica.SacredFoundry {
public SacredFoundry(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/gatecrash/SkyknightLegionnaire.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author Plopman
*/
public class SkyknightLegionnaire extends mage.sets.ravnika.SkyknightLegionnaire {
public class SkyknightLegionnaire extends mage.sets.ravnica.SkyknightLegionnaire {
public SkyknightLegionnaire(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/gatecrash/WateryGrave.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class WateryGrave extends mage.sets.ravnika.WateryGrave {
public class WateryGrave extends mage.sets.ravnica.WateryGrave {
public WateryGrave(UUID ownerId) {
super(ownerId);

6
Mage.Sets/src/mage/sets/invasion/CapashenUnicorn.java
View file

@ -31,7 +31,6 @@ import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -53,7 +52,8 @@ public class CapashenUnicorn extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment");
static {
filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.ENCHANTMENT)));
filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT),
new CardTypePredicate(CardType.ENCHANTMENT)));
}
public CapashenUnicorn(UUID ownerId) {
@ -64,7 +64,7 @@ public class CapashenUnicorn extends CardImpl {
this.toughness = new MageInt(2);
// {1}{W}, {tap}, Sacrifice Capashen Unicorn: Destroy target artifact or enchantment.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{1}"));
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}"));
ability.addCost(new TapSourceCost());
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetPermanent(filter));

9
Mage.Sets/src/mage/sets/invasion/CrusadingKnight.java
View file

@ -31,12 +31,14 @@ import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.continious.BoostEnchantedEffect;
import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/**
@ -46,8 +48,9 @@ import mage.filter.predicate.permanent.ControllerPredicate;
public class CrusadingKnight extends CardImpl {
private static final FilterCard filterBlack = new FilterCard("Black");
private static final FilterLandPermanent filterSwamps = new FilterLandPermanent("Swamps your opponent controls");
private static final FilterLandPermanent filterSwamps = new FilterLandPermanent("Swamp your opponent controls");
static {
filterSwamps.add(new SubtypePredicate("Swamp"));
filterSwamps.add(new ControllerPredicate(TargetController.OPPONENT));
}
@ -64,7 +67,7 @@ public class CrusadingKnight extends CardImpl {
// Crusading Knight gets +1/+1 for each Swamp your opponents control.
PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filterSwamps, 1);
SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield));
SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield));
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/invasion/Firescreamer.java
View file

@ -31,9 +31,7 @@ import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.ReturnToHandSourceEffect;
import mage.abilities.effects.common.continious.BoostEnchantedEffect;
import mage.abilities.effects.common.continious.BoostSourceEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;

8
Mage.Sets/src/mage/sets/invasion/MaraudingKnight.java
View file

@ -29,14 +29,17 @@ package mage.sets.invasion;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.continious.BoostEnchantedEffect;
import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/**
@ -48,6 +51,7 @@ public class MaraudingKnight extends CardImpl {
private static final FilterCard filterWhite = new FilterCard("White");
private static final FilterLandPermanent filterPlains = new FilterLandPermanent("Plains your opponent controls");
static {
filterPlains.add(new SubtypePredicate("Plains"));
filterPlains.add(new ControllerPredicate(TargetController.OPPONENT));
}
@ -64,7 +68,7 @@ public class MaraudingKnight extends CardImpl {
// Marauding Knight gets +1/+1 for each Plains your opponents control.
PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filterPlains, 1);
SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield));
SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/sets/invasion/SerpentineKavu.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
import mage.abilities.keyword.HasteAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;

2
Mage.Sets/src/mage/sets/izzetvsgolgari/ElvesOfDeepShadow.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class ElvesOfDeepShadow extends mage.sets.ravnika.ElvesOfDeepShadow {
public class ElvesOfDeepShadow extends mage.sets.ravnica.ElvesOfDeepShadow {
public ElvesOfDeepShadow(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariGraveTroll.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariGraveTroll extends mage.sets.ravnika.GolgariGraveTroll {
public class GolgariGraveTroll extends mage.sets.ravnica.GolgariGraveTroll {
public GolgariGraveTroll(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotFarm.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariRotFarm extends mage.sets.ravnika.GolgariRotFarm {
public class GolgariRotFarm extends mage.sets.ravnica.GolgariRotFarm {
public GolgariRotFarm(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariRotwurm.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariRotwurm extends mage.sets.ravnika.GolgariRotwurm {
public class GolgariRotwurm extends mage.sets.ravnica.GolgariRotwurm {
public GolgariRotwurm(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariSignet.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariSignet extends mage.sets.ravnika.GolgariSignet {
public class GolgariSignet extends mage.sets.ravnica.GolgariSignet {
public GolgariSignet(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/GolgariThug.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GolgariThug extends mage.sets.ravnika.GolgariThug {
public class GolgariThug extends mage.sets.ravnica.GolgariThug {
public GolgariThug(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/GreaterMossdog.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GreaterMossdog extends mage.sets.ravnika.GreaterMossdog {
public class GreaterMossdog extends mage.sets.ravnica.GreaterMossdog {
public GreaterMossdog(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/LifeFromTheLoam.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class LifeFromTheLoam extends mage.sets.ravnika.LifeFromTheLoam {
public class LifeFromTheLoam extends mage.sets.ravnica.LifeFromTheLoam {
public LifeFromTheLoam(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/NightmareVoid.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class NightmareVoid extends mage.sets.ravnika.NightmareVoid {
public class NightmareVoid extends mage.sets.ravnica.NightmareVoid {
public NightmareVoid(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/Putrefy.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class Putrefy extends mage.sets.ravnika.Putrefy {
public class Putrefy extends mage.sets.ravnica.Putrefy {
public Putrefy(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/ShamblingShell.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class ShamblingShell extends mage.sets.ravnika.ShamblingShell {
public class ShamblingShell extends mage.sets.ravnica.ShamblingShell {
public ShamblingShell(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/StinkweedImp.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class StinkweedImp extends mage.sets.ravnika.StinkweedImp {
public class StinkweedImp extends mage.sets.ravnica.StinkweedImp {
public StinkweedImp(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/izzetvsgolgari/VigorMortis.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author emerald000
*/
public class VigorMortis extends mage.sets.ravnika.VigorMortis {
public class VigorMortis extends mage.sets.ravnica.VigorMortis {
public VigorMortis(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/jacevsvraska/Remand.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class Remand extends mage.sets.ravnika.Remand {
public class Remand extends mage.sets.ravnica.Remand {
public Remand(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/jacevsvraska/VinelasherKudzu.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class VinelasherKudzu extends mage.sets.ravnika.VinelasherKudzu {
public class VinelasherKudzu extends mage.sets.ravnica.VinelasherKudzu {
public VinelasherKudzu(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/judgepromo/DarkConfidant.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author fireshoes
*/
public class DarkConfidant extends mage.sets.ravnika.DarkConfidant {
public class DarkConfidant extends mage.sets.ravnica.DarkConfidant {
public DarkConfidant(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/knightsvsdragons/SelesnyaSanctuary.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SelesnyaSanctuary extends mage.sets.ravnika.SelesnyaSanctuary {
public class SelesnyaSanctuary extends mage.sets.ravnica.SelesnyaSanctuary {
public SelesnyaSanctuary(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2012/BelltowerSphinx.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author nantuko
*/
public class BelltowerSphinx extends mage.sets.ravnika.BelltowerSphinx {
public class BelltowerSphinx extends mage.sets.ravnica.BelltowerSphinx {
public BelltowerSphinx(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2013/Farseek.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author North
*/
public class Farseek extends mage.sets.ravnika.Farseek {
public class Farseek extends mage.sets.ravnica.Farseek {
public Farseek(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2013/VedalkenEntrancer.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author North
*/
public class VedalkenEntrancer extends mage.sets.ravnika.VedalkenEntrancer {
public class VedalkenEntrancer extends mage.sets.ravnica.VedalkenEntrancer {
public VedalkenEntrancer(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2015/ChordOfCalling.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class ChordOfCalling extends mage.sets.ravnika.ChordOfCalling {
public class ChordOfCalling extends mage.sets.ravnica.ChordOfCalling {
public ChordOfCalling(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2015/DevouringLight.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class DevouringLight extends mage.sets.ravnika.DevouringLight {
public class DevouringLight extends mage.sets.ravnica.DevouringLight {
public DevouringLight(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2015/FrenziedGoblin.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class FrenziedGoblin extends mage.sets.ravnika.FrenziedGoblin {
public class FrenziedGoblin extends mage.sets.ravnica.FrenziedGoblin {
public FrenziedGoblin(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2015/GatherCourage.java
View file

@ -34,7 +34,7 @@ import mage.constants.Rarity;
*
* @author LevelX2
*/
public class GatherCourage extends mage.sets.ravnika.GatherCourage {
public class GatherCourage extends mage.sets.ravnica.GatherCourage {
public GatherCourage(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2015/Overwhelm.java
View file

@ -34,7 +34,7 @@ import mage.constants.Rarity;
*
* @author LevelX2
*/
public class Overwhelm extends mage.sets.ravnika.Overwhelm {
public class Overwhelm extends mage.sets.ravnica.Overwhelm {
public Overwhelm(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/magic2015/SiegeWurm.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class SiegeWurm extends mage.sets.ravnika.SiegeWurm {
public class SiegeWurm extends mage.sets.ravnica.SiegeWurm {
public SiegeWurm(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/mediainserts/BirdsOfParadise.java
View file

@ -30,7 +30,7 @@ package mage.sets.mediainserts;
import java.util.UUID;
public class BirdsOfParadise extends mage.sets.ravnika.BirdsOfParadise {
public class BirdsOfParadise extends mage.sets.ravnica.BirdsOfParadise {
public BirdsOfParadise(UUID ownerId) {
super(ownerId);

6
Mage.Sets/src/mage/sets/mercadianmasques/Bribery.java
View file

@ -53,13 +53,9 @@ public class Bribery extends CardImpl {
super(ownerId, 62, "Bribery", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}");
this.expansionSetCode = "MMQ";
this.color.setBlue(true);
// Search target opponent's library for a creature card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
this.getSpellAbility().addEffect(new BriberyEffect());
this.getSpellAbility().addTarget(new TargetOpponent());
}
public Bribery(final Bribery card) {
@ -97,7 +93,7 @@ class BriberyEffect extends OneShotEffect {
if (controller.searchLibrary(target, game, opponent.getId())) {
List<UUID> targets = target.getTargets();
for (UUID targetId : targets) {
Card card = opponent.getLibrary().remove(targetId, game);
Card card = opponent.getLibrary().getCard(targetId, game);
if (card != null) {
controller.putOntoBattlefieldWithInfo(card, game, Zone.LIBRARY, source.getSourceId());
}

2
Mage.Sets/src/mage/sets/modernmasters/DarkConfidant.java
View file

@ -34,7 +34,7 @@ import mage.constants.Rarity;
*
* @author LevelX2
*/
public class DarkConfidant extends mage.sets.ravnika.DarkConfidant {
public class DarkConfidant extends mage.sets.ravnica.DarkConfidant {
public DarkConfidant(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/modernmasters/GreaterMossdog.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class GreaterMossdog extends mage.sets.ravnika.GreaterMossdog {
public class GreaterMossdog extends mage.sets.ravnica.GreaterMossdog {
public GreaterMossdog(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/modernmasters/LifeFromTheLoam.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class LifeFromTheLoam extends mage.sets.ravnika.LifeFromTheLoam {
public class LifeFromTheLoam extends mage.sets.ravnica.LifeFromTheLoam {
public LifeFromTheLoam(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/modernmasters/LightningHelix.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class LightningHelix extends mage.sets.ravnika.LightningHelix {
public class LightningHelix extends mage.sets.ravnica.LightningHelix {
public LightningHelix(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/modernmasters/MoldervineCloak.java
View file

@ -34,7 +34,7 @@ import mage.constants.Rarity;
*
* @author LevelX2
*/
public class MoldervineCloak extends mage.sets.ravnika.MoldervineCloak {
public class MoldervineCloak extends mage.sets.ravnica.MoldervineCloak {
public MoldervineCloak(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/modernmasters/Sandsower.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class Sandsower extends mage.sets.ravnika.Sandsower {
public class Sandsower extends mage.sets.ravnica.Sandsower {
public Sandsower(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/modernmasters/StinkweedImp.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class StinkweedImp extends mage.sets.ravnika.StinkweedImp {
public class StinkweedImp extends mage.sets.ravnica.StinkweedImp {
public StinkweedImp(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/modernmasters/VedalkenDismisser.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class VedalkenDismisser extends mage.sets.ravnika.VedalkenDismisser {
public class VedalkenDismisser extends mage.sets.ravnica.VedalkenDismisser {
public VedalkenDismisser(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/modernmasters/VeteranArmorer.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class VeteranArmorer extends mage.sets.ravnika.VeteranArmorer {
public class VeteranArmorer extends mage.sets.ravnica.VeteranArmorer {
public VeteranArmorer(UUID ownerId) {
super(ownerId);

5
Mage.Sets/src/mage/sets/newphyrexia/SurgicalExtraction.java
View file

@ -59,16 +59,13 @@ public class SurgicalExtraction extends CardImpl {
private static final FilterCard filter = new FilterCard("card in a graveyard other than a basic land card");
static {
filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
filter.add(Predicates.not(new SupertypePredicate("Basic")));
filter.add(Predicates.not(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate("Basic"))));
}
public SurgicalExtraction(UUID ownerId) {
super(ownerId, 74, "Surgical Extraction", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{BP}");
this.expansionSetCode = "NPH";
this.color.setBlack(true);
// Choose target card in a graveyard other than a basic land card. Search its owner's graveyard,
// hand, and library for any number of cards with the same name as that card and exile them.
// Then that player shuffles his or her library.

8
Mage.Sets/src/mage/sets/planarchaos/Extirpate.java
View file

@ -35,14 +35,11 @@ import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.SplitSecondAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.common.FilterNonlandCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.NamePredicate;
@ -62,16 +59,13 @@ public class Extirpate extends CardImpl {
private static final FilterCard filter = new FilterCard("card in a graveyard other than a basic land card");
static {
filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
filter.add(Predicates.not(new SupertypePredicate("Basic")));
filter.add(Predicates.not(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate("Basic"))));
}
public Extirpate(UUID ownerId) {
super(ownerId, 71, "Extirpate", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{B}");
this.expansionSetCode = "PLC";
this.color.setBlack(true);
// Split second
this.addAbility(new SplitSecondAbility());
// Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles his or her library.

2
Mage.Sets/src/mage/sets/planechase/BorosGuildmage.java
View file

@ -34,7 +34,7 @@ import java.util.UUID;
*
* @author Loki
*/
public class BorosGuildmage extends mage.sets.ravnika.BorosGuildmage {
public class BorosGuildmage extends mage.sets.ravnica.BorosGuildmage {
public BorosGuildmage (UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/planechase/BorosSignet.java
View file

@ -34,7 +34,7 @@ import java.util.UUID;
*
* @author Loki
*/
public class BorosSignet extends mage.sets.ravnika.BorosSignet {
public class BorosSignet extends mage.sets.ravnica.BorosSignet {
public BorosSignet (UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/planechase/LightningHelix.java
View file

@ -34,7 +34,7 @@ import java.util.UUID;
*
* @author Loki
*/
public class LightningHelix extends mage.sets.ravnika.LightningHelix {
public class LightningHelix extends mage.sets.ravnica.LightningHelix {
public LightningHelix (UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/planechase2012/BrambleElemental.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class BrambleElemental extends mage.sets.ravnika.BrambleElemental {
public class BrambleElemental extends mage.sets.ravnica.BrambleElemental {
public BrambleElemental(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/planechase2012/DimirAqueduct.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author LevelX2
*/
public class DimirAqueduct extends mage.sets.ravnika.DimirAqueduct {
public class DimirAqueduct extends mage.sets.ravnica.DimirAqueduct {
public DimirAqueduct(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/planechase2012/DimirInfiltrator.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author * @author LevelX2
*/
public class DimirInfiltrator extends mage.sets.ravnika.DimirInfiltrator {
public class DimirInfiltrator extends mage.sets.ravnica.DimirInfiltrator {
public DimirInfiltrator(UUID ownerId) {
super(ownerId);

2
Mage.Sets/src/mage/sets/planechase2012/DowsingShaman.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
*
* @author * @author LevelX2
*/
public class DowsingShaman extends mage.sets.ravnika.DowsingShaman {
public class DowsingShaman extends mage.sets.ravnica.DowsingShaman {
public DowsingShaman(UUID ownerId) {
super(ownerId);

Some files were not shown because too many files have changed in this diff Show more