Merge pull request #2529 from spjspj/master

spjspj - 'A' cards in C16
This commit is contained in:
spjspj 2016-10-30 17:30:51 +11:00 committed by GitHub
commit 907a14b021
4 changed files with 167 additions and 4 deletions

View file

@ -0,0 +1,98 @@
/*
* 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.cards.a;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.CardsInControllerHandCount;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.BasicLandcyclingAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.game.Game;
import mage.players.Player;
/**
*
* @author spjspj
*/
public class AncientExcavation extends CardImpl {
public AncientExcavation(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}{B}");
// Draw cards equal to the number of cards in your hand, then discard a card for each card drawn this way.
this.getSpellAbility().addEffect(new AncientExcavationEffect());
// Basic landcycling {2}
this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{2}")));
}
public AncientExcavation(final AncientExcavation card) {
super(card);
}
@Override
public AncientExcavation copy() {
return new AncientExcavation(this);
}
}
class AncientExcavationEffect extends OneShotEffect {
public AncientExcavationEffect() {
super(Outcome.DrawCard);
staticText = "Draw cards equal to the number of cards in your hand, then discard a card for each card drawn this way";
}
public AncientExcavationEffect(final AncientExcavationEffect effect) {
super(effect);
}
@Override
public AncientExcavationEffect copy() {
return new AncientExcavationEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
DynamicValue numCards = new CardsInControllerHandCount();
int amount = numCards.calculate(game, source, this);
player.drawCards(amount, game);
player.discard(amount, false, source, game);
return true;
}
return false;
}
}

View file

@ -0,0 +1,62 @@
/*
* 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.cards.a;
import java.util.UUID;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.keyword.BasicLandcyclingAbility;
import mage.abilities.mana.ColorlessManaAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
/**
*
* @author spjspj
*/
public class AshBarrens extends CardImpl {
public AshBarrens(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
// {T}: Add {C} to your mana pool.
this.addAbility(new ColorlessManaAbility());
// Basic landcycling {1}
this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{1}")));
}
public AshBarrens(final AshBarrens card) {
super(card);
}
@Override
public AshBarrens copy() {
return new AshBarrens(this);
}
}

View file

@ -48,18 +48,20 @@ public class Commander2016 extends ExpansionSet {
private Commander2016() {
super("Commander 2016 Edition", "C16", ExpansionSet.buildDate(2016, 11, 11), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone";
cards.add(new SetCardInfo("AStral Cornucopia", 243, Rarity.RARE, mage.cards.a.AStralCornucopia.class));
cards.add(new SetCardInfo("AStral Cornucopia", 243, Rarity.RARE, mage.cards.a.AstralCornucopia.class));
cards.add(new SetCardInfo("Abzan Charm", 177, Rarity.UNCOMMON, mage.cards.a.AbzanCharm.class));
cards.add(new SetCardInfo("Abzan Falconer", 57, Rarity.UNCOMMON, mage.cards.a.AbzanFalconer.class));
cards.add(new SetCardInfo("Academy Elite", 81, Rarity.RARE, mage.cards.a.AcademyElite.class));
cards.add(new SetCardInfo("Aeon Chronicler", 82, Rarity.RARE, mage.cards.a.AeonChronicler.class));
cards.add(new SetCardInfo("Akroan Horse", 241, Rarity.RARE, mage.cards.a.AkroanHorse.class));
cards.add(new SetCardInfo("Alesha, Who Smiles at Death", 119, Rarity.RARE, mage.cards.a.AleshaWhoSmilesAtDeath.class));
cards.add(new SetCardInfo("Ancient Excavation", 27, Rarity.UNCOMMON, mage.cards.a.AncientExcavation.class));
cards.add(new SetCardInfo("Ankle Shanker", 178, Rarity.RARE, mage.cards.a.AnkleShanker.class));
cards.add(new SetCardInfo("Arcane Denial", 83, Rarity.COMMON, mage.cards.a.ArcaneDenial.class));
cards.add(new SetCardInfo("Arcane Sanctum", 281, Rarity.UNCOMMON, mage.cards.a.ArcaneSanctum.class));
cards.add(new SetCardInfo("Army of the Damned", 105, Rarity.MYTHIC, mage.cards.a.ArmyOfTheDamned.class));
cards.add(new SetCardInfo("Artifact Mutation", 179, Rarity.RARE, mage.cards.a.ArtifactMutation.class));
cards.add(new SetCardInfo("Ash Barrens", 56, Rarity.COMMON, mage.cards.a.AshBarrens.class));
cards.add(new SetCardInfo("Assault Suit", 242, Rarity.UNCOMMON, mage.cards.a.AssaultSuit.class));
cards.add(new SetCardInfo("Atraxa, Praetors' Voice", 28, Rarity.MYTHIC, mage.cards.a.AtraxaPraetorsVoice.class));
cards.add(new SetCardInfo("Aura Mutation", 180, Rarity.RARE, mage.cards.a.AuraMutation.class));
@ -87,6 +89,7 @@ public class Commander2016 extends ExpansionSet {
cards.add(new SetCardInfo("Brutal Hordechief", 108, Rarity.MYTHIC, mage.cards.b.BrutalHordechief.class));
cards.add(new SetCardInfo("Burgeoning", 143, Rarity.RARE, mage.cards.b.Burgeoning.class));
cards.add(new SetCardInfo("Buried Ruin", 284, Rarity.UNCOMMON, mage.cards.b.BuriedRuin.class));
cards.add(new SetCardInfo("Cauldron of Souls", 246, Rarity.RARE, mage.cards.c.CauldronOfSouls.class));
cards.add(new SetCardInfo("Cathars' Crusade", 61, Rarity.RARE, mage.cards.c.CatharsCrusade.class));
cards.add(new SetCardInfo("Caves of Koilos", 285, Rarity.RARE, mage.cards.c.CavesOfKoilos.class));
cards.add(new SetCardInfo("Chain of Vapor", 84, Rarity.UNCOMMON, mage.cards.c.ChainOfVapor.class));

View file

@ -30212,10 +30212,10 @@ Order|Commander 2016|240a|U|{3}{W}|Instant|||Exile target attacking creature.|
Chaos|Commander 2016|240b|U|{2}{R}|Instant|||Creatures can't block this turn.|
Akroan Horse|Commander 2016|241|R|{4}|Artifact Creature - Horse|0|4|Defender$When Akroan Horse enters the battlefield, an opponent gains control of it.$At the beginning of your upkeep, each opponent creates a 1/1 white Soldier creature token.|
Assault Suit|Commander 2016|242|U|{4}|Artifact - Equipment|||Equipped creature gets +2/+2, has haste, can't attack you or a planeswalker you control, and can't be sacrificed.$At the beginning of each opponent's upkeep, you may have that player gain control of equipped creature until end of turn. If you do, untap it.$Equip {3}|
AStral Cornucopia|Commander 2016|243|R|{X}{X}{X}|Artifact|||Astral Cornucopia enters the battlefield with X charge counters on it.${T}: Choose a color. Add one mana of that color to your mana pool for each charge counter on Astral Cornucopia.|
Astral Cornucopia|Commander 2016|243|R|{X}{X}{X}|Artifact|||Astral Cornucopia enters the battlefield with X charge counters on it.${T}: Choose a color. Add one mana of that color to your mana pool for each charge counter on Astral Cornucopia.|
Blinkmoth Urn|Commander 2016|244|R|{5}|Artifact|||At the beginning of each player's precombat main phase, if Blinkmoth Urn is untapped, that player adds {C} to his or her mana pool for each artifact he or she counters.|
Bonehoard|Commander 2016|245|R|{4}|Artifact - Equipment|||Living Weapon <i>(When this Equipment enters the battlefield, create a 0/0 black Germ creature token, then attack this to it.)</i>$Equipped creatures gets +X/+X, where X is the number of creatures cards in all graveyards.$Equip {2}|
Cauldon of Souls|Commander 2016|246|R|{5}|Artifact|||{T}: Choose any number of target creatures. Each of those creatures gains persist until end of turn. <i>(When it dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)</i>|
Cauldron of Souls|Commander 2016|246|R|{5}|Artifact|||{T}: Choose any number of target creatures. Each of those creatures gains persist until end of turn. <i>(When it dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)</i>|
Chromatic Lantern|Commander 2016|247|R|{3}|Artifact|||Lands you control have "{T}: Add one mana of any color to your mana pool."${T}: Add one mana of any color to your mana pool.|
Commander's Sphere|Commander 2016|248|C|{3}|Artifact|||{T}: Add to your mana pool one mana of any color in your commander's color identity.$Sacrifice Commander's Sphere: Draw a card.|
Cranial Plating|Commander 2016|249|U|{2}|Artifact - Equipment|||Equipped creature gets +1/+0 for each artifact you control.${B}{B}: Attach Cranial Plating to target creature you control.$Equip {1}|
@ -30320,4 +30320,4 @@ Mountain|Commander 2016|347|L||Basic Land - Mountain||||
Mountain|Commander 2016|348|L||Basic Land - Mountain||||
Forest|Commander 2016|349|L||Basic Land - Forest||||
Forest|Commander 2016|350|L||Basic Land - Forest||||
Forest|Commander 2016|351|L||Basic Land - Forest||||
Forest|Commander 2016|351|L||Basic Land - Forest||||