Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

updated creatures that gained the Noble subtype

Browse source
This commit is contained in:
Evan Kranzler 2019-09-27 13:41:39 -04:00
parent d4baa4ebd2
commit f264205dfe
20 changed files with 123 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java
View file

@ -1,7 +1,5 @@
package mage.cards.a;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -24,24 +22,25 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.TargetPermanent;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
/**
*
* @author cbt33
*/
public final class AboshanCephalidEmperor extends CardImpl {
static final FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("untapped Cephalid you control");
static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures without flying");
static {
filter1.add(new SubtypePredicate(SubType.CEPHALID));
filter2.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
}
static final FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("untapped Cephalid you control");
static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures without flying");
static {
filter1.add(new SubtypePredicate(SubType.CEPHALID));
filter2.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
}
public AboshanCephalidEmperor(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.CEPHALID);
this.subtype.add(SubType.CEPHALID, SubType.NOBLE);
this.power = new MageInt(3);
this.toughness = new MageInt(3);
@ -50,7 +49,7 @@ static {
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter1, true)));
ability.addTarget(new TargetPermanent());
this.addAbility(ability);
// {U}{U}{U}: Tap all creatures without flying.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(filter2), new ManaCostsImpl("{U}{U}{U}")));
}

15
Mage.Sets/src/mage/cards/b/BaronSengir.java
View file

@ -1,7 +1,5 @@
package mage.cards.b;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DealtDamageAndDiedTriggeredAbility;
@ -22,12 +20,13 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public final class BaronSengir extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target Vampire");
static {
@ -36,18 +35,18 @@ public final class BaronSengir extends CardImpl {
}
public BaronSengir(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}{B}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{B}{B}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.VAMPIRE);
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE);
this.power = new MageInt(5);
this.toughness = new MageInt(5);
// Flying
this.addAbility(FlyingAbility.getInstance());
// Whenever a creature dealt damage by Baron Sengir this turn dies, put a +2/+2 counter on Baron Sengir.
this.addAbility(new DealtDamageAndDiedTriggeredAbility(new AddCountersSourceEffect(CounterType.P2P2.createInstance()), false));
// {tap}: Regenerate another target Vampire.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent(filter));

7
Mage.Sets/src/mage/cards/b/BragoKingEternal.java
View file

@ -1,7 +1,5 @@
package mage.cards.b;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
@ -20,8 +18,9 @@ import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.target.common.TargetControlledPermanent;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public final class BragoKingEternal extends CardImpl {
@ -29,7 +28,7 @@ public final class BragoKingEternal extends CardImpl {
public BragoKingEternal(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.SPIRIT);
this.subtype.add(SubType.SPIRIT, SubType.NOBLE);
this.power = new MageInt(2);
this.toughness = new MageInt(4);

9
Mage.Sets/src/mage/cards/c/CephalidAristocrat.java
View file

@ -1,7 +1,5 @@
package mage.cards.c;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.BecomesTargetTriggeredAbility;
import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect;
@ -10,15 +8,16 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public final class CephalidAristocrat extends CardImpl {
public CephalidAristocrat(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}");
this.subtype.add(SubType.CEPHALID);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}");
this.subtype.add(SubType.CEPHALID, SubType.NOBLE);
this.power = new MageInt(3);
this.toughness = new MageInt(3);

17
Mage.Sets/src/mage/cards/e/EmpressGalina.java
View file

@ -1,7 +1,5 @@
package mage.cards.e;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -10,21 +8,18 @@ import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continuous.GainControlTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.constants.*;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public final class EmpressGalina extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("legendary permanent");
static {
@ -32,9 +27,9 @@ public final class EmpressGalina extends CardImpl {
}
public EmpressGalina(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.MERFOLK);
this.subtype.add(SubType.MERFOLK, SubType.NOBLE);
this.power = new MageInt(1);
this.toughness = new MageInt(3);

11
Mage.Sets/src/mage/cards/f/FaerieNoble.java
View file

@ -1,7 +1,5 @@
package mage.cards.f;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -19,12 +17,13 @@ import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import java.util.UUID;
/**
*
* @author ilcartographer
*/
public final class FaerieNoble extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Faerie creatures");
static {
@ -32,8 +31,8 @@ public final class FaerieNoble extends CardImpl {
}
public FaerieNoble(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
this.subtype.add(SubType.FAERIE);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
this.subtype.add(SubType.FAERIE, SubType.NOBLE);
this.power = new MageInt(1);
this.toughness = new MageInt(2);

10
Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java
View file

@ -1,7 +1,5 @@
package mage.cards.f;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -16,20 +14,22 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT;
/**
*
* @author North
*/
public final class FalkenrathAristocrat extends CardImpl {
public FalkenrathAristocrat(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{R}");
this.subtype.add(SubType.VAMPIRE);
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE);
this.power = new MageInt(4);
this.toughness = new MageInt(1);

31
Mage.Sets/src/mage/cards/f/FalkenrathNoble.java
View file

@ -1,7 +1,5 @@
package mage.cards.f;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.GainLifeEffect;
@ -19,15 +17,16 @@ import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.target.TargetPlayer;
import java.util.UUID;
/**
*
* @author North
*/
public final class FalkenrathNoble extends CardImpl {
public FalkenrathNoble(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}");
this.subtype.add(SubType.VAMPIRE);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
@ -72,19 +71,17 @@ class FalkenrathNobleTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
if (zEvent.isDiesEvent()) {
Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
if (permanent != null) {
if (permanent.getId().equals(this.getSourceId())) {
return true;
} else {
if (permanent.isCreature()) {
return true;
}
}
}
if (!zEvent.isDiesEvent()) {
return false;
}
return false;
Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
if (permanent == null) {
return false;
}
if (permanent.getId().equals(this.getSourceId())) {
return true;
}
return permanent.isCreature();
}
@Override

13
Mage.Sets/src/mage/cards/g/GarzaZolPlagueQueen.java
View file

@ -1,7 +1,5 @@
package mage.cards.g;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.common.DealtDamageAndDiedTriggeredAbility;
@ -16,25 +14,26 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.counters.CounterType;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public final class GarzaZolPlagueQueen extends CardImpl {
public GarzaZolPlagueQueen(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{B}{R}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{B}{R}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.VAMPIRE);
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE);
this.power = new MageInt(5);
this.toughness = new MageInt(5);
// Flying
this.addAbility(FlyingAbility.getInstance());
// Haste
this.addAbility(HasteAbility.getInstance());
// Whenever a creature dealt damage by Garza Zol, Plague Queen this turn dies, put a +1/+1 counter on Garza Zol.
this.addAbility(new DealtDamageAndDiedTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())));

29
Mage.Sets/src/mage/cards/i/ImposingSovereign.java
View file

@ -1,32 +1,27 @@
package mage.cards.i;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.constants.*;
import mage.game.Game;
import mage.game.events.EntersTheBattlefieldEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import java.util.UUID;
/**
*
* @author jeffwadsworth
*/
public final class ImposingSovereign extends CardImpl {
public ImposingSovereign(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add(SubType.HUMAN);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
this.subtype.add(SubType.HUMAN, SubType.NOBLE);
this.power = new MageInt(2);
this.toughness = new MageInt(1);
@ -36,7 +31,7 @@ public final class ImposingSovereign extends CardImpl {
}
public ImposingSovereign(final ImposingSovereign card) {
private ImposingSovereign(final ImposingSovereign card) {
super(card);
}
@ -53,7 +48,7 @@ class ImposingSovereignEffect extends ReplacementEffectImpl {
staticText = "Creatures your opponents control enter the battlefield tapped";
}
ImposingSovereignEffect(final ImposingSovereignEffect effect) {
private ImposingSovereignEffect(final ImposingSovereignEffect effect) {
super(effect);
}
@ -73,13 +68,11 @@ class ImposingSovereignEffect extends ReplacementEffectImpl {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
Permanent permanent = ((EntersTheBattlefieldEvent) event).getTarget();
if (permanent != null && permanent.isCreature()) {
return true;
}
if (!game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
return false;
}
return false;
Permanent permanent = ((EntersTheBattlefieldEvent) event).getTarget();
return permanent != null && permanent.isCreature();
}
@Override

12
Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java
View file

@ -1,7 +1,5 @@
package mage.cards.i;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -15,13 +13,15 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT;
/**
*
* @author fireshoes
*/
public final class IndulgentAristocrat extends CardImpl {
@ -34,7 +34,7 @@ public final class IndulgentAristocrat extends CardImpl {
public IndulgentAristocrat(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}");
this.subtype.add(SubType.VAMPIRE);
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
@ -47,7 +47,7 @@ public final class IndulgentAristocrat extends CardImpl {
this.addAbility(ability);
}
public IndulgentAristocrat(final IndulgentAristocrat card) {
private IndulgentAristocrat(final IndulgentAristocrat card) {
super(card);
}

6
Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java
View file

@ -1,7 +1,6 @@
package mage.cards.k;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.effects.Effect;
@ -16,8 +15,9 @@ import mage.constants.SuperType;
import mage.game.permanent.token.GoldToken;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public final class KingMacarTheGoldCursed extends CardImpl {
@ -25,7 +25,7 @@ public final class KingMacarTheGoldCursed extends CardImpl {
public KingMacarTheGoldCursed(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.HUMAN, SubType.NOBLE);
this.power = new MageInt(2);
this.toughness = new MageInt(3);

14
Mage.Sets/src/mage/cards/k/KingSuleiman.java
View file

@ -1,7 +1,5 @@
package mage.cards.k;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -17,8 +15,9 @@ import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
*
* @author KholdFuzion
*/
public final class KingSuleiman extends CardImpl {
@ -26,14 +25,15 @@ public final class KingSuleiman extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("Djinn or Efreet");
static {
filter.add( Predicates.or(
filter.add(Predicates.or(
new SubtypePredicate(SubType.DJINN),
new SubtypePredicate(SubType.EFREET)));
new SubtypePredicate(SubType.EFREET)
));
}
public KingSuleiman(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
this.subtype.add(SubType.HUMAN);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
this.subtype.add(SubType.HUMAN, SubType.NOBLE);
this.power = new MageInt(1);
this.toughness = new MageInt(1);

14
Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java
View file

@ -1,7 +1,6 @@
package mage.cards.l;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.ObjectColor;
@ -23,8 +22,9 @@ import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public final class LlawanCephalidEmpress extends CardImpl {
@ -38,9 +38,9 @@ public final class LlawanCephalidEmpress extends CardImpl {
}
public LlawanCephalidEmpress(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.CEPHALID);
this.subtype.add(SubType.CEPHALID, SubType.NOBLE);
this.power = new MageInt(2);
this.toughness = new MageInt(3);
@ -90,7 +90,7 @@ class LlawanCephalidRuleModifyingEffect extends ContinuousRuleModifyingEffectImp
public boolean apply(Game game, Ability source) {
return true;
}
@Override
public String getInfoMessage(Ability source, GameEvent event, Game game) {
MageObject mageObject = game.getObject(source.getSourceId());
@ -99,12 +99,12 @@ class LlawanCephalidRuleModifyingEffect extends ContinuousRuleModifyingEffectImp
}
return null;
}
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.CAST_SPELL;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
Player controller = game.getPlayer(source.getControllerId());

10
Mage.Sets/src/mage/cards/m/MerfolkSovereign.java
View file

@ -1,8 +1,5 @@
package mage.cards.m;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -20,8 +17,9 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public final class MerfolkSovereign extends CardImpl {
@ -35,8 +33,8 @@ public final class MerfolkSovereign extends CardImpl {
}
public MerfolkSovereign(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}");
this.subtype.add(SubType.MERFOLK);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
this.subtype.add(SubType.MERFOLK, SubType.NOBLE);
this.power = new MageInt(2);
this.toughness = new MageInt(2);

16
Mage.Sets/src/mage/cards/s/SpriteNoble.java
View file

@ -1,7 +1,5 @@
package mage.cards.s;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
@ -11,16 +9,16 @@ import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AbilityPredicate;
/**
*
* @author LoneFox
import java.util.UUID;
/**
* @author LoneFox
*/
public final class SpriteNoble extends CardImpl {
@ -31,8 +29,8 @@ public final class SpriteNoble extends CardImpl {
}
public SpriteNoble(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}");
this.subtype.add(SubType.FAERIE);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
this.subtype.add(SubType.FAERIE, SubType.NOBLE);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
@ -42,7 +40,7 @@ public final class SpriteNoble extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true)));
// {tap}: Other creatures you control with flying get +1/+0 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter, true),
new TapSourceCost()));
new TapSourceCost()));
}
public SpriteNoble(final SpriteNoble card) {

8
Mage.Sets/src/mage/cards/s/StromkirkNoble.java
View file

@ -1,7 +1,5 @@
package mage.cards.s;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.common.SimpleEvasionAbility;
@ -15,8 +13,9 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import java.util.UUID;
/**
*
* @author Alvin
* @author ayratn
*/
@ -24,7 +23,7 @@ public final class StromkirkNoble extends CardImpl {
public StromkirkNoble(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}");
this.subtype.add(SubType.VAMPIRE);
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
@ -34,7 +33,6 @@ public final class StromkirkNoble extends CardImpl {
new CantBeBlockedByCreaturesSourceEffect(new FilterCreaturePermanent(SubType.HUMAN, "Humans"), Duration.WhileOnBattlefield)));
// Whenever Stromkirk Noble deals combat damage to a player, put a +1/+1 counter on it.
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false));
}
public StromkirkNoble(final StromkirkNoble card) {

12
Mage.Sets/src/mage/cards/v/VampireAristocrat.java
View file

@ -1,7 +1,5 @@
package mage.cards.v;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -11,22 +9,22 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
/**
*
* @author Loki
*/
public final class VampireAristocrat extends CardImpl {
public VampireAristocrat(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
this.subtype.add(SubType.VAMPIRE);
this.subtype.add(SubType.ROGUE);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE, SubType.ROGUE);
this.power = new MageInt(2);
this.toughness = new MageInt(2);

9
Mage.Sets/src/mage/cards/v/VampireNoble.java
View file

@ -1,22 +1,21 @@
package mage.cards.v;
import java.util.UUID;
import mage.MageInt;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public final class VampireNoble extends CardImpl {
public VampireNoble(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
this.subtype.add(SubType.VAMPIRE);
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE);
this.power = new MageInt(3);
this.toughness = new MageInt(2);
}

8
Mage.Sets/src/mage/cards/v/VampireSovereign.java
View file

@ -1,20 +1,20 @@
package mage.cards.v;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.effects.common.LoseLifeTargetEffect;
import mage.constants.SubType;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.target.common.TargetOpponent;
import java.util.UUID;
/**
*
* @author TheElk801
*/
public final class VampireSovereign extends CardImpl {
@ -22,7 +22,7 @@ public final class VampireSovereign extends CardImpl {
public VampireSovereign(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
this.subtype.add(SubType.VAMPIRE);
this.subtype.add(SubType.VAMPIRE, SubType.NOBLE);
this.power = new MageInt(3);
this.toughness = new MageInt(4);