Refactored counters on permanents counting

Added BecomeMonstrousTriggeredAbility 
Added Target and Filter class for creature an opponent controls

Mage/src/main/java/mage/abilities/common/BecomesMonstrousTriggeredAbility.java

@@ -0,0 +1,60 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.abilities.common;
+
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author Styxo
+ */
+public class BecomesMonstrousTriggeredAbility extends TriggeredAbilityImpl {
+
+    protected FilterCreaturePermanent filter = new FilterCreaturePermanent();
+
+    public BecomesMonstrousTriggeredAbility(Effect effect) {
+        super(Zone.BATTLEFIELD, effect, false);
+    }
+
+    public BecomesMonstrousTriggeredAbility(final BecomesMonstrousTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public BecomesMonstrousTriggeredAbility copy() {
+        return new BecomesMonstrousTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.BECOMES_MONSTROUS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent permanent = game.getPermanent(event.getTargetId());
+        if (filter.match(permanent, sourceId, controllerId, game)
+                && (permanent.getControllerId().equals(this.controllerId))) {
+            for (Effect effect : this.getEffects()) {
+                effect.setTargetPointer(new FixedTarget(event.getTargetId()));
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever " + filter.getMessage() + " becomes monstrous, " + super.getRule();
+    }
+}

Mage/src/main/java/mage/abilities/dynamicvalue/common/CountersSourceCount.java

@@ -7,15 +7,15 @@ import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
-public class CountersCount implements DynamicValue {
+public class CountersSourceCount implements DynamicValue {
 
     private final CounterType counter;
 
-    public CountersCount(CounterType counter) {
+    public CountersSourceCount(CounterType counter) {
         this.counter = counter;
     }
 
-    public CountersCount(final CountersCount countersCount) {
+    public CountersSourceCount(final CountersSourceCount countersCount) {
         this.counter = countersCount.counter;
     }
 
@@ -29,8 +29,8 @@ public class CountersCount implements DynamicValue {
     }
 
     @Override
-    public CountersCount copy() {
-        return new CountersCount(this);
+    public CountersSourceCount copy() {
+        return new CountersSourceCount(this);
     }
 
     @Override

Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java

@@ -46,6 +46,11 @@ public class FightTargetsEffect extends OneShotEffect {
         super(Outcome.Damage);
     }
 
+    public FightTargetsEffect(String effectText) {
+        this();
+        this.staticText = effectText;
+    }
+
     public FightTargetsEffect(final FightTargetsEffect effect) {
         super(effect);
     }

Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java

@@ -41,6 +41,7 @@ import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
+import mage.target.Target;
 import mage.util.CardUtil;
 
 /**
@@ -144,17 +145,21 @@ public class AddCountersTargetEffect extends OneShotEffect {
             sb.append("s");
         }
         sb.append(" on ");
+        
+        Target target = mode.getTargets().get(0);
+        if (target.getNumberOfTargets() == 0) {
+            sb.append("up to ");
+        }
 
-        // TODO: add normal text infrastructure for target pointers
-        if (mode.getTargets().size() > 0) {
-            String targetName = mode.getTargets().get(0).getTargetName();
-            if (!targetName.startsWith("another")) {
+        if (target.getMaxNumberOfTargets() > 1 || target.getNumberOfTargets() == 0) {
+            sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName());
+        } else {
+            if (!target.getTargetName().startsWith("another")) {
                 sb.append("target ");
             }
-            sb.append(targetName);
-        } else {
-            sb.append("it");
+            sb.append(target.getTargetName());
         }
+
         if (amount.getMessage().length() > 0) {
             sb.append(" for each ").append(amount.getMessage());
         }