From 948a975298a8cf6a9ee76d4ebb2109a6264ec1dc Mon Sep 17 00:00:00 2001 From: Muz Ali Date: Sun, 25 Jan 2026 20:04:25 -0600 Subject: [PATCH] BallisticBoulder -> BallisticBoulderToken --- Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java | 4 ++-- Mage.Sets/src/mage/cards/m/MordorTrebuchet.java | 12 +++--------- ...listicBoulder.java => BallisticBoulderToken.java} | 10 +++++----- Mage/src/main/resources/tokens-database.txt | 4 ++-- 4 files changed, 12 insertions(+), 18 deletions(-) rename Mage/src/main/java/mage/game/permanent/token/{BallisticBoulder.java => BallisticBoulderToken.java} (69%) diff --git a/Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java b/Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java index 14384d8587e..7ca4170da1c 100644 --- a/Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java +++ b/Mage.Sets/src/mage/cards/f/FireNavyTrebuchet.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.game.Game; -import mage.game.permanent.token.BallisticBoulder; +import mage.game.permanent.token.BallisticBoulderToken; import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTargets; @@ -71,7 +71,7 @@ class FireNavyTrebuchetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Token token = new BallisticBoulder(); + Token token = new BallisticBoulderToken(); token.putOntoBattlefield(1, game, source, source.getControllerId(), true, true); game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility( new SacrificeTargetEffect() diff --git a/Mage.Sets/src/mage/cards/m/MordorTrebuchet.java b/Mage.Sets/src/mage/cards/m/MordorTrebuchet.java index e7fa9b56aac..9a12827b5b5 100644 --- a/Mage.Sets/src/mage/cards/m/MordorTrebuchet.java +++ b/Mage.Sets/src/mage/cards/m/MordorTrebuchet.java @@ -1,15 +1,11 @@ package mage.cards.m; -import java.util.Objects; -import java.util.Optional; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksWithCreaturesTriggeredAbility; -import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.SacrificeTargetEffect; import mage.constants.Outcome; import mage.constants.SubType; @@ -17,12 +13,10 @@ import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.game.Game; -import mage.game.permanent.token.BallisticBoulder; -import mage.game.permanent.token.PhyrexianHorrorRedToken; +import mage.game.permanent.token.BallisticBoulderToken; import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTargets; @@ -44,7 +38,7 @@ public final class MordorTrebuchet extends CardImpl { public MordorTrebuchet(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{B}"); - + this.subtype.add(SubType.WALL); this.power = new MageInt(1); this.toughness = new MageInt(4); @@ -91,7 +85,7 @@ class MordorTrebuchetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Token token = new BallisticBoulder(); + Token token = new BallisticBoulderToken(); token.putOntoBattlefield(1, game, source, source.getControllerId(), true, true); game.addDelayedTriggeredAbility(new AtTheEndOfCombatDelayedTriggeredAbility( new SacrificeTargetEffect().setText("sacrifice it") diff --git a/Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java b/Mage/src/main/java/mage/game/permanent/token/BallisticBoulderToken.java similarity index 69% rename from Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java rename to Mage/src/main/java/mage/game/permanent/token/BallisticBoulderToken.java index d402f6b4ab8..1b2aa13bed4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BallisticBoulder.java +++ b/Mage/src/main/java/mage/game/permanent/token/BallisticBoulderToken.java @@ -10,9 +10,9 @@ import mage.constants.SubType; /** * @author Susucr */ -public final class BallisticBoulder extends TokenImpl { +public final class BallisticBoulderToken extends TokenImpl { - public BallisticBoulder() { + public BallisticBoulderToken() { super("Ballistic Boulder", "2/1 colorless Construct artifact creature token with flying named Ballistic Boulder"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); @@ -23,11 +23,11 @@ public final class BallisticBoulder extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); } - protected BallisticBoulder(final BallisticBoulder token) { + protected BallisticBoulderToken(final BallisticBoulderToken token) { super(token); } - public BallisticBoulder copy() { - return new BallisticBoulder(this); + public BallisticBoulderToken copy() { + return new BallisticBoulderToken(this); } } diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt index bcd0454c508..4381a1f2283 100644 --- a/Mage/src/main/resources/tokens-database.txt +++ b/Mage/src/main/resources/tokens-database.txt @@ -2131,7 +2131,7 @@ |TOK:MUL|Phyrexian Myr||BrudicladTelchorMyrToken| # LTR -|TOK:LTR|Ballistic Boulder||BallisticBoulder| +|TOK:LTR|Ballistic Boulder||BallisticBoulderToken| |TOK:LTR|Food|1|FoodToken| |TOK:LTR|Food|2|FoodToken| |TOK:LTR|Food|3|FoodToken| @@ -2901,7 +2901,7 @@ |TOK:TLA|Ally|3|AllyToken| |TOK:TLA|Ally|4|AllyToken| |TOK:TLA|Ally|5|AllyToken| -|TOK:TLA|Ballistic Boulder||BallisticBoulder| +|TOK:TLA|Ballistic Boulder||BallisticBoulderToken| |TOK:TLA|Bear||BearsCompanionBearToken| |TOK:TLA|Clue|1|ClueArtifactToken| |TOK:TLA|Clue|2|ClueArtifactToken|