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

Merge origin/master

Browse source
This commit is contained in:
fireshoes 2015-06-24 13:54:57 -05:00
commit bb694105a2
28 changed files with 554 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Mage.Client/src/main/java/mage/client/dialog/CardInfoWindowDialog.java
View file

@ -34,7 +34,6 @@
package mage.client.dialog; package mage.client.dialog;
import static com.sun.java.accessibility.util.AWTEventMonitor.addWindowListener;
import java.awt.Point; import java.awt.Point;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
@ -44,6 +43,8 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import mage.client.cards.BigCard; import mage.client.cards.BigCard;
import mage.client.util.Config; import mage.client.util.Config;
import mage.client.util.ImageHelper; import mage.client.util.ImageHelper;
@ -61,18 +62,18 @@ import org.mage.plugins.card.utils.impl.ImageManagerImpl;
public class CardInfoWindowDialog extends MageDialog { public class CardInfoWindowDialog extends MageDialog {
public static enum ShowType { REVEAL, LOOKED_AT, EXILE, GRAVEYARD, OTHER }; public static enum ShowType { REVEAL, LOOKED_AT, EXILE, GRAVEYARD, OTHER };
private ShowType showType; private ShowType showType;
private boolean positioned; private boolean positioned;
private String name; private String name;
public CardInfoWindowDialog(ShowType showType, String name) { public CardInfoWindowDialog(ShowType showType, String name) {
this.name = name; this.name = name;
this.title = name; this.title = name;
this.showType = showType; this.showType = showType;
this.positioned = false; this.positioned = false;
initComponents(); initComponents();
this.setModal(false); this.setModal(false);
switch(this.showType) { switch(this.showType) {
case LOOKED_AT: case LOOKED_AT:
@ -88,20 +89,20 @@ public class CardInfoWindowDialog extends MageDialog {
this.setIconifiable(false); this.setIconifiable(false);
this.setClosable(true); this.setClosable(true);
this.setDefaultCloseOperation(HIDE_ON_CLOSE); this.setDefaultCloseOperation(HIDE_ON_CLOSE);
addWindowListener(new WindowAdapter() { addInternalFrameListener(new InternalFrameAdapter() {
@Override @Override
public void windowClosing(WindowEvent e) { public void internalFrameClosing(InternalFrameEvent e) {
CardInfoWindowDialog.this.hideDialog(); CardInfoWindowDialog.this.hideDialog();
} }
}); });
break; break;
case EXILE: case EXILE:
this.setFrameIcon(new ImageIcon(ImageManagerImpl.getInstance().getExileImage())); this.setFrameIcon(new ImageIcon(ImageManagerImpl.getInstance().getExileImage()));
break; break;
default: default:
// no icon yet // no icon yet
} }
this.setTitelBarToolTip(name); this.setTitelBarToolTip(name);
} }
public void cleanUp() { public void cleanUp() {
@ -112,17 +113,17 @@ public class CardInfoWindowDialog extends MageDialog {
cards.loadCards(showCards, bigCard, gameId); cards.loadCards(showCards, bigCard, gameId);
showAndPositionWindow(); showAndPositionWindow();
} }
public void loadCards(CardsView showCards, BigCard bigCard, UUID gameId) { public void loadCards(CardsView showCards, BigCard bigCard, UUID gameId) {
cards.loadCards(showCards, bigCard, gameId, null); cards.loadCards(showCards, bigCard, gameId, null);
if (showType.equals(ShowType.GRAVEYARD)) { if (showType.equals(ShowType.GRAVEYARD)) {
setTitle(name + "'s Graveyard (" + showCards.size() + ")"); setTitle(name + "'s Graveyard (" + showCards.size() + ")");
this.setTitelBarToolTip(name); this.setTitelBarToolTip(name);
} }
showAndPositionWindow(); showAndPositionWindow();
} }
private void showAndPositionWindow() { private void showAndPositionWindow() {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -142,7 +143,7 @@ public class CardInfoWindowDialog extends MageDialog {
} }
}); });
} }
public void loadCards(ExileView exile, BigCard bigCard, UUID gameId) { public void loadCards(ExileView exile, BigCard bigCard, UUID gameId) {
boolean changed = cards.loadCards(exile, bigCard, gameId, null); boolean changed = cards.loadCards(exile, bigCard, gameId, null);
if (exile.size() > 0) { if (exile.size() > 0) {

46
Mage.Sets/src/mage/sets/alarareborn/BlitzHellion.java
View file

@ -29,17 +29,15 @@ package mage.sets.alarareborn;
import java.util.UUID; import java.util.UUID;
import mage.constants.*;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.Effect;
import mage.abilities.keyword.TrampleAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect;
import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HasteAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.game.Game; import mage.constants.*;
import mage.game.permanent.Permanent;
import mage.players.Player;
/** /**
* *
@ -64,7 +62,9 @@ public class BlitzHellion extends CardImpl {
this.addAbility(HasteAbility.getInstance()); this.addAbility(HasteAbility.getInstance());
// At the beginning of the end step, Blitz Hellion's owner shuffles it into his or her library. // At the beginning of the end step, Blitz Hellion's owner shuffles it into his or her library.
this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new ShuffleSourceEffect(), TargetController.ANY, null, false)); Effect effect = new ShuffleIntoLibrarySourceEffect();
effect.setText("{this}'s owner shuffles it into his or her library.");
this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, null, false));
} }
public BlitzHellion(final BlitzHellion card) { public BlitzHellion(final BlitzHellion card) {
@ -76,35 +76,3 @@ public class BlitzHellion extends CardImpl {
return new BlitzHellion(this); return new BlitzHellion(this);
} }
} }
class ShuffleSourceEffect extends OneShotEffect {
ShuffleSourceEffect() {
super(Outcome.Neutral);
staticText = "{this}'s owner shuffles it into his or her library";
}
ShuffleSourceEffect(final ShuffleSourceEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player == null) {
return false;
}
Permanent permanent = game.getPermanent(source.getSourceId());
if (permanent != null) {
permanent.moveToZone(Zone.LIBRARY, id, game, false);
player.shuffleLibrary(game);
return true;
}
return false;
}
@Override
public ShuffleSourceEffect copy() {
return new ShuffleSourceEffect(this);
}
}

69
Mage.Sets/src/mage/sets/alliances/StormShaman1.java Normal file
View file

@ -0,0 +1,69 @@
/*
* 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.alliances;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
/**
*
* @author LoneFox
*/
public class StormShaman1 extends CardImpl {
public StormShaman1(UUID ownerId) {
super(ownerId, 118, "Storm Shaman", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}");
this.expansionSetCode = "ALL";
this.subtype.add("Human");
this.subtype.add("Cleric");
this.subtype.add("Shaman");
this.power = new MageInt(0);
this.toughness = new MageInt(4);
// {R}: Storm Shaman gets +1/+0 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
}
public StormShaman1(final StormShaman1 card) {
super(card);
}
@Override
public StormShaman1 copy() {
return new StormShaman1(this);
}
}

54
Mage.Sets/src/mage/sets/alliances/StormShaman2.java Normal file
View file

@ -0,0 +1,54 @@
/*
* 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.alliances;
import java.util.UUID;
import mage.constants.Rarity;
/**
*
* @author LoneFox
*/
public class StormShaman2 extends mage.sets.alliances.StormShaman1 {
public StormShaman2(UUID ownerId) {
super(ownerId);
this.cardNumber = 119;
this.rarity = Rarity.UNCOMMON;
}
public StormShaman2(final StormShaman2 card) {
super(card);
}
@Override
public StormShaman2 copy() {
return new StormShaman2(this);
}
}

46
Mage.Sets/src/mage/sets/fatereforged/LightningShrieker.java
View file

@ -29,21 +29,17 @@ package mage.sets.fatereforged;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HasteAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
/** /**
* *
@ -65,7 +61,9 @@ public class LightningShrieker extends CardImpl {
// Haste // Haste
this.addAbility(HasteAbility.getInstance()); this.addAbility(HasteAbility.getInstance());
// At the beginning of the end step, Lightning Shrieker's owner shuffles it into his or her library. // At the beginning of the end step, Lightning Shrieker's owner shuffles it into his or her library.
this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new ShuffleSourceEffect(), TargetController.ANY, null, false)); Effect effect = new ShuffleIntoLibrarySourceEffect();
effect.setText("{this}'s owner shuffles it into his or her library.");
this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, null, false));
} }
public LightningShrieker(final LightningShrieker card) { public LightningShrieker(final LightningShrieker card) {
@ -77,35 +75,3 @@ public class LightningShrieker extends CardImpl {
return new LightningShrieker(this); return new LightningShrieker(this);
} }
} }
class ShuffleSourceEffect extends OneShotEffect {
ShuffleSourceEffect() {
super(Outcome.Neutral);
staticText = "{this}'s owner shuffles it into his or her library";
}
ShuffleSourceEffect(final ShuffleSourceEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player == null) {
return false;
}
Permanent permanent = game.getPermanent(source.getSourceId());
if (permanent != null) {
permanent.moveToZone(Zone.LIBRARY, id, game, false);
player.shuffleLibrary(game);
return true;
}
return false;
}
@Override
public ShuffleSourceEffect copy() {
return new ShuffleSourceEffect(this);
}
}

2
Mage.Sets/src/mage/sets/iceage/KnightOfStromgald.java
View file

@ -51,7 +51,7 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class KnightOfStromgald extends CardImpl { public class KnightOfStromgald extends CardImpl {
private static final FilterCard filter = new FilterCard("White"); private static final FilterCard filter = new FilterCard("white");
static { static {
filter.add(new ColorPredicate(ObjectColor.WHITE)); filter.add(new ColorPredicate(ObjectColor.WHITE));

2
Mage.Sets/src/mage/sets/iceage/OrderOfTheWhiteShield.java
View file

@ -51,7 +51,7 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class OrderOfTheWhiteShield extends CardImpl { public class OrderOfTheWhiteShield extends CardImpl {
private static final FilterCard filter = new FilterCard("Black"); private static final FilterCard filter = new FilterCard("black");
static { static {
filter.add(new ColorPredicate(ObjectColor.BLACK)); filter.add(new ColorPredicate(ObjectColor.BLACK));

6
Mage.Sets/src/mage/sets/legends/Urborg.java
View file

@ -34,7 +34,7 @@ import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.continuous.LoseAbilityOrAnotherAbilityTargetEffect; import mage.abilities.effects.common.continuous.LoseAbilityOrAnotherAbilityTargetEffect;
import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.SwampwalkAbility; import mage.abilities.keyword.SwampwalkAbility;
import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.BlackManaAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
@ -48,12 +48,12 @@ import mage.target.common.TargetCreaturePermanent;
public class Urborg extends CardImpl { public class Urborg extends CardImpl {
public Urborg(UUID ownerId) { public Urborg(UUID ownerId) {
super(ownerId, 107, "Urborg", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); super(ownerId, 255, "Urborg", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
this.expansionSetCode = "LEG"; this.expansionSetCode = "LEG";
this.supertype.add("Legendary"); this.supertype.add("Legendary");
// {tap}: Add {B} to your mana pool. // {tap}: Add {B} to your mana pool.
this.addAbility(new GreenManaAbility()); this.addAbility(new BlackManaAbility());
// {tap}: Target creature loses first strike or swampwalk until end of turn. // {tap}: Target creature loses first strike or swampwalk until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityOrAnotherAbilityTargetEffect(FirstStrikeAbility.getInstance(), new SwampwalkAbility()), new TapSourceCost()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityOrAnotherAbilityTargetEffect(FirstStrikeAbility.getInstance(), new SwampwalkAbility()), new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetCreaturePermanent());

2
Mage.Sets/src/mage/sets/magicorigins/ActOfTreason.java
View file

@ -38,7 +38,7 @@ public class ActOfTreason extends mage.sets.magic2010.ActOfTreason {
public ActOfTreason(UUID ownerId) { public ActOfTreason(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 999; this.cardNumber = 129;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
this.rarity = Rarity.COMMON; this.rarity = Rarity.COMMON;
} }

2
Mage.Sets/src/mage/sets/magicorigins/CatacombSlug.java
View file

@ -37,7 +37,7 @@ public class CatacombSlug extends mage.sets.returntoravnica.CatacombSlug {
public CatacombSlug(UUID ownerId) { public CatacombSlug(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 998; this.cardNumber = 86;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/magicorigins/ChandrasFury.java
View file

@ -37,7 +37,7 @@ public class ChandrasFury extends mage.sets.magic2013.ChandrasFury {
public ChandrasFury(UUID ownerId) { public ChandrasFury(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 997; this.cardNumber = 136;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/magicorigins/ChargingGriffin.java
View file

@ -37,7 +37,7 @@ public class ChargingGriffin extends mage.sets.magic2014.ChargingGriffin {
public ChargingGriffin(UUID ownerId) { public ChargingGriffin(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 996; this.cardNumber = 9;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/magicorigins/Claustrophobia.java
View file

@ -37,7 +37,7 @@ public class Claustrophobia extends mage.sets.innistrad.Claustrophobia {
public Claustrophobia(UUID ownerId) { public Claustrophobia(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 995; this.cardNumber = 50;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/magicorigins/Cobblebrute.java
View file

@ -37,7 +37,7 @@ public class Cobblebrute extends mage.sets.returntoravnica.Cobblebrute {
public Cobblebrute(UUID ownerId) { public Cobblebrute(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 994; this.cardNumber = 138;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/magicorigins/CruelRevival.java
View file

@ -37,7 +37,7 @@ public class CruelRevival extends mage.sets.onslaught.CruelRevival {
public CruelRevival(UUID ownerId) { public CruelRevival(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 993; this.cardNumber = 88;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/magicorigins/Disperse.java
View file

@ -37,7 +37,7 @@ public class Disperse extends mage.sets.scarsofmirrodin.Disperse {
public Disperse(UUID ownerId) { public Disperse(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 992; this.cardNumber = 54;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/magicorigins/ElvishVisionary.java
View file

@ -37,7 +37,7 @@ public class ElvishVisionary extends mage.sets.shardsofalara.ElvishVisionary {
public ElvishVisionary(UUID ownerId) { public ElvishVisionary(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 991; this.cardNumber = 175;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/magicorigins/FieryConclusion.java
View file

@ -37,7 +37,7 @@ public class FieryConclusion extends mage.sets.ravnica.FieryConclusion {
public FieryConclusion(UUID ownerId) { public FieryConclusion(UUID ownerId) {
super(ownerId); super(ownerId);
this.cardNumber = 990; this.cardNumber = 144;
this.expansionSetCode = "ORI"; this.expansionSetCode = "ORI";
} }

2
Mage.Sets/src/mage/sets/mastersedition/OrderOfLeitbur.java
View file

@ -51,7 +51,7 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class OrderOfLeitbur extends CardImpl { public class OrderOfLeitbur extends CardImpl {
private static final FilterCard filter = new FilterCard("Black"); private static final FilterCard filter = new FilterCard("black");
static { static {
filter.add(new ColorPredicate(ObjectColor.BLACK)); filter.add(new ColorPredicate(ObjectColor.BLACK));

2
Mage.Sets/src/mage/sets/mastersedition/OrderOfTheEbonHand.java
View file

@ -51,7 +51,7 @@ import mage.filter.predicate.mageobject.ColorPredicate;
*/ */
public class OrderOfTheEbonHand extends CardImpl { public class OrderOfTheEbonHand extends CardImpl {
private static final FilterCard filter = new FilterCard("White"); private static final FilterCard filter = new FilterCard("white");
static { static {
filter.add(new ColorPredicate(ObjectColor.WHITE)); filter.add(new ColorPredicate(ObjectColor.WHITE));

72
Mage.Sets/src/mage/sets/ravnica/CeruleanSphinx.java Normal file
View file

@ -0,0 +1,72 @@
/*
* 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.ravnica;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
/**
*
* @author LoneFox
*/
public class CeruleanSphinx extends CardImpl {
public CeruleanSphinx(UUID ownerId) {
super(ownerId, 39, "Cerulean Sphinx", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}{U}");
this.expansionSetCode = "RAV";
this.subtype.add("Sphinx");
this.power = new MageInt(5);
this.toughness = new MageInt(5);
// Flying
this.addAbility(FlyingAbility.getInstance());
// {U}: Cerulean Sphinx's owner shuffles it into his or her library.
Effect effect = new ShuffleIntoLibrarySourceEffect();
effect.setText("{this}'s owner shuffles it into his or her library.");
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{U}")));
}
public CeruleanSphinx(final CeruleanSphinx card) {
super(card);
}
@Override
public CeruleanSphinx copy() {
return new CeruleanSphinx(this);
}
}

55
Mage.Sets/src/mage/sets/seventhedition/DakmorLancer.java Normal file
View file

@ -0,0 +1,55 @@
/*
* 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.seventhedition;
import java.util.UUID;
import mage.constants.Rarity;
/**
*
* @author LoneFox
*/
public class DakmorLancer extends mage.sets.starter1999.DakmorLancer {
public DakmorLancer(UUID ownerId) {
super(ownerId);
this.cardNumber = 126;
this.expansionSetCode = "7ED";
this.rarity = Rarity.UNCOMMON;
}
public DakmorLancer(final DakmorLancer card) {
super(card);
}
@Override
public DakmorLancer copy() {
return new DakmorLancer(this);
}
}

53
Mage.Sets/src/mage/sets/seventhedition/GoblinGardener.java Normal file
View file

@ -0,0 +1,53 @@
/*
* 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.seventhedition;
import java.util.UUID;
/**
*
* @author LoneFox
*/
public class GoblinGardener extends mage.sets.urzasdestiny.GoblinGardener {
public GoblinGardener(UUID ownerId) {
super(ownerId);
this.cardNumber = 188;
this.expansionSetCode = "7ED";
}
public GoblinGardener(final GoblinGardener card) {
super(card);
}
@Override
public GoblinGardener copy() {
return new GoblinGardener(this);
}
}

55
Mage.Sets/src/mage/sets/seventhedition/StormShaman.java Normal file
View file

@ -0,0 +1,55 @@
/*
* 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.seventhedition;
import java.util.UUID;
import mage.constants.Rarity;
/**
*
* @author LoneFox
*/
public class StormShaman extends mage.sets.alliances.StormShaman1 {
public StormShaman(UUID ownerId) {
super(ownerId);
this.cardNumber = 222;
this.expansionSetCode = "7ED";
this.rarity = Rarity.UNCOMMON;
}
public StormShaman(final StormShaman card) {
super(card);
}
@Override
public StormShaman copy() {
return new StormShaman(this);
}
}

80
Mage.Sets/src/mage/sets/starter1999/DakmorLancer.java Normal file
View file

@ -0,0 +1,80 @@
/*
* 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.starter1999;
import java.util.UUID;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
*
* @author LoneFox
*/
public class DakmorLancer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonblack creature");
static {
filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK)));
}
public DakmorLancer(UUID ownerId) {
super(ownerId, 71, "Dakmor Lancer", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}{B}");
this.expansionSetCode = "S99";
this.subtype.add("Human");
this.subtype.add("Knight");
this.power = new MageInt(3);
this.toughness = new MageInt(3);
// When Dakmor Lancer enters the battlefield, destroy target nonblack creature.
Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
ability.addTarget(new TargetCreaturePermanent(filter));
this.addAbility(ability);
}
public DakmorLancer(final DakmorLancer card) {
super(card);
}
@Override
public DakmorLancer copy() {
return new DakmorLancer(this);
}
}

68
Mage.Sets/src/mage/sets/urzasdestiny/GoblinGardener.java Normal file
View file

@ -0,0 +1,68 @@
/*
* 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.urzasdestiny;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.target.common.TargetLandPermanent;
/**
*
* @author LoneFox
*/
public class GoblinGardener extends CardImpl {
public GoblinGardener(UUID ownerId) {
super(ownerId, 84, "Goblin Gardener", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.expansionSetCode = "UDS";
this.subtype.add("Goblin");
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// When Goblin Gardener dies, destroy target land.
Ability ability = new DiesTriggeredAbility(new DestroyTargetEffect(), false);
ability.addTarget(new TargetLandPermanent());
this.addAbility(ability);
}
public GoblinGardener(final GoblinGardener card) {
super(card);
}
@Override
public GoblinGardener copy() {
return new GoblinGardener(this);
}
}

2
Mage.Sets/src/mage/sets/urzassaga/OpalArchangel.java
View file

@ -75,7 +75,7 @@ public class OpalArchangel extends CardImpl {
class OpalArchangelToken extends Token { class OpalArchangelToken extends Token {
public OpalArchangelToken() { public OpalArchangelToken() {
super("Angel", "a 3/3 Angelt creature with flying and vigilance"); super("Angel", "a 3/3 Angel creature with flying and vigilance");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
subtype.add("Angel"); subtype.add("Angel");
power = new MageInt(5); power = new MageInt(5);

2
Mage.Sets/src/mage/sets/urzassaga/OpalGargoyle.java
View file

@ -76,7 +76,7 @@ class OpalGargoyleToken extends Token {
public OpalGargoyleToken() { public OpalGargoyleToken() {
super("Gargoyle", "a 2/2 Gargoyle creature with flying"); super("Gargoyle", "a 2/2 Gargoyle creature with flying");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
subtype.add("Knight"); subtype.add("Gargoyle");
power = new MageInt(2); power = new MageInt(2);
toughness = new MageInt(2); toughness = new MageInt(2);
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());