Fix AI cameratarget bug

IllusionMods · Dec 13, 2019 · 4094cd8 · 4094cd8
1 parent a2c1cbe
commit 4094cd8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/src/CameraTargetFix.AISyoujyo/CameraTargetFix.cs b/src/CameraTargetFix.AISyoujyo/CameraTargetFix.cs
@@ -1,18 +1,31 @@
 using BepInEx;
+using CharaCustom;
 using HarmonyLib;
 
 namespace KeelPlugins
 {
-    [BepInProcess(AISyoujyoConstants.StudioProcessName)]
     [BepInPlugin(GUID, PluginName, Version)]
     public class CameraTargetFix : CameraTargetFixCore
     {
         protected override void Awake()
         {
             base.Awake();
 
-            Harmony.Patch(typeof(Studio.CameraControl).GetMethod("InternalUpdateCameraState", AccessTools.all),
-                          transpiler: new HarmonyMethod(typeof(CameraTargetFixCore).GetMethod(nameof(StudioPatch), AccessTools.all)));
+            if(Paths.ProcessName == AISyoujyoConstants.StudioProcessName)
+            {
+                Harmony.Patch(typeof(Studio.CameraControl).GetMethod("InternalUpdateCameraState", AccessTools.all),
+                                  transpiler: new HarmonyMethod(typeof(CameraTargetFixCore).GetMethod(nameof(StudioPatch), AccessTools.all))); 
+            }
+            else
+            {
+                Harmony.Patch(typeof(CustomControl).GetMethod("Start", AccessTools.all),
+                              postfix: new HarmonyMethod(GetType().GetMethod(nameof(MakerPatch), AccessTools.all)));
+            }
+        }
+
+        private static void MakerPatch()
+        {
+            Singleton<CustomBase>.Instance.centerDraw = Manager.Config.ActData.Look;
         }
     }
 }
diff --git a/src/CameraTargetFix.Core/CameraTargetFixCore.cs b/src/CameraTargetFix.Core/CameraTargetFixCore.cs
@@ -14,11 +14,12 @@ public abstract class CameraTargetFixCore : BaseUnityPlugin
         public const string Version = "1.0.0." + BuildNumber.Version;
 
         protected static new ManualLogSource Logger;
-        protected static Harmony Harmony = new Harmony($"{GUID}.harmony");
+        protected static Harmony Harmony;
 
         protected virtual void Awake()
         {
-
+            Logger = base.Logger;
+            Harmony = new Harmony($"{GUID}.harmony");
         }
 
 #if DEBUG

diff --git a/src/CameraTargetFix.Koikatu/CameraTargetFix.cs b/src/CameraTargetFix.Koikatu/CameraTargetFix.cs
@@ -11,11 +11,8 @@ protected override void Awake()
         {
             base.Awake();
 
-            if(SceneHelper.StudioInit)
-            {
-                Harmony.Patch(typeof(Studio.CameraControl).GetMethod("LateUpdate", AccessTools.all),
-                              transpiler: new HarmonyMethod(typeof(CameraTargetFixCore).GetMethod(nameof(StudioPatch), AccessTools.all)));
-            }
+            Harmony.Patch(typeof(Studio.CameraControl).GetMethod("LateUpdate", AccessTools.all),
+                            transpiler: new HarmonyMethod(typeof(CameraTargetFixCore).GetMethod(nameof(StudioPatch), AccessTools.all)));
         }
     }
 }
diff --git a/src/Common.Koikatu/Common.Koikatu.projitems b/src/Common.Koikatu/Common.Koikatu.projitems
@@ -10,6 +10,5 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)KoikatuConstants.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SceneHelper.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/Common.Koikatu/SceneHelper.cs b/src/Common.Koikatu/SceneHelper.cs