minor merge cleanup

ZephyDray · Feb 24, 2024 · 41120a6 · 41120a6
1 parent 4e24ef2
commit 41120a6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/Mage.Sets/src/mage/cards/r/RedemptionArc.java b/Mage.Sets/src/mage/cards/r/RedemptionArc.java
@@ -39,7 +39,6 @@ public RedemptionArc(UUID ownerId, CardSetInfo setInfo) {
         // Enchanted creature has indestructible and is goaded.
         Effect effect = new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(),
                 AttachmentType.AURA, Duration.WhileOnBattlefield);
-        effect.setText("Enchanted creature has indestructible");
         effect.setOutcome(Outcome.Benefit);
 
         Effect effect2 = new GoadAttachedEffect();

diff --git a/Mage.Sets/src/mage/cards/t/TribuneOfRot.java b/Mage.Sets/src/mage/cards/t/TribuneOfRot.java
@@ -1,4 +1,3 @@
-
 package mage.cards.t;
 
 import mage.MageInt;
@@ -12,11 +11,10 @@
 import mage.constants.SubType;
 import mage.filter.StaticFilters;
 import mage.game.Game;
-import mage.game.permanent.token.Token;
 import mage.game.permanent.token.SaprolingToken;
+import mage.game.permanent.token.Token;
 import mage.players.Player;
 
-import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -52,7 +50,7 @@ class TribuneOfRotEffect extends OneShotEffect {
 
     TribuneOfRotEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "For each creature card milled this way, create a 1/1 green Saproling creature token.";
+        this.staticText = "mill two cards. For each creature card milled this way, create a 1/1 green Saproling creature token";
     }
 
     private TribuneOfRotEffect(final TribuneOfRotEffect effect) {

diff --git a/Mage.Sets/src/mage/cards/u/UnshakableTail.java b/Mage.Sets/src/mage/cards/u/UnshakableTail.java
@@ -62,7 +62,8 @@ public UnshakableTail copy() {
 class UnshakableTailSurveilTriggeredAbility extends TriggeredAbilityImpl {
 
     UnshakableTailSurveilTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new SurveilEffect(1));
+        super(Zone.BATTLEFIELD, new SurveilEffect(1, false));
+        setTriggerPhrase("When {this} enters the battlefield and at the beginning of your upkeep, ");
     }
 
     private UnshakableTailSurveilTriggeredAbility(final UnshakableTailSurveilTriggeredAbility ability) {
@@ -88,16 +89,13 @@ public boolean checkTrigger(GameEvent event, Game game) {
         return game.isActivePlayer(getControllerId());
     }
 
-    @Override
-    public String getRule() {
-        return "When {this} enters the battlefield and at the beginning of your upkeep, surveil 1.";
-    }
 }
 
 class UnshakableTailInvestigateTriggeredAbility extends TriggeredAbilityImpl {
 
-    public UnshakableTailInvestigateTriggeredAbility() {
+    UnshakableTailInvestigateTriggeredAbility() {
         super(Zone.BATTLEFIELD, new InvestigateEffect(), false);
+        setTriggerPhrase("Whenever one or more creature cards are put into your graveyard from your library, ");
     }
 
     private UnshakableTailInvestigateTriggeredAbility(final UnshakableTailInvestigateTriggeredAbility ability) {
@@ -136,8 +134,4 @@ public UnshakableTailInvestigateTriggeredAbility copy() {
         return new UnshakableTailInvestigateTriggeredAbility(this);
     }
 
-    @Override
-    public String getRule() {
-        return "Whenever one or more creature cards are put into your graveyard from your library, investigate.";
-    }
 }