Merge branch 'dev' into game-modes

MiraAPI/Events/Vanilla/Gameplay/AfterMurderEvent.cs

@@ -16,20 +16,76 @@ public class AfterMurderEvent : MiraEvent
     public PlayerControl Target { get; }
 
     /// <summary>
-    /// Gets the <see cref="Target"/>'s <see cref="global::DeadBody"/>, if it exists.
+    /// Gets the <see cref="PlayerControl"/> that was framed, if any.
+    /// </summary>
+    public PlayerControl? Framed { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the murder was done indirectly.
+    /// This is commonly used to prevent the <see cref="Source"/> <see cref="PlayerControl"/> from being killed.
+    /// </summary>
+    public bool IsIndirectAttack { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the murder was able to bypass protective roles or general defense, such as <see cref="GuardianAngelRole"/>.
+    /// </summary>
+    public bool IgnoreDefense { get; }
+
+    /// <summary>
+    /// Gets the <see cref="Target"/>'s <see cref="DeadBody"/>, if it exists.
     /// </summary>
     public DeadBody? DeadBody { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
     /// </summary>
-    /// <param name="source">The killer.</param>
-    /// <param name="target">The killed <see cref="PlayerControl"/>.</param>
-    /// <param name="deadBody">The <paramref name="target"/>'s <see cref="global::DeadBody"/>, if it exists.</param>
+    /// <param name="source">The <see cref="PlayerControl"/> that killed the <paramref name="target"/>.</param>
+    /// <param name="target">The <see cref="PlayerControl"/> that was killed.</param>
+    /// <param name="deadBody">The <paramref name="target"/>'s <see cref="DeadBody"/>, if it exists.</param>
+    /// <param name="isIndirect">Whether the murder was caused indirectly.</param>
+    /// <param name="ignoreDefense">Whether the murder ignored protection.</param>
+    public AfterMurderEvent(PlayerControl source, PlayerControl target, DeadBody? deadBody, bool isIndirect, bool ignoreDefense = false)
+    {
+        Source = source;
+        Target = target;
+        Framed = null;
+        DeadBody = deadBody;
+        IsIndirectAttack = isIndirect;
+        IgnoreDefense = ignoreDefense;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
+    /// </summary>
+    /// <param name="source">The <see cref="PlayerControl"/> that killed the <paramref name="target"/>.</param>
+    /// <param name="target">The <see cref="PlayerControl"/> that was killed.</param>
+    /// <param name="framed">The <see cref="PlayerControl"/> that was framed.</param>
+    /// <param name="deadBody">The <paramref name="target"/>'s <see cref="DeadBody"/>, if it exists.</param>
+    /// <param name="isIndirect">Whether the murder was caused indirectly.</param>
+    /// <param name="ignoreDefense">Whether the murder ignored protection.</param>
+    public AfterMurderEvent(PlayerControl source, PlayerControl target, PlayerControl framed, DeadBody? deadBody, bool isIndirect = true, bool ignoreDefense = false)
+    {
+        Source = source;
+        Target = target;
+        Framed = framed;
+        DeadBody = deadBody;
+        IsIndirectAttack = isIndirect;
+        IgnoreDefense = ignoreDefense;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AfterMurderEvent"/> class.
+    /// </summary>
+    /// <param name="source">The <see cref="PlayerControl"/> that killed the <paramref name="target"/>.</param>
+    /// <param name="target">The <see cref="PlayerControl"/> that was killed.</param>
+    /// <param name="deadBody">The <paramref name="target"/>'s <see cref="DeadBody"/>, if it exists.</param>
     public AfterMurderEvent(PlayerControl source, PlayerControl target, DeadBody? deadBody)
     {
         Source = source;
         Target = target;
+        Framed = null;
         DeadBody = deadBody;
+        IsIndirectAttack = false;
+        IgnoreDefense = false;
     }
 }

MiraAPI/Events/Vanilla/Gameplay/BeforeMurderEvent.cs

@@ -17,11 +17,64 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
     /// </summary>
     public PlayerControl Target { get; }
 
+    /// <summary>
+    /// Gets the <see cref="PlayerControl"/> that is being framed, if any.
+    /// </summary>
+    public PlayerControl? Framed { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the murder is done indirectly.
+    /// This is commonly used to prevent the <see cref="Source"/> <see cref="PlayerControl"/> from being killed.
+    /// </summary>
+    public bool IsIndirectAttack { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the murder should bypass protective roles or general defense, such as <see cref="GuardianAngelRole"/>.
+    /// </summary>
+    public bool IgnoreDefense { get; }
+
     /// <summary>
     /// Gets whether the murder was meant to be done in a meeting, via an enum.
     /// </summary>
     public MeetingCheck InMeeting { get; }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
+    /// </summary>
+    /// <param name="source">The <see cref="PlayerControl"/> that is killing the <paramref name="target"/>.</param>
+    /// <param name="target">The <see cref="PlayerControl"/> that is being killed.</param>
+    /// <param name="isIndirect">Whether the murder is caused indirectly.</param>
+    /// <param name="ignoreDefense">Whether the murder should ignore protection.</param>
+    /// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
+    public BeforeMurderEvent(PlayerControl source, PlayerControl target, bool isIndirect, bool ignoreDefense = false, MeetingCheck inMeeting = MeetingCheck.Ignore)
+    {
+        Source = source;
+        Target = target;
+        Framed = null;
+        IsIndirectAttack = isIndirect;
+        IgnoreDefense = ignoreDefense;
+        InMeeting = inMeeting;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
+    /// </summary>
+    /// <param name="source">The <see cref="PlayerControl"/> that is killing the <paramref name="target"/>.</param>
+    /// <param name="target">The <see cref="PlayerControl"/> that is being killed.</param>
+    /// <param name="framed">The <see cref="PlayerControl"/> that is being framed.</param>
+    /// <param name="isIndirect">Whether the murder is caused indirectly.</param>
+    /// <param name="ignoreDefense">Whether the murder should ignore protection.</param>
+    /// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
+    public BeforeMurderEvent(PlayerControl source, PlayerControl target, PlayerControl framed, bool isIndirect = true, bool ignoreDefense = false, MeetingCheck inMeeting = MeetingCheck.Ignore)
+    {
+        Source = source;
+        Target = target;
+        Framed = framed;
+        IsIndirectAttack = isIndirect;
+        IgnoreDefense = ignoreDefense;
+        InMeeting = inMeeting;
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
     /// </summary>
@@ -32,6 +85,9 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
     {
         Source = source;
         Target = target;
+        Framed = null;
+        IsIndirectAttack = false;
+        IgnoreDefense = false;
         InMeeting = inMeeting;
     }
 
@@ -44,6 +100,9 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
     {
         Source = source;
         Target = target;
+        Framed = null;
+        IsIndirectAttack = false;
+        IgnoreDefense = false;
         InMeeting = MeetingCheck.Ignore;
     }
 }

MiraAPI/Modifiers/ModifierManager.cs

@@ -136,7 +136,10 @@ public static class ModifierManager
             var validPlayers = plrs.Where(x => IsGameModifierValid(x, modifier, modifier.TypeId)).ToList();
             if (validPlayers.Count == 0)
             {
-                Warning($"No valid players for modifier {modifier.ModifierName}");
+                if (MiraApiPlugin.IsDevBuild)
+                {
+                    Warning($"No valid players for modifier {modifier.ModifierName}");
+                }
                 continue;
             }
 
@@ -157,15 +160,23 @@ public static class ModifierManager
 
                 if (candidates.Count == 0)
                 {
-                    Warning(
-                        $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
+                    if (MiraApiPlugin.IsDevBuild)
+                    {
+                        Warning(
+                            $"No available players for modifier {modifier.ModifierName} at assignment {i + 1}");
+                    }
+
                     break;
                 }
 
                 var plr = candidates.Random();
                 if (plr == null)
                 {
-                    Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
+                    if (MiraApiPlugin.IsDevBuild)
+                    {
+                        Warning($"Valid player for modifier {modifier.ModifierName} disappeared");
+                    }
+
                     continue;
                 }