Quellcode durchsuchen

1.10.013 updates (1)

mbunch_kascope vor 1 Jahr
Ursprung
Commit
95f47ad436

+ 2 - 2
Assets/CardEffect/BT15/Black/BT15_065.cs

@@ -277,9 +277,9 @@ namespace DCGO.CardEffects.BT15
                                 canEndNotMax: false,
                                 isShowOpponent: true,
                                 mode: SelectCardEffect.Mode.Discard,
-                                root: SelectCardEffect.Root.DigivolutionCards,
+                                root: SelectCardEffect.Root.Custom,
                                 customRootCardList: card.PermanentOfThisCard().DigivolutionCards,
-                                canLookReverseCard: true,
+                                canLookReverseCard: false,
                                 selectPlayer: card.Owner,
                                 cardEffect: activateClass);
 

+ 1 - 1
Assets/CardEffect/BT16/Red/BT16_014.cs

@@ -109,7 +109,7 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (cardSource.IsOption)
                     {
-                        if (cardSource.CardNames.Contains("GodFlame") || cardSource.CardTraits.Contains("Four Great Dragons") || cardSource.CardTraits.Contains("FourGreatDragons"))
+                        if (cardSource.EqualsCardName("God Flame") || cardSource.EqualsTraits("Four Great Dragons"))
                         {
                             if (!cardSource.CanNotPlayThisOption)
                             {

+ 2 - 1
Assets/CardEffect/BT18/Black/BT18_070.cs

@@ -228,7 +228,8 @@ namespace DCGO.CardEffects.BT18
                                         ignoreDigivolutionRequirementFixedCost: 3,
                                         isHand: true,
                                         activateClass: activateClass,
-                                        successProcess: null));
+                                        successProcess: null,
+                                        isOptional:false));
                             }
                         }
                     }

+ 2 - 1
Assets/CardEffect/BT18/Purple/BT18_081.cs

@@ -229,7 +229,8 @@ namespace DCGO.CardEffects.BT18
                                         isHand: true,
                                         activateClass: activateClass,
                                         successProcess: null,
-                                        failedProcess: DigivolvedFailed()));
+                                        failedProcess: DigivolvedFailed(),
+                                        isOptional:false));
                             }
 
                             IEnumerator DigivolvedFailed()

+ 2 - 2
Assets/CardEffect/BT18/Yellow/BT18_032.cs

@@ -76,14 +76,14 @@ namespace DCGO.CardEffects.BT18
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("1 of opponent's Digimon gets -2000 DP", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 activateClass.SetHashString("WhenAttackingInherit_Luxmon_BT18_032");
                 activateClass.SetIsInheritedEffect(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
                 {
-                    return "[When Attacking] 1 of your opponent's Digimon gets -2000 DP for the turn.";
+                    return "[When Attacking] [Once Per Turn] 1 of your opponent's Digimon gets -2000 DP for the turn.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

+ 1 - 0
Assets/CardEffect/BT20/Purple/BT20_096.cs

@@ -194,6 +194,7 @@ namespace DCGO.CardEffects.BT20
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete 1 of your opponent's level 6 or lower Digimon.", CanUseCondition, card);
                 activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetIsSecurityEffect(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

+ 1 - 1
Assets/CardEffect/BT20/Yellow/BT20_037.cs

@@ -88,7 +88,7 @@ namespace DCGO.CardEffects.BT20
 
                 bool IsLevel6(CardSource source)
                 {
-                    return source.HasLevel && source.IsLevel6;
+                    return source.HasLevel && source.IsLevel6 && !source.IsFlipped;
                 }
 
                 bool OpponentsDigimonOrTamer(Permanent permanent)

+ 1 - 1
Assets/CardEffect/BT21/Black/BT21_055.cs

@@ -102,7 +102,7 @@ namespace DCGO.CardEffects.BT21
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: null,
                         maxCount: 1,
-                        canNoSelect: true,
+                        canNoSelect: false,
                         canEndNotMax: false,
                         selectPermanentCoroutine: null,
                         afterSelectPermanentCoroutine: null,

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

@@ -404,7 +404,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return isExistOnField(card) && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, targetPermanentCondition);
+                    return isExistOnField(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 5 - 3
Assets/CardEffect/BT21/Red/BT21_018.cs

@@ -228,7 +228,7 @@ namespace DCGO.CardEffects.BT21
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("This digimon may attack", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
                 activateClass.SetIsLinkedEffect(true);
                 cardEffects.Add(activateClass);
 
@@ -237,6 +237,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
+                    UnityEngine.Debug.Log($"CAN USE: {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}, {CardEffectCommons.CanTriggerWhenLinking(hashtable, PermanentCondition, card)}");
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.CanTriggerWhenLinking(hashtable, PermanentCondition, card))
@@ -249,9 +250,10 @@ namespace DCGO.CardEffects.BT21
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
+                    UnityEngine.Debug.Log($"CAN ACTIVATE: {CardEffectCommons.IsExistOnBattleAreaDigimon(card)}, {card.PermanentOfThisCard().CanAttack(activateClass)}");
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        if (card.PermanentOfThisCard().TopCard.PermanentOfThisCard().CanAttack(activateClass))
+                        if (card.PermanentOfThisCard().CanAttack(activateClass))
                         {
                             return true;
                         }
@@ -261,7 +263,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool PermanentCondition(Permanent permanent)
                 {
-                    return permanent == card.PermanentOfThisCard().TopCard.PermanentOfThisCard();
+                    return permanent == card.PermanentOfThisCard();
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/BT22/Red/BT22_009.cs

@@ -122,7 +122,7 @@ namespace DCGO.CardEffects.BT22
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete 1 digimon with less then 4K DP", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, _ => SharedActivateCoroutine(activateClass), 1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, _ => SharedActivateCoroutine(activateClass), -1, false, EffectDiscription());
                 activateClass.SetIsLinkedEffect(true);
                 cardEffects.Add(activateClass);
 

+ 2 - 2
Assets/CardEffect/BT22/Yellow/BT22_035.cs

@@ -408,8 +408,8 @@ namespace DCGO.CardEffects.BT22
             {
                 int dpMinus = card.Owner.GetBattleAreaDigimons().Count(x => x.TopCard.HasAppmonTraits) * 4000;
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect($"-{dpMinus} DP", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpICardEffect($"-4000 DP for each Digimon with [Appmon] trait", CanUseCondition, card);
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 activateClass.SetIsLinkedEffect(true);
                 cardEffects.Add(activateClass);
 

+ 1 - 1
Assets/CardEffect/BT22/Yellow/BT22_038.cs

@@ -294,7 +294,7 @@ namespace DCGO.CardEffects.BT22
 
                                 #endregion
 
-                                selectedPermanent.UntilOpponentTurnEndEffects.Add(_ => invalidationClass);
+                                selectedPermanent.UntilOwnerTurnEndEffects.Add(_ => invalidationClass);
 
                                 yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                                     targetPermanent: selectedPermanent,

+ 66 - 66
Assets/CardEffect/EX3/Green/EX3_043.cs

@@ -20,7 +20,7 @@ namespace DCGO.CardEffects.EX3
 
                 string EffectDiscription()
                 {
-                    return "<Digisorption -3> (When one of your Digimon digivolves into this card from your hand, you may suspend 1 of your Digimon to reduce the memory cost of the digivolution by 3.)";
+                    return "<Digisorption -3> (When one of your Digimon digivolves into this card from your hand, you may suspend 1 of your Digimon to reduce the memory cost of the digivolution by 2.)";
                 }
 
                 bool CanSelectCondition_CheckAvailability(Permanent permanent)
@@ -116,13 +116,15 @@ namespace DCGO.CardEffects.EX3
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    #region 
+                    #region ?z???i???????????
+
                     Hashtable hashtable = new Hashtable();
                     hashtable.Add("CardEffect", activateClass);
 
                     foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players_ForTurnPlayer)
                     {
-                        #region 
+                        #region ???p?[?}?l???g?????
+
                         foreach (Permanent permanent1 in player.GetFieldPermanents())
                         {
                             foreach (ICardEffect cardEffect in permanent1.EffectList(EffectTiming.WhenDigisorption))
@@ -136,9 +138,11 @@ namespace DCGO.CardEffects.EX3
                                 }
                             }
                         }
+
                         #endregion
 
-                        #region 
+                        #region ?v???C???[?????
+
                         foreach (ICardEffect cardEffect in player.EffectList(EffectTiming.WhenDigisorption))
                         {
                             if (cardEffect is ActivateICardEffect)
@@ -149,10 +153,11 @@ namespace DCGO.CardEffects.EX3
                                 }
                             }
                         }
+
                         #endregion
                     }
 
-
+                    //??????????????
                     yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(false, AutoProcessing.HasExecutedSameEffect));
 
                     #endregion
@@ -178,101 +183,96 @@ namespace DCGO.CardEffects.EX3
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
-                        List<Permanent> selectedPermanents = new List<Permanent>();
-
                         IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                         {
-                            selectedPermanents = permanents.Clone();
-
                             yield return null;
 
-                        }
-
-                        if (selectedPermanents.Count >= 1)
-                        {
-                            if (card.Owner.CanReduceCost(new List<Permanent>() { new Permanent(new List<CardSource>()) }, card))
+                            if (permanents.Count >= 1)
                             {
-                                ContinuousController.instance.PlaySE(GManager.instance.GetComponent<Effects>().BuffSE);
-                            }
+                                if (card.Owner.CanReduceCost(new List<Permanent>() { new Permanent(new List<CardSource>()) }, card))
+                                {
+                                    ContinuousController.instance.PlaySE(GManager.instance.GetComponent<Effects>().BuffSE);
+                                }
 
-                            ChangeCostClass changeCostClass = new ChangeCostClass();
-                            changeCostClass.SetUpICardEffect("Digivolution Cost -3", CanUseCondition1, card);
-                            changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
-                            card.Owner.UntilCalculateFixedCostEffect.Add((_timing) => changeCostClass);
+                                ChangeCostClass changeCostClass = new ChangeCostClass();
+                                changeCostClass.SetUpICardEffect("Digivolution Cost -3", CanUseCondition1, card);
+                                changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
+                                card.Owner.UntilCalculateFixedCostEffect.Add((_timing) => changeCostClass);
 
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ShowReducedCost(_hashtable));
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ShowReducedCost(_hashtable));
 
-                            bool CanUseCondition1(Hashtable hashtable)
-                            {
-                                return true;
-                            }
+                                bool CanUseCondition1(Hashtable hashtable)
+                                {
+                                    return true;
+                                }
 
-                            int ChangeCost(CardSource cardSource, int Cost, SelectCardEffect.Root root, List<Permanent> targetPermanents)
-                            {
-                                if (CardSourceCondition(cardSource))
+                                int ChangeCost(CardSource cardSource, int Cost, SelectCardEffect.Root root, List<Permanent> targetPermanents)
                                 {
-                                    if (RootCondition(root))
+                                    if (CardSourceCondition(cardSource))
                                     {
-                                        if (PermanentsCondition(targetPermanents))
+                                        if (RootCondition(root))
                                         {
-                                            Cost -= 3;
+                                            if (PermanentsCondition(targetPermanents))
+                                            {
+                                                Cost -= 3;
+                                            }
                                         }
                                     }
-                                }
 
-                                return Cost;
-                            }
+                                    return Cost;
+                                }
 
-                            bool PermanentsCondition(List<Permanent> targetPermanents)
-                            {
-                                if (targetPermanents != null)
+                                bool PermanentsCondition(List<Permanent> targetPermanents)
                                 {
-                                    if (targetPermanents.Count(PermanentCondition) >= 1)
+                                    if (targetPermanents != null)
                                     {
-                                        return true;
+                                        if (targetPermanents.Count(PermanentCondition) >= 1)
+                                        {
+                                            return true;
+                                        }
                                     }
-                                }
 
-                                return false;
-                            }
+                                    return false;
+                                }
 
-                            bool PermanentCondition(Permanent targetPermanent)
-                            {
-                                if (targetPermanent.TopCard != null)
+                                bool PermanentCondition(Permanent targetPermanent)
                                 {
-                                    if (targetPermanent.TopCard.Owner == card.Owner)
+                                    if (targetPermanent.TopCard != null)
                                     {
-                                        if (targetPermanent.TopCard.Owner.GetBattleAreaPermanents().Contains(targetPermanent))
+                                        if (targetPermanent.TopCard.Owner == card.Owner)
                                         {
-                                            return true;
+                                            if (targetPermanent.TopCard.Owner.GetBattleAreaPermanents().Contains(targetPermanent))
+                                            {
+                                                return true;
+                                            }
                                         }
                                     }
-                                }
 
-                                return false;
-                            }
+                                    return false;
+                                }
 
-                            bool CardSourceCondition(CardSource cardSource)
-                            {
-                                if (cardSource != null)
+                                bool CardSourceCondition(CardSource cardSource)
                                 {
-                                    if (cardSource == card)
+                                    if (cardSource != null)
                                     {
-                                        return true;
+                                        if (cardSource == card)
+                                        {
+                                            return true;
+                                        }
                                     }
-                                }
 
-                                return false;
-                            }
+                                    return false;
+                                }
 
-                            bool RootCondition(SelectCardEffect.Root root)
-                            {
-                                return true;
-                            }
+                                bool RootCondition(SelectCardEffect.Root root)
+                                {
+                                    return true;
+                                }
 
-                            bool isUpDown()
-                            {
-                                return true;
+                                bool isUpDown()
+                                {
+                                    return true;
+                                }
                             }
                         }
                     }

+ 1 - 1
Assets/CardEffect/EX8/Purple/EX8_061.cs

@@ -200,7 +200,7 @@ namespace DCGO.CardEffects.EX8
                         selectPlayer: card.Owner,
                         cardEffect: activateClass);
 
-                    selectCardEffect.SetUpCustomMessage("Select 1 digivolution card to play.", "The opponent is selecting 1 digivolution card to play.");
+                    selectCardEffect.SetUpCustomMessage("Select 1 digivolution card to play.", "The opponent is selecting card to play.");
                     selectCardEffect.SetUpCustomMessage_ShowCard("Played Card");
 
                     yield return StartCoroutine(selectCardEffect.Activate());

+ 1 - 0
Assets/Scripts/CardController.cs

@@ -1053,6 +1053,7 @@ public class HatchDigiEggClass
         ActivateETB: true);
 
         playPermanentClass.SetIsBreedingArea();
+        playPermanentClass.SetIsHatching();
 
         yield return ContinuousController.instance.StartCoroutine(playPermanentClass.PlayPermanent());
 

+ 4 - 3
Assets/Scripts/CardEffectCommons.cs

@@ -501,7 +501,8 @@ public partial class CardEffectCommons
         //bool ignoreLevel = false,
         bool ignoreSelection = false,
         IgnoreRequirement ignoreRequirements = IgnoreRequirement.None,
-        IEnumerator failedProcess = null)
+        IEnumerator failedProcess = null,
+        bool isOptional = true)
     {
         if (targetPermanent == null) yield break;
         if (targetPermanent.TopCard == null) yield break;
@@ -719,7 +720,7 @@ public partial class CardEffectCommons
                     canTargetCondition_ByPreSelecetedList: null,
                     canEndSelectCondition: null,
                     maxCount: maxCount,
-                    canNoSelect: true,
+                    canNoSelect: isOptional,
                     canEndNotMax: false,
                     isShowOpponent: true,
                     selectCardCoroutine: SelectCardCoroutine,
@@ -746,7 +747,7 @@ public partial class CardEffectCommons
                             canTargetCondition: CanSelectCardCondition,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
-                            canNoSelect: () => true,
+                            canNoSelect: () => isOptional,
                             selectCardCoroutine: SelectCardCoroutine,
                             afterSelectCardCoroutine: null,
                             message: "Select 1 card to digivolve.",

+ 6 - 5
Assets/Scripts/ICardEffect.cs

@@ -306,6 +306,7 @@ public abstract class ICardEffect
 
     public bool CanActivate(Hashtable hashtable)
     {
+        UnityEngine.Debug.Log($"CAN ACTIVATE: LINE 1");
         #region Effect availability determined by the maximum number of times it can be used in a turn
 
         if (EffectSourceCard.cEntity_EffectController.isOverMaxCountPerTurn(this, MaxCountPerTurn))
@@ -314,7 +315,7 @@ public abstract class ICardEffect
         }
 
         #endregion
-
+        UnityEngine.Debug.Log($"CAN ACTIVATE: LINE 2");
         #region Determination of availability for each effect
 
         if (CanActivateCondition != null && !CanActivateCondition(hashtable))
@@ -323,7 +324,7 @@ public abstract class ICardEffect
         }
 
         #endregion
-
+        UnityEngine.Debug.Log($"CAN ACTIVATE: LINE 3");
         #region Determination of availability for Inheritated/Linked Effect
 
         if (this is ActivateICardEffect)
@@ -358,7 +359,7 @@ public abstract class ICardEffect
         }
 
         #endregion
-
+        UnityEngine.Debug.Log($"CAN ACTIVATE: LINE 4");
         #region Determination of availability due to be disabled
 
         if (IsDisabled)
@@ -367,7 +368,7 @@ public abstract class ICardEffect
         }
 
         #endregion
-
+        UnityEngine.Debug.Log($"CAN ACTIVATE: LINE 5");
         //TODO: Look into this for the on deletion General issue
         #region Determination whether the permanent is same as when triggered
 
@@ -396,7 +397,7 @@ public abstract class ICardEffect
         }
 
         #endregion
-
+        UnityEngine.Debug.Log($"CAN ACTIVATE: LINE 6");
         return true;
     }