github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed Code of Constraint not preventing untap when cast during main phase

Browse source
This commit is contained in:
Evan Kranzler 2019-01-13 20:23:22 -05:00
parent 90bbfd0a63
commit d895f6ccc0
1 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Mage.Sets/src/mage/cards/c/CodeOfConstraint.java
View file

@ -1,15 +1,17 @@
package mage.cards.c; package mage.cards.c;
import mage.abilities.Ability;
import mage.abilities.condition.common.AddendumCondition; import mage.abilities.condition.common.AddendumCondition;
import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEffect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.TapTargetEffect;
import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome;
import mage.game.Game;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.UUID; import java.util.UUID;
@ -30,16 +32,7 @@ public final class CodeOfConstraint extends CardImpl {
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
// Addendum — If you cast this spell during your main phase, tap that creature and it doesn't untap during its controller's next untap step. // Addendum — If you cast this spell during your main phase, tap that creature and it doesn't untap during its controller's next untap step.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect( this.getSpellAbility().addEffect(new CodeOfConstraintEffect());
new TapTargetEffect(), AddendumCondition.instance,
"<br><i>Addendum</i> &mdash; If you cast this spell " +
"during your main phase, tap that creature"
));
this.getSpellAbility().addEffect(new ConditionalContinuousEffect(
new DontUntapInControllersNextUntapStepSourceEffect(),
AddendumCondition.instance, "and it doesn't untap " +
"during its controller's next untap step."
));
} }
private CodeOfConstraint(final CodeOfConstraint card) { private CodeOfConstraint(final CodeOfConstraint card) {
@ -51,3 +44,30 @@ public final class CodeOfConstraint extends CardImpl {
return new CodeOfConstraint(this); return new CodeOfConstraint(this);
} }
} }
class CodeOfConstraintEffect extends OneShotEffect {
CodeOfConstraintEffect() {
super(Outcome.Benefit);
staticText = "<br><i>Addendum</i> &mdash; If you cast this spell during your main phase, " +
"tap that creature and it doesn't untap during its controller's next untap step.";
}
private CodeOfConstraintEffect(final CodeOfConstraintEffect effect) {
super(effect);
}
@Override
public CodeOfConstraintEffect copy() {
return new CodeOfConstraintEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
if (AddendumCondition.instance.apply(game, source)) {
new TapTargetEffect().apply(game, source);
game.addEffect(new DontUntapInControllersNextUntapStepTargetEffect(), source);
}
return true;
}
}