diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java index 04000e8f769..9e5bdeae16a 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/forge-game/src/main/java/forge/game/card/CardProperty.java @@ -1779,6 +1779,10 @@ public class CardProperty { if (!card.isCommander()) { return false; } + } else if (property.equals("IsNotCommander")) { + if (card.isCommander()) { + return false; + } } else if (property.startsWith("NotedFor")) { final String key = property.substring("NotedFor".length()); for (String note : sourceController.getNotesForName(key)) { diff --git a/forge-gui/res/cardsfolder/upcoming/slash_the_ranks.txt b/forge-gui/res/cardsfolder/upcoming/slash_the_ranks.txt index 4f367d7228b..dc811221d8a 100644 --- a/forge-gui/res/cardsfolder/upcoming/slash_the_ranks.txt +++ b/forge-gui/res/cardsfolder/upcoming/slash_the_ranks.txt @@ -1,7 +1,5 @@ Name:Slash the Ranks -ManaCost: 3 W W +ManaCost:3 W W Types:Sorcery -A:SP$ PumpAll | Cost$ 3 W W | ValidCards$ Permanent.IsCommander | RememberAllPumped$ True | SubAbility$ Destroy | SpellDescription$ Destroy all creatures and planeswalkers except for commanders. -SVar:Destroy:DB$ DestroyAll | ValidCards$ Creature.IsNotRemembered,Planeswalker.IsNotRemembered | SubAbility$ DBCleanup | StackDescription$ None -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +A:SP$ DestroyAll | Cost$ 3 W W | ValidCards$ Creature.IsNotCommander,Planeswalker.IsNotCommander | SpellDescription$ Destroy all creatures and planeswalkers except for commanders. Oracle:Destroy all creatures and planeswalkers except for commanders. diff --git a/forge-gui/src/main/java/forge/card/CardScriptParser.java b/forge-gui/src/main/java/forge/card/CardScriptParser.java index 55947f13095..5ae578236c8 100644 --- a/forge-gui/src/main/java/forge/card/CardScriptParser.java +++ b/forge-gui/src/main/java/forge/card/CardScriptParser.java @@ -446,7 +446,7 @@ public final class CardScriptParser { "hasActivatedAbility", "hasManaAbility", "hasNonManaActivatedAbility", "NoAbilities", "HasCounters", "wasNotCast", "ChosenType", "IsNotChosenType", "IsCommander", - "IsRenowned", "IsNotRenowned"); + "IsNotCommander","IsRenowned", "IsNotRenowned"); private static final Set VALID_EXCLUSIVE_STARTSWITH = ImmutableSortedSet .of("named", "notnamed", "OwnedBy", "ControlledBy", "ControllerControls", "AttachedTo", "EnchantedBy",