mbunch_kascope 1 rok temu
rodzic
commit
5d10d63cd2

+ 1 - 1
Assets/CardEffect/BT21/Red/BT21_018.cs

@@ -20,7 +20,7 @@ namespace DCGO.CardEffects.BT21
                     return targetPermanent.TopCard.EqualsTraits("Stnd.");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 4, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
             #endregion
 

+ 1 - 1
Assets/CardEffect/BT21/Red/BT21_029.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.BT21
 
             #region Progress
 
-            if (timing == EffectTiming.OnAllyAttack || timing == EffectTiming.OnEnterFieldAnyone)
+            if (timing == EffectTiming.RulesTiming || timing == EffectTiming.AfterEffectsActivate)
             {
                 bool Condition()
                 {

+ 1 - 1
Assets/CardEffect/BT21/Red/BT21_092.cs

@@ -228,7 +228,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.HasPlayCost || cardSource.HasUseCost)
+                    if (cardSource.HasPlayCost)
                     {
                         if (cardSource.BasePlayCostFromEntity <= 5)
                         {

+ 2 - 1
Assets/CardEffect/BT8/Red/BT8_097.cs

@@ -140,7 +140,8 @@ public class BT8_097 : CEntity_Effect
 
                 bool CardEffectCondition(ICardEffect cardEffect)
                 {
-                    return cardEffect.EffectSourceCard.Owner == card.Owner.Enemy;
+                    return cardEffect != null &&
+                           cardEffect.EffectSourceCard.Owner == card.Owner.Enemy;
                 }
 
                 List<Permanent> destroyTargetPermanents = card.Owner.Enemy.GetBattleAreaDigimons().Filter(CanSelectPermanentCondition);

+ 1 - 1
Assets/CardEffect/P/Red/P_182.cs

@@ -146,7 +146,7 @@ namespace DCGO.CardEffects.P
 
             #region All Turns
 
-            if (timing == EffectTiming.OnEnterFieldAnyone || timing == EffectTiming.AfterEffectsActivate)
+            if (timing == EffectTiming.RulesTiming || timing == EffectTiming.AfterEffectsActivate)
             {
                 if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                 {

+ 3 - 0
Assets/Scripts/AutoProcessing.cs

@@ -120,6 +120,9 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
         //Rule processing
         yield return ContinuousController.instance.StartCoroutine(RuleProcess());
 
+        //Rule Timing
+        yield return ContinuousController.instance.StartCoroutine(StackSkillInfos(null, EffectTiming.RulesTiming));
+
         //Trigger effect processing
         yield return ContinuousController.instance.StartCoroutine(TriggeredSkillProcess(false, null));
 

+ 1 - 1
Assets/Scripts/Combinations.cs

@@ -119,7 +119,7 @@ public static class Combinations
         }
 
         int colorCount = cardsCorrespondingToColor.ToList().Count((cardSource) => cardSource != null);
-        UnityEngine.Debug.Log($"COUNTS: {colorCount} >= {maxColorCount}");
+
         if (colorCount >= maxColorCount)
         {
             maxColorCount = colorCount;

+ 2 - 1
Assets/Scripts/ICardEffect.cs

@@ -919,7 +919,8 @@ public enum EffectTiming
     AfterEffectsActivate,
     WhenWouldDigivolutionCardDiscarded,
     WhenLinked,
-    WhenTopCardTrashed
+    WhenTopCardTrashed,
+    RulesTiming
 }
 
 #endregion