mbunch_kascope преди 2 години
родител
ревизия
5ff3339dd9
променени са 3 файла, в които са добавени 6 реда и са изтрити 82 реда
  1. 2 76
      Assets/CardEffect/EX6/Yellow/Shakamon_EX6_031.cs
  2. 3 5
      Assets/Scripts/CardEffectFactory/ChangeSAttack.cs
  3. 1 1
      Assets/Scripts/Permanent.cs

+ 2 - 76
Assets/CardEffect/EX6/Yellow/Shakamon_EX6_031.cs

@@ -468,10 +468,9 @@ namespace DCGO.CardEffects.EX6
             #endregion
 
             #region Your Turn
-
-            if (timing == EffectTiming.AfterEffectsActivate || timing == EffectTiming.OnStartTurn || timing == EffectTiming.OnEnterFieldAnyone || timing == EffectTiming.OnUseOption || timing == EffectTiming.OptionSkill || timing == EffectTiming.SecuritySkill)
+            if (timing == EffectTiming.None)
             {
-                /*
+
                 bool Condition()
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
@@ -498,86 +497,13 @@ namespace DCGO.CardEffects.EX6
                     return false;
                 }
 
-
-                
-
                 cardEffects.Add(CardEffectFactory.InvertSAttackStaticEffect(
                     permanentCondition: PermanentCondition,
                     changeValue: -1,
                     isInheritedEffect: false,
                     card: card,
                     condition: Condition));
-                */
-
-                ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Invert Security Attack", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
-                activateClass.SetIsBackgroundProcess(true);
-                cardEffects.Add(activateClass);
-
-                string EffectDiscription()
-                {
-                    return "[Your Turn] This Digimon gains [Security A+1] for each of your opponent's Digimon with [Security Attack].";
-                }
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return true;
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (CardEffectCommons.IsOwnerTurn(card))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-
-                bool PermanentCondition(Permanent permanent)
-                {
-                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
-                    {
-                        if (permanent.HasSecurityAttackChanges)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-
-                IEnumerator ActivateCoroutine(Hashtable hashtable)
-                {
-                    List<Permanent> DigimonToInvertSec = card.Owner.GetBattleAreaDigimons().ToList();
-                    
-
-                    if (DigimonToInvertSec.Count() >= 1)
-                    {
-                        foreach(Permanent permanent1 in DigimonToInvertSec)
-                        {
-                            if(permanent1.HasSecurityAttackChanges && permanent1.EffectList(EffectTiming.None).Where(x => x.HashString == "SecAttackFromLampEffect").ToList().Count() <= 0)
-                            {
-                                //int invert = permanent1.InvertSecutiryValue * -permanent1.Strike;
-                                Debug.Log("Is this working");
-
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonSAttack(
-                                targetPermanent: permanent1,
-                                changeValue: permanent1.InvertSecutiryValue,
-                                effectDuration: EffectDuration.UntilEachTurnEnd,
-                                activateClass: activateClass,
-                                activateAnimation: false,
-                                hashstring: "SecAttackFromLampEffect"));
-                            }
-                        }
-                    }
-                }
             }
-
             #endregion
 
             #region End of Opponent's Turn

+ 3 - 5
Assets/Scripts/CardEffectFactory/ChangeSAttack.cs

@@ -214,11 +214,9 @@ public partial class CardEffectFactory
         InvertSAttackClass invertSAttackClass = new InvertSAttackClass();
         invertSAttackClass.SetUpICardEffect("", CanUseCondition, card);
         invertSAttackClass.SetUpChangeSAttackClass(changeInvertFunc: InvertValue, permanentCondition: PermanentCondition);
-
-        if (isInheritedEffect)
-        {
-            invertSAttackClass.SetIsInheritedEffect(true);
-        }
+        invertSAttackClass.SetIsInheritedEffect(isInheritedEffect);
+        invertSAttackClass.SetHashString($"InvertSecA_{card.CardID}");
+        invertSAttackClass.SetIsBackgroundProcess(true);
 
         bool CanUseCondition(Hashtable hashtable)
         {

+ 1 - 1
Assets/Scripts/Permanent.cs

@@ -1181,7 +1181,7 @@ public class Permanent
                 {
                     if (cardEffect.CanUse(null))
                     {
-                        int Strike1 = ((IChangeSAttackEffect)cardEffect).GetSAttack(Strike, this, InvertSecutiryValue);
+                        int Strike1 = ((IChangeSAttackEffect)cardEffect).GetSAttack(Strike, this, 0);
 
                         if (Strike1 != Strike)
                         {