External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some fixes to red cards.

Browse source
This commit is contained in:
LevelX2 2017-09-16 15:14:21 +02:00
parent 21c3e2cf02
commit d66a9d1693
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/l/LightningRigCrew.java
View file

@ -35,10 +35,10 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.effects.common.DamagePlayersEffect;
import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.effects.common.UntapSourceEffect;
import mage.constants.SubType;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterSpell; import mage.filter.FilterSpell;
@ -50,7 +50,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
*/ */
public class LightningRigCrew extends CardImpl { public class LightningRigCrew extends CardImpl {
private static final FilterSpell filter = new FilterSpell(); private static final FilterSpell filter = new FilterSpell("a Pirate spell");
static { static {
filter.add(new SubtypePredicate(SubType.PIRATE)); filter.add(new SubtypePredicate(SubType.PIRATE));

2
Mage.Sets/src/mage/cards/s/SunCrownedHunters.java
View file

@ -53,7 +53,7 @@ public class SunCrownedHunters extends CardImpl {
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
// <i>Enrage</i> &mdash; Whenever Sun-Crowned Hunters is dealt damage, it deals 3 damage to target opponent. // <i>Enrage</i> &mdash; Whenever Sun-Crowned Hunters is dealt damage, it deals 3 damage to target opponent.
Ability ability = new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), false, true); Ability ability = new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3, true, "it"), false, true);
ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetOpponent());
this.addAbility(ability); this.addAbility(ability);
} }

2
Mage.Sets/src/mage/cards/s/SunbirdsInvocation.java
View file

@ -111,7 +111,7 @@ class SunbirdsInvocationEffect extends OneShotEffect {
public SunbirdsInvocationEffect() { public SunbirdsInvocationEffect() {
super(Outcome.PutCardInPlay); super(Outcome.PutCardInPlay);
staticText = "Reveal the top X cards of your library, where X is that spell's converted mana cost. You may cast a card revealed this way with converted mana cost X or less without paying its mana cost. Put the rest on the bottom of your library in a random order"; staticText = "reveal the top X cards of your library, where X is that spell's converted mana cost. You may cast a card revealed this way with converted mana cost X or less without paying its mana cost. Put the rest on the bottom of your library in a random order";
} }
public SunbirdsInvocationEffect(final SunbirdsInvocationEffect effect) { public SunbirdsInvocationEffect(final SunbirdsInvocationEffect effect) {

14
Mage.Sets/src/mage/cards/s/Swashbuckling.java
View file

@ -28,15 +28,11 @@
package mage.cards.s; package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.constants.SubType;
import mage.target.common.TargetCreaturePermanent;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
import mage.constants.Outcome;
import mage.target.TargetPermanent;
import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.EnchantAbility;
import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HasteAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -44,7 +40,11 @@ import mage.cards.CardSetInfo;
import mage.constants.AttachmentType; import mage.constants.AttachmentType;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
/** /**
* *
@ -65,8 +65,10 @@ public class Swashbuckling extends CardImpl {
this.addAbility(ability); this.addAbility(ability);
// Enchanted creature gets +2/+2 and has haste. // Enchanted creature gets +2/+2 and has haste.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); ability.addEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA)
.setText("and has haste"));
this.addAbility(ability);
} }
public Swashbuckling(final Swashbuckling card) { public Swashbuckling(final Swashbuckling card) {

2
Mage/src/main/java/mage/abilities/common/SacrificePermanentTriggeredAbility.java
View file

@ -75,6 +75,6 @@ public class SacrificePermanentTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public String getRule() { public String getRule() {
return "Whenever you sacrifice" + filter.getMessage() + ", " + super.getRule(); return "Whenever you sacrifice " + filter.getMessage() + ", " + super.getRule();
} }
} }