diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index 5af705f19a9..dcc516b630c 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -125,6 +125,7 @@ public final class StaticAbilityContinuous { String[] addStatics = null; List addFullAbs = null; boolean removeAllAbilities = false; + boolean removeNonMana = false; boolean removeSuperTypes = false; boolean removeCardTypes = false; boolean removeSubTypes = false; @@ -245,6 +246,9 @@ public final class StaticAbilityContinuous { if (layer == StaticAbilityLayer.ABILITIES1 && params.containsKey("RemoveAllAbilities")) { removeAllAbilities = true; + if (params.containsKey("ExceptManaAbilities")) { + removeNonMana = true; + } } if (layer == StaticAbilityLayer.ABILITIES2 && params.containsKey("AddAbility")) { @@ -726,9 +730,15 @@ public final class StaticAbilityContinuous { // remove activated and static abilities if (removeAllAbilities) { - for (final SpellAbility ab : affectedCard.getSpellAbilities()) { - ab.setTemporarilySuppressed(true); - } + if (removeNonMana) { // Blood Sun + for (final SpellAbility mana : affectedCard.getNonManaAbilities()) { + mana.setTemporarilySuppressed(true); + } + } else { + for (final SpellAbility ab : affectedCard.getSpellAbilities()) { + ab.setTemporarilySuppressed(true); + } + } for (final StaticAbility stA : affectedCard.getStaticAbilities()) { stA.setTemporarilySuppressed(true); } diff --git a/forge-gui/res/cardsfolder/upcoming/blood_sun.txt b/forge-gui/res/cardsfolder/upcoming/blood_sun.txt new file mode 100644 index 00000000000..b2c0c40fa65 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/blood_sun.txt @@ -0,0 +1,10 @@ +Name:Blood Sun +ManaCost:2 R +Types:Enchantment +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card. +SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 +S:Mode$ Continuous | Affected$ Land | RemoveAllAbilities$ True | ExceptManaAbilities$ True | Description$ All lands lose all abilities except mana abilities. +SVar:NonStackingEffect:True +SVar:RemRandomDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_sun.jpg +Oracle:When Blood Sun enters the battlefield, draw a card.\nAll lands lose all abilities except mana abilities.