From 058b9e970c94e65f7f05ddbcfbd1c1561c0a1df5 Mon Sep 17 00:00:00 2001 From: Styxo Date: Tue, 11 Apr 2017 11:57:29 +0200 Subject: [PATCH] [AKH] Name fix --- .../{f/FallingEarth.java => h/HeavenEarth.java} | 12 ++++++------ Mage.Sets/src/mage/sets/Amonkhet.java | 2 +- Utils/mtg-cards-data.txt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) rename Mage.Sets/src/mage/cards/{f/FallingEarth.java => h/HeavenEarth.java} (84%) diff --git a/Mage.Sets/src/mage/cards/f/FallingEarth.java b/Mage.Sets/src/mage/cards/h/HeavenEarth.java similarity index 84% rename from Mage.Sets/src/mage/cards/f/FallingEarth.java rename to Mage.Sets/src/mage/cards/h/HeavenEarth.java index 30bf8af1c7c..2dc83692710 100644 --- a/Mage.Sets/src/mage/cards/f/FallingEarth.java +++ b/Mage.Sets/src/mage/cards/h/HeavenEarth.java @@ -1,4 +1,4 @@ -package mage.cards.f; +package mage.cards.h; import java.util.UUID; import mage.abilities.dynamicvalue.common.ManacostVariableValue; @@ -17,7 +17,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; * * @author Styxo */ -public class FallingEarth extends SplitCard { +public class HeavenEarth extends SplitCard { private static final FilterCreaturePermanent filterFlying = new FilterCreaturePermanent("creature with flying"); private static final FilterCreaturePermanent filterWithouFlying = new FilterCreaturePermanent("creature without flying"); @@ -27,7 +27,7 @@ public class FallingEarth extends SplitCard { filterWithouFlying.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); } - public FallingEarth(UUID ownerId, CardSetInfo setInfo) { + public HeavenEarth(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, new CardType[]{CardType.SORCERY}, "{X}{G}", "{X}{R}{R}", false); // Falling @@ -41,12 +41,12 @@ public class FallingEarth extends SplitCard { getRightHalfCard().getSpellAbility().addEffect(new DamageAllEffect(new ManacostVariableValue(), filterWithouFlying)); } - public FallingEarth(final FallingEarth card) { + public HeavenEarth(final HeavenEarth card) { super(card); } @Override - public FallingEarth copy() { - return new FallingEarth(this); + public HeavenEarth copy() { + return new HeavenEarth(this); } } diff --git a/Mage.Sets/src/mage/sets/Amonkhet.java b/Mage.Sets/src/mage/sets/Amonkhet.java index 3d3feeee8ef..69865f73162 100644 --- a/Mage.Sets/src/mage/sets/Amonkhet.java +++ b/Mage.Sets/src/mage/sets/Amonkhet.java @@ -103,7 +103,6 @@ public class Amonkhet extends ExpansionSet { cards.add(new SetCardInfo("Dusk // Dawn", 210, Rarity.RARE, mage.cards.d.DuskDawn.class)); cards.add(new SetCardInfo("Essence Scatter", 52, Rarity.COMMON, mage.cards.e.EssenceScatter.class)); cards.add(new SetCardInfo("Exemplar of Strength", 165, Rarity.UNCOMMON, mage.cards.e.ExemplarOfStrength.class)); - cards.add(new SetCardInfo("Falling // Earth", 224, Rarity.RARE, mage.cards.f.FallingEarth.class)); cards.add(new SetCardInfo("Fetid Pools", 243, Rarity.RARE, mage.cards.f.FetidPools.class)); cards.add(new SetCardInfo("Flameblade Adept", 131, Rarity.UNCOMMON, mage.cards.f.FlamebladeAdept.class)); cards.add(new SetCardInfo("Fling", 132, Rarity.COMMON, mage.cards.f.Fling.class)); @@ -124,6 +123,7 @@ public class Amonkhet extends ExpansionSet { cards.add(new SetCardInfo("Hazoret the Fervent", 136, Rarity.MYTHIC, mage.cards.h.HazoretTheFervent.class)); cards.add(new SetCardInfo("Hazoret's Favor", 137, Rarity.RARE, mage.cards.h.HazoretsFavor.class)); cards.add(new SetCardInfo("Hazoret's Monument", 229, Rarity.UNCOMMON, mage.cards.h.HazoretsMonument.class)); + cards.add(new SetCardInfo("Heaven // Earth", 224, Rarity.RARE, mage.cards.h.HeavenEarth.class)); cards.add(new SetCardInfo("Honored Hydra", 172, Rarity.RARE, mage.cards.h.HonoredHydra.class)); cards.add(new SetCardInfo("Hyena Pack", 139, Rarity.COMMON, mage.cards.h.HyenaPack.class)); cards.add(new SetCardInfo("Impeccable Timing", 18, Rarity.COMMON, mage.cards.i.ImpeccableTiming.class)); diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index 9a994de3080..da654320ca8 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -30897,7 +30897,7 @@ Limits of Solidarity|Amonkhet|140|U|{3}{R}|Sorcery|||Gain control of target crea Magma Spray|Amonkhet|141|C|{R}|Instant|||Magma Spray deals 2 damage to target creature. If that creature would die this turn, exile it instead.| Hyena Pack|Amonkhet|139|C|{2}{R}{R}|Creature - Hyena|3|4|| Nimble-Blade Khenra|Amonkhet|145|C|{1}{R}|Creature - Jackal Warrior|1|3|Prowess| -Soul-Scar Mage|Amonkhet|149|R|{R}|Creature - Human Wizard|1|2|Prowess$If a source you control would deal noncombat damage to a creature an opponent controls, put that many -1/-1 counters on that creature instead.| +Soul-Scar Mage|Amonkhet|148|R|{R}|Creature - Human Wizard|1|2|Prowess$If a source you control would deal noncombat damage to a creature an opponent controls, put that many -1/-1 counters on that creature instead.| Trial of Zeal|Amonkhet|152|U|{2}{R}|Enchantment|||When Trial of Zeal enters the battlefield, it deals 3 damage to target creature or player.$When a Cartouche enters the battlefield under your control, return Trial of Zeal to its owner's hand.| Cartouche of Strength|Amonkhet|158|C|{2}{G}|Enchantment - Aura Cartouche|||Enchant creature you control$When Cartouche of Strength enters the battlefield, you may have enchanted creature fight target creature an opponent controls.$Enchanted creature gets +1/+1 and has trample.| Champion of Rhonas|Amonkhet|159|R|{3}{G}|Creature - Jackal Warrior|3|3|You may exert Champion of Rhonas as it attacks. When you do, you may put a creature card from your hand onto the battlefield.| @@ -30943,7 +30943,7 @@ Rags|Amonkhet|222a|R|{2}{B}{B}|Sorcery|||All creatures get -2/-2 until end of tu Riches|Amonkhet|222b|R|{5}{U}{U}|Sorcery|Aftermath$Each opponent chooses a creature he or she controls. You gain control of those creatures.| Cut|Amonkhet|223a|R|{1}{R}|Sorcery|||Cut deals 4 damage to target creature.| Ribbons|Amonkhet|223b|R|{X}{B}{B}|Sorcery|||Aftermath$Each opponent loses X life.| -Falling|Amonkhet|224a|R|{X}{G}|Instant|||Falling deals X damage to each creature with flying.| +Heaven|Amonkhet|224a|R|{X}{G}|Instant|||Heaven deals X damage to each creature with flying.| Earth|Amonkhet|224b|R|{X}{R}{R}|Sorcery|||Earth deals X damage to each creature without flying.| Bontu's Monument|Amonkhet|225|U|{3}|Legendary Artifact|||Black creature spells you cast cost {1} less to cast.$Whenever you cast a creature spell, each opponent loses 1 life and you gain 1 life.| Hazoret's Monument|Amonkhet|229|U|{3}|Legendary Artifact|||Red creature spells you cast cost {1} less to cast.$Whenever you cast a creature spell, you may discard a card. If you do, draw a card.|