Update v1.1.2.0

mxyx0412 · mxyx0412 · commit a0ee79496055 · 2025-01-26T07:22:28.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,3 @@
-v1.1.1.9更新日志
+v1.1.2.0更新日志
 
-* 新增中立杀手职业：鹈鹕
-* 压缩音频资源，减少dll文件大小
-* 对选项界面进行优化，使其更加流畅不会持续卡顿
-* 怨灵：死亡后的视野仍然与存活时无异（视野无法穿墙）
-* 怨灵：使用复活技能后，会自动复活在离玩家最近的出生点
-* 警长、捕快：职业优化，允许同时存在多个警长
-* 跟班：优化按钮，晋升豺狼时不会再重置击杀按钮cd
-* 月下狼人：对按钮分布进行优化，使其使用击杀按钮更方便
-* 巨人：修复碰撞体积的问题
-* 魅魔：修复胜利条件（第N次修复，这次真的没问题了！）
-
-注：本次仅更新Lite分支
+* 修复部分bug。
diff --git a/TheOtherRoles/Buttons/Buttons.cs b/TheOtherRoles/Buttons/Buttons.cs
@@ -2262,12 +2262,12 @@ public static void createButtonsPostfix(HudManager __instance)
                     (byte)CustomRPC.GrenadierFlash, SendOption.Reliable);
                 writer.Write(false);
                 AmongUsClient.Instance.FinishRpcImmediately(writer);
-                RPCProcedure.grenadierFlash();
+                RPCProcedure.grenadierFlash(false);
             },
             () =>
             {
                 /* Can See */
-                return Grenadier.grenadier != null && Grenadier.grenadier == CachedPlayer.LocalPlayer.PlayerControl
+                return Grenadier.Player != null && Grenadier.Player == CachedPlayer.LocalPlayer.PlayerControl
                        && !CachedPlayer.LocalPlayer.Data.IsDead;
             },
             () =>
diff --git a/TheOtherRoles/Patches/PlayerControlPatch.cs b/TheOtherRoles/Patches/PlayerControlPatch.cs
@@ -2116,9 +2116,9 @@ public static void Postfix(PlayerControl __instance, [HarmonyArgument(0)] Player
     public static void HandleMurderPostfix(PlayerControl __instance, PlayerControl target)
     {
         // Collect dead player info
-        var deadPlayer = new DeadPlayer(target, DateTime.UtcNow, CustomDeathReason.Kill, __instance);
-        if (__instance == target) deadPlayer = new DeadPlayer(target, DateTime.UtcNow, CustomDeathReason.Suicide, __instance);
-        if (DeadPlayers.Any(x => x.Player != target)) DeadPlayers.Add(deadPlayer);
+        var deathReason = __instance == target ? CustomDeathReason.Suicide : CustomDeathReason.Kill;
+        var deadPlayer = new DeadPlayer(target, DateTime.UtcNow, deathReason, __instance);
+        DeadPlayers.Add(deadPlayer);
 
         // Reset killer to crewmate if resetToCrewmate
         if (resetToCrewmate) __instance.Data.Role.TeamType = RoleTeamTypes.Crewmate;
diff --git a/TheOtherRoles/Patches/UpdatePatch.cs b/TheOtherRoles/Patches/UpdatePatch.cs
@@ -131,8 +131,8 @@ private static void setNameColors()
             setPlayerNameColor(WolfLord.Player, WolfLord.color);
         }
 
-        if (Grenadier.grenadier != null && ((localPlayer.isImpostor() && Grenadier.indicatorsMode)
-            || localPlayer == Grenadier.grenadier || shouldShowGhostInfo()))
+        if (Grenadier.Player != null && ((localPlayer.isImpostor() && Grenadier.indicatorsMode)
+            || localPlayer == Grenadier.Player || shouldShowGhostInfo()))
         {
             foreach (var p in Grenadier.controls)
             {
diff --git a/TheOtherRoles/RPC.cs b/TheOtherRoles/RPC.cs
@@ -309,7 +309,7 @@ public static void setRole(byte roleId, byte playerId)
                         PartTimer.partTimer = player;
                         break;
                     case RoleId.Grenadier:
-                        Grenadier.grenadier = player;
+                        Grenadier.Player = player;
                         break;
                     case RoleId.Veteran:
                         Veteran.veteran = player;
@@ -922,13 +922,13 @@ public static void swapperSwap(byte playerId1, byte playerId2)
         }
     }
 
-    public static void grenadierFlash()
+    public static void grenadierFlash(bool clear = false)
     {
-        var closestPlayers = GetClosestPlayers(Grenadier.grenadier.GetTruePosition(), Grenadier.radius, true);
+        var closestPlayers = GetClosestPlayers(Grenadier.Player.GetTruePosition(), Grenadier.radius, true);
         Grenadier.controls = closestPlayers;
         foreach (var player in closestPlayers)
         {
-            if (CachedPlayer.LocalId == player.PlayerId)
+            if (PlayerControl.LocalPlayer.PlayerId == player.PlayerId)
             {
                 if (player.isImpostor() && !player.IsDead() && !MeetingHud.Instance)
                 {
@@ -1164,7 +1164,7 @@ public static void erasePlayerRoles(byte playerId, bool ignoreModifier = true)
         if (player == Blackmailer.blackmailer) Blackmailer.clearAndReload();
         if (player == Terrorist.terrorist) Terrorist.clearAndReload();
         if (player == Gambler.gambler) Gambler.clearAndReload();
-        if (player == Grenadier.grenadier) Grenadier.clearAndReload();
+        if (player == Grenadier.Player) Grenadier.clearAndReload();
 
         // Other roles
         if (player == Jester.jester) Jester.clearAndReload();
@@ -2421,7 +2421,7 @@ private static bool Prefix([HarmonyArgument(0)] byte callId, [HarmonyArgument(1)
                 RPCProcedure.yoyoMarkLocation(reader.ReadBytesAndSize());
                 break;
             case CustomRPC.GrenadierFlash:
-                RPCProcedure.grenadierFlash();
+                RPCProcedure.grenadierFlash(reader.ReadBoolean());
                 break;
             case CustomRPC.WitnessReport:
                 Witness.WitnessReport(reader.ReadByte());
diff --git a/TheOtherRoles/Roles/Ghost/Specter.cs b/TheOtherRoles/Roles/Ghost/Specter.cs
@@ -141,7 +141,7 @@ public static void TakeRole(byte targetId)
                     break;
                 case RoleId.Grenadier:
                     if (resetRole) Grenadier.clearAndReload();
-                    Grenadier.grenadier = local;
+                    Grenadier.Player = local;
                     break;
                 case RoleId.Survivor:
                     Survivor.Player.Add(local);
diff --git a/TheOtherRoles/Roles/Impostor/Grenadier.cs b/TheOtherRoles/Roles/Impostor/Grenadier.cs
@@ -8,7 +8,7 @@ namespace TheOtherRoles.Roles.Impostor;
 
 public class Grenadier
 {
-    public static PlayerControl grenadier;
+    public static PlayerControl Player;
     public static Color color = Palette.ImpostorRed;
     public static Color flash = new Color32(150, 150, 150, byte.MaxValue);
     public static List<PlayerControl> controls = new();
@@ -37,12 +37,12 @@ public static void showFlash(Color color, float duration = 10f, float alpha = 1f
             if (InMeeting)
             {
                 renderer.enabled = false;
-                if (CachedPlayer.LocalId == grenadier.PlayerId && controls.Count > 0)
+                if (PlayerControl.LocalPlayer.PlayerId == Player?.PlayerId && controls?.Count > 0)
                 {
-                    var writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId,
-                        (byte)CustomRPC.GrenadierFlash, SendOption.Reliable);
+                    var writer = StartRPC(PlayerControl.LocalPlayer, CustomRPC.GrenadierFlash);
                     writer.Write(true);
-                    AmongUsClient.Instance.FinishRpcImmediately(writer);
+                    writer.EndRPC();
+                    RPCProcedure.grenadierFlash(true);
                     controls.Clear();
                 }
                 return;
@@ -58,12 +58,12 @@ public static void showFlash(Color color, float duration = 10f, float alpha = 1f
                 var fadeOutProgress = (p - (1 - fadeFraction)) / fadeFraction;
                 if (renderer != null) renderer.color = new Color(color.r, color.g, color.b, Mathf.Clamp01((1 - fadeOutProgress) * alpha));
 
-                if (CachedPlayer.LocalId == grenadier.PlayerId && controls.Count > 0)
+                if (PlayerControl.LocalPlayer.PlayerId == Player?.PlayerId && controls?.Count > 0)
                 {
-                    var writer = AmongUsClient.Instance.StartRpcImmediately(CachedPlayer.LocalPlayer.PlayerControl.NetId,
-                        (byte)CustomRPC.GrenadierFlash, SendOption.Reliable);
+                    var writer = StartRPC(PlayerControl.LocalPlayer, CustomRPC.GrenadierFlash);
                     writer.Write(true);
-                    AmongUsClient.Instance.FinishRpcImmediately(writer);
+                    writer.EndRPC();
+                    RPCProcedure.grenadierFlash(true);
                     controls.Clear();
                 }
             }
@@ -78,7 +78,7 @@ public static void showFlash(Color color, float duration = 10f, float alpha = 1f
 
     public static void clearAndReload()
     {
-        grenadier = null;
+        Player = null;
         controls.Clear();
         cooldown = CustomOptionHolder.grenadierCooldown.GetFloat();
         duration = CustomOptionHolder.grenadierDuration.GetFloat() + 0.5f;
diff --git a/TheOtherRoles/Roles/Modifier/Aftermath.cs b/TheOtherRoles/Roles/Modifier/Aftermath.cs
@@ -348,32 +348,32 @@ public static void afterTrigger(byte playerId, byte killerId)
             SoundEffectsManager.play("morphlingMorph");
             camouflagerButton.Timer = camouflagerButton.MaxTimer;
         }
-        else if (Grenadier.grenadier == killer)
+        else if (Grenadier.Player == killer)
         {
             var writer = AmongUsClient.Instance.StartRpcImmediately(killer.NetId,
                 (byte)CustomRPC.GrenadierFlash, SendOption.Reliable);
             writer.Write(false);
             AmongUsClient.Instance.FinishRpcImmediately(writer);
-            grenadierFlash();
+            grenadierFlash(false);
             grenadierFlashButton.Timer = grenadierFlashButton.MaxTimer + Grenadier.duration;
         }
         else if (Swooper.swooper == killer)
         {
-            var invisibleWriter = AmongUsClient.Instance.StartRpcImmediately(killer.NetId,
+            var writer = AmongUsClient.Instance.StartRpcImmediately(killer.NetId,
                 (byte)CustomRPC.SetSwoop, SendOption.Reliable);
-            invisibleWriter.Write(killer.PlayerId);
-            invisibleWriter.Write(byte.MinValue);
-            AmongUsClient.Instance.FinishRpcImmediately(invisibleWriter);
+            writer.Write(killer.PlayerId);
+            writer.Write(byte.MinValue);
+            AmongUsClient.Instance.FinishRpcImmediately(writer);
             setSwoop(Swooper.swooper.PlayerId, byte.MinValue);
             swooperSwoopButton.Timer = swooperSwoopButton.MaxTimer + Swooper.duration;
         }
         else if (Jackal.jackal.Any(x => x == killer) && Jackal.canSwoop)
         {
-            var invisibleWriter = AmongUsClient.Instance.StartRpcImmediately(killer.NetId,
+            var writer = AmongUsClient.Instance.StartRpcImmediately(killer.NetId,
                 (byte)CustomRPC.SetJackalSwoop, SendOption.Reliable);
-            invisibleWriter.Write(killer.PlayerId);
-            invisibleWriter.Write(byte.MinValue);
-            AmongUsClient.Instance.FinishRpcImmediately(invisibleWriter);
+            writer.Write(killer.PlayerId);
+            writer.Write(byte.MinValue);
+            AmongUsClient.Instance.FinishRpcImmediately(writer);
             setJackalSwoop(killer.PlayerId, byte.MinValue);
             jackalSwoopButton.Timer = jackalSwoopButton.MaxTimer + Jackal.duration;
         }
diff --git a/TheOtherRoles/Roles/Neutral/Amnisiac.cs b/TheOtherRoles/Roles/Neutral/Amnisiac.cs
@@ -161,7 +161,7 @@ public static void TakeRole(byte targetId, byte playerId)
                 break;
             case RoleId.Grenadier:
                 if (resetRole) Grenadier.clearAndReload();
-                Grenadier.grenadier = local;
+                Grenadier.Player = local;
                 break;
 
             case RoleId.Survivor:
diff --git a/TheOtherRoles/Roles/Neutral/Thief.cs b/TheOtherRoles/Roles/Neutral/Thief.cs
@@ -97,7 +97,7 @@ public static void StealsRole(byte playerId)
         if (target == Gambler.gambler) Gambler.gambler = thief;
         if (target == Cleaner.cleaner) Cleaner.cleaner = thief;
         if (target == Warlock.warlock) Warlock.warlock = thief;
-        if (target == Grenadier.grenadier) Grenadier.grenadier = thief;
+        if (target == Grenadier.Player) Grenadier.Player = thief;
         if (target == WolfLord.Player) WolfLord.Player = thief;
         if (target == BountyHunter.bountyHunter) BountyHunter.bountyHunter = thief;
         if (target == Witch.witch)
diff --git a/TheOtherRoles/Roles/RoleInfo.cs b/TheOtherRoles/Roles/RoleInfo.cs
@@ -318,7 +318,7 @@ public static List<RoleInfo> getRoleInfoForPlayer(PlayerControl p, bool showModi
         if (p == Detective.detective) infos.Add(detective);
         if (p == TimeMaster.timeMaster) infos.Add(timeMaster);
         if (p == Veteran.veteran) infos.Add(veteran);
-        if (p == Grenadier.grenadier) infos.Add(grenadier);
+        if (p == Grenadier.Player) infos.Add(grenadier);
         if (p == Medic.medic) infos.Add(medic);
         if (p == Swapper.swapper) infos.Add(swapper);
         if (p == BodyGuard.bodyguard) infos.Add(bodyguard);
diff --git a/TheOtherRoles/TheOtherRoles.csproj b/TheOtherRoles/TheOtherRoles.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>1.1.1.9</Version>
+        <Version>1.1.2.0</Version>
 		<AssemblyName>TheOtherUs</AssemblyName>
         <Authors>mxyx-club</Authors>
         <LangVersion>latest</LangVersion>

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,8 @@ private static void setNameColors()`
`131`	`131`	`setPlayerNameColor(WolfLord.Player, WolfLord.color);`
`132`	`132`	`}`
`133`	`133`
`134`		`- if (Grenadier.grenadier != null && ((localPlayer.isImpostor() && Grenadier.indicatorsMode)`
`135`		`- \|\| localPlayer == Grenadier.grenadier \|\| shouldShowGhostInfo()))`
	`134`	`+ if (Grenadier.Player != null && ((localPlayer.isImpostor() && Grenadier.indicatorsMode)`
	`135`	`+ \|\| localPlayer == Grenadier.Player \|\| shouldShowGhostInfo()))`
`136`	`136`	`{`
`137`	`137`	`foreach (var p in Grenadier.controls)`
`138`	`138`	`{`