github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use BeginningOfUpkeepTriggeredAbility instead of OnEventTriggeredAbility for Harbinger of Night and Ivory Tower

Browse source
This commit is contained in:
LoneFox 2015-06-25 10:44:48 +03:00
parent da479b69ab
commit 8366ce3b8d
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/sets/antiquities/IvoryTower.java
View file

@ -29,14 +29,14 @@ package mage.sets.antiquities;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent.EventType;
import mage.players.Player; import mage.players.Player;
/** /**
@ -50,8 +50,7 @@ public class IvoryTower extends CardImpl {
super(ownerId, 18, "Ivory Tower", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); super(ownerId, 18, "Ivory Tower", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}");
this.expansionSetCode = "ATQ"; this.expansionSetCode = "ATQ";
this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", this.addAbility(new BeginningOfUpkeepTriggeredAbility(new IvoryTowerEffect(), TargetController.YOU, false));
new IvoryTowerEffect(), false));
} }
public IvoryTower(final IvoryTower card) { public IvoryTower(final IvoryTower card) {

8
Mage.Sets/src/mage/sets/mirage/HarbingerOfNight.java
View file

@ -29,14 +29,14 @@ package mage.sets.mirage;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.effects.common.counter.AddCountersAllEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.game.events.GameEvent.EventType;
/** /**
* *
@ -53,8 +53,8 @@ public class HarbingerOfNight extends CardImpl {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// At the beginning of your upkeep, put a -1/-1 counter on each creature. // At the beginning of your upkeep, put a -1/-1 counter on each creature.
this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.M1M1.createInstance(), new FilterCreaturePermanent()),
new AddCountersAllEffect(CounterType.M1M1.createInstance(), new FilterCreaturePermanent()), false)); TargetController.YOU, false));
} }
public HarbingerOfNight(final HarbingerOfNight card) { public HarbingerOfNight(final HarbingerOfNight card) {