diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
index 0616ed3e244..24e62094dfe 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
@@ -50,46 +50,17 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect {
         final Card source = sa.getHostCard();
         final Game game = source.getGame();
 
-        boolean addAllCreatureTypes = false;
-        boolean removeSuperTypes = false;
-        boolean removeCardTypes = false;
-        boolean removeSubTypes = false;
-        boolean removeLandTypes = false;
-        boolean removeCreatureTypes = false;
-        boolean removeArtifactTypes = false;
-        boolean removeEnchantmentTypes = false;
-
+        boolean addAllCreatureTypes = sa.hasParam("AddAllCreatureTypes");
+        boolean removeSuperTypes = sa.hasParam("RemoveSuperTypes");
+        boolean removeCardTypes = sa.hasParam("RemoveCardTypes");
+        boolean removeSubTypes = sa.hasParam("RemoveSubTypes");
+        boolean removeLandTypes = sa.hasParam("RemoveLandTypes");
+        boolean removeCreatureTypes = sa.hasParam("RemoveCreatureTypes");
+        boolean removeArtifactTypes = sa.hasParam("RemoveArtifactTypes");
+        boolean removeEnchantmentTypes = sa.hasParam("RemoveEnchantmentTypes");
+        boolean removeNonManaAbilities = sa.hasParam("RemoveNonManaAbilities");
         boolean removeAll = sa.hasParam("RemoveAllAbilities");
 
-        if (sa.hasParam("AddAllCreatureTypes")) {
-            addAllCreatureTypes = true;
-        }
-
-        if (sa.hasParam("RemoveSuperTypes")) {
-            removeSuperTypes = true;
-        }
-
-        if (sa.hasParam("RemoveCardTypes")) {
-            removeCardTypes = true;
-        }
-
-        if (sa.hasParam("RemoveSubTypes")) {
-            removeSubTypes = true;
-        }
-
-        if (sa.hasParam("RemoveLandTypes")) {
-            removeLandTypes = true;
-        }
-        if (sa.hasParam("RemoveCreatureTypes")) {
-            removeCreatureTypes = true;
-        }
-        if (sa.hasParam("RemoveArtifactTypes")) {
-            removeArtifactTypes = true;
-        }
-        if (sa.hasParam("RemoveEnchantmentTypes")) {
-            removeEnchantmentTypes = true;
-        }
-
         if (sa.hasParam("RememberAnimated")) {
             source.addRemembered(c);
         }
@@ -195,7 +166,7 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect {
                 || !addedAbilities.isEmpty() || !removedAbilities.isEmpty() || !addedTriggers.isEmpty()
                 || !addedReplacements.isEmpty() || !addedStaticAbilities.isEmpty()) {
             c.addChangedCardTraits(addedAbilities, removedAbilities, addedTriggers, addedReplacements,
-                    addedStaticAbilities, removeAll, false, timestamp, 0);
+                    addedStaticAbilities, removeAll, removeNonManaAbilities, timestamp, 0);
         }
 
         if (!"Permanent".equals(sa.getParam("Duration"))) {
diff --git a/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt
new file mode 100644
index 00000000000..a7cc3786464
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt
@@ -0,0 +1,10 @@
+Name:Town-razer Tyrant
+ManaCost:2 R R
+Types:Creature Dragon
+PT:4/4
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, target land you don't control loses all abilities except mana abilities and gains "At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it."
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Land.YouDontCtrl | TgtPrompt$ Select target land you don't control | RemoveNonManaAbilities$ True | Triggers$ UpkeepShock | Duration$ Permanent
+SVar:UpkeepShock:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it.
+SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2 | UnlessCost$ Sac<1/CARDNAME> | UnlessPayer$ TriggeredPlayer
+Oracle:Flying\nWhen Town-razer Tyrant enters the battlefield, target land you don't control loses all abilities except mana abilities and gains "At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it."