Lewisaaronwelch 1 an în urmă
părinte
comite
2e483e2a59

+ 4 - 5
Assets/CardEffect/BT22/White/BT22_093.cs

@@ -80,18 +80,17 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, DigivolvingCondition)
-                        && CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition);
+                    return CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, DigivolvingCondition);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if(DigivolvingDigimon != null)
+                    if (DigivolvingDigimon != null)
                     {
                         if (!DigivolvingCondition(DigivolvingDigimon))
                             return false;
-
                     }
+
                     return CardEffectCommons.IsExistOnField(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.CanActivateSuspendCostEffect(card);
@@ -103,7 +102,7 @@ namespace DCGO.CardEffects.BT22
                     {
                         if (permanent.TopCard.HasCSTraits)
                         {
-                            if(permanent.DigivolutionCards.Filter(x => x.HasLevel && x.Level == permanent.Level).Count >= 1)
+                            if (permanent.DigivolutionCards.Filter(x => x.HasLevel && x.Level == permanent.Level).Count >= 1)
                             {
                                 DigivolvingDigimon = permanent;
                                 return true;

+ 6 - 8
Assets/CardEffect/BT22/Yellow/BT22_034.cs

@@ -70,7 +70,7 @@ namespace DCGO.CardEffects.BT22
                 if (CardEffectCommons.HasMatchConditionOpponentsPermanent(card, SharedIsOpponentDigimon))
                 {
                     bool isTrashingSecurity = false;
-                    int dpChange = -3000;
+                    int dpChange = 3000;
 
                     if (card.Owner.SecurityCards.Any())
                     {
@@ -94,21 +94,19 @@ namespace DCGO.CardEffects.BT22
 
                     if (isTrashingSecurity)
                     {
-                        #region Trash Top Security And Check
-
                         CardSource topSec = card.Owner.SecurityCards.FirstOrDefault();
 
+                        #region Trash Top Security
+
                         yield return ContinuousController.instance.StartCoroutine(new IDestroySecurity(
                         player: card.Owner,
                         destroySecurityCount: 1,
                         cardEffect: activateClass,
                         fromTop: true).DestroySecurity());
 
-                        List<CardSource> DiscardedCards = CardEffectCommons.GetDiscardedCardsFromHashtable(hashtable);
-
                         #endregion
 
-                        if (DiscardedCards.Contains(topSec)) dpChange = -6000;
+                        if (CardEffectCommons.IsExistOnTrash(topSec)) dpChange = 6000;
                     }
 
                     Permanent selectedPermament = null;
@@ -137,14 +135,14 @@ namespace DCGO.CardEffects.BT22
                         yield return null;
                     }
 
-                    selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to -2K DP", "The opponent is selecting 1 Digimon to -2K DP");
+                    selectPermanentEffect.SetUpCustomMessage($"Select 1 Digimon to -{dpChange} DP", $"The opponent is selecting 1 Digimon to -{dpChange} DP");
                     yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
                     #endregion
 
                     if (selectedPermament != null) yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                         targetPermanent: selectedPermament,
-                        changeValue: dpChange,
+                        changeValue: -dpChange,
                         effectDuration: EffectDuration.UntilOpponentTurnEnd,
                         activateClass: activateClass
                     ));

+ 1 - 1
Assets/CardEffect/BT22/Yellow/BT22_035.cs

@@ -322,7 +322,7 @@ namespace DCGO.CardEffects.BT22
             if (timing == EffectTiming.WhenLinked)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Play 1 level 4 or lower [Appmon] digimon", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Play 1 4 cost or lower [Appmon] digimon", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
                 activateClass.SetHashString("BT22_035_WL");
                 cardEffects.Add(activateClass);

+ 5 - 3
Assets/CardEffect/BT22/Yellow/BT22_041.cs

@@ -30,12 +30,14 @@ namespace DCGO.CardEffects.BT22
 
             #region Reduce Cost
 
-            if (timing == EffectTiming.None)
+            if (timing == EffectTiming.BeforePayCost)
             {
+                int securityCount = card.Owner.SecurityCards.Count + card.Owner.Enemy.SecurityCards.Count;
+
                 bool Condition()
                 {
-                    return !CardEffectCommons.IsExistOnField(card)
-                        && card.Owner.SecurityCards.Count + card.Owner.Enemy.SecurityCards.Count <= 6;
+                    return !CardEffectCommons.IsExistOnBattleAreaDigimon(card)
+                        && securityCount <= 6;
                 }
 
                 cardEffects.Add(

+ 4 - 1
Assets/Scripts/CardEffectFactory/KeyWordEffects/Decode.cs

@@ -33,8 +33,11 @@ public partial class CardEffectFactory
         if (card == null) return null;
         if (sourceCondition == null) sourceCondition = _ => true;
 
+        // EX: "Decode (Red/Black)"
+        string effectname = $"Decode {decodeStrings[0].Split(' ')[0]}";
+
         ActivateClass activateClass = new ActivateClass();
-        activateClass.SetUpICardEffect("Decode", CanUseCondition, card);
+        activateClass.SetUpICardEffect(effectname, CanUseCondition, card);
         activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, DataBase.DecodeEffectDiscription(decodeStrings));
         activateClass.SetIsInheritedEffect(isInheritedEffect);