Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Remove redundant InvertCondition and used instead UnlessCondition.

Browse source
This commit is contained in:
LevelX2 2013-07-22 13:11:09 +02:00
parent 1ab6b72e8a
commit 937c757d58
4 changed files with 6 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/innistrad/MayorOfAvabruck.java
View file

@ -31,7 +31,6 @@ import mage.MageInt;
import mage.abilities.TriggeredAbility;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.InvertCondition;
import mage.abilities.condition.common.NoSpellsWereCastLastTurnCondition;
import mage.abilities.condition.common.TransformedCondition;
import mage.abilities.decorator.ConditionalContinousEffect;
@ -46,6 +45,7 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import java.util.UUID;
import mage.abilities.condition.common.UnlessCondition;
/**
*
@ -76,7 +76,7 @@ public class MayorOfAvabruck extends CardImpl<MayorOfAvabruck> {
this.toughness = new MageInt(1);
// Other Human creatures you control get +1/+1.
Effect effect = new ConditionalContinousEffect(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new InvertCondition(new TransformedCondition()), ruleText);
Effect effect = new ConditionalContinousEffect(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new UnlessCondition(new TransformedCondition()), ruleText);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
// At the beginning of each upkeep, if no spells were cast last turn, transform Mayor of Avabruck.

4
Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java
View file

@ -34,7 +34,7 @@ import mage.abilities.TriggeredAbility;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.InvertCondition;
import mage.abilities.condition.common.UnlessCondition;
import mage.abilities.decorator.ConditionalTriggeredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.SacrificeTargetEffect;
@ -88,7 +88,7 @@ public class ShadowbornDemon extends CardImpl<ShadowbornDemon> {
triggeredAbility.addTarget(target);
this.addAbility(new ConditionalTriggeredAbility(
triggeredAbility,
new InvertCondition(new CreatureCardsInControllerGraveCondition(6)),
new UnlessCondition(new CreatureCardsInControllerGraveCondition(6)),
"At the beginning of your upkeep, if there are fewer than six creature cards in your graveyard, sacrifice a creature"));
}

4
Mage.Sets/src/mage/sets/modernmasters/Epochrasite.java
View file

@ -33,7 +33,7 @@ import mage.abilities.Ability;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.common.CastFromHandCondition;
import mage.abilities.condition.common.InvertCondition;
import mage.abilities.condition.common.UnlessCondition;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.ExileSourceEffect;
import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
@ -65,7 +65,7 @@ public class Epochrasite extends CardImpl<Epochrasite> {
// Epochrasite enters the battlefield with three +1/+1 counters on it if you didn't cast it from your hand.
this.addAbility(new EntersBattlefieldAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)),
new InvertCondition(new CastFromHandCondition()), true,
new UnlessCondition(new CastFromHandCondition()), true,
"{this} enters the battlefield with three +1/+1 counters on it if you didn't cast it from your hand",""));
// When Epochrasite dies, exile it with three time counters on it and it gains suspend.

59
Mage/src/mage/abilities/condition/common/InvertCondition.java
View file

@ -1,59 +0,0 @@
/*
* 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;
/**
* A simple {@link mage.abilities.condition.Condition} to invert a decorated conditions
* {@link mage.abilities.condition.Condition#apply(mage.game.Game, mage.abilities.Ability) apply(mage.game.Game, mage.abilities.Ability)}
* method invocation.
*
* The copy for {@link UnlessCondition}.
*
* @author noxx
*/
public class InvertCondition implements Condition {
private Condition condition;
public InvertCondition(Condition condition) {
this.condition = condition;
}
/*
* {@inheritDoc}
*/
@Override
public boolean apply(Game game, Ability source) {
return !condition.apply(game, source);
}
}