mbunch_kascope 2 anni fa
parent
commit
352b18fd39

+ 3 - 2
Assets/CardEffect/LM/Blue/Thetismon_LM_004.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace DCGO.CardEffects.LM
 {
@@ -20,7 +21,7 @@ namespace DCGO.CardEffects.LM
 
                 string EffectDiscription()
                 {
-                    return "[On Play] [When Digivolving] By trashing 2 blue cards fin your hand, unsuspend 1 of your Digimon and 1 of your [Kiyoshiro Higashimitarai], and this Digimon gains <Blocker> until the end of your opponent's turn.";
+                    return "[On Play] [When Digivolving] By trashing 2 blue cards in your hand, unsuspend 1 of your Digimon and 1 of your [Kiyoshiro Higashimitarai], and this Digimon gains <Blocker> until the end of your opponent's turn.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)
@@ -43,7 +44,7 @@ namespace DCGO.CardEffects.LM
                     {
                         if (permanent.IsTamer)
                         {
-                            if(permanent.TopCard.CardNames.Contains("Kiyoshiro Higashimitarai"))
+                            if (permanent.TopCard.CardNames.Contains("Kiyoshiro Higashimitarai") || permanent.TopCard.CardNames.Contains("KiyoshiroHigashimitarai"))
                                 return true;
                         }
                     }

+ 2 - 2
Assets/CardEffect/LM/Green/Chamblemon_LM_010.cs

@@ -40,12 +40,12 @@ namespace DCGO.CardEffects.LM
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                        return CardEffectCommons.IsExistOnBattleArea(card);
+                    return CardEffectCommons.IsExistOnBattleArea(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, CanSelectPermanentCondition))
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
                         int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
 

+ 3 - 3
Assets/CardEffect/LM/Green/Diarbbitmon_LM_013.cs

@@ -240,10 +240,10 @@ namespace DCGO.CardEffects.LM
                                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.BouncePeremanentAndProcessAccordingToResult(
                                         targetPermanents: new List<Permanent>() { playedCard.PermanentOfThisCard() },
                                         activateClass: activateClass,
-                                        successProcess: SuccessProcess(),
+                                        successProcess: null,
                                         failureProcess: null));
 
-                                    IEnumerator SuccessProcess()
+                                    /*IEnumerator SuccessProcess()
                                     {
                                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
@@ -274,7 +274,7 @@ namespace DCGO.CardEffects.LM
                                                 cardEffect: activateClass);
 
                                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                                    }
+                                    }*/
                                 }
                             }
 

+ 1 - 1
Assets/CardEffect/LM/Purple/Gyuukimon_LM_018.cs

@@ -12,7 +12,7 @@ namespace DCGO.CardEffects.LM
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Place 1 levl 4 Digimon", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Delete 1 levl 4 Digimon", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
                 cardEffects.Add(activateClass);
 

+ 12 - 6
Assets/CardEffect/LM/Purple/Regulusmon_LM_017.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 using System.Linq;
 
 namespace DCGO.CardEffects.LM
@@ -171,6 +172,7 @@ namespace DCGO.CardEffects.LM
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete 1 Digimon, Play 1 Digimon", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
+                activateClass.SetHashString("Delete_Play_LM_017");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -199,18 +201,18 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
+                    Debug.Log($"CanUseCondition");
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
+                        Debug.Log($"CanUseCondition: Exists");
                         if (CardEffectCommons.CanTriggerOnAddDigivolutionCard(
                                 hashtable: hashtable,
                                 permanentCondition: permanent => permanent == card.PermanentOfThisCard(),
                                 cardEffectCondition: cardEffect => cardEffect.EffectSourceCard != null,
                                 cardCondition: null))
                         {
-                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                            {
-                                return true;
-                            }
+                            Debug.Log($"CanUseCondition: Can Trigger OnAddDigivolution");
+                            return true;
                         }
                     }
 
@@ -241,7 +243,7 @@ namespace DCGO.CardEffects.LM
                         mode: SelectPermanentEffect.Mode.Destroy,
                         cardEffect: activateClass);
 
-                    selectPermanentEffect.SetUpCustomMessage("Select 1 card to place at the bottom of digivolution cards.", "The opponent is selecting 1 card to place at the bottom of digivolution cards.");
+                    selectPermanentEffect.SetUpCustomMessage("Select 1 digimon to delete.", "The opponent is selecting 1 digimon to delete.");
 
                     yield return StartCoroutine(selectPermanentEffect.Activate());
 
@@ -249,10 +251,12 @@ namespace DCGO.CardEffects.LM
                     {
                         selectedCards.Add(permanent);
 
+                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DeletePeremanentAndProcessAccordingToResult(targetPermanents: selectedCards, activateClass: activateClass, successProcess: permanents => SuccessProcess(), failureProcess: null));
+
                         yield return null;
                     }
 
-                    if (selectedCards.Count >= 1)
+                    IEnumerator SuccessProcess()
                     {
                         ActivateClass activateByClass = new ActivateClass();
                         activateByClass.SetUpICardEffect("Play 1 Digimon", CanUseByCondition, card);
@@ -315,6 +319,8 @@ namespace DCGO.CardEffects.LM
                                 root: SelectCardEffect.Root.Trash,
                                 activateETB: true));
                         }
+
+                        yield return null;
                     }
                 }
             }

+ 1 - 1
Assets/CardEffect/LM/Red/Siriusmon_LM_001.cs

@@ -168,7 +168,7 @@ namespace DCGO.CardEffects.LM
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Gain Memory", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

+ 2 - 1
Assets/CardEffect/LM/White/Bokomon_LM_019.cs

@@ -87,7 +87,8 @@ namespace DCGO.CardEffects.LM
                     {
                         if (permanent.TopCard.HasText("Gammamon") && !permanent.TopCard.CardNames.Contains("Bokomon"))
                         {
-                            return true;
+                            if (permanent.willBeRemoveField)
+                                return true;
                         }
                     }
 

+ 3 - 2
Assets/Scripts/CardSource.cs

@@ -1668,10 +1668,11 @@ public class CardSource : MonoBehaviour
     }
     #endregion
 
-    #region whether this card has [Fortitude]
+    #region whether this card has [Blocker]
     public bool HasBlocker =>
         EffectList(EffectTiming.None)
-            .Some(cardEffect => cardEffect is BlockerClass
+            .Some(cardEffect => cardEffect is BlockerClass 
+                && cardEffect.CanUseCondition == null
                 && !cardEffect.IsInheritedEffect && !cardEffect.IsSecurityEffect);
     #endregion
 

+ 3 - 3
Assets/Scripts/ContinuousController.cs

@@ -225,9 +225,9 @@ public class ContinuousController : MonoBehaviour
 
         GyuukimonToken = new CEntity_Base()
         {
-            cardColors = new List<CardColor>() { CardColor.White },
-            PlayCost = 14,
-            Level = 6,
+            cardColors = new List<CardColor>() { CardColor.Purple },
+            PlayCost = 7,
+            Level = 5,
             CardName_JPN = "ギュウキモン",
             CardName_ENG = "Gyuukimon",
             Form_JPN = new List<string>() { "究極の" },