github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 01:01:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

xmage 1.4.26V11c

Browse source
This commit is contained in:
LevelX2 2018-01-08 22:59:35 +01:00
parent 121c0ff894
commit fef0ef83ec
3 changed files with 9 additions and 6 deletions
Mage.Common/src/main/java/mage/utils
MageVersion.java
Mage.Sets/src/mage/cards/c
ChampionOfDusk.java
Mage/src/main/java/mage/cards/repository
CardRepository.java

2
Mage.Common/src/main/java/mage/utils/MageVersion.java
View file

@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 26; 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 = ""; public final static String MAGE_VERSION_INFO = "";
private final int major; private final int major;

11
Mage.Sets/src/mage/cards/c/ChampionOfDusk.java
View file

@ -31,6 +31,7 @@ import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect;
@ -46,22 +47,24 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
* @author L_J * @author L_J
*/ */
public class ChampionOfDusk extends CardImpl { 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 { static {
filter.add(new SubtypePredicate(SubType.VAMPIRE)); filter.add(new SubtypePredicate(SubType.VAMPIRE));
} }
public ChampionOfDusk(UUID ownerId, CardSetInfo setInfo) { 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.VAMPIRE);
this.subtype.add(SubType.KNIGHT); this.subtype.add(SubType.KNIGHT);
this.power = new MageInt(4); this.power = new MageInt(4);
this.toughness = 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. // 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))); DynamicValue xCount = new PermanentsOnBattlefieldCount(filter);
ability.addEffect(new LoseLifeSourceControllerEffect(new PermanentsOnBattlefieldCount(filter))); Ability ability = new EntersBattlefieldAbility(new DrawCardSourceControllerEffect(xCount));
ability.addEffect(new LoseLifeSourceControllerEffect(xCount));
this.addAbility(ability); this.addAbility(ability);
} }

2
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -58,7 +58,7 @@ public enum CardRepository {
// raise this if db structure was changed // raise this if db structure was changed
private static final long CARD_DB_VERSION = 51; private static final long CARD_DB_VERSION = 51;
// raise this if new cards were added to the server // 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<CardInfo, Object> cardDao; private Dao<CardInfo, Object> cardDao;
private Set<String> classNames; private Set<String> classNames;