Răsfoiți Sursa

Updated Cards

cchmc-burkewm 1 an în urmă
părinte
comite
7f6d49f116
31 a modificat fișierele cu 184 adăugiri și 115 ștergeri
  1. 32 4
      .idea/.idea.DCGO/.idea/workspace.xml
  2. 1 4
      Assets/CardEffect/BT1/Blue/LovelyAttack_BT1_099.cs
  3. 74 0
      Assets/CardEffect/BT1/Blue/WereGarurumon_BT1_040.cs
  4. 11 0
      Assets/CardEffect/BT1/Blue/WereGarurumon_BT1_040.cs.meta
  5. 1 1
      Assets/CardEffect/BT1/Red/Metalgreymon_BT1_021.cs
  6. 1 4
      Assets/CardEffect/BT10/Blue/Regarexmon_BT10_027.cs
  7. 1 1
      Assets/CardEffect/BT10/Purple/Skullbulkimon_BT10_080.cs
  8. 18 12
      Assets/CardEffect/BT10/Red/ShoutmonX4B_BT10_012.cs
  9. 1 4
      Assets/CardEffect/BT11/Blue/IceStatue_BT11_099.cs
  10. 1 4
      Assets/CardEffect/BT12/Blue/ExLaser_BT12_101.cs
  11. 2 5
      Assets/CardEffect/BT12/Blue/Tonosamagekomon_BT12_026.cs
  12. 1 4
      Assets/CardEffect/BT13/Blue/Jellymon_BT13_023.cs
  13. 1 4
      Assets/CardEffect/BT13/Blue/Teslajellymon_BT13_026.cs
  14. 2 0
      Assets/CardEffect/BT14/Purple/Devimon_BT14_075.cs
  15. 2 2
      Assets/CardEffect/BT15/Black/Omekamon_BT15_060.cs
  16. 2 8
      Assets/CardEffect/BT15/Blue/Coelamon_BT15_023.cs
  17. 2 8
      Assets/CardEffect/BT15/Blue/Crabmon_BT15_019.cs
  18. 2 8
      Assets/CardEffect/BT15/Blue/Divermon_BT15_028.cs
  19. 17 0
      Assets/CardEffect/BT15/White/Apocalymon_BT15_102.cs
  20. 1 4
      Assets/CardEffect/BT2/Blue/ArcticBlizzard_BT2_094.cs
  21. 1 4
      Assets/CardEffect/BT5/Blue/AbsoluteBlust_BT5_097.cs
  22. 1 4
      Assets/CardEffect/BT5/Blue/Hexebraumon_BT5_032.cs
  23. 1 4
      Assets/CardEffect/BT6/Blue/HowlingMemoryBoost_BT6_097.cs
  24. 1 4
      Assets/CardEffect/BT7/Blue/Chackmon_BT7_021.cs
  25. 1 4
      Assets/CardEffect/BT7/Blue/HimiTomoki_BT7_086.cs
  26. 1 1
      Assets/CardEffect/BT7/Yellow/OrimotoIzumi_BT7_088.cs
  27. 1 4
      Assets/CardEffect/BT8/Blue/Frosbergmon_BT8_031.cs
  28. 1 4
      Assets/CardEffect/BT8/Blue/Submarimon_BT8_023.cs
  29. 1 4
      Assets/CardEffect/BT8/Blue/Yukiagumon_BT8_022.cs
  30. 1 1
      Assets/CardEffect/ST16/Purple/ShoutOfFriendly_ST16_15.cs
  31. 1 4
      Assets/CardEffect/ST2/Blue/Garurumon_ST2_06.cs

+ 32 - 4
.idea/.idea.DCGO/.idea/workspace.xml

@@ -5,8 +5,35 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1f770e58-b781-4cb0-ad93-4c50994f611d" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/Assets/CardEffect/BT1/Blue/WereGarurumon_BT1_040.cs" afterDir="false" />
       <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/CardEffect/EX7/Green/Pteromon_EX7_031.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX7/Green/Pteromon_EX7_031.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT1/Blue/LovelyAttack_BT1_099.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT1/Blue/LovelyAttack_BT1_099.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT1/Red/Metalgreymon_BT1_021.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT1/Red/Metalgreymon_BT1_021.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT10/Blue/Regarexmon_BT10_027.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT10/Blue/Regarexmon_BT10_027.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT10/Purple/Skullbulkimon_BT10_080.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT10/Purple/Skullbulkimon_BT10_080.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT10/Red/ShoutmonX4B_BT10_012.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT10/Red/ShoutmonX4B_BT10_012.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT11/Blue/IceStatue_BT11_099.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT11/Blue/IceStatue_BT11_099.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/ExLaser_BT12_101.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/ExLaser_BT12_101.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/Tonosamagekomon_BT12_026.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/Tonosamagekomon_BT12_026.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT13/Blue/Jellymon_BT13_023.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT13/Blue/Jellymon_BT13_023.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT13/Blue/Teslajellymon_BT13_026.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT13/Blue/Teslajellymon_BT13_026.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Devimon_BT14_075.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Devimon_BT14_075.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Black/Omekamon_BT15_060.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Black/Omekamon_BT15_060.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Coelamon_BT15_023.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Coelamon_BT15_023.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Crabmon_BT15_019.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Crabmon_BT15_019.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Divermon_BT15_028.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Divermon_BT15_028.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/White/Apocalymon_BT15_102.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/White/Apocalymon_BT15_102.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT2/Blue/ArcticBlizzard_BT2_094.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT2/Blue/ArcticBlizzard_BT2_094.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT5/Blue/AbsoluteBlust_BT5_097.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT5/Blue/AbsoluteBlust_BT5_097.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT5/Blue/Hexebraumon_BT5_032.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT5/Blue/Hexebraumon_BT5_032.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT6/Blue/HowlingMemoryBoost_BT6_097.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT6/Blue/HowlingMemoryBoost_BT6_097.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT7/Blue/Chackmon_BT7_021.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT7/Blue/Chackmon_BT7_021.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT7/Blue/HimiTomoki_BT7_086.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT7/Blue/HimiTomoki_BT7_086.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT7/Yellow/OrimotoIzumi_BT7_088.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT7/Yellow/OrimotoIzumi_BT7_088.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT8/Blue/Frosbergmon_BT8_031.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT8/Blue/Frosbergmon_BT8_031.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT8/Blue/Submarimon_BT8_023.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT8/Blue/Submarimon_BT8_023.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT8/Blue/Yukiagumon_BT8_022.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT8/Blue/Yukiagumon_BT8_022.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/ST2/Blue/Garurumon_ST2_06.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/ST2/Blue/Garurumon_ST2_06.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -50,9 +77,9 @@
   },
   "keyToStringList": {
     "rider.external.source.directories": [
-      "C:\\Users\\Andrej\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\DecompilerCache",
-      "C:\\Users\\Andrej\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\SourcesCache",
-      "C:\\Users\\Andrej\\AppData\\Local\\Symbols\\src"
+      "C:\\Users\\wwm0n\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\DecompilerCache",
+      "C:\\Users\\wwm0n\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\SourcesCache",
+      "C:\\Users\\wwm0n\\AppData\\Local\\Symbols\\src"
     ]
   }
 }]]></component>
@@ -118,6 +145,7 @@
       <workItem from="1720456596917" duration="698000" />
       <workItem from="1722408646322" duration="10730000" />
       <workItem from="1722421835652" duration="1365000" />
+      <workItem from="1726692825707" duration="3056000" />
     </task>
     <servers />
   </component>

+ 1 - 4
Assets/CardEffect/BT1/Blue/LovelyAttack_BT1_099.cs

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

+ 74 - 0
Assets/CardEffect/BT1/Blue/WereGarurumon_BT1_040.cs

@@ -0,0 +1,74 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace CardEffect.BT1.Blue
+{
+    public class WereGarurumon_BT1_040 : CEntity_Effect
+    {
+         public override List<ICardEffect> CardEffects(EffectTiming timing, CardSource card)
+    {
+        List<ICardEffect> cardEffects = new List<ICardEffect>();
+
+        if (timing == EffectTiming.OnAllyAttack)
+        {
+            ActivateClass activateClass = new ActivateClass();
+            activateClass.SetUpICardEffect("Memory +3", CanUseCondition, card);
+            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+            cardEffects.Add(activateClass);
+
+            string EffectDiscription()
+            {
+                return "[When Attacking] Gain 3 memory. At end of turn lose 3 memory.";
+            }
+
+            bool CanUseCondition(Hashtable hashtable)
+            {
+                return CardEffectCommons.CanTriggerOnAttack(hashtable, card);
+            }
+
+            bool CanActivateCondition(Hashtable hashtable)
+            {
+                if (CardEffectCommons.IsExistOnBattleArea(card))
+                {
+                    return true;
+                }
+
+                return false;
+            }
+
+            IEnumerator ActivateCoroutine(Hashtable _hashtable)
+            {
+                yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(3, activateClass));
+
+                        ActivateClass activateClass1 = new ActivateClass();
+                        activateClass1.SetUpICardEffect("Memory -3", CanUseCondition1, card);
+                        activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                        CardEffectCommons.AddEffectToPlayer(effectDuration: EffectDuration.UntilEachTurnEnd, card: card, cardEffect: activateClass1, timing: EffectTiming.OnEndTurn);
+
+                        string EffectDiscription1()
+                        {
+                            return "Lose 3 memory.";
+                        }
+
+                        bool CanUseCondition1(Hashtable hashtable)
+                        {
+                            return true;
+                        }
+
+                        bool CanActivateCondition1(Hashtable hashtable)
+                        {
+                            return true;
+                        }
+
+                        IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(-3, activateClass1));
+                        }
+            }
+        }
+
+        return cardEffects;
+    }
+    }
+}

+ 11 - 0
Assets/CardEffect/BT1/Blue/WereGarurumon_BT1_040.cs.meta

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

+ 1 - 1
Assets/CardEffect/BT1/Red/Metalgreymon_BT1_021.cs

@@ -21,7 +21,7 @@ public class Metalgreymon_BT1_021 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[When Attacking] Gain 3 memory. At end of turn lose 3 memory.";
+                return "[When Attacking] Gain 3 memory. At end of turn lose 3 memory.";
             }
 
             bool CanUseCondition(Hashtable hashtable)

+ 1 - 4
Assets/CardEffect/BT10/Blue/Regarexmon_BT10_027.cs

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

+ 1 - 1
Assets/CardEffect/BT10/Purple/Skullbulkimon_BT10_080.cs

@@ -176,7 +176,7 @@ public class Skullbulkimon_BT10_080 : CEntity_Effect
 
             bool CanSelectPermanentCondition(Permanent permanent)
             {
-                return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
+                return CardEffectCommons.IsExistOnBattleArea(card);
             }
 
             bool RootCondition(SelectCardEffect.Root root)

+ 18 - 12
Assets/CardEffect/BT10/Red/ShoutmonX4B_BT10_012.cs

@@ -64,14 +64,17 @@ public class ShoutmonX4B_BT10_012 : CEntity_Effect
 
             bool CanSelectCardCondition1(CardSource cardSource)
             {
-                if (cardSource.CardTraits.Contains("Xros Heart"))
+                if (cardSource.IsDigimon || cardSource.IsTamer)
                 {
-                    return true;
-                }
+                    if (cardSource.CardTraits.Contains("Xros Heart"))
+                    {
+                        return true;
+                    }
 
-                if (cardSource.CardTraits.Contains("XrosHeart"))
-                {
-                    return true;
+                    if (cardSource.CardTraits.Contains("XrosHeart"))
+                    {
+                        return true;
+                    }
                 }
 
                 return false;
@@ -351,14 +354,17 @@ public class ShoutmonX4B_BT10_012 : CEntity_Effect
 
             bool CanSelectCardCondition1(CardSource cardSource)
             {
-                if (cardSource.CardTraits.Contains("Xros Heart"))
+                if (cardSource.IsDigimon || cardSource.IsTamer)
                 {
-                    return true;
-                }
+                    if (cardSource.CardTraits.Contains("Xros Heart"))
+                    {
+                        return true;
+                    }
 
-                if (cardSource.CardTraits.Contains("XrosHeart"))
-                {
-                    return true;
+                    if (cardSource.CardTraits.Contains("XrosHeart"))
+                    {
+                        return true;
+                    }
                 }
 
                 return false;

+ 1 - 4
Assets/CardEffect/BT11/Blue/IceStatue_BT11_099.cs

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

+ 1 - 4
Assets/CardEffect/BT12/Blue/ExLaser_BT12_101.cs

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

+ 2 - 5
Assets/CardEffect/BT12/Blue/Tonosamagekomon_BT12_026.cs

@@ -47,12 +47,9 @@ public class Tonosamagekomon_BT12_026 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                 {
-                    if (permanent.DigivolutionCards.Count((cardSource) => !cardSource.CanNotTrashFromDigivolutionCards(activateClass)) >= 1)
+                    if (permanent.CanSelectBySkill(activateClass))
                     {
-                        if (permanent.CanSelectBySkill(activateClass))
-                        {
-                            return true;
-                        }
+                        return true;
                     }
                 }
 

+ 1 - 4
Assets/CardEffect/BT13/Blue/Jellymon_BT13_023.cs

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

+ 1 - 4
Assets/CardEffect/BT13/Blue/Teslajellymon_BT13_026.cs

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

+ 2 - 0
Assets/CardEffect/BT14/Purple/Devimon_BT14_075.cs

@@ -152,6 +152,8 @@ public class Devimon_BT14_075 : CEntity_Effect
                         }
                     }
 
+                    card.Owner.Enemy.HandCards = RandomUtility.ShuffledDeckCards(card.Owner.Enemy.HandCards);
+                    
                     List<CardSource> selectedCards = new List<CardSource>();
 
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();

+ 2 - 2
Assets/CardEffect/BT15/Black/Omekamon_BT15_060.cs

@@ -163,13 +163,13 @@ public class Omekamon_BT15_060 : CEntity_Effect
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("De-Digivolve 1 on 1 Digimon", CanUseCondition, card);
-            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
             activateClass.SetIsInheritedEffect(true);
             cardEffects.Add(activateClass);
 
             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)

+ 2 - 8
Assets/CardEffect/BT15/Blue/Coelamon_BT15_023.cs

@@ -27,10 +27,7 @@ public class Coelamon_BT15_023 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                 {
-                    if (permanent.DigivolutionCards.Count((cardSource) => !cardSource.CanNotTrashFromDigivolutionCards(activateClass)) >= 1)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
 
                 return false;
@@ -40,10 +37,7 @@ public class Coelamon_BT15_023 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                 {
-                    if (permanent.DigivolutionCards.Count >= 1)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
 
                 return false;

+ 2 - 8
Assets/CardEffect/BT15/Blue/Crabmon_BT15_019.cs

@@ -29,10 +29,7 @@ public class Crabmon_BT15_019 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                 {
-                    if (permanent.DigivolutionCards.Count((cardSource) => !cardSource.CanNotTrashFromDigivolutionCards(activateClass)) >= 1)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
 
                 return false;
@@ -42,10 +39,7 @@ public class Crabmon_BT15_019 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                 {
-                    if (permanent.DigivolutionCards.Count >= 1)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
 
                 return false;

+ 2 - 8
Assets/CardEffect/BT15/Blue/Divermon_BT15_028.cs

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

+ 17 - 0
Assets/CardEffect/BT15/White/Apocalymon_BT15_102.cs

@@ -38,6 +38,18 @@ public class Apocalymon_BT15_102 : CEntity_Effect
                 return false;
             }
 
+            bool CanSelectCardConditionPermenant(Permanent permanent)
+            {
+                if (permanent.IsDigimon)
+                {
+                    if (permanent.TopCard.ContainsTraits("Dark Masters") || permanent.TopCard.ContainsTraits("DarkMasters"))
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
             bool CardCondition(CardSource cardSource)
             {
                 if (cardSource == card)
@@ -82,6 +94,11 @@ public class Apocalymon_BT15_102 : CEntity_Effect
                     {
                         return true;
                     }
+
+                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, CanSelectCardConditionPermenant))
+                    {
+                        return true;
+                    }
                 }
 
                 return false;

+ 1 - 4
Assets/CardEffect/BT2/Blue/ArcticBlizzard_BT2_094.cs

@@ -28,10 +28,7 @@ public class ArcticBlizzard_BT2_094 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                 {
-                    if (permanent.DigivolutionCards.Count(CanSelectCardCondition) >= 1)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
 
                 return false;

+ 1 - 4
Assets/CardEffect/BT5/Blue/AbsoluteBlust_BT5_097.cs

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

+ 1 - 4
Assets/CardEffect/BT5/Blue/Hexebraumon_BT5_032.cs

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

+ 1 - 4
Assets/CardEffect/BT6/Blue/HowlingMemoryBoost_BT6_097.cs

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

+ 1 - 4
Assets/CardEffect/BT7/Blue/Chackmon_BT7_021.cs

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

+ 1 - 4
Assets/CardEffect/BT7/Blue/HimiTomoki_BT7_086.cs

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

+ 1 - 1
Assets/CardEffect/BT7/Yellow/OrimotoIzumi_BT7_088.cs

@@ -41,7 +41,7 @@ public class OrimotoIzumi_BT7_088 : CEntity_Effect
                     return true;
                 }
 
-                if (cardSource.CardTraits.Contains("Ten Warriors"))
+                if (cardSource.CardTraits.Contains("TenWarriors"))
                 {
                     return true;
                 }

+ 1 - 4
Assets/CardEffect/BT8/Blue/Frosbergmon_BT8_031.cs

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

+ 1 - 4
Assets/CardEffect/BT8/Blue/Submarimon_BT8_023.cs

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

+ 1 - 4
Assets/CardEffect/BT8/Blue/Yukiagumon_BT8_022.cs

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

+ 1 - 1
Assets/CardEffect/ST16/Purple/ShoutOfFriendly_ST16_15.cs

@@ -139,7 +139,7 @@ public class ShoutOfFriendly_ST16_15 : CEntity_Effect
                             activateClass1.SetUpICardEffect("Play this card from trash", CanUseCondition1, selectedPermanent.TopCard);
                             activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
                             activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                            CardEffectCommons.AddEffectToPermanent(targetPermanent: selectedPermanent, effectDuration: EffectDuration.UntilEachTurnEnd, card: card, cardEffect: activateClass1, timing: EffectTiming.OnDestroyedAnyone);
+                            CardEffectCommons.AddEffectToPermanent(targetPermanent: selectedPermanent, effectDuration: EffectDuration.UntilOpponentTurnEnd, card: card, cardEffect: activateClass1, timing: EffectTiming.OnDestroyedAnyone);
 
                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateBuffEffect(selectedPermanent));
 

+ 1 - 4
Assets/CardEffect/ST2/Blue/Garurumon_ST2_06.cs

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