From 3bf75385a8f978f01e2993c2e37424466e61013f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 16 Sep 2013 21:42:49 +0200 Subject: [PATCH] Fixes and improvements to framework classes. --- .../PermanentOnBattelfieldCondition.java | 48 ++++++++++++++++ ...nBattlefieldControlUnchangedCondition.java | 56 +++++++++++++++++++ .../decorator/ConditionalContinousEffect.java | 2 +- .../abilities/effects/ContinuousEffects.java | 3 +- .../continious/GainControlTargetEffect.java | 36 +++++++++--- 5 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 Mage/src/mage/abilities/condition/common/PermanentOnBattelfieldCondition.java create mode 100644 Mage/src/mage/abilities/condition/common/PermanentOnBattlefieldControlUnchangedCondition.java diff --git a/Mage/src/mage/abilities/condition/common/PermanentOnBattelfieldCondition.java b/Mage/src/mage/abilities/condition/common/PermanentOnBattelfieldCondition.java new file mode 100644 index 00000000000..0e28f7064ec --- /dev/null +++ b/Mage/src/mage/abilities/condition/common/PermanentOnBattelfieldCondition.java @@ -0,0 +1,48 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.abilities.condition.common; + +import mage.abilities.Ability; +import mage.abilities.condition.Condition; +import mage.game.Game; + + +/** + * As long as the sourceId permanent is + * on the battlefield, the condition is true. + * + * @author LevelX2 + */ +public class PermanentOnBattelfieldCondition implements Condition { + + @Override + public boolean apply(Game game, Ability source) { + return (game.getPermanent(source.getSourceId()) != null); + } + +} diff --git a/Mage/src/mage/abilities/condition/common/PermanentOnBattlefieldControlUnchangedCondition.java b/Mage/src/mage/abilities/condition/common/PermanentOnBattlefieldControlUnchangedCondition.java new file mode 100644 index 00000000000..b8c0f9eebd5 --- /dev/null +++ b/Mage/src/mage/abilities/condition/common/PermanentOnBattlefieldControlUnchangedCondition.java @@ -0,0 +1,56 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.abilities.condition.common; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.condition.Condition; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * This condition remembers controller on the first apply. + * As long as this controller keeps unchanged and the source is + * on the battlefield, the condition is true. + * + * @author LevelX2 + */ +public class PermanentOnBattlefieldControlUnchangedCondition implements Condition { + + private UUID controllerId; + + @Override + public boolean apply(Game game, Ability source) { + if (controllerId == null) { + controllerId = source.getControllerId(); + } + Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId()); + return (permanent != null && controllerId == source.getControllerId()); + } + +} diff --git a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java index 03bf055e843..54d6a6c32b1 100644 --- a/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java +++ b/Mage/src/mage/abilities/decorator/ConditionalContinousEffect.java @@ -75,7 +75,7 @@ public class ConditionalContinousEffect extends ContinuousEffectImpl { + private UUID fixedControllerId; + private boolean fixedController; + public GainControlTargetEffect(Duration duration) { + this(duration, false); + } + + public GainControlTargetEffect(Duration duration, boolean fixedController) { super(duration, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl); + this.fixedController = fixedController; } public GainControlTargetEffect(final GainControlTargetEffect effect) { super(effect); + this.fixedControllerId = effect.fixedControllerId; + this.fixedController = effect.fixedController; } @Override @@ -58,13 +69,22 @@ public class GainControlTargetEffect extends ContinuousEffectImpl