External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[C16] Added 5 cards.

Browse source
This commit is contained in:
LevelX2 2016-11-06 10:51:38 +01:00
parent 7d8a02bf63
commit 05feab8e96
8 changed files with 1030 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/effects/common/PreventDamageToControllerEffect.java
View file

@ -46,6 +46,7 @@ public class PreventDamageToControllerEffect extends PreventionEffectImpl {
public PreventDamageToControllerEffect(Duration duration, boolean onlyCombat, boolean consumable, int amountToPrevent) {
super(duration, amountToPrevent, onlyCombat, consumable, null);
staticText = setText();
}
public PreventDamageToControllerEffect(Duration duration, boolean onlyCombat, boolean consumable, DynamicValue amountToPreventDynamic) {
@ -55,7 +56,6 @@ public class PreventDamageToControllerEffect extends PreventionEffectImpl {
public PreventDamageToControllerEffect(final PreventDamageToControllerEffect effect) {
super(effect);
staticText = setText();
}
@Override
@ -76,7 +76,7 @@ public class PreventDamageToControllerEffect extends PreventionEffectImpl {
private String setText() {
// Prevent the next X damage that would be dealt to you this turn
StringBuilder sb = new StringBuilder("Prevent ");
StringBuilder sb = new StringBuilder("prevent ");
if (amountToPrevent == Integer.MAX_VALUE) {
sb.append("all ");
} else if (amountToPreventDynamic != null) {

2
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -10,6 +10,7 @@ import mage.filter.common.FilterArtifactCard;
import mage.filter.common.FilterArtifactCreaturePermanent;
import mage.filter.common.FilterControlledArtifactPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.common.FilterNonlandCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
@ -24,6 +25,7 @@ public class StaticFilters {
public static final FilterControlledPermanent FILTER_CONTROLLED_PERMANENT_ARTIFACT_OR_CREATURE = new FilterControlledPermanent("artifact or creature you control");
public static final FilterControlledPermanent FILTER_CONTROLLED_PERMANENT_ARTIFACT = new FilterControlledArtifactPermanent();
public static final FilterArtifactCard FILTER_CARD_ARTIFACT = new FilterArtifactCard();
public static final FilterNonlandCard FILTER_CARD_NON_LAND = new FilterNonlandCard();
public static final FilterCard FILTER_CARD_ARTIFACT_OR_CREATURE = new FilterCard("artifact or creature card");
static {