Version 2.7.3

TheOtherRolesAU · Jul 19, 2021 · c0a233b · c0a233b
1 parent 15c659d
commit c0a233b
Show file tree

Hide file tree

Showing 97 changed files with 489 additions and 321 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.vs
+.vscode/tasks.json
diff --git a/README.md b/README.md
@@ -36,9 +36,9 @@ The [Role Assignment](#role-assignment) sections explains how the roles are bein
 # Releases
 | Among Us - Version| Mod Version | Link |
 |----------|-------------|-----------------|
-| **2021.6.30**| v2.7.2 Beta| [Download](https://github.com/Eisbison/TheOtherRoles/releases/tag/v2.7.2)
-| 2021.6.15| v2.7.1| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.7.1/TheOtherRoles.zip)
-| 2021.6.15| v2.7.0| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.7.0/TheOtherRoles.zip)
+| **2021.6.30s**| v2.7.3| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.7.3/TheOtherRoles.zip)
+| 2021.6.15s| v2.7.1| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.7.1/TheOtherRoles.zip)
+| 2021.6.15s| 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)
 | 2021.5.10s| v2.6.5| [Download](https://github.com/Eisbison/TheOtherRoles/releases/download/v2.6.5/TheOtherRoles.zip)
@@ -72,11 +72,19 @@ The [Role Assignment](#role-assignment) sections explains how the roles are bein
 <details>
   <summary>Click to show the Changelog</summary>
 
+**Version 2.7.3**
+- Updated to Among Us v2021.6.30
+- Updated BepInEx version
+- Updated Credentials
+- Fixed some Colors being considered darker, when they should be lighter
+- Added /size command for Lobby
+- Added /color and /murder command to Freeplay (for the Hat Designers)
+
 **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
+- Fixed a bug where [swapped](#swapper) votes were sometimes counted wrongly
+- Fixed the positioning of the player name while [morphed](#morphling)
+- Fixed a bug where the window of the [Guesser](#guesser) sometimes showed no "close button"
+- Fixed a bug where the [garlics](#vampire) were not displayed properly
 
 **Version 2.7.0**
 - **New Role:** [Bounty Hunter](#bounty-hunter) created by [Mallöris](https://github.com/Mallaris) 
@@ -322,7 +330,7 @@ Not working? You might want to install the dependency [vc_redist](https://aka.ms
 **Linux Manual**
 1. Install Among Us via Steam
 2. Download newest [release](https://github.com/Eisbison/TheOtherRoles/releases/latest) and extract it to ~/.steam/steam/steamapps/common/Among Us
-3. Enable `winhttp.dll` via the proton winecfg (https://bepinex.github.io/bepinex_docs/master/articles/advanced/steam_interop.html#protonwine)
+3. Enable `winhttp.dll` via the proton winecfg (https://docs.bepinex.dev/articles/advanced/steam_interop.html#open-winecfg-for-the-target-game)
 4. Launch the game via Steam
 
 # Custom Servers and 10+ Players
@@ -663,7 +671,7 @@ Depending on the options, there'll be an arrow pointing towards the current targ
 ### **Team: Crewmates or Impostors**
 The Guesser can be a Crewmate or an Impostor (depending on the settings).\
 The Guesser can shoot a player during the meeting, by guessing its role. If the guess is wrong, the Guesser dies instead.\
-Only one person can be shot per meeting and you can set a maximum number of shots.\
+You can select how many players can be shot per meeting and how many players can be shot per game.\
 The guesses Impostor and Crewmate are only right, if the player is part of the corresponding team and has no special role.\
 You can only shoot during the voting time.
 
@@ -679,7 +687,8 @@ You can only shoot during the voting time.
 |----------|:-------------:|
 | Guesser Spawn Chance | -
 | Chance That The Guesser Is An Impostor | -
-| Guesser Number Of Shots | -
+| Guesser Number Of Shots Per Game| -
+| Guesser Number Of Shots Per Meeting| -
 
 -----------------------
 

diff --git a/Source Code/.gitignore b/Source Code/.gitignore
diff --git a/Source Code/ChatCommands.cs b/Source Code/ChatCommands.cs
diff --git a/Source Code/CustomButton.cs b/Source Code/CustomButton.cs
diff --git a/TheOtherRoles.sln b/TheOtherRoles.sln
@@ -0,0 +1,16 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheOtherRoles", "TheOtherRoles\TheOtherRoles.csproj", "{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/Source Code/Buttons.cs → TheOtherRoles/Buttons.cs b/Source Code/Buttons.cs → TheOtherRoles/Buttons.cs
@@ -3,6 +3,7 @@
 using System;
 using UnityEngine;
 using static TheOtherRoles.TheOtherRoles;
+using TheOtherRoles.Objects;
 
 namespace TheOtherRoles
 {

diff --git a/Source Code/CustomOptions.cs → TheOtherRoles/CustomOptions.cs b/Source Code/CustomOptions.cs → TheOtherRoles/CustomOptions.cs
diff --git a/Source Code/GameHistory.cs → TheOtherRoles/GameHistory.cs b/Source Code/GameHistory.cs → TheOtherRoles/GameHistory.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using static TheOtherRoles.TheOtherRoles;
 
-namespace TheOtherRoles{
+namespace TheOtherRoles {
     public class DeadPlayer
     {
         public PlayerControl player;

diff --git a/Source Code/Helpers.cs → TheOtherRoles/Helpers.cs b/Source Code/Helpers.cs → TheOtherRoles/Helpers.cs
@@ -7,6 +7,7 @@
 using UnityEngine;
 using System.Linq;
 using static TheOtherRoles.TheOtherRoles;
+using TheOtherRoles.Modules;
 using HarmonyLib;
 using Hazel;
 
@@ -203,6 +204,10 @@ public static void setSemiTransparent(this PoolablePlayer player, bool value) {
             player.NameText.color = new Color(player.NameText.color.r, player.NameText.color.g, player.NameText.color.b, alpha);
         }
 
+        public static string GetString(this TranslationController t, StringNames key, params Il2CppSystem.Object[] parts) {
+            return t.GetString(key, parts);
+        }
+
         public static string cs(Color c, string s) {
             return string.Format("<color=#{0:X2}{1:X2}{2:X2}{3:X2}>{4}</color>", ToByte(c.r), ToByte(c.g), ToByte(c.b), ToByte(c.a), s);
         }

diff --git a/Source Code/Main.cs → TheOtherRoles/Main.cs b/Source Code/Main.cs → TheOtherRoles/Main.cs
@@ -12,6 +12,7 @@
 using System.Reflection;
 using UnhollowerBaseLib;
 using UnityEngine;
+using TheOtherRoles.Modules;
 
 namespace TheOtherRoles
 {
@@ -20,7 +21,7 @@ namespace TheOtherRoles
     public class TheOtherRolesPlugin : BasePlugin
     {
         public const string Id = "me.eisbison.theotherroles";
-        public const string VersionString = "2.7.1";
+        public const string VersionString = "2.7.3";
         public static System.Version Version = System.Version.Parse(VersionString);
 
         public Harmony Harmony { get; } = new Harmony(Id);

diff --git a/Source Code/MapOptions.cs → TheOtherRoles/MapOptions.cs b/Source Code/MapOptions.cs → TheOtherRoles/MapOptions.cs