瀏覽代碼

Several updates from excel sheet and bug forums

mbunch_kascope 2 年之前
父節點
當前提交
5c85e29a33

+ 10 - 4
Assets/CardEffect/BT15/Black/Ginryumon_BT15_058.cs

@@ -204,9 +204,12 @@ public class Ginryumon_BT15_058 : CEntity_Effect
                         {
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                             {
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCantUnsuspendNextActivePhase(
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotUnsuspend(
                                         targetPermanent: selectedPermanent,
-                                        activateClass: activateClass
+                                        effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                                        activateClass: activateClass,
+                                        condition: null,
+                                        effectName: "Can't unsuspend"
                                     ));
                             }
                         }
@@ -297,9 +300,12 @@ public class Ginryumon_BT15_058 : CEntity_Effect
                         {
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                             {
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCantUnsuspendNextActivePhase(
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotUnsuspend(
                                         targetPermanent: selectedPermanent,
-                                        activateClass: activateClass
+                                        effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                                        activateClass: activateClass,
+                                        condition: null,
+                                        effectName: "Can't unsuspend"
                                     ));
                             }
                         }

+ 1 - 1
Assets/CardEffect/BT15/Black/Kyokyomon_BT15_005.cs

@@ -23,7 +23,7 @@ public class Kyokyomon_BT15_005 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[Opponent's Turn][Once Per Turn] When an opponent's Digimon becomes unsuspended, <De-Digivolve 1> that Digimon.";
+                return "[Opponent's Turn] [Once Per Turn] When a Digimon becomes unsuspended, <Draw 1>.";
             }
 
             bool PermanentCondition(Permanent permanent)

+ 1 - 1
Assets/CardEffect/BT15/Blue/Matt_Ishida_BT15_083.cs

@@ -89,7 +89,7 @@ public class Matt_Ishida_BT15_083 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[Your Turn][Once Per Turn] When one of your Digimons effects adds cards to your hand, this Digimon gets +1000 DP for the turn.";
+                return "[Your Turn] When one of your Digimon's effects adds cards to your hand, by suspending this Tamer, gain 1 memory.";
             }
 
             bool CanUseCondition(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/BT15/Purple/Mist_Barrier_BT15_098.cs

@@ -138,7 +138,7 @@ public class Mist_Barrier_BT15_098 : CEntity_Effect
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Play 1 Digimon", CanUseCondition, card);
-            activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
+            activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, true, EffectDiscription());
             cardEffects.Add(activateClass);
 
             #region Delay Effect - When deleted

+ 1 - 1
Assets/CardEffect/BT15/Yellow/Kari_Kamiya_BT15_084.cs

@@ -122,7 +122,7 @@ public class Kari_Kamiya_BT15_084 : CEntity_Effect
                 {
                     if (CardEffectCommons.CanTriggerWhenLoseSecurity(hashtable, player => player == card.Owner))
                     {
-                        if (!GManager.instance.attackProcess.IsAttacking && !GManager.instance.attackProcess.DoSecurityCheck)
+                        if (!GManager.instance.attackProcess.DoSecurityCheck)
                         {
                             return true;
                         }

+ 1 - 1
Assets/CardEffect/BT8/White/Kimeramon_BT8_084.cs

@@ -248,7 +248,7 @@ public class Kimeramon_BT8_084 : CEntity_Effect
                                 mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
-                            selectPermanentEffect.SetUpCustomMessage($"Select 1 Digimon to DP -{minusDP}.", $"The opponent is selecting 1 Digimon to DP -{minusDP}.");
+                            selectPermanentEffect.SetUpCustomMessage($"Select up to 4 Digimon to DP -{minusDP}.", $"The opponent is selecting up to 4 Digimon to DP -{minusDP}.");
 
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 

+ 1 - 1
Assets/CardEffect/BT9/Green/GrandisScissor_BT9_100.cs

@@ -83,7 +83,7 @@ public class GrandisScissor_BT9_100 : CEntity_Effect
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: null,
                         maxCount: maxCount,
-                        canNoSelect: false,
+                        canNoSelect: true,
                         canEndNotMax: false,
                         selectPermanentCoroutine: null,
                         afterSelectPermanentCoroutine: AfterSelectPermanentCoroutine,

+ 9 - 14
Assets/CardEffect/LM/Black/Espimon_LM_014.cs

@@ -22,14 +22,15 @@ namespace DCGO.CardEffects.LM
                     return "[On Play] Reveal the top 3 cards of your deck. Add 1 card with <Blocker> or 1 Tamer card among them to the hand. Return the rest to the bottom of the deck.";
                 }
 
-                bool CanSelectBlockerCondition(CardSource cardSource)
+                bool CanSelectCondition(CardSource cardSource)
                 {
-                    return cardSource.HasBlocker;
-                }
 
-                bool CanSelectTamerCondition(CardSource cardSource)
-                {
-                    return cardSource.IsTamer;
+                    if(cardSource.HasBlocker || cardSource.IsTamer)
+                    {
+                        return true;
+                    }
+
+                    return false;
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -58,14 +59,8 @@ namespace DCGO.CardEffects.LM
                         new SimplifiedSelectCardConditionClass[]
                         {
                         new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:CanSelectBlockerCondition,
-                            message: "Select 1 card with [Blocker].",
-                            mode: SelectCardEffect.Mode.AddHand,
-                            maxCount: 1,
-                            selectCardCoroutine: null),
-                        new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:CanSelectTamerCondition,
-                            message:  "Select 1 Tamer card.",
+                            canTargetCondition:CanSelectCondition,
+                            message: "Select 1 card with <Blocker> or 1 Tamer.",
                             mode: SelectCardEffect.Mode.AddHand,
                             maxCount: 1,
                             selectCardCoroutine: null),

+ 25 - 23
Assets/CardEffect/ST17/Green/Rapidmon_ST17_07.cs

@@ -227,32 +227,34 @@ namespace DCGO.CardEffects.ST17
                         }
                     }
 
-                    bool CardEffectCondition(ICardEffect cardEffect)
+                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.TopCard.CardColors.Contains(CardColor.Green) && permanent.IsTamer))
                     {
-                        return CardEffectCommons.IsOpponentEffect(cardEffect, card);
-                    }
+                        bool CardEffectCondition(ICardEffect cardEffect)
+                        {
+                            return CardEffectCommons.IsOpponentEffect(cardEffect, card);
+                        }
+
+                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotBeDeletedByEffect(
+                            targetPermanent: card.PermanentOfThisCard(),
+                            cardEffectCondition: CardEffectCondition,
+                            effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                            activateClass: activateClass,
+                            effectName: "Can't be deleted by opponent's effects"));
 
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotBeDeletedByEffect(
-                        targetPermanent: card.PermanentOfThisCard(),
-                        cardEffectCondition: CardEffectCondition,
-                        effectDuration: EffectDuration.UntilOpponentTurnEnd,
-                        activateClass: activateClass,
-                        effectName: "Can't be deleted by opponent's effects"));
-
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotReturnToHand(
-                        targetPermanent: card.PermanentOfThisCard(),
-                        cardEffectCondition: CardEffectCondition,
-                        effectDuration: EffectDuration.UntilOpponentTurnEnd,
-                        activateClass: activateClass,
-                        effectName: "Can't return to hand by opponent's effects"));
-
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotReturnToDeck(
-                        targetPermanent: card.PermanentOfThisCard(),
-                        cardEffectCondition: CardEffectCondition,
-                        effectDuration: EffectDuration.UntilOpponentTurnEnd,
-                        activateClass: activateClass,
-                        effectName: "Can't return to deck by opponent's effects"));
+                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotReturnToHand(
+                            targetPermanent: card.PermanentOfThisCard(),
+                            cardEffectCondition: CardEffectCondition,
+                            effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                            activateClass: activateClass,
+                            effectName: "Can't return to hand by opponent's effects"));
 
+                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotReturnToDeck(
+                            targetPermanent: card.PermanentOfThisCard(),
+                            cardEffectCondition: CardEffectCondition,
+                            effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                            activateClass: activateClass,
+                            effectName: "Can't return to deck by opponent's effects"));
+                    }
                 }
             }
 

+ 1 - 2
Assets/Scripts/CardEffectCommons/MinMax_DP_Cost_Level/Cost/IsMaxCost.cs

@@ -14,12 +14,11 @@ public partial class CardEffectCommons
         if (permanent.TopCard.Owner != owner) return false;
         if (!IsPermanentExistsOnOwnerBattleArea(permanent, permanent.TopCard)) return false;
         if (!permanent.IsDigimon && !permanent.IsTamer) return false;
-        //if (IsDigimonOnly && permanent.IsTamer) return false;
         if (!permanent.TopCard.HasPlayCost) return false;
 
         List<int> costs = permanent.TopCard.Owner.GetBattleAreaPermanents().Filter(permanent1 =>
             (permanent1.IsDigimon || permanent1.IsTamer)
-            && (!IsDigimonOnly || !permanent1.IsTamer)
+            && (IsDigimonOnly && permanent1.IsDigimon)
             && permanent1.TopCard.HasPlayCost)
             .Map(permanent1 => permanent1.TopCard.GetCostItself);
 

+ 28 - 23
Assets/Scripts/ResultObject.cs

@@ -49,7 +49,7 @@ public class ResultObject : MonoBehaviour
             }
         }
 
-        else
+        else if (Winner != null)
         {
             ContinuousController.instance.PlaySE(GManager.instance.LoseSE);
 
@@ -63,37 +63,42 @@ public class ResultObject : MonoBehaviour
                     ResultText.text = "You have surrendered.";
                 }
             }
+        }
+        else
+        {
+            WinImage.gameObject.SetActive(false);
+            LoseImage.gameObject.SetActive(true);
 
-            else
-            {
-                bool isDisconnected = true;
+            bool isDisconnected = true;
 
-                if (PhotonNetwork.IsConnected)
+            if (PhotonNetwork.IsConnected)
+            {
+                if (PhotonNetwork.PlayerList.Length == 2)
                 {
-                    if (PhotonNetwork.PlayerList.Length == 2)
-                    {
-                        isDisconnected = false;
-                    }
-
-                    if (GManager.instance.IsAI)
-                    {
-                        isDisconnected = false;
-                    }
+                    isDisconnected = false;
                 }
 
-                if (isDisconnected)
+                if (GManager.instance.IsAI)
                 {
-                    log += $"\nDisconnected";
-
-                    ResultText.text = "Disconnected.";
+                    isDisconnected = false;
                 }
 
-                else
-                {
-                    log += $"\nDraw";
+                WinImage.gameObject.SetActive(true);
+                LoseImage.gameObject.SetActive(false);
+            }
 
-                    ResultText.text = "Draw.";
-                }
+            if (isDisconnected)
+            {
+                log += $"\nDisconnected";
+
+                ResultText.text = "Disconnected.";
+            }
+
+            else
+            {
+                log += $"\nDraw";
+
+                ResultText.text = "Draw.";
             }
         }