From fef0ef83ec9cb07dcd752b1c76e680a6ff8ed69d Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 8 Jan 2018 22:59:35 +0100 Subject: [PATCH] xmage 1.4.26V11c --- Mage.Common/src/main/java/mage/utils/MageVersion.java | 2 +- Mage.Sets/src/mage/cards/c/ChampionOfDusk.java | 11 +++++++---- .../java/mage/cards/repository/CardRepository.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java index 26dd9ca6d3..4a6adeb7dc 100644 --- a/Mage.Common/src/main/java/mage/utils/MageVersion.java +++ b/Mage.Common/src/main/java/mage/utils/MageVersion.java @@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable { public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_PATCH = 26; - public final static String MAGE_VERSION_MINOR_PATCH = "V11b"; + public final static String MAGE_VERSION_MINOR_PATCH = "V11c"; public final static String MAGE_VERSION_INFO = ""; private final int major; diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java b/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java index 0fb0d72cc2..b8721ab762 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java @@ -31,6 +31,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -46,22 +47,24 @@ import mage.filter.predicate.mageobject.SubtypePredicate; * @author L_J */ public class ChampionOfDusk extends CardImpl { - private static FilterControlledPermanent filter = new FilterControlledPermanent("Vampires you control"); + + private final static FilterControlledPermanent filter = new FilterControlledPermanent("Vampires you control"); static { filter.add(new SubtypePredicate(SubType.VAMPIRE)); } public ChampionOfDusk(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); this.subtype.add(SubType.VAMPIRE); this.subtype.add(SubType.KNIGHT); this.power = new MageInt(4); this.toughness = new MageInt(4); // When Champion of Dusk enters the battlefield, you draw X cards and you lose X life, where X is the number of Vampires you control. - Ability ability = new EntersBattlefieldAbility(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter))); - ability.addEffect(new LoseLifeSourceControllerEffect(new PermanentsOnBattlefieldCount(filter))); + DynamicValue xCount = new PermanentsOnBattlefieldCount(filter); + Ability ability = new EntersBattlefieldAbility(new DrawCardSourceControllerEffect(xCount)); + ability.addEffect(new LoseLifeSourceControllerEffect(xCount)); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index c210707109..db9f2bf33f 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -58,7 +58,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 51; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 98; + private static final long CARD_CONTENT_VERSION = 99; private Dao cardDao; private Set classNames;