mirror of
https://github.com/magefree/mage.git
synced 2026-01-23 03:39:54 -08:00
[EMN] Added 7/6 spoilers to mtg-cards-data.txt. Implemented Permeating Mass and Falkenrath Reaver. Add Meld reminder text to Bruna, Midnight Scavengers, and Hanweir Garrison. Fixed translated name of Collective Defiance.
This commit is contained in:
parent
21e1b98637
commit
b8d7ee2c02
7 changed files with 190 additions and 16 deletions
|
|
@ -30,13 +30,16 @@ package mage.sets.eldritchmoon;
|
|||
import java.util.UUID;
|
||||
import mage.MageInt;
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.effects.common.CastSourceTriggeredAbility;
|
||||
import mage.abilities.effects.common.InfoEffect;
|
||||
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
|
||||
import mage.abilities.keyword.FlyingAbility;
|
||||
import mage.abilities.keyword.VigilanceAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.Zone;
|
||||
import mage.filter.FilterCard;
|
||||
import mage.filter.predicate.Predicates;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
|
|
@ -78,6 +81,7 @@ public class BrunaTheFadingLight extends CardImpl {
|
|||
this.addAbility(VigilanceAbility.getInstance());
|
||||
|
||||
// <i>(Melds with Gisela, the Broken Blade.)</i>
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Gisela, the Broken Blade.)</i>")));
|
||||
}
|
||||
|
||||
public BrunaTheFadingLight(final BrunaTheFadingLight card) {
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ import mage.target.common.TargetCreaturePermanent;
|
|||
*
|
||||
* @author fireshoes
|
||||
*/
|
||||
public class CollectiveResistance extends CardImpl {
|
||||
public class CollectiveDefiance extends CardImpl {
|
||||
|
||||
private static final FilterPlayer filterDiscard = new FilterPlayer("player to discard and then draw cards");
|
||||
private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creature to be dealt damage");
|
||||
|
|
@ -63,8 +63,8 @@ public class CollectiveResistance extends CardImpl {
|
|||
filterDamageOpponent.add(new PlayerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public CollectiveResistance(UUID ownerId) {
|
||||
super(ownerId, 123, "Collective Resistance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
|
||||
public CollectiveDefiance(UUID ownerId) {
|
||||
super(ownerId, 123, "Collective Defiance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
|
||||
this.expansionSetCode = "EMN";
|
||||
|
||||
// Escalate {1}
|
||||
|
|
@ -75,10 +75,10 @@ public class CollectiveResistance extends CardImpl {
|
|||
this.getSpellAbility().getModes().setMaxModes(3);
|
||||
|
||||
// Target player discards all cards in his or her hand, then draws that many cards.;
|
||||
this.getSpellAbility().addEffect(new CollectiveResistanceEffect());
|
||||
this.getSpellAbility().addEffect(new CollectiveDefianceEffect());
|
||||
this.getSpellAbility().addTarget(new TargetPlayer(1, 1, false, filterDiscard));
|
||||
|
||||
// Collective Resistance deals 4 damage to target creature.;
|
||||
// Collective Defiance deals 4 damage to target creature.;
|
||||
Mode mode = new Mode();
|
||||
Effect effect = new DamageTargetEffect(4);
|
||||
effect.setText("{this} deals 4 damage to target creature");
|
||||
|
|
@ -86,7 +86,7 @@ public class CollectiveResistance extends CardImpl {
|
|||
mode.getTargets().add(new TargetCreaturePermanent(filterCreature));
|
||||
this.getSpellAbility().addMode(mode);
|
||||
|
||||
// Collective Resistance deals 3 damage to target opponent.
|
||||
// Collective Defiance deals 3 damage to target opponent.
|
||||
mode = new Mode();
|
||||
effect = new DamageTargetEffect(3);
|
||||
effect.setText("{this} deals 3 damage to target opponent");
|
||||
|
|
@ -95,30 +95,30 @@ public class CollectiveResistance extends CardImpl {
|
|||
this.getSpellAbility().addMode(mode);
|
||||
}
|
||||
|
||||
public CollectiveResistance(final CollectiveResistance card) {
|
||||
public CollectiveDefiance(final CollectiveDefiance card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CollectiveResistance copy() {
|
||||
return new CollectiveResistance(this);
|
||||
public CollectiveDefiance copy() {
|
||||
return new CollectiveDefiance(this);
|
||||
}
|
||||
}
|
||||
|
||||
class CollectiveResistanceEffect extends OneShotEffect {
|
||||
class CollectiveDefianceEffect extends OneShotEffect {
|
||||
|
||||
public CollectiveResistanceEffect() {
|
||||
public CollectiveDefianceEffect() {
|
||||
super(Outcome.Discard);
|
||||
this.staticText = "Target player discards all the cards in his or her hand, then draws that many cards";
|
||||
}
|
||||
|
||||
public CollectiveResistanceEffect(final CollectiveResistanceEffect effect) {
|
||||
public CollectiveDefianceEffect(final CollectiveDefianceEffect effect) {
|
||||
super(effect);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CollectiveResistanceEffect copy() {
|
||||
return new CollectiveResistanceEffect(this);
|
||||
public CollectiveDefianceEffect copy() {
|
||||
return new CollectiveDefianceEffect(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
58
Mage.Sets/src/mage/sets/eldritchmoon/FalkenrathReaver.java
Normal file
58
Mage.Sets/src/mage/sets/eldritchmoon/FalkenrathReaver.java
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
/*
|
||||
* 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.eldritchmoon;
|
||||
|
||||
import java.util.UUID;
|
||||
import mage.MageInt;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Rarity;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author fireshoes
|
||||
*/
|
||||
public class FalkenrathReaver extends CardImpl {
|
||||
|
||||
public FalkenrathReaver(UUID ownerId) {
|
||||
super(ownerId, 127, "Falkenrath Reaver", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{R}");
|
||||
this.expansionSetCode = "EMN";
|
||||
this.subtype.add("Vampire");
|
||||
this.power = new MageInt(2);
|
||||
this.toughness = new MageInt(2);
|
||||
}
|
||||
|
||||
public FalkenrathReaver(final FalkenrathReaver card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FalkenrathReaver copy() {
|
||||
return new FalkenrathReaver(this);
|
||||
}
|
||||
}
|
||||
|
|
@ -31,10 +31,13 @@ import java.util.UUID;
|
|||
import mage.MageInt;
|
||||
import mage.ObjectColor;
|
||||
import mage.abilities.common.AttacksTriggeredAbility;
|
||||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.effects.common.CreateTokenEffect;
|
||||
import mage.abilities.effects.common.InfoEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.Zone;
|
||||
import mage.game.permanent.token.Token;
|
||||
|
||||
/**
|
||||
|
|
@ -55,6 +58,7 @@ public class HanweirGarrison extends CardImpl {
|
|||
this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new RedHumanToken(), 2, true, true), false));
|
||||
|
||||
// <i>(Melds with Hanweir Battlements.)</i>
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Hannweir Battlements.)</i>")));
|
||||
}
|
||||
|
||||
public HanweirGarrison(final HanweirGarrison card) {
|
||||
|
|
|
|||
|
|
@ -31,10 +31,13 @@ import java.util.UUID;
|
|||
import mage.MageInt;
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.effects.common.InfoEffect;
|
||||
import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.Zone;
|
||||
import mage.filter.Filter;
|
||||
import mage.filter.common.FilterCreatureCard;
|
||||
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
|
||||
|
|
@ -66,8 +69,9 @@ public class MidnightScavengers extends CardImpl {
|
|||
Target target = new TargetCardInYourGraveyard(filter);
|
||||
ability.addTarget(target);
|
||||
this.addAbility(ability);
|
||||
|
||||
|
||||
// <i>(Melds with Graf Rats.)</i>
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Graf Rats.)</i>")));
|
||||
}
|
||||
|
||||
public MidnightScavengers(final MidnightScavengers card) {
|
||||
|
|
|
|||
98
Mage.Sets/src/mage/sets/eldritchmoon/PermeatingMass.java
Normal file
98
Mage.Sets/src/mage/sets/eldritchmoon/PermeatingMass.java
Normal 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.sets.eldritchmoon;
|
||||
|
||||
import java.util.UUID;
|
||||
import mage.MageInt;
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Duration;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.Rarity;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.util.functions.EmptyApplyToPermanent;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author fireshoes
|
||||
*/
|
||||
public class PermeatingMass extends CardImpl {
|
||||
|
||||
public PermeatingMass(UUID ownerId) {
|
||||
super(ownerId, 165, "Permeating Mass", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}");
|
||||
this.expansionSetCode = "EMN";
|
||||
this.subtype.add("Spirit");
|
||||
this.power = new MageInt(1);
|
||||
this.toughness = new MageInt(3);
|
||||
|
||||
// Whenever Permeating Mass deals combat damage to a creature, that creature becomes a copy of Permeating Mass.
|
||||
this.addAbility(new DealsCombatDamageToACreatureTriggeredAbility(new PermeatingMassEffect(), false, true));
|
||||
}
|
||||
|
||||
public PermeatingMass(final PermeatingMass card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermeatingMass copy() {
|
||||
return new PermeatingMass(this);
|
||||
}
|
||||
}
|
||||
|
||||
class PermeatingMassEffect extends OneShotEffect {
|
||||
|
||||
public PermeatingMassEffect() {
|
||||
super(Outcome.Copy);
|
||||
this.staticText = "that creature becomes a copy of {this}.";
|
||||
}
|
||||
|
||||
public PermeatingMassEffect(final PermeatingMassEffect effect) {
|
||||
super(effect);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermeatingMassEffect copy() {
|
||||
return new PermeatingMassEffect(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability ability) {
|
||||
Permanent copyTo = game.getPermanent(getTargetPointer().getFirst(game, ability));
|
||||
if (copyTo != null) {
|
||||
Permanent copyFrom = game.getPermanent(ability.getSourceId());
|
||||
if (copyFrom != null) {
|
||||
game.copyPermanent(Duration.WhileOnBattlefield, copyFrom, copyTo.getId(), ability, new EmptyApplyToPermanent());
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue