black bug fixes

Assets/CardEffect/EX6/Black/BryweLudramon_EX6_044.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DCGO.CardEffects
+namespace DCGO.CardEffects.EX6
 {
     public class BryweLudramon_EX6_044 : CEntity_Effect
     {
@@ -144,6 +144,10 @@ namespace DCGO.CardEffects
 
                     if (selectedPermanent != null)
                     {
+                        yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(
+                                new List<CardSource>() { card },
+                                activateClass));
+
                         List<Permanent> enemyPermanents = card.Owner.Enemy.GetBattleAreaDigimons().Where(IsEnemyPermanent).ToList();
 
                         foreach(Permanent permanent in enemyPermanents)

Assets/CardEffect/EX6/Black/Diaboromon_EX6_043.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DCGO.CardEffects
+namespace DCGO.CardEffects.EX6
 {
     public class Diaboromon_EX6_043 : CEntity_Effect
     {

Assets/CardEffect/EX6/Black/Infermon_EX6_041.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DCGO.CardEffects
+namespace DCGO.CardEffects.EX6
 {
     public class Infermon_EX6_041 : CEntity_Effect
     {

Assets/CardEffect/EX6/Black/Kakkinmon_EX6_005.cs

@@ -31,7 +31,12 @@ namespace DCGO.CardEffects.EX6
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return card.PermanentOfThisCard().DigivolutionCards.Count(HasLegendArms) > 0;
+                    if (CardEffectCommons.IsOwnerTurn(card))
+                    {
+                        return card.PermanentOfThisCard().DigivolutionCards.Count(HasLegendArms) > 0;
+                    }
+
+                    return false;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
@@ -43,30 +48,27 @@ namespace DCGO.CardEffects.EX6
                 {
                     CardSource selectedSource = null;
 
-                    if (card.PermanentOfThisCard().DigivolutionCards.Count(HasLegendArms) > 0)
-                    {
-                        SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-
-                        selectCardEffect.SetUp(
-                            canTargetCondition: null,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            canNoSelect: () => true,
-                            selectCardCoroutine: SelectCardCoroutine,
-                            afterSelectCardCoroutine: null,
-                            message: "Select 1 card with [Legend-Arms] trait to hand",
-                            maxCount: 1,
-                            canEndNotMax: false,
-                            isShowOpponent: true,
-                            mode: SelectCardEffect.Mode.AddHand,
-                            root: SelectCardEffect.Root.DigivolutionCards,
-                            customRootCardList: card.PermanentOfThisCard().DigivolutionCards.Where(HasLegendArms).ToList(),
-                            canLookReverseCard: false,
-                            selectPlayer: card.Owner,
-                            cardEffect: activateClass);
-
-                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-                    }
+                    SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+
+                    selectCardEffect.SetUp(
+                        canTargetCondition: null,
+                        canTargetCondition_ByPreSelecetedList: null,
+                        canEndSelectCondition: null,
+                        canNoSelect: () => true,
+                        selectCardCoroutine: SelectCardCoroutine,
+                        afterSelectCardCoroutine: null,
+                        message: "Select 1 card with [Legend-Arms] trait to hand",
+                        maxCount: 1,
+                        canEndNotMax: false,
+                        isShowOpponent: true,
+                        mode: SelectCardEffect.Mode.AddHand,
+                        root: SelectCardEffect.Root.Custom,
+                        customRootCardList: card.PermanentOfThisCard().DigivolutionCards.Where(HasLegendArms).ToList(),
+                        canLookReverseCard: false,
+                        selectPlayer: card.Owner,
+                        cardEffect: activateClass);
+
+                    yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
                     IEnumerator SelectCardCoroutine(CardSource cardSource)
                     {

Assets/CardEffect/EX6/Black/Kurisarimon_EX6_039.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DCGO.CardEffects
+namespace DCGO.CardEffects.EX6
 {
     public class Kurisarimon_EX6_039 : CEntity_Effect
     {

Assets/CardEffect/EX6/Black/Ludomon_EX6_038.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System;
 
-namespace DCGO.CardEffects
+namespace DCGO.CardEffects.EX6
 {
     public class Ludomon_EX6_038 : CEntity_Effect
     {
@@ -104,6 +104,10 @@ namespace DCGO.CardEffects
 
                         if (selectedPermanent != null)
                         {
+                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(
+                                new List<CardSource>() { card },
+                                activateClass));
+
                             yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                                 targetPermanent: selectedPermanent, 
                                 changeValue: 2000, 

Assets/CardEffect/EX6/Black/RaijiLudomon_EX6_042.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DCGO.CardEffects
+namespace DCGO.CardEffects.EX6
 {
     public class RaijiLudomon_EX6_042 : CEntity_Effect
     {
@@ -147,22 +147,26 @@ namespace DCGO.CardEffects
                             }
                         }
 
-                        if(selectedEnemy != null)
+                        if (selectedEnemy != null)
                         {
+                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(
+                                new List<CardSource>() { card },
+                                activateClass));
+
                             ActivateClass activateClass1 = new ActivateClass();
-                            activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedEnemy.TopCard);
+                            activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
                             activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                            activateClass1.SetEffectSourcePermanent(selectedEnemy);
-                            selectedEnemy.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                            activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                            selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
                             if (!selectedEnemy.TopCard.CanNotBeAffected(activateClass))
                             {
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedEnemy));
+                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
                             }
 
                             string EffectDiscription1()
                             {
-                                return "[Start of Your Main Phase] This Digimon attacks.";
+                                return "[Start of Your Main Phase] Attack with this Digimon.";
                             }
 
                             bool CanUseCondition1(Hashtable hashtable1)
@@ -185,9 +189,9 @@ namespace DCGO.CardEffects
                             {
                                 if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                 {
-                                    if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
+                                    if (!selectedEnemy.TopCard.CanNotBeAffected(activateClass))
                                     {
-                                        if (selectedPermanent.CanAttack(activateClass1))
+                                        if (selectedEnemy.CanAttack(activateClass1))
                                         {
                                             return true;
                                         }
@@ -201,7 +205,7 @@ namespace DCGO.CardEffects
                             {
                                 if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                 {
-                                    if (selectedPermanent.CanAttack(activateClass1))
+                                    if (selectedEnemy.CanAttack(activateClass1))
                                     {
                                         SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
 

Assets/CardEffect/EX6/Black/Spadamon_EX6_037.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DCGO.CardEffects
+namespace DCGO.CardEffects.EX6
 {
     public class Spadamon_EX6_037 : CEntity_Effect
     {
@@ -103,6 +103,10 @@ namespace DCGO.CardEffects
 
                         if(selectedPermanent != null)
                         {
+                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(
+                                new List<CardSource>() { card },
+                                activateClass));
+
                             yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(-1, activateClass));
                             yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
                         }
@@ -160,7 +164,7 @@ namespace DCGO.CardEffects
                             isShowOpponent: true,
                             mode: SelectCardEffect.Mode.Discard,
                             root: SelectCardEffect.Root.Hand,
-                            customRootCardList: card.PermanentOfThisCard().DigivolutionCards.Where(HasLegendArmInTrait).ToList(),
+                            customRootCardList: card.Owner.HandCards.Where(HasLegendArmInTrait).ToList(),
                             canLookReverseCard: false,
                             selectPlayer: card.Owner,
                             cardEffect: activateClass);

Assets/CardEffect/EX6/Black/TiaLudomon_EX6_040.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System;
 
-namespace DCGO.CardEffects
+namespace DCGO.CardEffects.EX6
 {
     public class TiaLudomon_EX6_040 : CEntity_Effect
     {
@@ -75,7 +75,7 @@ namespace DCGO.CardEffects
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(-1, activateClass));
-
+                    
                     if (CardEffectCommons.HasMatchConditionPermanent(IsLevel3OrHasLegendArmsTrait))
                     {
                         Permanent selectedPermanent = null;
@@ -109,6 +109,10 @@ namespace DCGO.CardEffects
 
                         if (selectedPermanent != null)
                         {
+                            yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(
+                                new List<CardSource>() { card },
+                                activateClass));
+
                             yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                                 targetPermanent: selectedPermanent,
                                 changeValue: 2000,