New AttackingCreatureCount and some changes to rule text generation.

Mage/src/mage/abilities/dynamicvalue/common/AttackingCreatureCount.java

@@ -0,0 +1,82 @@
+/*
+ *  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 mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.game.Game;
+import mage.game.combat.CombatGroup;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+
+public class AttackingCreatureCount implements DynamicValue {
+
+    private String message;
+
+    public AttackingCreatureCount() {
+        this("attacking creature");
+    }
+
+    public AttackingCreatureCount(String message) {
+        this.message = message;
+    }
+
+    public AttackingCreatureCount(final AttackingCreatureCount dynamicValue) {
+        super();
+        this.message = dynamicValue.message;
+    }
+
+    @Override
+    public int calculate(Game game, Ability sourceAbility) {
+        int count = 0;
+        for (CombatGroup combatGroup : game.getCombat().getGroups()) {
+            count += combatGroup.getAttackers().size();
+        }
+        return count;
+    }
+
+    @Override
+    public DynamicValue copy() {
+        return new AttackingCreatureCount(this);
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public String toString() {
+        return "1";
+    }
+}

Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java

@@ -77,12 +77,12 @@ public class DrawCardControllerEffect extends OneShotEffect<DrawCardControllerEf
     private void setText() {
         StringBuilder sb = new StringBuilder();
         boolean oneCard = (amount instanceof StaticValue && amount.calculate(null, null) == 1) 
-                                || amount instanceof PermanentsOnBattlefieldCount;
+                                || amount instanceof PermanentsOnBattlefieldCount || amount.toString() == "1";
         sb.append("draw ").append(oneCard ? "a" : amount).append(" card");
         if (!oneCard) {
             sb.append("s");
         }
-                String message = amount.getMessage();
+        String message = amount.getMessage();
         if (message.length() > 0) {
             sb.append(" for each ");
         }

Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java

@@ -99,12 +99,18 @@ public class AddCountersSourceEffect extends OneShotEffect<AddCountersSourceEffe
 
     private void setText() {
         StringBuilder sb = new StringBuilder();
+        // put a +1/+1 counter on it for each attacking creature you control.
+        sb.append("put ");
         if (counter.getCount() > 1) {
-            sb.append("put ").append(Integer.toString(counter.getCount())).append(" ").append(counter.getName()).append(" counters on {this}");
-            staticText = sb.toString();
+            sb.append(Integer.toString(counter.getCount())).append(" ");
         } else {
-            staticText = sb.append("put a ").append(counter.getName().toLowerCase()).append(" counter on {this}").toString();
+            sb.append("a ");
         }
+        sb.append(counter.getName().toLowerCase()).append(" counter on {this}");
+        if (amount.getMessage().length() > 0) {
+            sb.append(" for each ").append(amount.getMessage());
+        }
+        staticText = sb.toString();
     }
 
     @Override