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

Changes to Consecrate Land and Power Surge both not working yet.

Browse source
This commit is contained in:
MTGfan 2016-12-08 22:38:17 -05:00
parent 4a2e1c5063
commit 90aec7c517
3 changed files with 97 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/c/ConsecrateLand.java
View file

@ -30,7 +30,7 @@ package mage.cards.c;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.CantBeEnchantedSourceEffect;
import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
@ -90,7 +90,7 @@ public class ConsecrateLand extends CardImpl {
// 9/25/2006 ruling: If Consecrate Land enters the battlefield attached to a land that’s enchanted by other Auras, those Auras are put into their owners’ graveyards.
class ConsecrateLandEffect extends OneShotEffect {
class ConsecrateLandEffect extends ContinuousEffectImpl {
private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent();
@ -99,7 +99,7 @@ class ConsecrateLandEffect extends OneShotEffect {
}
public ConsecrateLandEffect() {
super(Outcome.Benefit);
super(Duration.WhileOnBattlefield, Outcome.Benefit);
}
public ConsecrateLandEffect(final ConsecrateLandEffect effect) {

7
Mage.Sets/src/mage/cards/p/PowerSurge.java
View file

@ -38,9 +38,9 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.common.FilterControlledUntappedLandPermanent;
import mage.game.Game;
import mage.players.Player;
import mage.watchers.common.UntappedLandsAtBeginningOfTurnWatcher;
/**
*
@ -53,7 +53,7 @@ public class PowerSurge extends CardImpl {
// At the beginning of each player's upkeep, Power Surge deals X damage to that player, where X is the number of untapped lands he or she controlled at the beginning of this turn.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PowerSurgeDamageEffect(), TargetController.ANY, false, true));
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PowerSurgeDamageEffect(), TargetController.ANY, false, true), new UntappedLandsAtBeginningOfTurnWatcher());
}
public PowerSurge(final PowerSurge card) {
@ -87,7 +87,8 @@ class PowerSurgeDamageEffect extends OneShotEffect{
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
if (player != null) {
int damage = game.getBattlefield().getAllActivePermanents(new FilterControlledUntappedLandPermanent(), targetPointer.getFirst(game, source), game).size();
UntappedLandsAtBeginningOfTurnWatcher watcher = (UntappedLandsAtBeginningOfTurnWatcher) game.getState().getWatchers().get("UntappedLandsAtBeginningOfTurn");
int damage = watcher.getUntappedLandCount(targetPointer.getFirst(game, source));
player.damage(damage, source.getSourceId(), game, false, true);
return true;
}