[STX] Implemented Uvilda, Dean of Perfect / Nassari, Dean of Expression

Mage.Sets/src/mage/cards/j/JadziOracleOfArcavios.java

@@ -112,7 +112,7 @@ class JadziOracleOfArcaviosEffect extends OneShotEffect {
         if (card.isLand()) {
             return player.moveCards(card, Zone.BATTLEFIELD, source, game);
         }
-        if (!player.chooseUse(outcome, "Cast " + " by paying {1}?", source, game)) {
+        if (!player.chooseUse(outcome, "Cast " + card.getName() + " by paying {1}?", source, game)) {
             return false;
         }
         SpellAbility spellAbility = player.chooseAbilityForCast(card, game, true);
@@ -121,10 +121,7 @@ class JadziOracleOfArcaviosEffect extends OneShotEffect {
         }
         game.getState().setValue("PlayFromNotOwnHandZone" + card.getId(), Boolean.TRUE);
         player.setCastSourceIdWithAlternateMana(card.getId(), new ManaCostsImpl<>("{1}"), null);
-        Boolean cardWasCast = player.cast(
-                player.chooseAbilityForCast(card, game, true),
-                game, false, new ApprovingObject(source, game)
-        );
+        player.cast(spellAbility, game, false, new ApprovingObject(source, game));
         game.getState().setValue("PlayFromNotOwnHandZone" + card.getId(), null);
         return true;
     }

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

@@ -0,0 +1,324 @@
+package mage.cards.u;
+
+import mage.ApprovingObject;
+import mage.MageObject;
+import mage.MageObjectReference;
+import mage.abilities.Ability;
+import mage.abilities.SpellAbility;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.common.SpellCastControllerTriggeredAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.effects.common.counter.RemoveCounterSourceEffect;
+import mage.cards.*;
+import mage.constants.*;
+import mage.counters.CounterType;
+import mage.filter.StaticFilters;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.players.Player;
+import mage.target.TargetCard;
+import mage.target.common.TargetCardInHand;
+import mage.util.CardUtil;
+
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class UvildaDeanOfPerfection extends ModalDoubleFacesCard {
+
+    public UvildaDeanOfPerfection(UUID ownerId, CardSetInfo setInfo) {
+        super(
+                ownerId, setInfo,
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.DJINN, SubType.WIZARD}, "{2}{U}",
+                "Nassari, Dean of Expression",
+                new CardType[]{CardType.CREATURE}, new SubType[]{SubType.EFREET, SubType.SHAMAN}, "{3}{R}{R}"
+        );
+
+        // 1.
+        // Uvilda, Dean of Perfection
+        // Legendary Creature - Djinn Wizard
+        this.getLeftHalfCard().addSuperType(SuperType.LEGENDARY);
+        this.getLeftHalfCard().setPT(2, 2);
+
+        // {T}: You may exile an instant or sorcery card from your hand and put three hone counters on it. It gains "At the beginning of your upkeep, if this card is exiled, remove a hone counter from it" and "When the last hone counter is removed from this card, if it's exiled, you may cast it. It costs {4} less to cast this way."
+        this.getLeftHalfCard().addAbility(new SimpleActivatedAbility(
+                new UvildaDeanOfPerfectionEffect(), new TapSourceCost()
+        ));
+
+        // 2.
+        // Nassari, Dean of Expression
+        // Legendary Creature - Efreet Shaman
+        this.getRightHalfCard().addSuperType(SuperType.LEGENDARY);
+        this.getRightHalfCard().setPT(4, 4);
+
+        // At the beginning of your upkeep, exile the top card of each opponent's library. Until end of turn, you may cast spells from among those exiled cards, and you many spend mana as though it were mana of any color to cast those spells.
+        this.getRightHalfCard().addAbility(new BeginningOfUpkeepTriggeredAbility(
+                new NassariDeanOfExpressionEffect(), TargetController.YOU, false
+        ));
+
+        // Whenever you cast a spell from exile, put a +1/+1 counter on Nassari, Dean of Expression.
+        this.getRightHalfCard().addAbility(new NassariDeanOfExpressionTriggeredAbility());
+    }
+
+    private UvildaDeanOfPerfection(final UvildaDeanOfPerfection card) {
+        super(card);
+    }
+
+    @Override
+    public UvildaDeanOfPerfection copy() {
+        return new UvildaDeanOfPerfection(this);
+    }
+}
+
+class UvildaDeanOfPerfectionEffect extends OneShotEffect {
+
+    UvildaDeanOfPerfectionEffect() {
+        super(Outcome.Benefit);
+        staticText = "you may exile an instant or sorcery card from your hand and put three hone counters on it. " +
+                "It gains \"At the beginning of your upkeep, if this card is exiled, " +
+                "remove a hone counter from it\" and \"When the last hone counter is removed from this card, " +
+                "if it's exiled, you may cast it. It costs {4} less to cast this way.\"";
+    }
+
+    private UvildaDeanOfPerfectionEffect(final UvildaDeanOfPerfectionEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public UvildaDeanOfPerfectionEffect copy() {
+        return new UvildaDeanOfPerfectionEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player == null || player.getHand().count(
+                StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY, game
+        ) < 1) {
+            return false;
+        }
+        TargetCard target = new TargetCardInHand(
+                0, 1, StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY
+        );
+        player.choose(outcome, player.getHand(), target, game);
+        Card card = game.getCard(target.getFirstTarget());
+        if (card == null) {
+            return false;
+        }
+        player.moveCards(card, Zone.EXILED, source, game);
+        if (game.getState().getZone(card.getId()) != Zone.EXILED) {
+            return false;
+        }
+        card.addCounters(CounterType.HONE.createInstance(3), source.getControllerId(), source, game);
+        game.addEffect(new UvildaDeanOfPerfectionGainAbilityEffect(card, game), source);
+        return true;
+    }
+}
+
+class UvildaDeanOfPerfectionGainAbilityEffect extends ContinuousEffectImpl {
+
+    private final MageObjectReference mor;
+
+    UvildaDeanOfPerfectionGainAbilityEffect(Card card, Game game) {
+        super(Duration.Custom, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility);
+        this.mor = new MageObjectReference(card, game);
+    }
+
+    private UvildaDeanOfPerfectionGainAbilityEffect(final UvildaDeanOfPerfectionGainAbilityEffect effect) {
+        super(effect);
+        this.mor = effect.mor;
+    }
+
+    @Override
+    public UvildaDeanOfPerfectionGainAbilityEffect copy() {
+        return new UvildaDeanOfPerfectionGainAbilityEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Card card = mor.getCard(game);
+        if (card == null) {
+            discard();
+            return true;
+        }
+        Ability ability = new ConditionalInterveningIfTriggeredAbility(
+                new BeginningOfUpkeepTriggeredAbility(
+                        Zone.EXILED, new RemoveCounterSourceEffect(CounterType.HONE.createInstance()),
+                        TargetController.YOU, false
+                ), UvildaDeanOfPerfectionCondition.instance, "At the beginning of your upkeep, " +
+                "if this card is exiled, remove a hone counter from it."
+        );
+        ability.setSourceId(card.getId());
+        ability.setControllerId(source.getControllerId());
+        game.getState().addOtherAbility(card, ability);
+        ability = new UvildaDeanOfPerfectionTriggeredAbility();
+        ability.setSourceId(card.getId());
+        ability.setControllerId(source.getControllerId());
+        game.getState().addOtherAbility(card, ability);
+        return true;
+    }
+}
+
+enum UvildaDeanOfPerfectionCondition implements Condition {
+    instance;
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return game.getState().getZone(source.getSourceId()) == Zone.EXILED;
+    }
+}
+
+class UvildaDeanOfPerfectionTriggeredAbility extends TriggeredAbilityImpl {
+
+    UvildaDeanOfPerfectionTriggeredAbility() {
+        super(Zone.EXILED, new UvildaDeanOfPerfectionCastEffect());
+    }
+
+    private UvildaDeanOfPerfectionTriggeredAbility(final UvildaDeanOfPerfectionTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.COUNTERS_REMOVED;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        MageObject sourceObject = getSourceObjectIfItStillExists(game);
+        return event.getTargetId().equals(this.getSourceId())
+                && sourceObject instanceof Card
+                && ((Card) sourceObject).getCounters(game).getCount(CounterType.HONE) == 0
+                && event.getAmount() > 0
+                && event.getData().equals("hone");
+    }
+
+    @Override
+    public boolean checkInterveningIfClause(Game game) {
+        return game.getState().getZone(getSourceId()) == Zone.EXILED;
+    }
+
+    @Override
+    public UvildaDeanOfPerfectionTriggeredAbility copy() {
+        return new UvildaDeanOfPerfectionTriggeredAbility(this);
+    }
+
+    @Override
+    public String getRule() {
+        return "When the last hone counter is removed from this card, if it's exiled, " +
+                "you may cast it. It costs {4} less to cast this way.";
+    }
+}
+
+class UvildaDeanOfPerfectionCastEffect extends OneShotEffect {
+
+    UvildaDeanOfPerfectionCastEffect() {
+        super(Outcome.Benefit);
+    }
+
+    private UvildaDeanOfPerfectionCastEffect(final UvildaDeanOfPerfectionCastEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public UvildaDeanOfPerfectionCastEffect copy() {
+        return new UvildaDeanOfPerfectionCastEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        MageObject sourceObject = source.getSourceObjectIfItStillExists(game);
+        if (player == null || !(sourceObject instanceof Card)) {
+            return false;
+        }
+        Card card = (Card) sourceObject;
+        if (!player.chooseUse(outcome, "Cast " + card.getName() + '?', source, game)) {
+            return false;
+        }
+        SpellAbility spellAbility = player.chooseAbilityForCast(card, game, true);
+        if (spellAbility == null) {
+            return false;
+        }
+        CardUtil.reduceCost(spellAbility, 4);
+        game.getState().setValue("PlayFromNotOwnHandZone" + card.getId(), Boolean.TRUE);
+        player.cast(spellAbility, game, false, new ApprovingObject(source, game));
+        game.getState().setValue("PlayFromNotOwnHandZone" + card.getId(), null);
+        return true;
+    }
+}
+
+class NassariDeanOfExpressionEffect extends OneShotEffect {
+
+    NassariDeanOfExpressionEffect() {
+        super(Outcome.Benefit);
+        staticText = "exile the top card of each opponent's library. Until end of turn, " +
+                "you may cast spells from among those exiled cards, and you many spend mana " +
+                "as though it were mana of any color to cast those spells";
+    }
+
+    private NassariDeanOfExpressionEffect(final NassariDeanOfExpressionEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public NassariDeanOfExpressionEffect copy() {
+        return new NassariDeanOfExpressionEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        if (player == null) {
+            return false;
+        }
+        Cards cards = new CardsImpl();
+        game.getOpponents(source.getControllerId())
+                .stream()
+                .map(game::getPlayer)
+                .filter(Objects::nonNull)
+                .map(Player::getLibrary)
+                .map(p -> p.getFromTop(game))
+                .forEach(cards::add);
+        player.moveCards(cards, Zone.EXILED, source, game);
+        cards.retainZone(Zone.EXILED, game);
+        if (cards.isEmpty()) {
+            return false;
+        }
+        for (Card card : cards.getCards(game)) {
+            CardUtil.makeCardPlayable(game, source, card, Duration.EndOfTurn, true);
+        }
+        return true;
+    }
+}
+
+class NassariDeanOfExpressionTriggeredAbility extends SpellCastControllerTriggeredAbility {
+
+    NassariDeanOfExpressionTriggeredAbility() {
+        super(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false);
+        this.rule = "Whenever you cast a spell from exile, put a +1/+1 counter on {this}.";
+    }
+
+    private NassariDeanOfExpressionTriggeredAbility(final NassariDeanOfExpressionTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public NassariDeanOfExpressionTriggeredAbility copy() {
+        return new NassariDeanOfExpressionTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        return event.getZone() == Zone.EXILED && super.checkTrigger(event, game);
+    }
+}

Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java

@@ -294,6 +294,7 @@ public final class StrixhavenSchoolOfMages extends ExpansionSet {
         cards.add(new SetCardInfo("Twinscroll Shaman", 118, Rarity.COMMON, mage.cards.t.TwinscrollShaman.class));
         cards.add(new SetCardInfo("Umbral Juke", 89, Rarity.UNCOMMON, mage.cards.u.UmbralJuke.class));
         cards.add(new SetCardInfo("Unwilling Ingredient", 90, Rarity.COMMON, mage.cards.u.UnwillingIngredient.class));
+        cards.add(new SetCardInfo("Uvilda, Dean of Perfection", 160, Rarity.RARE, mage.cards.u.UvildaDeanOfPerfection.class));
         cards.add(new SetCardInfo("Valentin, Dean of the Vein", 161, Rarity.RARE, mage.cards.v.ValentinDeanOfTheVein.class));
         cards.add(new SetCardInfo("Vanishing Verse", 244, Rarity.RARE, mage.cards.v.VanishingVerse.class));
         cards.add(new SetCardInfo("Velomachus Lorehold", 245, Rarity.MYTHIC, mage.cards.v.VelomachusLorehold.class));

Mage/src/main/java/mage/counters/CounterType.java

@@ -75,6 +75,7 @@ public enum CounterType {
     HEXPROOF("hexproof"),
     HIT("hit"),
     HOOFPRINT("hoofprint"),
+    HONE("hone"),
     HOUR("hour", "an"),
     HOURGLASS("hourglass", "an"),
     HUNGER("hunger"),