From f9a073fd939b522721912fbbbc0861fd8bf17e0d Mon Sep 17 00:00:00 2001
From: Adam Pantel <>
Date: Mon, 5 Apr 2021 18:58:24 -0400
Subject: [PATCH] Momir script improvement

---
 forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java | 4 +---
 forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java  | 4 +++-
 .../res/cardsfolder/m/momir_vig_simic_visionary_avatar.txt    | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java
index b12f37aecca..4a0ded95dc2 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java
@@ -35,9 +35,7 @@ public class ChooseCardNameAi extends SpellAbilityAi {
             }
 
             String logic = sa.getParam("AILogic");
-            if (logic.equals("MomirAvatar")) {
-                return SpecialCardAi.MomirVigAvatar.consider(ai, sa);
-            } else if (logic.equals("CursedScroll")) {
+            if (logic.equals("CursedScroll")) {
                 return SpecialCardAi.CursedScroll.consider(ai, sa);
             }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java b/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java
index d493849c6af..e0f03379bd2 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java
@@ -44,7 +44,9 @@ public class CopyPermanentAi extends SpellAbilityAi {
             return false;
         }
 
-        if ("MimicVat".equals(aiLogic)) {
+        if ("MomirAvatar".equals(aiLogic)) {
+                return SpecialCardAi.MomirVigAvatar.consider(aiPlayer, sa);
+        } else if ("MimicVat".equals(aiLogic)) {
             return SpecialCardAi.MimicVat.considerCopy(aiPlayer, sa);
         } else if ("AtEOT".equals(aiLogic)) {
             return ph.is(PhaseType.END_OF_TURN);
diff --git a/forge-gui/res/cardsfolder/m/momir_vig_simic_visionary_avatar.txt b/forge-gui/res/cardsfolder/m/momir_vig_simic_visionary_avatar.txt
index 34ed1b39345..df7ef16d564 100644
--- a/forge-gui/res/cardsfolder/m/momir_vig_simic_visionary_avatar.txt
+++ b/forge-gui/res/cardsfolder/m/momir_vig_simic_visionary_avatar.txt
@@ -2,8 +2,7 @@ Name:Momir Vig, Simic Visionary Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/+4
-A:AB$ NameCard | Cost$ X Discard<1/Card> | AILogic$ MomirAvatar | ActivationZone$ Command | AtRandom$ True | ValidCards$ Creature | ValidAttribute$ cmcEQX | Amount$ 1 | SubAbility$ DBToken | SorcerySpeed$ True | ActivationLimit$ 1 | AILogic$ MomirAvatar | SpellDescription$ Create a token that's a copy of a creature card with converted mana cost X chosen at random. Activate this ability only any time you could cast a sorcery and only once each turn. | StackDescription$ SpellDescription
-SVar:DBToken:DB$ CopyPermanent | ValidSupportedCopy$ Card | DefinedName$ NamedCard | NumCopies$ 1 | StackDescription$
+A:AB$ CopyPermanent | Cost$ X Discard<1/Card> | AILogic$ MomirAvatar | ActivationZone$ Command | NumCopies$ 1 | ValidSupportedCopy$ Creature.cmcEQX | RandomCopied$ True | RandomNum$ 1 | SorcerySpeed$ True | ActivationLimit$ 1 | AILogic$ MomirAvatar | SpellDescription$ Create a token that's a copy of a creature card with converted mana cost X chosen at random. Activate this ability only any time you could cast a sorcery and only once each turn. | StackDescription$ SpellDescription
 SVar:X:Count$xPaid
 SVar:Picture:https://downloads.cardforge.org/images/cards/VAN/Momir Vig, Simic Visionary Avatar.full.jpg
 Oracle:Hand +0, life +4\n{X}, Discard a card: Create a token that's a copy of a creature card with converted mana cost X chosen at random. Activate this ability only any time you could cast a sorcery and only once each turn.