External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 19:59:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaned up ReturnToHandChosenControllesPermanentEffect.

Browse source
This commit is contained in:
LevelX2 2015-06-07 01:07:49 +02:00
parent 76a7aeb957
commit f2cf08d5b2
3 changed files with 14 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Sets/src/mage/sets/planarchaos/DustElemental.java
View file

@ -29,7 +29,6 @@ package mage.sets.planarchaos;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect;
import mage.abilities.keyword.FlashAbility;
@ -38,12 +37,7 @@ import mage.abilities.keyword.FearAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetControlledPermanent;
/**
*
@ -65,8 +59,9 @@ public class DustElemental extends CardImpl {
// Flying; fear
this.addAbility(FlyingAbility.getInstance());
this.addAbility(FearAbility.getInstance());
// When Dust Elemental enters the battlefield, return three creatures you control to their owner's hand.
this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter,1,3)));
this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter, 3)));
}
public DustElemental(final DustElemental card) {

2
Mage.Sets/src/mage/sets/planarchaos/StormfrontRiders.java
View file

@ -68,7 +68,7 @@ public class StormfrontRiders extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// When Stormfront Riders enters the battlefield, return two creatures you control to their owner's hand.
this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(new FilterControlledCreaturePermanent("creatures you control"),1,2)));
this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(new FilterControlledCreaturePermanent("creatures you control"), 2)));
// Whenever Stormfront Riders or another creature is returned to your hand from the battlefield, put a 1/1 white Soldier creature token onto the battlefield.
this.addAbility(new ZoneChangeAllTriggeredAbility(Zone.BATTLEFIELD, Zone.BATTLEFIELD, Zone.HAND, new CreateTokenEffect(new SoldierToken()),
filter,"Whenever {this} or another creature is returned to your hand from the battlefield, ", false));