mirror of
https://github.com/correl/mage.git
synced 2025-03-16 09:16:26 -09:00
Some minor changes.
This commit is contained in:
parent
e334d85078
commit
2b3fb81cdd
2 changed files with 9 additions and 4 deletions
|
@ -27,6 +27,8 @@
|
||||||
*/
|
*/
|
||||||
package mage.sets.fatereforged;
|
package mage.sets.fatereforged;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.LoyaltyAbility;
|
import mage.abilities.LoyaltyAbility;
|
||||||
|
@ -35,6 +37,7 @@ import mage.abilities.costs.Cost;
|
||||||
import mage.abilities.costs.common.PayVariableLoyaltyCost;
|
import mage.abilities.costs.common.PayVariableLoyaltyCost;
|
||||||
import mage.abilities.effects.OneShotEffect;
|
import mage.abilities.effects.OneShotEffect;
|
||||||
import mage.abilities.effects.common.DamageTargetEffect;
|
import mage.abilities.effects.common.DamageTargetEffect;
|
||||||
|
import mage.cards.Card;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
import mage.cards.CardsImpl;
|
import mage.cards.CardsImpl;
|
||||||
import mage.constants.CardType;
|
import mage.constants.CardType;
|
||||||
|
@ -48,7 +51,6 @@ import mage.filter.predicate.Predicates;
|
||||||
import mage.filter.predicate.mageobject.ColorlessPredicate;
|
import mage.filter.predicate.mageobject.ColorlessPredicate;
|
||||||
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
|
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.game.permanent.Permanent;
|
|
||||||
import mage.players.Player;
|
import mage.players.Player;
|
||||||
import mage.target.common.TargetCardInHand;
|
import mage.target.common.TargetCardInHand;
|
||||||
import mage.target.common.TargetCreatureOrPlayer;
|
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");
|
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(new ConvertedManaCostPredicate(ComparisonType.LessThan, cmc + 1));
|
||||||
filter.add(Predicates.not(new ColorlessPredicate()));
|
filter.add(Predicates.not(new ColorlessPredicate()));
|
||||||
for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
|
Set<Card> permanentsToExile = new HashSet<>();
|
||||||
controller.moveCardToExileWithInfo(permanent, null, "", source.getSourceId(), game, Zone.BATTLEFIELD, true);
|
permanentsToExile.addAll(game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game));
|
||||||
}
|
controller.moveCards(permanentsToExile, Zone.EXILED, source, game);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,14 +59,17 @@ public class ChandraNalaar extends CardImpl {
|
||||||
|
|
||||||
this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(6));
|
this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(6));
|
||||||
|
|
||||||
|
// +1: Chandra Nalaar deals 1 damage to target player.
|
||||||
LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(1), 1);
|
LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(1), 1);
|
||||||
ability1.addTarget(new TargetPlayer());
|
ability1.addTarget(new TargetPlayer());
|
||||||
this.addAbility(ability1);
|
this.addAbility(ability1);
|
||||||
|
|
||||||
|
// -X: Chandra Nalaar deals X damage to target creature.
|
||||||
LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(ChandraNalaarXValue.getDefault()));
|
LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(ChandraNalaarXValue.getDefault()));
|
||||||
ability2.addTarget(new TargetCreaturePermanent());
|
ability2.addTarget(new TargetCreaturePermanent());
|
||||||
this.addAbility(ability2);
|
this.addAbility(ability2);
|
||||||
|
|
||||||
|
// -8: Chandra Nalaar deals 10 damage to target player and each creature he or she controls.
|
||||||
Effects effects1 = new Effects();
|
Effects effects1 = new Effects();
|
||||||
effects1.add(new DamageTargetEffect(10));
|
effects1.add(new DamageTargetEffect(10));
|
||||||
effects1.add(new DamageAllControlledTargetEffect(10, new FilterCreaturePermanent()));
|
effects1.add(new DamageAllControlledTargetEffect(10, new FilterCreaturePermanent()));
|
||||||
|
|
Loading…
Add table
Reference in a new issue