1.8.6.8 build

Assets/CardEffect/BT21/Purple/BT21_077.cs

@@ -491,7 +491,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanPlay(CardSource cardSource)
                 {
-                    return ((cardSource.HasText("Gammamon") && cardSource.HasLevel && cardSource.Level <= 4) || cardSource.EqualsCardName("Canoweissmon")) &&
+                    return ((cardSource.HasText("Gammamon") && cardSource.HasLevel && cardSource.Level <= 4 && cardSource.IsDigimon) || cardSource.EqualsCardName("Canoweissmon")) &&
                            CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass);
                 }
 
@@ -571,7 +571,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanPlay(CardSource cardSource)
                 {
-                    return cardSource.HasText("Gammamon") && cardSource.HasLevel && cardSource.Level <= 4 &&
+                    return cardSource.HasText("Gammamon") && cardSource.HasLevel && cardSource.Level <= 4 && cardSource.IsDigimon &&
                            CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass);
                 }
 

Assets/CardEffect/BT4/Red/BT4_011.cs

@@ -13,6 +13,8 @@ public class BT4_011 : CEntity_Effect
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
+        List<Func<EffectTiming, ICardEffect>> getCardEffects = new List<Func<EffectTiming, ICardEffect>>();
+
         if (timing == EffectTiming.None)
         {
             bool Condition()
@@ -124,7 +126,7 @@ public class BT4_011 : CEntity_Effect
                 dontHaveDPClass.SetUpDontHaveDPClass(PermanentCondition: PermanentCondition);
                 dontHaveDPClass.SetNotShowUI(true);
 
-                List<Func<EffectTiming, ICardEffect>> getCardEffects =
+               getCardEffects =
                     new List<Func<EffectTiming, ICardEffect>>()
                     {
                                                 _ => changePermanentLevelClass,
@@ -137,21 +139,14 @@ public class BT4_011 : CEntity_Effect
                     card.Owner.PermanentEffects.Add(getCardEffect);
                 }
 
+                yield return null;
+            }
+        }
 
-                if (card.CanPlayCardTargetFrame(selectedPermanent.PermanentFrame, true, activateClass))
-                {
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                        targetPermanent: selectedPermanent,
-                        cardCondition: source => source == card,
-                        payCost: true,
-                        reduceCostTuple: null,
-                        fixedCostTuple: (fixedCost: 3, fixedCostCardCondition: null),
-                        ignoreDigivolutionRequirementFixedCost: -1,
-                        isHand: true,
-                        activateClass: activateClass,
-                        successProcess: null));
-                }
-
+        if(timing == EffectTiming.AfterPayCost)
+        {
+            if(getCardEffects.Count > 0)
+            {
                 foreach (Func<EffectTiming, ICardEffect> getCardEffect in getCardEffects)
                 {
                     card.Owner.PermanentEffects.Remove(getCardEffect);

Assets/Scripts/AttackProcess.cs

@@ -143,6 +143,8 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                     attackerTapHashtable).Tap());
             }
 
+            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
+
             // target arrow
             if (DefendingPermanent == null)
             {
@@ -165,7 +167,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
             }
 
             // activate cutin effects
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
+            //yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
             //yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(true, null));
 
             // callback that is processed before [On Attack]

Assets/Scripts/CardController.cs

@@ -4640,9 +4640,11 @@ public class SuspendPermanentsClass
             }
             #endregion
 
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
-
-            if (IsAttack) yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
+            if (IsAttack)
+            {
+                yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
+                yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
+            }
             else yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
 
             #endregion

Assets/Scripts/CardSource.cs

@@ -1139,8 +1139,8 @@ public class CardSource : MonoBehaviour
         if (testName.Contains("greymon"))
             return testName != "dorugreymon" && testName != "burninggreymon" && testName != "dexdorugreymon";
 
-        if (testName.Equals("argomon"))
-            return !testName.Contains("gargomon");
+        if (testName.Contains("argomon") && !testName.Contains("gargomon"))
+            return testName != "gargomon" && testName != "megagargomon" && testName != "blackmegagargomon";
 
         return passTest;
     }

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3697dde8997c1d5be7a921655efee578d036d493775610fce50e30a9a7041ce
+oid sha256:0b8ffac071a9bb67331b7560ddcb50014a4d36ef092b92d48bdf644536fb63e8
 size 20168