瀏覽代碼

Card Bug Fixes WIP

cchmc-burkewm 2 年之前
父節點
當前提交
ed4f6f8e5c

+ 21 - 2
.idea/.idea.DCGO/.idea/workspace.xml

@@ -4,7 +4,26 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1f770e58-b781-4cb0-ad93-4c50994f611d" name="Changes" comment="" />
+    <list default="true" id="1f770e58-b781-4cb0-ad93-4c50994f611d" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.DCGO/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.DCGO/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardBaseEntity/ST5/Black/Digimon/コマンドラモン-ST5-05.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardBaseEntity/ST5/Black/Digimon/コマンドラモン-ST5-05.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT12/Purple/BaalmonXAntibody_BT12_082.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT12/Purple/BaalmonXAntibody_BT12_082.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT13/Purple/GizmonAT_BT13_083.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT13/Purple/GizmonAT_BT13_083.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT13/Yellow/Ponechessmon_BT13_035.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT13/Yellow/Ponechessmon_BT13_035.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Fenrirugamon_BT14_081.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Fenrirugamon_BT14_081.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Solgarumon_BT14_079.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Solgarumon_BT14_079.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Pukumon_BT15_030.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Pukumon_BT15_030.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT7/Red/Ardamon_BT7_014.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT7/Red/Ardamon_BT7_014.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX3/Blue/Sourai_EX3_067.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX3/Blue/Sourai_EX3_067.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX4/Green/Blackcentgargomon_EX4_037.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX4/Green/Blackcentgargomon_EX4_037.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX5/Yellow/Fanronmon_EX5_074.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX5/Yellow/Fanronmon_EX5_074.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/LM/Blue/Amphimon_LM_005.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/LM/Blue/Amphimon_LM_005.cs" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -99,7 +118,7 @@
       <workItem from="1704380154591" duration="3621000" />
       <workItem from="1705445110111" duration="617000" />
       <workItem from="1707092728240" duration="644000" />
-      <workItem from="1715820047500" duration="22601000" />
+      <workItem from="1715820047500" duration="27171000" />
     </task>
     <servers />
   </component>

+ 2 - 2
Assets/CardBaseEntity/ST5/Black/Digimon/コマンドラモン-ST5-05.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c006089325084ce0d71274aac2f35273bfdab14f0de8f09caa5fd0dbbf56268e
-size 1520
+oid sha256:f8ed5924d9f6aec49366d3c80d554744a845b6f3faed7d49495839d36a61a367
+size 1254

+ 4 - 4
Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs

@@ -21,7 +21,7 @@ public class UndeadKing_BT10_104 : CEntity_Effect
             bool CanUseCondition(Hashtable hashtable)
             {
                 return card.Owner.GetBattleAreaPermanents().Some(permanet =>
-                    permanet.TopCard.CardNames.Contains("Nene Amano") || permanet.TopCard.CardNames.Contains("NeneAmano"));
+                    permanet.TopCard.ContainsCardName("Nene Amano") || permanet.TopCard.ContainsCardName("NeneAmano"));
             }
 
             bool CardCondition(CardSource cardSource)
@@ -44,7 +44,7 @@ public class UndeadKing_BT10_104 : CEntity_Effect
 
             bool CanSelectCardCondition(CardSource cardSource)
             {
-                if (cardSource.CardNames.Contains("DarkKnightmon"))
+                if (cardSource.ContainsCardName("DarkKnightmon"))
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(
                         cardSource: cardSource,
@@ -71,7 +71,7 @@ public class UndeadKing_BT10_104 : CEntity_Effect
                     card.Owner,
                     activateClass).AddTrashCardsFromLibraryTop());
 
-                #region デジクロスでトラッシュを選択可
+                #region �スf�スW�スN�ス�ス�スX�スナト�ス�ス�スb�スV�ス�ス�ス�スI�ス�ス�スツ
                 AddMaxTrashCountDigiXrosClass addMaxTrashCountDigiXrosClass = new AddMaxTrashCountDigiXrosClass();
                 addMaxTrashCountDigiXrosClass.SetUpICardEffect("Can select DigiXros cards from trash", CanUseCondition1, card);
                 addMaxTrashCountDigiXrosClass.SetUpAddMaxTrashCountDigiXrosClass(getMaxTrashCount: GetCount);
@@ -146,7 +146,7 @@ public class UndeadKing_BT10_104 : CEntity_Effect
                         activateETB: true));
                 }
 
-                #region デジクロスでトラッシュを選択可能解除
+                #region �スf�スW�スN�ス�ス�スX�スナト�ス�ス�スb�スV�ス�ス�ス�スI�ス�ス�スツ能�ス�ス�ス�ス
                 card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
                 #endregion
             }

+ 3 - 8
Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs

@@ -17,8 +17,8 @@ public class ImperialdramonFighterMode_BT12_031 : CEntity_Effect
         {
             bool PermanentCondition(Permanent targetPermanent)
             {
-                return targetPermanent.TopCard.CardNames.Contains("Imperialdramon: Dragon Mode") || targetPermanent.TopCard.CardNames.Contains("Imperialdramon:DragonMode") ||
-                    targetPermanent.TopCard.CardNames.Contains("Imperialdramon Dragon Mode") || targetPermanent.TopCard.CardNames.Contains("ImperialdramonDragonMode");
+                return targetPermanent.TopCard.ContainsCardName("Imperialdramon: Dragon Mode") || targetPermanent.TopCard.ContainsCardName("Imperialdramon:DragonMode") ||
+                    targetPermanent.TopCard.ContainsCardName("Imperialdramon Dragon Mode") || targetPermanent.TopCard.ContainsCardName("ImperialdramonDragonMode");
             }
 
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -58,12 +58,7 @@ public class ImperialdramonFighterMode_BT12_031 : CEntity_Effect
                 {
                     if (cardSource.Owner == card.Owner)
                     {
-                        if (cardSource.CardNames.Contains("Imperialdramon: Dragon Mode"))
-                        {
-                            return true;
-                        }
-
-                        if (cardSource.CardNames.Contains("Imperialdramon:DragonMode"))
+                        if (cardSource.ContainsCardName("Imperialdramon: Dragon Mode") || cardSource.ContainsCardName("Imperialdramon:DragonMode"))
                         {
                             return true;
                         }

+ 7 - 7
Assets/CardEffect/BT12/Purple/BaalmonXAntibody_BT12_082.cs

@@ -16,7 +16,7 @@ public class BaalmonXAntibody_BT12_082 : CEntity_Effect
         {
             bool PermanentCondition(Permanent targetPermanent)
             {
-                return targetPermanent.TopCard.CardNames.Contains("Baalmon");
+                return targetPermanent.TopCard.ContainsCardName("Baalmon");
             }
 
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -40,12 +40,12 @@ public class BaalmonXAntibody_BT12_082 : CEntity_Effect
                 {
                     if (cardSource.Owner == card.Owner)
                     {
-                        if (cardSource.CardNames.Contains("X Antibody"))
+                        if (cardSource.ContainsCardName("X Antibody"))
                         {
                             return true;
                         }
 
-                        if (cardSource.CardNames.Contains("XAntibody"))
+                        if (cardSource.ContainsCardName("XAntibody"))
                         {
                             return true;
                         }
@@ -149,7 +149,7 @@ public class BaalmonXAntibody_BT12_082 : CEntity_Effect
                 {
                     if (card.Owner.GetBattleAreaDigimons().Contains(card.PermanentOfThisCard()))
                     {
-                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("Baalmon") || cardSource.CardNames.Contains("X Antibody") || cardSource.CardNames.Contains("XAntibody")) >= 1)
+                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.ContainsCardName("Baalmon") || cardSource.ContainsCardName("X Antibody") || cardSource.ContainsCardName("XAntibody")) >= 1)
                         {
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             {
@@ -218,17 +218,17 @@ public class BaalmonXAntibody_BT12_082 : CEntity_Effect
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
-                        if (card.PermanentOfThisCard().TopCard.CardTraits.Contains("Wizard"))
+                        if (card.PermanentOfThisCard().TopCard.ContainsTraits("Wizard"))
                         {
                             return true;
                         }
 
-                        if (card.PermanentOfThisCard().TopCard.CardTraits.Contains("Demon Lord"))
+                        if (card.PermanentOfThisCard().TopCard.ContainsTraits("Demon Lord"))
                         {
                             return true;
                         }
 
-                        if (card.PermanentOfThisCard().TopCard.CardTraits.Contains("DemonLord"))
+                        if (card.PermanentOfThisCard().TopCard.ContainsTraits("DemonLord"))
                         {
                             return true;
                         }

+ 1 - 1
Assets/CardEffect/BT13/Purple/GizmonAT_BT13_083.cs

@@ -16,7 +16,7 @@ public class GizmonAT_BT13_083 : CEntity_Effect
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Delete your 1 level 3 Digimon to get Play Cost -4", CanUseCondition, card);
-            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
             activateClass.SetHashString("PlayCost-4_BT13_083");
             cardEffects.Add(activateClass);
 

+ 1 - 1
Assets/CardEffect/BT13/Yellow/Ponechessmon_BT13_035.cs

@@ -40,7 +40,7 @@ public class Ponechessmon_BT13_035 : CEntity_Effect
             {
                 if (cardSource != null)
                 {
-                    if (cardSource.ContainsCardName("Chessmon"))
+                    if (cardSource.CardNames.Contains("Chessmon"))
                     {
                         if (cardSource.IsDigimon)
                         {

+ 1 - 14
Assets/CardEffect/BT14/Purple/Fenrirugamon_BT14_081.cs

@@ -31,20 +31,7 @@ public class Fenrirugamon_BT14_081 : CEntity_Effect
                     {
                         if (cardSource.HasLevel)
                         {
-                            if (cardSource.CardTraits.Contains("Dark Animal"))
-                            {
-                                return true;
-                            }
-
-                            if (cardSource.CardTraits.Contains("DarkAnimal"))
-                            {
-                                return true;
-                            }
-
-                            if (cardSource.CardTraits.Contains("SoC"))
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
                 }

+ 2 - 22
Assets/CardEffect/BT14/Purple/Solgarumon_BT14_079.cs

@@ -42,17 +42,7 @@ public class Solgarumon_BT14_079 : CEntity_Effect
                     {
                         if (cardSource.HasLevel)
                         {
-                            if (cardSource.CardTraits.Contains("Dark Animal"))
-                            {
-                                return true;
-                            }
-
-                            if (cardSource.CardTraits.Contains("DarkAnimal"))
-                            {
-                                return true;
-                            }
-
-                            if (cardSource.CardTraits.Contains("SoC"))
+                            if (cardSource.CardTraits.Contains("Dark Animal") || cardSource.CardTraits.Contains("DarkAnimal") || cardSource.CardTraits.Contains("SoC"))
                             {
                                 return true;
                             }
@@ -215,17 +205,7 @@ public class Solgarumon_BT14_079 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                 {
-                    if (permanent.TopCard.CardTraits.Contains("Dark Animal"))
-                    {
-                        return true;
-                    }
-
-                    if (permanent.TopCard.CardTraits.Contains("DarkAnimal"))
-                    {
-                        return true;
-                    }
-
-                    if (permanent.TopCard.CardTraits.Contains("SoC"))
+                    if (permanent.TopCard.CardTraits.Contains("Dark Animal") || permanent.TopCard.CardTraits.Contains("DarkAnimal") ||permanent.TopCard.CardTraits.Contains("SoC"))
                     {
                         return true;
                     }

+ 5 - 2
Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs

@@ -44,7 +44,7 @@ public class Megadramon_BT15_064 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[When Attacking][De-Digivolve] 1�„n 1 of your opponent's Digimon (Trash up to 1 card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards).";
+                return "[When Attacking][De-Digivolve] 1��n 1 of your opponent's Digimon (Trash up to 1 card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards).";
             }
 
             bool CanSelectPermanentCondition(Permanent permanent)
@@ -120,7 +120,10 @@ public class Megadramon_BT15_064 : CEntity_Effect
                 {
                     if (permanent.TopCard.GetCostItself <= 3)
                     {
-                        return true;
+                        if (permanent.IsDigimon || permanent.IsTamer)
+                        {
+                            return true;
+                        }
                     }
                 }
 

+ 1 - 4
Assets/CardEffect/BT15/Blue/Pukumon_BT15_030.cs

@@ -54,10 +54,7 @@ public class Pukumon_BT15_030 : CEntity_Effect
                 {
                     if (permanent.DigivolutionCards.Count((cardSource) => !cardSource.CanNotTrashFromDigivolutionCards(activateClass)) >= 1)
                     {
-                        if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                        {
-                            return true;
-                        }
+                        return true;
                     }
                 }
 

+ 1 - 1
Assets/CardEffect/BT7/Red/Ardamon_BT7_014.cs

@@ -116,7 +116,7 @@ public class Ardamon_BT7_014 : CEntity_Effect
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
-                        if (card.PermanentOfThisCard().TopCard.CardTraits.Contains("Hybrid") || card.PermanentOfThisCard().TopCard.CardTraits.Contains("TenWarriors") || card.PermanentOfThisCard().TopCard.CardTraits.Contains("Ten Warriors"))
+                        if (card.PermanentOfThisCard().TopCard.ContainsTraits("Hybrid") || card.PermanentOfThisCard().TopCard.ContainsTraits("TenWarriors") || card.PermanentOfThisCard().TopCard.ContainsTraits("Ten Warriors"))
                         {
                             if (card != card.PermanentOfThisCard().TopCard)
                             {

+ 1 - 1
Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs

@@ -30,7 +30,7 @@ public class AiAndMakoto_EX2_065 : CEntity_Effect
 
             bool CanSelectCardCondition(CardSource cardSource)
             {
-                return cardSource.CardNames.Contains("Beelzemon Blast Mode") || cardSource.CardNames.Contains("BeelzemonBlastMode");
+                return cardSource.ContainsCardName("Beelzemon Blast Mode") || cardSource.ContainsCardName("BeelzemonBlastMode");
             }
 
             bool PermanentCondition(Permanent permanent) => CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);

+ 1 - 1
Assets/CardEffect/EX3/Blue/Sourai_EX3_067.cs

@@ -28,7 +28,7 @@ public class Sourai_EX3_067 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                 {
-                    if (permanent.DigivolutionCards.Count((cardSource) => !cardSource.CanNotTrashFromDigivolutionCards(activateClass)) >= 1)
+                    if (permanent.DigivolutionCards.Count((cardSource) => !cardSource.CanNotTrashFromDigivolutionCards(activateClass)) >= 0)
                     {
                         return true;
                     }

+ 13 - 1
Assets/CardEffect/EX4/Green/Blackcentgargomon_EX4_037.cs

@@ -15,7 +15,19 @@ public class Blackcentgargomon_EX4_037 : CEntity_Effect
         {
             bool PermanentCondition(Permanent targetPermanent)
             {
-                return targetPermanent.TopCard.ContainsCardName("Rapidmon") || (targetPermanent.TopCard.CardColors.Contains(CardColor.Green) && targetPermanent.TopCard.CardColors.Count == 2 && targetPermanent.TopCard.HasLevel && targetPermanent.Level == 5);
+                if(targetPermanent.TopCard.ContainsCardName("Rapidmon") && targetPermanent.TopCard.HasLevel && targetPermanent.Level == 5)
+                {
+                    return true;
+                }
+
+                if (targetPermanent.TopCard.CardColors.Contains(CardColor.Green) &&
+                    targetPermanent.TopCard.CardColors.Count == 2 && targetPermanent.TopCard.HasLevel &&
+                    targetPermanent.Level == 5)
+                {
+                    return true;
+                }
+
+                return false;
             }
 
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 4, ignoreDigivolutionRequirement: false, card: card, condition: null));

+ 4 - 4
Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs

@@ -31,22 +31,22 @@ public class Moonmon_EX5_002 : CEntity_Effect
                 {
                     if (permanent.IsTamer)
                     {
-                        if (permanent.TopCard.CardTraits.Contains("Light Fang"))
+                        if (permanent.TopCard.ContainsTraits("Light Fang"))
                         {
                             return true;
                         }
 
-                        if (permanent.TopCard.CardTraits.Contains("LightFung"))
+                        if (permanent.TopCard.ContainsTraits("LightFung"))
                         {
                             return true;
                         }
 
-                        if (permanent.TopCard.CardTraits.Contains("Night Claw"))
+                        if (permanent.TopCard.ContainsTraits("Night Claw"))
                         {
                             return true;
                         }
 
-                        if (permanent.TopCard.CardTraits.Contains("NightClaw"))
+                        if (permanent.TopCard.ContainsTraits("NightClaw"))
                         {
                             return true;
                         }

+ 5 - 0
Assets/CardEffect/EX5/Yellow/Fanronmon_EX5_074.cs

@@ -360,6 +360,11 @@ public class Fanronmon_EX5_074 : CEntity_Effect
                     {
                         return true;
                     }
+
+                    if (cardEffect.IsDigimonEffect && cardEffect.IsSecurityEffect)
+                    {
+                        return true;
+                    }
                 }
 
                 return false;

+ 2 - 2
Assets/CardEffect/LM/Blue/Amphimon_LM_005.cs

@@ -78,7 +78,7 @@ namespace DCGO.CardEffects.LM
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOpponentBattleArea(permanent, card))
                     {
-                        if (!permanent.TopCard.IsDigiEgg)
+                        if (!permanent.TopCard.IsDigiEgg || !permanent.TopCard.IsOption)
                         {
                             if (permanent.DigivolutionCards.Count(CanSelectCardCondition) >= 1)
                             {
@@ -179,7 +179,7 @@ namespace DCGO.CardEffects.LM
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOpponentBattleArea(permanent, card))
                     {
-                        if (!permanent.TopCard.IsDigiEgg)
+                        if (!permanent.TopCard.IsDigiEgg || !permanent.TopCard.IsOption)
                         {
                             if (permanent.DigivolutionCards.Count(CanSelectCardCondition) >= 1)
                             {