From 082adcfc75f4eb586ef8d3ba5f965cbe4391ff10 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 18 May 2018 12:04:24 -0400 Subject: [PATCH] fixed battlebond land implementation --- Mage.Sets/src/mage/cards/b/BountifulPromenade.java | 4 ++-- Mage.Sets/src/mage/cards/l/LuxurySuite.java | 4 ++-- Mage.Sets/src/mage/cards/m/MorphicPool.java | 4 ++-- Mage.Sets/src/mage/cards/s/SeaOfClouds.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpireGarden.java | 4 ++-- ...ponentsCondition.java => OneOpponentCondition.java} | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) rename Mage/src/main/java/mage/abilities/condition/common/{TwoOrMoreOpponentsCondition.java => OneOpponentCondition.java} (92%) diff --git a/Mage.Sets/src/mage/cards/b/BountifulPromenade.java b/Mage.Sets/src/mage/cards/b/BountifulPromenade.java index 212306c9452..6f80b937f7f 100644 --- a/Mage.Sets/src/mage/cards/b/BountifulPromenade.java +++ b/Mage.Sets/src/mage/cards/b/BountifulPromenade.java @@ -29,7 +29,7 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.condition.common.TwoOrMoreOpponentsCondition; +import mage.abilities.condition.common.OneOpponentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.GreenManaAbility; @@ -51,7 +51,7 @@ public class BountifulPromenade extends CardImpl { this.addAbility(new EntersBattlefieldAbility( new ConditionalOneShotEffect( new TapSourceEffect(), - TwoOrMoreOpponentsCondition.instance, + OneOpponentCondition.instance, "tapped unless you have two or more opponents" ), "tapped unless you have two or more opponents" )); diff --git a/Mage.Sets/src/mage/cards/l/LuxurySuite.java b/Mage.Sets/src/mage/cards/l/LuxurySuite.java index ac6e2628a49..fb553aafd3c 100644 --- a/Mage.Sets/src/mage/cards/l/LuxurySuite.java +++ b/Mage.Sets/src/mage/cards/l/LuxurySuite.java @@ -29,7 +29,7 @@ package mage.cards.l; import java.util.UUID; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.condition.common.TwoOrMoreOpponentsCondition; +import mage.abilities.condition.common.OneOpponentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; @@ -51,7 +51,7 @@ public class LuxurySuite extends CardImpl { this.addAbility(new EntersBattlefieldAbility( new ConditionalOneShotEffect( new TapSourceEffect(), - TwoOrMoreOpponentsCondition.instance, + OneOpponentCondition.instance, "tapped unless you have two or more opponents" ), "tapped unless you have two or more opponents" )); diff --git a/Mage.Sets/src/mage/cards/m/MorphicPool.java b/Mage.Sets/src/mage/cards/m/MorphicPool.java index 0520de899dc..40b34708091 100644 --- a/Mage.Sets/src/mage/cards/m/MorphicPool.java +++ b/Mage.Sets/src/mage/cards/m/MorphicPool.java @@ -29,7 +29,7 @@ package mage.cards.m; import java.util.UUID; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.condition.common.TwoOrMoreOpponentsCondition; +import mage.abilities.condition.common.OneOpponentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlackManaAbility; @@ -51,7 +51,7 @@ public class MorphicPool extends CardImpl { this.addAbility(new EntersBattlefieldAbility( new ConditionalOneShotEffect( new TapSourceEffect(), - TwoOrMoreOpponentsCondition.instance, + OneOpponentCondition.instance, "tapped unless you have two or more opponents" ), "tapped unless you have two or more opponents" )); diff --git a/Mage.Sets/src/mage/cards/s/SeaOfClouds.java b/Mage.Sets/src/mage/cards/s/SeaOfClouds.java index dd98ad15857..79c0e9c6e66 100644 --- a/Mage.Sets/src/mage/cards/s/SeaOfClouds.java +++ b/Mage.Sets/src/mage/cards/s/SeaOfClouds.java @@ -29,7 +29,7 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.condition.common.TwoOrMoreOpponentsCondition; +import mage.abilities.condition.common.OneOpponentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.BlueManaAbility; @@ -51,7 +51,7 @@ public class SeaOfClouds extends CardImpl { this.addAbility(new EntersBattlefieldAbility( new ConditionalOneShotEffect( new TapSourceEffect(), - TwoOrMoreOpponentsCondition.instance, + OneOpponentCondition.instance, "tapped unless you have two or more opponents" ), "tapped unless you have two or more opponents" )); diff --git a/Mage.Sets/src/mage/cards/s/SpireGarden.java b/Mage.Sets/src/mage/cards/s/SpireGarden.java index d5d078a1286..64bfb5694cb 100644 --- a/Mage.Sets/src/mage/cards/s/SpireGarden.java +++ b/Mage.Sets/src/mage/cards/s/SpireGarden.java @@ -29,7 +29,7 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.condition.common.TwoOrMoreOpponentsCondition; +import mage.abilities.condition.common.OneOpponentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.mana.GreenManaAbility; @@ -51,7 +51,7 @@ public class SpireGarden extends CardImpl { this.addAbility(new EntersBattlefieldAbility( new ConditionalOneShotEffect( new TapSourceEffect(), - TwoOrMoreOpponentsCondition.instance, + OneOpponentCondition.instance, "tapped unless you have two or more opponents" ), "tapped unless you have two or more opponents" )); diff --git a/Mage/src/main/java/mage/abilities/condition/common/TwoOrMoreOpponentsCondition.java b/Mage/src/main/java/mage/abilities/condition/common/OneOpponentCondition.java similarity index 92% rename from Mage/src/main/java/mage/abilities/condition/common/TwoOrMoreOpponentsCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/OneOpponentCondition.java index 94bfc8980f9..36e608ee06a 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/TwoOrMoreOpponentsCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/OneOpponentCondition.java @@ -36,9 +36,9 @@ import java.util.UUID; /** * - * @author fireshoes + * @author TheElk801 */ -public enum TwoOrMoreOpponentsCondition implements Condition { +public enum OneOpponentCondition implements Condition { instance; @@ -52,16 +52,16 @@ public enum TwoOrMoreOpponentsCondition implements Condition { if (opponent != null) { opponentCount++; if (opponentCount > 1) { - return true; + return false; } } } } - return false; + return true; } @Override public String toString() { - return "you have two or more opponents"; + return "you have one opponent"; } }