Merge origin/master

This commit is contained in:
fireshoes 2016-11-03 10:13:11 -05:00
commit 7741981533
8 changed files with 367 additions and 2 deletions

View file

@ -0,0 +1,106 @@
/*
* 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.b;
import java.util.UUID;
import mage.abilities.DelayedTriggeredAbility;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.UntapAllEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent;
import mage.players.Player;
/**
*
* @author emerald000
*/
public class BenefactorsDraught extends CardImpl {
public BenefactorsDraught(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}");
// Untap all creatures.
this.getSpellAbility().addEffect(new UntapAllEffect(new FilterCreaturePermanent()));
// Until end of turn, whenever a creature an opponent controls blocks, draw a card.
this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new BenefactorsDraughtTriggeredAbility()));
// Draw a card.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
}
public BenefactorsDraught(final BenefactorsDraught card) {
super(card);
}
@Override
public BenefactorsDraught copy() {
return new BenefactorsDraught(this);
}
}
class BenefactorsDraughtTriggeredAbility extends DelayedTriggeredAbility {
BenefactorsDraughtTriggeredAbility() {
super(new DrawCardSourceControllerEffect(1), Duration.EndOfTurn, false);
}
BenefactorsDraughtTriggeredAbility(final BenefactorsDraughtTriggeredAbility ability) {
super(ability);
}
@Override
public BenefactorsDraughtTriggeredAbility copy() {
return new BenefactorsDraughtTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.BLOCKER_DECLARED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Permanent blocker = game.getPermanent(event.getSourceId());
Player controller = game.getPlayer(this.getControllerId());
return blocker != null && controller != null && game.isOpponent(controller, blocker.getControllerId());
}
@Override
public String getRule() {
return "Until end of turn, whenever a creature an opponent controls blocks, draw a card.";
}
}

View file

@ -0,0 +1,146 @@
/*
* 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.c;
import java.util.Set;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.condition.Condition;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.CountersSourceCount;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.HasteAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.watchers.common.AttackedThisTurnWatcher;
/**
*
* @author spjspj
*/
public class ChargingCinderhorn extends CardImpl {
public ChargingCinderhorn(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.subtype.add("Elemental");
this.subtype.add("Ox");
this.power = new MageInt(4);
this.toughness = new MageInt(2);
// Haste
this.addAbility(HasteAbility.getInstance());
// At the beginning of each player's end step, if no creatures attacked this turn, put a fury counter on Charging Cinderhorn. Then Charging Cinderhorn deals damage equal to the number of fury counters on it to that player.
ChargingCinderhornDamageTargetEffect effect = new ChargingCinderhornDamageTargetEffect();
effect.setText("if no creatures attacked this turn, put a fury counter on {this}. Then {this} deals damage equal to the number of fury counters on it to that player");
BeginningOfEndStepTriggeredAbility ability =
new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, new ChargingCinderhornCondition(), false);
this.addAbility(ability, new AttackedThisTurnWatcher());
}
public ChargingCinderhorn(final ChargingCinderhorn card) {
super(card);
}
@Override
public ChargingCinderhorn copy() {
return new ChargingCinderhorn(this);
}
}
class ChargingCinderhornCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
AttackedThisTurnWatcher watcher = (AttackedThisTurnWatcher) game.getState().getWatchers().get("AttackedThisTurn");
if (watcher != null && watcher instanceof AttackedThisTurnWatcher) {
Set<UUID> attackedThisTurnCreatures = watcher.getAttackedThisTurnCreatures();
return attackedThisTurnCreatures.isEmpty();
}
return true;
}
@Override
public String toString() {
return "no creatures attacked this turn";
}
}
class ChargingCinderhornDamageTargetEffect extends OneShotEffect{
public ChargingCinderhornDamageTargetEffect()
{
super(Outcome.Damage);
}
public ChargingCinderhornDamageTargetEffect(ChargingCinderhornDamageTargetEffect copy)
{
super(copy);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent chargingCinderhoof = game.getPermanent(source.getSourceId());
if (chargingCinderhoof != null) {
chargingCinderhoof.addCounters(CounterType.FURY.createInstance(), game);
} else {
chargingCinderhoof = game.getPermanentOrLKIBattlefield(source.getSourceId());
}
if (chargingCinderhoof == null) {
return false;
}
DynamicValue amount = new CountersSourceCount(CounterType.FURY);
Player player = game.getPlayer(targetPointer.getFirst(game, source));
if (player != null) {
player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true);
return true;
}
return false;
}
@Override
public ChargingCinderhornDamageTargetEffect copy() {
return new ChargingCinderhornDamageTargetEffect(this);
}
}

View file

@ -0,0 +1,107 @@
/*
* 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.e;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent;
/**
*
* @author spjspj
*/
public class EvolutionaryEscalation extends CardImpl {
private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls");
public EvolutionaryEscalation(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
// At the beginning of your upkeep, put three +1/+1 counters on target creature you control and three +1/+1 counters on target creature an opponent controls.
EvolutionaryEscalationEffect effect = new EvolutionaryEscalationEffect();
Ability ability = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false);
ability.addTarget(new TargetControlledCreaturePermanent());
ability.addTarget(new TargetCreaturePermanent(filterOpponentCreature));
this.addAbility(ability);
}
public EvolutionaryEscalation(final EvolutionaryEscalation card) {
super(card);
}
@Override
public EvolutionaryEscalation copy() {
return new EvolutionaryEscalation(this);
}
}
class EvolutionaryEscalationEffect extends OneShotEffect {
public EvolutionaryEscalationEffect() {
super(Outcome.BoostCreature);
staticText = "put three +1/+1 counters on target creature you control and three +1/+1 counters on target creature an opponent controls";
}
public EvolutionaryEscalationEffect(final EvolutionaryEscalationEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Counter counter = CounterType.P1P1.createInstance(3);
boolean addedCounters = false;
for (Target target: source.getTargets()) {
Permanent targetPermanent = game.getPermanent(target.getFirstTarget());
if (targetPermanent != null) {
targetPermanent.addCounters(counter.copy(), game);
addedCounters = true;
}
}
return addedCounters;
}
@Override
public EvolutionaryEscalationEffect copy() {
return new EvolutionaryEscalationEffect(this);
}
}

View file

@ -60,6 +60,7 @@ public class ExpendableTroops extends CardImpl {
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost());
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature()));
this.addAbility(ability);
}
public ExpendableTroops(final ExpendableTroops card) {

View file

@ -57,6 +57,7 @@ public class PhyrexianBroodlings extends CardImpl {
// {1}, Sacrifice a creature: Put a +1/+1 counter on Phyrexian Broodlings.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost());
ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
this.addAbility(ability);
}
public PhyrexianBroodlings(final PhyrexianBroodlings card) {

View file

@ -73,6 +73,7 @@ public class Commander2016 extends ExpansionSet {
cards.add(new SetCardInfo("Beacon of Unrest", 107, Rarity.RARE, mage.cards.b.BeaconOfUnrest.class));
cards.add(new SetCardInfo("Beast Within", 141, Rarity.UNCOMMON, mage.cards.b.BeastWithin.class));
cards.add(new SetCardInfo("Beastmaster Ascension", 142, Rarity.RARE, mage.cards.b.BeastmasterAscension.class));
cards.add(new SetCardInfo("Benefactor's Draught", 21, Rarity.RARE, mage.cards.b.BenefactorsDraught.class));
cards.add(new SetCardInfo("Bituminous Blast", 182, Rarity.UNCOMMON, mage.cards.b.BituminousBlast.class));
cards.add(new SetCardInfo("Blasphemous Act", 120, Rarity.RARE, mage.cards.b.BlasphemousAct.class));
cards.add(new SetCardInfo("Blazing Archon", 58, Rarity.RARE, mage.cards.b.BlazingArchon.class));
@ -98,6 +99,7 @@ public class Commander2016 extends ExpansionSet {
cards.add(new SetCardInfo("Chain of Vapor", 84, Rarity.UNCOMMON, mage.cards.c.ChainOfVapor.class));
cards.add(new SetCardInfo("Champion of Lambholt", 144, Rarity.RARE, mage.cards.c.ChampionOfLambholt.class));
cards.add(new SetCardInfo("Chaos Warp", 122, Rarity.RARE, mage.cards.c.ChaosWarp.class));
cards.add(new SetCardInfo("Charging Cinderhorn", 16, Rarity.RARE, mage.cards.c.ChargingCinderhorn.class));
cards.add(new SetCardInfo("Chasm Skulker", 85, Rarity.RARE, mage.cards.c.ChasmSkulker.class));
cards.add(new SetCardInfo("Chief Engineer", 86, Rarity.RARE, mage.cards.c.ChiefEngineer.class));
cards.add(new SetCardInfo("Chromatic Lantern", 247, Rarity.RARE, mage.cards.c.ChromaticLantern.class));
@ -150,6 +152,7 @@ public class Commander2016 extends ExpansionSet {
cards.add(new SetCardInfo("Evacuation", 91, Rarity.RARE, mage.cards.e.Evacuation.class));
cards.add(new SetCardInfo("Everflowing Chalice", 253, Rarity.UNCOMMON, mage.cards.e.EverflowingChalice.class));
cards.add(new SetCardInfo("Everlasting Torment", 233, Rarity.RARE, mage.cards.e.EverlastingTorment.class));
cards.add(new SetCardInfo("Evolutionary Escalation", 22, Rarity.UNCOMMON, mage.cards.e.EvolutionaryEscalation.class));
cards.add(new SetCardInfo("Evolving Wilds", 294, Rarity.COMMON, mage.cards.e.EvolvingWilds.class));
cards.add(new SetCardInfo("Executioner's Capsule", 109, Rarity.COMMON, mage.cards.e.ExecutionersCapsule.class));
cards.add(new SetCardInfo("Exotic Orchard", 295, Rarity.RARE, mage.cards.e.ExoticOrchard.class));

View file

@ -62,6 +62,7 @@ public enum CounterType {
FATE("fate"),
FEATHER("feather"),
FLOOD("flood"),
FURY("fury"),
FUSE("fuse"),
GOLD("gold"),
HATCHLING("hatchling"),

View file

@ -30009,7 +30009,7 @@ Migratory Route|Commander 2016|38|U|{3}{W}{U}|Sorcery|||Create four 1/1 white Bi
Ravos, Soultender|Commander 2016|39|M|{3}{W}{B}|Legendary Creature - Human Cleric|2|2|Flying$Other creatures you control get +1/+1.$At the beginning of your upkeep, you may return target creature card from your graveyard to your hand.$Partner <i>(You can have two commanders if both have partner.)</i>|
Reyhan, Last of the Abzan|Commander 2016|40|R|{1}{B}{G}|Legendary Creature - Human Warrior|0|0|Reyhan, Last of the Abzan enters the battlefield with three +1/+1 counters on it.$Whenever a creature you control dies or is put into the command zone, if it had one or more +1/+1 counters on it, you may put that may +1/+1 counters on target creature.$Partner <i>(You can have two commanders if both have partner.)</i>|
Saskia the Unyielding|Commander 2016|41|M|{B}{R}{G}{W}|Legendary Creature - Human Soldier|3|4|Vigilance, haste$As Saskia the Unyielding enters the battlefield, choose a player.$Whenever a creature you control deals combat damage to a player, it deals that much damage to the chosen player.|
Sider Kondo of Jamuraa|Commander 2016|42|M|{2}{G}{W}|Legendary Creature - Human Knight|2|5|Flanking <i>(Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)</i>$Creatures your opponents control with flying or reach can't block creatures with power 2 or less.)$Partner <i>(You can have two commanders if both have partner.)</i>|
Sidar Kondo of Jamuraa|Commander 2016|42|M|{2}{G}{W}|Legendary Creature - Human Knight|2|5|Flanking <i>(Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)</i>$Creatures your opponents control with flying or reach can't block creatures with power 2 or less.)$Partner <i>(You can have two commanders if both have partner.)</i>|
Silas Renn, Seeker Adept|Commander 2016|43|M|{1}{U}{B}|Legendary Artifact Creature - Human|2|2|Deathtouch$Whenever Silas Renn, Seeker Adept deals combat damage to a player, choose target artifact card in your graveyard. You may cast that card this turn.$Partner <i>(You can have two commanders if both have partner.)</i>|
Sylvan Reclamation|Commander 2016|44|U|{3}{G}{W}|Instant|||Exile up to two target artifacts and/or enchantments.$Basic landcycling {2} <i>({2}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)</i>|
Tana, the Bloodsower|Commander 2016|45|M|{2}{R}{G}|Legendary Creature - Elf Druid|2|2|Trample$Whenever Tana, the Bloodsower deals combat damage to a player, create that many 1/1 green Saproling creature tokens.$Partner <i>(You can have two commanders if both have partner.)</i>|
@ -30237,7 +30237,7 @@ Myr Retriever|Commander 2016|264|U|{2}|Artifact Creature - Myr|1|1|When Myr Retr
Nevinyrral's Disk|Commander 2016|265|R|{4}|Artifact|||Nevinyrral's Disk enters the battlefield tapped.${1}, {T}: Destroy all artifacts, creatures, and enchantments.|
Orzhov Signet|Commander 2016|266|C|{2}|Artifact|||{1}, {T}: Add {W}{B} to your mana pool.|
Psychosis Crawler|Commander 2016|267|R|{5|Artifact Creature - Horror|0|0|Psychosis Crawler's power and toughness are each equal to the number of cards in your hand.$Whenever you draw a card, each opponent losses 1 life.|
Pakdos Signet|Commander 2016|268|C|{2}|Artifact|||{1}, {T}: Add {B}{R} to your mana pool.|
Rakdos Signet|Commander 2016|268|C|{2}|Artifact|||{1}, {T}: Add {B}{R} to your mana pool.|
Shimmer Myr|Commander 2016|269|R|{3}|Artifact Creature - Myr|2|2|Flash$You may cast artifact spell as though they had flash.|
Simic Signet|Commander 2016|270|C|{2}|Artifact|||{1}, {T}: Add {G}{U} to your mana pool.|
Skullclamp|Commander 2016|271|U|{1}|Artifact - Equipment|||Equipped creature gets +1/-1.$Whenever equipped creature dies, draw two cards.$Equip {1}|