Update to v4.1.3

README.md

@@ -40,6 +40,7 @@ The [Role Assignment](#role-assignment) sections explains how the roles are bein
 # Releases
 | Among Us - Version| Mod Version | Link |
 |----------|-------------|-----------------|
+| 2022.3.29| v4.1.3| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.3/TheOtherRoles.zip)
 | 2022.3.29| v4.1.2| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.2/TheOtherRoles.zip)
 | 2022.3.29| v4.1.1| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.1/TheOtherRoles.zip)
 | 2022.3.29| v4.1.0| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v4.1.0/TheOtherRoles.zip)
@@ -104,6 +105,11 @@ The [Role Assignment](#role-assignment) sections explains how the roles are bein
 <details>
   <summary>Click to show the Changelog</summary>
 
+**Version 4.1.3**
+- Fixed morphling's being morphed during meetings
+- Fixed hide player names hiding the player's name during meetings
+- Added an option to the mayor: "Number Of Remote Meetings", so that the amount of mobile meetings is limited.
+
 **Version 4.1.2**
 - Made some general performance fixes. Special thanks to [probablyadnf](https://github.com/simonkellly)
 - Added an option to the ninja to get invisible after kill for x-seconds

TheOtherRoles/Buttons.cs

@@ -1491,23 +1491,25 @@ public static void Postfix(HudManager __instance)
             mayorMeetingButton = new CustomButton(
                () => {
                    PlayerControl.LocalPlayer.NetTransform.Halt(); // Stop current movement 
-                   Helpers.handleVampireBiteOnBodyReport(); // Manually call Vampire handling, since the CmdReportDeadBody Prefix won't be called
+                   Mayor.remoteMeetingsLeft--;
+	               Helpers.handleVampireBiteOnBodyReport(); // Manually call Vampire handling, since the CmdReportDeadBody Prefix won't be called
                    RPCProcedure.uncheckedCmdReportDeadBody(PlayerControl.LocalPlayer.PlayerId, Byte.MinValue);
 
                    MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.UncheckedCmdReportDeadBody, Hazel.SendOption.Reliable, -1);
                    writer.Write(PlayerControl.LocalPlayer.PlayerId);
                    writer.Write(Byte.MaxValue);
                    AmongUsClient.Instance.FinishRpcImmediately(writer);
+                   mayorMeetingButton.Timer = 1f;
                },
                () => { return Mayor.mayor != null && Mayor.mayor == PlayerControl.LocalPlayer && !PlayerControl.LocalPlayer.Data.IsDead ;},
                () => {
-                   mayorMeetingButton.actionButton.OverrideText("Emergency");
+                   mayorMeetingButton.actionButton.OverrideText("Emergency ("+ Mayor.remoteMeetingsLeft + ")");
                    bool sabotageActive = false;
                    foreach (PlayerTask task in PlayerControl.LocalPlayer.myTasks.GetFastEnumerator())
                        if (task.TaskType == TaskTypes.FixLights || task.TaskType == TaskTypes.RestoreOxy || task.TaskType == TaskTypes.ResetReactor || task.TaskType == TaskTypes.ResetSeismic || task.TaskType == TaskTypes.FixComms || task.TaskType == TaskTypes.StopCharles
                            || SubmergedCompatibility.IsSubmerged && task.TaskType == SubmergedCompatibility.RetrieveOxygenMask)
                            sabotageActive = true;
-                   return !sabotageActive && PlayerControl.LocalPlayer.CanMove;
+                   return !sabotageActive && PlayerControl.LocalPlayer.CanMove && (Mayor.remoteMeetingsLeft > 0);
                },
                () => { mayorMeetingButton.Timer = mayorMeetingButton.MaxTimer; },
                Mayor.getMeetingSprite(),

TheOtherRoles/CustomOptionHolder.cs

@@ -98,6 +98,7 @@ public class CustomOptionHolder {
         public static CustomOption mayorCanSeeVoteColors;
         public static CustomOption mayorTasksNeededToSeeVoteColors;
         public static CustomOption mayorMeetingButton;
+        public static CustomOption mayorMaxRemoteMeetings;
 
         public static CustomOption portalmakerSpawnRate;
         public static CustomOption portalmakerCooldown;
@@ -406,6 +407,7 @@ public static void Load() {
             mayorCanSeeVoteColors = CustomOption.Create(81, Types.Crewmate, "Mayor Can See Vote Colors", false, mayorSpawnRate);
             mayorTasksNeededToSeeVoteColors = CustomOption.Create(82, Types.Crewmate, "Completed Tasks Needed To See Vote Colors", 5f, 0f, 20f, 1f, mayorCanSeeVoteColors);
             mayorMeetingButton = CustomOption.Create(83, Types.Crewmate, "Mobile Emergency Button", true, mayorSpawnRate);
+            mayorMaxRemoteMeetings = CustomOption.Create(84, Types.Crewmate, "Number Of Remote Meetings", 1f, 1f, 5f, 1f, mayorMeetingButton);
 
             engineerSpawnRate = CustomOption.Create(90, Types.Crewmate, cs(Engineer.color, "Engineer"), rates, null, true);
             engineerNumberOfFixes = CustomOption.Create(91, Types.Crewmate, "Number Of Sabotage Fixes", 1f, 1f, 3f, 1f, engineerSpawnRate);

TheOtherRoles/Helpers.cs

@@ -17,12 +17,19 @@ public enum MurderAttemptResult {
         SuppressKill,
         BlankKill
     }
-    public static class Helpers {
+    public static class Helpers
+    {
+
+        public static Dictionary<string, Sprite> CachedSprites = new();
 
         public static Sprite loadSpriteFromResources(string path, float pixelsPerUnit) {
-            try {
+            try
+            {
+                if (CachedSprites.TryGetValue(path + pixelsPerUnit, out var sprite)) return sprite;
                 Texture2D texture = loadTextureFromResources(path);
-                return Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f), pixelsPerUnit);
+                sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f), pixelsPerUnit);
+                sprite.hideFlags |= HideFlags.HideAndDontSave | HideFlags.DontSaveInEditor;
+                return CachedSprites[path + pixelsPerUnit] = sprite;
             } catch {
                 System.Console.WriteLine("Error loading sprite from path: " + path);
             }

TheOtherRoles/Main.cs

@@ -22,7 +22,7 @@ namespace TheOtherRoles
     public class TheOtherRolesPlugin : BasePlugin
     {
         public const string Id = "me.eisbison.theotherroles";
-        public const string VersionString = "4.1.2";
+        public const string VersionString = "4.1.3";
 
         public static Version Version = Version.Parse(VersionString);
         internal static BepInEx.Logging.ManualLogSource Logger;

TheOtherRoles/Objects/Footprint.cs

@@ -1,65 +1,121 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using TheOtherRoles.Utilities;
 using UnityEngine;
 
-namespace TheOtherRoles.Objects {
-    class Footprint {
-        private static List<Footprint> footprints = new List<Footprint>();
-        private static Sprite sprite;
-        private Color color;
-        private GameObject footprint;
-        private SpriteRenderer spriteRenderer;
-        private PlayerControl owner;
-        private bool anonymousFootprints;
+namespace TheOtherRoles.Objects 
+{
+    public class FootprintHolder : MonoBehaviour
+    {
+        static FootprintHolder() => ClassInjector.RegisterTypeInIl2Cpp<FootprintHolder>();
 
-        public static Sprite getFootprintSprite() {
-            if (sprite) return sprite;
-            sprite = Helpers.loadSpriteFromResources("TheOtherRoles.Resources.Footprint.png", 600f);
-            return sprite;
-        }
-
-        public Footprint(float footprintDuration, bool anonymousFootprints, PlayerControl player) {
-            this.owner = player;
-            this.anonymousFootprints = anonymousFootprints;
-            if (anonymousFootprints)
-                this.color = Palette.PlayerColors[6];
-            else
-                this.color = Palette.PlayerColors[(int) player.Data.DefaultOutfit.ColorId];
+        public FootprintHolder(IntPtr ptr) : base(ptr) { }
 
-            footprint = new GameObject("Footprint");
-            footprint.AddSubmergedComponent(SubmergedCompatibility.Classes.ElevatorMover);
-            Vector3 position = new Vector3(player.transform.position.x, player.transform.position.y, player.transform.position.y / 1000 + 0.001f);
-            footprint.transform.position = position;
-            footprint.transform.localPosition = position;
-            footprint.transform.SetParent(player.transform.parent);
+        private static FootprintHolder _instance;
+        public static FootprintHolder Instance
+        {
+            get => _instance ? _instance : _instance = new GameObject("FootprintHolder").AddComponent<FootprintHolder>();
+            set => _instance = value;
 
-            footprint.transform.Rotate(0.0f, 0.0f, UnityEngine.Random.Range(0.0f, 360.0f));
+        }
+
+        private static Sprite _footprintSprite;
+        private static Sprite FootprintSprite => _footprintSprite ??= Helpers.loadSpriteFromResources("TheOtherRoles.Resources.Footprint.png", 600f);
 
+        private static bool AnonymousFootprints => TheOtherRoles.Detective.anonymousFootprints;
+        private static float FootprintDuration => TheOtherRoles.Detective.footprintDuration;
+
+        private class Footprint
+        {
+            public GameObject GameObject;
+            public Transform Transform;
+            public SpriteRenderer Renderer;
+            public PlayerControl Owner;
+            public GameData.PlayerInfo Data;
+            public float Lifetime;
 
-            spriteRenderer = footprint.AddComponent<SpriteRenderer>();
-            spriteRenderer.sprite = getFootprintSprite();
-            spriteRenderer.color = color;
+            public Footprint()
+            {
+                GameObject = new("Footprint") { layer = 8 };
+                Transform = GameObject.transform;
+                Renderer = GameObject.AddComponent<SpriteRenderer>();
+                Renderer.sprite = FootprintSprite;
+                Renderer.color = Color.clear;
+                GameObject.AddSubmergedComponent(SubmergedCompatibility.Classes.ElevatorMover);
+            }
+        }
 
-            footprint.SetActive(true);
-            footprints.Add(this);
+
 
-            FastDestroyableSingleton<HudManager>.Instance.StartCoroutine(Effects.Lerp(footprintDuration, new Action<float>((p) => {
-            Color c = color;
-            if (!anonymousFootprints && owner != null) {
-                if (owner == Morphling.morphling && Morphling.morphTimer > 0 && Morphling.morphTarget?.Data != null)
-                    c = Palette.ShadowColors[Morphling.morphTarget.Data.DefaultOutfit.ColorId];
-                else if (Camouflager.camouflageTimer > 0)
-                    c = Palette.PlayerColors[6];
+        private readonly ConcurrentBag<Footprint> _pool = new();
+        private readonly List<Footprint> _activeFootprints = new();
+        private readonly List<Footprint> _toRemove = new();
+
+        [HideFromIl2Cpp]
+        public void MakeFootprint(PlayerControl player)
+        {
+            if (!_pool.TryTake(out var print))
+            {
+                print = new();
             }
 
-            if (spriteRenderer) spriteRenderer.color = new Color(c.r, c.g, c.b, Mathf.Clamp01(1 - p));
+            print.Lifetime = FootprintDuration;
+
+            var pos = player.transform.position;
+            pos.z = pos.y / 1000f + 0.001f;
+            print.Transform.SetPositionAndRotation(pos, Quaternion.EulerRotation(0, 0, UnityEngine.Random.Range(0.0f, 360.0f)));
+            print.GameObject.SetActive(true);
+            print.Owner = player;
+            print.Data = player.Data;
+            _activeFootprints.Add(print);
+        }
 
-            if (p == 1f && footprint != null) {
-                UnityEngine.Object.Destroy(footprint);
-                footprints.Remove(this);
+        private void Update()
+        {
+            var dt = Time.deltaTime;
+            _toRemove.Clear();
+            foreach (var activeFootprint in _activeFootprints)
+            {
+                var p = activeFootprint.Lifetime / FootprintDuration;
+
+                if (activeFootprint.Lifetime <= 0)
+                {
+                    _toRemove.Add(activeFootprint);
+                    continue;
+                }
+
+                Color color;
+                if (AnonymousFootprints || Camouflager.camouflageTimer > 0)
+                {
+                    color = Palette.PlayerColors[6];
+                }
+                else if (activeFootprint.Owner == Morphling.morphling && Morphling.morphTimer > 0 && Morphling.morphTarget && Morphling.morphTarget.Data != null)
+                {
+                    color = Palette.PlayerColors[Morphling.morphTarget.Data.DefaultOutfit.ColorId];
+                }
+                else
+                {
+                    color = Palette.PlayerColors[activeFootprint.Data.DefaultOutfit.ColorId];
+                }
+
+                color.a = Math.Clamp(p, 0f, 1f);
+                activeFootprint.Renderer.color = color;
+
+                activeFootprint.Lifetime -= dt;
+            }
+
+            foreach (var footprint in _toRemove)
+            {
+                footprint.GameObject.SetActive(false);
+                _activeFootprints.Remove(footprint);
+                _pool.Add(footprint);
             }
-            })));
+        }
+
+        private void OnDestroy()
+        {
+            Instance = null;
         }
     }
 }

TheOtherRoles/Patches/PlayerControlPatch.cs

@@ -184,8 +184,9 @@ static void detectiveUpdateFootPrints() {
             if (Detective.timer <= 0f) {
                 Detective.timer = Detective.footprintIntervall;
                 foreach (PlayerControl player in PlayerControl.AllPlayerControls.GetFastEnumerator()) {
-                    if (player != null && player != PlayerControl.LocalPlayer && !player.Data.IsDead && !player.inVent) {
-                        new Footprint(Detective.footprintDuration, Detective.anonymousFootprints, player);
+                    if (player != null && player != PlayerControl.LocalPlayer && !player.Data.IsDead && !player.inVent) 
+                    {
+                        FootprintHolder.Instance.MakeFootprint(player);
                     }
                 }
             }

TheOtherRoles/Patches/UpdatePatch.cs

@@ -23,20 +23,19 @@ static void resetNameTagsAndColors() {
             foreach (var data in GameData.Instance.AllPlayers.GetFastEnumerator())
             {
                 var player = data.Object;
-                string text;
+                string text = data.PlayerName;
                 Color color;
                 if (player)
                 {
-                    String playerName = data.PlayerName;
+                    var playerName = text;
                     if (morphTimerNotUp && morphTargetNotNull && Morphling.morphling == player) playerName = Morphling.morphTarget.Data.PlayerName;
                     var nameText = player.nameText;
 
-                    nameText.text = text = Helpers.hidePlayerName(localPlayer, player) ? "" : playerName;
+                    nameText.text = Helpers.hidePlayerName(localPlayer, player) ? "" : playerName;
                     nameText.color = color = amImpostor && data.Role.IsImpostor ? Palette.ImpostorRed : Color.white;
                 }
                 else
                 {
-                    text = data.PlayerName;
                     color = Color.white;
                 }
 

TheOtherRoles/TheOtherRoles.cs

@@ -129,6 +129,8 @@ public static class Mayor {
             public static Color color = new Color32(32, 77, 66, byte.MaxValue);
             public static Minigame emergency = null;
             public static Sprite emergencySprite = null;
+            public static int remoteMeetingsLeft = 1;        
+
 
             public static bool canSeeVoteColors = false;
             public static int tasksNeededToSeeVoteColors;
@@ -145,7 +147,7 @@ public static void clearAndReload() {
                 mayor = null;
                 emergency = null;
                 emergencySprite = null;
-
+		        remoteMeetingsLeft = Mathf.RoundToInt(CustomOptionHolder.mayorMaxRemoteMeetings.getFloat()); 
                 canSeeVoteColors = CustomOptionHolder.mayorCanSeeVoteColors.getBool();
                 tasksNeededToSeeVoteColors = (int)CustomOptionHolder.mayorTasksNeededToSeeVoteColors.getFloat();
                 meetingButton = CustomOptionHolder.mayorMeetingButton.getBool();

TheOtherRoles/TheOtherRoles.csproj

@@ -1,25 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-        <Version>4.1.2</Version>
-        <Description>TheOtherRoles</Description>
-        <Authors>Eisbison</Authors>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.1</TargetFramework>
+		<Version>4.1.3</Version>
+		<Description>TheOtherRoles</Description>
+		<Authors>Eisbison</Authors>
 		<LangVersion>latest</LangVersion>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+	</PropertyGroup>
 
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\**" />
-    </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Resources\**" />
+	</ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="AmongUs.GameLibs.Steam" Version="2022.3.29" />
-        <PackageReference Include="BepInEx.IL2CPP" Version="6.0.0-be.559" />
-        <PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="1.1.1" />
-    </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="AmongUs.GameLibs.Steam" Version="2022.3.29" />
+		<PackageReference Include="BepInEx.IL2CPP" Version="6.0.0-be.559" />
+		<PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="1.1.1" />
+	</ItemGroup>
 
-    <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
-        <Message Text="Second occurrence" />
-        <Copy SourceFiles="$(ProjectDir)\bin\$(Configuration)\netstandard2.1\TheOtherRoles.dll" DestinationFolder="$(AmongUsLatest)/BepInEx/plugins/" />
-    </Target>
+	<Target Name="CopyCustomContent" AfterTargets="AfterBuild" Condition="Exists('$(AmongUsLatest)/BepInEx/plugins/')">
+		<Message Text="Second occurrence" />
+		<Copy SourceFiles="$(ProjectDir)\bin\$(Configuration)\netstandard2.1\TheOtherRoles.dll" DestinationFolder="$(AmongUsLatest)/BepInEx/plugins/" />
+	</Target>
 </Project>