mbunch_kascope hai 1 ano
pai
achega
7521e71acc

+ 0 - 38
Assets/CardEffect/BT22/White/BT22_007.cs

@@ -138,44 +138,6 @@ namespace DCGO.CardEffects.BT22
 
             #endregion
 
-            #region All Turns
-
-            /*if (timing == EffectTiming.None)
-            {
-                string EffectDiscription()
-                {
-                    return "[Breeding] [All Turns] All of your [Mother Eater]s in the battle area are treated as having 16000 DP.";
-                }
-
-                bool Condition()
-                {
-                    return CardEffectCommons.IsExistOnBreedingAreaDigimon(card);
-                }
-
-                bool PermanentCondition(Permanent permanent)
-                {
-                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
-                    {
-                        if (permanent.TopCard.EqualsCardName("Mother Eater"))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-
-                cardEffects.Add(CardEffectFactory.ChangeDPStaticEffect(
-                permanentCondition: PermanentCondition,
-                changeValue: 16000,
-                isInheritedEffect: false,
-                card: card,
-                condition: Condition,
-                effectName: EffectDiscription));
-            }*/
-
-            #endregion
-
             #region On Play
 
             if (timing == EffectTiming.OnEnterFieldAnyone)

+ 1 - 1
Assets/CardEffect/BT22/White/BT22_082.cs

@@ -379,7 +379,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 2
Assets/CardEffect/BT22/White/BT22_094.cs

@@ -75,8 +75,7 @@ namespace DCGO.CardEffects.BT22
                 }
 
                 bool PlayCardCondition(CardSource cardSource)
-                    => CardEffectCommons.IsExistOnHand(cardSource) && 
-                       (cardSource.IsDigimon || cardSource.IsTamer) && 
+                    => (cardSource.IsDigimon || cardSource.IsTamer) && 
                        cardSource.HasCSTraits && cardSource.Owner == card.Owner;
 
                 bool CanUseCondition(Hashtable hashtable)

+ 4 - 4
Assets/CardEffect/BT22/Yellow/BT22_088.cs

@@ -47,8 +47,8 @@ namespace DCGO.CardEffects.BT22
                 bool IsShoemon(CardSource cardSource)
                 {
                     return CardEffectCommons.IsExistOnTrash(cardSource)
-                        && cardSource.EqualsCardName("IsShoemon")
-                        && CardEffectCommons.CanPlayAsNewPermanent(cardSource, false, activateClass);
+                        && cardSource.EqualsCardName("Shoemon")
+                        && CardEffectCommons.CanPlayAsNewPermanent(cardSource, false, activateClass, SelectCardEffect.Root.Trash);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -106,13 +106,13 @@ namespace DCGO.CardEffects.BT22
                                     activateETB: true));
                         }
 
+                        UnityEngine.Debug.Log($"THEN: {card.Owner.GetBattleAreaDigimons().Any()}, {CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsShoemon)}");
                         if (!card.Owner.GetBattleAreaDigimons().Any() && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsShoemon))
                         {
                             CardSource selectedTrashCard = null;
 
                             #region Select Trash card
 
-                            int maxCount = Math.Min(1, CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, IsShoemon));
                             SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
                             selectCardEffect.SetUp(
@@ -123,7 +123,7 @@ namespace DCGO.CardEffects.BT22
                                 selectCardCoroutine: SelectCardCoroutine,
                                 afterSelectCardCoroutine: null,
                                 message: "Select 1 [Shoemon] to play",
-                                maxCount: maxCount,
+                                maxCount: 1,
                                 canEndNotMax: false,
                                 isShowOpponent: true,
                                 mode: SelectCardEffect.Mode.Custom,

+ 4 - 16
Assets/CardEffect/P/Yellow/P_195.cs

@@ -95,14 +95,8 @@ namespace DCGO.CardEffects.P
 
                 bool IsAegiomon(CardSource source)
                 {
-                    if (source.EqualsCardName("Aegiomon"))
-                    {
-                        return card.Owner.GetBattleAreaDigimons().Any(x =>
-                            card.CanPlayCardTargetFrame(x.PermanentFrame, false, activateClass)
-                        );
-                    }
-
-                    return false;
+                    return source.IsDigimon &&
+                           source.EqualsCardName("Aegiomon");
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)
@@ -127,7 +121,7 @@ namespace DCGO.CardEffects.P
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     bool CanPlayElecmon = CardEffectCommons.HasMatchConditionOwnersHand(card, IsElecmon);
-                    bool CanEvoAegiomon = CardEffectCommons.HasMatchConditionOwnersHand(card, IsAegiomon);
+                    bool CanEvoAegiomon = CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition);
 
                     #region Option Selection
 
@@ -209,7 +203,7 @@ namespace DCGO.CardEffects.P
                                 mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 [Agumon] to digivolve.", "The opponent is selecting 1 [Agumon] to digivolve.");
+                            selectPermanentEffect.SetUpCustomMessage("Select 1 digimon to digivolve.", "The opponent is selecting 1 digimon to digivolve.");
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
                             IEnumerator SelectPermanentCoroutine(Permanent permanent)
@@ -238,12 +232,6 @@ namespace DCGO.CardEffects.P
                     }
 
                     #endregion
-                    if (CanPlayElecmon || CanEvoAegiomon)
-                    {
-
-                    }
-
-                    yield return null;
                 }
             }
             #endregion

+ 18 - 16
Assets/Scripts/CardObjectController.cs

@@ -1009,28 +1009,30 @@ public class CardObjectController : MonoBehaviour
                 FieldCardFrame moveTargetFrame = movingPermanent.TopCard.PreferredFrame();
 
                 if (toBreeding)
+                {
                     moveTargetFrame = player.fieldCardFrames.Filter(frame => frame.isBreedingAreaFrame()).ToList()[0];
 
-                #region cut in effect
+                    #region cut in effect
 
-                // "When permanents would remove field" effect
-                yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(
-                    CardEffectCommons.WhenPermanentWouldRemoveFieldCheckHashtable(
-                        new List<Permanent> { movingPermanent },
-                        effect,
-                        null
-                    ),
-                    EffectTiming.WhenRemoveField));
+                    // "When permanents would remove field" effect
+                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(
+                        CardEffectCommons.WhenPermanentWouldRemoveFieldCheckHashtable(
+                            new List<Permanent> { movingPermanent },
+                            effect,
+                            null
+                        ),
+                        EffectTiming.WhenRemoveField));
 
-                if (GManager.instance.autoProcessing_CutIn.HasAwaitingActivateEffects())
-                {
-                    // effect
-                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.ShrinkSecurityDigimonDisplay());
+                    if (GManager.instance.autoProcessing_CutIn.HasAwaitingActivateEffects())
+                    {
+                        // effect
+                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.ShrinkSecurityDigimonDisplay());
 
-                    // cut in effect process
-                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, null));
+                        // cut in effect process
+                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, null));
+                    }
+                    #endregion
                 }
-                #endregion
 
                 if (moveTargetFrame != null && moveTargetFrame != null)
                 {

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4eac1ab790db484b48551e2dd4bb033c76d4beeae2e44d9e715e77606d63231a
+oid sha256:26a29f8e88cd86b4ff013f757abd04968e8d704fcb09380e02d4766c81be54e6
 size 20169