From a08567f5ddd1cf31a06096813156b39f1ce73606 Mon Sep 17 00:00:00 2001 From: Eisbison Date: Fri, 18 Jun 2021 13:00:16 +0200 Subject: [PATCH] Version 2.7.1 --- README.md | 7 +++++++ Source Code/Main.cs | 2 +- Source Code/MeetingPatch.cs | 10 +++++++--- Source Code/NameFix.cs | 17 +++++++++++++++++ Source Code/Resources/Garlic.png | Bin 12605 -> 7309 bytes Source Code/TheOtherRoles.csproj | 2 +- Source Code/UpdatePatch.cs | 2 +- 7 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 Source Code/NameFix.cs diff --git a/README.md b/README.md index b62eaac..f469b3d 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ The [Role Assignment](#role-assignment) sections explains how the roles are bein # Releases | Among Us - Version| Mod Version | Link | |----------|-------------|-----------------| +| **2021.6.15**| v2.7.1| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.7.0/TheOtherRoles.zip) | **2021.6.15**| v2.7.0| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.7.0/TheOtherRoles.zip) | 2021.5.25.2s| v2.6.7| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.6.7/TheOtherRoles.zip) | 2021.5.10s| v2.6.6| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.6.6/TheOtherRoles.zip) @@ -70,6 +71,12 @@ The [Role Assignment](#role-assignment) sections explains how the roles are bein
Click to show the Changelog +**Version 2.7.1** +- Fixed a bug where swapped votes were sometimes counted wrongly +- Fixed the positioning of the player name while morphed +- Fixed a bug where the window of the Guesser sometimes showed no "close button" +- Fixed a bug where the garlics were not displayed properly + **Version 2.7.0** - **New Role:** [Bounty Hunter](#bounty-hunter) created by [Mallöris](https://github.com/Mallaris) - Added more new [colors](#colors) (Thanks to [Drakoni](https://twitter.com/Drakoni13) for sorting them) diff --git a/Source Code/Main.cs b/Source Code/Main.cs index 7accc2e..e06fbba 100644 --- a/Source Code/Main.cs +++ b/Source Code/Main.cs @@ -20,7 +20,7 @@ namespace TheOtherRoles public class TheOtherRolesPlugin : BasePlugin { public const string Id = "me.eisbison.theotherroles"; - public const string VersionString = "2.7.0"; + public const string VersionString = "2.7.1"; public static System.Version Version = System.Version.Parse(VersionString); public Harmony Harmony { get; } = new Harmony(Id); diff --git a/Source Code/MeetingPatch.cs b/Source Code/MeetingPatch.cs index fa36996..4e98b71 100644 --- a/Source Code/MeetingPatch.cs +++ b/Source Code/MeetingPatch.cs @@ -46,7 +46,9 @@ namespace TheOtherRoles if (playerVoteArea.TargetPlayerId == Swapper.playerId2) swapped2 = playerVoteArea; } - if (swapped1 != null && swapped2 != null && dictionary.ContainsKey(swapped1.TargetPlayerId) && dictionary.ContainsKey(swapped2.TargetPlayerId)) { + if (swapped1 != null && swapped2 != null) { + if (!dictionary.ContainsKey(swapped1.TargetPlayerId)) dictionary[swapped1.TargetPlayerId] = 0; + if (!dictionary.ContainsKey(swapped2.TargetPlayerId)) dictionary[swapped2.TargetPlayerId] = 0; int tmp = dictionary[swapped1.TargetPlayerId]; dictionary[swapped1.TargetPlayerId] = dictionary[swapped2.TargetPlayerId]; dictionary[swapped2.TargetPlayerId] = tmp; @@ -230,8 +232,10 @@ namespace TheOtherRoles var smallButtonTemplate = __instance.playerStates[0].Buttons.transform.Find("CancelButton"); var textTemplate = __instance.playerStates[0].NameText; - Transform exitButton = UnityEngine.Object.Instantiate(smallButtonTemplate.transform, container); - exitButton.transform.localPosition = new Vector3(-2.725f, 2.1f, -10f); + Transform exitButton = UnityEngine.Object.Instantiate(buttonTemplate.transform, container); + exitButton.transform.localPosition = new Vector3(2.725f, 2.1f, -5); + exitButton.transform.localScale = new Vector3(0.25f, 0.9f, 1); + exitButton.gameObject.GetComponent().sprite = smallButtonTemplate.GetComponent().sprite; exitButton.GetComponent().OnClick.RemoveAllListeners(); exitButton.GetComponent().OnClick.AddListener((UnityEngine.Events.UnityAction)(() => { UnityEngine.Object.Destroy(container.gameObject); diff --git a/Source Code/NameFix.cs b/Source Code/NameFix.cs new file mode 100644 index 0000000..b861088 --- /dev/null +++ b/Source Code/NameFix.cs @@ -0,0 +1,17 @@ +using HarmonyLib; + +namespace TheOtherRoles { + [Harmony] + public class AccountManagerPatch { + [HarmonyPatch(typeof(AccountManager), nameof(AccountManager.RandomizeName))] + public static class RandomizeNamePatch { + static bool Prefix(AccountManager __instance) { + if (SaveManager.lastPlayerName == null) + return true; + SaveManager.PlayerName = SaveManager.lastPlayerName; + __instance.accountTab.UpdateNameDisplay(); + return false; // Don't execute original + } + } + } +} \ No newline at end of file diff --git a/Source Code/Resources/Garlic.png b/Source Code/Resources/Garlic.png index fcca3b4a20eaf2f5db1dda6db7ed7a9891e40870..c078e9a113255815682ac6f35526968a70af4188 100644 GIT binary patch literal 7309 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 literal 12605 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 diff --git a/Source Code/TheOtherRoles.csproj b/Source Code/TheOtherRoles.csproj index 5d06ee7..1c13a0c 100644 --- a/Source Code/TheOtherRoles.csproj +++ b/Source Code/TheOtherRoles.csproj @@ -1,7 +1,7 @@ netstandard2.1 - 2.7.0 + 2.7.1 TheOtherRoles Eisbison diff --git a/Source Code/UpdatePatch.cs b/Source Code/UpdatePatch.cs index 6ecb63c..c233933 100644 --- a/Source Code/UpdatePatch.cs +++ b/Source Code/UpdatePatch.cs @@ -199,7 +199,7 @@ namespace TheOtherRoles Morphling.morphling.myRend.material.SetColor("_BackColor", Palette.ShadowColors[Morphling.morphTarget.Data.ColorId]); Morphling.morphling.myRend.material.SetColor("_BodyColor", Palette.PlayerColors[Morphling.morphTarget.Data.ColorId]); Morphling.morphling.HatRenderer.SetHat(Morphling.morphTarget.Data.HatId, Morphling.morphTarget.Data.ColorId); - Morphling.morphling.nameText.transform.localPosition = new Vector3(0f, (Morphling.morphTarget.Data.HatId == 0U) ? 0.7f : 1.05f, -0.5f); + Morphling.morphling.nameText.transform.localPosition = new Vector3(0f, ((Morphling.morphTarget.Data.HatId == 0U) ? 0.7f : 1.05f) * 2f, -0.5f); if (Morphling.morphling.MyPhysics.Skin.skin.ProdId != DestroyableSingleton.Instance.AllSkins[(int)Morphling.morphTarget.Data.SkinId].ProdId) { Helpers.setSkinWithAnim(Morphling.morphling.MyPhysics, Morphling.morphTarget.Data.SkinId); -- 2.39.5