From 813e1816ea2bc2343d67dd78af11ef5e5e1665c1 Mon Sep 17 00:00:00 2001
From: "Alex W. Jackson" <alex.w.jackson@gmail.com>
Date: Mon, 7 Mar 2022 14:26:12 -0500
Subject: [PATCH] [RIX] Remove a duplicate token

---
 .../src/mage/cards/t/TilonallisSummoner.java  |  4 +--
 .../permanent/token/RedElementalToken.java    |  6 +++-
 .../TilonallisSummonerElementalToken.java     | 31 -------------------
 3 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 Mage/src/main/java/mage/game/permanent/token/TilonallisSummonerElementalToken.java

diff --git a/Mage.Sets/src/mage/cards/t/TilonallisSummoner.java b/Mage.Sets/src/mage/cards/t/TilonallisSummoner.java
index acb8437025c..2818ad31a84 100644
--- a/Mage.Sets/src/mage/cards/t/TilonallisSummoner.java
+++ b/Mage.Sets/src/mage/cards/t/TilonallisSummoner.java
@@ -20,7 +20,7 @@ import mage.cards.CardSetInfo;
 import mage.cards.CardsImpl;
 import mage.constants.*;
 import mage.game.Game;
-import mage.game.permanent.token.TilonallisSummonerElementalToken;
+import mage.game.permanent.token.RedElementalToken;
 import mage.players.Player;
 import mage.target.targetpointer.FixedTargets;
 
@@ -82,7 +82,7 @@ class TilonallisSummonerEffect extends OneShotEffect {
                 cost.add(new GenericManaCost(costX));
                 if (cost.pay(source, game, source, source.getControllerId(), false, null)) {
                     controller.resetStoredBookmark(game); // otherwise you can undo the payment
-                    CreateTokenEffect effect = new CreateTokenEffect(new TilonallisSummonerElementalToken(), costX, true, true);
+                    CreateTokenEffect effect = new CreateTokenEffect(new RedElementalToken(), costX, true, true);
                     effect.apply(game, source);
                     Effect exileEffect = new ExileTargetEffect(null, "", Zone.BATTLEFIELD)
                             .setText("exile those tokens unless you have the city's blessing");
diff --git a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java
index 9b8fc4ce8ca..f208a1b1f4d 100644
--- a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java
@@ -20,7 +20,7 @@ public final class RedElementalToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("C13", "EMA", "M14", "SHM", "MH1", "M20");
+        availableImageSetCodes = Arrays.asList("C13", "EMA", "M14", "SHM", "MH1", "M20", "RIX");
     }
 
     @Override
@@ -35,6 +35,10 @@ public final class RedElementalToken extends TokenImpl {
             setTokenType(RandomUtil.nextInt(2) + 1);
         }
 
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("RIX")) {
+            setTokenType(2);
+        }
+
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("SHM")) {
             setTokenType(2);
         }
diff --git a/Mage/src/main/java/mage/game/permanent/token/TilonallisSummonerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TilonallisSummonerElementalToken.java
deleted file mode 100644
index 57ec5377890..00000000000
--- a/Mage/src/main/java/mage/game/permanent/token/TilonallisSummonerElementalToken.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package mage.game.permanent.token;
-
-import mage.MageInt;
-import mage.constants.CardType;
-import mage.constants.SubType;
-
-/**
- * @author LevelX2
- */
-public final class TilonallisSummonerElementalToken extends TokenImpl {
-
-    public TilonallisSummonerElementalToken() {
-        super("Elemental", "1/1 red Elemental creature tokens");
-        cardType.add(CardType.CREATURE);
-        subtype.add(SubType.ELEMENTAL);
-        color.setRed(true);
-        power = new MageInt(1);
-        toughness = new MageInt(1);
-
-        setTokenType(2);
-    }
-
-    public TilonallisSummonerElementalToken(final TilonallisSummonerElementalToken token) {
-        super(token);
-    }
-
-    @Override
-    public TilonallisSummonerElementalToken copy() {
-        return new TilonallisSummonerElementalToken(this);
-    }
-}