From 4c9f84602e14a80cf95e0bf3f8f67036f78a4df1 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sun, 9 Jul 2017 08:46:59 +0000 Subject: [PATCH] SpellAbility: hasProperty add more properties --- .../forge/game/spellability/SpellAbility.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 203ab60de2d..dadf760a326 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -1510,11 +1510,32 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit // Takes arguments like Blue or withFlying @Override public boolean hasProperty(final String property, final Player sourceController, final Card source, SpellAbility spellAbility) { - if (property.equals("Cycling")) { + if (property.equals("Buyback")) { + if (!isBuyBackAbility()) { + return false; + } + } else if (property.equals("Cycling")) { if (!isCycling()) { return false; } + } else if (property.equals("Dash")) { + if (!isDash()) { + return false; + } + } else if (property.equals("Flashback")) { + if (!isFlashBackAbility()) { + return false; + } + } else if (property.equals("MorphUp")) { + if (!isMorphUp()) { + return false; + } + } else if (property.equals("Equip")) { + if (!hasParam("Equip")) { + return false; + } } + return true; }