* same as last but for AIS

Mantas-2155X · Jul 4, 2020 · 2d4fee6 · 2d4fee6
1 parent f1909c4
commit 2d4fee6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/AI_BetterHScenes/AI_BetterHScenes.cs b/AI_BetterHScenes/AI_BetterHScenes.cs
@@ -49,6 +49,7 @@ public class AI_BetterHScenes : BaseUnityPlugin
         private static Light sun;
         private static List<SkinnedCollisionHelper> collisionHelpers;
 
+        private static bool OnHStart;
         private static bool activeUI;
         private static bool patched;
 
@@ -391,11 +392,6 @@ public static void HScene_SetStartVoice_Patch(HScene __instance, HSceneSprite __
             Tools.SetGotoWeaknessCount(countToWeakness.Value);
 
             SliderUI.InitDraggersUI();
-
-            HScene_StripClothes(
-                stripMaleClothes.Value == Tools.OffHStartAnimChange.OnHStart || stripMaleClothes.Value == Tools.OffHStartAnimChange.Both, 
-                stripFemaleClothes.Value == Tools.OffHStartAnimChange.OnHStart || stripFemaleClothes.Value == Tools.OffHStartAnimChange.Both
-            );
         }    
 
         //-- Enable map, simulation after H if disabled previously, disable dragger UI --//
@@ -410,6 +406,7 @@ public static void HScene_EndProc_Patch()
                 sun.shadows = oldSunShadowsState;
 
             activeUI = false;
+            OnHStart = false;
 
             if (!increaseBathDesire.Value || manager.bMerchant) 
                 return;
@@ -447,6 +444,22 @@ public static void HScene_EndProc_Patch()
             }
         }
 
+        //-- Strip on start of H scene --//
+        //-- fuck you illusion for giving me 21 headaches over this when it's supposed to work everywhere else I patched. Why the fuck is it working for females but not males in the same fucking line of code, why do I have to pick other places to patch. Fuck you, fuck you and FUCK YOU!! --//
+        [HarmonyPostfix, HarmonyPatch(typeof(HScene), "SyncAnimation")]
+        public static void HScene_SyncAnimation_StripClothes()
+        {
+            if (!OnHStart)
+            {
+                HScene_StripClothes(
+                    stripMaleClothes.Value == Tools.OffHStartAnimChange.OnHStart || stripMaleClothes.Value == Tools.OffHStartAnimChange.Both, 
+                    stripFemaleClothes.Value == Tools.OffHStartAnimChange.OnHStart || stripFemaleClothes.Value == Tools.OffHStartAnimChange.Both
+                );
+
+                OnHStart = true;
+            }
+        }
+
         //-- Always gauges heart --//
         [HarmonyPostfix, HarmonyPatch(typeof(FeelHit), "isHit")]
         public static void FeelHit_isHit_AlwaysGaugesHeart(ref bool __result)

diff --git a/HS2_BetterHScenes/HS2_BetterHScenes.cs b/HS2_BetterHScenes/HS2_BetterHScenes.cs
@@ -311,7 +311,7 @@ public static void HScene_EndProc_Patch()
         //-- Strip on start of H scene --//
         //-- fuck you illusion for giving me 21 headaches over this when it's supposed to work everywhere else I patched. Why the fuck is it working for females but not males in the same fucking line of code, why do I have to pick other places to patch. Fuck you, fuck you and FUCK YOU!! --//
         [HarmonyPostfix, HarmonyPatch(typeof(HScene), "SetStartVoice")]
-        public static void HScene_SetStartVoice_CacheMode()
+        public static void HScene_SetStartVoice_StripClothes()
         {
             HScene_StripClothes(
                 stripMaleClothes.Value == Tools.OffHStartAnimChange.OnHStart || stripMaleClothes.Value == Tools.OffHStartAnimChange.Both,