ソースを参照

deck editor fixes, ST19, ST18, ST17, LM fixes

mbunch_kascope 1 年間 前
コミット
e05f93d345

+ 2 - 2
Assets/CardBaseEntity/ST17/Green/Option/DoubleTyphoon-ST17-11.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b94d6beb338bd1c0a16b4af3688406f62c2114c9819774a9e96567b1f4babf2
-size 1994
+oid sha256:ee08a2de8151621c19a1a13611ec8ce83953a6c35b1ec3be2ce10b359cbf8b0f
+size 1470

+ 2 - 2
Assets/CardBaseEntity/ST17/Green/Option/GiantMissile-ST17-12.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c312c103b90090f2e341c52bc7508af1117189740764e21f83b15e0771851acd
-size 1636
+oid sha256:db8598cb49841ef74abf5a989a1daf54b94506ef1753660ff729bb0c826925f0
+size 1306

+ 2 - 2
Assets/CardBaseEntity/ST17/Green/Tamer/HenryWong-ST17-10.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d739a7cc9460aad6081c7ef2b8fc285e468e50ce2fb03bf855ae3e8fbd0c4ca
-size 1867
+oid sha256:c81d4eb793adb269a476c14a6fbde3ec4c92a42a5bb1c66693f6b769801f1872
+size 1515

+ 11 - 22
Assets/CardEffect/LM/Blue/Cthyllamon_LM_006.cs

@@ -203,15 +203,7 @@ namespace DCGO.CardEffects.LM
 
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
-                    {
-                        if (permanent.DigivolutionCards.Count((cardSource) => !cardSource.CanNotTrashFromDigivolutionCards(activateClass)) >= 1)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -250,25 +242,22 @@ namespace DCGO.CardEffects.LM
                         }
                     }
 
-                    bool DefenderCondition(Permanent defender)
+                    bool AttackerCondition(Permanent attacker)
                     {
-                        return true;
+                        return attacker.DigivolutionCards.Count == 0;
                     }
 
-                    foreach(Permanent permanent in card.Owner.Enemy.GetBattleAreaDigimons())
+                    bool DefenderCondition(Permanent defender)
                     {
-                        if (permanent.DigivolutionCards.Count == 0)
-                        {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotAttack(
-                                targetPermanent: permanent,
-                                defenderCondition: DefenderCondition,
-                                effectDuration: EffectDuration.UntilOpponentTurnEnd,
-                                activateClass: activateClass,
-                                effectName: "Can't Attack"));
-                        }
+                        return true;
                     }
 
-                    
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainCanNotAttackPlayerEffect(
+                        attackerCondition: AttackerCondition,
+                        defenderCondition: DefenderCondition,
+                        effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                        activateClass: activateClass,
+                        effectName: "Can't Attack"));                    
                 }
             }
             #endregion

+ 6 - 9
Assets/CardEffect/LM/Yellow/Quantumon_LM_020.cs

@@ -30,14 +30,11 @@ namespace DCGO.CardEffects.LM
 
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
+                    if (CardEffectCommons.IsPermanentExistsOnBattleAreaDigimon(permanent))
                     {
-                        if (permanent.IsDigimon)
+                        if (permanent.TopCard.Owner.CanAddSecurity(activateClass))
                         {
-                            if (permanent.TopCard.Owner.CanAddSecurity(activateClass))
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
 
@@ -51,7 +48,7 @@ namespace DCGO.CardEffects.LM
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
@@ -95,10 +92,10 @@ namespace DCGO.CardEffects.LM
 
                         if (!permanent.IsToken)
                         {
-                            int beforeEffectSecurityCount = card.Owner.Enemy.SecurityCards.Count;
+                            int beforeEffectSecurityCount = permanent.TopCard.Owner.SecurityCards.Count;
                             yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(permanent, CardEffectCommons.CardEffectHashtable(activateClass), toTop: true).PutSecurity());
 
-                            if (card.Owner.Enemy.SecurityCards.Count > beforeEffectSecurityCount)
+                            if (permanent.TopCard.Owner.SecurityCards.Count > beforeEffectSecurityCount)
                                 placedToSecurity = true;
                         }
 

+ 1 - 10
Assets/CardEffect/ST17/Blue/Magnamon_ST17_13.cs

@@ -61,16 +61,7 @@ namespace DCGO.CardEffects.ST17
 
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
-                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
-                    {
-                        if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                        {
-                            if (permanent.IsDigimon)
-                                return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsPermanentExistsOnBattleAreaDigimon(permanent);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/ST18/Green/Zephagamon_ST18_12.cs

@@ -125,7 +125,7 @@ namespace DCGO.CardEffects.ST18
                         CanUseConditionImmunity, card);
                     canNotAffectedClass.SetUpCanNotAffectedClass(CardCondition: CardCondition,
                         SkillCondition: SkillCondition);
-                    permanentOfThisCard.UntilOpponentTurnEndEffects.Add(GetCardEffect);
+                    permanentOfThisCard.UntilEachTurnEndEffects.Add(GetCardEffect);
 
                     bool CanUseConditionImmunity(Hashtable hashtableImmunity)
                     {

+ 1 - 1
Assets/CardEffect/ST19/Yellow/ShoeShoemon_ST19_08.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.ST19
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play a Digimon from your hand or trash.", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
-                activateClass.SetHashString("PlayDigimon_ST187_08");
+                activateClass.SetIsSecurityEffect(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()