From 2b3fb81cdd92682676aa8530cfa4c9355638040a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 17 Jun 2016 15:16:24 +0200 Subject: [PATCH] Some minor changes. --- .../mage/sets/fatereforged/UginTheSpiritDragon.java | 10 ++++++---- Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/fatereforged/UginTheSpiritDragon.java b/Mage.Sets/src/mage/sets/fatereforged/UginTheSpiritDragon.java index a7cbbf6bc0..c07286bae2 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/UginTheSpiritDragon.java +++ b/Mage.Sets/src/mage/sets/fatereforged/UginTheSpiritDragon.java @@ -27,6 +27,8 @@ */ package mage.sets.fatereforged; +import java.util.HashSet; +import java.util.Set; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; @@ -35,6 +37,7 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.common.PayVariableLoyaltyCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; +import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardsImpl; import mage.constants.CardType; @@ -48,7 +51,6 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; -import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreatureOrPlayer; @@ -123,9 +125,9 @@ class UginTheSpiritDragonEffect2 extends OneShotEffect { FilterPermanent filter = new FilterPermanent("permanent with converted mana cost X or less that's one or more colors"); filter.add(new ConvertedManaCostPredicate(ComparisonType.LessThan, cmc + 1)); filter.add(Predicates.not(new ColorlessPredicate())); - for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - controller.moveCardToExileWithInfo(permanent, null, "", source.getSourceId(), game, Zone.BATTLEFIELD, true); - } + Set permanentsToExile = new HashSet<>(); + permanentsToExile.addAll(game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)); + controller.moveCards(permanentsToExile, Zone.EXILED, source, game); return true; } } diff --git a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java index b1ced67254..f1bc12fcbc 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java @@ -59,14 +59,17 @@ public class ChandraNalaar extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(6)); + // +1: Chandra Nalaar deals 1 damage to target player. LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(1), 1); ability1.addTarget(new TargetPlayer()); this.addAbility(ability1); + // -X: Chandra Nalaar deals X damage to target creature. LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(ChandraNalaarXValue.getDefault())); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); + // -8: Chandra Nalaar deals 10 damage to target player and each creature he or she controls. Effects effects1 = new Effects(); effects1.add(new DamageTargetEffect(10)); effects1.add(new DamageAllControlledTargetEffect(10, new FilterCreaturePermanent()));