From 83ef6e004b76bc76c4a8c37f86ff84b403f0bfb4 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 22 Sep 2018 20:46:30 +0200 Subject: [PATCH] [GRN] Some fixes to multicolored cards. --- Mage.Sets/src/mage/cards/c/ChanceForGlory.java | 2 +- Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java | 2 +- Mage.Sets/src/mage/cards/g/GlowsporeShaman.java | 8 +++++--- Mage.Sets/src/mage/cards/i/IntegrityIntervention.java | 2 +- Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java | 2 +- Mage.Sets/src/mage/cards/n/NotionRain.java | 4 ++-- Mage.Sets/src/mage/cards/r/ResponseResurgence.java | 6 +++--- Mage.Sets/src/mage/cards/r/RhizomeLurcher.java | 6 ++---- Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java | 5 +++-- Mage.Sets/src/mage/cards/u/UndercityUprising.java | 5 +++-- Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java | 8 ++++---- Mage.Sets/src/mage/cards/v/VraskasStoneglare.java | 4 ++-- 12 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/ChanceForGlory.java b/Mage.Sets/src/mage/cards/c/ChanceForGlory.java index c630431bd6f..ab8c37fb8aa 100644 --- a/Mage.Sets/src/mage/cards/c/ChanceForGlory.java +++ b/Mage.Sets/src/mage/cards/c/ChanceForGlory.java @@ -21,7 +21,7 @@ public final class ChanceForGlory extends CardImpl { // Creatures you control gain indestructible. Take an extra turn after this one. At the beginning of that turn's end step, you lose the game. this.getSpellAbility().addEffect(new GainAbilityControlledEffect( IndestructibleAbility.getInstance(), Duration.EndOfGame - ).setText("Creatures you control gain indestructible.")); + ).setText("Creatures you control gain indestructible")); this.getSpellAbility().addEffect(new AddExtraTurnControllerEffect(true)); } diff --git a/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java b/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java index 762421895e5..6e57cee6652 100644 --- a/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java +++ b/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java @@ -54,7 +54,7 @@ public final class DiscoveryDispersal extends SplitCard { // Dispersal // Each opponent returns a nonland permanent they control with the highest converted mana cost among permanents they control to its owner’s hand, then discards a card. - this.getLeftHalfCard().getSpellAbility().addEffect(new DispersalEffect()); + this.getRightHalfCard().getSpellAbility().addEffect(new DispersalEffect()); } public DiscoveryDispersal(final DiscoveryDispersal card) { diff --git a/Mage.Sets/src/mage/cards/g/GlowsporeShaman.java b/Mage.Sets/src/mage/cards/g/GlowsporeShaman.java index 68b831134c2..3af42f354db 100644 --- a/Mage.Sets/src/mage/cards/g/GlowsporeShaman.java +++ b/Mage.Sets/src/mage/cards/g/GlowsporeShaman.java @@ -8,11 +8,11 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.common.FilterLandCard; import mage.game.Game; import mage.players.Player; @@ -35,9 +35,11 @@ public final class GlowsporeShaman extends CardImpl { this.toughness = new MageInt(1); // When Glowspore Shaman enters the battlefield, put the top three cards of your library into your graveyard. You may put a land card from your graveyard on top of your library. - this.addAbility(new EntersBattlefieldTriggeredAbility( + Ability ability = new EntersBattlefieldTriggeredAbility( new PutTopCardOfLibraryIntoGraveControllerEffect(3), false - )); + ); + ability.addEffect(new GlowsporeShamanEffect()); + this.addAbility(ability); } public GlowsporeShaman(final GlowsporeShaman card) { diff --git a/Mage.Sets/src/mage/cards/i/IntegrityIntervention.java b/Mage.Sets/src/mage/cards/i/IntegrityIntervention.java index 0948c19d2fd..f258e069e84 100644 --- a/Mage.Sets/src/mage/cards/i/IntegrityIntervention.java +++ b/Mage.Sets/src/mage/cards/i/IntegrityIntervention.java @@ -33,7 +33,7 @@ public final class IntegrityIntervention extends SplitCard { // Intervention // Intervention deals 3 damage to any target and you gain 3 life. this.getRightHalfCard().getSpellAbility().addEffect( - new DamageTargetEffect(3) + new DamageTargetEffect(3).setText("Intervention deals 3 damage to any target") ); this.getRightHalfCard().getSpellAbility().addEffect( new GainLifeEffect(3).setText("and you gain 3 life") diff --git a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java index b9a5f94619c..809d0b4c26d 100644 --- a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java +++ b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java @@ -57,7 +57,7 @@ class MnemonicBetrayalExileEffect extends OneShotEffect { + "and you may spend mana as though it were mana of any type " + "to cast those spells. At the beginning of the next end step, " + "if any of those cards remain exiled, " - + "return them to their owner's graveyards."; + + "return them to their owner's graveyards"; } public MnemonicBetrayalExileEffect(final MnemonicBetrayalExileEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NotionRain.java b/Mage.Sets/src/mage/cards/n/NotionRain.java index 171706396c1..c478038d132 100644 --- a/Mage.Sets/src/mage/cards/n/NotionRain.java +++ b/Mage.Sets/src/mage/cards/n/NotionRain.java @@ -19,11 +19,11 @@ public final class NotionRain extends CardImpl { // Surveil 2, then draw two cards. Rain of Notions deals 2 damage to you. this.getSpellAbility().addEffect( - new SurveilEffect(2).setText("Surveil 2,") + new SurveilEffect(2).setText("Surveil 2") ); this.getSpellAbility().addEffect( new DrawCardSourceControllerEffect(2) - .setText("then draw two cards.") + .setText(", then draw two cards") ); this.getSpellAbility().addEffect(new DamageControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/cards/r/ResponseResurgence.java b/Mage.Sets/src/mage/cards/r/ResponseResurgence.java index 68f7c253e61..50ba39c10f4 100644 --- a/Mage.Sets/src/mage/cards/r/ResponseResurgence.java +++ b/Mage.Sets/src/mage/cards/r/ResponseResurgence.java @@ -34,21 +34,21 @@ public final class ResponseResurgence extends SplitCard { // Resurgence // Creatures you control gain first strike and vigilance until end of turn. After this main phase, there is an additional combat phase followed by an additional main phase. - this.getLeftHalfCard().getSpellAbility().addEffect( + this.getRightHalfCard().getSpellAbility().addEffect( new GainAbilityControlledEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURE ).setText("Creatures you control gain first strike") ); - this.getLeftHalfCard().getSpellAbility().addEffect( + this.getRightHalfCard().getSpellAbility().addEffect( new GainAbilityControlledEffect( VigilanceAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURE ).setText("and vigilance until end of turn") ); - this.getLeftHalfCard().getSpellAbility().addEffect( + this.getRightHalfCard().getSpellAbility().addEffect( new AddCombatAndMainPhaseEffect() ); } diff --git a/Mage.Sets/src/mage/cards/r/RhizomeLurcher.java b/Mage.Sets/src/mage/cards/r/RhizomeLurcher.java index bfa45116495..63c0c7913ca 100644 --- a/Mage.Sets/src/mage/cards/r/RhizomeLurcher.java +++ b/Mage.Sets/src/mage/cards/r/RhizomeLurcher.java @@ -9,7 +9,6 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -35,10 +34,9 @@ public final class RhizomeLurcher extends CardImpl { new CardsInControllerGraveyardCount( StaticFilters.FILTER_CARD_CREATURE ), true - ), "with a number of +1/+1 counters on it equal to " - + "the number of creature cards in your graveyard" + ), null, "Undergrowth — {this} enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in your graveyard.", + null ); - ability.setAbilityWord(AbilityWord.UNDERGROWTH); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java b/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java index d5522821caa..258cf034675 100644 --- a/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java +++ b/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java @@ -5,10 +5,11 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -39,7 +40,7 @@ public final class SumalaWoodshaper extends CardImpl { // When Sumala Woodshaper enters the battlefield, look at the top four cards of your library. You may reveal a creature or enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect( - new StaticValue(4), false, new StaticValue(1), filter, false + new StaticValue(4), false, new StaticValue(1), filter, Zone.LIBRARY, false, true, false, Zone.HAND, false, false, false ), false)); } diff --git a/Mage.Sets/src/mage/cards/u/UndercityUprising.java b/Mage.Sets/src/mage/cards/u/UndercityUprising.java index 86eb2368340..da820f372b8 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityUprising.java +++ b/Mage.Sets/src/mage/cards/u/UndercityUprising.java @@ -31,12 +31,13 @@ public final class UndercityUprising extends CardImpl { public UndercityUprising(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}{G}"); - // Creatures you control gain deathtouch until end of turn. Target creature you control fights target creature you don't control. + // Creatures you control gain deathtouch until end of turn. Then target creature you control fights target creature you don't control. this.getSpellAbility().addEffect(new GainAbilityControlledEffect( DeathtouchAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES )); - this.getSpellAbility().addEffect(new FightTargetsEffect()); + this.getSpellAbility().addEffect(new FightTargetsEffect() + .setText("Then target creature you control fights target creature you don't control")); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } diff --git a/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java b/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java index 9f3646cdb0a..371c9c9d6ba 100644 --- a/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java +++ b/Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java @@ -10,12 +10,12 @@ import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.GetEmblemEffect; -import mage.constants.SubType; -import mage.constants.SuperType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.SubType; +import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterNonlandPermanent; @@ -53,11 +53,11 @@ public final class VraskaGolgariQueen extends CardImpl { new GainLifeEffect(1), new SacrificeTargetCost(new TargetControlledPermanent(filter1)) ); - effect.addEffect(new DrawCardSourceControllerEffect(1)); + effect.addEffect(new DrawCardSourceControllerEffect(1).setText("and draw a card")); this.addAbility(new LoyaltyAbility(effect, 2)); // -3: Destroy target nonland permanent with converted mana cost 3 or less. - Ability ability = new LoyaltyAbility(new DestroyTargetEffect()); + Ability ability = new LoyaltyAbility(new DestroyTargetEffect(), -3); ability.addTarget(new TargetPermanent(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VraskasStoneglare.java b/Mage.Sets/src/mage/cards/v/VraskasStoneglare.java index 71345f6e32e..853236eb458 100644 --- a/Mage.Sets/src/mage/cards/v/VraskasStoneglare.java +++ b/Mage.Sets/src/mage/cards/v/VraskasStoneglare.java @@ -34,7 +34,7 @@ public final class VraskasStoneglare extends CardImpl { this.getSpellAbility().addEffect(new VraskasStoneglareEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect( - new SearchLibraryGraveyardPutInHandEffect(filter, false, false) + new SearchLibraryGraveyardPutInHandEffect(filter, false, true) ); } @@ -53,7 +53,7 @@ class VraskasStoneglareEffect extends OneShotEffect { public VraskasStoneglareEffect() { super(Outcome.Benefit); this.staticText = "Destroy target creature. " - + "You gain life equal to its toughness."; + + "You gain life equal to its toughness"; } public VraskasStoneglareEffect(final VraskasStoneglareEffect effect) {