diff --git a/Mage.Sets/src/mage/cards/c/CodeOfConstraint.java b/Mage.Sets/src/mage/cards/c/CodeOfConstraint.java
new file mode 100644
index 00000000000..95330ab9a3b
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/c/CodeOfConstraint.java
@@ -0,0 +1,53 @@
+package mage.cards.c;
+
+import mage.abilities.condition.common.AddendumCondition;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.decorator.ConditionalOneShotEffect;
+import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEffect;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.TapTargetEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class CodeOfConstraint extends CardImpl {
+
+ public CodeOfConstraint(UUID ownerId, CardSetInfo setInfo) {
+ super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}");
+
+ // Target creature gets -4/-0 until end of turn.
+ this.getSpellAbility().addEffect(new BoostTargetEffect(-4, 0));
+ this.getSpellAbility().addTarget(new TargetCreaturePermanent());
+
+ // Draw a card.
+ 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.
+ this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
+ new TapTargetEffect(), AddendumCondition.instance,
+ "
Addendum — 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) {
+ super(card);
+ }
+
+ @Override
+ public CodeOfConstraint copy() {
+ return new CodeOfConstraint(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/RavnicaAllegiance.java b/Mage.Sets/src/mage/sets/RavnicaAllegiance.java
index 43c30120ab6..b4d656b6eee 100644
--- a/Mage.Sets/src/mage/sets/RavnicaAllegiance.java
+++ b/Mage.Sets/src/mage/sets/RavnicaAllegiance.java
@@ -77,6 +77,7 @@ public final class RavnicaAllegiance extends ExpansionSet {
cards.add(new SetCardInfo("Civic Stalwart", 6, Rarity.COMMON, mage.cards.c.CivicStalwart.class));
cards.add(new SetCardInfo("Clamor Shaman", 96, Rarity.UNCOMMON, mage.cards.c.ClamorShaman.class));
cards.add(new SetCardInfo("Clan Guildmage", 162, Rarity.UNCOMMON, mage.cards.c.ClanGuildmage.class));
+ cards.add(new SetCardInfo("Code of Constraint", 35, Rarity.UNCOMMON, mage.cards.c.CodeOfConstraint.class));
cards.add(new SetCardInfo("Collision // Colossus", 223, Rarity.UNCOMMON, mage.cards.c.CollisionColossus.class));
cards.add(new SetCardInfo("Combine Guildmage", 163, Rarity.UNCOMMON, mage.cards.c.CombineGuildmage.class));
cards.add(new SetCardInfo("Consecrate // Consume", 224, Rarity.UNCOMMON, mage.cards.c.ConsecrateConsume.class));