Merge branch 'develop' into OnlineBanlist

Assets/Scripts/CardEffect/AD1/Blue/AD1_010.cs

@@ -17,12 +17,11 @@ namespace DCGO.CardEffects.AD1
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel3
-                        && (targetPermanent.TopCard.HasText("Omnimon")
-                            || targetPermanent.TopCard.EqualsTraits("ADVENTURE"));
+                    return targetPermanent.TopCard.HasText("Omnimon")
+                            || targetPermanent.TopCard.EqualsTraits("ADVENTURE");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 3, permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
 
             #endregion

Assets/Scripts/CardEffect/AD1/Blue/AD1_011.cs

@@ -16,12 +16,11 @@ namespace DCGO.CardEffects.AD1
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel4
-                        && (targetPermanent.TopCard.EqualsTraits("Free")
-                            || targetPermanent.TopCard.EqualsTraits("Hero"));
+                    return targetPermanent.TopCard.EqualsTraits("Free")
+                            || targetPermanent.TopCard.EqualsTraits("Hero");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 4, permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
             #endregion
 

Assets/Scripts/CardEffect/AD1/Blue/AD1_013.cs

@@ -18,12 +18,11 @@ namespace DCGO.CardEffects.AD1
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel5
-                        && (targetPermanent.TopCard.EqualsTraits("Blue Flare")
-                            || targetPermanent.TopCard.EqualsTraits("Xros Heart"));
+                    return targetPermanent.TopCard.EqualsTraits("Blue Flare")
+                            || targetPermanent.TopCard.EqualsTraits("Xros Heart");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 5, permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
 
             #endregion

Assets/Scripts/CardEffect/AD1/Blue/AD1_024.cs

@@ -17,11 +17,10 @@ namespace DCGO.CardEffects.AD1
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel5
-                        && targetPermanent.TopCard.EqualsTraits("Hero");
+                    return targetPermanent.TopCard.EqualsTraits("Hero");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 5, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 5, permanentCondition: PermanentCondition, digivolutionCost: 5, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
             if (timing == EffectTiming.None)
             {

Assets/Scripts/CardEffect/AD1/Red/AD1_001.cs

@@ -18,12 +18,11 @@ namespace DCGO.CardEffects.AD1
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel3
-                        && (targetPermanent.TopCard.HasText("Omnimon")
-                            || targetPermanent.TopCard.EqualsTraits("ADVENTURE"));
+                    return targetPermanent.TopCard.HasText("Omnimon")
+                            || targetPermanent.TopCard.EqualsTraits("ADVENTURE");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 3, permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
 
             #endregion

Assets/Scripts/CardEffect/AD1/Red/AD1_003.cs

@@ -18,12 +18,11 @@ namespace DCGO.CardEffects.AD1
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel4 &&
-                           (targetPermanent.TopCard.ContainsCardName("Growlmon")
-                            || targetPermanent.TopCard.EqualsTraits("Hero"));
+                    return targetPermanent.TopCard.ContainsCardName("Growlmon")
+                            || targetPermanent.TopCard.EqualsTraits("Hero");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 4, permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
             #endregion
 

Assets/Scripts/CardEffect/AD1/Red/AD1_004.cs

@@ -122,19 +122,8 @@ namespace DCGO.CardEffects.AD1
 
             #region All Turns
 
-            if (timing != EffectTiming.None)
+            if (timing == EffectTiming.None)
             {
-                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
-                {
-                    Permanent thisPermanent = card.PermanentOfThisCard();
-
-                    
-                    if(Condition())
-                        thisPermanent.AddBoost(new Permanent.DPBoost("AD1_004", count(), Condition));
-                    else
-                        thisPermanent.RemoveBoost("AD1_004");
-                }
-                
                 int count()
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
@@ -160,11 +149,11 @@ namespace DCGO.CardEffects.AD1
                            card.PermanentOfThisCard().TopCard == card;
                 }
 
-                //cardEffects.Add(CardEffectFactory.ChangeSelfDPStaticEffect<Func<int>>(
-                //    changeValue: count,
-                //    isInheritedEffect: false,
-                //    card: card,
-                //    condition: Condition));
+                cardEffects.Add(CardEffectFactory.ChangeSelfDPStaticEffect<Func<int>>(
+                   changeValue: count,
+                   isInheritedEffect: false,
+                   card: card,
+                   condition: Condition));
             }
 
             if (timing == EffectTiming.None)

Assets/Scripts/CardEffect/AD1/Red/AD1_006.cs

@@ -17,12 +17,11 @@ namespace DCGO.CardEffects.AD1
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel6
-                        && (targetPermanent.TopCard.EqualsTraits("Blue Flare")
-                            || targetPermanent.TopCard.EqualsTraits("Xros Heart"));
+                    return targetPermanent.TopCard.EqualsTraits("Blue Flare")
+                            || targetPermanent.TopCard.EqualsTraits("Xros Heart");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 6, permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
             #endregion
 

Assets/Scripts/CardEffect/AD1/Red/AD1_007.cs

@@ -19,11 +19,11 @@ namespace DCGO.CardEffects.AD1
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel5
-                        && (targetPermanent.TopCard.HasText("Gammamon"));
+                    return targetPermanent.TopCard.HasText("Gammamon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
+                    level: 5,
                     permanentCondition: PermanentCondition,
                     digivolutionCost: 3,
                     ignoreDigivolutionRequirement: false,
@@ -197,6 +197,9 @@ namespace DCGO.CardEffects.AD1
                 SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
+
+                List<CardSource> fixedCards = new List<CardSource>();
+
                 bool ToTop = GManager.instance.userSelectionManager.SelectedBoolValue;
 
                 selectCardEffect.SetUp(
@@ -204,7 +207,7 @@ namespace DCGO.CardEffects.AD1
                     canTargetCondition_ByPreSelecetedList: null,
                     canEndSelectCondition: null,
                     canNoSelect: () => false,
-                    selectCardCoroutine: null,
+                    selectCardCoroutine: selectCardCoroutine,
                     afterSelectCardCoroutine: AfterSelectCardCoroutine1,
                     message: "Specify the order to place the cards in the digivolution cards\n(cards will be placed so that cards with lower numbers are on top).",
                     maxCount: selectedCards.Count,
@@ -221,15 +224,21 @@ namespace DCGO.CardEffects.AD1
 
                 yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
+                IEnumerator selectCardCoroutine (CardSource cardSource)
+                {
+                    fixedCards.Add(cardSource);
+                    return null;
+                }
+
                 IEnumerator AfterSelectCardCoroutine1(List<CardSource> cardSources)
                 {
                     if (ToTop)
                     {
-                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsTop(selectedCards, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsTop(fixedCards, activateClass));
                     }
                     else
                     {
-                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(selectedCards, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(fixedCards, activateClass));
                     }
 
                     yield return null;

Assets/Scripts/CardEffect/AD1/Red/AD1_008.cs

@@ -253,7 +253,7 @@ namespace DCGO.CardEffects.AD1
 
                 #region Immunity
                 CanNotAffectedClass canNotAffectedClass = new CanNotAffectedClass();
-                canNotAffectedClass.SetUpICardEffect("Isn't affected by opponent's Digimon's effects", CanUseCondition, card);
+                canNotAffectedClass.SetUpICardEffect("Isn't affected by opponent's effects", CanUseCondition, card);
                 canNotAffectedClass.SetUpCanNotAffectedClass(CardCondition: CardCondition, SkillCondition: SkillCondition);
                 cardEffects.Add(canNotAffectedClass);
 

Assets/Scripts/CardEffect/AD1/Yellow/AD1_016.cs

@@ -17,12 +17,11 @@ namespace DCGO.CardEffects.AD1
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel5
-                        && (targetPermanent.TopCard.ContainsCardName("RizeGreymon")
-                            || targetPermanent.TopCard.EqualsTraits("DATA SQUAD"));
+                    return targetPermanent.TopCard.ContainsCardName("RizeGreymon")
+                            || targetPermanent.TopCard.EqualsTraits("DATA SQUAD");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 5, permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
             #endregion
 

Assets/Scripts/CardEffect/EX10/Purple/EX10_052.cs

@@ -120,7 +120,7 @@ namespace DCGO.CardEffects.EX10
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel3 && targetPermanent.TopCard.EqualsCardName("Lucemon");
+                    return targetPermanent.TopCard.EqualsCardName("Lucemon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 5, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -294,4 +294,4 @@ namespace DCGO.CardEffects.EX10
             return cardEffects;
         }
     }
-}
+}

Assets/Scripts/CardEffect/EX10/Yellow/EX10_013.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.EX10
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel2 && targetPermanent.TopCard.EqualsCardName("Cupimon");
+                    return targetPermanent.TopCard.EqualsCardName("Cupimon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 5, ignoreDigivolutionRequirement: false, card: card, condition: null));

Assets/Scripts/CardEffect/EX11/Green/EX11_028.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.EX11
 
             string SharedEffectName() => "Suspend 1 Digimon.";
 
-            string SharedEffectDescription(string tag) => $"[{tag}] [On Play] [When Digivolving] You may suspend 1 Digimon.";
+            string SharedEffectDescription(string tag) => $"[{tag}] You may suspend 1 Digimon.";
 
             bool SharedCanActivateCondition(Hashtable hashtable)
             {

Assets/Scripts/CardEffect/EX6/Yellow/EX6_018.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.EX6
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Cupimon");
+                    return targetPermanent.TopCard.EqualsCardName("Cupimon");
                 }
                 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -400,4 +400,4 @@ namespace DCGO.CardEffects.EX6
             return cardEffects;
         }
     }
-}
+}

Assets/Scripts/CardEffect/ST23/Green/ST23_06.cs

@@ -17,11 +17,10 @@ namespace DCGO.CardEffects.ST23
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel2
-                        && targetPermanent.TopCard.EqualsTraits("Glowing Dawn");
+                    return targetPermanent.TopCard.EqualsTraits("Glowing Dawn");
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 2, permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
 
             #endregion

Assets/Scripts/CardEffect/ST24/Yellow/ST24_04.cs

@@ -17,14 +17,22 @@ namespace DCGO.CardEffects.ST24
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("Koromon")
-                            || (targetPermanent.TopCard.IsLevel2
-                        && targetPermanent.TopCard.EqualsTraits("DATA SQUAD"));
+                    return targetPermanent.TopCard.EqualsCardName("Koromon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
 
+            if (timing == EffectTiming.None)
+            {
+                bool PermanentCondition(Permanent targetPermanent)
+                {
+                    return targetPermanent.TopCard.EqualsTraits("DATA SQUAD");
+                }
+
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(level: 2, permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
+            }
+
             #endregion
 
             #region Shared WM/OP

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07cd6abeeb241d32968d9f0ecbfdf42444680d027015b107ccedb6a2d4518c9c
-size 20479
+oid sha256:113b3f924915cbef9c388b358e51a4d658e37ad04b6b61406799bd7189dc8e0c
+size 20480