Merge pull request #3931 from theelk801/master

Updated Vintage banlist and XLN card names

Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java

@@ -94,6 +94,7 @@ public class Vintage extends Constructed {
         restricted.add("Memory Jar");
         restricted.add("Merchant Scroll");
         restricted.add("Mind's Desire");
+        restricted.add("Monastery Mentory")
         restricted.add("Mox Emerald");
         restricted.add("Mox Jet");
         restricted.add("Mox Pearl");
@@ -104,6 +105,7 @@ public class Vintage extends Constructed {
         restricted.add("Ponder");
         restricted.add("Sol Ring");
         restricted.add("Strip Mine");
+        restricted.add("Thorn of Amethyst")
         restricted.add("Time Vault");
         restricted.add("Time Walk");
         restricted.add("Timetwister");
@@ -114,7 +116,6 @@ public class Vintage extends Constructed {
         restricted.add("Vampiric Tutor");
         restricted.add("Wheel of Fortune");
         restricted.add("Windfall");
-        restricted.add("Yawgmoth's Bargain");
         restricted.add("Yawgmoth's Will");
 
     }

Mage.Sets/src/mage/cards/k/KumenasSpeaker.java

@@ -45,9 +45,9 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  *
  * @author TheElk801
  */
-public class KumenasOmenspeaker extends CardImpl {
+public class KumenasSpeaker extends CardImpl {
 
-    private static final FilterPermanent filter = new FilterPermanent("another Merfolk or Island");
+    private static final FilterPermanent filter = new FilterPermanent("another Merfolk or an Island");
 
     static {
         filter.add(Predicates.or(
@@ -59,7 +59,7 @@ public class KumenasOmenspeaker extends CardImpl {
         ));
     }
 
-    public KumenasOmenspeaker(UUID ownerId, CardSetInfo setInfo) {
+    public KumenasSpeaker(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}");
 
         this.subtype.add("Merfolk");
@@ -70,12 +70,12 @@ public class KumenasOmenspeaker extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1)));
     }
 
-    public KumenasOmenspeaker(final KumenasOmenspeaker card) {
+    public KumenasSpeaker(final KumenasSpeaker card) {
         super(card);
     }
 
     @Override
-    public KumenasOmenspeaker copy() {
+    public KumenasSpeaker copy() {
-        return new KumenasOmenspeaker(this);
+        return new KumenasSpeaker(this);
     }
 }

Mage.Sets/src/mage/cards/m/BelligerentBrontodon.java

@@ -49,9 +49,9 @@ import mage.game.Game;
  *
  * @author TheElk801
  */
-public class MilitantDinosaur extends CardImpl {
+public class BelligerentBrontodon extends CardImpl {
 
-    public MilitantDinosaur(UUID ownerId, CardSetInfo setInfo) {
+    public BelligerentBrontodon(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{W}");
 
         this.subtype.add("Dinosaur");
@@ -62,13 +62,13 @@ public class MilitantDinosaur extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MilitantDinosaurCombatDamageRuleEffect()));
     }
 
-    public MilitantDinosaur(final MilitantDinosaur card) {
+    public BelligerentBrontodon(final BelligerentBrontodon card) {
         super(card);
     }
 
     @Override
-    public MilitantDinosaur copy() {
+    public BelligerentBrontodon copy() {
-        return new MilitantDinosaur(this);
+        return new BelligerentBrontodon(this);
     }
 }
 

Mage.Sets/src/mage/cards/t/DuskLegionDreadnought.java

@@ -39,9 +39,9 @@ import mage.constants.CardType;
  *
  * @author TheElk801
  */
-public class TwilightLegionBattleship extends CardImpl {
+public class DuskLegionDreadnought extends CardImpl {
 
-    public TwilightLegionBattleship(UUID ownerId, CardSetInfo setInfo) {
+    public DuskLegionDreadnought(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}");
         
         this.subtype.add("Vehicle");
@@ -56,12 +56,12 @@ public class TwilightLegionBattleship extends CardImpl {
 
     }
 
-    public TwilightLegionBattleship(final TwilightLegionBattleship card) {
+    public DuskLegionDreadnought(final DuskLegionDreadnought card) {
         super(card);
     }
 
     @Override
-    public TwilightLegionBattleship copy() {
+    public DuskLegionDreadnought copy() {
-        return new TwilightLegionBattleship(this);
+        return new DuskLegionDreadnought(this);
     }
 }

Mage.Sets/src/mage/sets/Ixalan.java

@@ -55,9 +55,9 @@ public class Ixalan extends ExpansionSet {
         cards.add(new SetCardInfo("Huatli, Dinosaur Knight", 285, Rarity.MYTHIC, mage.cards.h.HuatliDinosaurKnight.class));
         cards.add(new SetCardInfo("Jace, Cunning Castaway", 60, Rarity.MYTHIC, mage.cards.j.JaceCunningCastaway.class));
         cards.add(new SetCardInfo("Jace, Ingenious Mind-Mage", 280, Rarity.MYTHIC, mage.cards.j.JaceIngeniousMindMage.class));
-        cards.add(new SetCardInfo("Kumena's Omenspeaker", 196, Rarity.UNCOMMON, mage.cards.k.KumenasOmenspeaker.class));
+        cards.add(new SetCardInfo("Kumena's Speaker", 196, Rarity.UNCOMMON, mage.cards.k.KumenasSpeaker.class));
         cards.add(new SetCardInfo("Marauding Looter", 225, Rarity.UNCOMMON, mage.cards.m.MaraudingLooter.class));
-        cards.add(new SetCardInfo("Militant Dinosaur", 218, Rarity.UNCOMMON, mage.cards.m.MilitantDinosaur.class));
+        cards.add(new SetCardInfo("Belligerent Brontodon", 218, Rarity.UNCOMMON, mage.cards.m.BelligerentBrontodon.class));
         cards.add(new SetCardInfo("Old-Growth Dryads", 199, Rarity.RARE, mage.cards.o.OldGrowthDryads.class));
         cards.add(new SetCardInfo("Prosperous Pirates", 69, Rarity.COMMON, mage.cards.p.ProsperousPirates.class));
         cards.add(new SetCardInfo("Queen's Bay Soldier", 115, Rarity.COMMON, mage.cards.q.QueensBaySoldier.class));
@@ -77,13 +77,13 @@ public class Ixalan extends ExpansionSet {
         cards.add(new SetCardInfo("Tocatli Honor Guard", 42, Rarity.RARE, mage.cards.t.TocatliHonorGuard.class));
         cards.add(new SetCardInfo("Treasure Cove", 1250, Rarity.RARE, mage.cards.t.TreasureCove.class));
         cards.add(new SetCardInfo("Treasure Map", 250, Rarity.RARE, mage.cards.t.TreasureMap.class));
-        cards.add(new SetCardInfo("Twilight Legion Battleship", 236, Rarity.UNCOMMON, mage.cards.t.TwilightLegionBattleship.class));
+        cards.add(new SetCardInfo("Dusk Legion Dreadnought", 236, Rarity.UNCOMMON, mage.cards.t.DuskLegionDreadnought.class));
         cards.add(new SetCardInfo("Unclaimed Territory", 258, Rarity.UNCOMMON, mage.cards.u.UnclaimedTerritory.class));
         cards.add(new SetCardInfo("Unfriendly Fire", 172, Rarity.COMMON, mage.cards.u.UnfriendlyFire.class));
         cards.add(new SetCardInfo("Vanquisher's Banner", 251, Rarity.RARE, mage.cards.v.VanquishersBanner.class));
         cards.add(new SetCardInfo("Verdant Sun's Avatar", 213, Rarity.RARE, mage.cards.v.VerdantSunsAvatar.class));
         cards.add(new SetCardInfo("Vraska's Contempt", 129, Rarity.RARE, mage.cards.v.VraskasContempt.class));
         cards.add(new SetCardInfo("Waker of the Wilds", 215, Rarity.RARE, mage.cards.w.WakerOfTheWilds.class));
-        cards.add(new SetCardInfo("Walk the Plank", 130, Rarity.UNCOMMON, mage.cards.w.WalkThePlank.class));      
+        cards.add(new SetCardInfo("Walk the Plank", 130, Rarity.UNCOMMON, mage.cards.w.WalkThePlank.class));
     }
 }

Utils/mtg-cards-data.txt

@@ -32372,7 +32372,7 @@ Carnage Tyrant|Ixalan|179|M|{4}{G}{G}|Creature - Dinosaur|7|6|Carnage Tyrant can
 Deathgorge Scavenger|Ixalan|???|R|???|Creature - Dinosaur|3|2|Whenever Deathgorge Scavenger enters the battlefield or attacks, you may exile target card from a graveyard. If a creature card is exiled this way, you may gain 2 life. If a noncreature card is exiled this way, Deathgorge Scavenger gets +1/+1 until end of turn.|
 Deeproot Champion|Ixalan|185|R|{1}{G}|Creature - Merfolk Shaman|1|1|Whenever you cast a noncreature spell, put a +1/+1 counter on Deeproot Champion.|
 Emperor's Vanguard|Ixalan|189|R|{3}{G}|Creature - Human Scout|4|3|Whenever Emperor's Vanguard deals combat damage to a player, it explores.|
-Kumena's Omenspeaker|Ixalan|196|U|{G}|Creature - Merfolk|1|1|Kumena's Omenspeaker gets +1/+1 as long as you control another Merfolk or Island.|
+Kumena's Speaker|Ixalan|196|U|{G}|Creature - Merfolk|1|1|Kumena's Speaker gets +1/+1 as long as you control another Merfolk or an Island.|
 Old-Growth Dryads|Ixalan|199|R|{G}|Creature - Dryad|3|3|When Old-Growth Dryads enters the battlefield, each opponent may search his or her library for a basic land card, put it onto the battlefield tapped, then shuffle his or her library.|
 Ripjaw Raptor|Ixalan|203|R|{2}{G}{G}|Creature - Dinosaur|4|5|<i>Enrage</i> &mdash; Whenever Ripjaw Raptor is dealt damage, draw a card.|
 Shapers' Sanctuary|Ixalan|206|R|{G}|Enchantment|||Whenever a creature you control becomes the target of a spell or ability an opponent controls, you may draw a card.|
@@ -32380,16 +32380,16 @@ Tishana's Wayfinder|Ixalan|211|C|{2}{G}|Creature - Merfolk Scout|2|2|When Tishan
 Verdant Sun's Avatar|Ixalan|213|R|{5}{G}{G}|Creature - Dinosaur Avatar|5|5|When Verdant Sun's Avatar or another creature enters the battlefield under your control, you gain life equal to that creature's toughness.|
 Waker of the Wilds|Ixalan|215|R|{2}{G}{G}|Creature - Merfolk Shaman|3|3|{X}{G}{G}: Put X +1/+1 counters on target land you control. That land becomes a 0/0 Elemental creature with haste. It's still a land.|
 Admiral Beckett Brass|Ixalan|217|M|{1}{U}{B}{R}|Legendary Creature - Human Pirate|3|3|Other Pirates you control get +1/+1.$At the beginning of your end step, gain control of target nonland permanent controlled by a player who was dealt damage by three or more Pirates this turn.|
-Militant Dinosaur|Ixalan|218|U|{5}{G}{W}|Creature - Dinosaur|4|6|Each creature you control assigns combats damage equal to its toughness rather than its power.|
+Belligerent Brontodon|Ixalan|218|U|{5}{G}{W}|Creature - Dinosaur|4|6|Each creature you control assigns combats damage equal to its toughness rather than its power.|
-Invite the Party|Ixalan|219|U|{2}{W}{B}|Sorcery|||Create three 1/1 white Vampire creature tokens with lifelink.|
+Call to the Feast|Ixalan|219|U|{2}{W}{B}|Sorcery|||Create three 1/1 white Vampire creature tokens with lifelink.|
 Deadeye Plunderers|Ixalan|220|U|{3}{U}{B}|Creature - Human Pirate|3|3|Deadeye Plunderers gets +1/+1 for each artifact you control.${2}{U}{B}: Create a colorless artifact token named Treasure with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."|
 Dire Fleet Captain|Ixalan|221|U|{B}{R}|Creature - Orc Pirate|2|2|Whenever Dire Fleet Captain attacks, it gets +1/+1 until end of turn for each other attacking Pirate.|
 Gishath, Sun's Avatar|Ixalan|222|M|{5}{R}{G}{W}|Legendary Creature - Dinosaur Avatar|7|6|Trample, vigilance, haste$Whenever Gishath, Sun's Avatar deals combat damage to a player, reveal that many cards from the top of your library. Put any number of Dinosaur creature cards from among them onto the battlefield and the rest on the bottom of your library in a random order.|
 Hostage Taker|Ixalan|223|R|{2}{U}{B}|Creature - Human Pirate|2|3|When Hostage Taker enters the battlefield, exile another target artifact or creature until Hostage Taker leaves the battlefield. You may cast that card as long as it remains exiled, and you may spend mana as though it were mana of any type to cast that spell.|
 Marauding Looter|Ixalan|225|U|{2}{U}{R}|Creature - Human Pirate|4|3|Raid - At the beginning of your end step, if you attacked with a creature this turn, you may draw a card. If you do, discard a card.|
-Infuriated Gladiodon|Ixalan|226|U|{3}{R}{G}|Creature - Dinosaur|5|5|Trample$When Infuriated Gladiodon enters the battlefield, it deals 1 damage to each other creature.|
+Raging Swordtooth|Ixalan|226|U|{3}{R}{G}|Creature - Dinosaur|5|5|Trample$When Raging Swordtooth enters the battlefield, it deals 1 damage to each other creature.|
 Tishana, Voice of Thunder|Ixalan|230|M|{5}{G}{U}|Legendary Creature - Merfolk Shaman|*|*|Tishana, Voice of Thunder's power and toughness are each equal to the number of cards in your hand.$You have no maximum hand size.$When Tishana enters the battlefield, draw a card for each creature you control.|
-Twilight Legion Battleship|Ixalan|236|U|{5}|Artifact - Vehicle|4|6|Vigilance$Crew 2|
+Dusk Legion Dreadnought|Ixalan|236|U|{5}|Artifact - Vehicle|4|6|Vigilance$Crew 2|
 Pillar of Genesis|Ixalan|241|U|{2}|Artifact|||As Pillar of Genesis enters the battlefield, choose a creature type.${T}: Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell if the chosen type.|
 Sleek Schooner|Ixalan|247|U|{3}|Artifact - Vehicle|4|3|Crew 1|
 Sorcerous Spyglass|Ixalan|248|R|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.|