Merge pull request #43 from EnhancedNetwork/dev_2.2.0

Dev 2.2.0
impostor4291 · Jan 9, 2025 · 2a1d08e · 2a1d08e
2 parents d7b7f7b + 8a09db1
commit 2a1d08e
Show file tree

Hide file tree

Showing 22 changed files with 11,480 additions and 8,472 deletions.
diff --git a/Patches/ChatCommandPatch.cs b/Patches/ChatCommandPatch.cs
@@ -2100,7 +2100,7 @@ public static void OnReceiveChat(PlayerControl player, string text, out bool can
         if (Nemesis.NemesisMsgCheck(player, text)) { Logger.Info($"Is Nemesis Revenge command", "OnReceiveChat"); return; }
         if (Retributionist.RetributionistMsgCheck(player, text)) { Logger.Info($"Is Retributionist Revenge command", "OnReceiveChat"); return; }
         if (player.GetRoleClass() is Dictator dt && dt.ExilePlayer(player, text)) { canceled = true; Logger.Info($"Is Dictator command", "OnReceiveChat"); return; }
-        if (Ritualist.RitualistMsgCheck(player, text)) { canceled = true;  Logger.Info($"Is Ritualist command", "OnReceiveChat"); return; }
+        if (Ritualist.RitualistMsgCheck(player, text)) { canceled = true; Logger.Info($"Is Ritualist command", "OnReceiveChat"); return; }
 
         Directory.CreateDirectory(modTagsFiles);
         Directory.CreateDirectory(vipTagsFiles);

diff --git a/Patches/ExilePatch.cs b/Patches/ExilePatch.cs
@@ -1,6 +1,5 @@
 using AmongUs.Data;
 using System;
-using TOHE.Modules;
 using TOHE.Roles.Core;
 using TOHE.Roles.Neutral;
 

diff --git a/Patches/IntroPatch.cs b/Patches/IntroPatch.cs
@@ -571,7 +571,7 @@ public static void Postfix(IntroCutscene __instance)
                 PlayerControl.LocalPlayer.Data.Role.IntroSound = RoleManager.Instance.AllRoles.FirstOrDefault((role) => role.Role == RoleTypes.GuardianAngel)?.UseSound;
                 break;
             case CustomRoles.Illusionist:
-            case CustomRoles.MoonDancer:    
+            case CustomRoles.MoonDancer:
                 PlayerControl.LocalPlayer.Data.Role.IntroSound = RoleManager.Instance.AllRoles.FirstOrDefault((role) => role.Role == RoleTypes.Phantom)?.UseSound;
                 break;
             case CustomRoles.Telecommunication:

diff --git a/Resources/Lang/de_DE.json b/Resources/Lang/de_DE.json
diff --git a/Resources/Lang/es_419.json b/Resources/Lang/es_419.json
diff --git a/Resources/Lang/es_ES.json b/Resources/Lang/es_ES.json
diff --git a/Resources/Lang/fil_PH.json b/Resources/Lang/fil_PH.json
diff --git a/Resources/Lang/fr_FR.json b/Resources/Lang/fr_FR.json
diff --git a/Resources/Lang/it_IT.json b/Resources/Lang/it_IT.json
diff --git a/Resources/Lang/ja_JP.json b/Resources/Lang/ja_JP.json
diff --git a/Resources/Lang/ko_KR.json b/Resources/Lang/ko_KR.json
diff --git a/Resources/Lang/nl_NL.json b/Resources/Lang/nl_NL.json
diff --git a/Resources/Lang/pt_BR.json b/Resources/Lang/pt_BR.json
diff --git a/Resources/Lang/pt_PT.json b/Resources/Lang/pt_PT.json
diff --git a/Resources/Lang/ru_RU.json b/Resources/Lang/ru_RU.json
diff --git a/Resources/Lang/zh_CN.json b/Resources/Lang/zh_CN.json
diff --git a/Resources/Lang/zh_TW.json b/Resources/Lang/zh_TW.json
diff --git a/Roles/Coven/Medusa.cs b/Roles/Coven/Medusa.cs
@@ -4,7 +4,6 @@
 using static TOHE.Options;
 using static TOHE.Translator;
 using static TOHE.Utils;
-using static UnityEngine.GraphicsBuffer;
 
 namespace TOHE.Roles.Coven;
 

diff --git a/Roles/Coven/PotionMaster.cs b/Roles/Coven/PotionMaster.cs
@@ -1,12 +1,10 @@
 using Hazel;
 using InnerNet;
 using System.Text;
-using TOHE.Roles.AddOns.Common;
 using UnityEngine;
 using static TOHE.Options;
 using static TOHE.Translator;
 using static TOHE.Utils;
-using static UnityEngine.ParticleSystem.PlaybackState;
 
 namespace TOHE.Roles.Coven;
 

diff --git a/Roles/Coven/Ritualist.cs b/Roles/Coven/Ritualist.cs
@@ -6,7 +6,6 @@
 using TOHE.Roles.AddOns.Impostor;
 using TOHE.Roles.Crewmate;
 using TOHE.Roles.Double;
-using TOHE.Roles.Impostor;
 using TOHE.Roles.Neutral;
 using UnityEngine;
 using static TOHE.Options;
@@ -202,7 +201,7 @@ public override void AfterMeetingTasks()
     public void ConvertRole(PlayerControl killer, PlayerControl target)
     {
         if (!killer.Is(CustomRoles.Admired) && !killer.Is(CustomRoles.Recruit) && !killer.Is(CustomRoles.Charmed)
-                && !killer.Is(CustomRoles.Infected) && !killer.Is(CustomRoles.Contagious) && !killer.Is(CustomRoles.Madmate) 
+                && !killer.Is(CustomRoles.Infected) && !killer.Is(CustomRoles.Contagious) && !killer.Is(CustomRoles.Madmate)
                && CanBeConverted(target))
         {
             Logger.Info("Set converted: " + target.GetNameWithRole().RemoveHtmlTags() + " to " + CustomRoles.Enchanted.ToString(), "Ritualist Assign");

diff --git a/Roles/Crewmate/Sheriff.cs b/Roles/Crewmate/Sheriff.cs
@@ -70,7 +70,7 @@ public override void SetupCustomOption()
         CanKillContagious = BooleanOptionItem.Create(Id + 27, "SheriffCanKillContagious", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]);
         CanKillEnchanted = BooleanOptionItem.Create(Id + 30, "SheriffCanKillEnchanted", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]);
         CanKillCoven = BooleanOptionItem.Create(Id + 29, "SheriffCanKillCoven", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]);
-        MisfireOnAdmired = BooleanOptionItem.Create(Id + 32, "SheriffMisfireOnAdmired", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]);        
+        MisfireOnAdmired = BooleanOptionItem.Create(Id + 32, "SheriffMisfireOnAdmired", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]);
         CanKillNeutrals = BooleanOptionItem.Create(Id + 16, "SheriffCanKillNeutrals", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]);
         CanKillNeutralsMode = StringOptionItem.Create(Id + 14, "SheriffCanKillNeutralsMode", EnumHelper.GetAllNames<KillOptionList>(), 0, TabGroup.CrewmateRoles, false).SetParent(CanKillNeutrals);
         SetUpNeutralOptions(Id + 33);

diff --git a/main.cs b/main.cs
@@ -46,7 +46,7 @@ public class Main : BasePlugin
     public static ConfigEntry<string> DebugKeyInput { get; private set; }
 
     public const string PluginGuid = "com.0xdrmoe.townofhostenhanced";
-    public const string PluginVersion = "2025.0106.220.11000"; // YEAR.MMDD.VERSION.CANARYDEV
+    public const string PluginVersion = "2025.0109.220.11000"; // YEAR.MMDD.VERSION.CANARYDEV
     public const string PluginDisplayVersion = "2.2.0 Alpha 11";
     public const string SupportedVersionAU = "2024.10.29"; // Changed becasue Dark theme works at this version.