diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties index f7b76ebd66..6160ddc857 100644 --- a/Mage.Client/src/main/resources/image.url.properties +++ b/Mage.Client/src/main/resources/image.url.properties @@ -60,6 +60,6 @@ ptk=p3k gur=guru mpr=mprp # Remove DGM as sson as the images can be downloaded -ignore.urls=TOK,EMBLEM,DGM +ignore.urls=TOK,EMBLEM # sets ordered by release time (newest goes first) -token.lookup.order=GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,PVC,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK \ No newline at end of file +token.lookup.order=DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,PVC,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK \ No newline at end of file diff --git a/Mage/src/mage/abilities/effects/common/DetainTargetEffect.java b/Mage/src/mage/abilities/effects/common/DetainTargetEffect.java index 9a4b5992ec..671366fcb0 100644 --- a/Mage/src/mage/abilities/effects/common/DetainTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DetainTargetEffect.java @@ -41,6 +41,7 @@ import mage.game.permanent.Permanent; import mage.game.turn.Step; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import mage.util.CardUtil; /** * @@ -105,7 +106,7 @@ public class DetainTargetEffect extends OneShotEffect { sb.append("detain ").append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName()); } } else { - sb.append("detain up to ").append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName()); + sb.append("detain up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" target ").append(target.getTargetName()); } sb.append(". (Until your next turn, "); diff --git a/Mage/src/mage/abilities/effects/common/PreventAllDamageToControllerEffect.java b/Mage/src/mage/abilities/effects/common/PreventAllDamageToControllerEffect.java new file mode 100644 index 0000000000..aaf9354632 --- /dev/null +++ b/Mage/src/mage/abilities/effects/common/PreventAllDamageToControllerEffect.java @@ -0,0 +1,93 @@ +/* + * 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; + +import mage.Constants.Duration; +import mage.abilities.Ability; +import mage.abilities.effects.PreventionEffectImpl; +import mage.game.Game; +import mage.game.events.GameEvent; + +/** + * + * @author LevelX2 + */ + + +public class PreventAllDamageToControllerEffect extends PreventionEffectImpl { + + public PreventAllDamageToControllerEffect(Duration duration) { + super(duration); + staticText = setText(); + } + + public PreventAllDamageToControllerEffect(final PreventAllDamageToControllerEffect effect) { + super(effect); + } + + @Override + public PreventAllDamageToControllerEffect copy() { + return new PreventAllDamageToControllerEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + return true; + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + GameEvent preventEvent = new GameEvent(GameEvent.EventType.PREVENT_DAMAGE, source.getFirstTarget(), source.getId(), source.getControllerId(), event.getAmount(), false); + if (!game.replaceEvent(preventEvent)) { + int damage = event.getAmount(); + event.setAmount(0); + game.fireEvent(GameEvent.getEvent(GameEvent.EventType.PREVENTED_DAMAGE, source.getFirstTarget(), source.getId(), source.getControllerId(), damage)); + } + return false; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + if (super.applies(event, source, game)) { + if (event.getTargetId().equals(source.getControllerId())){ + return true; + } + + } + return false; + } + + private String setText() { + StringBuilder sb = new StringBuilder("Prevent all damage that would be dealt to you"); + if (duration.equals(Duration.EndOfTurn)) { + sb.append(" this turn"); + } + return sb.toString(); + } +}