ソースを参照

Mike updates for bug fixes

mbunch_kascope 11 ヶ月 前
コミット
6eddee2618

+ 1 - 1
Assets/CardEffect/EX10/Green/EX10_001.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.EX10
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
-                           CardEffectCommons.CanTriggerOnTrashSelfDigivolutionCard(hashtable, cardEffect => cardEffect != null, card); ;
+                           CardEffectCommons.CanTriggerOnTrashLinkedCard(hashtable,perm => perm == card.PermanentOfThisCard(), cardEffect => cardEffect != null, source => source != null);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)

+ 2 - 1
Assets/CardEffect/EX10/Green/EX10_015.cs

@@ -97,7 +97,8 @@ namespace DCGO.CardEffects.EX10
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.IsOwnerTurn(card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/EX10/Green/EX10_020.cs

@@ -324,7 +324,7 @@ namespace DCGO.CardEffects.EX10
 
                 bool CardCondition(CardSource cardSource)
                 {
-                    return cardSource.EqualsCardName("Apocalymon");
+                    return !cardSource.EqualsCardName("Apocalymon");
                 }
 
                 cardEffects.Add(CardEffectFactory.CanNotDigivolveStaticSelfEffect(

+ 1 - 1
Assets/CardEffect/EX10/Red/EX10_006.cs

@@ -26,7 +26,7 @@ namespace DCGO.CardEffects.EX10
             #endregion
 
             #region Start of Your Main Phase
-            if (timing == EffectTiming.OnEnterFieldAnyone)
+            if (timing == EffectTiming.OnStartMainPhase)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Return 1 card from trash to hand", CanUseCondition, card);

+ 6 - 3
Assets/CardEffect/EX10/Red/EX10_007.cs

@@ -92,7 +92,7 @@ namespace DCGO.CardEffects.EX10
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("1 digimon gains 3K DP", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, hashtable => SharedActivateCoroutine(hashtable, activateClass), -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, hashtable => SharedActivateCoroutine(hashtable, activateClass), -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -121,7 +121,7 @@ namespace DCGO.CardEffects.EX10
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("1 digimon gains 3K DP", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, hashtable => SharedActivateCoroutine(hashtable, activateClass), -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, hashtable => SharedActivateCoroutine(hashtable, activateClass), -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -148,7 +148,10 @@ namespace DCGO.CardEffects.EX10
 
             if (timing == EffectTiming.None)
             {
-                bool Condition() => CardEffectCommons.IsExistOnBattleArea(card);
+                bool Condition()
+                {
+                    return CardEffectCommons.IsExistOnBattleArea(card);
+                }
 
                 cardEffects.Add(CardEffectFactory.ChangeSelfDPStaticEffect(changeValue: 1000, isInheritedEffect: true, card: card, condition: Condition));
             }

+ 2 - 2
Assets/CardEffect/EX10/Red/EX10_009.cs

@@ -12,7 +12,7 @@ namespace DCGO.CardEffects.EX10
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-            #region OP/WD Shared
+            #region WD/OD Shared
 
             IEnumerator SharedActivateCoroutine(Hashtable hashtable, ActivateClass activateClass)
             {
@@ -132,7 +132,7 @@ namespace DCGO.CardEffects.EX10
                 bool CanSelectCardCondition(CardSource card)
                 {
                     return card.IsDigimon
-                        && card.CardColors.Contains(CardColor.Red) || card.CardColors.Contains(CardColor.Purple)
+                        && (card.CardColors.Contains(CardColor.Red) || card.CardColors.Contains(CardColor.Purple))
                         && card.BaseCardDP <= 5000
                         && CardEffectCommons.CanPlayAsNewPermanent(card, false, activateClass, isBreedingArea: true);
                 }

+ 1 - 1
Assets/CardEffect/EX10/Red/EX10_011.cs

@@ -295,7 +295,7 @@ namespace DCGO.CardEffects.EX10
 
                 bool OpponentsLowestDP(Permanent permanent)
                 {
-                    return CardEffectCommons.IsPermanentExistsOnBattleAreaDigimon(permanent) &&
+                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&
                            CardEffectCommons.IsMinDP(permanent, permanent.TopCard.Owner);
                 }
 

+ 1 - 1
Assets/CardEffect/LM/Black/LM_031.cs

@@ -184,7 +184,7 @@ namespace DCGO.CardEffects.LM
                             message: "Select a black Digimon to place at the top of the deck\n(cards will be placed back to the top of the deck so that cards with lower numbers are on top).",
                             maxCount: maxCount,
                             canEndNotMax: false,
-                            isShowOpponent: false,
+                            isShowOpponent: true,
                             mode: SelectCardEffect.Mode.Custom,
                             root: SelectCardEffect.Root.Trash,
                             customRootCardList: null,

+ 1 - 1
Assets/CardEffect/LM/Blue/LM_028.cs

@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.LM
                             message: "Select a blue Digimon to place at the top of the deck\n(cards will be placed back to the top of the deck so that cards with lower numbers are on top).",
                             maxCount: maxCount,
                             canEndNotMax: false,
-                            isShowOpponent: false,
+                            isShowOpponent: true,
                             mode: SelectCardEffect.Mode.Custom,
                             root: SelectCardEffect.Root.Trash,
                             customRootCardList: null,

+ 1 - 1
Assets/CardEffect/LM/Green/LM_030.cs

@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.LM
                             message: "Select a green Digimon to place at the top of the deck\n(cards will be placed back to the top of the deck so that cards with lower numbers are on top).",
                             maxCount: maxCount,
                             canEndNotMax: false,
-                            isShowOpponent: false,
+                            isShowOpponent: true,
                             mode: SelectCardEffect.Mode.Custom,
                             root: SelectCardEffect.Root.Trash,
                             customRootCardList: null,

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

@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.LM
                             message: "Select a purple Digimon to place at the top of the deck\n(cards will be placed back to the top of the deck so that cards with lower numbers are on top).",
                             maxCount: maxCount,
                             canEndNotMax: false,
-                            isShowOpponent: false,
+                            isShowOpponent: true,
                             mode: SelectCardEffect.Mode.Custom,
                             root: SelectCardEffect.Root.Trash,
                             customRootCardList: null,

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

@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.LM
                             message: "Select a red Digimon to place at the top of the deck\n(cards will be placed back to the top of the deck so that cards with lower numbers are on top).",
                             maxCount: maxCount,
                             canEndNotMax: false,
-                            isShowOpponent: false,
+                            isShowOpponent: true,
                             mode: SelectCardEffect.Mode.Custom,
                             root: SelectCardEffect.Root.Trash,
                             customRootCardList: null,

+ 1 - 1
Assets/CardEffect/LM/Yellow/LM_029.cs

@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.LM
                             message: "Select a yellow Digimon to place at the top of the deck\n(cards will be placed back to the top of the deck so that cards with lower numbers are on top).",
                             maxCount: maxCount,
                             canEndNotMax: false,
-                            isShowOpponent: false,
+                            isShowOpponent: true,
                             mode: SelectCardEffect.Mode.Custom,
                             root: SelectCardEffect.Root.Trash,
                             customRootCardList: null,