Update v1.0.8.6

TheOtherRoles.sln

@@ -15,12 +15,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other Files", "Other Files"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Beta|Any CPU = Beta|Any CPU
 		Debug|Any CPU = Debug|Any CPU
 		mxyx-club|Any CPU = mxyx-club|Any CPU
 		Release|Any CPU = Release|Any CPU
 		Sunday|Any CPU = Sunday|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Beta|Any CPU.ActiveCfg = Beta|Any CPU
+		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Beta|Any CPU.Build.0 = Beta|Any CPU
 		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Debug|Any CPU.ActiveCfg = Release|Any CPU
 		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.mxyx-club|Any CPU.ActiveCfg = mxyx-club|Any CPU

TheOtherRoles/Buttons/Buttons.cs

@@ -3462,6 +3462,7 @@ public static void createButtonsPostfix(HudManager __instance)
                 //set location
                 Jumper.jumpLocation = PlayerControl.LocalPlayer.transform.localPosition;
                 jumperMarkButton.Timer = jumperMarkButton.MaxTimer;
+                //jumperJumpButton.Timer = jumperMarkButton.MaxTimer;
             },
             () =>
             {
@@ -3493,7 +3494,9 @@ public static void createButtonsPostfix(HudManager __instance)
                 //teleport to location if you have one
                 PlayerControl.LocalPlayer.NetTransform.RpcSnapTo(Jumper.jumpLocation);
                 Jumper.Charges--;
-                if (Jumper.Charges > 0) jumperJumpButton.Timer = jumperJumpButton.MaxTimer;
+                jumperJumpButton.Timer = jumperJumpButton.MaxTimer;
+                //jumperMarkButton.Timer = jumperJumpButton.MaxTimer;
+
             },
             () =>
             {
@@ -3523,6 +3526,7 @@ public static void createButtonsPostfix(HudManager __instance)
                 //set location
                 Escapist.escapeLocation = PlayerControl.LocalPlayer.transform.localPosition;
                 escapistMarkButton.Timer = escapistMarkButton.MaxTimer;
+                //escapistEscapeButton.Timer = escapistMarkButton.MaxTimer;
             },
             () =>
             {
@@ -3552,6 +3556,7 @@ public static void createButtonsPostfix(HudManager __instance)
                 //set location
                 PlayerControl.LocalPlayer.NetTransform.RpcSnapTo(Escapist.escapeLocation);
                 escapistEscapeButton.Timer = escapistEscapeButton.MaxTimer;
+                //escapistMarkButton.Timer = escapistEscapeButton.MaxTimer;
             },
             () =>
             {

TheOtherRoles/CustomCosmetics/CosmeticsManager.cs

@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Text.Json.Serialization;
 using BepInEx;
 using TheOtherRoles.CustomCosmetics.CustomHats;
 
@@ -36,4 +38,29 @@ public void AddConfig()
     {
         configs.Add(DefConfig);
     }
-}
+}
+
+public class CosmeticsManagerConfig
+{
+    public string ConfigName = "None";
+    public string RootUrl { get; set; }
+    public CustomCosmeticsFlags hasCosmetics { get; set; }
+    public string HatDirName { get; set; } = "hats";
+    public string VisorDirName { get; set; } = "Visors";
+    public string NamePlateDirName { get; set; } = "NamePlates";
+    public string HatFileName { get; set; } = "CustomHats.json";
+    public string VisorFileName { get; set; } = "CustomVisors.json";
+    public string NamePlateFileName { get; set; } = "CustomNamePlates.json";
+    public string HatPropertyName { get; set; } = "hats";
+    public string VisorPropertyName { get; set; } = "Visors";
+    public string NamePlatePropertyName { get; set; } = "nameplates";
+}
+
+[Flags, JsonConverter(typeof(JsonStringEnumConverter))]
+public enum CustomCosmeticsFlags
+{
+    Hat = 1,
+    Skin,
+    Visor,
+    NamePlate,
+}

TheOtherRoles/Main.cs

@@ -21,7 +21,11 @@ public class TheOtherRolesPlugin : BasePlugin
     public const string Id = "TheOtherUs.Options.v2"; // Config files name
     public const string ModName = MyPluginInfo.PLUGIN_NAME;
     public const string VersionString = MyPluginInfo.PLUGIN_VERSION;
-    public static uint betaDays = 30; // amount of days for the build to be usable (0 for infinite!)
+#if RELEASE
+    public static uint betaDays; // amount of days for the build to be usable (0 for infinite!)
+#else
+    public static uint betaDays = 30;
+#endif
     public static int BetaDaysLeft;
 
     public static Version Version = Version.Parse(VersionString);

TheOtherRoles/Objects/Map/Airship.cs

@@ -59,7 +59,7 @@ public static void addLadder(int mapId)
             if (CustomOptionHolder.airshipLadder.getBool())
             {
                 // 梯子追加
-                GameObject ladder = meetingRoom.GetComponentsInChildren<SpriteRenderer>().Where(x => x.name == "ladder_meeting").FirstOrDefault().gameObject;
+                GameObject ladder = meetingRoom.GetComponentsInChildren<SpriteRenderer>().FirstOrDefault(x => x.name == "ladder_meeting").gameObject;
                 GameObject newLadder = UnityEngine.Object.Instantiate(ladder, ladder.transform.parent);
                 Il2CppArrayBase<Ladder> ladders = newLadder.GetComponentsInChildren<Ladder>();
                 int id = 100;
@@ -75,8 +75,8 @@ public static void addLadder(int mapId)
                 newLadder.GetComponentInChildren<SpriteRenderer>().sprite = ladderSprite;
 
                 // 梯子の周りの影を消す
-                UnityEngine.Object.Destroy(gapRoom.GetComponentsInChildren<EdgeCollider2D>().Where(x => Math.Abs(x.points[0].x + 6.2984f) < 0.1).FirstOrDefault());
-                EdgeCollider2D collider = meetingRoom.GetComponentsInChildren<EdgeCollider2D>().Where(x => x.pointCount == 46).FirstOrDefault();
+                UnityEngine.Object.Destroy(gapRoom.GetComponentsInChildren<EdgeCollider2D>().FirstOrDefault(x => Math.Abs(x.points[0].x + 6.2984f) < 0.1));
+                EdgeCollider2D collider = meetingRoom.GetComponentsInChildren<EdgeCollider2D>().FirstOrDefault(x => x.pointCount == 46);
                 Il2CppSystem.Collections.Generic.List<Vector2> points = new();
                 EdgeCollider2D newCollider = collider.gameObject.AddComponent<EdgeCollider2D>();
                 EdgeCollider2D newCollider2 = collider.gameObject.AddComponent<EdgeCollider2D>();
@@ -95,7 +95,7 @@ public static void addLadder(int mapId)
                 UnityEngine.Object.DestroyObject(collider);
 
                 // 梯子の背景を変更
-                SpriteRenderer side = meetingRoom.GetComponentsInChildren<SpriteRenderer>().Where(x => x.name == "meeting_side").FirstOrDefault();
+                SpriteRenderer side = meetingRoom.GetComponentsInChildren<SpriteRenderer>().FirstOrDefault(x => x.name == "meeting_side");
                 SpriteRenderer bg = UnityEngine.Object.Instantiate(side, side.transform.parent);
                 if (!ladderBgSprite) ladderBgSprite = UnityHelper.loadSpriteFromResources("TheOtherRoles.Resources.ladder_bg.png", 100f);
                 bg.sprite = ladderBgSprite;

TheOtherRoles/Objects/Map/FungleElectrical.cs

@@ -62,12 +62,10 @@ public static void Postfix(MapBehaviour __instance)
 
 public static class MapLoader
 {
-    private static ShipStatus skeld;
-    private static ShipStatus airship;
     public static ShipStatus Polus;
     public static GameObject PolusObject => Polus.gameObject;
-    public static ShipStatus Skeld => skeld;
-    public static ShipStatus Airship => airship;
+    public static ShipStatus Skeld { get; private set; }
+    public static ShipStatus Airship { get; private set; }
 
     public static IEnumerator LoadMaps()
     {
@@ -76,15 +74,15 @@ public static IEnumerator LoadMaps()
         AsyncOperationHandle<GameObject> skeldAsset = AmongUsClient.Instance.ShipPrefabs.ToArray()[0].LoadAsset<GameObject>();
         while (!skeldAsset.IsDone)
             yield return null;
-        skeld = skeldAsset.Result.GetComponent<ShipStatus>();
+        Skeld = skeldAsset.Result.GetComponent<ShipStatus>();
         AsyncOperationHandle<GameObject> polusAsset = AmongUsClient.Instance.ShipPrefabs.ToArray()[2].LoadAsset<GameObject>();
         while (!polusAsset.IsDone)
             yield return null;
         Polus = polusAsset.Result.GetComponent<ShipStatus>();
         AsyncOperationHandle<GameObject> airshipAsset = AmongUsClient.Instance.ShipPrefabs.ToArray()[4].LoadAsset<GameObject>();
         while (!airshipAsset.IsDone)
             yield return null;
-        airship = airshipAsset.Result.GetComponent<ShipStatus>();
+        Airship = airshipAsset.Result.GetComponent<ShipStatus>();
     }
 }
 

TheOtherRoles/Patches/CredentialsPatch.cs

@@ -8,7 +8,7 @@ namespace TheOtherRoles.Patches;
 [HarmonyPatch]
 public static class CredentialsPatch
 {
-    public static string fullCredentialsVersion = $"<size=130%>{getString("TouTitle")}</size> v{Main.Version + (Main.betaDays > 0 ? "-BETA" : "")}";
+    public static string fullCredentialsVersion = $"<size=130%>{getString("TouTitle")}</size> v{Main.Version + (Main.betaDays > 0 ? "-Beta" : "")}";
 
     public static string fullCredentials = getString("fullCredentials");
 
@@ -77,7 +77,7 @@ private static void Postfix(PingTracker __instance)
             var credentialObject = new GameObject("credentialsTOR");
             var credentials = credentialObject.AddComponent<TextMeshPro>();
             credentials.SetText(
-                $"<size=90%>TheOtherUs-Edited v{Main.Version + (Main.betaDays > 0 ? "-BETA" : "")}</size>\n<size=30%>\n</size>{mainMenuCredentials}\n<size=30%>\n</size>{contributorsCredentials}");
+                $"<size=90%>TheOtherUs-Edited v{Main.Version + (Main.betaDays > 0 ? "-Beta" : "")}</size>\n<size=30%>\n</size>{mainMenuCredentials}\n<size=30%>\n</size>{contributorsCredentials}");
             credentials.alignment = TextAlignmentOptions.Center;
             credentials.fontSize *= 0.05f;
 

TheOtherRoles/Patches/LobbyRoleList.cs

@@ -220,6 +220,6 @@ class GameStartPatch
 {
     public static void Prefix(ShipStatus __instance)
     {
-        LobbyRoleInfo.RolesSummaryUI?.SetActive(false);
+        if (LobbyRoleInfo.RolesSummaryUI != null) LobbyRoleInfo.RolesSummaryUI.SetActive(false);
     }
 }

TheOtherRoles/Patches/MainMenuPatch.cs

@@ -213,7 +213,7 @@ public static class VersionShower_Start
 {
     public static void Postfix(VersionShower __instance)
     {
-        __instance.text.text = $"Among Us v{Application.version} - <color=#ff351f>The Other Us Edited</color> <color=#FCCE03FF>v{Main.Version}{(Main.betaDays > 0 ? "-BETA" : "")}</color>";
+        __instance.text.text = $"Among Us v{Application.version} - <color=#ff351f>The Other Us Edited</color> <color=#FCCE03FF>v{Main.Version}{(Main.betaDays > 0 ? "-Beta" : "")}</color>";
     }
 }
 /*

TheOtherRoles/Patches/PlayerControlPatch.cs

@@ -1090,6 +1090,7 @@ private static void bountyHunterUpdate()
                     (p != Mini.mini || Mini.isGrownUp()) && (BountyHunter.bountyHunter.getPartner() == null ||
                                                              p != BountyHunter.bountyHunter.getPartner()))
                     possibleTargets.Add(p);
+            if (possibleTargets.Count == 0) return;
             BountyHunter.bounty = possibleTargets[rnd.Next(0, possibleTargets.Count)];
             if (BountyHunter.bounty == null) return;
 
@@ -1542,9 +1543,8 @@ private static void witchSetTarget()
         List<PlayerControl> untargetables;
         if (Witch.spellCastingTarget != null)
         {
-            untargetables = PlayerControl.AllPlayerControls.ToArray()
-                .Where(x => x.PlayerId != Witch.spellCastingTarget.PlayerId)
-                .ToList(); // Don't switch the target from the the one you're currently casting a spell on
+            // Don't switch the target from the the one you're currently casting a spell on
+            untargetables = PlayerControl.AllPlayerControls.ToArray().Where(x => x.PlayerId != Witch.spellCastingTarget.PlayerId).ToList();
         }
         else
         {

TheOtherRoles/Patches/UpdatePatch.cs

@@ -486,8 +486,7 @@ private static void Postfix(HudManager __instance)
         {
             var pet = target.GetPet();
             if (pet != null)
-                pet.Visible = ((PlayerControl.LocalPlayer.Data.IsDead && target.Data.IsDead) || !target.Data.IsDead) &&
-                              !target.inVent;
+                pet.Visible = ((PlayerControl.LocalPlayer.Data.IsDead && target.Data.IsDead) || !target.Data.IsDead) && !target.inVent;
         }
     }
 }

TheOtherRoles/Patches/UsablesPatch.cs

@@ -136,9 +136,7 @@ public static bool Prefix(Vent __instance)
 
         if (Trapper.playersOnMap.Contains(CachedPlayer.LocalPlayer.PlayerControl)) return false;
 
-        bool canUse;
-        bool couldUse;
-        __instance.CanUse(CachedPlayer.LocalPlayer.Data, out canUse, out couldUse);
+        __instance.CanUse(CachedPlayer.LocalPlayer.Data, out var canUse, out var couldUse);
         var canMoveInVents = CachedPlayer.LocalPlayer.PlayerControl != Spy.spy &&
                              !Trapper.playersOnMap.Contains(CachedPlayer.LocalPlayer.PlayerControl);
         if (!canUse) return false; // No need to execute the native method as using is disallowed anyways

TheOtherRoles/Resources/stringData.json

@@ -4196,6 +4196,9 @@
     "InfoSleuthFullDesc": {
         "13": "在会议中投票给查验目标，\n下一轮会议开始时即可获得投票目标的身份信息。"
     },
+    "BalancerFullDesc": {
+        "13": "可以在会议中选择两位玩家挂上天平，所有玩家只能在这两位玩家中投票。\n\n在特殊会议中，如果平票则同时驱逐两位玩家。\n\n如果其中一位玩家死亡（例如被赌死），则直接跳过投票环节直接驱逐另一位被挂上天平的玩家。可以在会议中选择两位玩家挂上天平，所有玩家只能在这两位玩家中投票。\n\n在特殊会议中，如果平票则同时驱逐两位玩家。\n\n如果其中一位玩家死亡（例如被赌死），则直接跳过投票环节直接驱逐另一位被挂上天平的玩家。"
+    },
     "LoverFullDesc": {
         "13": "执子之手，与子共生。\n恋人如果有任何一方被击杀，另一方也会一起死亡。\n当恋人中有一方并非船员时并且恋人存活，\n则不会计算该玩家的任务进度。\n\n剩余3名玩家时并且两名玩家为恋人时，\n恋人将独自获胜。"
     },

TheOtherRoles/Roles/Crewmate/Balancer.cs

@@ -31,6 +31,7 @@ public static void clearAndReload()
         CurrentState = BalancerState.NotBalance;
         IsDoubleExile = false;
         currentTarget = null;
+        exiled1 = false;
     }
 
     public static SpriteRenderer BackObject;
@@ -55,6 +56,7 @@ public enum BalancerState
     private static int pleasevoteanimIndex;
     private static float rotate;
     private static float openMADENOtimer;
+    private static bool exiled1;
 
     public static void Update()
     {
@@ -72,7 +74,8 @@ public static void Update()
                 {
                     target = targetplayerright;
                 }
-                if (AmongUsClient.Instance.AmHost) MeetingHud.Instance.RpcVotingComplete(new List<MeetingHud.VoterState>().ToArray(), target.Data, false);
+                if (AmongUsClient.Instance.AmHost && !exiled1) MeetingHud.Instance.RpcVotingComplete(new List<MeetingHud.VoterState>().ToArray(), target.Data, false);
+                exiled1 = true;
                 return;
             }
             switch (CurrentState)
@@ -242,6 +245,7 @@ public static void WrapUp(PlayerControl exiled)
         targetplayerright = null;
         targetplayerleft = null;
         IsDoubleExile = false;
+        exiled1 = false;
         currentAbilityUser = null;
         CurrentState = BalancerState.NotBalance;
         currentTarget = null;

TheOtherRoles/Roles/Modifier/Shifter.cs

@@ -221,6 +221,11 @@ public static void shiftRole(PlayerControl player1, PlayerControl player2, bool
             if (repeat) shiftRole(player2, player1, false);
             PartTimer.partTimer = player1;
         }
+        else if (Balancer.balancer != null && Balancer.balancer == player2)
+        {
+            if (repeat) shiftRole(player2, player1, false);
+            Balancer.balancer = player1;
+        }
     }
 
     public static void clearAndReload()

TheOtherRoles/TheOtherRoles.csproj

@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>1.0.8.1</Version>
+        <Version>1.0.8.6</Version>
 		<AssemblyName>TheOtherUs</AssemblyName>
         <Authors>mxyx-club</Authors>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 		<DebugType>embedded</DebugType>
-		<Optimize>true</Optimize>
-		<Configurations>Debug;Release;Sunday;mxyx-club</Configurations>
+		<Configurations>Debug;Release;Sunday;mxyx-club;Beta</Configurations>
     </PropertyGroup>
 
     <ItemGroup>

TheOtherRoles/Utilities/CachedPlayer.cs

@@ -37,20 +37,9 @@ public class CachedPlayer
     public Vector2 TruePosition => PlayerControl.GetTruePosition();
     public Vector2 ControlOffset => PlayerControl.Collider.offset;
 
-    public static implicit operator bool(CachedPlayer player)
-    {
-        return player != null && player.PlayerControl;
-    }
-
-    public static implicit operator PlayerControl(CachedPlayer player)
-    {
-        return player.PlayerControl;
-    }
-
-    public static implicit operator PlayerPhysics(CachedPlayer player)
-    {
-        return player.PlayerPhysics;
-    }
+    public static implicit operator bool(CachedPlayer player) => player != null && player.PlayerControl;
+    public static implicit operator PlayerControl(CachedPlayer player) => player.PlayerControl;
+    public static implicit operator PlayerPhysics(CachedPlayer player) => player.PlayerPhysics;
 }
 
 [HarmonyPatch]
@@ -70,14 +59,6 @@ public static void CachePlayerPatch(PlayerControl __instance)
         };
         CachedPlayer.AllPlayers.Add(player);
         CachedPlayer.PlayerPtrs[__instance.Pointer] = player;
-        // Debug
-        foreach (var cachedPlayer in CachedPlayer.AllPlayers)
-        {
-            if (!cachedPlayer.PlayerControl || !cachedPlayer.PlayerPhysics || !cachedPlayer.NetTransform || !cachedPlayer.transform)
-            {
-                Error($"CachedPlayer {cachedPlayer.PlayerControl.name} has null fields");
-            }
-        }
     }
 
     [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.OnDestroy))]