Merge pull request #1818 from drmDev/master

Neckbreaker fix. typo fix
This commit is contained in:
Derek M 2016-04-07 20:04:55 -04:00
commit d3f1f811ce
2 changed files with 7 additions and 3 deletions

View file

@ -38,6 +38,8 @@ import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.decorator.ConditionalTriggeredAbility;
import mage.abilities.effects.common.TransformSourceEffect;
import mage.abilities.effects.common.continuous.BoostControlledEffect;
import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.keyword.TransformAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
@ -66,9 +68,11 @@ public class NeckBreaker extends CardImpl {
this.canTransform = true;
// Attacking creatures you control get +1/+0 and have trample.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
SimpleStaticAbility boostAbility = new SimpleStaticAbility(Zone.BATTLEFIELD,
new ConditionalContinuousEffect(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, new FilterAttackingCreature()),
new TransformedCondition(false), "Attacking creatures you control get +1/+0")));
new TransformedCondition(false), "Attacking creatures you control get +1/+0"));
boostAbility.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterAttackingCreature()));
this.addAbility(boostAbility);
// At the beginning of each upkeep, if a player cast two or more spells last turn, transform Neck Breaker.
TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false);

View file

@ -45,7 +45,7 @@ public class TransformedCondition implements Condition {
}
/**
* The condition checks wether a permanent is transformed or not.
* The condition checks whether a permanent is transformed or not.
*
* @param notCondition if true the condition is true when the permanent is not transformed
* @return true if the condition is true, false if the condition is false