diff --git a/Mage.Sets/src/mage/cards/m/MerchantOfTruth.java b/Mage.Sets/src/mage/cards/m/MerchantOfTruth.java new file mode 100644 index 00000000000..f99d8a5d0de --- /dev/null +++ b/Mage.Sets/src/mage/cards/m/MerchantOfTruth.java @@ -0,0 +1,57 @@ +package mage.cards.m; + +import mage.MageInt; +import mage.abilities.common.DiesCreatureTriggeredAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; +import mage.abilities.effects.keyword.InvestigateEffect; +import mage.abilities.keyword.ExaltedAbility; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SubType; +import mage.filter.FilterPermanent; +import mage.filter.StaticFilters; + +import java.util.UUID; + +/** + * @author PurpleCrowbar + */ +public final class MerchantOfTruth extends CardImpl { + + private static final FilterPermanent filter = new FilterPermanent(SubType.CLUE, "Clues"); + + public MerchantOfTruth(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); + this.subtype.add(SubType.ANGEL, SubType.DETECTIVE); + this.power = new MageInt(2); + this.toughness = new MageInt(5); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + // Whenever a nontoken creature you control dies, investigate. + this.addAbility(new DiesCreatureTriggeredAbility( + new InvestigateEffect(false), false, StaticFilters.FILTER_CONTROLLED_CREATURE_NON_TOKEN + )); + + // Clues you control have exalted. + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( + new ExaltedAbility(), Duration.WhileOnBattlefield, filter + ).setText("Clues you control have exalted. (Whenever a creature you control attacks alone, that creature " + + "gets +1/+1 until end of turn for each instance of exalted among permanents you control.)" + ))); + } + + private MerchantOfTruth(final MerchantOfTruth card) { + super(card); + } + + @Override + public MerchantOfTruth copy() { + return new MerchantOfTruth(this); + } +} diff --git a/Mage.Sets/src/mage/sets/MurdersAtKarlovManorCommander.java b/Mage.Sets/src/mage/sets/MurdersAtKarlovManorCommander.java index 8b23fe7d453..b617e453b02 100644 --- a/Mage.Sets/src/mage/sets/MurdersAtKarlovManorCommander.java +++ b/Mage.Sets/src/mage/sets/MurdersAtKarlovManorCommander.java @@ -144,6 +144,8 @@ public final class MurdersAtKarlovManorCommander extends ExpansionSet { cards.add(new SetCardInfo("Master of Pearls", 73, Rarity.RARE, mage.cards.m.MasterOfPearls.class)); cards.add(new SetCardInfo("Mastery of the Unseen", 74, Rarity.RARE, mage.cards.m.MasteryOfTheUnseen.class)); cards.add(new SetCardInfo("Mechanized Production", 109, Rarity.MYTHIC, mage.cards.m.MechanizedProduction.class)); + cards.add(new SetCardInfo("Merchant of Truth", 11, Rarity.RARE, mage.cards.m.MerchantOfTruth.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Merchant of Truth", 322, Rarity.RARE, mage.cards.m.MerchantOfTruth.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Mind Stone", 232, Rarity.UNCOMMON, mage.cards.m.MindStone.class)); cards.add(new SetCardInfo("Mirror Entity", 75, Rarity.RARE, mage.cards.m.MirrorEntity.class)); cards.add(new SetCardInfo("Mission Briefing", 110, Rarity.RARE, mage.cards.m.MissionBriefing.class)); diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java index 9d54181fc11..8f78e38290d 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java @@ -28,9 +28,21 @@ public class InvestigateEffect extends OneShotEffect { } public InvestigateEffect(DynamicValue amount) { + this(amount, true); + } + + public InvestigateEffect(boolean showAbilityHint) { + this(1, showAbilityHint); + } + + public InvestigateEffect(int amount, boolean showAbilityHint) { + this(StaticValue.get(amount), showAbilityHint); + } + + public InvestigateEffect(DynamicValue amount, boolean showAbilityHint) { super(Outcome.Benefit); this.amount = amount; - this.staticText = makeText(); + this.staticText = makeText(showAbilityHint); } protected InvestigateEffect(final InvestigateEffect effect) { @@ -63,7 +75,10 @@ public class InvestigateEffect extends OneShotEffect { return new InvestigateEffect(this); } - private String makeText() { + private String makeText(boolean showAbilityHint) { + if (!showAbilityHint) { + return "investigate"; + } String message; if (amount instanceof StaticValue) { int value = ((StaticValue) amount).getValue();