Use a more reliable implementation of GetMakerSex

IllusionMods · Sep 21, 2021 · d7ec3d8 · d7ec3d8
1 parent 6e2d0b7
commit d7ec3d8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Shared.Core/Maker/MakerAPI.cs b/src/Shared.Core/Maker/MakerAPI.cs
@@ -104,7 +104,16 @@ public static AccessoryControlWrapper<T, TVal> AddEditableAccessoryWindowControl
         /// </summary>
         public static int GetMakerSex()
 #if KK || KKS || EC
-            => GetMakerBase().modeSex;
+
+
+        {
+            var res = (int)Hooks._modeSex;
+#if DEBUG
+            if(GetMakerBase().modeSex != res)
+                KoikatuAPI.Logger.LogMessage($"Difference in modesex hooks={res} base={GetMakerBase().modeSex}");
+#endif
+            return res;
+        }
 #elif AI || HS2
             => CharaCustom.CharaCustom.modeSex;
 #endif

diff --git a/src/Shared.KKalike/Maker/MakerAPI.Hooks.KK.cs b/src/Shared.KKalike/Maker/MakerAPI.Hooks.KK.cs
@@ -76,9 +76,11 @@ private static IEnumerator OnMakerLoadingCo()
 
             [HarmonyPrefix]
             [HarmonyPatch(typeof(CustomScene), "Start")]
-            public static void CustomScene_Start()
+            public static void CustomScene_Start(CustomScene __instance)
             {
                 InsideMaker = Singleton<CustomBase>.Instance != null;
+
+                _modeSex = __instance.modeNew ? __instance.modeSex : __instance.chaFileCtrl.parameter.sex;
             }
 
             [HarmonyPrefix]
@@ -88,6 +90,7 @@ public static void CustomScene_Destroy()
                 OnMakerExiting();
                 InsideMaker = false;
                 InternalLastLoadedChaFile = null;
+                _modeSex = -1;
             }
 
             [HarmonyPrefix, HarmonyPatch(typeof(CustomCharaFile), "Initialize")]
@@ -112,6 +115,7 @@ public static void ChaFileLoadFilePreHook(ChaFile __instance)
             }
 
             public static ChaFile InternalLastLoadedChaFile;
+            public static int _modeSex;
 
             [HarmonyPostfix]
 #if KKS