diff --git a/AmongUs.props b/AmongUs.props index 2a76fee..719fd30 100644 --- a/AmongUs.props +++ b/AmongUs.props @@ -1,8 +1,8 @@ Steam - 2022.2.23 - 2021.12.15 + 2022.3.29 + 2022.3.29 diff --git a/Reactor.Debugger/DebuggerPlugin.cs b/Reactor.Debugger/DebuggerPlugin.cs index 30e07ad..1587756 100644 --- a/Reactor.Debugger/DebuggerPlugin.cs +++ b/Reactor.Debugger/DebuggerPlugin.cs @@ -80,10 +80,11 @@ namespace Reactor.Debugger playerControl.GetComponent().enabled = true; playerControl.NetTransform.enabled = false; playerControl.SetName($"{TranslationController.Instance.GetString(StringNames.Dummy, Array.Empty())} {i}"); - playerControl.SetColor((byte) (i % Palette.PlayerColors.Length)); - playerControl.SetHat(HatManager.Instance.AllHats.ToArray().ElementAt(i % HatManager.Instance.AllHats.Count).ProdId, playerControl.Data.DefaultOutfit.ColorId); - playerControl.SetPet(HatManager.Instance.AllPets.ToArray().ElementAt(i % HatManager.Instance.AllPets.Count).ProdId); - playerControl.SetSkin(HatManager.Instance.AllSkins.ToArray().ElementAt(i % HatManager.Instance.AllSkins.Count).ProdId); + var color = (byte) (i % Palette.PlayerColors.Length); + playerControl.SetColor(color); + playerControl.SetHat(HatManager.Instance.allHats[i % HatManager.Instance.allHats.Count].ProdId, playerControl.Data.DefaultOutfit.ColorId); + playerControl.SetPet(HatManager.Instance.allPets[i % HatManager.Instance.allPets.Count].ProdId); + playerControl.SetSkin(HatManager.Instance.allSkins[i % HatManager.Instance.allSkins.Count].ProdId, color); GameData.Instance.RpcSetTasks(playerControl.PlayerId, new Il2CppStructArray(0)); } } diff --git a/Reactor.Debugger/packages.lock.json b/Reactor.Debugger/packages.lock.json index d08fcb5..176ac39 100644 --- a/Reactor.Debugger/packages.lock.json +++ b/Reactor.Debugger/packages.lock.json @@ -4,9 +4,9 @@ ".NETStandard,Version=v2.1": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2022.2.23, )", - "resolved": "2022.2.23", - "contentHash": "CHMKmYSv00f7bU8pZ/NSfXNSSwKqCtcYyLsBmiFJ8asx+wmLKXHPsUbB9l+Ew2ZdisTt8lU+bQm2jznyWaMtdw==" + "requested": "[2022.3.29, )", + "resolved": "2022.3.29", + "contentHash": "EStKwHGq8MMvSRxIHjlh31VJmCZrGHZ/xoDDN33L5gh7XJLWBFufo6+5ueezndSRpanoCkqLwuTkG73KCS2J1A==" }, "BepInEx.AutoPlugin": { "type": "Direct", diff --git a/Reactor.Example/packages.lock.json b/Reactor.Example/packages.lock.json index d08fcb5..176ac39 100644 --- a/Reactor.Example/packages.lock.json +++ b/Reactor.Example/packages.lock.json @@ -4,9 +4,9 @@ ".NETStandard,Version=v2.1": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2022.2.23, )", - "resolved": "2022.2.23", - "contentHash": "CHMKmYSv00f7bU8pZ/NSfXNSSwKqCtcYyLsBmiFJ8asx+wmLKXHPsUbB9l+Ew2ZdisTt8lU+bQm2jznyWaMtdw==" + "requested": "[2022.3.29, )", + "resolved": "2022.3.29", + "contentHash": "EStKwHGq8MMvSRxIHjlh31VJmCZrGHZ/xoDDN33L5gh7XJLWBFufo6+5ueezndSRpanoCkqLwuTkG73KCS2J1A==" }, "BepInEx.AutoPlugin": { "type": "Direct", diff --git a/Reactor/CustomStringName.cs b/Reactor/CustomStringName.cs index 781511a..a076acc 100644 --- a/Reactor/CustomStringName.cs +++ b/Reactor/CustomStringName.cs @@ -34,7 +34,7 @@ namespace Reactor public static implicit operator StringNames(CustomStringName name) => (StringNames) name.Id; public static explicit operator CustomStringName(StringNames name) => List.SingleOrDefault(x => x.Id == (int) name); - [HarmonyPatch(typeof(LanguageUnit), nameof(LanguageUnit.GetString), typeof(StringNames), typeof(string), typeof(Il2CppReferenceArray))] + [HarmonyPatch(typeof(TranslationController), nameof(TranslationController.GetString), typeof(StringNames), typeof(Il2CppReferenceArray))] private static class GetStringPatch { public static bool Prefix(StringNames stringId, Il2CppReferenceArray parts, ref string __result) diff --git a/Reactor/Patches/SplashSkip.cs b/Reactor/Patches/SplashSkip.cs index 07af624..a5d1a98 100644 --- a/Reactor/Patches/SplashSkip.cs +++ b/Reactor/Patches/SplashSkip.cs @@ -1,19 +1,13 @@ -using System; -using UnityEngine.SceneManagement; +using HarmonyLib; namespace Reactor.Patches { + [HarmonyPatch(typeof(SplashManager), nameof(SplashManager.Start))] internal static class SplashSkip { - internal static void Initialize() + private static void Prefix(SplashManager __instance) { - SceneManager.add_sceneLoaded((Action) ((scene, _) => - { - if (scene.name == "SplashIntro") - { - SceneManager.LoadScene("MainMenu"); - } - })); + __instance.minimumSecondsBeforeSceneChange = 0; } } } diff --git a/Reactor/ReactorPlugin.cs b/Reactor/ReactorPlugin.cs index d1ebcaa..5bfff6f 100644 --- a/Reactor/ReactorPlugin.cs +++ b/Reactor/ReactorPlugin.cs @@ -50,7 +50,6 @@ namespace Reactor ReactorVersionShower.Initialize(); FreeNamePatch.Initialize(); - SplashSkip.Initialize(); DefaultBundle.Load(); SceneManager.add_sceneLoaded((Action) ((scene, _) => diff --git a/Reactor/packages.lock.json b/Reactor/packages.lock.json index 3654d21..b4a4f2f 100644 --- a/Reactor/packages.lock.json +++ b/Reactor/packages.lock.json @@ -4,9 +4,9 @@ ".NETStandard,Version=v2.1": { "AmongUs.GameLibs.Steam": { "type": "Direct", - "requested": "[2022.2.23, )", - "resolved": "2022.2.23", - "contentHash": "CHMKmYSv00f7bU8pZ/NSfXNSSwKqCtcYyLsBmiFJ8asx+wmLKXHPsUbB9l+Ew2ZdisTt8lU+bQm2jznyWaMtdw==" + "requested": "[2022.3.29, )", + "resolved": "2022.3.29", + "contentHash": "EStKwHGq8MMvSRxIHjlh31VJmCZrGHZ/xoDDN33L5gh7XJLWBFufo6+5ueezndSRpanoCkqLwuTkG73KCS2J1A==" }, "BepInEx.AutoPlugin": { "type": "Direct",