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

merge cleanup, text fixes

Browse source
This commit is contained in:
xenohedron 2024-01-13 15:53:56 -05:00
parent 212a7bc159
commit dba8725b26
3 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/d/DontMove.java
View file

@ -35,7 +35,6 @@ public final class DontMove extends CardImpl {
public DontMove(UUID ownerId, CardSetInfo setInfo) { public DontMove(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}{W}");
// Destroy all tapped creatures. // Destroy all tapped creatures.
this.getSpellAbility().addEffect(new DestroyAllEffect(filter, false)); this.getSpellAbility().addEffect(new DestroyAllEffect(filter, false));
@ -57,7 +56,7 @@ public final class DontMove extends CardImpl {
class DontMoveEffect extends OneShotEffect { class DontMoveEffect extends OneShotEffect {
public DontMoveEffect() { DontMoveEffect() {
super(Outcome.PlayForFree); super(Outcome.PlayForFree);
this.staticText = "Until your next turn, whenever a creature becomes tapped, destroy it."; this.staticText = "Until your next turn, whenever a creature becomes tapped, destroy it.";
} }

2
Mage.Sets/src/mage/cards/j/JurassicPark.java
View file

@ -26,7 +26,7 @@ import mage.players.Player;
*/ */
public final class JurassicPark extends CardImpl { public final class JurassicPark extends CardImpl {
private static final FilterPermanent filter = new FilterControlledPermanent("Dinosaurs you control"); private static final FilterPermanent filter = new FilterControlledPermanent("Dinosaur you control");
static { static {
filter.add(SubType.DINOSAUR.getPredicate()); filter.add(SubType.DINOSAUR.getPredicate());

33
Mage.Sets/src/mage/cards/w/WelcomeTo.java
View file

@ -1,25 +1,21 @@
package mage.cards.w; package mage.cards.w;
import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.DelayedTriggeredAbility;
import mage.abilities.common.SagaAbility; import mage.abilities.common.SagaAbility;
import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.*; import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.DestroyAllEffect;
import mage.abilities.effects.common.ExileSagaAndReturnTransformedEffect;
import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HasteAbility;
import mage.abilities.keyword.TransformAbility; import mage.abilities.keyword.TransformAbility;
import mage.cards.Card;
import mage.constants.*;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.StaticFilters;
import mage.filter.common.FilterNoncreaturePermanent; import mage.filter.common.FilterNoncreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate;
@ -27,13 +23,12 @@ import mage.game.Game;
import mage.game.permanent.token.DinosaurToken; import mage.game.permanent.token.DinosaurToken;
import mage.game.permanent.token.custom.CreatureToken; import mage.game.permanent.token.custom.CreatureToken;
import mage.players.Player; import mage.players.Player;
import mage.target.TargetCard;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCardInYourGraveyard;
import mage.target.targetadjustment.TargetAdjuster; import mage.target.targetadjustment.TargetAdjuster;
import mage.target.targetpointer.EachTargetPointer; import mage.target.targetpointer.EachTargetPointer;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
import mage.target.targetpointer.FixedTargets;
import java.util.UUID;
/** /**
* *
@ -41,7 +36,7 @@ import mage.target.targetpointer.FixedTargets;
*/ */
public final class WelcomeTo extends CardImpl { public final class WelcomeTo extends CardImpl {
private static FilterPermanent filter = new FilterPermanent("walls"); private static final FilterPermanent filter = new FilterPermanent("Walls");
static { static {
filter.add(SubType.WALL.getPredicate()); filter.add(SubType.WALL.getPredicate());
@ -60,11 +55,13 @@ public final class WelcomeTo extends CardImpl {
// I -- For each opponent, up to one target noncreature artifact they control becomes a 0/4 Wall artifact creature with defender for as long as you control this Saga. // I -- For each opponent, up to one target noncreature artifact they control becomes a 0/4 Wall artifact creature with defender for as long as you control this Saga.
sagaAbility.addChapterEffect(this, SagaChapter.CHAPTER_I, ability -> { sagaAbility.addChapterEffect(this, SagaChapter.CHAPTER_I, ability -> {
ability.addEffect( ability.addEffect(
new BecomesCreatureTargetEffect(new CreatureToken(0, 4).withSubType(SubType.WALL), new BecomesCreatureTargetEffect(
false, false, Duration.WhileControlled) new CreatureToken(0, 4)
.setText("For each opponent, up to one target noncreature artifact they control becomes " + .withSubType(SubType.WALL)
"a 0/4 Wall artifact creature with defender for as long as you control this Saga.")); .withAbility(DefenderAbility.getInstance()),
ability.addEffect(new GainAbilityTargetEffect(DefenderAbility.getInstance(), Duration.WhileControlled, "")); false, false, Duration.WhileControlled
).setText("For each opponent, up to one target noncreature artifact they control becomes " +
"a 0/4 Wall artifact creature with defender for as long as you control this Saga."));
ability.getEffects().setTargetPointer(new EachTargetPointer()); ability.getEffects().setTargetPointer(new EachTargetPointer());
ability.setTargetAdjuster(WelcomeToAdjuster.instance); ability.setTargetAdjuster(WelcomeToAdjuster.instance);
}); });
@ -116,7 +113,7 @@ enum WelcomeToAdjuster implements TargetAdjuster {
// Based on Mordor on the March // Based on Mordor on the March
class WelcomeToEffect extends OneShotEffect { class WelcomeToEffect extends OneShotEffect {
public WelcomeToEffect() { WelcomeToEffect() {
super(Outcome.PutCreatureInPlay); super(Outcome.PutCreatureInPlay);
this.staticText = "Create a 3/3 green Dinosaur creature token with trample. It gains haste until end of turn."; this.staticText = "Create a 3/3 green Dinosaur creature token with trample. It gains haste until end of turn.";
} }