mirror of
https://github.com/correl/mage.git
synced 2024-12-01 03:00:09 +00:00
resolved rebase conflicts
This commit is contained in:
parent
58926ce4c1
commit
25bc5d6589
2 changed files with 4 additions and 1 deletions
|
@ -32,6 +32,7 @@ public final class InnistradMidnightHunt extends ExpansionSet {
|
||||||
this.numBoosterDoubleFaced = 1;
|
this.numBoosterDoubleFaced = 1;
|
||||||
|
|
||||||
cards.add(new SetCardInfo("Abandon the Post", 127, Rarity.COMMON, mage.cards.a.AbandonThePost.class));
|
cards.add(new SetCardInfo("Abandon the Post", 127, Rarity.COMMON, mage.cards.a.AbandonThePost.class));
|
||||||
|
cards.add(new SetCardInfo("Adeline, Resplendent Cathar", 1, Rarity.RARE, mage.cards.a.AdelineResplendentCathar.class));
|
||||||
cards.add(new SetCardInfo("Ambitious Farmhand", 2, Rarity.UNCOMMON, mage.cards.a.AmbitiousFarmhand.class));
|
cards.add(new SetCardInfo("Ambitious Farmhand", 2, Rarity.UNCOMMON, mage.cards.a.AmbitiousFarmhand.class));
|
||||||
cards.add(new SetCardInfo("Angelfire Ignition", 209, Rarity.RARE, mage.cards.a.AngelfireIgnition.class));
|
cards.add(new SetCardInfo("Angelfire Ignition", 209, Rarity.RARE, mage.cards.a.AngelfireIgnition.class));
|
||||||
cards.add(new SetCardInfo("Arcane Infusion", 210, Rarity.UNCOMMON, mage.cards.a.ArcaneInfusion.class));
|
cards.add(new SetCardInfo("Arcane Infusion", 210, Rarity.UNCOMMON, mage.cards.a.ArcaneInfusion.class));
|
||||||
|
@ -81,6 +82,7 @@ public final class InnistradMidnightHunt extends ExpansionSet {
|
||||||
cards.add(new SetCardInfo("Covert Cutpurse", 92, Rarity.UNCOMMON, mage.cards.c.CovertCutpurse.class));
|
cards.add(new SetCardInfo("Covert Cutpurse", 92, Rarity.UNCOMMON, mage.cards.c.CovertCutpurse.class));
|
||||||
cards.add(new SetCardInfo("Covetous Castaway", 45, Rarity.UNCOMMON, mage.cards.c.CovetousCastaway.class));
|
cards.add(new SetCardInfo("Covetous Castaway", 45, Rarity.UNCOMMON, mage.cards.c.CovetousCastaway.class));
|
||||||
cards.add(new SetCardInfo("Covetous Geist", 92, Rarity.UNCOMMON, mage.cards.c.CovetousGeist.class));
|
cards.add(new SetCardInfo("Covetous Geist", 92, Rarity.UNCOMMON, mage.cards.c.CovetousGeist.class));
|
||||||
|
cards.add(new SetCardInfo("Crawl from the Cellar", 93, Rarity.COMMON, mage.cards.c.CrawlFromTheCellar.class));
|
||||||
cards.add(new SetCardInfo("Croaking Counterpart", 215, Rarity.RARE, mage.cards.c.CroakingCounterpart.class));
|
cards.add(new SetCardInfo("Croaking Counterpart", 215, Rarity.RARE, mage.cards.c.CroakingCounterpart.class));
|
||||||
cards.add(new SetCardInfo("Crossroads Candleguide", 253, Rarity.COMMON, mage.cards.c.CrossroadsCandleguide.class));
|
cards.add(new SetCardInfo("Crossroads Candleguide", 253, Rarity.COMMON, mage.cards.c.CrossroadsCandleguide.class));
|
||||||
cards.add(new SetCardInfo("Curse of Shaken Faith", 134, Rarity.RARE, mage.cards.c.CurseOfShakenFaith.class));
|
cards.add(new SetCardInfo("Curse of Shaken Faith", 134, Rarity.RARE, mage.cards.c.CurseOfShakenFaith.class));
|
||||||
|
@ -142,6 +144,7 @@ public final class InnistradMidnightHunt extends ExpansionSet {
|
||||||
cards.add(new SetCardInfo("Geistwave", 56, Rarity.COMMON, mage.cards.g.Geistwave.class));
|
cards.add(new SetCardInfo("Geistwave", 56, Rarity.COMMON, mage.cards.g.Geistwave.class));
|
||||||
cards.add(new SetCardInfo("Ghostly Castigator", 45, Rarity.UNCOMMON, mage.cards.g.GhostlyCastigator.class));
|
cards.add(new SetCardInfo("Ghostly Castigator", 45, Rarity.UNCOMMON, mage.cards.g.GhostlyCastigator.class));
|
||||||
cards.add(new SetCardInfo("Ghoulcaller's Harvest", 225, Rarity.RARE, mage.cards.g.GhoulcallersHarvest.class));
|
cards.add(new SetCardInfo("Ghoulcaller's Harvest", 225, Rarity.RARE, mage.cards.g.GhoulcallersHarvest.class));
|
||||||
|
cards.add(new SetCardInfo("Ghoulish Procession", 102, Rarity.UNCOMMON, mage.cards.g.GhoulishProcession.class));
|
||||||
cards.add(new SetCardInfo("Grafted Identity", 57, Rarity.RARE, mage.cards.g.GraftedIdentity.class));
|
cards.add(new SetCardInfo("Grafted Identity", 57, Rarity.RARE, mage.cards.g.GraftedIdentity.class));
|
||||||
cards.add(new SetCardInfo("Graveyard Glutton", 104, Rarity.RARE, mage.cards.g.GraveyardGlutton.class));
|
cards.add(new SetCardInfo("Graveyard Glutton", 104, Rarity.RARE, mage.cards.g.GraveyardGlutton.class));
|
||||||
cards.add(new SetCardInfo("Graveyard Trespasser", 104, Rarity.RARE, mage.cards.g.GraveyardTrespasser.class));
|
cards.add(new SetCardInfo("Graveyard Trespasser", 104, Rarity.RARE, mage.cards.g.GraveyardTrespasser.class));
|
||||||
|
|
|
@ -42336,7 +42336,7 @@ Falkenrath Perforator|Innistrad: Midnight Hunt|136|C|{1}{R}|Creature - Vampire|2
|
||||||
Falkenrath Pit Fighter|Innistrad: Midnight Hunt|137|R|{R}|Creature - Vampire Warrior|2|1|{1}{R}, Discard a card, Sacrifice a Vampire: Draw two cards. Activate only if an opponent lost life this turn.|
|
Falkenrath Pit Fighter|Innistrad: Midnight Hunt|137|R|{R}|Creature - Vampire Warrior|2|1|{1}{R}, Discard a card, Sacrifice a Vampire: Draw two cards. Activate only if an opponent lost life this turn.|
|
||||||
Famished Foragers|Innistrad: Midnight Hunt|138|C|{3}{R}|Creature - Vampire|4|3|When Famished Foragers enters the battlefield, if an opponent lost life this turn, add {R}{R}{R}.${2}{R}, Discard a card: Draw a card.|
|
Famished Foragers|Innistrad: Midnight Hunt|138|C|{3}{R}|Creature - Vampire|4|3|When Famished Foragers enters the battlefield, if an opponent lost life this turn, add {R}{R}{R}.${2}{R}, Discard a card: Draw a card.|
|
||||||
Fangblade Brigand|Innistrad: Midnight Hunt|139|U|{3}{R}|Creature - Human Werewolf|3|4|{1}{R}: Fangblade Brigand gets +1/+0 and gains first strike until end of turn.$Daybound|
|
Fangblade Brigand|Innistrad: Midnight Hunt|139|U|{3}{R}|Creature - Human Werewolf|3|4|{1}{R}: Fangblade Brigand gets +1/+0 and gains first strike until end of turn.$Daybound|
|
||||||
Fangblade Eviscerator|Innistrad: Midnight Hunt|139|U||Creature - Werewolf|4|5|{1}{R}: "Blade-Fang Eviscerator" gets +1/+0 and gains first strike until end of turn.${4}{R}: Creatures you control get +2/+0 until end of turn.$Nightbound|
|
Fangblade Eviscerator|Innistrad: Midnight Hunt|139|U||Creature - Werewolf|4|5|{1}{R}: Fangblade Eviscerator gets +1/+0 and gains first strike until end of turn.${4}{R}: Creatures you control get +2/+0 until end of turn.$Nightbound|
|
||||||
Festival Crasher|Innistrad: Midnight Hunt|140|C|{1}{R}|Creature - Devil|1|3|Whenever you cast an instant or sorcery spell, Festival Crasher gets +2/+0 until end of turn.|
|
Festival Crasher|Innistrad: Midnight Hunt|140|C|{1}{R}|Creature - Devil|1|3|Whenever you cast an instant or sorcery spell, Festival Crasher gets +2/+0 until end of turn.|
|
||||||
Flame Channeler|Innistrad: Midnight Hunt|141|U|{1}{R}|Creature - Human Wizard|2|2|When a spell you control deals damage, transform Flame Channeler.|
|
Flame Channeler|Innistrad: Midnight Hunt|141|U|{1}{R}|Creature - Human Wizard|2|2|When a spell you control deals damage, transform Flame Channeler.|
|
||||||
Embodiment of Flame|Innistrad: Midnight Hunt|141|U||Creature - Elemental Wizard|3|3|Whenever a spell you control deals damage, put a flame counter on Embodiment of Flame.${1}, Remove a flame counter from Embodiment of Flame: Exile the top card of your library. You may play that card this turn.|
|
Embodiment of Flame|Innistrad: Midnight Hunt|141|U||Creature - Elemental Wizard|3|3|Whenever a spell you control deals damage, put a flame counter on Embodiment of Flame.${1}, Remove a flame counter from Embodiment of Flame: Exile the top card of your library. You may play that card this turn.|
|
||||||
|
|
Loading…
Reference in a new issue