More fixes

Assets/CardBaseEntity/EX6/Yellow/Digimon/Ophanimon-EX6-027.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc32aac508ec3a07151b3e447176c0309b560b5030e3845d96a80afd8886d960
-size 1648
+oid sha256:9b5f962152b47d4dd7482d1bdee8938b77af879522af3ebc6b9f12b2683548c1
+size 1651

Assets/CardBaseEntity/EX6/Yellow/Digimon/Ophanimon-EX6-027_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0ce002df5b3e81666151c023f999c7e2881b4435ae0a3f3ce348e2b3fd9d684
-size 1654
+oid sha256:f11e33b8500eb4bee08d1138b6930574c2a7092f01a8795e4c91879bedd3b0b2
+size 1657

Assets/CardBaseEntity/EX6/Yellow/Digimon/Ophanimon-EX6-027_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b32b3b06aff29afde19837ec8213890a6af917a4fe8f440bd3a6d6becf5db31f
-size 1654
+oid sha256:3c88e5461fca5a5123dbe3120016e84a407b818e2982c12118ce42a513bbebe7
+size 1657

Assets/CardBaseEntity/EX6/Yellow/Digimon/Seraphimon-EX6-028.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:991b2e80141756d533d1f23a25aa84c4f80b361c8cab468c53f972f1a39345e9
-size 1503
+oid sha256:746e5762bf6ac8de65cbe19d9b80c0bef06c9bd92f8fe5ee92b8ce8d6f9e74ac
+size 1506

Assets/CardBaseEntity/EX6/Yellow/Digimon/Seraphimon-EX6-028_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8ffecf45f046973530f7e5783ab62ce62e89033a65f2c23352437eb0a9fc473
-size 1509
+oid sha256:5f9c7a0385db0f3cb6d57d7013cfa17e823a58ea5bfb9682f5b02f0cf73c86cd
+size 1512

Assets/CardBaseEntity/EX6/Yellow/Digimon/Seraphimon-EX6-028_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21e1ac6a068148a8fcedcbfa5c30d6dba210fe46f07d9dbe973536fc51826ce0
-size 1509
+oid sha256:d5c0bd5a7fca2c5f9a262a28de0bd3705f1bc3e8f9d68d177a8499a6742126f4
+size 1512

Assets/CardEffect/EX6/Yellow/Descent_of_the_Three_Great_Angels_EX6_068.cs

@@ -103,7 +103,7 @@ namespace DCGO.CardEffects.EX6
                 activateClass.SetUpICardEffect(
                     "Play 1 card with the [Three Great Angels] trait from your security stack without paying the cost",
                     CanUseCondition, card);
-                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDescription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, true, EffectDescription());
                 activateClass.SetHashString("PlaySecurityCard_EX6_068");
                 cardEffects.Add(activateClass);
                 

Assets/CardEffect/EX6/Yellow/Dominimon_EX6_030.cs

@@ -10,36 +10,36 @@ namespace DCGO.CardEffects.EX6
         public override List<ICardEffect> CardEffects(EffectTiming timing, CardSource card)
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
-            
+
             #region Rule Text
-            
+
             if (timing == EffectTiming.None)
             {
                 ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
                 changeTraitsClass.SetUpICardEffect("Trait: Has [Angel] Type", CanUseCondition, card);
                 changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: ChangeTraits);
                 cardEffects.Add(changeTraitsClass);
-                
+
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     return true;
                 }
-                
+
                 List<string> ChangeTraits(CardSource cardSource, List<string> cardTraits)
                 {
                     if (cardSource == card)
                     {
                         cardTraits.Add("Angel");
                     }
-                    
+
                     return cardTraits;
                 }
             }
-            
+
             #endregion
-            
+
             #region When Digivolving
-            
+
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
@@ -49,13 +49,13 @@ namespace DCGO.CardEffects.EX6
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false,
                     EffectDescription());
                 cardEffects.Add(activateClass);
-                
+
                 string EffectDescription()
                 {
                     return
                         "[When Digivolving] Search your security stack. You may play 1 level 5 or lower Digimon card with the [Angel]/[Archangel] trait among them without paying the cost. Then, shuffle your security stack, and 1 of your opponent's Digimon gets -7000 DP until the end of the turn.";
                 }
-                
+
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
                     if (cardSource.IsDigimon)
@@ -72,40 +72,40 @@ namespace DCGO.CardEffects.EX6
                             }
                         }
                     }
-                    
+
                     return false;
                 }
-                
+
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
                 }
-                
+
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
                 }
-                
+
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                         return true;
                     }
-                    
+
                     return false;
                 }
-                
+
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if (card.Owner.SecurityCards.Count(CanSelectCardCondition) >= 1)
+                    if (card.Owner.SecurityCards.Count >= 1)
                     {
                         int maxCount = Math.Min(1, card.Owner.SecurityCards.Count(CanSelectCardCondition));
-                        
+
                         List<CardSource> selectedCards = new List<CardSource>();
-                        
+
                         SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-                        
+
                         selectCardEffect.SetUp(
                             canTargetCondition: CanSelectCardCondition,
                             canTargetCondition_ByPreSelecetedList: null,
@@ -123,16 +123,16 @@ namespace DCGO.CardEffects.EX6
                             canLookReverseCard: true,
                             selectPlayer: card.Owner,
                             cardEffect: activateClass);
-                        
+
                         yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-                        
+
                         IEnumerator SelectCardCoroutine(CardSource cardSource)
                         {
                             selectedCards.Add(cardSource);
-                            
+
                             yield return null;
                         }
-                        
+
                         IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
                         {
                             if (cardSources.Count >= 1)
@@ -141,31 +141,31 @@ namespace DCGO.CardEffects.EX6
                                     player: card.Owner,
                                     refSkillInfos: ref ContinuousController.instance.nullSkillInfos).ReduceSecurity());
                             }
-                            
+
                             yield return null;
                         }
-                        
+
                         yield return ContinuousController.instance.StartCoroutine(
                             CardEffectCommons.PlayPermanentCards(cardSources: selectedCards,
                                 activateClass: activateClass, payCost: false, isTapped: false,
                                 root: SelectCardEffect.Root.Security, activateETB: true));
                     }
-                    
+
                     if (card.Owner.SecurityCards.Count >= 1)
                     {
                         ContinuousController.instance.PlaySE(GManager.instance.ShuffleSE);
-                        
+
                         card.Owner.SecurityCards = RandomUtility.ShuffledDeckCards(card.Owner.SecurityCards);
                     }
-                    
+
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
                         int maxCount = Math.Min(1,
                             CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
-                        
+
                         SelectPermanentEffect selectPermanentEffect =
                             GManager.instance.GetComponent<SelectPermanentEffect>();
-                        
+
                         selectPermanentEffect.SetUp(
                             selectPlayer: card.Owner,
                             canTargetCondition: CanSelectPermanentCondition,
@@ -178,13 +178,13 @@ namespace DCGO.CardEffects.EX6
                             afterSelectPermanentCoroutine: null,
                             mode: SelectPermanentEffect.Mode.Custom,
                             cardEffect: activateClass);
-                        
+
                         selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get DP -7000.",
                             "The opponent is selecting 1 Digimon that will get DP -7000.");
-                        
+
                         yield return ContinuousController.instance.StartCoroutine(
                             selectPermanentEffect.Activate());
-                        
+
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
                             yield return ContinuousController.instance.StartCoroutine(
@@ -195,11 +195,11 @@ namespace DCGO.CardEffects.EX6
                     }
                 }
             }
-            
+
             #endregion
-            
+
             #region All Turns
-            
+
             if (timing == EffectTiming.WhenRemoveField)
             {
                 ActivateClass activateClass = new ActivateClass();
@@ -210,13 +210,13 @@ namespace DCGO.CardEffects.EX6
                     EffectDescription());
                 activateClass.SetHashString("TrashSecurityToPreventLeaving_EX6_030");
                 cardEffects.Add(activateClass);
-                
+
                 string EffectDescription()
                 {
                     return
                         "[All Turns] When one of your Digimon with the[Angel]/[Archangel]/[Three Great Angels] trait would leave the battle area other than in battle, by trashing the top card of your security stack, prevent it from leaving.";
                 }
-                
+
                 bool PermanentCondition(Permanent permanent)
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
@@ -229,26 +229,28 @@ namespace DCGO.CardEffects.EX6
                             return true;
                         }
                     }
-                    
+
                     return false;
                 }
-                
+
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.CanTriggerWhenPermanentRemoveField(hashtable, PermanentCondition))
                         {
-                            if (!CardEffectCommons.IsByBattle(hashtable))
+                            if (!CardEffectCommons.IsByBattle(hashtable) &&
+                                !CardEffectCommons.IsByEffect(hashtable,
+                                    cardEffect => CardEffectCommons.IsOwnerEffect(cardEffect, card)))
                             {
                                 return true;
                             }
                         }
                     }
-                    
+
                     return false;
                 }
-                
+
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
@@ -258,11 +260,11 @@ namespace DCGO.CardEffects.EX6
                             return true;
                         }
                     }
-                    
+
                     return false;
                 }
-                
-                IEnumerator ActivateCoroutine(Hashtable _hashtable)
+
+                IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
@@ -270,10 +272,10 @@ namespace DCGO.CardEffects.EX6
                         {
                             int maxCount = Math.Min(1,
                                 CardEffectCommons.MatchConditionPermanentCount(PermanentCondition));
-                            
+
                             SelectPermanentEffect selectPermanentEffect =
                                 GManager.instance.GetComponent<SelectPermanentEffect>();
-                            
+
                             selectPermanentEffect.SetUp(
                                 selectPlayer: card.Owner,
                                 canTargetCondition: PermanentCondition,
@@ -286,12 +288,12 @@ namespace DCGO.CardEffects.EX6
                                 afterSelectPermanentCoroutine: null,
                                 mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
-                            
+
                             selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to save.",
                                 "The opponent is selecting 1 Digimon to save.");
-                            
+
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                            
+
                             IEnumerator SelectPermanentCoroutine(Permanent permanent)
                             {
                                 yield return ContinuousController.instance.StartCoroutine(new IDestroySecurity(
@@ -299,7 +301,7 @@ namespace DCGO.CardEffects.EX6
                                     destroySecurityCount: 1,
                                     cardEffect: activateClass,
                                     fromTop: true).DestroySecurity());
-                                
+
                                 permanent.willBeRemoveField = false;
                                 permanent.HideDeleteEffect();
                                 permanent.HideHandBounceEffect();
@@ -310,9 +312,9 @@ namespace DCGO.CardEffects.EX6
                     }
                 }
             }
-            
+
             #endregion
-            
+
             return cardEffects;
         }
     }

Assets/CardEffect/EX6/Yellow/OphanimonAce_EX6_027.cs

@@ -74,7 +74,7 @@ namespace DCGO.CardEffects.EX6
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect(
-                    " By trashing the top or bottom card of your security stack, 1 of your opponent's Digimon gets -8000 DP until the end of your opponents turn.",
+                    "By trashing the top or bottom card of your security stack, 1 of your opponent's Digimon gets -8000 DP until the end of your opponents turn.",
                     CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateSharedCondition, ActivateCoroutine, -1, true,
                     EffectSharedDescription());