役職用RPCをCustomRoleSyncに一本化

Modules/RPC.cs

@@ -19,24 +19,10 @@ public enum CustomRPC
         EndGame,
         PlaySound,
         SetCustomRole,
-        SetBountyTarget,
-        WitchSync,
-        SetSheriffShotLimit,
-        SetDousedPlayer,
         SetNameColorData,
-        SniperSync,
         SetLoversPlayers,
-        SetExecutionerTarget,
-        SetCurrentDousingTarget,
-        SetEvilTrackerTarget,
         SetRealKiller,
-        SyncPuppet,
-        SetSchrodingerCatTeam,
-        StealthDarken,
-        EvilHackerCreateMurderNotify,
-        PenguinSync,
-        MareSync,
-        SyncPlagueDoctor,
+        CustomRoleSync,
     }
     public enum Sounds
     {
@@ -153,8 +139,8 @@ public static void Postfix(PlayerControl __instance, [HarmonyArgument(0)] byte c
                     byte killerId = reader.ReadByte();
                     RPC.SetRealKiller(targetId, killerId);
                     break;
-                default:
-                    CustomRoleManager.DispatchRpc(reader, rpcType);
+                case CustomRPC.CustomRoleSync:
+                    CustomRoleManager.DispatchRpc(reader);
                     break;
             }
         }

Roles/Core/CustomRoleManager.cs

@@ -237,11 +237,10 @@ public static void OtherRolesAdd(PlayerControl pc)
     /// 受信したRPCから送信先を読み取ってRoleClassに配信する
     /// </summary>
     /// <param name="reader"></param>
-    /// <param name="rpcType"></param>
-    public static void DispatchRpc(MessageReader reader, CustomRPC rpcType)
+    public static void DispatchRpc(MessageReader reader)
     {
         var playerId = reader.ReadByte();
-        GetByPlayerId(playerId)?.ReceiveRPC(reader, rpcType);
+        GetByPlayerId(playerId)?.ReceiveRPC(reader);
     }
     //NameSystem
     public static HashSet<Func<PlayerControl, PlayerControl, bool, string>> MarkOthers = new();

Roles/Core/RoleBase.cs

@@ -86,9 +86,9 @@ public virtual void OnDestroy()
     protected class RoleRPCSender : IDisposable
     {
         public MessageWriter Writer;
-        public RoleRPCSender(RoleBase role, CustomRPC rpcType)
+        public RoleRPCSender(RoleBase role)
         {
-            Writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)rpcType, SendOption.Reliable, -1);
+            Writer = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.NetId, (byte)CustomRPC.CustomRoleSync, SendOption.Reliable, -1);
             Writer.Write(role.Player.PlayerId);
         }
         public void Dispose()
@@ -102,17 +102,16 @@ public void Dispose()
     /// </summary>
     /// <param name="rpcType">送信するCustomRPC</param>
     /// <returns>送信に使用するRoleRPCSender</returns>
-    protected RoleRPCSender CreateSender(CustomRPC rpcType)
+    protected RoleRPCSender CreateSender()
     {
-        return new RoleRPCSender(this, rpcType);
+        return new RoleRPCSender(this);
     }
     /// <summary>
     /// RPCを受け取った時に呼ばれる関数
     /// RoleRPCSenderで送信されたPlayerIdは削除されて渡されるため意識しなくてもよい。
     /// </summary>
     /// <param name="reader">届いたRPCの情報</param>
-    /// <param name="rpcType">届いたCustomRPC</param>
-    public virtual void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public virtual void ReceiveRPC(MessageReader reader)
     { }
     /// <summary>
     /// 能力ボタンを使えるかどうか

Roles/Crewmate/Sheriff.cs

@@ -122,13 +122,11 @@ public override void Add()
     }
     private void SendRPC()
     {
-        using var sender = CreateSender(CustomRPC.SetSheriffShotLimit);
+        using var sender = CreateSender();
         sender.Writer.Write(ShotLimit);
     }
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType != CustomRPC.SetSheriffShotLimit) return;
-
         ShotLimit = reader.ReadInt32();
     }
     public float CalculateKillCooldown() => CanUseKillButton() ? CurrentKillCooldown : 0f;

Roles/Impostor/BountyHunter.cs

@@ -75,14 +75,12 @@ public override void Add()
     }
     private void SendRPC(byte targetId)
     {
-        using var sender = CreateSender(CustomRPC.SetBountyTarget);
+        using var sender = CreateSender();
         sender.Writer.Write(targetId);
     }
 
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType != CustomRPC.SetBountyTarget) return;
-
         byte targetId = reader.ReadByte();
 
         Target = Utils.GetPlayerById(targetId);

Roles/Impostor/EvilHacker.cs

@@ -144,16 +144,13 @@ private void RpcCreateMurderNotify(SystemTypes room)
         CreateMurderNotify(room);
         if (AmongUsClient.Instance.AmHost)
         {
-            using var sender = CreateSender(CustomRPC.EvilHackerCreateMurderNotify);
+            using var sender = CreateSender();
             sender.Writer.Write((byte)room);
         }
     }
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType == CustomRPC.EvilHackerCreateMurderNotify)
-        {
-            CreateMurderNotify((SystemTypes)reader.ReadByte());
-        }
+        CreateMurderNotify((SystemTypes)reader.ReadByte());
     }
     /// <summary>
     /// 名前の下にキル発生通知を出す

Roles/Impostor/EvilTracker.cs

@@ -122,10 +122,8 @@ public bool CheckKillFlash(MurderInfo info) // IKillFlashSeeable
     }
     public bool CanMakeSidekick() => CanCreateMadmate; // ISidekickable
 
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType != CustomRPC.SetEvilTrackerTarget) return;
-
         var operation = (TargetOperation)reader.ReadByte();
 
         switch (operation)
@@ -141,7 +139,7 @@ private void ReEnableTargeting()
         CanSetTarget = true;
         if (AmongUsClient.Instance.AmHost)
         {
-            using var sender = CreateSender(CustomRPC.SetEvilTrackerTarget);
+            using var sender = CreateSender();
             sender.Writer.Write((byte)TargetOperation.ReEnableTargeting);
         }
     }
@@ -150,7 +148,7 @@ private void RemoveTarget()
         TargetId = byte.MaxValue;
         if (AmongUsClient.Instance.AmHost)
         {
-            using var sender = CreateSender(CustomRPC.SetEvilTrackerTarget);
+            using var sender = CreateSender();
             sender.Writer.Write((byte)TargetOperation.RemoveTarget);
         }
     }
@@ -164,7 +162,7 @@ private void SetTarget(byte targetId)
         TargetArrow.Add(Player.PlayerId, targetId);
         if (AmongUsClient.Instance.AmHost)
         {
-            using var sender = CreateSender(CustomRPC.SetEvilTrackerTarget);
+            using var sender = CreateSender();
             sender.Writer.Write((byte)TargetOperation.SetTarget);
             sender.Writer.Write(targetId);
         }

Roles/Impostor/Mare.cs

@@ -83,13 +83,11 @@ private void ActivateKill(bool activate)
     }
     public void SendRPC()
     {
-        using var sender = CreateSender(CustomRPC.MareSync);
+        using var sender = CreateSender();
         sender.Writer.Write(IsActivateKill);
     }
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType != CustomRPC.MareSync) return;
-
         IsActivateKill = reader.ReadBoolean();
     }
 

Roles/Impostor/Penguin.cs

@@ -63,15 +63,13 @@ public override void Add()
     public override void ApplyGameOptions(IGameOptions opt) => AURoleOptions.ShapeshifterCooldown = AbductVictim != null ? AbductTimer : 255f;
     private void SendRPC()
     {
-        using var sender = CreateSender(CustomRPC.PenguinSync);
+        using var sender = CreateSender();
 
         sender.Writer.Write(AbductVictim?.PlayerId ?? 255);
     }
 
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType != CustomRPC.PenguinSync) return;
-
         var victim = reader.ReadByte();
         if (victim == 255)
         {

Roles/Impostor/Puppeteer.cs

@@ -42,15 +42,13 @@ public override void OnDestroy()
 
     private void SendRPC(byte targetId, byte typeId)
     {
-        using var sender = CreateSender(CustomRPC.SyncPuppet);
+        using var sender = CreateSender();
 
         sender.Writer.Write(typeId);
         sender.Writer.Write(targetId);
     }
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType != CustomRPC.SyncPuppet) return;
-
         var typeId = reader.ReadByte();
         var targetId = reader.ReadByte();
 

Roles/Impostor/Sniper.cs

@@ -91,7 +91,7 @@ public override void Add()
     private void SendRPC()
     {
         Logger.Info($"{Player.GetNameWithRole()}:SendRPC", "Sniper");
-        using var sender = CreateSender(CustomRPC.SniperSync);
+        using var sender = CreateSender();
 
         var snList = ShotNotify;
         sender.Writer.Write(snList.Count);
@@ -101,9 +101,8 @@ private void SendRPC()
         }
     }
 
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType != CustomRPC.SniperSync) return;
         ShotNotify.Clear();
         var count = reader.ReadInt32();
         while (count > 0)

Roles/Impostor/Stealth.cs

@@ -121,16 +121,13 @@ private void RpcDarken(SystemTypes? roomType)
     {
         logger.Info($"暗転させている部屋を{roomType?.ToString() ?? "null"}に設定");
         darkenedRoom = roomType;
-        using var sender = CreateSender(CustomRPC.StealthDarken);
+        using var sender = CreateSender();
         sender.Writer.Write((byte?)roomType ?? byte.MaxValue);
     }
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType == CustomRPC.StealthDarken)
-        {
-            var roomId = reader.ReadByte();
-            darkenedRoom = roomId == byte.MaxValue ? null : (SystemTypes)roomId;
-        }
+        var roomId = reader.ReadByte();
+        darkenedRoom = roomId == byte.MaxValue ? null : (SystemTypes)roomId;
     }
     /// <summary>発生している暗転効果を解除</summary>
     private void ResetDarkenState()

Roles/Impostor/Witch.cs

@@ -68,7 +68,7 @@ public override void Add()
         }
         private void SendRPC(bool doSpell, byte target = 255)
         {
-            using var sender = CreateSender(CustomRPC.WitchSync);
+            using var sender = CreateSender();
             sender.Writer.Write(doSpell);
             if (doSpell)
             {
@@ -80,10 +80,8 @@ private void SendRPC(bool doSpell, byte target = 255)
             }
         }
 
-        public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+        public override void ReceiveRPC(MessageReader reader)
         {
-            if (rpcType != CustomRPC.WitchSync) return;
-
             var doSpel = reader.ReadBoolean();
             if (doSpel)
             {

Roles/Neutral/Arsonist.cs

@@ -86,24 +86,30 @@ public override void ApplyGameOptions(IGameOptions opt)
     {
         opt.SetVision(false);
     }
-    public void SendRPC(CustomRPC rpcType, byte targetId = byte.MaxValue, bool isDoused = false)
+    enum RPC_type
     {
-        using var sender = CreateSender(rpcType);
+        SetDousedPlayer,
+        SetCurrentDousingTarget
+    }
+    private void SendRPC(RPC_type rpcType, byte targetId = byte.MaxValue, bool isDoused = false)
+    {
+        using var sender = CreateSender();
         sender.Writer.Write(targetId);
-
-        if (rpcType == CustomRPC.SetDousedPlayer)
+        sender.Writer.Write((byte)rpcType);
+        if (rpcType == RPC_type.SetDousedPlayer)
             sender.Writer.Write(isDoused);
     }
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
         var targetId = reader.ReadByte();
+        var rpcType = (RPC_type)reader.ReadByte();
         switch (rpcType)
         {
-            case CustomRPC.SetDousedPlayer:
+            case RPC_type.SetDousedPlayer:
                 bool doused = reader.ReadBoolean();
                 IsDoused[targetId] = doused;
                 break;
-            case CustomRPC.SetCurrentDousingTarget:
+            case RPC_type.SetCurrentDousingTarget:
                 TargetInfo = new(targetId, 0f);
                 break;
         }
@@ -118,7 +124,7 @@ public void OnCheckMurderAsKiller(MurderInfo info)
         {
             TargetInfo = new(target.PlayerId, 0f);
             Utils.NotifyRoles(SpecifySeer: killer);
-            SendRPC(CustomRPC.SetCurrentDousingTarget, target.PlayerId);
+            SendRPC(RPC_type.SetCurrentDousingTarget, target.PlayerId);
         }
         info.DoKill = false;
     }
@@ -136,7 +142,7 @@ public override void OnFixedUpdate(PlayerControl player)
             {
                 TargetInfo = null;
                 Utils.NotifyRoles(SpecifySeer: Player);
-                SendRPC(CustomRPC.SetCurrentDousingTarget);
+                SendRPC(RPC_type.SetCurrentDousingTarget);
             }
             else
             {
@@ -151,9 +157,9 @@ public override void OnFixedUpdate(PlayerControl player)
                     Player.SetKillCooldown();
                     TargetInfo = null;//塗が完了したのでTupleから削除
                     IsDoused[ar_target.PlayerId] = true;//塗り完了
-                    SendRPC(CustomRPC.SetDousedPlayer, ar_target.PlayerId, true);
+                    SendRPC(RPC_type.SetDousedPlayer, ar_target.PlayerId, true);
                     Utils.NotifyRoles();//名前変更
-                    SendRPC(CustomRPC.SetCurrentDousingTarget);
+                    SendRPC(RPC_type.SetCurrentDousingTarget);
                 }
                 else
                 {
@@ -167,7 +173,7 @@ public override void OnFixedUpdate(PlayerControl player)
                     {
                         TargetInfo = null;
                         Utils.NotifyRoles(SpecifySeer: Player);
-                        SendRPC(CustomRPC.SetCurrentDousingTarget);
+                        SendRPC(RPC_type.SetCurrentDousingTarget);
 
                         Logger.Info($"Canceled: {Player.GetNameWithRole()}", "Arsonist");
                     }

Roles/Neutral/Executioner.cs

@@ -104,10 +104,10 @@ public void SendRPC()
     {
         if (!AmongUsClient.Instance.AmHost) return;
 
-        using var sender = CreateSender(CustomRPC.SetExecutionerTarget);
+        using var sender = CreateSender();
         sender.Writer.Write(TargetId);
     }
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
         byte targetId = reader.ReadByte();
         TargetId = targetId;

Roles/Neutral/PlagueDoctor.cs

@@ -138,14 +138,12 @@ public static bool CanInfect(PlayerControl player)
     }
     public void SendRPC(byte targetId, float rate)
     {
-        using var sender = CreateSender(CustomRPC.SyncPlagueDoctor);
+        using var sender = CreateSender();
         sender.Writer.Write(targetId);
         sender.Writer.Write(rate);
     }
-    public override void ReceiveRPC(MessageReader reader, CustomRPC rpcType)
+    public override void ReceiveRPC(MessageReader reader)
     {
-        if (rpcType != CustomRPC.SyncPlagueDoctor) return;
-
         var targetId = reader.ReadByte();
         var rate = reader.ReadSingle();
         InfectInfos[targetId] = rate;