Some changes to the framework classes. Added ControllerGotLifeCount DynamicValue.

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);

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";
+    }
+}

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<AddCountersSourceEffe
         // put a +1/+1 counter on it for each attacking creature you control.
         sb.append("put ");
         if (counter.getCount() > 1) {
-            sb.append(Integer.toString(counter.getCount())).append(" ");
+            sb.append(CardUtil.numberToText(counter.getCount())).append(" ");
         } else {
             sb.append("a ");
         }