Merge pull request #70 from All-Of-Us-Mods/dev

MiraAPI v0.3.2

Directory.Build.props

@@ -8,7 +8,7 @@
 
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 
-        <VersionPrefix>0.3.1</VersionPrefix>
+        <VersionPrefix>0.3.2</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
 
         <Authors>All Of Us, XtraCube, Angxl</Authors>

MiraAPI/Networking/CustomMurderRpc.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Linq;
 using AmongUs.Data;
 using AmongUs.GameOptions;
@@ -8,8 +9,10 @@ using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
 using Reactor.Networking.Attributes;
 using Reactor.Networking.Rpc;
+using Reactor.Utilities;
 using Reactor.Utilities.Extensions;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace MiraAPI.Networking;
 
@@ -169,7 +172,14 @@ public static class CustomMurderRpc
 
             if (showKillAnim)
             {
-                HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
+                try
+                {
+                    HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
+                }
+                catch (Exception e)
+                {
+                    Logger<MiraApiPlugin>.Error($"Error with kill animation: {e.ToString()}");
+                }
             }
 
             target.cosmetics.SetNameMask(false);
@@ -202,7 +212,7 @@ public static class CustomMurderRpc
         bool teleportMurderer = true)
     {
         var cam = Camera.main?.GetComponent<FollowerCamera>();
-        var isParticipant = PlayerControl.LocalPlayer == source || PlayerControl.LocalPlayer == target;
+        var isParticipant = source.AmOwner || target.AmOwner;
         var sourcePhys = source.MyPhysics;
 
         if (teleportMurderer)
@@ -222,7 +232,7 @@ public static class CustomMurderRpc
 
         if (createDeadBody)
         {
-            deadBody = Object.Instantiate(GameManager.Instance.deadBodyPrefab[0]);
+            deadBody = Object.Instantiate(GameManager.Instance.GetDeadBody(source.Data.Role));
             deadBody.enabled = false;
             deadBody.ParentId = target.PlayerId;
             deadBody.bodyRenderers.ToList().ForEach(target.SetPlayerMaterialColors);
@@ -233,6 +243,13 @@ public static class CustomMurderRpc
             deadBody.transform.position = vector;
         }
 
+        source.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
+        target.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
+
+        // no idea if this causes bugs, but innersloth is brain-dead
+        // I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF I HATE INNERSCUFF
+        PlayerControl.LocalPlayer.Data.Role.KillAnimSpecialSetup(deadBody, source, target);
+
         if (isParticipant)
         {
             if (cam != null)

MiraAPI/Patches/Events/EndGamePatches.cs

@@ -7,15 +7,6 @@ namespace MiraAPI.Patches.Events;
 
 internal static class EndGamePatches
 {
-    [HarmonyPatch(typeof(GameManager), nameof(GameManager.Awake))]
-    public static class GameManagerAwakePatch
-    {
-        public static void Postfix(GameManager __instance)
-        {
-            __instance.enabled = true;
-        }
-    }
-
     [HarmonyPatch(typeof(GameManager), nameof(GameManager.RpcEndGame))]
     public static class GameManagerRpcEndGamePatch
     {

MiraAPI/Patches/HudManagerPatches.cs

@@ -73,6 +73,22 @@ public static class HudManagerPatches
         gridArrange.Alignment = GridArrange.StartAlign.Right;
         aspectPosition.Alignment = AspectPosition.EdgeAlignments.LeftBottom;
 
+        if (Constants.GetPlatformType() is Platforms.Android or Platforms.IPhone)
+        {
+            var fakeButton = Object.Instantiate(__instance.AbilityButton, BottomLeft.transform);
+            foreach (var renderer in fakeButton.GetComponentsInChildren<Renderer>())
+            {
+                renderer.enabled = false;
+            }
+
+            fakeButton.buttonLabelText.Destroy();
+            fakeButton.cooldownTimerText.Destroy();
+            fakeButton.usesRemainingText.Destroy();
+            fakeButton.GetComponent<PassiveButton>().Destroy();
+            fakeButton.ToggleVisible(true);
+            fakeButton.Destroy();
+        }
+
         foreach (var button in CustomButtonManager.CustomButtons)
         {
             var location = button.Location switch

MiraAPI/Patches/Options/LobbyViewPanePatches.cs

@@ -344,7 +344,7 @@ public static class LobbyViewPanePatches
                 }
 
                 viewSettingsInfoPanelRoleVariant.SetInfo(
-                    roleBehaviour.NiceName,
+                    roleBehaviour.GetRoleName(),
                     numPerGame,
                     chancePerGame,
                     61,

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -473,9 +473,7 @@ public static class RoleSettingMenuPatches
         RolePositions[GameSettingMenuPatches.SelectedModIdx] = __instance.scrollBar.Inner.localPosition;
 
         __instance.roleDescriptionText.text = customRole.RoleLongDescription;
-        __instance.roleTitleText.text = TranslationController.Instance.GetString(
-            role.StringName,
-            new Il2CppReferenceArray<Il2CppSystem.Object>(0));
+        __instance.roleTitleText.text = role.GetRoleName();
 
         var imgBg = __instance.AdvancedRolesSettings.transform.FindChild("Imagebackground");
         var labelBg = __instance.AdvancedRolesSettings.transform.FindChild("InfoLabelBackground");
@@ -579,6 +577,7 @@ public static class RoleSettingMenuPatches
         roleOptionSetting.transform.localPosition = new Vector3(-0.1f, ScrollerNum, -2f);
 
         roleOptionSetting.SetRole(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions, role, 20);
+        roleOptionSetting.titleText.text = role.GetRoleName();
         roleOptionSetting.labelSprite.color = customRole.OptionsMenuColor;
         roleOptionSetting.OnValueChanged = new Action<OptionBehaviour>(ValueChanged);
         roleOptionSetting.SetClickMask(__instance.ButtonClickMask);

MiraAPI/Patches/Roles/HauntMenuPatch.cs

@@ -1,11 +1,12 @@
 using HarmonyLib;
 using MiraAPI.Roles;
+using MiraAPI.Utilities;
 using UnityEngine;
 
 namespace MiraAPI.Patches.Roles;
 
 /// <summary>
-/// Patches the haunt menu to show the actual role name rather then team.
+/// Patches the haunt menu to show the actual role name rather than team.
 /// </summary>
 [HarmonyPatch(typeof(HauntMenuMinigame), nameof(HauntMenuMinigame.SetHauntTarget))]
 // SetFilterText was INLINED
@@ -22,7 +23,7 @@ public static class HauntMenuMinigamePatch
         var role = __instance.HauntTarget.Data.Role;
         var color = role is ICustomRole custom ? custom.RoleColor : role.TeamColor;
 
-        __instance.FilterText.text = role.NiceName;
+        __instance.FilterText.text = role.GetRoleName();
         __instance.FilterText.color = color;
     }
 }

MiraAPI/Roles/CustomRoleManager.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using AmongUs.GameOptions;
 using Il2CppInterop.Runtime;
 using Il2CppInterop.Runtime.Injection;
+using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using MiraAPI.Networking;
 using MiraAPI.PluginLoading;
 using MiraAPI.Utilities;
@@ -53,6 +54,9 @@ public static class CustomRoleManager
     internal static readonly Dictionary<ushort, RoleBehaviour> CustomRoles = [];
     internal static readonly Dictionary<Type, ushort> RoleIds = [];
 
+    private static Il2CppSystem.Collections.Generic.List<BaseGameSetting>? _emptySettings;
+    private static Il2CppReferenceArray<OverlayKillAnimation>? _emptyKillAnimations;
+
     private static ushort _roleId = 100;
 
     private static ushort GetNextRoleId()
@@ -133,6 +137,12 @@ public static class CustomRoleManager
         roleBehaviour.MaxCount = customRole.Configuration.MaxRoleCount;
         roleBehaviour.RoleScreenshot = customRole.Configuration.OptionsScreenshot?.LoadAsset();
 
+        _emptySettings ??= new(0);
+        _emptyKillAnimations ??= new(0);
+
+        roleBehaviour.AllGameSettings = _emptySettings;
+        roleBehaviour.CustomKillAnimations = _emptyKillAnimations;
+
         if (customRole.Configuration.Icon != null)
         {
             var asset = customRole.Configuration.Icon.LoadAsset();

MiraAPI/Utilities/Assets/SpriteTools.cs

@@ -19,7 +19,10 @@ public static class SpriteTools
     /// <exception cref="ArgumentException">Thrown when the resource cannot be found in the specified assembly.</exception>
     public static Texture2D LoadTextureFromResourcePath(string resourcePath, Assembly assembly)
     {
-        var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false);
+        var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false)
+        {
+            wrapMode = TextureWrapMode.Clamp,
+        };
         var myStream = assembly.GetManifestResourceStream(resourcePath);
         if (myStream != null)
         {