Browse Source

updates for 1.8.2.6

mbunch_kascope 1 year ago
parent
commit
d17a59252d

+ 7 - 9
Assets/CardEffect/BT21/Black/BT21_098.cs

@@ -127,7 +127,7 @@ namespace DCGO.CardEffects.BT21
 
                     List<Permanent> deleteTargetPermanents = new List<Permanent>();
 
-                    bool failedToDelete = false;
+                    bool failedToDelete = true;
 
                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DeletePeremanentAndProcessAccordingToResult(
                                     targetPermanents: new List<Permanent>() { card.PermanentOfThisCard() }, 
@@ -157,7 +157,7 @@ namespace DCGO.CardEffects.BT21
                                 canEndNotMax: false,
                                 selectPermanentCoroutine: null,
                                 afterSelectPermanentCoroutine: AfterSelectPermanentCoroutine,
-                                mode: SelectPermanentEffect.Mode.Destroy,
+                                mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
@@ -172,18 +172,16 @@ namespace DCGO.CardEffects.BT21
 
                         if (deleteTargetPermanents.Count > 0)
                         {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DeletePeremanentAndProcessAccordingToResult(targetPermanents: deleteTargetPermanents, activateClass: activateClass, successProcess: null, failureProcess: FailureProcess));
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DeletePeremanentAndProcessAccordingToResult(targetPermanents: deleteTargetPermanents, activateClass: activateClass, successProcess: SuccessDeleteProcess, failureProcess: null));
 
-                            IEnumerator FailureProcess()
+                            IEnumerator SuccessDeleteProcess(List<Permanent> permanents)
                             {
-                                failedToDelete = true;
+                                if(permanents.Count > 0)
+                                    failedToDelete = false;
+
                                 yield return null;
                             }
                         }
-                        else
-                        {
-                            failedToDelete = true;
-                        }
 
                         if (failedToDelete)
                         {

+ 1 - 1
Assets/CardEffect/BT21/Purple/BT21_076.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT21
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
                     return targetPermanent.TopCard.ContainsCardName("Growlmon") && 
-                           targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 5;
+                           targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));

+ 1 - 2
Assets/CardEffect/BT21/White/BT21_101.cs

@@ -235,7 +235,7 @@ namespace DCGO.CardEffects.BT21
                                 isShowOpponent: true,
                                 mode: SelectCardEffect.Mode.Custom,
                                 root: SelectCardEffect.Root.Custom,
-                                customRootCardList: card.PermanentOfThisCard().LinkedCards,
+                                customRootCardList: card.PermanentOfThisCard().DigivolutionCards,
                                 canLookReverseCard: true,
                                 selectPlayer: card.Owner,
                                 cardEffect: activateClass);
@@ -275,7 +275,6 @@ namespace DCGO.CardEffects.BT21
                 {
                     bool CanSelectDigimon(Permanent permanent)
                     {
-                        UnityEngine.Debug.Log($"CAN SELECT DIGIMON: {CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card)}, {selectedCard.CanLinkToTargetPermanent(permanent, false)}");
                         if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
                             return selectedCard.CanLinkToTargetPermanent(permanent, false);
 

+ 10 - 7
Assets/Scripts/Permanent.cs

@@ -1190,17 +1190,20 @@ public class Permanent
                         {
                             if (cardEffect != null)
                             {
-                                if (cardEffect.IsInheritedEffect && isTopCard)
+                                if (cardEffect.IsInheritedEffect && !isTopCard)
+                                {
+                                    _EffectList.Add(cardEffect);
                                     continue;
+                                }
 
-                                if (cardEffect.IsLinkedEffect && !cardSource.IsLinked)
+                                if (cardEffect.IsLinkedEffect && cardSource.IsLinked)
+                                {
+                                    _EffectList.Add(cardEffect);
                                     continue;
+                                }
 
-                                //if (isTopCard == cardEffect.IsInheritedEffect)
-                                //    continue;
-
-
-                                _EffectList.Add(cardEffect);
+                                if(isTopCard && !cardSource.IsLinked)
+                                    _EffectList.Add(cardEffect);
                             }
                         }
                     }