From 7b69628da2eea1bc92bcee91677490cfe4147fec Mon Sep 17 00:00:00 2001
From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:42:12 +0000
Subject: [PATCH] Fix decayed zombie token, as described in #10139

---
 .../mage/abilities/keyword/DecayedAbility.java     |  2 +-
 .../game/permanent/token/ZombieDecayedToken.java   | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/keyword/DecayedAbility.java b/Mage/src/main/java/mage/abilities/keyword/DecayedAbility.java
index 8d7e03f1dec..b002f4a8931 100644
--- a/Mage/src/main/java/mage/abilities/keyword/DecayedAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/DecayedAbility.java
@@ -18,7 +18,7 @@ public class DecayedAbility extends StaticAbility {
         super(Zone.BATTLEFIELD, new CantBlockSourceEffect(Duration.WhileOnBattlefield));
         this.addSubAbility(new AttacksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(
                 new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect())
-        )));
+        ).setText("sacrifice it at end of combat")).setTriggerPhrase("When {this} attacks, "));
     }
 
     private DecayedAbility(final DecayedAbility ability) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java
index dead837da0c..70ceab02d52 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ZombieDecayedToken.java
@@ -4,9 +4,6 @@ import mage.MageInt;
 import mage.abilities.keyword.DecayedAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.util.RandomUtil;
-
-import java.util.Arrays;
 
 /**
  * @author TheElk801
@@ -22,7 +19,16 @@ public final class ZombieDecayedToken extends TokenImpl {
         toughness = new MageInt(2);
         this.addAbility(new DecayedAbility());
 
-        availableImageSetCodes.addAll(Arrays.asList("MID"));
+        this.setExpansionSetCodeForImage("MID");
+    }
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MID")) {
+            this.setTokenType(1);
+        }
     }
 
     public ZombieDecayedToken(final ZombieDecayedToken token) {