Update to 3.5s

Hardel-DW · Mar 10, 2021 · 6aa0c00 · 6aa0c00
1 parent dde230c
commit 6aa0c00
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 21 deletions.
diff --git a/Libs/Essentials-2020.12.9s.dll b/Libs/Essentials-2020.12.9s.dll
diff --git a/Libs/Essentials-2021.3.5s.dll b/Libs/Essentials-2021.3.5s.dll
diff --git a/RolesMods/Patch/GameSettingsPatch.cs b/RolesMods/Patch/GameSettingsPatch.cs
@@ -1,14 +1,7 @@
 using HarmonyLib;
+using UnityEngine;
 
 namespace RolesMods.Patch {
-
-    [HarmonyPatch(typeof(GameOptionsData), nameof(GameOptionsData.Method_24))]
-    class GameSettingsPatch {
-        static void Postfix(ref string __result) {
-            DestroyableSingleton<HudManager>.Instance.GameSettings.scale = 0.425f;
-        }
-    }
-
     [HarmonyPatch]
     class GameOptionsMenuPatch {
         static float defaultBounds = 0f;
@@ -27,4 +20,24 @@ static void Postfix(ref GameOptionsMenu __instance) {
             }
         }
     }
+
+    [HarmonyPatch(typeof(HudManager), nameof(HudManager.Update))]
+    public static class HudGameOptionsPatch {
+        public const float increment = 0.2f;
+        public static FloatRange scrollBounds = new FloatRange(2.9f, 7.2f);
+
+        public static void Postfix(HudManager __instance) {
+            if (PlayerControl.LocalPlayer == null || !PlayerControl.LocalPlayer.CanMove)
+                return;
+
+            var pos = __instance.GameSettings.transform.localPosition;
+            if (Input.mouseScrollDelta.y > 0F)
+                pos = new Vector3(pos.x, Mathf.Clamp(pos.y - increment, scrollBounds.min, scrollBounds.max), pos.z);
+            else if (Input.mouseScrollDelta.y < 0f)
+                pos = new Vector3(pos.x, Mathf.Clamp(pos.y + increment, scrollBounds.min, scrollBounds.max), pos.z);
+
+            __instance.GameSettings.transform.localPosition = pos;
+
+        }
+    }
 }
diff --git a/RolesMods/Patch/VersionShowerPatch.cs b/RolesMods/Patch/VersionShowerPatch.cs
@@ -5,7 +5,7 @@ namespace RolesMods.Patch {
     [HarmonyPatch(typeof(VersionShower), nameof(VersionShower.Start))]
     public static class VersionShowerPatch {
         public static void Postfix(VersionShower __instance) {
-            __instance.text.Text += " + [2EADFFFF]RolesMods[] by Hardel";
+            Reactor.Patches.ReactorVersionShower.Text.Text += "\n[2EADFFFF]Too Many Roles[] by Hardel";
         }
     }
 }
diff --git a/RolesMods/ResourceLoader.cs b/RolesMods/ResourceLoader.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 using Reactor.Extensions;
-using Reactor.Unstrip;
 using UnityEngine;
 
 namespace RolesMods {
@@ -15,7 +14,6 @@ public static void LoadAssets() {
 
             Overlay = assetBundle.LoadAsset<GameObject>("Overlay.prefab").DontDestroy();
             OverlaySprite = assetBundle.LoadAsset<Sprite>("Overlay").DontDestroy();
-            assetBundle.Dispose();
         }
     }
 }
diff --git a/RolesMods/RolesMods.cs b/RolesMods/RolesMods.cs
@@ -2,10 +2,11 @@
 using BepInEx.IL2CPP;
 using HarmonyLib;
 using Reactor;
-using Essentials.CustomOptions;
 using BepInEx.Logging;
+using Essentials.Options;
 
 namespace RolesMods {
+
     [BepInPlugin(Id)]
     [BepInProcess("Among Us.exe")]
     [BepInDependency(ReactorPlugin.Id)]

diff --git a/RolesMods/RolesMods.csproj b/RolesMods/RolesMods.csproj
@@ -1,13 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-        <Version>1.0.0</Version>
-        <GameVersion>2020.12.9s</GameVersion>
-        <Mappings>NuclearPowered/Mappings:0.1.0-alpha.2</Mappings>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Version>1.0.0</Version>
+    <Mappings>NuclearPowered/Mappings:0.2.0</Mappings>
 
-        <Description>ToManyRolesMods by Hardel</Description>
-        <Authors>js6pak</Authors>
-    </PropertyGroup>
+    <Description>Too many roles mods</Description>
+    <Authors>Hardel</Authors>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GamePlatform)' == 'Steam'">
+    <GameVersion>2021.3.5s</GameVersion>
+    <DefineConstants>$(DefineConstants);STEAM</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GamePlatform)' == 'Itch'">
+    <GameVersion>2021.3.5i</GameVersion>
+    <DefineConstants>$(DefineConstants);ITCH</DefineConstants>
+  </PropertyGroup>
 
     <ItemGroup>
         <Deobfuscate Include="$(AmongUs)\BepInEx\plugins\Reactor-$(GameVersion).dll" />
@@ -16,7 +25,7 @@
         <EmbeddedResource Include="Resources\Footprint.png"></EmbeddedResource>
         <EmbeddedResource Include="Resources\Overlay.png"></EmbeddedResource>
         <EmbeddedResource Include="Resources\psychic"></EmbeddedResource>
-        <PackageReference Include="Reactor.OxygenFilter.MSBuild" Version="0.2.3" />
+        <PackageReference Include="Reactor.OxygenFilter.MSBuild" Version="0.2.9" />
     </ItemGroup>
 
     <ItemGroup>