github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-10 11:44:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master' into ut/trickster

Browse source
This commit is contained in:
Derek Monturo 2019-06-13 17:37:14 -04:00
commit 9eeccd274c
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/cards/d/DeepForestHermit.java
View file

@ -1,10 +1,13 @@
package mage.cards.d; package mage.cards.d;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.keyword.VanishingSacrificeAbility; import mage.abilities.keyword.VanishingSacrificeAbility;
import mage.abilities.keyword.VanishingUpkeepAbility; import mage.abilities.keyword.VanishingUpkeepAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -12,6 +15,7 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.SubType; import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.game.permanent.token.SquirrelToken; import mage.game.permanent.token.SquirrelToken;
@ -34,6 +38,9 @@ public final class DeepForestHermit extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Vanishing 3 // Vanishing 3
Ability ability = new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.TIME.createInstance(3)));
ability.setRuleVisible(false);
this.addAbility(ability);
this.addAbility(new VanishingUpkeepAbility(3)); this.addAbility(new VanishingUpkeepAbility(3));
this.addAbility(new VanishingSacrificeAbility()); this.addAbility(new VanishingSacrificeAbility());

5
Mage.Sets/src/mage/cards/m/MartyrsSoul.java
View file

@ -13,7 +13,8 @@ import mage.constants.CardType;
import mage.constants.ComparisonType; import mage.constants.ComparisonType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterLandPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.predicate.permanent.TappedPredicate; import mage.filter.predicate.permanent.TappedPredicate;
import java.util.UUID; import java.util.UUID;
@ -23,7 +24,7 @@ import java.util.UUID;
*/ */
public final class MartyrsSoul extends CardImpl { public final class MartyrsSoul extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent(); private static final FilterPermanent filter = new FilterControlledLandPermanent();
static { static {
filter.add(TappedPredicate.instance); filter.add(TappedPredicate.instance);

6
Mage.Sets/src/mage/cards/s/SmokeShroud.java
View file

@ -50,9 +50,9 @@ public final class SmokeShroud extends CardImpl {
// When a Ninja enters the battlefield under your control, you may return Smoke Shroud from your graveyard to the battlefield attached to that creature. // When a Ninja enters the battlefield under your control, you may return Smoke Shroud from your graveyard to the battlefield attached to that creature.
this.addAbility(new EntersBattlefieldControlledTriggeredAbility( this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
Zone.GRAVEYARD, new SmokeShroudEffect(), filter, Zone.GRAVEYARD, new SmokeShroudEffect(), filter, true,
true, "When a Ninja enters the battlefield under your control," + SetTargetPointer.PERMANENT, "When a Ninja enters the battlefield under your control, " +
" you may return {this} from your graveyard to the battlefield attached to that creature." "you may return {this} from your graveyard to the battlefield attached to that creature."
)); ));
} }

2
Mage.Sets/src/mage/cards/w/WatcherForTomorrow.java
View file

@ -72,7 +72,7 @@ class WatcherForTomorrowEffect extends OneShotEffect {
if (player == null) { if (player == null) {
return false; return false;
} }
ExileZone zone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source)); ExileZone zone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source.getSourceId(), true));
if (zone == null) { if (zone == null) {
return false; return false;
} }