github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-09 09:11:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/magefree/mage

Browse source
This commit is contained in:
igoudt 2017-06-29 12:21:55 +02:00
commit b7badc49cf
5 changed files with 15 additions and 13 deletions
Mage.Sets/src/mage/cards
c
ChampionOfWits.java
d
DarkIntimations.java
n
NomadMythmaker.java
Mage/src/main/java/mage/abilities/effects/common
PopulateEffect.java
Utils
mtg-cards-data.txt

4
Mage.Sets/src/mage/cards/c/ChampionOfWits.java
View file

@ -57,7 +57,7 @@ public class ChampionOfWits extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
// When Champion of Wits enters the battlefield, you may draw cards equal to its power. If you do, discard two cards.
// When Champion of Wits enters the battlefield, you may draw cards equal to its power. If you do, discard two cards
this.addAbility(new EntersBattlefieldTriggeredAbility(new ChampionOfWitsEffect(), true));
// Eternalize {5}{U}{U}
@ -78,7 +78,7 @@ class ChampionOfWitsEffect extends OneShotEffect {
public ChampionOfWitsEffect() {
super(Outcome.Benefit);
staticText = "When {this} enters the battlefield, you may draw cards equal to its power. If you do, discard two cards.";
staticText = "you may draw cards equal to its power. If you do, discard two cards.";
}
public ChampionOfWitsEffect(final ChampionOfWitsEffect effect) {

8
Mage.Sets/src/mage/cards/d/DarkIntimations.java
View file

@ -150,14 +150,15 @@ class DarkIntimationsEffect extends OneShotEffect {
}
}
TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filterCard);
if (target.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.choose(Outcome.ReturnToHand, target, source.getSourceId(), game)) {
if (target.canChoose(source.getSourceId(), source.getControllerId(), game)
&& controller.choose(Outcome.ReturnToHand, target, source.getSourceId(), game)) {
Card card = game.getCard(target.getFirstTarget());
if (card == null) {
return false;
}
controller.moveCards(card, Zone.HAND, source, game);
controller.drawCards(1, game);
}
controller.drawCards(1, game);
return true;
}
}
@ -217,7 +218,8 @@ class DarkIntimationsReplacementEffect extends ReplacementEffectImpl {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
Permanent creature = ((EntersTheBattlefieldEvent) event).getTarget();
return creature != null && event.getTargetId().equals(getTargetPointer().getFirst(game, source));
return creature != null
&& event.getTargetId().equals(getTargetPointer().getFirst(game, source));
}
@Override

11
Mage.Sets/src/mage/cards/n/NomadMythmaker.java
View file

@ -57,7 +57,7 @@ import mage.target.common.TargetControlledPermanent;
*/
public class NomadMythmaker extends CardImpl {
private static final FilterCard FILTER = new FilterCard("Aura card");
private static final FilterCard FILTER = new FilterCard("Aura card from a graveyard");
static {
FILTER.add(new CardTypePredicate(CardType.ENCHANTMENT));
@ -65,7 +65,7 @@ public class NomadMythmaker extends CardImpl {
}
public NomadMythmaker(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}");
this.subtype.add("Human");
this.subtype.add("Nomad");
this.subtype.add("Cleric");
@ -114,16 +114,15 @@ class NomadMythmakerEffect extends OneShotEffect {
|| aura == null) {
return false;
}
FilterControlledCreaturePermanent FILTER = new FilterControlledCreaturePermanent("Aura card in a graveyard");
FilterControlledCreaturePermanent FILTER = new FilterControlledCreaturePermanent("Choose a creature you control");
TargetControlledPermanent target = new TargetControlledPermanent(FILTER);
target.setNotTarget(true);
if (target.canChoose(source.getControllerId(), game)
&& controller.choose(Outcome.PutCardInPlay, target, source.getSourceId(), game)) {
if (controller.choose(Outcome.PutCardInPlay, target, source.getSourceId(), game)) {
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null
&& !permanent.cantBeAttachedBy(aura, game)) {
game.getState().setValue("attachTo:" + aura.getId(), permanent);
controller.moveCards(aura, Zone.BATTLEFIELD, source, game);
aura.putOntoBattlefield(game, Zone.GRAVEYARD, source.getSourceId(), controller.getId());
return permanent.addAttachment(aura.getId(), game);
}
}

1
Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java
View file

@ -82,6 +82,7 @@ public class PopulateEffect extends OneShotEffect {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
Target target = new TargetPermanent(filter);
target.setNotTarget(true);
if (target.canChoose(source.getControllerId(), game)) {
player.choose(Outcome.Copy, target, source.getSourceId(), game);
Permanent tokenToCopy = game.getPermanent(target.getFirstTarget());

4
Utils/mtg-cards-data.txt
View file

@ -31650,7 +31650,7 @@ Supreme Will|Hour of Devastation|49|U|{2}{U}|Instant|||Choose one —$• Counte
Swarm Intelligence|Hour of Devastation|50|R|{6}{U}|Enchantment|||Whenever you cast an instant or sorcery spell, you may copy that spell. You may choose new targets for the copy.|
Unesh, Criosphinx Sovereign|Hour of Devastation|52|M|{4}{U}{U}|Legendary Creature - Sphinx|4|4|Flying$Sphinx spells you cast cost {2} less to cast.$Whenever Unesh, Criosphinx Sovereign or another Sphinx enters the battlefield under your control, reveal the top four cards of your library. An opponent seperates those cards into two piles. Put one pile into your hand and the other into your graveyard.|
Accursed Horde|Hour of Devastation|56|U|{3}{B}|Creature - Zombie|3|3|{1}{B}: Target attacking Zombie gains indestructible until end of turn. <i>(Damage and effects that say "destroy" don't destroy it. If its toughness is 0 or less, it's still put into its owner's graveyard.)</i>|
Ammit Eternal|Hour of Devastation|57|{2}{B}|Creature - Zombie Crocodile Demon|5|5|Afflict 3 <i>(Whenever this creature becomes blocked, defending player loses 3 life.)</i>$Whenever an opponent casts a spell, put a -1/-1 counter on Ammit Eternal.$Whenever Ammit Eternal deals combat damage to a player, remove all -1/-1 counters from it.|
Ammit Eternal|Hour of Devastation|57|R|{2}{B}|Creature - Zombie Crocodile Demon|5|5|Afflict 3$Whenever an opponent casts a spell, put a -1/-1 counter on Ammit Eternal.$Whenever Ammit Eternal deals combat damage to a player, remove all -1/-1 counters from it.|
Bontu's Last Reckoning|Hour of Devastation|60|R|{1}{B}{B}|Sorcery|||Destroy all creatures. Lands you control don't untap during your next untap step.|
Carrion Screecher|Hour of Devastation|61|C|{3}{B}|Creature - Zombie Bird|3|1|Flying|
Doomfall|Hour of Devastation|62|U|{2}{B}|Sorcery|||Choose one —$• Target player exiles a creature he or she controls.$• Target opponent reveals his or her hand. You choose a nonland card from it. Exile that card.|
@ -31658,7 +31658,7 @@ Dreamstealer|Hour of Devastation|63|R|{2}{B}|Creature - Human Wizard|1|2|Menace$
Hour of Glory|Hour of Devastation|65|R|{3}{B}|Instant|||Exile target creature. If that creature was a God, its controller reveals his or her hand and exiles all cards with the same name as that creature.|
Khenra Eternal|Hour of Devastation|66|C|{1}{B}|Creature - Zombie Jackal Warrior|2|2|Afflict 1 <i>(Whenever this creature becomes blocked, defending player loses 1 life.)</i>|
Liliana's Defeat|Hour of Devastation|68|U|{B}|Sorcery|||Destroy target black creature or black planeswalker. If that permanent was a Liliana planeswalker, her controller loses 3 life.|
Maurauding Boneslasher|Hour of Devastation|70|C|{2}{B}|Creature - Zombie Minotaur|3|3|Marauding Boneslasher can't block unless you control another Zombie.|
Marauding Boneslasher|Hour of Devastation|70|C|{2}{B}|Creature - Zombie Minotaur|3|3|Marauding Boneslasher can't block unless you control another Zombie.|
Razaketh, the Foulblooded|Hour of Devastation|73|M|{5}{B}{B}{B}|Legendary Creature - Demon|8|8|Flying, trample$Pay 2 life, Sacrifice another creature: Search your library for a card and put that card into your hand. Then shuffle your library.|
Razaketh's Ritual|Hour of Devastation|74|U|{3}{B}{B}|Sorcery|||Search your library for a card and put that card into your hand. Then shuffle your library.$Cycling {B} <i>({B}, Discard this card: Draw a card.)</i>|
Torment of Hailfire|Hour of Devastation|77|R|{X}{B}{B}|Sorcery|||Repeat the following process X times. Each opponent loses 3 life unless he or she sacrifices a nonland permanent or discards a card.|