zoom improvements + config changes

Author: EBro912

Patches/HUDManager_Patches.cs

@@ -30,11 +30,14 @@ private static void Postfix(HUDManager __instance)
                     string flashlightKey = InputControlPath.ToHumanReadableString(Plugin.Inputs.FlashlightKey.bindings[0].effectivePath, InputControlPath.HumanReadableStringOptions.OmitDevice);
                     string zoomOutKey = InputControlPath.ToHumanReadableString(Plugin.Inputs.ZoomOutKey.bindings[0].effectivePath, InputControlPath.HumanReadableStringOptions.OmitDevice);
                     string zoomInKey = InputControlPath.ToHumanReadableString(Plugin.Inputs.ZoomInKey.bindings[0].effectivePath, InputControlPath.HumanReadableStringOptions.OmitDevice);
-                    // who needs to change the y position when u can just \n: sunglasses:
-                    if (SpectateEnemies.Instance.SpectatingEnemies)
-                        __instance.holdButtonToEndGameEarlyText.text += $"\n\n\n\n\nSpectate Players: [{swapKey}]\nFlashlight : [{flashlightKey}]\nZoom Out [{zoomOutKey}]\nZoom In [{zoomInKey}]\nConfig Menu : [{menuKey}]";
-                    else
-                        __instance.holdButtonToEndGameEarlyText.text += $"\n\n\n\n\nSpectate Enemies: [{swapKey}]\nFlashlight : [{flashlightKey}]\nConfig Menu : [{menuKey}]";
+                    if (!SpectateEnemies.Instance.HideControls.Value)
+                    {
+                        // who needs to change the y position when u can just \n: sunglasses:
+                        if (SpectateEnemies.Instance.SpectatingEnemies)
+                            __instance.holdButtonToEndGameEarlyText.text += $"\n\n\n\n\nSpectate Players: [{swapKey}]\nFlashlight : [{flashlightKey}]\nZoom Out : [{zoomOutKey}]\nZoom In : [{zoomInKey}]\nConfig Menu : [{menuKey}]";
+                        else
+                            __instance.holdButtonToEndGameEarlyText.text += $"\n\n\n\n\nSpectate Enemies: [{swapKey}]\nFlashlight : [{flashlightKey}]\nConfig Menu : [{menuKey}]";
+                    }
 
                 }
             }

Patches/QuickMenuManager_Patches.cs

@@ -6,7 +6,7 @@ namespace SpectateEnemy.Patches
     [HarmonyPatch(typeof(QuickMenuManager), "Start")]
     internal class QuickMenuManager_Patches
     {
-        private static void Postfix(QuickMenuManager __instance)
+        private static void Postfix()
         {
             if (SpectateEnemies.Instance == null)
             {

Plugin.cs

@@ -1,4 +1,5 @@
 using BepInEx;
+using BepInEx.Configuration;
 using GameNetcodeStuff;
 using HarmonyLib;
 using System.Reflection;
@@ -13,11 +14,14 @@ internal class Plugin : BaseUnityPlugin
     public static MethodInfo displaySpectatorTip = null;
 
     public static Inputs Inputs = new();
+    public static ConfigFile Configuration;
 
     private Harmony harmony;
 
     private void Awake()
     {
+        Configuration = Config;
+
         harmony = new Harmony(MyPluginInfo.PLUGIN_GUID);
         harmony.PatchAll();
 

SpectateEnemies.cs

@@ -1,4 +1,5 @@
 using BepInEx;
+using BepInEx.Configuration;
 using GameNetcodeStuff;
 using System;
 using System.Collections.Generic;
@@ -14,15 +15,16 @@ internal class SpectateEnemies : MonoBehaviour
     {
         public static SpectateEnemies Instance;
 
-        private static readonly Dictionary<string, bool> settings = [];
+        private static readonly Dictionary<string, ConfigEntry<bool>> settings = [];
 
         private bool WindowOpen = false;
         private Rect window = new(10, 10, 500, 400);
 
         public int SpectatedEnemyIndex = -1;
         public bool SpectatingEnemies = false;
         public Spectatable[] SpectatorList;
-        public float zoomLevel = 1f;
+        public float ZoomLevel = 1f;
+        public ConfigEntry<bool> HideControls;
 
         private void Awake()
         {
@@ -33,6 +35,8 @@ private void Awake()
             SetupKeybinds();
             Instance = this;
             DontDestroyOnLoad(gameObject);
+
+            HideControls = Plugin.Configuration.Bind("Config", "Hide Controls", false, "Hides the controls toolip on the right hand side.");
         }
 
         private void SetupKeybinds()
@@ -92,18 +96,18 @@ private void OnZoomOutPressed(InputAction.CallbackContext context)
         {
             if (!context.performed) return;
             if (!SpectatingEnemies) return;
-            zoomLevel += 0.1f;
-            if (zoomLevel > 10f)
-                zoomLevel = 10f;
+            ZoomLevel += 0.1f;
+            if (ZoomLevel > 10f)
+                ZoomLevel = 10f;
         }
 
         private void OnZoomInPressed(InputAction.CallbackContext context)
         {
             if (!context.performed) return;
             if (!SpectatingEnemies) return;
-            zoomLevel -= 0.1f;
-            if (zoomLevel < 1f)
-                zoomLevel = 1f;
+            ZoomLevel -= 0.1f;
+            if (ZoomLevel < 1f)
+                ZoomLevel = 1f;
         }
 
         private void LateUpdate()
@@ -139,12 +143,15 @@ private void LateUpdate()
                 {
                     TryFixName(ref currentEnemy);
                 }
-                GameNetworkManager.Instance.localPlayerController.spectateCameraPivot.position = position.Value + Vector3.up * zoomLevel;
+
+                GameNetworkManager.Instance.localPlayerController.spectateCameraPivot.position = position.Value;
                 if (currentEnemy.type == SpectatableType.Masked && currentEnemy.maskedName != string.Empty)
-                    HUDManager.Instance.spectatingPlayerText.text = string.Format("(Spectating: {0}) [{1:F1}x]", currentEnemy.maskedName, zoomLevel);
+                    HUDManager.Instance.spectatingPlayerText.text = string.Format("(Spectating: {0}) [{1:F1}x]", currentEnemy.maskedName, ZoomLevel);
                 else
-                    HUDManager.Instance.spectatingPlayerText.text = string.Format("(Spectating: {0}) [{1:F1}x]", currentEnemy.enemyName, zoomLevel);
+                    HUDManager.Instance.spectatingPlayerText.text = string.Format("(Spectating: {0}) [{1:F1}x]", currentEnemy.enemyName, ZoomLevel);
                 Plugin.raycastSpectate.Invoke(GameNetworkManager.Instance.localPlayerController, []);
+                // Thanks HalfyRed!
+                GameNetworkManager.Instance.localPlayerController.spectateCameraPivot.GetComponentInChildren<Camera>().transform.localPosition = Vector3.back * (ZoomLevel + 0.5f);
             }
         }
 
@@ -209,7 +216,7 @@ public void ToggleSpectatingMode(PlayerControllerB __instance)
             SpectatingEnemies = !SpectatingEnemies;
             if (SpectatingEnemies)
             {
-                SpectatorList = FindObjectsByType<Spectatable>(FindObjectsSortMode.None).Where(x => settings[x.enemyName]).ToArray();
+                SpectatorList = FindObjectsByType<Spectatable>(FindObjectsSortMode.None).Where(x => GetSetting(x.enemyName)).ToArray();
                 if (SpectatorList.Length == 0)
                 {
                     SpectatingEnemies = false;
@@ -254,12 +261,13 @@ public void PopulateSettings()
             {
                 if (type.enemyName == "Red pill" || type.enemyName == "Lasso")
                     continue;
-                settings.TryAdd(type.enemyName, !type.isDaytimeEnemy);
+                settings.TryAdd(type.enemyName, Plugin.Configuration.Bind("Enemies", type.enemyName, !type.isDaytimeEnemy, "Enables spectating " + type.enemyName));
             }
 
-            settings.TryAdd("Landmine", false);
-            settings.TryAdd("Turret", false);
+            settings.TryAdd("Landmine", Plugin.Configuration.Bind("Enemies", "Landmine", false, "Enables spectating Landmines"));
+            settings.TryAdd("Turret", Plugin.Configuration.Bind("Enemies", "Turret", false, "Enables spectating Turrets"));
 
+            /*
             // TODO: this is terrible, improve
             try
             {
@@ -290,22 +298,24 @@ public void PopulateSettings()
             catch (Exception)
             {
                 Debug.LogWarning("[SpectateEnemies]: Config failed to load, using default values!");
-            } 
+            } */
 
+            Debug.LogWarning("[SpectateEnemies]: Config loaded");
             AssertSettings();
         }
 
         private void OnApplicationQuit()
         {
-            StringBuilder sb = new();
+            /*StringBuilder sb = new();
             foreach (var s in settings)
             {
                 sb.Append(s.Key);
                 sb.Append(':');
                 sb.Append(s.Value);
                 sb.AppendLine();
             }
-            File.WriteAllText(Paths.ConfigPath + "/SpectateEnemy.cfg", sb.ToString());
+            File.WriteAllText(Paths.ConfigPath + "/SpectateEnemy.cfg", sb.ToString());*/
+            Plugin.Configuration.Save();
             Debug.LogWarning("[SpectateEnemies]: Config saved");
         }
 
@@ -322,7 +332,7 @@ public bool SpectateNextEnemy()
 
         private void GetNextValidSpectatable()
         {
-            SpectatorList = FindObjectsByType<Spectatable>(FindObjectsSortMode.None).Where(x => settings[x.enemyName]).ToArray();
+            SpectatorList = FindObjectsByType<Spectatable>(FindObjectsSortMode.None).Where(x => GetSetting(x.enemyName)).ToArray();
             int enemiesChecked = 0;
             int current = SpectatedEnemyIndex;
             while (enemiesChecked < SpectatorList.Length)
@@ -366,7 +376,7 @@ private void AssertSettings()
         public bool GetSetting(string name)
         {
             if (settings.ContainsKey(name))
-                return settings[name];
+                return settings[name].Value;
             return false;
         }
 
@@ -403,7 +413,7 @@ private void DrawGUI(int windowID)
                 int y = 0;
                 foreach (string k in settings.Keys.ToList())
                 {
-                    settings[k] = GUI.Toggle(new Rect(10 + (150 * x), 60 + (30 * y), 150, 20), settings[k], k);
+                    settings[k].Value = GUI.Toggle(new Rect(10 + (150 * x), 60 + (30 * y), 150, 20), settings[k].Value, k);
                     x++;
                     if (x == 3)
                     {

SpectateEnemy.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>SpectateEnemy</AssemblyName>
     <Description>My first plugin</Description>
-    <Version>2.2.1</Version>
+    <Version>2.3.0</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <RestoreAdditionalProjectSources>
@@ -31,7 +31,7 @@
       <HintPath>F:\SteamLibrary\steamapps\common\Lethal Company\Lethal Company_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="LethalCompanyInputUtils">
-      <HintPath>F:\SteamLibrary\steamapps\common\Lethal Company\BepInEx\plugins\Rune580-LethalCompany_InputUtils\LethalCompanyInputUtils.dll</HintPath>
+      <HintPath>F:\SteamLibrary\steamapps\common\Lethal Company\BepInEx\plugins\Rune580-LethalCompany_InputUtils\LethalCompanyInputUtils\LethalCompanyInputUtils.dll</HintPath>
     </Reference>
     <Reference Include="Unity.InputSystem">
       <HintPath>F:\SteamLibrary\steamapps\common\Lethal Company\Lethal Company_Data\Managed\Unity.InputSystem.dll</HintPath>