Fix merge issues. v4.3.0

diff --git a/TheOtherRoles/Modules/CustomOptions.cs b/TheOtherRoles/Modules/CustomOptions.cs
index a16f38976d209fc1a9dbb321facda6f57b5905d4..93615cc3ff9f8e83bb5326ce6957f11a1d80eb28 100644 (file)
--- a/TheOtherRoles/Modules/CustomOptions.cs
+++ b/TheOtherRoles/Modules/CustomOptions.cs
@@ -547,43 +547,6 @@ namespace TheOtherRoles {
         }
 
         
-        private static void setListener(Dictionary<GameObject, SpriteRenderer> settingsHighlightMap, int index) {
-            foreach (KeyValuePair<GameObject, SpriteRenderer> entry in settingsHighlightMap) {
-                entry.Key.SetActive(false);
-                entry.Value.enabled = false;
-            }
-            settingsHighlightMap.ElementAt(index).Key.SetActive(true);
-            settingsHighlightMap.ElementAt(index).Value.enabled = true;
-        }
-
-        private static void destroyOptions (List<List<OptionBehaviour>> optionBehavioursList) {
-           foreach (List<OptionBehaviour> optionBehaviours in optionBehavioursList) {
-                foreach (OptionBehaviour option in optionBehaviours)
-                    UnityEngine.Object.Destroy(option.gameObject);
-            }
-        }
-
-        private static bool setNames (Dictionary<string, string> gameObjectNameDisplayNameMap) {
-            foreach (KeyValuePair <string, string> entry in gameObjectNameDisplayNameMap) {
-                if (GameObject.Find(entry.Key) != null) { // Settings setup has already been performed, fixing the title of the tab and returning
-                    GameObject.Find(entry.Key).transform.FindChild("GameGroup").FindChild("Text").GetComponent<TMPro.TextMeshPro>().SetText(entry.Value);
-                    return true;
-                }
-            }
-
-            setOptions(
-                new List<GameOptionsMenu>{torMenu, hideNSeekMenu},
-                new List<List<OptionBehaviour>> {torOptions, hideNSeekOptions}, 
-                new List<GameObject> {torSettings, hideNSeekSettings}
-            );
-
-            torSettings.gameObject.SetActive(true);
-            torTabHighlight.enabled = true;
-            gameSettingMenu.RegularGameSettings.SetActive(false);
-            gameSettingMenu.GameSettingsHightlight.enabled = false;
-        }
-
-        
         private static void setListener(Dictionary<GameObject, SpriteRenderer> settingsHighlightMap, int index) {
             foreach (KeyValuePair<GameObject, SpriteRenderer> entry in settingsHighlightMap) {
                 entry.Key.SetActive(false);

diff --git a/TheOtherRoles/TheOtherRoles.csproj b/TheOtherRoles/TheOtherRoles.csproj
index eafa1f6cc68adebb6bb496165b33ed7dc0f8d5f2..0e0b3b421a1f64e0b40416d37f04751aa1582491 100644 (file)
--- a/TheOtherRoles/TheOtherRoles.csproj
+++ b/TheOtherRoles/TheOtherRoles.csproj
@@ -15,38 +15,15 @@
     </ItemGroup>
 
     <ItemGroup>
-      <None Remove="Resources\TabIconClassicMode.png" />
-      <None Remove="Resources\TabIconGuesserMode.png" />
-      <None Remove="Resources\TabIconGuesserSettings.png" />
-      <None Remove="Resources\TabIconHideNSeekMode.png" />
-      <None Remove="Resources\TabIconHideNSeekRoles.png" />
-      <None Remove="Resources\TabIconHideNSeekSettings.png" />
     </ItemGroup>
 
        <ItemGroup>
-               <PackageReference Include="AmongUs.GameLibs.Steam" Version="2022.12.8" />
-        <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.664" />
-        <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" />
-        <PackageReference Include="Reactor" Version="2.1.0" />
-    </ItemGroup>       
-
-    <Target Name="Date" BeforeTargets="BeforeBuild">  <!--Will make the compile time available s.t. we can let betas expire-->
-    <WriteLinesToFile File="$(IntermediateOutputPath)gen.cs" Lines="static partial class Builtin { public static long CompileTime = $([System.DateTime]::UtcNow.Ticks) %3B }" Overwrite="true" />
-    <ItemGroup>
-    </ItemGroup>
-
-       <ItemGroup>
-               <!--PackageReference Include="AmongUs.GameLibs.Steam" Version="2023.02.28" /-->
+               <PackageReference Include="AmongUs.GameLibs.Steam" Version="2023.02.28" />
         <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.664" />
         <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.0.1" />
         <PackageReference Include="Reactor" Version="2.1.0" />
     </ItemGroup>
 
-       <ItemGroup>
-               <Reference Include="$(AmongUs)/BepInEx/core/*.dll" />
-               <Reference Include="$(AmongUs)/BepInEx/interop/*.dll" />
-       </ItemGroup>
-
     <Target Name="Date" BeforeTargets="BeforeBuild">  <!--Will make the compile time available s.t. we can let betas expire-->
     <WriteLinesToFile File="$(IntermediateOutputPath)gen.cs" Lines="static partial class Builtin { public static long CompileTime = $([System.DateTime]::UtcNow.Ticks) %3B }" Overwrite="true" />
     <ItemGroup>

diff --git a/TheOtherRoles/packages.lock.json b/TheOtherRoles/packages.lock.json
index 654944b71fde5faffb5f7d343270f0e956f30e75..eb054c700e8bf900a978ce42e44f1d15906db25b 100644 (file)
--- a/TheOtherRoles/packages.lock.json
+++ b/TheOtherRoles/packages.lock.json
@@ -4,9 +4,9 @@
     "net6.0": {
       "AmongUs.GameLibs.Steam": {
         "type": "Direct",
-        "requested": "[2022.12.8, )",
-        "resolved": "2022.12.8",
-        "contentHash": "IJsIi89xUYRvA54YtNVEJjf25hhF3LWzkNBslKCNDUpL1aQ/PhNyO4j18pO71DCgW/qr1P1j8+CwByuBLsInNA=="
+        "requested": "[2023.2.28, )",
+        "resolved": "2023.2.28",
+        "contentHash": "GEcFs++dUrI+6Q+RTWvnm1a7l3Q/bUNNuCy9h8R17WISTOrV7g9QrZZmUiJka0JvVnj/J9Hygx5FaqApzFZKiQ=="
       },
       "BepInEx.IL2CPP.MSBuild": {
         "type": "Direct",