diff --git a/Mage.Sets/src/mage/sets/conspiracytakethecrown/CharmbreakerDevils.java b/Mage.Sets/src/mage/sets/conspiracytakethecrown/CharmbreakerDevils.java index 02ef4619074..e570145e833 100644 --- a/Mage.Sets/src/mage/sets/conspiracytakethecrown/CharmbreakerDevils.java +++ b/Mage.Sets/src/mage/sets/conspiracytakethecrown/CharmbreakerDevils.java @@ -37,7 +37,7 @@ public class CharmbreakerDevils extends mage.sets.innistrad.CharmbreakerDevils { public CharmbreakerDevils(UUID ownerId) { super(ownerId); - this.cardNumber = "155"; + this.cardNumber = "153"; this.expansionSetCode = "CN2"; } diff --git a/Mage.Sets/src/mage/sets/conspiracytakethecrown/HavengulVampire.java b/Mage.Sets/src/mage/sets/conspiracytakethecrown/HavengulVampire.java index def3cc342c1..196c2c998a2 100644 --- a/Mage.Sets/src/mage/sets/conspiracytakethecrown/HavengulVampire.java +++ b/Mage.Sets/src/mage/sets/conspiracytakethecrown/HavengulVampire.java @@ -37,7 +37,7 @@ public class HavengulVampire extends mage.sets.avacynrestored.HavengulVampire { public HavengulVampire(UUID ownerId) { super(ownerId); - this.cardNumber = "154"; + this.cardNumber = "164"; this.expansionSetCode = "CN2"; } diff --git a/Mage.Sets/src/mage/sets/conspiracytakethecrown/InquisitionOfKozilek.java b/Mage.Sets/src/mage/sets/conspiracytakethecrown/InquisitionOfKozilek.java index a7c08527d6a..4fcb84ae0bc 100644 --- a/Mage.Sets/src/mage/sets/conspiracytakethecrown/InquisitionOfKozilek.java +++ b/Mage.Sets/src/mage/sets/conspiracytakethecrown/InquisitionOfKozilek.java @@ -38,7 +38,7 @@ public class InquisitionOfKozilek extends mage.sets.riseoftheeldrazi.Inquisition public InquisitionOfKozilek(UUID ownerId) { super(ownerId); - this.cardNumber = "146"; + this.cardNumber = "140"; this.expansionSetCode = "CN2"; this.rarity = Rarity.RARE; } diff --git a/Mage.Sets/src/mage/sets/conspiracytakethecrown/ShipwreckSinger.java b/Mage.Sets/src/mage/sets/conspiracytakethecrown/ShipwreckSinger.java index 5a79f76cdfd..e6464213041 100644 --- a/Mage.Sets/src/mage/sets/conspiracytakethecrown/ShipwreckSinger.java +++ b/Mage.Sets/src/mage/sets/conspiracytakethecrown/ShipwreckSinger.java @@ -37,7 +37,7 @@ public class ShipwreckSinger extends mage.sets.theros.ShipwreckSinger { public ShipwreckSinger(UUID ownerId) { super(ownerId); - this.cardNumber = "205"; + this.cardNumber = "206"; this.expansionSetCode = "CN2"; } diff --git a/Mage.Sets/src/mage/sets/conspiracytakethecrown/WildGriffin.java b/Mage.Sets/src/mage/sets/conspiracytakethecrown/WildGriffin.java index 7a8d430820d..3a64dce68bc 100644 --- a/Mage.Sets/src/mage/sets/conspiracytakethecrown/WildGriffin.java +++ b/Mage.Sets/src/mage/sets/conspiracytakethecrown/WildGriffin.java @@ -37,7 +37,7 @@ public class WildGriffin extends mage.sets.tenthedition.WildGriffin { public WildGriffin(UUID ownerId) { super(ownerId); - this.cardNumber = "100"; + this.cardNumber = "99"; this.expansionSetCode = "CN2"; } diff --git a/Mage.Sets/src/mage/sets/fourthedition/Tunnel.java b/Mage.Sets/src/mage/sets/fourthedition/Tunnel.java index 4c8070dc038..36242c1e426 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/Tunnel.java +++ b/Mage.Sets/src/mage/sets/fourthedition/Tunnel.java @@ -37,7 +37,7 @@ public class Tunnel extends mage.sets.revisededition.Tunnel { public Tunnel(UUID ownerId) { super(ownerId); - this.cardNumber = "142"; + this.cardNumber = "245"; this.expansionSetCode = "4ED"; } diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/ArchdemonOfGreed.java b/Mage.Sets/src/mage/sets/prereleaseevents/ArchdemonOfGreed.java index 1ef98c7aa66..d25f981fc1f 100644 --- a/Mage.Sets/src/mage/sets/prereleaseevents/ArchdemonOfGreed.java +++ b/Mage.Sets/src/mage/sets/prereleaseevents/ArchdemonOfGreed.java @@ -38,7 +38,7 @@ public class ArchdemonOfGreed extends mage.sets.darkascension.ArchdemonOfGreed { public ArchdemonOfGreed(UUID ownerId) { super(ownerId); - this.cardNumber = "52"; + this.cardNumber = "52b"; this.expansionSetCode = "PTC"; this.rarity = Rarity.SPECIAL; } diff --git a/Mage.Sets/src/mage/sets/prereleaseevents/RavenousDemon.java b/Mage.Sets/src/mage/sets/prereleaseevents/RavenousDemon.java index 8506c0d52df..2fffc46e237 100644 --- a/Mage.Sets/src/mage/sets/prereleaseevents/RavenousDemon.java +++ b/Mage.Sets/src/mage/sets/prereleaseevents/RavenousDemon.java @@ -38,7 +38,7 @@ public class RavenousDemon extends mage.sets.darkascension.RavenousDemon { public RavenousDemon(UUID ownerId) { super(ownerId); - this.cardNumber = "52"; + this.cardNumber = "52a"; this.expansionSetCode = "PTC"; this.rarity = Rarity.SPECIAL; } diff --git a/Mage.Sets/src/mage/sets/revisededition/Lance.java b/Mage.Sets/src/mage/sets/revisededition/Lance.java index a02f08fd0e3..a3aea307775 100644 --- a/Mage.Sets/src/mage/sets/revisededition/Lance.java +++ b/Mage.Sets/src/mage/sets/revisededition/Lance.java @@ -37,7 +37,7 @@ public class Lance extends mage.sets.limitedalpha.Lance { public Lance(UUID ownerId) { super(ownerId); - this.cardNumber = "187"; + this.cardNumber = "211"; this.expansionSetCode = "3ED"; } diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Lance.java b/Mage.Sets/src/mage/sets/unlimitededition/Lance.java index 11b7a6d3b70..ca67682a7c3 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/Lance.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/Lance.java @@ -37,7 +37,7 @@ public class Lance extends mage.sets.limitedalpha.Lance { public Lance(UUID ownerId) { super(ownerId); - this.cardNumber = "187"; + this.cardNumber = "212"; this.expansionSetCode = "2ED"; } diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index 5eb212521cc..c1d6b529eb4 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -3477,8 +3477,8 @@ Stromkirk Patrol|Conspiracy: Take the Crown|149|C|{4}{B}|Creature - Vampire Sold Unnerve|Conspiracy: Take the Crown|150|C|{3}{B}|Sorcery|||Each opponent discards two cards.| Burn Away|Conspiracy: Take the Crown|151|U|{4}{R}|Instant|||Burn Away deals 6 damage to target creature. When that creature dies this turn, exile all cards from its controller's graveyard.| Burning Wish|Conspiracy: Take the Crown|152|R|{1}{R}|Sorcery|||You may choose a sorcery card you own from outside the game, reveal that card, and put it into your hand. Exile Burning Wish.| +Charmbreaker Devils|Conspiracy: Take the Crown|153|R|{5}{R}|Creature - Devil|4|4|At the beginning of your upkeep, return an instant or sorcery card at random from your graveyard to your hand.$Whenever you cast an instant or sorcery spell, Charmbreaker Devils gets +4/+0 until end of turn.| Coordinated Assault|Conspiracy: Take the Crown|154|U|{R}|Instant|||Up to two target creatures each get +1/+0 and gain first strike until end of turn.| -Charmbreaker Devils|Conspiracy: Take the Crown|155|R|{5}{R}|Creature - Devil|4|4|At the beginning of your upkeep, return an instant or sorcery card at random from your graveyard to your hand.$Whenever you cast an instant or sorcery spell, Charmbreaker Devils gets +4/+0 until end of turn.| Ember Beast|Conspiracy: Take the Crown|155|C|{2}{R}|Creature - Beast|3|4|Ember Beast can't attack or block alone.| Fiery Fall|Conspiracy: Take the Crown|156|C|{5}{R}|Instant|||Fiery Fall deals 5 damage to target creature.$Basic landcycling {1}{R}| Flame Slash|Conspiracy: Take the Crown|157|C|{R}|Sorcery|||Flame Slash deals 4 damage to target creature.| @@ -7569,7 +7569,7 @@ Deathgrip|Fourth Edition|14|U|{B}{B}|Enchantment|||{B}{B}: Counter target green Ley Druid|Fourth Edition|140|U|{2}{G}|Creature - Human Druid|1|1|{tap}: Untap target land.| Lifeforce|Fourth Edition|141|U|{G}{G}|Enchantment|||{G}{G}: Counter target black spell.| Lifelace|Fourth Edition|142|R|{G}|Instant|||Target spell or permanent becomes green. (Mana symbols on that permanent remain unchanged.)| -Tunnel|Fourth Edition|142|U|{R}|Instant|||Destroy target Wall. It can't be regenerated.| +Tunnel|Fourth Edition|245|U|{R}|Instant|||Destroy target Wall. It can't be regenerated.| Living Artifact|Fourth Edition|143|R|{G}|Enchantment - Aura|||Enchant artifact$Whenever you're dealt damage, put that many vitality counters on Living Artifact.$At the beginning of your upkeep, you may remove a vitality counter from Living Artifact. If you do, you gain 1 life.| Living Lands|Fourth Edition|144|R|{3}{G}|Enchantment|||All Forests are 1/1 creatures that are still lands.| Llanowar Elves|Fourth Edition|145|C|{G}|Creature - Elf Druid|1|1|{tap}: Add {G} to your mana pool.| @@ -21028,7 +21028,7 @@ Wheel of Fortune|Revised Edition|184|R|{2}{R}|Sorcery|||Each player discards his Animate Wall|Revised Edition|185|R|{W}|Enchantment - Aura|||Enchant Wall$Enchanted Wall can attack as though it didn't have defender.| Armageddon|Revised Edition|186|R|{3}{W}|Sorcery|||Destroy all lands.| Balance|Revised Edition|187|R|{1}{W}|Sorcery|||Each player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way.| -Lance|Revised Edition|187|U|{W}|Enchantment - Aura|||Enchant creature$Enchanted creature has first strike.| +Lance|Revised Edition|211|U|{W}|Enchantment - Aura|||Enchant creature$Enchanted creature has first strike.| Benalish Hero|Revised Edition|188|C|{W}|Creature - Human Soldier|1|1|Banding (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)| Black Ward|Revised Edition|189|U|{W}|Enchantment - Aura|||Enchant creature$Enchanted creature has protection from black. This effect doesn't remove Black Ward.| Fear|Revised Edition|19|C|{B}{B}|Enchantment - Aura|||Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)$Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.)| @@ -25345,7 +25345,7 @@ Wheel of Fortune|Unlimited Edition|184|R|{2}{R}|Sorcery|||Each player discards h Animate Wall|Unlimited Edition|185|R|{W}|Enchantment - Aura|||Enchant Wall$Enchanted Wall can attack as though it didn't have defender.| Armageddon|Unlimited Edition|186|R|{3}{W}|Sorcery|||Destroy all lands.| Balance|Unlimited Edition|187|R|{1}{W}|Sorcery|||Each player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way.| -Lance|Unlimited Edition|187|U|{W}|Enchantment - Aura|||Enchant creature$Enchanted creature has first strike.| +Lance|Unlimited Edition|212|U|{W}|Enchantment - Aura|||Enchant creature$Enchanted creature has first strike.| Benalish Hero|Unlimited Edition|188|C|{W}|Creature - Human Soldier|1|1|Banding (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)| Black Ward|Unlimited Edition|189|U|{W}|Enchantment - Aura|||Enchant creature$Enchanted creature has protection from black. This effect doesn't remove Black Ward.| Gloom|Unlimited Edition|19|U|{2}{B}|Enchantment|||White spells cost {3} more to cast.$Activated abilities of white enchantments cost {3} more to activate.|