diff --git a/Mage.Sets/src/mage/cards/s/SilverskinArmor.java b/Mage.Sets/src/mage/cards/s/SilverskinArmor.java index 65a2ddf1c44..e00f2036550 100644 --- a/Mage.Sets/src/mage/cards/s/SilverskinArmor.java +++ b/Mage.Sets/src/mage/cards/s/SilverskinArmor.java @@ -2,6 +2,8 @@ package mage.cards.s; import java.util.UUID; + +import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.AddCardTypeAttachedEffect; @@ -22,8 +24,9 @@ public final class SilverskinArmor extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1 and is an artifact in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardTypeAttachedEffect(CardType.ARTIFACT, Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(1, 1)); + ability.addEffect(new AddCardTypeAttachedEffect(CardType.ARTIFACT, AttachmentType.EQUIPMENT)); + this.addAbility(ability); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{2}"), false)); diff --git a/Mage.Sets/src/mage/cards/t/TransmogrifyingLicid.java b/Mage.Sets/src/mage/cards/t/TransmogrifyingLicid.java index 4e7047968d4..978821d1d13 100644 --- a/Mage.Sets/src/mage/cards/t/TransmogrifyingLicid.java +++ b/Mage.Sets/src/mage/cards/t/TransmogrifyingLicid.java @@ -7,7 +7,6 @@ import mage.abilities.Ability; import mage.abilities.common.LicidAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.AddCardTypeAttachedEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.cards.CardImpl; @@ -15,8 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.AttachmentType; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.Duration; -import mage.constants.Zone; /** * @@ -34,10 +31,8 @@ public final class TransmogrifyingLicid extends CardImpl { this.addAbility(new LicidAbility(new GenericManaCost(1), new GenericManaCost(1))); // Enchanted creature gets +1/+1 and is an artifact in addition to its other types. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1)); - Effect effect = new AddCardTypeAttachedEffect(CardType.ARTIFACT, Duration.WhileOnBattlefield, AttachmentType.AURA); - effect.setText("and is an artifact in addition to its other types"); - ability.addEffect(effect); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); + ability.addEffect(new AddCardTypeAttachedEffect(CardType.ARTIFACT, AttachmentType.AURA)); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java index ea0d3038aed..29dac13f833 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardTypeAttachedEffect.java @@ -6,6 +6,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import mage.util.CardUtil; /** * @author nantuko @@ -15,11 +16,13 @@ public class AddCardTypeAttachedEffect extends ContinuousEffectImpl { private final CardType addedCardType; private final AttachmentType attachmentType; - public AddCardTypeAttachedEffect(CardType addedCardType, Duration duration, AttachmentType attachmentType) { - super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); + public AddCardTypeAttachedEffect(CardType addedCardType, AttachmentType attachmentType) { + super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.addedCardType = addedCardType; this.attachmentType = attachmentType; - setText(); + staticText = "and is " + + CardUtil.addArticle(CardUtil.getTextWithFirstCharLowerCase(addedCardType.toString())) + + " in addition to its other types"; } public AddCardTypeAttachedEffect(final AddCardTypeAttachedEffect effect) { @@ -45,10 +48,4 @@ public class AddCardTypeAttachedEffect extends ContinuousEffectImpl { return new AddCardTypeAttachedEffect(this); } - private void setText() { - StringBuilder sb = new StringBuilder(); - sb.append(attachmentType.verb()); - sb.append(" creature becomes ").append(addedCardType.toString()).append(" in addition to its other types"); //TODO add attacked card type detection - staticText = sb.toString(); - } }