mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
Merge origin/master
This commit is contained in:
Matthaios Tsiridis
commit
af9a961174
5 changed files with 166 additions and 0 deletions
46
Mage.Sets/src/mage/cards/a/ArdenvalePaladin.java
Normal file
46
Mage.Sets/src/mage/cards/a/ArdenvalePaladin.java
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
package mage.cards.a;
|
||||
|
||||
import mage.MageInt;
|
||||
import mage.abilities.common.EntersBattlefieldAbility;
|
||||
import mage.abilities.condition.common.AdamantCondition;
|
||||
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.cards.CardSetInfo;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.SubType;
|
||||
import mage.counters.CounterType;
|
||||
import mage.watchers.common.ManaSpentToCastWatcher;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author TheElk801
|
||||
*/
|
||||
public final class ArdenvalePaladin extends CardImpl {
|
||||
|
||||
public ArdenvalePaladin(UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
|
||||
|
||||
this.subtype.add(SubType.HUMAN);
|
||||
this.subtype.add(SubType.KNIGHT);
|
||||
this.power = new MageInt(2);
|
||||
this.toughness = new MageInt(5);
|
||||
|
||||
// Adamant — If at least three white mana was spent to cast this spell, Ardenvale Paladin enters the battlefield with a +1/+1 counter on it.
|
||||
this.addAbility(new EntersBattlefieldAbility(
|
||||
new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
|
||||
AdamantCondition.WHITE, "<br><i>Adamant</i> — " +
|
||||
"If at least three white mana was spent to cast this spell, " +
|
||||
"{this} enters the battlefield with a +1/+1 counter on it.", ""
|
||||
), new ManaSpentToCastWatcher());
|
||||
}
|
||||
|
||||
private ArdenvalePaladin(final ArdenvalePaladin card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArdenvalePaladin copy() {
|
||||
return new ArdenvalePaladin(this);
|
||||
}
|
||||
}
|
||||
54
Mage.Sets/src/mage/cards/l/LindenTheSteadfastQueen.java
Normal file
54
Mage.Sets/src/mage/cards/l/LindenTheSteadfastQueen.java
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
package mage.cards.l;
|
||||
|
||||
import mage.MageInt;
|
||||
import mage.ObjectColor;
|
||||
import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility;
|
||||
import mage.abilities.effects.common.GainLifeEffect;
|
||||
import mage.abilities.keyword.VigilanceAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.cards.CardSetInfo;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.SubType;
|
||||
import mage.constants.SuperType;
|
||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.ColorPredicate;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author TheElk801
|
||||
*/
|
||||
public final class LindenTheSteadfastQueen extends CardImpl {
|
||||
|
||||
private static final FilterControlledCreaturePermanent filter
|
||||
= new FilterControlledCreaturePermanent("white creature you control");
|
||||
|
||||
static {
|
||||
filter.add(new ColorPredicate(ObjectColor.WHITE));
|
||||
}
|
||||
|
||||
public LindenTheSteadfastQueen(UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{W}{W}");
|
||||
|
||||
this.addSuperType(SuperType.LEGENDARY);
|
||||
this.subtype.add(SubType.HUMAN);
|
||||
this.subtype.add(SubType.NOBLE);
|
||||
this.power = new MageInt(3);
|
||||
this.toughness = new MageInt(3);
|
||||
|
||||
// Vigilance
|
||||
this.addAbility(VigilanceAbility.getInstance());
|
||||
|
||||
// Whenever a white creature you control attacks, you gain 1 life.
|
||||
this.addAbility(new AttacksCreatureYouControlTriggeredAbility(new GainLifeEffect(1), false, filter));
|
||||
}
|
||||
|
||||
private LindenTheSteadfastQueen(final LindenTheSteadfastQueen card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LindenTheSteadfastQueen copy() {
|
||||
return new LindenTheSteadfastQueen(this);
|
||||
}
|
||||
}
|
||||
49
Mage.Sets/src/mage/cards/r/RallyForTheThrone.java
Normal file
49
Mage.Sets/src/mage/cards/r/RallyForTheThrone.java
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
package mage.cards.r;
|
||||
|
||||
import mage.abilities.condition.common.AdamantCondition;
|
||||
import mage.abilities.decorator.ConditionalOneShotEffect;
|
||||
import mage.abilities.dynamicvalue.DynamicValue;
|
||||
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
|
||||
import mage.abilities.effects.common.CreateTokenEffect;
|
||||
import mage.abilities.effects.common.GainLifeEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.cards.CardSetInfo;
|
||||
import mage.constants.CardType;
|
||||
import mage.filter.StaticFilters;
|
||||
import mage.game.permanent.token.HumanToken;
|
||||
import mage.watchers.common.ManaSpentToCastWatcher;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @author TheElk801
|
||||
*/
|
||||
public final class RallyForTheThrone extends CardImpl {
|
||||
|
||||
private static final DynamicValue xValue
|
||||
= new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE);
|
||||
|
||||
public RallyForTheThrone(UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{W}");
|
||||
|
||||
// Create two 1/1 white Human creature tokens.
|
||||
this.getSpellAbility().addEffect(new CreateTokenEffect(new HumanToken(), 2));
|
||||
|
||||
// Adamant — If at least three white mana was spent to cast this spell, you gain 1 life for each creature you control.
|
||||
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
|
||||
new GainLifeEffect(xValue), AdamantCondition.WHITE, "<br><i>Adamant</i> — " +
|
||||
"If at least three white mana was spent to cast this spell, " +
|
||||
"you gain 1 life for each creature you control."
|
||||
));
|
||||
this.getSpellAbility().addWatcher(new ManaSpentToCastWatcher());
|
||||
}
|
||||
|
||||
private RallyForTheThrone(final RallyForTheThrone card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
@Override
|
||||
public RallyForTheThrone copy() {
|
||||
return new RallyForTheThrone(this);
|
||||
}
|
||||
}
|
||||
|
|
@ -33,6 +33,7 @@ public final class ThroneOfEldraine extends ExpansionSet {
|
|||
cards.add(new SetCardInfo("Animating Faerie", 38, Rarity.UNCOMMON, mage.cards.a.AnimatingFaerie.class));
|
||||
cards.add(new SetCardInfo("Arcane Signet", 331, Rarity.COMMON, mage.cards.a.ArcaneSignet.class));
|
||||
cards.add(new SetCardInfo("Arcanist's Owl", 206, Rarity.UNCOMMON, mage.cards.a.ArcanistsOwl.class));
|
||||
cards.add(new SetCardInfo("Ardenvale Paladin", 4, Rarity.COMMON, mage.cards.a.ArdenvalePaladin.class));
|
||||
cards.add(new SetCardInfo("Ardenvale Tactician", 5, Rarity.COMMON, mage.cards.a.ArdenvaleTactician.class));
|
||||
cards.add(new SetCardInfo("Ayara, First of Locthwain", 75, Rarity.RARE, mage.cards.a.AyaraFirstOfLocthwain.class));
|
||||
cards.add(new SetCardInfo("Bake into a Pie", 76, Rarity.COMMON, mage.cards.b.BakeIntoAPie.class));
|
||||
|
|
@ -114,6 +115,7 @@ public final class ThroneOfEldraine extends ExpansionSet {
|
|||
cards.add(new SetCardInfo("Knight of the Keep", 19, Rarity.COMMON, mage.cards.k.KnightOfTheKeep.class));
|
||||
cards.add(new SetCardInfo("Knights' Charge", 328, Rarity.RARE, mage.cards.k.KnightsCharge.class));
|
||||
cards.add(new SetCardInfo("Korvold, Fae-Cursed King", 329, Rarity.MYTHIC, mage.cards.k.KorvoldFaeCursedKing.class));
|
||||
cards.add(new SetCardInfo("Linden, the Steadfast Queen", 20, Rarity.RARE, mage.cards.l.LindenTheSteadfastQueen.class));
|
||||
cards.add(new SetCardInfo("Loch Dragon", 211, Rarity.UNCOMMON, mage.cards.l.LochDragon.class));
|
||||
cards.add(new SetCardInfo("Lochmere Serpent", 195, Rarity.RARE, mage.cards.l.LochmereSerpent.class));
|
||||
cards.add(new SetCardInfo("Lost Legion", 94, Rarity.COMMON, mage.cards.l.LostLegion.class));
|
||||
|
|
@ -143,6 +145,7 @@ public final class ThroneOfEldraine extends ExpansionSet {
|
|||
cards.add(new SetCardInfo("Piper of the Swarm", 100, Rarity.RARE, mage.cards.p.PiperOfTheSwarm.class));
|
||||
cards.add(new SetCardInfo("Questing Beast", 171, Rarity.MYTHIC, mage.cards.q.QuestingBeast.class));
|
||||
cards.add(new SetCardInfo("Raging Redcap", 134, Rarity.COMMON, mage.cards.r.RagingRedcap.class));
|
||||
cards.add(new SetCardInfo("Rally for the Throne", 25, Rarity.UNCOMMON, mage.cards.r.RallyForTheThrone.class));
|
||||
cards.add(new SetCardInfo("Rankle, Master of Pranks", 101, Rarity.MYTHIC, mage.cards.r.RankleMasterOfPranks.class));
|
||||
cards.add(new SetCardInfo("Reave Soul", 103, Rarity.COMMON, mage.cards.r.ReaveSoul.class));
|
||||
cards.add(new SetCardInfo("Redcap Melee", 135, Rarity.UNCOMMON, mage.cards.r.RedcapMelee.class));
|
||||
|
|
|
|||
|
|
@ -35994,6 +35994,7 @@ Swamp|Commander 2019|294|C||Basic Land - Swamp|||({T}: Add {B}.)|
|
|||
Mountain|Commander 2019|297|C||Basic Land - Mountain|||({T}: Add {R}.)|
|
||||
Forest|Commander 2019|300|C||Basic Land - Forest|||({T}: Add {G}.)|
|
||||
All That Glitters|Throne of Eldraine|2|U|{1}{W}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +1/+1 for each artifact and/or enchantment you control.|
|
||||
Ardenvale Paladin|Throne of Eldraine|4|C|{3}{W}|Creature - Human Knight|2|5|Adamant — If at least three white ana was spent to cast this spell, Ardenvale Paladin enters the battlefield with a +1/+1 counter on it.|
|
||||
Ardenvale Tactician|Throne of Eldraine|5|C|{1}{W}{W}|Creature - Human Knight|2|3|Flying|
|
||||
Dizzying Swoop|Throne of Eldraine|5|C|{1}{W}|Instant - Adventure|2|3|Tap up to two target creatures.|
|
||||
Bartered Cow|Throne of Eldraine|6|C|{3}{W}|Creature - Ox|3|3|When Bartered Cow dies or when you discard it, create a Food token.|
|
||||
|
|
@ -36008,9 +36009,15 @@ Giant Killer|Throne of Eldraine|14|R|{W}|Creature - Human Peasant|1|2|{1}{W}, {T
|
|||
Glass Casket|Throne of Eldraine|15|U|{1}{W}|Artifact|||When Glass Casket enters the battlefield, exile target creature an opponent controls with converted mana cost 3 or less until Glass Casket leaves the battlefield.|
|
||||
Harmonious Archon|Throne of Eldraine|17|M|{4}{W}{W}|Creature - Archon|4|5|Flying$Non-Archon creatures have base power and toughness 3/3.$When Harmonious Archon enters the battlefield, create two 1/1 white Human creature tokens.|
|
||||
Knight of the Keep|Throne of Eldraine|19|C|{2}{W}|Creature - Human Knight|3|2||
|
||||
Linden, the Steadfast Queen|Throne of Eldraine|20|R|{W}{W}{W}|Legendary Creature - Human Noble|3|3|Vigilance$Whenever a white creature you control attacks, you gain 1 life.|
|
||||
Lonesome Unicorn|Throne of Eldraine|21|C|{4}{W}|Creature - Unicorn|3|3|Vigilance|
|
||||
Rider in Need|Throne of Eldraine|21|C|{2}{W}|Sorcery - Adventure|3|3|Create a 2/2 white Knight creature token with vigilance.|
|
||||
Rally for the Throne|Throne of Eldraine|25|U|{2}{W}|Instant|||Create two 1/1 white Human creature tokens.$Adamant — If at least three white mana was spent to cast this spell, you gain 1 life for each creature you control.|
|
||||
Righteousness|Throne of Eldraine|27|U|{W}|Instant|||Target blocking creature gets +7/+7 until end of turn.|
|
||||
Shining Armor|Throne of Eldraine|29|C|{1}{W}|Artifact - Equipment|||Flash$When Shining Armor enters the battlefield, attach it to target Knight you control.$Equipped creature gets +0/+2 and has vigilance.$Equip {3}|
|
||||
Silverflame Ritual|Throne of Eldraine|30|C|{3}{W}|Sorcery|||Put a +1/+1 counter on each creature you control.$Adamant — If at least three white mana was spent to cast this spell, creatures you control gain vigilance until end of turn.|
|
||||
On Alert|Throne of Eldraine|31|C|{2}{W}|Instant - Adventure|2|1|Target creature gets +2/+2 until end of turn. Untap it.|
|
||||
Silverflame Squire|Throne of Eldraine|31|C|{1}{W}|Creature - Human Soldier|2|1||
|
||||
Trapped in the Tower|Throne of Eldraine|33|C|{1}{W}|Enchantment - Aura|||Enchant creature without flying$Enchanted creature can't attack or block, and its activated abilities can't be activated.|
|
||||
True Love's Kiss|Throne of Eldraine|34|C|{2}{W}{W}|Instant|||Exile target artifact or enchantment.$Draw a card|
|
||||
Venerable Knight|Throne of Eldraine|35|U|{W}|Creature - Human Knight|2|1|When Venerable Knight dies, put a +1/+1 counter on target Knight you control.|
|
||||
|
|
@ -36081,6 +36088,7 @@ Battle Display|Throne of Eldraine|122|U|{R}|Sorcery - Adventure|2|1|Destroy targ
|
|||
Embereth Shieldbreaker|Throne of Eldraine|122|U|{1}{R}|Creature - Human Knight|2|1||
|
||||
Ferocity of the Wilds|Throne of Eldraine|123|U|{2}{R}|Enchantment|||Attacking non-Human creatures you control get +1/+0 and have trample.|
|
||||
Fervent Champion|Throne of Eldraine|124|R|{R}|Creature - Human Knight|1|1|First strike, haste$Whenever Fervent Champion attacks, another target attacking Knight you control gets +1/+0 until end of turn.$Equip abilities you activate that target Fervent Champion cost {3} less to activate.|
|
||||
Fires of Invention|Throne of Eldraine|125|R|{3}{R}|Enchantment|||You can cast spells only during your turn and you can cast no more than two spells each turn.$You may cast spells with converted mana cost less than or equal to the number of lands you control without paying their mana costs.|
|
||||
Irencrag Feat|Throne of Eldraine|127|R|{1}{R}{R}{R}|Sorcery|||Add seven {R}. You can cast only one more spell this turn.|
|
||||
Joust|Throne of Eldraine|129|U|{1}{R}|Sorcery|||Choose target creature you control and target creature you don't control. The creature you control gets +2/+1 until end of turn if it's a Knight. Then those creatures fight each other.|
|
||||
Haggle|Throne of Eldraine|131|C|{R}|Instant - Adventure|2|3|You may discard a card. If you do, draw a card.|
|
||||
|
|
@ -36110,6 +36118,7 @@ Fierce Witchstalker|Throne of Eldraine|154|C|{2}{G}{G}|Creature - Wolf|4|4|Tramp
|
|||
Flaxen Intruder|Throne of Eldraine|155|U|{G}|Creature - Human Berserker|1|2|Whenever Flaxen Intruder deals combat damage to a player, you may sacrifice it. When you do, destroy target artifact or enchantment.|
|
||||
Welcome Home|Throne of Eldraine|155|U|{5}{G}{G}|Sorcery - Adventure|1|2|Create three 2/2 green Bear creature tokens.|
|
||||
Garenbrig Paladin|Throne of Eldraine|157|C|{4}{G}|Creature - Giant Knight|4|4|Adamant — If at least three green mana was spent to cast this spell, Garenbrig Paladin enters the battlefield with a +1/+1 counter on it.$Garenbrig Paladin can't be blocked by creatures with power 2 or less.|
|
||||
Garenbrig Squire|Throne of Eldraine|158|C|{1}{G}|Creature - Human Soldier|2|2|Whenever you cast a creature spell that has an Adventure, Garenbrig Squire gets +1/+1 until end of turn.|
|
||||
Giant Opportunity|Throne of Eldraine|159|U|{2}{G}|Sorcery|||You may sacrifice two Foods. If you do, create a 7/7 green Giant creature token. Otherwise, create three Food tokens.|
|
||||
Gilded Goose|Throne of Eldraine|160|R|{G}|Creature - Bird|0|2|Flying$When Gilded Goose enters the battlefield, create a Food token.${1}{G}, {T}: Create a Food token.${T}, Sacrifice a Food: Add one mana of any color.|
|
||||
Insatiable Appetite|Throne of Eldraine|162|C|{1}{G}|Instant|||You may sacrifice a Food. If you do, target creature gets +5/+5 until end of turn. Otherwise, that creature gets +3/+3 until end of turn.|
|
||||
|
|
@ -36127,6 +36136,8 @@ Rosethorn Acolyte|Throne of Eldraine|174|C|{2}{G}|Creature - Elf Druid|2|3|{T}:
|
|||
Seasonal Ritual|Throne of Eldraine|174|C|{G}|Sorcery - Adventure|2|3|Add one mana of any color.|
|
||||
Tall as a Beanstalk|Throne of Eldraine|178|C|{3}{G}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +3/+3, has reach, and is a Giant in addition to its other types.|
|
||||
Trail of Crumbs|Throne of Eldraine|179|U|{1}{G}|Enchantment|||When Trail of Crumbs enters the battlefield, create a Food token.$Whenever you sacrifice a Food, you may pay {1}. If you do, look at the top two cards of your library. You may reveal a permanent card from among them and put it into your hand. Put the rest on the bottom of your library in any order.|
|
||||
Oaken Boon|Throne of Eldraine|180|C|{3}{G}|Sorcery - Adventure|6|5|Put two +1/+1 counters on target creature.|
|
||||
Tuinvale Treefolk|Throne of Eldraine|180|C|{5}{G}|Creature - Treefolk Druid|6|5||
|
||||
Wicked Wolf|Throne of Eldraine|181|R|{2}{G}{G}|Creature - Wolf|3|3|When Wicked Wolf enters the battlefield, it fights up to one target creature you don't control.$Sacrifice a Food: Put a +1/+1 counter on Wicked Wolf. It gains indestructible until end of turn. Tap it.|
|
||||
Wildborn Preserver|Throne of Eldraine|182|R|{1}{G}|Creature - Elf Archer|2|2|Flash$Reach$Whenever another non-Human creature enters the battlefield under your control, you may pay {X}. When you do, put X +1/+1 counters on Wildborn Preserver.|
|
||||
Wildwood Tracker|Throne of Eldraine|183|C|{G}|Creature - Elf Warrior|1|1|Whenever Wildwood Tracker attacks or blocks, if you control another non-Human creature, Wildwood Tracker gets +1/+1 until end of turn.|
|
||||
|
|
@ -36165,9 +36176,12 @@ Heraldic Banner|Throne of Eldraine|222|U|{3}|Artifact|||As Heraldic Banner enter
|
|||
Inquisitive Puppet|Throne of Eldraine|223|U|{1}|Artifact Creature - Construct|0|2|When Inquisitive Puppet enters the battlefield, scry 1.$Exile Inquisitive Puppet: Create a 1/1 white Human creature token.|
|
||||
Jousting Dummy|Throne of Eldraine|224|C|{2}|Artifact Creature - Scarecrow Knight|2|1|{3}: Jousting Dummy gets +1/+0 until end of turn.|
|
||||
Roving Keep|Throne of Eldraine|228|C|{7}|Artifact Creature - Wall|5|7|Defender${7}: Roving Keep gets +2/+0 and gains trample until end of turn. It can attack this turn as though it didn't have defender.|
|
||||
Shambling Suit|Throne of Eldraine|230|U|{3}|Artifact Creature - Construct|*|3|Shambling Suit's power is equal to the number of artifacts and/or enchantments you control.|
|
||||
Sorcerous Spyglass|Throne of Eldraine|233|R|{2}|Artifact|||As Sorcerous Spyglass enters the battlefield, look at an opponent's hand, then choose any card name.$Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.|
|
||||
Spinning Wheel|Throne of Eldraine|234|U|{3}|Artifact|||{T}: Add one mana of any color.${5}, {T}: Tap target creature.|
|
||||
Stonecoil Serpent|Throne of Eldraine|235|R|{X}|Artifact Creature - Snake|0|0|Reach, trample, protection from multicolored$Stonecoil Serpent enters the battlefield with X +1/+1 counters on it.|
|
||||
Witch's Oven|Throne of Eldraine|237|U|{1}|Artifact|||{T}, Sacrifice a creature: Create a Food token. If the sacrificed creature's toughness was 4 or greater, create two Food tokens instead.|
|
||||
Idyllic Grange|Throne of Eldraine|246|C||Land - Plains|||({T}: Add {W}.)$Idyllic Grange enters the battlefield tapped unless you control three or more other Plains.$When Idyllic Grange enters the battlefield untapped, put a +1/+1 counter on target creature you control.|
|
||||
Tournament Grounds|Throne of Eldraine|248|U||Land|||{T}: Add {C}.${T}: Add {R}, {W}, or {B}. Spend this mana only to cast a Knight or Equipment spell.|
|
||||
Witch's Cottage|Throne of Eldraine|249|C||Land - Swamp|||({T}: Add {B}.)$Witch's Cottage enters the battlefield tapped unless you control three or more other Swamps.$When Witch's Cottage enters the battlefield untapped, you may put target creature card from your graveyard on top of your library.|
|
||||
Kenrith, the Returned King|Throne of Eldraine|303|M|{4}{W}|Legendary Creature - Human Noble|5|5|{R}: All creatures gain trample and haste until end of turn.${1}{G}: Put a +1/+1 counter on target creature.${2}{W}: Target player gains 5 life.${3}{U}: Target player draws a card.${4}{B}: Put target creature card from a graveyard onto the battlefield under its owner's control.|
|
||||
|
|
|
|||
Loading…
Reference in a new issue