- updated available set info of Zombie and Gold tokens

- added Curse of Vitality
- added Curse of Verbosity
- added Curse of Disturbance
- added Curse of Opulence
- added Curse of Bounty
- added Curse cycle to C17

Mage.Sets/src/mage/cards/c/CurseOfBounty.java

@@ -0,0 +1,154 @@
+/*
+ *  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.cards.c;
+
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
+import java.util.UUID;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.UntapAllControllerEffect;
+import mage.filter.common.FilterNonlandPermanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author Saga
+ */
+public class CurseOfBounty extends CardImpl {
+
+    public CurseOfBounty(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}");
+        this.subtype.add(SubType.AURA, SubType.CURSE);
+
+        // Enchant player
+        TargetPlayer auraTarget = new TargetPlayer();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
+        this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
+
+        // Whenever enchanted player is attacked, untap all nonland permanents you control. 
+        // Each opponent attacking that player untaps all nonland permanents he or she controls.
+        Ability ability = new CurseOfBountyTriggeredAbility();
+        ability.addEffect(new UntapAllControllerEffect(new FilterNonlandPermanent()));
+        this.addAbility(ability);
+    }
+
+    public CurseOfBounty(final CurseOfBounty card) {
+        super(card);
+    }
+
+    @Override
+    public CurseOfBounty copy() {
+        return new CurseOfBounty(this);
+    }
+}
+
+class CurseOfBountyTriggeredAbility extends TriggeredAbilityImpl {
+
+    public CurseOfBountyTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new UntapAllNonlandsTargetEffect(), false);
+    }
+
+    public CurseOfBountyTriggeredAbility(final CurseOfBountyTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.DECLARED_ATTACKERS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent enchantment = game.getPermanent(this.getSourceId());
+        if (enchantment != null
+                && enchantment.getAttachedTo() != null
+                && game.getCombat().getPlayerDefenders(game).contains(enchantment.getAttachedTo())) {
+            for (Effect effect: this.getEffects()) {
+                effect.setTargetPointer(new FixedTarget(game.getCombat().getAttackerId()));                    
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever enchanted player is attacked, untap all nonland permanents you control. "
+                + "Each opponent attacking that player untaps all nonland permanents he or she controls.";
+    }
+
+    @Override
+    public CurseOfBountyTriggeredAbility copy() {
+        return new CurseOfBountyTriggeredAbility(this);
+    }
+}
+
+class UntapAllNonlandsTargetEffect extends OneShotEffect {
+    
+    public UntapAllNonlandsTargetEffect() {
+        super(Outcome.Untap);
+    }
+
+    public UntapAllNonlandsTargetEffect(final UntapAllNonlandsTargetEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source));
+        if (player != null) {
+            for (Permanent nonland: game.getBattlefield().getAllActivePermanents(new FilterNonlandPermanent(), player.getId(), game)) {
+                nonland.untap(game);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public UntapAllNonlandsTargetEffect copy() {
+        return new UntapAllNonlandsTargetEffect(this);
+    }
+
+}

Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java

@@ -0,0 +1,123 @@
+/*
+ *  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.cards.c;
+
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
+import java.util.UUID;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.CreateTokenTargetEffect;
+import mage.game.permanent.token.ZombieToken;
+
+/**
+ *
+ * @author Saga
+ */
+public class CurseOfDisturbance extends CardImpl {
+
+    public CurseOfDisturbance(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}");
+        this.subtype.add(SubType.AURA, SubType.CURSE);
+
+        // Enchant player
+        TargetPlayer auraTarget = new TargetPlayer();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
+        this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
+
+        // Whenever enchanted player is attacked, create a 2/2 black Zombie creature token. Each opponent attacking that player does the same.
+        Ability ability = new CurseOfDisturbanceTriggeredAbility();
+        ability.addEffect(new CreateTokenEffect(new ZombieToken()));
+        this.addAbility(ability);
+    }
+
+    public CurseOfDisturbance(final CurseOfDisturbance card) {
+        super(card);
+    }
+
+    @Override
+    public CurseOfDisturbance copy() {
+        return new CurseOfDisturbance(this);
+    }
+}
+
+class CurseOfDisturbanceTriggeredAbility extends TriggeredAbilityImpl {
+
+    public CurseOfDisturbanceTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new CreateTokenTargetEffect(new ZombieToken()), false);
+    }
+
+    public CurseOfDisturbanceTriggeredAbility(final CurseOfDisturbanceTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.DECLARED_ATTACKERS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent enchantment = game.getPermanent(this.getSourceId());
+        if (enchantment != null
+                && enchantment.getAttachedTo() != null
+                && game.getCombat().getPlayerDefenders(game).contains(enchantment.getAttachedTo())) {
+            for (Effect effect: this.getEffects()) {
+                effect.setTargetPointer(new FixedTarget(game.getCombat().getAttackerId()));                    
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever enchanted player is attacked, create a 2/2 black Zombie creature token. Each opponent attacking that player does the same.";
+    }
+
+    @Override
+    public CurseOfDisturbanceTriggeredAbility copy() {
+        return new CurseOfDisturbanceTriggeredAbility(this);
+    }
+    
+}

Mage.Sets/src/mage/cards/c/CurseOfOpulence.java

@@ -0,0 +1,125 @@
+/*
+ *  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.cards.c;
+
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
+import java.util.UUID;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.CreateTokenTargetEffect;
+import mage.game.permanent.token.GoldToken;
+
+/**
+ *
+ * @author Saga
+ */
+public class CurseOfOpulence extends CardImpl {
+
+    public CurseOfOpulence(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}");
+        this.subtype.add(SubType.AURA, SubType.CURSE);
+
+        // Enchant player
+        TargetPlayer auraTarget = new TargetPlayer();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
+        this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
+
+        // Whenever enchanted player is attacked, create a colorless artifact token named Gold. 
+        // It has "sacrifice this artifact: Add one mana of any color to your mana pool." Each opponent attacking that player does the same.
+        Ability ability = new CurseOfOpulenceTriggeredAbility();
+        ability.addEffect(new CreateTokenEffect(new GoldToken()));
+        this.addAbility(ability);
+    }
+
+    public CurseOfOpulence(final CurseOfOpulence card) {
+        super(card);
+    }
+
+    @Override
+    public CurseOfOpulence copy() {
+        return new CurseOfOpulence(this);
+    }
+}
+
+class CurseOfOpulenceTriggeredAbility extends TriggeredAbilityImpl {
+
+    public CurseOfOpulenceTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new CreateTokenTargetEffect(new GoldToken()), false);
+    }
+
+    public CurseOfOpulenceTriggeredAbility(final CurseOfOpulenceTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.DECLARED_ATTACKERS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent enchantment = game.getPermanent(this.getSourceId());
+        if (enchantment != null
+                && enchantment.getAttachedTo() != null
+                && game.getCombat().getPlayerDefenders(game).contains(enchantment.getAttachedTo())) {
+            for (Effect effect: this.getEffects()) {
+                effect.setTargetPointer(new FixedTarget(game.getCombat().getAttackerId()));                    
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever enchanted player is attacked, create a colorless artifact token named Gold. "
+                + "It has \"sacrifice this artifact: Add one mana of any color to your mana pool.\" Each opponent attacking that player does the same.";
+    }
+
+    @Override
+    public CurseOfOpulenceTriggeredAbility copy() {
+        return new CurseOfOpulenceTriggeredAbility(this);
+    }
+    
+}

Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java

@@ -0,0 +1,122 @@
+/*
+ *  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.cards.c;
+
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
+import java.util.UUID;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.DrawCardTargetEffect;
+
+/**
+ *
+ * @author Saga
+ */
+public class CurseOfVerbosity extends CardImpl {
+
+    public CurseOfVerbosity(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}");
+        this.subtype.add(SubType.AURA, SubType.CURSE);
+
+        // Enchant player
+        TargetPlayer auraTarget = new TargetPlayer();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
+        this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
+
+        // Whenever enchanted player is attacked, draw a card. Each opponent attacking that player does the same.
+        Ability ability = new CurseOfVerbosityTriggeredAbility();
+        ability.addEffect(new DrawCardSourceControllerEffect(1));
+        this.addAbility(ability);
+    }
+
+    public CurseOfVerbosity(final CurseOfVerbosity card) {
+        super(card);
+    }
+
+    @Override
+    public CurseOfVerbosity copy() {
+        return new CurseOfVerbosity(this);
+    }
+}
+
+class CurseOfVerbosityTriggeredAbility extends TriggeredAbilityImpl {
+
+    public CurseOfVerbosityTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), false);
+    }
+
+    public CurseOfVerbosityTriggeredAbility(final CurseOfVerbosityTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.DECLARED_ATTACKERS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent enchantment = game.getPermanent(this.getSourceId());
+        if (enchantment != null
+                && enchantment.getAttachedTo() != null
+                && game.getCombat().getPlayerDefenders(game).contains(enchantment.getAttachedTo())) {
+            for (Effect effect: this.getEffects()) {
+                effect.setTargetPointer(new FixedTarget(game.getCombat().getAttackerId()));                    
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever enchanted player is attacked, draw a card. Each opponent attacking that player does the same.";
+    }
+
+    @Override
+    public CurseOfVerbosityTriggeredAbility copy() {
+        return new CurseOfVerbosityTriggeredAbility(this);
+    }
+
+}

Mage.Sets/src/mage/cards/c/CurseOfVitality.java

@@ -0,0 +1,122 @@
+/*
+ *  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.cards.c;
+
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
+import java.util.UUID;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.effects.common.GainLifeTargetEffect;
+
+/**
+ *
+ * @author Saga
+ */
+public class CurseOfVitality extends CardImpl {
+
+    public CurseOfVitality(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}");
+        this.subtype.add(SubType.AURA, SubType.CURSE);
+
+        // Enchant player
+        TargetPlayer auraTarget = new TargetPlayer();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
+        this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
+
+        // Whenever enchanted player is attacked, you gain 2 life. Each opponent attacking that player does the same.
+        Ability ability = new CurseOfVitalityTriggeredAbility();
+        ability.addEffect(new GainLifeEffect(2));
+        this.addAbility(ability);
+    }
+
+    public CurseOfVitality(final CurseOfVitality card) {
+        super(card);
+    }
+
+    @Override
+    public CurseOfVitality copy() {
+        return new CurseOfVitality(this);
+    }
+}
+
+class CurseOfVitalityTriggeredAbility extends TriggeredAbilityImpl {
+
+    public CurseOfVitalityTriggeredAbility() {
+        super(Zone.BATTLEFIELD, new GainLifeTargetEffect(2), false);
+    }
+
+    public CurseOfVitalityTriggeredAbility(final CurseOfVitalityTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == EventType.DECLARED_ATTACKERS;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        Permanent enchantment = game.getPermanent(this.getSourceId());
+        if (enchantment != null
+                && enchantment.getAttachedTo() != null
+                && game.getCombat().getPlayerDefenders(game).contains(enchantment.getAttachedTo())) {
+            for (Effect effect: this.getEffects()) {
+                effect.setTargetPointer(new FixedTarget(game.getCombat().getAttackerId()));                    
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever enchanted player is attacked, you gain 2 life. Each opponent attacking that player does the same.";
+    }
+
+    @Override
+    public CurseOfVitalityTriggeredAbility copy() {
+        return new CurseOfVitalityTriggeredAbility(this);
+    }
+
+}

Mage.Sets/src/mage/sets/Commander2017.java

@@ -49,6 +49,11 @@ public class Commander2017 extends ExpansionSet {
 
         cards.add(new SetCardInfo("Balan, Wandering Knight", 2, Rarity.RARE, mage.cards.b.BalanWanderingKnight.class));
         cards.add(new SetCardInfo("Bloodsworn Steward", 22, Rarity.RARE, mage.cards.b.BloodswornSteward.class));
+        cards.add(new SetCardInfo("Curse of Bounty", 30, Rarity.UNCOMMON, mage.cards.c.CurseOfBounty.class));
+        cards.add(new SetCardInfo("Curse of Disturbance", 16, Rarity.UNCOMMON, mage.cards.c.CurseOfDisturbance.class));
+        cards.add(new SetCardInfo("Curse of Opulence", 24, Rarity.UNCOMMON, mage.cards.c.CurseOfOpulence.class));
+        cards.add(new SetCardInfo("Curse of Verbosity", 9, Rarity.UNCOMMON, mage.cards.c.CurseOfVerbosity.class));
+        cards.add(new SetCardInfo("Curse of Vitality", 3, Rarity.UNCOMMON, mage.cards.c.CurseOfVitality.class));
         cards.add(new SetCardInfo("Herald's Horn", 53, Rarity.UNCOMMON, mage.cards.h.HeraldsHorn.class));
         cards.add(new SetCardInfo("Hungry Lynx", 31, Rarity.RARE, mage.cards.h.HungryLynx.class));
         cards.add(new SetCardInfo("Nazahn, Revered Bladesmith", 44, Rarity.MYTHIC, mage.cards.n.NazahnReveredBladesmith.class));

Mage/src/main/java/mage/game/permanent/token/GoldToken.java

@@ -28,6 +28,9 @@
 
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.effects.common.AddManaOfAnyColorEffect;
 import mage.abilities.mana.SimpleManaAbility;
@@ -39,10 +42,24 @@ import mage.constants.Zone;
  * @author LevelX2
  */
 public class GoldToken extends Token {
+    
+    final static private List<String> tokenImageSets = new ArrayList<>();
+    static {
+        tokenImageSets.addAll(Arrays.asList("BNG", "C17"));
+    }
 
     public GoldToken() {
+        this(null, 0);
+    }
+
+    public GoldToken(String setCode) {
+        this(setCode, 0);
+    }
+
+    public GoldToken(String setCode, int tokenType) {
         super("Gold", "colorless artifact token named Gold onto the battlefield. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\"");
-        this.setOriginalExpansionSetCode("BNG");
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.ARTIFACT);
 
         this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new SacrificeSourceCost()));

Mage/src/main/java/mage/game/permanent/token/ZombieToken.java

@@ -44,7 +44,7 @@ public class ZombieToken extends Token {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "C16", "CNS",
+        tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "C16", "C17", "CNS",
                 "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3", "AKH", "CMA", "E01"));
     }