[KTK] Added 12 cards.

Mage/src/mage/abilities/effects/common/combat/CanBlockAdditionalCreatureAllEffect.java

@@ -0,0 +1,107 @@
+/*
+ *  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.effects.common.combat;
+
+import mage.abilities.Ability;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.Outcome;
+import mage.constants.SubLayer;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.util.CardUtil;
+
+/**
+ *
+ * @author emerald000
+ */
+
+public class CanBlockAdditionalCreatureAllEffect extends ContinuousEffectImpl {
+
+    protected int amount;
+    protected FilterPermanent filter;
+
+    public CanBlockAdditionalCreatureAllEffect(int amount, FilterPermanent filter, Duration duration) {
+        super(duration, Outcome.Benefit);
+        this.amount = amount;
+        this.filter = filter;
+        staticText = setText();
+    }
+
+    public CanBlockAdditionalCreatureAllEffect(final CanBlockAdditionalCreatureAllEffect effect) {
+        super(effect);
+        this.amount = effect.amount;
+        this.filter = effect.filter;
+    }
+
+    @Override
+    public CanBlockAdditionalCreatureAllEffect copy() {
+        return new CanBlockAdditionalCreatureAllEffect(this);
+    }
+
+    @Override
+    public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+        for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
+            if (permanent != null) {
+                // maxBlocks = 0 equals to "can block any number of creatures"
+                if (amount > 0) {
+                    permanent.setMaxBlocks(permanent.getMaxBlocks() + amount);
+                }
+                else {
+                    permanent.setMaxBlocks(0);
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return false;
+    }
+
+    private String setText() {
+        StringBuilder sb = new StringBuilder(filter.getMessage());
+        sb.append(" can block ");
+        switch(amount) {
+            case 0:
+                sb.append("any number of creatures");
+                break;
+            default:
+                sb.append(CardUtil.numberToText(amount, "an")).append(" additional creature").append(amount > 1 ? "s" : "");
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public boolean hasLayer(Layer layer) {
+        return layer == Layer.RulesEffects;
+    }
+}

Mage/src/mage/abilities/effects/common/continious/GainProtectionFromColorTargetEffect.java

@@ -28,28 +28,34 @@
 
 package mage.abilities.effects.common.continious;
 
-import mage.constants.Duration;
 import mage.abilities.Ability;
 import mage.abilities.Mode;
 import mage.abilities.keyword.ProtectionAbility;
 import mage.choices.ChoiceColor;
+import mage.constants.Duration;
+import mage.constants.Outcome;
 import mage.filter.FilterCard;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
+import mage.players.Player;
 
 /**
  *
  * @author BetaSteward_at_googlemail.com
  */
 public class GainProtectionFromColorTargetEffect extends GainAbilityTargetEffect {
+    
+    protected ChoiceColor choice;
 
     public GainProtectionFromColorTargetEffect(Duration duration) {
         super(new ProtectionAbility(new FilterCard()), duration);
+        choice = new ChoiceColor();
     }
 
     public GainProtectionFromColorTargetEffect(final GainProtectionFromColorTargetEffect effect) {
         super(effect);
+        choice = effect.choice;
     }
 
     @Override
@@ -60,8 +66,11 @@ public class GainProtectionFromColorTargetEffect extends GainAbilityTargetEffect
     @Override
     public boolean apply(Game game, Ability source) {
         Permanent creature = game.getPermanent(source.getFirstTarget());
-        if (creature != null) {
-            ChoiceColor choice = (ChoiceColor) source.getChoices().get(0);
+        Player player = game.getPlayer(source.getControllerId());
+        if (creature != null && player != null) {
+            while (!choice.isChosen()) {
+                player.choose(Outcome.Protect, choice, game);
+            }
             FilterCard protectionFilter = (FilterCard)((ProtectionAbility)ability).getFilter();
             protectionFilter.add(new ColorPredicate(choice.getColor()));
             protectionFilter.setMessage(choice.getChoice());
@@ -74,6 +83,11 @@ public class GainProtectionFromColorTargetEffect extends GainAbilityTargetEffect
 
     @Override
     public String getText(Mode mode) {
-        return "target creature you control gains protection from the color of your choice " + duration.toString();
+        if (staticText != null && !staticText.isEmpty()) {
+            return staticText;
+        }
+        else {
+            return "target creature you control gains protection from the color of your choice " + duration.toString();
+        }
     }
 }