github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Some minor rule text fixes to WAR cards.

Browse source
This commit is contained in:
LevelX2 2019-04-14 19:18:46 +02:00
parent b3fb6f047a
commit 8c11ab8505
10 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/cards/b/Blindblast.java
View file

@ -1,5 +1,6 @@
package mage.cards.b;
import java.util.UUID;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.combat.CantBlockTargetEffect;
@ -9,8 +10,6 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -23,7 +22,7 @@ public final class Blindblast extends CardImpl {
this.getSpellAbility().addEffect(new DamageTargetEffect(1));
this.getSpellAbility().addEffect(new CantBlockTargetEffect(
Duration.EndOfTurn
).setText("That creature can't block this turn. "));
).setText("That creature can't block this turn"));
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
// Draw a card.

5
Mage.Sets/src/mage/cards/b/BurningProphet.java
View file

@ -1,5 +1,6 @@
package mage.cards.b;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
@ -12,8 +13,6 @@ import mage.constants.Duration;
import mage.constants.SubType;
import mage.filter.StaticFilters;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -32,7 +31,7 @@ public final class BurningProphet extends CardImpl {
new BoostSourceEffect(
1, 0, Duration.EndOfTurn
).setText("{this} gets +1/+0 until end of turn, then"),
StaticFilters.FILTER_SPELL_NON_CREATURE, false
StaticFilters.FILTER_SPELL_A_NON_CREATURE, false
);
ability.addEffect(new ScryEffect(1));
this.addAbility(ability);

7
Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java
View file

@ -1,4 +1,3 @@
package mage.cards.c;
import java.util.UUID;
@ -16,11 +15,11 @@ import mage.target.common.TargetAnyTargetAmount;
public final class ChandrasPyrohelix extends CardImpl {
public ChandrasPyrohelix(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}");
// Chandra's Pyrohelix deals 2 damage divided as you choose among one or two target creatures and/or players.
// Chandra's Pyrohelix deals 2 damage divided as you choose among one or two targets.
Effect effect = new DamageMultiEffect(2);
effect.setText("{this} deals 2 damage divided as you choose among one or two target creatures and/or players");
effect.setText("{this} deals 2 damage divided as you choose among one or two targets");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addTarget(new TargetAnyTargetAmount(2));
}

5
Mage.Sets/src/mage/cards/h/HonorTheGodPharaoh.java
View file

@ -1,5 +1,6 @@
package mage.cards.h;
import java.util.UUID;
import mage.abilities.costs.common.DiscardCardCost;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.keyword.AmassEffect;
@ -7,8 +8,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -21,7 +20,7 @@ public final class HonorTheGodPharaoh extends CardImpl {
this.getSpellAbility().addCost(new DiscardCardCost(false));
// Draw two cards. Amass 1.
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2).setText("draw two cards."));
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2).setText("draw two cards"));
this.getSpellAbility().addEffect(new AmassEffect(1));
}

11
Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java
View file

@ -1,5 +1,6 @@
package mage.cards.s;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility;
import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
@ -26,8 +27,6 @@ import mage.target.TargetPermanent;
import mage.target.targetpointer.FixedTarget;
import mage.util.functions.EmptyApplyToPermanent;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -56,7 +55,7 @@ public final class SaheeliSublimeArtificer extends CardImpl {
// Whenever you cast a noncreature spell, create a 1/1 colorless Servo artifact creature token.
this.addAbility(new SpellCastControllerTriggeredAbility(
new CreateTokenEffect(new ServoToken()), StaticFilters.FILTER_SPELL_NON_CREATURE, false
new CreateTokenEffect(new ServoToken()), StaticFilters.FILTER_SPELL_A_NON_CREATURE, false
));
// -2: Target artifact you control becomes a copy of another target artifact or creature you control until end of turn, except it's an artifact in addition to its other types.
@ -84,8 +83,8 @@ class SaheeliSublimeArtificerEffect extends OneShotEffect {
SaheeliSublimeArtificerEffect() {
super(Outcome.Benefit);
staticText = "Target artifact you control becomes a copy of another target artifact or creature you control" +
" until end of turn, except it's an artifact in addition to its other types.";
staticText = "Target artifact you control becomes a copy of another target artifact or creature you control"
+ " until end of turn, except it's an artifact in addition to its other types.";
}
private SaheeliSublimeArtificerEffect(final SaheeliSublimeArtificerEffect effect) {
@ -111,4 +110,4 @@ class SaheeliSublimeArtificerEffect extends OneShotEffect {
}
return true;
}
}
}

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

@ -1,5 +1,6 @@
package mage.cards.s;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility;
import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
@ -18,8 +19,6 @@ import mage.constants.SuperType;
import mage.filter.StaticFilters;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -44,7 +43,7 @@ public final class SamutTyrantSmasher extends CardImpl {
).setText("target creature gets +2/+1"), -1);
ability.addEffect(new GainAbilityTargetEffect(
HasteAbility.getInstance(), Duration.EndOfTurn
).setText("and gains haste until end of turn. "));
).setText("and gains haste until end of turn"));
ability.addEffect(new ScryEffect(1));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);

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

@ -1,5 +1,6 @@
package mage.cards.s;
import java.util.UUID;
import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
import mage.abilities.effects.keyword.ScryEffect;
@ -10,8 +11,6 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -26,7 +25,7 @@ public final class SamutsSprint extends CardImpl {
).setText("target creature gets +2/+1"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(
HasteAbility.getInstance(), Duration.EndOfTurn
).setText("and gains haste until end of turn."));
).setText("and gains haste until end of turn"));
this.getSpellAbility().addEffect(new ScryEffect(1));
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
}

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

@ -1,5 +1,6 @@
package mage.cards.s;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@ -10,8 +11,6 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.StaticFilters;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -27,7 +26,7 @@ public final class SpellgorgerWeird extends CardImpl {
// Whenever you cast a noncreature spell, put a +1/+1 counter on Spellgorger Weird.
this.addAbility(new SpellCastControllerTriggeredAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
StaticFilters.FILTER_SPELL_NON_CREATURE, false
StaticFilters.FILTER_SPELL_A_NON_CREATURE, false
));
}

5
Mage.Sets/src/mage/cards/t/TenthDistrictLegionnaire.java
View file

@ -1,5 +1,6 @@
package mage.cards.t;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@ -12,8 +13,6 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.counters.CounterType;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -34,7 +33,7 @@ public final class TenthDistrictLegionnaire extends CardImpl {
Ability ability = new HeroicAbility(new AddCountersSourceEffect(
CounterType.P1P1.createInstance()
), false, false);
ability.addEffect(new ScryEffect(1));
ability.addEffect(new ScryEffect(1).setText(", then scry 1"));
this.addAbility(ability);
}

6
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -460,6 +460,12 @@ public final class StaticFilters {
FILTER_SPELL_NON_CREATURE.setLockedFilter(true);
}
public static final FilterSpell FILTER_SPELL_A_NON_CREATURE = (FilterSpell) new FilterSpell("a noncreature spell").add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
static {
FILTER_SPELL_A_NON_CREATURE.setLockedFilter(true);
}
public static final FilterSpell FILTER_SPELL = new FilterSpell();
static {