Xmas update

Exiled.API/Features/DamageHandlers/AttackerDamageHandler.cs

@@ -8,6 +8,7 @@
 namespace Exiled.API.Features.DamageHandlers
 {
     using CustomPlayerEffects;
+    using PlayerRoles;
 
     using BaseHandler = PlayerStatsSystem.DamageHandlerBase;
 
@@ -99,7 +100,7 @@ public override void ProcessDamage(Player player)
 
             if ((player != Attacker) && !ForceFullFriendlyFire)
             {
-                if (HitboxIdentity.CheckFriendlyFire(AttackerFootprint.Role, player.Role, true))
+                if (HitboxIdentity.IsEnemy(AttackerFootprint.Role, player.Role))
                     return;
 
                 Damage *= PlayerStatsSystem.AttackerDamageHandler._ffMultiplier;

Exiled.CustomItems/API/Features/CustomGrenade.cs

@@ -94,7 +94,11 @@ public virtual Pickup Throw(Vector3 position, float force, float weight, float f
             NetworkServer.Spawn(thrownProjectile.gameObject);
             thrownProjectile.InfoReceivedHook(default, newInfo);
             if (thrownProjectile.TryGetComponent(out Rigidbody component))
-                throwable.Base.PropelBody(component, throwable.Base.FullThrowSettings.StartTorque, ThrowableNetworkHandler.GetLimitedVelocity(velocity), force, throwable.Base.FullThrowSettings.UpwardsFactor);
+            {
+                Vector3 vector = (throwable.Base.GetCameraVector(throwable.Base.FullThrowSettings.UpwardsFactor) * force) + ThrowableNetworkHandler.GetLimitedVelocity(velocity);
+                throwable.Base.PropelBody(component, throwable.Base.FullThrowSettings.StartTorque, vector);
+            }
+
             thrownProjectile.ServerActivate();
 
             return Pickup.Get(thrownProjectile);

Exiled.Events/EventArgs/Map/ExplodingGrenadeEventArgs.cs

@@ -67,7 +67,7 @@ public ExplodingGrenadeEventArgs(Footprint thrower, Vector3 position, ExplosionG
                         break;
                     case true:
                         {
-                            if (Server.FriendlyFire || thrower.Hub == Server.Host.ReferenceHub || HitboxIdentity.CheckFriendlyFire(thrower.Role, hub.roleManager.CurrentRole.RoleTypeId))
+                            if (Server.FriendlyFire || thrower.Hub == Server.Host.ReferenceHub || HitboxIdentity.IsEnemy(thrower.Role, hub.roleManager.CurrentRole.RoleTypeId))
                             {
                                 if (!TargetsToAffect.Contains(player))
                                     TargetsToAffect.Add(player);

Exiled.Events/Patches/Generic/IndividualFriendlyFire.cs

@@ -89,7 +89,7 @@ public static bool CheckFriendlyFirePlayerRules(Footprint attackerFootprint, Ref
 
             // Return false, no custom friendly fire allowed, default to NW logic for FF. No point in processing if FF is enabled across the board.
             if (Server.FriendlyFire)
-                return HitboxIdentity.CheckFriendlyFire(attackerFootprint.Role, victimHub.roleManager.CurrentRole.RoleTypeId);
+                return HitboxIdentity.IsEnemy(attackerFootprint.Role, victimHub.roleManager.CurrentRole.RoleTypeId);
 
             // always allow damage from Server.Host
             if (attackerFootprint.Hub == Server.Host.ReferenceHub)
@@ -98,7 +98,7 @@ public static bool CheckFriendlyFirePlayerRules(Footprint attackerFootprint, Ref
             // Only check friendlyFire if the FootPrint hasn't changed (Fix for Grenade not dealing damage because it's from a dead player)
             // TODO rework FriendlyFireRule to make it compatible with Footprint
             if (!attackerFootprint.SameLife(new(attackerFootprint.Hub)))
-                return HitboxIdentity.CheckFriendlyFire(attackerFootprint.Role, victimHub.roleManager.CurrentRole.RoleTypeId);
+                return HitboxIdentity.IsEnemy(attackerFootprint.Role, victimHub.roleManager.CurrentRole.RoleTypeId);
 
             if (attackerFootprint.Hub is null || victimHub is null)
             {
@@ -170,14 +170,14 @@ public static bool CheckFriendlyFirePlayerRules(Footprint attackerFootprint, Ref
                 Log.Error($"CheckFriendlyFirePlayerRules failed to handle friendly fire because: {ex}");
             }
 
-            return HitboxIdentity.CheckFriendlyFire(attackerFootprint.Role, victimHub.roleManager.CurrentRole.RoleTypeId);
+            return HitboxIdentity.IsEnemy(attackerFootprint.Role, victimHub.roleManager.CurrentRole.RoleTypeId);
         }
     }
 
     /// <summary>
-    /// Patches <see cref="HitboxIdentity.CheckFriendlyFire(ReferenceHub, ReferenceHub, bool)"/>.
+    /// Patches <see cref="HitboxIdentity.IsEnemy(ReferenceHub, ReferenceHub)"/>.
     /// </summary>
-    [HarmonyPatch(typeof(HitboxIdentity), nameof(HitboxIdentity.CheckFriendlyFire), typeof(ReferenceHub), typeof(ReferenceHub), typeof(bool))]
+    [HarmonyPatch(typeof(HitboxIdentity), nameof(HitboxIdentity.IsEnemy), typeof(ReferenceHub), typeof(ReferenceHub))]
     internal static class HitboxIdentityCheckFriendlyFire
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)

Exiled.Loader/AutoUpdateFiles.cs

@@ -17,6 +17,6 @@ public static class AutoUpdateFiles
         /// <summary>
         /// Gets which SCP: SL version generated Exiled.
         /// </summary>
-        public static readonly Version RequiredSCPSLVersion = new(13, 3, 0, 1);
+        public static readonly Version RequiredSCPSLVersion = new(13, 4, 0, 0);
     }
 }

docs/docs/Resources/Intro.md

@@ -1,3 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
 ---
 sidebar_position: 1
 ---
@@ -62,6 +75,9 @@ sidebar_position: 1
 | 21  | Overwatch      | Dead             | None             | Draw            |
 | 22  | Filmmaker      | Dead             | None             | Draw            |
 | 23  | Scp3114        | SCPs             | Scp              | Anomalies       |
+| 24  | Flamingo       | Dead             | None             | Draw            |
+| 25  | AlphaFlamingo  | Dead             | None             | Draw            |
+| 26  | ZombieFlamingo | Dead             | None             | Draw            |
 ```
 
 </details>
@@ -127,6 +143,10 @@ sidebar_position: 1
 [52] GunFRMG0 
 [53] GunA7 
 [54] Lantern 
+[55] Snowball 
+[56] Coal 
+[57] SpecialCoal 
+[58] Tape 
 ```
 
 </details>