mike updates (09-08)

Assets/CardBaseEntity/P/Red/Digimon/P_072.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e5350d69eee405fe2cf4b0ffe0323441c66a66a4f4867230c739139a46ffc0f
-size 2794
+oid sha256:00a1d389aefbd57c9e0ba88d3725ed0f4c3b47e523e4dd911f60f3013818b1b7
+size 3046

Assets/CardEffect/EX10/Black/EX10_031.cs

@@ -114,8 +114,6 @@ namespace DCGO.CardEffects.EX10
                 {
                     Permanent selectedPermament = null;
 
-                    int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(SharedPermamentCondition));
-
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
                     selectPermanentEffect.SetUp(
@@ -123,7 +121,7 @@ namespace DCGO.CardEffects.EX10
                         canTargetCondition: SharedPermamentCondition,
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: null,
-                        maxCount: maxCount,
+                        maxCount: 1,
                         canNoSelect: false,
                         canEndNotMax: false,
                         selectPermanentCoroutine: SelectPermanentCoroutine,

Assets/CardEffect/EX10/Black/EX10_033.cs

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.EX10
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Place 3 cards from trash as bottom sources", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Place up to 3 cards from trash as bottom sources", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
                 activateClass.SetHashString("WDWA_EX10_033");
                 cardEffects.Add(activateClass);
@@ -115,7 +115,7 @@ namespace DCGO.CardEffects.EX10
             if (timing == EffectTiming.OnAllyAttack)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Place 3 cards from trash as bottom sources", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Place up to 3 cards from trash as bottom sources", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
                 activateClass.SetHashString("WDWA_EX10_033");
                 cardEffects.Add(activateClass);
@@ -293,7 +293,7 @@ namespace DCGO.CardEffects.EX10
                             mode: SelectPermanentEffect.Mode.Custom,
                             cardEffect: activateClass);
 
-                        selectPermanentEffect.SetUpCustomMessage("Select 1 card to delete.", "The opponent is selecting 1 card to delete.");
+                        selectPermanentEffect.SetUpCustomMessage("Select 1 card to reduce play cost.", "The opponent is selecting 1 card to reduce play cost.");
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                         
@@ -313,7 +313,7 @@ namespace DCGO.CardEffects.EX10
             #endregion
 
             #region When Attacking - Reduce Cost
-            if (timing == EffectTiming.OnEnterFieldAnyone)
+            if (timing == EffectTiming.OnAllyAttack)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("By trashing up to 3 sources, reduce 1 digimons play cost by 2 for each card", CanUseCondition, card);
@@ -407,7 +407,7 @@ namespace DCGO.CardEffects.EX10
                             mode: SelectPermanentEffect.Mode.Custom,
                             cardEffect: activateClass);
 
-                        selectPermanentEffect.SetUpCustomMessage("Select 1 card to delete.", "The opponent is selecting 1 card to delete.");
+                        selectPermanentEffect.SetUpCustomMessage("Select 1 card to reduce play cost.", "The opponent is selecting 1 card to reduce play cost.");
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 

Assets/CardEffect/EX10/Black/EX10_034.cs

@@ -31,6 +31,7 @@ namespace DCGO.CardEffects.EX10
                     {
                         DigiXrosConditionElement element = new DigiXrosConditionElement(CanSelectCardCondition, "Bagra Army trait");
                         DigiXrosConditionElement element1 = new DigiXrosConditionElement(CanSelectCardCondition, "Bagra Army trait");
+                        DigiXrosConditionElement element2 = new DigiXrosConditionElement(CanSelectCardCondition, "Bagra Army trait");
 
                         bool CanSelectCardCondition(CardSource cardSource)
                         {
@@ -51,7 +52,7 @@ namespace DCGO.CardEffects.EX10
                             return false;
                         }
 
-                        List<DigiXrosConditionElement> elements = new List<DigiXrosConditionElement>() { element, element1 };
+                        List<DigiXrosConditionElement> elements = new List<DigiXrosConditionElement>() { element, element1, element2 };
 
                         DigiXrosCondition digiXrosCondition = new DigiXrosCondition(elements, null, 2);
 
@@ -410,7 +411,7 @@ namespace DCGO.CardEffects.EX10
                 List<Permanent> removedPermanents = new List<Permanent>();
 
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Trash 2 source cards, prevent deletion", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Trash 2 source cards, gain ＜Security A. +1> and +3000 DP", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
                 activateClass.SetHashString("AT_EX10_034");
                 cardEffects.Add(activateClass);

Assets/CardEffect/EX10/Purple/EX10_005.cs

@@ -23,18 +23,18 @@ namespace DCGO.CardEffects.EX10
 
                 string EffectDiscription()
                 {
-                    return "[Your Turn] [Once Per Turn] When your opponent's deck is trashed from, <Draw 1> (Draw 1 card from your deck.)";
+                    return "[Your Turn] [Once Per Turn] When your opponent's deck is trashed from, <Draw 1>.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.CanTriggerWhenDiscardLibrary(hashtable, cardSource => cardSource.Owner == cardSource.Owner.Enemy);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card);
                 }
 

Assets/CardEffect/EX10/Purple/EX10_039.cs

@@ -58,12 +58,10 @@ namespace DCGO.CardEffects.EX10
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition) || CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {
-                            SelectCardEffect.Root? rootmode = null!;
+                            SelectCardEffect.Root? rootmode = SelectCardEffect.Root.Hand;
                             bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition);
                             bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition);
 
-                            if (canSelectHand && !canSelectTrash) rootmode = SelectCardEffect.Root.Hand;
-
                             if (!canSelectHand && canSelectTrash) rootmode = SelectCardEffect.Root.Trash;
 
                             if (canSelectHand && canSelectTrash)
@@ -82,9 +80,31 @@ namespace DCGO.CardEffects.EX10
                                 rootmode = GManager.instance.userSelectionManager.SelectedBoolValue ? SelectCardEffect.Root.Hand : SelectCardEffect.Root.Trash;
                             }
 
-                            if (rootmode != null)
+                            CardSource selectedCard = null;
+
+                            if (rootmode == SelectCardEffect.Root.Hand)
+                            {
+                                SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
+
+                                selectHandEffect.SetUp(
+                                    selectPlayer: card.Owner,
+                                    canTargetCondition: CanSelectCardCondition,
+                                    canTargetCondition_ByPreSelecetedList: null,
+                                    canEndSelectCondition: null,
+                                    maxCount: 1,
+                                    canNoSelect: true,
+                                    canEndNotMax: false,
+                                    isShowOpponent: true,
+                                    selectCardCoroutine: SelectCardCoroutine,
+                                    afterSelectCardCoroutine: null,                                  
+                                    mode: SelectHandEffect.Mode.Custom,
+                                    cardEffect: activateClass);
+
+                                selectHandEffect.SetUpCustomMessage("Select 1 card to add as source.", "The opponent is selecting 1 card to add as source.");
+                                yield return ContinuousController.instance.StartCoroutine(selectHandEffect.Activate());
+                            }
+                            else
                             {
-                                CardSource selectedCard = null;
                                 SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
                                 selectCardEffect.SetUp(
@@ -107,45 +127,45 @@ namespace DCGO.CardEffects.EX10
 
                                 selectCardEffect.SetUpCustomMessage("Select 1 card to add as source.", "The opponent is selecting 1 card to add as source.");
                                 yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
+                            }
+
+                            IEnumerator SelectCardCoroutine(CardSource cardSource)
+                            {
+                                selectedCard = cardSource;
+                                yield return null;
+                            }
+
+                            if (selectedCard != null)
+                            {
+                                Permanent selectedPermanent = null;
+                                int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectTamerCondition));
+
+                                SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                                selectPermanentEffect.SetUp(
+                                    selectPlayer: card.Owner,
+                                    canTargetCondition: CanSelectTamerCondition,
+                                    canTargetCondition_ByPreSelecetedList: null,
+                                    canEndSelectCondition: null,
+                                    maxCount: maxCount,
+                                    canNoSelect: false,
+                                    canEndNotMax: false,
+                                    selectPermanentCoroutine: SelectPermanentCoroutine,
+                                    afterSelectPermanentCoroutine: null,
+                                    mode: SelectPermanentEffect.Mode.Custom,
+                                    cardEffect: activateClass);
+
+                                yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
-                                IEnumerator SelectCardCoroutine(CardSource cardSource)
+                                IEnumerator SelectPermanentCoroutine(Permanent permanent)
                                 {
-                                    selectedCard = cardSource;
+                                    selectedPermanent = permanent;
                                     yield return null;
                                 }
 
-                                if (selectedCard != null)
+                                if (selectedPermanent != null)
                                 {
-                                    Permanent selectedPermanent = null;
-                                    int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectTamerCondition));
-
-                                    SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                                    selectPermanentEffect.SetUp(
-                                        selectPlayer: card.Owner,
-                                        canTargetCondition: CanSelectTamerCondition,
-                                        canTargetCondition_ByPreSelecetedList: null,
-                                        canEndSelectCondition: null,
-                                        maxCount: maxCount,
-                                        canNoSelect: false,
-                                        canEndNotMax: false,
-                                        selectPermanentCoroutine: SelectPermanentCoroutine,
-                                        afterSelectPermanentCoroutine: null,
-                                        mode: SelectPermanentEffect.Mode.Custom,
-                                        cardEffect: activateClass);
-
-                                    yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-
-                                    IEnumerator SelectPermanentCoroutine(Permanent permanent)
-                                    {
-                                        selectedPermanent = permanent;
-                                        yield return null;
-                                    }
-
-                                    if (selectedPermanent != null)
-                                    {
-                                        yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
-                                    }
+                                    yield return ContinuousController.instance.StartCoroutine(selectedPermanent.AddDigivolutionCardsBottom(new List<CardSource>() { selectedCard }, activateClass));
                                 }
                             }
                         }

Assets/CardEffect/EX10/Red/EX10_006.cs

@@ -40,7 +40,7 @@ namespace DCGO.CardEffects.EX10
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.HasGreymonName || cardSource.EqualsTraits("Virus");
+                    return cardSource.HasGreymonName && cardSource.EqualsTraits("Virus");
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/CardEffect/EX10/Red/EX10_008.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.EX10
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.ContainsCardName("Greymon");
+                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.HasGreymonName;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -177,7 +177,7 @@ namespace DCGO.CardEffects.EX10
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOpponentTurn(card)
-                        && card.PermanentOfThisCard().TopCard.ContainsCardName("Greymon");
+                        && card.PermanentOfThisCard().TopCard.HasGreymonName;
                 }
 
                 bool PermanentCondition(Permanent permanent)

Assets/CardEffect/EX10/Red/EX10_011.cs

@@ -21,7 +21,7 @@ namespace DCGO.CardEffects.EX10
                            targetPermanent.TopCard.IsLevel5;
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 5, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
 
             #endregion
@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.EX10
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnHand(card) &&
+                    return CardEffectCommons.IsExistOnTrash(card) &&
                            CardEffectCommons.MatchConditionPermanentCount(IsLvl5Myotismon) >= 2;
                 }
 
@@ -167,6 +167,7 @@ namespace DCGO.CardEffects.EX10
             bool CanSelectPermanentCondition(Permanent permanent)
             {
                 return CardEffectCommons.IsPermanentExistsOnBattleAreaDigimon(permanent) &&
+                       permanent != card.PermanentOfThisCard() &&
                        !permanent.IsSuspended;
             }
 
@@ -277,7 +278,7 @@ namespace DCGO.CardEffects.EX10
             if (timing == EffectTiming.OnDestroyedAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Tras security, then return 1 to bottom deck", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Trash security, then return 1 to bottom deck", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 activateClass.SetHashString("AllTurns_EX10-001");
                 cardEffects.Add(activateClass);