reset fumo poke dmg after a while

Alexejhero · Dec 16, 2023 · c9389aa · c9389aa
1 parent 6e6a4d5
commit c9389aa
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 15 deletions.
diff --git a/SCHIZO/Items/FumoItem/EvilFumoItemTool.cs b/SCHIZO/Items/FumoItem/EvilFumoItemTool.cs
@@ -8,11 +8,19 @@ partial class EvilFumoItemTool
     public Knife stolenKnife;
     private static float _knifeScale = 0.9f;
 
+    private static float _dmgResetTime = 60f;
+    private float _timeUntilDamageReset;
+    private float _currentDamage;
+
+    private void Start()
+    {
+        _currentDamage = damageOnPoke;
+    }
     protected override void ApplyAltEffect(bool active)
     {
         if (active)
         {
-            float dmg = damageOnPoke;
+            float dmg = _currentDamage;
             if (stealKnife && TryFindKnife(out Knife knife)
                 && Inventory.main.InternalDropItem(knife.pickupable))
             {
@@ -21,7 +29,7 @@ protected override void ApplyAltEffect(bool active)
                 dmg *= 4;
             }
             usingPlayer.liveMixin.TakeDamage(dmg);
-            damageOnPoke *= 1.25f; // negative reward function
+            _currentDamage *= 1.25f; // negative reward function
         }
         else
         {
@@ -55,6 +63,25 @@ private void YoinkKnife()
         stolenKnife.transform.SetParent(knifeSocket.Exists() ?? transform, true);
         stolenKnife.transform.localScale *= _knifeScale;
     }
+    protected override void FixedUpdate()
+    {
+        base.FixedUpdate();
+        UpdateDamageReset();
+    }
+
+    private void UpdateDamageReset()
+    {
+        if (_currentDamage == damageOnPoke) return;
+
+        if (isAltEffectActive)
+            _timeUntilDamageReset = _dmgResetTime;
+        else
+        {
+            _timeUntilDamageReset -= Time.fixedDeltaTime;
+            if (_timeUntilDamageReset < 0)
+                _currentDamage = damageOnPoke;
+        }
+    }
 
     protected override void Update()
     {

diff --git a/SCHIZO/Items/FumoItem/FumoItemTool.cs b/SCHIZO/Items/FumoItem/FumoItemTool.cs
@@ -42,24 +42,28 @@ partial class FumoItemTool
         base.Awake();
     }
 
-    public void FixedUpdate()
+    protected virtual void FixedUpdate()
     {
         if (!usingPlayer) return;
+        UpdateAltEffect();
+    }
 
-        if (_altEffectOnHug)
-        {
-            if (_isHugging)
-            {
-                _hugTime += Time.fixedDeltaTime;
-                if (_hugTime > altEffectMinHugTime) SetAltEffect(true);
-            }
-            else
-            {
-                _hugTime = 0;
-            }
-        }
+    private void UpdateAltEffect()
+    {
         _altEffectTimeRemaining -= Time.fixedDeltaTime;
         if (_altEffectTimeRemaining < 0f) SetAltEffect(false);
+
+        if (!_altEffectOnHug) return;
+
+        if (_isHugging)
+        {
+            _hugTime += Time.fixedDeltaTime;
+            if (_hugTime > altEffectMinHugTime && !isAltEffectActive) SetAltEffect(true);
+        }
+        else
+        {
+            _hugTime = 0;
+        }
     }
 
     protected virtual void Update()