(Don't merge yet) Rename totem armor to umbra armor (#12270)

* rename totem armor to umbra armor

* merge fix

* merge fix

Mage.Sets/src/mage/cards/b/BearUmbra.java

@@ -8,7 +8,7 @@ import mage.abilities.effects.common.UntapAllLandsControllerEffect;
 import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.AttachmentType;
@@ -42,8 +42,8 @@ public final class BearUmbra extends CardImpl {
         ), AttachmentType.AURA).setText("and has \"Whenever this creature attacks, untap all lands you control.\""));
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private BearUmbra(final BearUmbra card) {

Mage.Sets/src/mage/cards/b/BoarUmbra.java

@@ -7,7 +7,7 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -35,8 +35,8 @@ public final class BoarUmbra extends CardImpl {
         // Enchanted creature gets +3/+3.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)));
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private BoarUmbra(final BoarUmbra card) {

Mage.Sets/src/mage/cards/c/CrabUmbra.java

@@ -9,7 +9,7 @@ import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.UntapAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -39,8 +39,8 @@ public final class CrabUmbra extends CardImpl {
         // {2}{U}: Untap enchanted creature.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new ManaCostsImpl<>("{2}{U}")));
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private CrabUmbra(final CrabUmbra card) {

Mage.Sets/src/mage/cards/d/DogUmbra.java

@@ -10,7 +10,7 @@ import mage.abilities.effects.common.combat.CantAttackBlockAttachedEffect;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.FlashAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.AttachmentType;
@@ -52,7 +52,7 @@ public final class DogUmbra extends CardImpl {
                 "As long as another player controls enchanted creature, it can't attack or block."
         ));
         ability.addEffect(new ConditionalContinuousEffect(
-                new GainAbilitySourceEffect(new TotemArmorAbility()),
+                new GainAbilitySourceEffect(new UmbraArmorAbility()),
                 DogUmbraCondition.FALSE,
                 "Otherwise, {this} has umbra armor"
         ));

Mage.Sets/src/mage/cards/d/DrakeUmbra.java

@@ -7,7 +7,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.FlyingAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -41,8 +41,8 @@ public final class DrakeUmbra extends CardImpl {
         ).setText("and has flying"));
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private DrakeUmbra(final DrakeUmbra card) {

Mage.Sets/src/mage/cards/e/EelUmbra.java

@@ -9,7 +9,7 @@ import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.FlashAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -42,8 +42,8 @@ public final class EelUmbra extends CardImpl {
         // Enchanted creature gets +1/+1.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)));
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private EelUmbra(final EelUmbra card) {

Mage.Sets/src/mage/cards/e/ElandUmbra.java

@@ -8,7 +8,7 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -38,8 +38,8 @@ public final class ElandUmbra extends CardImpl {
         // Enchanted creature gets +0/+4.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 4, Duration.WhileOnBattlefield)));
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private ElandUmbra(final ElandUmbra card) {

Mage.Sets/src/mage/cards/e/EstridTheMasked.java

@@ -47,7 +47,7 @@ public final class EstridTheMasked extends CardImpl {
                 filter, "untap each enchanted permanent you control"
         ), 2));
 
-        // -1: Create a white Aura enchantment token named Mask attached to another target permanent. The token has enchant permanent and totem armor.
+        // -1: Create a white Aura enchantment token named Mask attached to another target permanent. The token has enchant permanent and umbra armor.
         Ability ability = new LoyaltyAbility(
                 new EstridTheMaskedTokenEffect(), -1
         );
@@ -79,7 +79,7 @@ class EstridTheMaskedTokenEffect extends OneShotEffect {
         super(Outcome.Benefit);
         this.staticText = "create a white Aura enchantment token named Mask "
                 + "attached to another target permanent. "
-                + "The token has enchant permanent and totem armor";
+                + "The token has enchant permanent and umbra armor";
     }
 
     private EstridTheMaskedTokenEffect(final EstridTheMaskedTokenEffect effect) {

Mage.Sets/src/mage/cards/f/FelidarUmbra.java

@@ -10,7 +10,7 @@ import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.LifelinkAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.AttachmentType;
@@ -48,8 +48,8 @@ public final class FelidarUmbra extends CardImpl {
         ability.addTarget(new TargetControlledCreaturePermanent());
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private FelidarUmbra(final FelidarUmbra card) {

Mage.Sets/src/mage/cards/h/HyenaUmbra.java

@@ -7,7 +7,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.FirstStrikeAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -40,8 +40,8 @@ public final class HyenaUmbra extends CardImpl {
         ).setText("and has first strike"));
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private HyenaUmbra(final HyenaUmbra card) {

Mage.Sets/src/mage/cards/i/IndrikUmbra.java

@@ -9,7 +9,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.FirstStrikeAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.AttachmentType;
@@ -47,8 +47,8 @@ public final class IndrikUmbra extends CardImpl {
                 .setText(", and all creatures able to block it do so"));
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private IndrikUmbra(final IndrikUmbra card) {

Mage.Sets/src/mage/cards/l/LionUmbra.java

@@ -7,7 +7,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.ReachAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -54,8 +54,8 @@ public final class LionUmbra extends CardImpl {
         ).setText("and reach"));
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private LionUmbra(final LionUmbra card) {

Mage.Sets/src/mage/cards/m/MammothUmbra.java

@@ -6,7 +6,7 @@ import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -40,8 +40,8 @@ public final class MammothUmbra extends CardImpl {
         ).setText("and has vigilance"));
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private MammothUmbra(final MammothUmbra card) {

Mage.Sets/src/mage/cards/o/OctopusUmbra.java

@@ -13,7 +13,7 @@ import mage.abilities.effects.common.continuous.SetBasePowerToughnessEnchantedEf
 import mage.constants.Outcome;
 import mage.target.TargetPermanent;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.AttachmentType;
@@ -60,8 +60,8 @@ public final class OctopusUmbra extends CardImpl {
                 + "you may tap target creature with power 8 or less.\""));
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
 
     }
 

Mage.Sets/src/mage/cards/s/SnakeUmbra.java

@@ -11,7 +11,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -45,8 +45,8 @@ public final class SnakeUmbra extends CardImpl {
         ability.addEffect(effect);
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private SnakeUmbra(final SnakeUmbra card) {

Mage.Sets/src/mage/cards/s/SpiderUmbra.java

@@ -7,7 +7,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.ReachAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -39,7 +39,7 @@ public final class SpiderUmbra extends CardImpl {
                 ReachAbility.getInstance(), AttachmentType.AURA
         ).setText("and has reach"));
         this.addAbility(ability);
-        this.addAbility(new TotemArmorAbility());
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private SpiderUmbra(final SpiderUmbra card) {

Mage.Sets/src/mage/cards/t/TreefolkUmbra.java

@@ -6,7 +6,7 @@ import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
@@ -41,8 +41,8 @@ public final class TreefolkUmbra extends CardImpl {
         ability.addEffect(new TreefolkUmbraEffect());
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private TreefolkUmbra(final TreefolkUmbra card) {

Mage.Sets/src/mage/cards/u/UmbraMystic.java

@@ -5,7 +5,7 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -36,8 +36,8 @@ public final class UmbraMystic extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // Auras attached to permanents you control have totem armor.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new TotemArmorAbility(), Duration.WhileOnBattlefield, filter, false)));
+        // Auras attached to permanents you control have umbra armor.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new UmbraArmorAbility(), Duration.WhileOnBattlefield, filter, false)));
     }
 
     private UmbraMystic(final UmbraMystic card) {

Mage/src/main/java/mage/abilities/keyword/UmbraArmorAbility.java

@@ -11,9 +11,9 @@ import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 
 /*
- * 702.87. Totem Armor
+ * 702.87. Umbra Armor
  *
- * 702.87a Totem armor is a static ability that appears on some Auras. "Totem armor" means "
+ * 702.87a Umbra armor is a static ability that appears on some Auras. "Umbra armor" means "
  * If enchanted permanent would be destroyed, instead remove all damage marked on it and
  * destroy this Aura."
  *
@@ -21,34 +21,34 @@ import mage.game.permanent.Permanent;
  *
  */
 
-public class TotemArmorAbility extends SimpleStaticAbility {
+public class UmbraArmorAbility extends SimpleStaticAbility {
 
-    public TotemArmorAbility() {
-        super(Zone.BATTLEFIELD, new TotemArmorEffect());
+    public UmbraArmorAbility() {
+        super(Zone.BATTLEFIELD, new UmbraArmorEffect());
     }
 
-    private TotemArmorAbility(final TotemArmorAbility ability) {
+    private UmbraArmorAbility(final UmbraArmorAbility ability) {
         super(ability);
     }
 
     @Override
-    public TotemArmorAbility copy() {
-        return new TotemArmorAbility(this);
+    public UmbraArmorAbility copy() {
+        return new UmbraArmorAbility(this);
     }
 
     @Override
     public String getRule() {
-        return "totem armor <i>(If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)</i>";
+        return "umbra armor <i>(If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)</i>";
     }
 }
 
-class TotemArmorEffect extends ReplacementEffectImpl {
+class UmbraArmorEffect extends ReplacementEffectImpl {
 
-    TotemArmorEffect() {
+    UmbraArmorEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit);
     }
 
-    private TotemArmorEffect(final TotemArmorEffect effect) {
+    private UmbraArmorEffect(final UmbraArmorEffect effect) {
         super(effect);
     }
 
@@ -76,7 +76,7 @@ class TotemArmorEffect extends ReplacementEffectImpl {
     }
 
     @Override
-    public TotemArmorEffect copy() {
-        return new TotemArmorEffect(this);
+    public UmbraArmorEffect copy() {
+        return new UmbraArmorEffect(this);
     }
 }

Mage/src/main/java/mage/game/permanent/token/MaskToken.java

@@ -3,7 +3,7 @@ package mage.game.permanent.token;
 import mage.abilities.Ability;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.keyword.EnchantAbility;
-import mage.abilities.keyword.TotemArmorAbility;
+import mage.abilities.keyword.UmbraArmorAbility;
 import mage.constants.CardType;
 import mage.constants.Outcome;
 import mage.constants.SubType;
@@ -18,7 +18,7 @@ public final class MaskToken extends TokenImpl {
         super(
                 "Mask", "white Aura enchantment token named Mask "
                         + "attached to another target permanent. "
-                        + "The token has enchant permanent and totem armor."
+                        + "The token has enchant permanent and umbra armor."
         );
         cardType.add(CardType.ENCHANTMENT);
         color.setWhite(true);
@@ -30,8 +30,8 @@ public final class MaskToken extends TokenImpl {
         ability.addEffect(new AttachEffect(Outcome.BoostCreature));
         this.addAbility(ability);
 
-        // Totem armor
-        this.addAbility(new TotemArmorAbility());
+        // Umbra armor
+        this.addAbility(new UmbraArmorAbility());
     }
 
     private MaskToken(final MaskToken token) {

Utils/keywords.txt

@@ -123,7 +123,7 @@ Sunburst|new|
 Suspend|number, cost, card|
 Swampcycling|cost|
 Swampwalk|new|
-Totem armor|new|
+Umbra armor|new|
 Toxic|number|
 Training|new|
 Trample|instance|