gaugeFemale logic tweaks

Author: ManlyMarco

Core_SkinEffects/SkinEffectsController.cs

@@ -11,7 +11,6 @@
 using KoiSkinOverlayX;
 using UnityEngine;
 using KKAPI.Utilities;
-using System.IO;
 
 namespace KK_SkinEffects
 {
@@ -227,50 +226,49 @@ public byte[] SiruState
 
         internal void OnFemaleGaugeUp(SaveData.Heroine heroine, HFlag hFlag)
         {
-            var orgs = hFlag.GetOrgCount();
-
-            // Increase sweat level every time female gauge reaches 70
-            if (hFlag.gaugeFemale >= 70)
-            {             
-                // Using GetOrgCount to prevent adding a level when you let gauge fall below 70 and resume
-                if (SweatLevel < orgs + 1)
-                {
-                    SweatLevel = orgs + 1;
-                }          
-            }
+            var gaugeFemale = hFlag.gaugeFemale;
 
-
-            // Note: In my experience masturbation (peeping scenes) do not increase Org count when the girl climaxes. 
-            // So a workaround is to use a narrow check between gauge 70-71 with a boolean flag to stop checking. 
-            if (hFlag.mode == HFlag.EMode.masturbation)
+            if (hFlag.mode == HFlag.EMode.masturbation)
             {
-                if (hFlag.gaugeFemale >= 0 && hFlag.gaugeFemale < 5 && _stopChecking != false)
-                {
-                    _stopChecking = false; //Reset it when meter resets, only if not already set back to false.
-                }
-
-                if (hFlag.gaugeFemale >= 70 && hFlag.gaugeFemale < 71 && _stopChecking == false)
-                {
-                    
-                    // Also make this check between 70-71, as it seems to be a decimal value between these two numbers. Don't want to check consistently.
-
-                    PussyJuiceLevel = PussyJuiceLevel + 1; //TextureLoader will only go up to the Math.Max for texture count. So if we had 10 levels of texture .png files in resources it would 
-                                                           // Increment through them all step by step. By default we have 3 textures for each level. 
-                    _stopChecking = true;
+                // Worakound to org count not increasing when the girl climaxes in masturbation/peeping scenes
+                if (_stopChecking)
+                {
+                    if (gaugeFemale >= 0 && gaugeFemale < 5)
+                    {
+                        //Reset it when meter resets, only if not already set back to false.
+                        _stopChecking = false;
+                    }
+                }
+                else
+                {
+                    if (gaugeFemale >= 70 && gaugeFemale < 71)
+                    {
+                        // Also make this check between 70-71, as it seems to be a decimal value between these two numbers. Don't want to check consistently.
+                        SweatLevel += 1;
+                        PussyJuiceLevel += 1;
+                        _stopChecking = true;
+                    }
+                }
+            }
+            else
+            {
+                if (gaugeFemale >= 70)
+                {
+                    // Using GetOrgCount to prevent adding a level when you let gauge fall below 70 and resume
+                    var orgsPlusOne = hFlag.GetOrgCount() + 1;
+                    if (SweatLevel < orgsPlusOne)
+                        SweatLevel = orgsPlusOne;
+                    if (PussyJuiceLevel < orgsPlusOne)
+                        PussyJuiceLevel = orgsPlusOne;
                 }
             }
-            else if (PussyJuiceLevel < orgs + 1)
-            {
-                PussyJuiceLevel = orgs + 1;
-            }
-
-
+
             // When going too rough and has FragileVag, add bld effect
             if (FragileVag)
             {
                 if (_fragileVagTriggeredLvl == 0)
                 {
-                    if (orgs == 0 && IsRoughPiston(hFlag))
+                    if (hFlag.GetOrgCount() == 0 && IsRoughPiston(hFlag))
                     {
                         BloodLevel = Mathf.Max(1, BloodLevel + 1);
                         _fragileVagTriggeredLvl = 1;
@@ -369,8 +367,8 @@ public void OnAnalInsert(SaveData.Heroine heroine, HFlag hFlag)
         public void OnCumInMouth(SaveData.Heroine heroine, HFlag hFlag)
         {
             DroolLevel++;
-            TearLevel++;
-            
+            TearLevel++;
+
             _mouthFilledWithCumCount += 1;
             if (_mouthFilledWithCumCount >= 3)
                 CumInNoseLevel += 1;
@@ -610,8 +608,8 @@ private void UpdateBldTexture(bool refresh = true)
                 if (refresh)
                     UpdateTextures(true, false);
             }
-        }
-		
+        }
+
         private void UpdateCumTexture(bool refresh = true)
         {
             _ksox.AdditionalTextures.RemoveAll(x => TextureLoader.CumTextures.Contains(x.Texture));
@@ -624,8 +622,8 @@ private void UpdateCumTexture(bool refresh = true)
                 if (refresh)
                     UpdateTextures(true, false);
             }
-        }
-		
+        }
+
         private void UpdateAnalCumTexture(bool refresh = true)
         {
             _ksox.AdditionalTextures.RemoveAll(x => TextureLoader.AnalCumTextures.Contains(x.Texture));
@@ -683,8 +681,8 @@ private void UpdateDroolTexture(bool refresh = true)
                 if (refresh)
                     UpdateTextures(false, true);
             }
-        }
-		
+        }
+
         private void UpdateSalivaTexture(bool refresh = true)
         {
             _ksox.AdditionalTextures.RemoveAll(x => TextureLoader.SalivaTextures.Contains(x.Texture));
@@ -731,7 +729,7 @@ private void UpdatePussyJuiceTexture(bool refresh = true)
         {
             _ksox.AdditionalTextures.RemoveAll(x => TextureLoader.PussyJuiceTextures.Contains(x.Texture));
 
-            if (StudioAPI.InsideStudio || SkinEffectsPlugin.EnableJuice.Value) 
+            if (StudioAPI.InsideStudio || SkinEffectsPlugin.EnableJuice.Value)
             {
                 if (PussyJuiceLevel > 0)
                 {