github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 11:08:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GRN] Some fixes to multicolored cards.

Browse source
This commit is contained in:
LevelX2 2018-09-22 20:46:30 +02:00
parent 2952eb3e1a
commit 83ef6e004b
12 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/c/ChanceForGlory.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java
View file

@ -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) {

8
Mage.Sets/src/mage/cards/g/GlowsporeShaman.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/i/IntegrityIntervention.java
View file

@ -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")

2
Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java
View file

@ -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) {

4
Mage.Sets/src/mage/cards/n/NotionRain.java
View file

@ -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));
}

6
Mage.Sets/src/mage/cards/r/ResponseResurgence.java
View file

@ -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()
);
}

6
Mage.Sets/src/mage/cards/r/RhizomeLurcher.java
View file

@ -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, "<i>Undergrowth</i> — {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);
}

5
Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java
View file

@ -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));
}

5
Mage.Sets/src/mage/cards/u/UndercityUprising.java
View file

@ -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));
}

8
Mage.Sets/src/mage/cards/v/VraskaGolgariQueen.java
View file

@ -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);

4
Mage.Sets/src/mage/cards/v/VraskasStoneglare.java
View file

@ -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) {