From 30dce7cce3dda8003e54fd8d622e6317d8181de9 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 11 Jul 2013 15:06:36 +0200 Subject: [PATCH] Some changes to the framework classes. Added ControllerGotLifeCount DynamicValue. --- ...BattlefieldControlledTriggeredAbility.java | 7 +- .../common/ControllerGotLifeCount.java | 86 +++++++++++++++++++ .../common/OpponentsLostLifeCount.java | 2 +- .../counter/AddCountersSourceEffect.java | 3 +- 4 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java index 4c1cc0b242..ceb90a2ff0 100644 --- a/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/EntersBattlefieldControlledTriggeredAbility.java @@ -29,8 +29,8 @@ package mage.abilities.common; import java.util.UUID; -import mage.constants.Zone; import mage.abilities.effects.Effect; +import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -76,15 +76,14 @@ public class EntersBattlefieldControlledTriggeredAbility extends EntersBattlefie if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD) { UUID targetId = event.getTargetId(); Permanent permanent = game.getPermanent(targetId); - if (filter.match(permanent, getSourceId(), getControllerId(), game)) { + if (permanent.getControllerId().equals(this.getControllerId()) + && filter.match(permanent, getSourceId(), getControllerId(), game)) { return true; } } return false; } - - @Override public EntersBattlefieldControlledTriggeredAbility copy() { return new EntersBattlefieldControlledTriggeredAbility(this); diff --git a/Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java b/Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java new file mode 100644 index 0000000000..93a1d1ac69 --- /dev/null +++ b/Mage/src/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java @@ -0,0 +1,86 @@ +/* + * 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.abilities.dynamicvalue.common; + +import java.io.ObjectStreamException; +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.MageSingleton; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.cards.Card; +import mage.game.Game; +import mage.watchers.common.PlayerGainedLifeWatcher; + +/** + * Amount of life the controller got this turn. + * + * @author LevelX2 + */ + +public class ControllerGotLifeCount implements DynamicValue, MageSingleton { + + private static final ControllerGotLifeCount fINSTANCE = new ControllerGotLifeCount(); + + private Object readResolve() throws ObjectStreamException { + return fINSTANCE; + } + + public static ControllerGotLifeCount getInstance(Card card) { + card.addWatcher(new PlayerGainedLifeWatcher()); + return fINSTANCE; + } + + @Override + public int calculate(Game game, Ability sourceAbility) { + return this.calculate(game, sourceAbility.getControllerId()); + } + + public int calculate(Game game, UUID controllerId) { + PlayerGainedLifeWatcher watcher = (PlayerGainedLifeWatcher) game.getState().getWatchers().get("PlayerGainedLifeWatcher"); + if (watcher != null) { + return watcher.getLiveGained(controllerId); + } + return 0; + } + + @Override + public DynamicValue copy() { + return new ControllerGotLifeCount(); + } + + @Override + public String toString() { + return "X"; + } + + @Override + public String getMessage() { + return "the amount of life you've gained this turn"; + } +} diff --git a/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java b/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java index 79459413d6..6292f6a514 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/OpponentsLostLifeCount.java @@ -72,4 +72,4 @@ public class OpponentsLostLifeCount implements DynamicValue { public String getMessage() { return "the total life lost by your opponents this turn"; } -} \ No newline at end of file +} diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java b/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java index 72a752e21a..b6f0fef714 100644 --- a/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java @@ -38,6 +38,7 @@ import mage.counters.Counter; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import mage.util.CardUtil; /** * @author BetaSteward_at_googlemail.com @@ -130,7 +131,7 @@ public class AddCountersSourceEffect extends OneShotEffect 1) { - sb.append(Integer.toString(counter.getCount())).append(" "); + sb.append(CardUtil.numberToText(counter.getCount())).append(" "); } else { sb.append("a "); }