v4.0.4 Source Code

eDonnes124 · Apr 17, 2023 · 389cd03 · 389cd03
1 parent 2fcd75f
commit 389cd03
Show file tree

Hide file tree

Showing 73 changed files with 735 additions and 1,096 deletions.
diff --git a/README.md b/README.md
@@ -75,6 +75,7 @@ Join our [Discord](https://discord.gg/ugyc4EVUYZ) if you have any problems or wa
 # Releases
 | Among Us - Version| Mod Version | Link |
 |----------|-------------|-----------------|
+| 2023.3.28s & 2023.3.28e | v4.0.4 | [Download](https://github.com/eDonnes124/Town-Of-Us/releases/download/v4.0.4/ToU.v4.0.4.zip) |
 | 2023.2.28s & 2023.2.28e | v4.0.3 | [Download](https://github.com/eDonnes124/Town-Of-Us/releases/download/v4.0.3/ToU.v4.0.3.zip) |
 | 2022.12.14s & 2022.12.14e | v4.0.2 | [Download](https://github.com/eDonnes124/Town-Of-Us/releases/download/v4.0.2/ToU.v4.0.2.zip) |
 | 2022.12.14s & 2022.12.14e | v4.0.1 | [Download](https://github.com/eDonnes124/Town-Of-Us/releases/download/v4.0.1/ToU.v4.0.1.zip) |
@@ -131,6 +132,11 @@ Join our [Discord](https://discord.gg/ugyc4EVUYZ) if you have any problems or wa
 <details>
   <summary> Changelog </summary>
   <details>
+  <summary> v4.0.4 </summary>
+  <ul> <li>Compatibility with the new Among Us version v2023.3.28</li> </ul>
+  <ul> <li>Haunter/Phantom/Traitor spawn adjustments</li> </ul>
+  </details>
+  <details>
   <summary> v4.0.3 </summary>
   <ul> <li>Compatibility with the new Among Us version v2023.2.28</li> </ul>
   <ul> <li>New Setting: Who can see dead players on admin (under Spy)</li> </ul>
@@ -1642,7 +1648,6 @@ When they are the only remaining Impostor, they will have their kill cooldown sh
 | Camouflaged Comms | Whether everyone becomes camouflaged when Comms are sabotaged | Toggle | False |
 | Impostors can see the roles of their team | Whether Impostors are able to see which Impostor roles their teammates have | Toggle | False |
 | Dead can see everyone's roles and Votes | Whether dead players are able to see the roles and votes of everyone else | Toggle | False |
-| Probability of a completely vanilla game | The percentage probability of a vanilla Among Us game happening | Percentage | 0% |
 | Game Start Cooldowns | The cooldown for all roles at the start of the game | Time | 10s |
 | Parallel Medbay Scans | Whether players have to wait for others to scan | Toggle | False |
 | Disable Meeting Skip Button | Whether the meeting button is disabled | No / Emergency / Always | No |

diff --git a/source/Patches/AddHauntPatch.cs b/source/Patches/AddHauntPatch.cs
diff --git a/source/Patches/CrewmateRoles/AltruistMod/Coroutine.cs b/source/Patches/CrewmateRoles/AltruistMod/Coroutine.cs
@@ -10,6 +10,7 @@
 using Object = UnityEngine.Object;
 using TownOfUs.Roles.Modifiers;
 using AmongUs.GameOptions;
+using TownOfUs.Patches;
 
 namespace TownOfUs.CrewmateRoles.AltruistMod
 {
@@ -98,6 +99,7 @@ public static IEnumerator AltruistRevive(DeadBody target, Altruist role)
                 {
                 }
 
+            ExilePatch.CheckTraitorSpawn(null);
 
             if (PlayerControl.LocalPlayer.Data.IsImpostor() || PlayerControl.LocalPlayer.Is(RoleEnum.Glitch) || PlayerControl.LocalPlayer.Is(RoleEnum.Juggernaut)
                 || PlayerControl.LocalPlayer.Is(RoleEnum.Arsonist) || PlayerControl.LocalPlayer.Is(RoleEnum.Werewolf)

diff --git a/source/Patches/CrewmateRoles/AltruistMod/KillButtonTarget.cs b/source/Patches/CrewmateRoles/AltruistMod/KillButtonTarget.cs
@@ -17,13 +17,16 @@ public static bool Prefix(KillButton __instance)
         public static void SetTarget(KillButton __instance, DeadBody target, Altruist role)
         {
             if (role.CurrentTarget && role.CurrentTarget != target)
-                role.CurrentTarget.bodyRenderer.material.SetFloat("_Outline", 0f);
+            {
+                foreach (var body in role.CurrentTarget.bodyRenderers) body.material.SetFloat("_Outline", 0f);
+            }
 
             if (target != null && target.ParentId == DontRevive) target = null;
             role.CurrentTarget = target;
             if (role.CurrentTarget && __instance.enabled)
             {
-                var component = role.CurrentTarget.bodyRenderer;
+                SpriteRenderer component = null;
+                foreach (var body in role.CurrentTarget.bodyRenderers) component = body;
                 component.material.SetFloat("_Outline", 1f);
                 component.material.SetColor("_OutlineColor", Color.red);
                 __instance.graphic.color = Palette.EnabledColor;

diff --git a/source/Patches/CrewmateRoles/DetectiveMod/DeadBody.cs b/source/Patches/CrewmateRoles/DetectiveMod/DeadBody.cs
@@ -31,7 +31,7 @@ public static string ParseBodyReport(BodyReport br)
                 return
                     $"Body Report: The killer appears to be a Crewmate! (Killed {Math.Round(br.KillAge / 1000)}s ago)";
 
-            else if (br.Killer.Is(Faction.Neutral))
+            else if (br.Killer.Is(Faction.NeutralKilling) || br.Killer.Is(Faction.NeutralOther))
                 return
                     $"Body Report: The killer appears to be a Neutral Role! (Killed {Math.Round(br.KillAge / 1000)}s ago)";
 

diff --git a/source/Patches/CrewmateRoles/HaunterMod/CompleteTask.cs b/source/Patches/CrewmateRoles/HaunterMod/CompleteTask.cs
@@ -26,7 +26,7 @@ public static void Postfix(PlayerControl __instance)
                 {
                     Coroutines.Start(Utils.FlashCoroutine(role.Color));
                 }
-                else if (PlayerControl.LocalPlayer.Data.IsImpostor() || (PlayerControl.LocalPlayer.Is(Faction.Neutral) && CustomGameOptions.HaunterRevealsNeutrals))
+                else if (PlayerControl.LocalPlayer.Data.IsImpostor() || (PlayerControl.LocalPlayer.Is(Faction.NeutralKilling) && CustomGameOptions.HaunterRevealsNeutrals))
                 {
                     role.Revealed = true;
                     Coroutines.Start(Utils.FlashCoroutine(role.Color));
@@ -48,7 +48,7 @@ public static void Postfix(PlayerControl __instance)
                 {
                     Coroutines.Start(Utils.FlashCoroutine(Color.white));
                 }
-                else if (PlayerControl.LocalPlayer.Data.IsImpostor() || (PlayerControl.LocalPlayer.Is(Faction.Neutral) && CustomGameOptions.HaunterRevealsNeutrals))
+                else if (PlayerControl.LocalPlayer.Data.IsImpostor() || (PlayerControl.LocalPlayer.Is(Faction.NeutralKilling) && CustomGameOptions.HaunterRevealsNeutrals))
                 {
                     Coroutines.Start(Utils.FlashCoroutine(Color.white));
                 }

diff --git a/source/Patches/CrewmateRoles/HaunterMod/Enums.cs b/source/Patches/CrewmateRoles/HaunterMod/Enums.cs
@@ -0,0 +1,9 @@
+namespace TownOfUs.CrewmateRoles.HaunterMod
+{
+    public enum HaunterCanBeClickedBy
+    {
+        All,
+        NonCrew,
+        ImpsOnly
+    }
+}
diff --git a/source/Patches/CrewmateRoles/HaunterMod/HighlightImpostors.cs b/source/Patches/CrewmateRoles/HaunterMod/HighlightImpostors.cs
@@ -17,7 +17,7 @@ public static void UpdateMeeting(MeetingHud __instance)
                     var role = Role.GetRole(player);
                     if (player.Is(Faction.Impostors))
                         state.NameText.color = Palette.ImpostorRed;
-                    if (player.Is(Faction.Neutral) && CustomGameOptions.HaunterRevealsNeutrals)
+                    if (player.Is(Faction.NeutralKilling) && CustomGameOptions.HaunterRevealsNeutrals)
                         state.NameText.color = role.Color;
                 }
             }

diff --git a/source/Patches/CrewmateRoles/HaunterMod/RepickHaunter.cs b/source/Patches/CrewmateRoles/HaunterMod/RepickHaunter.cs
diff --git a/source/Patches/CrewmateRoles/HaunterMod/SetHaunter.cs b/source/Patches/CrewmateRoles/HaunterMod/SetHaunter.cs
diff --git a/source/Patches/CrewmateRoles/ImitatorMod/StopImitate.cs b/source/Patches/CrewmateRoles/ImitatorMod/StopImitate.cs
@@ -17,7 +17,7 @@ public static void Prefix(PlayerControl __instance, [HarmonyArgument(0)] GameDat
             {
                 return;
             }
-            if (StartImitate.ImitatingPlayer != null)
+            if (StartImitate.ImitatingPlayer != null && !StartImitate.ImitatingPlayer.Is(RoleEnum.Traitor))
             {
                 PlayerControl lastExaminedPlayer = null;
                 List<RoleEnum> trappedPlayers = null;

diff --git a/source/Patches/CrewmateRoles/SeerMod/Update.cs b/source/Patches/CrewmateRoles/SeerMod/Update.cs
@@ -24,8 +24,7 @@ private static void UpdateMeeting(MeetingHud __instance, Seer seer)
                             ((player.Is(RoleEnum.Sheriff) || player.Is(RoleEnum.Veteran) || player.Is(RoleEnum.Vigilante)) && !CustomGameOptions.CrewKillingRed) ||
                             ((player.Is(RoleEnum.Amnesiac) || player.Is(RoleEnum.Survivor) || player.Is(RoleEnum.GuardianAngel)) && !CustomGameOptions.NeutBenignRed) ||
                             ((player.Is(RoleEnum.Executioner) || player.Is(RoleEnum.Jester) || player.Is(RoleEnum.Phantom)) && !CustomGameOptions.NeutEvilRed) ||
-                            ((player.Is(RoleEnum.Arsonist) || player.Is(RoleEnum.Glitch) || player.Is(RoleEnum.Juggernaut) ||
-                            player.Is(RoleEnum.Plaguebearer) || player.Is(RoleEnum.Pestilence) || player.Is(RoleEnum.Werewolf)) && !CustomGameOptions.NeutKillingRed))
+                            (player.Is(Faction.NeutralKilling) && !CustomGameOptions.NeutKillingRed))
                             {
                                 state.NameText.color = Color.green;
                             }
@@ -73,8 +72,7 @@ private static void Postfix(HudManager __instance)
                             ((player.Is(RoleEnum.Sheriff) || player.Is(RoleEnum.Veteran) || player.Is(RoleEnum.Vigilante)) && !CustomGameOptions.CrewKillingRed) ||
                             ((player.Is(RoleEnum.Amnesiac) || player.Is(RoleEnum.Survivor) || player.Is(RoleEnum.GuardianAngel)) && !CustomGameOptions.NeutBenignRed) ||
                             ((player.Is(RoleEnum.Executioner) || player.Is(RoleEnum.Jester) || player.Is(RoleEnum.Phantom)) && !CustomGameOptions.NeutEvilRed) ||
-                            ((player.Is(RoleEnum.Arsonist) || player.Is(RoleEnum.Glitch) || player.Is(RoleEnum.Juggernaut) ||
-                            player.Is(RoleEnum.Plaguebearer) || player.Is(RoleEnum.Pestilence) || player.Is(RoleEnum.Werewolf)) && !CustomGameOptions.NeutKillingRed))
+                            (player.Is(Faction.NeutralKilling) && !CustomGameOptions.NeutKillingRed))
                         {
                             player.nameText().color = Color.green;
                         }

diff --git a/source/Patches/CrewmateRoles/SnitchMod/HighlightImpostors.cs b/source/Patches/CrewmateRoles/SnitchMod/HighlightImpostors.cs
@@ -20,7 +20,7 @@ private static void UpdateMeeting(MeetingHud __instance)
                         state.NameText.color = Palette.ImpostorRed;
                     else if (player.Is(RoleEnum.Traitor) && CustomGameOptions.SnitchSeesTraitor)
                         state.NameText.color = Palette.ImpostorRed;
-                    if (player.Is(Faction.Neutral) && CustomGameOptions.SnitchSeesNeutrals)
+                    if (player.Is(Faction.NeutralKilling) && CustomGameOptions.SnitchSeesNeutrals)
                         state.NameText.color = role.Color;
                 }
             }
@@ -38,7 +38,7 @@ public static void Postfix(HudManager __instance)
                 if (player.Data.IsImpostor() && !player.Is(RoleEnum.Traitor)) player.nameText().color = Palette.ImpostorRed;
                 else if (player.Is(RoleEnum.Traitor) && CustomGameOptions.SnitchSeesTraitor) player.nameText().color = Palette.ImpostorRed;
                 var playerRole = Role.GetRole(player);
-                if (playerRole.Faction == Faction.Neutral && CustomGameOptions.SnitchSeesNeutrals)
+                if (playerRole.Faction == Faction.NeutralKilling && CustomGameOptions.SnitchSeesNeutrals)
                     player.nameText().color = playerRole.Color;
             }
         }

diff --git a/source/Patches/CrewmateRoles/SpyMod/Vitals.cs b/source/Patches/CrewmateRoles/SpyMod/Vitals.cs
diff --git a/source/Patches/CrewmateRoles/TransporterMod/UntransportableTracker.cs b/source/Patches/CrewmateRoles/TransporterMod/UntransportableTracker.cs
@@ -2,7 +2,6 @@
 using TownOfUs.Roles;
 using System;
 using Hazel;
-using Reactor.Utilities.Extensions;
 
 namespace TownOfUs.CrewmateRoles.TransporterMod
 {

diff --git a/source/Patches/CrewmateRoles/TransporterMod/Update.cs b/source/Patches/CrewmateRoles/TransporterMod/Update.cs
@@ -1,8 +1,6 @@
-using System.Linq;
-using HarmonyLib;
+using HarmonyLib;
 using InnerNet;
 using TownOfUs.Roles;
-using UnityEngine;
 
 namespace TownOfUs.CrewmateRoles.TransporterMod
 {