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

* Curse of Exhaustion - Fixed that it did not work correctly with Copy Enchantment spell.

Browse source
This commit is contained in:
LevelX2 2014-08-06 12:22:17 +02:00
parent 6776b03bae
commit fc382740ce
3 changed files with 92 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java
View file

@ -41,7 +41,7 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPlayer;
import mage.watchers.Watcher;
import mage.watchers.common.CastSpellLastTurnWatcher;
/**
*
@ -56,7 +56,6 @@ public class CurseOfExhaustion extends CardImpl {
this.subtype.add("Curse");
this.color.setWhite(true);
this.addWatcher(new CurseOfExhaustionWatcher());
// Enchant player
TargetPlayer auraTarget = new TargetPlayer();
@ -78,39 +77,6 @@ public class CurseOfExhaustion extends CardImpl {
}
}
class CurseOfExhaustionWatcher extends Watcher {
public CurseOfExhaustionWatcher() {
super("SpellCast", WatcherScope.PLAYER);
}
public CurseOfExhaustionWatcher(final CurseOfExhaustionWatcher watcher) {
super(watcher);
}
@Override
public CurseOfExhaustionWatcher copy() {
return new CurseOfExhaustionWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {
if (condition == true) {//no need to check - condition has already occured
return;
}
if (event.getType() == GameEvent.EventType.SPELL_CAST ) {
Permanent enchantment = game.getPermanent(this.sourceId);
if (enchantment != null && enchantment.getAttachedTo() != null) {
Player player = game.getPlayer(enchantment.getAttachedTo());
if (player != null && event.getPlayerId().equals(player.getId())) {
condition = true;
}
}
}
}
}
class CurseOfExhaustionEffect extends ContinuousRuleModifiyingEffectImpl {
public CurseOfExhaustionEffect() {
@ -139,8 +105,8 @@ class CurseOfExhaustionEffect extends ContinuousRuleModifiyingEffectImpl {
if (enchantment != null && enchantment.getAttachedTo() != null) {
Player player = game.getPlayer(enchantment.getAttachedTo());
if (player != null && event.getPlayerId().equals(player.getId())) {
Watcher watcher = game.getState().getWatchers().get("SpellCast", source.getControllerId());
if (watcher != null && watcher.conditionMet()) {
CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get("CastSpellLastTurnWatcher");
if (watcher != null && watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(event.getPlayerId()) > 0) {
return true;
}
}