added new CanNotBeRemoved class and effect

Assets/CardEffect/BT16/Black/Dorumon_BT16_051.cs

@@ -60,7 +60,7 @@ namespace DCGO.CardEffects.BT16
                             return true;
                         }
                     }
-
+                    
                     return false;
                 }
 
@@ -133,10 +133,10 @@ namespace DCGO.CardEffects.BT16
 
                         if (selectedPermanent != null)
                         {
-                            CanNotAffectedClass canNotAffectedClass = new CanNotAffectedClass();
-                            canNotAffectedClass.SetUpICardEffect("Can't leave battle area except by battle effect", CanUseProtectionCondition, card);
-                            canNotAffectedClass.SetUpCanNotAffectedClass(CardCondition: CardCondition, SkillCondition: SkillCondition);
-                            selectedPermanent.UntilOpponentTurnEndEffects.Add((_timing) => canNotAffectedClass);
+                            CanNotBeRemovedClass canNotBeRemovedClass = new CanNotBeRemovedClass();
+                            canNotBeRemovedClass.SetUpICardEffect("Can't leave battle area except by deletion effect", CanUseProtectionCondition, card);
+                            canNotBeRemovedClass.SetUpCanNotBeRemovedClass(permanentCondition: PermanentCondition);
+                            selectedPermanent.UntilOpponentTurnEndEffects.Add((_timing) => canNotBeRemovedClass);
 
                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateBuffEffect(selectedPermanent));
 
@@ -145,11 +145,11 @@ namespace DCGO.CardEffects.BT16
                                 return CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent);
                             }
 
-                            bool CardCondition(CardSource cardSource)
+                            bool PermanentCondition(Permanent permanent)
                             {
                                 if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                 {
-                                    if (cardSource == selectedPermanent.TopCard)
+                                    if (permanent == selectedPermanent)
                                     {
                                         return true;
                                     }
@@ -157,11 +157,6 @@ namespace DCGO.CardEffects.BT16
 
                                 return false;
                             }
-
-                            bool SkillCondition(ICardEffect cardEffect)
-                            {
-                                return true;
-                            }
                         }
 
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(selectedCards, activateClass));

Assets/Scripts/CardController.cs

@@ -1912,7 +1912,9 @@ public class DeckBottomBounceClass
         permanent != null
         && permanent.TopCard != null
         && (cardEffect == null ||
-        (!permanent.TopCard.CanNotBeAffected(cardEffect) && !permanent.CannotReturnToLibrary(cardEffect))));
+        (!permanent.TopCard.CanNotBeAffected(cardEffect) 
+        && !permanent.CannotReturnToLibrary(cardEffect)
+        && !permanent.CanBeRemoved())));
 
         if (_deckBounceTargetPermanents.Count == 0) yield break;
 
@@ -2044,7 +2046,9 @@ public class HandBounceClaass
         permanent != null
         && permanent.TopCard != null
         && (cardEffect == null ||
-        (!permanent.TopCard.CanNotBeAffected(cardEffect) && !permanent.CannotReturnToHand(cardEffect))));
+        (!permanent.TopCard.CanNotBeAffected(cardEffect) 
+        && !permanent.CannotReturnToHand(cardEffect)
+        && !permanent.CanBeRemoved())));
 
         if (_bounceTargetPermanents.Count == 0) yield break;
 
@@ -2638,7 +2642,9 @@ public class DestroyPermanentsClass
         permanent != null
         && permanent.TopCard != null
         && (cardEffect == null ||
-        (!permanent.TopCard.CanNotBeAffected(cardEffect) && permanent.CanBeDestroyedBySkill(cardEffect))));
+        (!permanent.TopCard.CanNotBeAffected(cardEffect) 
+        && permanent.CanBeDestroyedBySkill(cardEffect)
+        && permanent.CanBeRemoved())));
 
         if (_destroytargetPermanents.Count == 0) yield break;
 

Assets/Scripts/CardEffectFactory/CanNotBeRemoved.cs

@@ -0,0 +1,45 @@
+using System.Collections;
+using System.Collections.Generic;
+using System;
+using System.Linq;
+using UnityEngine;
+
+public partial class CardEffectFactory
+{
+    #region Static effect that can't be removed
+    public static CanNotBeRemovedClass CanNotBeRemovedStaticEffect(Func<Permanent, bool> permanentCondition, bool isInheritedEffect, CardSource card, Func<bool> condition, string effectName)
+    {
+        CanNotBeRemovedClass canNotBeRemovedClass = new CanNotBeRemovedClass();
+        canNotBeRemovedClass.SetUpICardEffect(effectName, CanUseCondition, card);
+        canNotBeRemovedClass.SetUpCanNotBeRemovedClass(permanentCondition: PermanentCondition);
+
+        if (isInheritedEffect)
+        {
+            canNotBeRemovedClass.SetIsInheritedEffect(true);
+        }
+
+        bool CanUseCondition(Hashtable hashtable)
+        {
+            return condition == null || condition();
+        }
+
+        bool PermanentCondition(Permanent permanent)
+        {
+            if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
+            {
+                if (!permanent.TopCard.CanNotBeAffected(canNotBeRemovedClass))
+                {
+                    if (permanentCondition == null || permanentCondition(permanent))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        return canNotBeRemovedClass;
+    }
+    #endregion
+}

Assets/Scripts/CardEffectFactory/CanNotBeRemoved.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 73eb0bdeb7817944994e491e1a5dcc21
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/CardEffectInterfaces.cs

@@ -383,6 +383,13 @@ public interface ICanNotBeDestroyedBySkillEffect
 }
 #endregion
 
+#region "Target permanent cannot be removed" effect"
+public interface ICanNotBeRemovedEffect
+{
+    bool CanNotBeRemoved(Permanent permanent);
+}
+#endregion
+
 #region "Target permanent gains Blocker" effect
 public interface IBlockerEffect
 {

Assets/Scripts/CardEffects/CanNotBeRemovedClass.cs

@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+
+public class CanNotBeRemovedClass : ICardEffect, ICanNotBeRemovedEffect
+{
+    Func<Permanent, bool> _permanentCondition { get; set; }
+    public void SetUpCanNotBeRemovedClass(Func<Permanent, bool> permanentCondition)
+    {
+        _permanentCondition = permanentCondition;
+    }
+
+    public bool CanNotBeRemoved(Permanent permanent)
+    {
+        if (permanent != null)
+        {
+            if (permanent.TopCard != null)
+            {
+                if (_permanentCondition != null)
+                {
+                    if (_permanentCondition(permanent))
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+}

Assets/Scripts/CardEffects/CanNotBeRemovedClass.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3d1787025aba98946998db42691110b7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Permanent.cs

@@ -2197,7 +2197,7 @@ public class Permanent
     public IBattle battle { get; set; } = null;
     #endregion
 
-    #region このデジモンが消滅するか
+    #region Can Be Destroyed
     public bool CanBeDestroyed()
     {
         #region 消滅しない効果
@@ -2252,6 +2252,9 @@ public class Permanent
             return false;
         }
 
+        if (!CanBeRemoved())
+            return false;
+
         #region 戦闘で消滅しない効果
         foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
         {
@@ -2311,6 +2314,9 @@ public class Permanent
                 return false;
             }
 
+            if (!CanBeRemoved())
+                return false;
+
             #region 効果で消滅しない効果
             foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
             {
@@ -2356,6 +2362,53 @@ public class Permanent
     }
     #endregion
 
+    #region Can Leave Field
+    public bool CanBeRemoved()
+    {
+        #region Effect that never disappears
+        foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
+        {
+            foreach (Permanent permanent in player.GetFieldPermanents())
+            {
+                #region Effects of permanents in play
+                foreach (ICardEffect cardEffect in permanent.EffectList(EffectTiming.None))
+                {
+                    if (cardEffect is ICanNotBeRemovedEffect)
+                    {
+                        if (cardEffect.CanUse(null))
+                        {
+                            if (((ICanNotBeRemovedEffect)cardEffect).CanNotBeRemoved(this))
+                            {
+                                return false;
+                            }
+                        }
+                    }
+                }
+                #endregion
+            }
+
+            #region player effect
+            foreach (ICardEffect cardEffect in player.EffectList(EffectTiming.None))
+            {
+                if (cardEffect is ICanNotBeRemovedEffect)
+                {
+                    if (cardEffect.CanUse(null))
+                    {
+                        if (((ICanNotBeRemovedEffect)cardEffect).CanNotBeRemoved(this))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            #endregion
+        }
+        #endregion
+
+        return true;
+    }
+    #endregion
+
     #region トークンかどうか
     public bool IsToken
     {