* Mana Reflection - Fixed that multiple Mana Reflections did not stack, fixed a bug of mana calculation (fixes #758).

This commit is contained in:
LevelX2 2015-02-27 15:05:53 +01:00
parent 80d3e6bd9a
commit 50261650b6
2 changed files with 14 additions and 97 deletions

View file

@ -58,7 +58,6 @@ public class ManaReflection extends CardImpl {
// If you tap a permanent for mana, it produces twice as much of that mana instead.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaReflectionReplacementEffect()));
this.addWatcher(new PermanentTappedForManaWatcher());
}
@ -92,41 +91,35 @@ class ManaReflectionReplacementEffect extends ReplacementEffectImpl {
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Mana mana = ((ManaEvent) event).getMana();
if (mana.getBlack() > 0) {
((ManaEvent) event).getMana().set(ManaType.BLACK, mana.count() * 2);
((ManaEvent) event).getMana().set(ManaType.BLACK, mana.getBlack()* 2);
}
if (mana.getBlue() > 0) {
((ManaEvent) event).getMana().set(ManaType.BLUE, mana.count() * 2);
((ManaEvent) event).getMana().set(ManaType.BLUE, mana.getBlue() * 2);
}
if (mana.getWhite() > 0) {
((ManaEvent) event).getMana().set(ManaType.WHITE, mana.count() * 2);
((ManaEvent) event).getMana().set(ManaType.WHITE, mana.getWhite() * 2);
}
if (mana.getGreen() > 0) {
((ManaEvent) event).getMana().set(ManaType.GREEN, mana.count() * 2);
((ManaEvent) event).getMana().set(ManaType.GREEN, mana.getGreen() * 2);
}
if (mana.getRed() > 0) {
((ManaEvent) event).getMana().set(ManaType.RED, mana.count() * 2);
((ManaEvent) event).getMana().set(ManaType.RED, mana.getRed() * 2);
}
if (mana.getColorless() > 0) {
((ManaEvent) event).getMana().set(ManaType.COLORLESS, mana.count() * 2);
((ManaEvent) event).getMana().set(ManaType.COLORLESS, mana.getColorless() * 2);
}
return false;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getType() == GameEvent.EventType.ADD_MANA
&& event.getPlayerId().equals(source.getControllerId())
&& game.getPermanentOrLKIBattlefield(event.getSourceId()) != null) {
UUID permanentId = game.getPermanentOrLKIBattlefield(event.getSourceId()).getId();
PermanentTappedForManaWatcher watcher = (PermanentTappedForManaWatcher) game.getState().getWatchers().get("PermanentTappedForMana");
if (watcher != null) {
if (watcher.permanentId.contains(permanentId)) {
watcher.permanentId.remove(permanentId);
return true;
}
}
}
return false;
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TAPPED_FOR_MANA;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
return event.getPlayerId().equals(source.getControllerId())
&& game.getPermanentOrLKIBattlefield(event.getSourceId()) != null;
}
@Override

View file

@ -1,76 +0,0 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.watchers.common;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.watchers.Watcher;
/**
* @author jeffwadsworth
*/
public class PermanentTappedForManaWatcher extends Watcher {
public List<UUID> permanentId = new ArrayList<>();
public PermanentTappedForManaWatcher() {
super("PermanentTappedForMana", WatcherScope.GAME);
}
public PermanentTappedForManaWatcher(final PermanentTappedForManaWatcher watcher) {
super(watcher);
}
@Override
public PermanentTappedForManaWatcher copy() {
return new PermanentTappedForManaWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.TAPPED_FOR_MANA) {
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getSourceId());
if (permanent != null) {
permanentId.add(permanent.getId());
}
}
}
@Override
public void reset() {
super.reset();
permanentId.clear();
}
}