From 56d55090ccf06bd796815837f89503c4c8a0068a Mon Sep 17 00:00:00 2001
From: xenohedron <12538125+xenohedron@users.noreply.github.com>
Date: Sun, 25 Jan 2026 20:24:22 -0500
Subject: [PATCH] a couple text fixes
---
Mage.Sets/src/mage/cards/i/IronApprentice.java | 3 ++-
.../src/mage/cards/z/ZimonesHypothesis.java | 16 +++++++---------
.../LeavesBattlefieldAllTriggeredAbility.java | 3 ++-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Mage.Sets/src/mage/cards/i/IronApprentice.java b/Mage.Sets/src/mage/cards/i/IronApprentice.java
index 208f5ab7e12..804d6e1ff6c 100644
--- a/Mage.Sets/src/mage/cards/i/IronApprentice.java
+++ b/Mage.Sets/src/mage/cards/i/IronApprentice.java
@@ -32,7 +32,8 @@ public final class IronApprentice extends CardImpl {
// When Iron Apprentice dies, if it had counters on it, put those counters on target creature you control.
Ability ability = new DiesSourceTriggeredAbility(new PutSavedPermanentCountersTargetEffect("permanentLeftBattlefield"))
- .withTriggerCondition(SourceHasCountersCondition.instance);
+ .withTriggerCondition(SourceHasCountersCondition.instance) // don't want to check intervening if on resolution
+ .setTriggerPhrase("When {this} dies, ");
ability.addTarget(new TargetControlledCreaturePermanent());
this.addAbility(ability);
}
diff --git a/Mage.Sets/src/mage/cards/z/ZimonesHypothesis.java b/Mage.Sets/src/mage/cards/z/ZimonesHypothesis.java
index 6e9187e8299..69c947c1a11 100644
--- a/Mage.Sets/src/mage/cards/z/ZimonesHypothesis.java
+++ b/Mage.Sets/src/mage/cards/z/ZimonesHypothesis.java
@@ -1,7 +1,6 @@
package mage.cards.z;
import mage.abilities.Ability;
-import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.ReturnToHandFromBattlefieldAllEffect;
import mage.cards.CardImpl;
@@ -10,7 +9,6 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
-import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.PowerParityPredicate;
import mage.game.Game;
@@ -33,7 +31,7 @@ public final class ZimonesHypothesis extends CardImpl {
// You may put a +1/+1 counter on a creature.
this.getSpellAbility().addEffect(new ZimonesHypothesisCounterEffect());
- //Then choose odd or even. Return each creature with power of the chosen quality to its owner’s hand.
+ // Then choose odd or even. Return each creature with power of the chosen quality to its owner’s hand.
this.getSpellAbility().addEffect(new ZimonesHypothesisBounceEffect());
}
@@ -65,13 +63,13 @@ class ZimonesHypothesisCounterEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
- final Player player = game.getPlayer(source.getControllerId());
+ Player player = game.getPlayer(source.getControllerId());
if (player == null) {
return false;
}
- final Target target = new TargetCreaturePermanent(0, 1).withNotTarget(true);
+ Target target = new TargetCreaturePermanent(0, 1).withNotTarget(true);
player.choose(this.outcome, target, source, game);
- final Permanent permanent = game.getPermanent(target.getFirstTarget());
+ Permanent permanent = game.getPermanent(target.getFirstTarget());
return permanent != null && permanent.addCounters(CounterType.P1P1.createInstance(), source, game);
}
}
@@ -88,7 +86,7 @@ class ZimonesHypothesisBounceEffect extends OneShotEffect {
ZimonesHypothesisBounceEffect() {
super(Outcome.ReturnToHand);
- this.staticText = "
Then choose odd or even. Return each creature with power of the chosen quality to its owner's hand. (Zero is even.)";
+ this.staticText = "Then choose odd or even. Return each creature with power of the chosen quality to its owner's hand. (Zero is even.)";
}
private ZimonesHypothesisBounceEffect(final ZimonesHypothesisBounceEffect effect) {
@@ -102,11 +100,11 @@ class ZimonesHypothesisBounceEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
- final Player player = game.getPlayer(source.getControllerId());
+ Player player = game.getPlayer(source.getControllerId());
if (player == null) {
return false;
}
- final FilterPermanent filter = player.chooseUse(this.outcome, "Odd or even?", null, "Odd", "Even", source, game) ? oddFilter : evenFilter;
+ FilterPermanent filter = player.chooseUse(this.outcome, "Odd or even?", null, "Odd", "Even", source, game) ? oddFilter : evenFilter;
return new ReturnToHandFromBattlefieldAllEffect(filter).apply(game, source);
}
}
diff --git a/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java
index f874db2a803..b764ec3b594 100644
--- a/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java
@@ -11,6 +11,7 @@ import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
+import mage.util.CardUtil;
/**
* @author Styxo
@@ -36,7 +37,7 @@ public class LeavesBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
super(zone, effect, optional);
this.filter = filter;
this.setTargetPointer = setTargetPointer;
- setTriggerPhrase("Whenever " + filter.getMessage() + " leaves the battlefield, ");
+ setTriggerPhrase("Whenever " + CardUtil.addArticle(filter.getMessage()) + " leaves the battlefield, ");
setLeavesTheBattlefieldTrigger(true);
}