Merge pull request #1419 from DCGO2/task/jimmy-ken-bugfix

BT22-092

Assets/Scripts/CardEffect/BT22/Purple/BT22_092.cs

@@ -210,7 +210,7 @@ namespace DCGO.CardEffects.BT22
                                             if (selectedEffect.CanUse(null))
                                             {
                                                 yield return ContinuousController.instance.StartCoroutine(((ActivateICardEffect)selectedEffect).Activate_Optional_Effect_Execute(null));
-
+                                                ((ActivateICardEffect)selectedEffect).AddUse();
                                                 yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(1, activateClass));
                                             }
                                         }

Assets/Scripts/Script/AutoProcessing.cs

@@ -899,7 +899,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
                     {
                         if (cardEffect.CanUse(hashtable))
                         {
-                            cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEfffectThisTurn(cardEffect);
+                            cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEffectThisTurn(cardEffect);
                             yield return ContinuousController.instance.StartCoroutine(((ActivateICardEffect)cardEffect).Activate(hashtable));
                         }
                     }
@@ -922,7 +922,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
                         {
                             if (cardEffect.CanUse(hashtable))
                             {
-                                cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEfffectThisTurn(cardEffect);
+                                cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEffectThisTurn(cardEffect);
                                 yield return ContinuousController.instance.StartCoroutine(((ActivateICardEffect)cardEffect).Activate(hashtable));
                             }
                         }
@@ -945,7 +945,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
                         {
                             if (cardEffect.CanUse(hashtable))
                             {
-                                cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEfffectThisTurn(cardEffect);
+                                cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEffectThisTurn(cardEffect);
                                 yield return ContinuousController.instance.StartCoroutine(((ActivateICardEffect)cardEffect).Activate(hashtable));
                             }
                         }
@@ -968,7 +968,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
                         {
                             if (cardEffect.CanUse(hashtable))
                             {
-                                cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEfffectThisTurn(cardEffect);
+                                cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEffectThisTurn(cardEffect);
                                 yield return ContinuousController.instance.StartCoroutine(((ActivateICardEffect)cardEffect).Activate(hashtable));
                             }
                         }
@@ -1036,7 +1036,7 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
                         {
                             if (cardEffect.CanUse(hashtable))
                             {
-                                cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEfffectThisTurn(cardEffect);
+                                cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEffectThisTurn(cardEffect);
                                 yield return ContinuousController.instance.StartCoroutine(((ActivateICardEffect)cardEffect).Activate(hashtable));
                             }
                         }

Assets/Scripts/Script/CEntity_EffectController.cs

@@ -1,8 +1,6 @@
-using System.Collections;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
-using System;
-using System.IO;
 
 public class CEntity_EffectController : MonoBehaviour
 {
@@ -184,7 +182,7 @@ public class CEntity_EffectController : MonoBehaviour
         #region Generate and set an instance of the card effect class
         bool CanAttachEffectComponent()
         {
-            if (string.IsNullOrEmpty(ClassName)) 
+            if (string.IsNullOrEmpty(ClassName))
                 return false;
 
             if (Type.GetType(ClassName) == null)
@@ -199,7 +197,7 @@ public class CEntity_EffectController : MonoBehaviour
                     if (Type.GetType($"DCGO.CardEffects.Tokens.{ClassName}") == null)
                         return false;
                 }
-                
+
             }
 
             return true;
@@ -218,7 +216,7 @@ public class CEntity_EffectController : MonoBehaviour
                 else
                     t = Type.GetType($"DCGO.CardEffects.Tokens.{ClassName}");
             }
-                
+
 
             Component component = this.gameObject.AddComponent(t);
 
@@ -268,7 +266,7 @@ public class CEntity_EffectController : MonoBehaviour
     #endregion
 
     #region Register as effects used this turn
-    public void RegisterUseEfffectThisTurn(ICardEffect cardEffect)
+    public void RegisterUseEffectThisTurn(ICardEffect cardEffect)
     {
         UseEffectsThisTurn.Add(cardEffect);
     }

Assets/Scripts/Script/ICardEffect.cs

@@ -1,5 +1,4 @@
-using Photon.Pun;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -1246,6 +1245,13 @@ public static class ActivateICardEffectExtensionClass
     }
     #endregion
 
+    #region add a usage of an X Per Turn
+    public static void AddUse(this ActivateICardEffect activateICardEffect)
+    {
+        ((ICardEffect)activateICardEffect).EffectSourceCard.cEntity_EffectController.RegisterUseEffectThisTurn((ICardEffect)activateICardEffect);
+    }
+    #endregion
+
     #region Effect → Processing
 
     public static IEnumerator Activate_Effect_Execute(this ActivateICardEffect activateICardEffect, Hashtable hash, UnityAction<ICardEffect> useEffectCallback)

Assets/Scripts/Script/MultipleSkills.cs

@@ -358,7 +358,7 @@ public class MultipleSkills : MonoBehaviourPunCallbacks
                     skillInfos_active[_skillIndex].CardEffect.SetOnProcessCallbuck(() =>
                         {
                             SkillInfos_used.Add(skillInfos_active[_skillIndex]);
-                            cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEfffectThisTurn(cardEffect);
+                            cardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEffectThisTurn(cardEffect);
                         });
 
                     if (cardEffect is ActivateICardEffect)

Assets/Scripts/Script/TurnStateMachine.cs

@@ -1182,7 +1182,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                         //Count up the number of uses
                         if (UseCardEffect.MaxCountPerTurn < 100)
                         {
-                            UseCardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEfffectThisTurn(UseCardEffect);
+                            UseCardEffect.EffectSourceCard.cEntity_EffectController.RegisterUseEffectThisTurn(UseCardEffect);
                         }
 
                         // yield return StartCoroutine(((ActivateICardEffect)UseCardEffect).Activate_Optional_Effect_Execute(null));