🚧 Managed to get object and agent hits working

Author: Chasmical

RogueLibs v3.sln.DotSettings

@@ -18,6 +18,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hitbox/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hookable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hypnotizer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=impactful/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Interactable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jugularious/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Knockback/@EntryIndexedValue">True</s:Boolean>

RogueLibsCore.Test/Tests/Weapons/Knocker.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
-namespace RogueLibsCore.Test
+namespace RogueLibsCore.Test
 {
     public class Knocker : CustomWeaponMelee
     {
@@ -34,7 +27,7 @@ public override MeleeAttackInfo StartAttack()
             TestPlugin.Log.LogWarning("StartAttack");
             return new MeleeAttackInfo(MeleeAttackType.Swing, MeleeHands.Both)
             {
-				Speed = 4f,
+                Speed = 4f,
                 CanBackstab = false,
                 KnockForce = 0f,
             };
@@ -45,7 +38,8 @@ public override void EndAttack()
         }
         public override void Hit(MeleeHitArgs e)
         {
-
+            TestPlugin.Log.LogWarning("Hit");
+            e.KnockbackStrength *= 5f;
         }
 
     }

RogueLibsCore/Hooks/Items/Weapons/MeleeHitArgs.cs

@@ -7,10 +7,12 @@ namespace RogueLibsCore
     /// </summary>
     public sealed class MeleeHitArgs
     {
-        internal MeleeHitArgs(GameObject gameObject, PlayfieldObject target)
+        internal MeleeHitArgs(MeleePreHitArgs e)
         {
-            GameObject = gameObject;
-            Target = target;
+            GameObject = e.GameObject;
+            Target = e.Target;
+            IsFirstHit = e.IsFirstHit;
+            FromClient = e.FromClient;
         }
 
         /// <summary>
@@ -22,30 +24,40 @@ internal MeleeHitArgs(GameObject gameObject, PlayfieldObject target)
         /// </summary>
         public PlayfieldObject Target { get; }
 
+        public int DamageDealt { get; internal set; }
+
         // Visuals and sounds
         /// <summary>
         ///   <para>Gets or sets whether to highlight the hit object for just a moment.</para>
         /// </summary>
         public bool DoFlash { get; set; }
+        public string? Particles { get; set; }
+        public Vector2 ParticlesPosition { get; set; }
+        public float ParticlesAngle { get; set; }
+
         /// <summary>
         ///   <para>Gets or sets the sound that the hit should make.</para>
         /// </summary>
         public string? HitSound { get; set; }
-        public string? Particles { get; set; }
+        public Vector2 HitSoundPosition { get; set; }
         public float NoiseVolume { get; set; }
+        public Vector2 NoisePosition { get; set; }
 
         // Input response
         public float ScreenShakeTime { get; set; }
         public float ScreenShakeOffset { get; set; }
+        public float VibrateControllerIntensity { get; set; }
+        public float VibrateControllerTime { get; set; }
         public int FreezeFrames { get; set; }
-        public float VibrateController { get; set; }
+        public bool AlienFX { get; set; }
 
         // Knockback
         public Vector2 KnockbackDirection { get; set; }
         public float KnockbackStrength { get; set; }
         public Vector2 RecoilDirection { get; set; }
         public float RecoilStrength { get; set; }
 
+        public bool DoOwnCheck { get; set; }
         public float AICombatCooldown { get; set; }
 
         public int DepleteAmount { get; set; }
@@ -60,6 +72,7 @@ internal MeleeHitArgs(GameObject gameObject, PlayfieldObject target)
         ///   <para>Determines whether this hit was the first one on this object (used with <see cref="CanHitAgain"/>).</para>
         /// </summary>
         public bool IsFirstHit { get; }
+        public bool FromClient { get; }
 
         /// <summary>
         ///   <para>Prevents any default behaviour of the melee weapon hit.</para>
@@ -69,17 +82,18 @@ public void PreventDefault()
             IsDefaultPrevented = true;
 
             DoFlash = false;
-            HitSound = null;
             Particles = null;
+            HitSound = null;
             NoiseVolume = 0f;
 
-            ScreenShakeTime = 0f;
             ScreenShakeOffset = 0f;
+            VibrateControllerIntensity = 0f;
             FreezeFrames = 0;
-            VibrateController = 0f;
+            AlienFX = false;
 
             KnockbackStrength = 0f;
             RecoilStrength = 0f;
+            DoOwnCheck = false;
             AICombatCooldown = 0f;
             DepleteAmount = 0;
         }
@@ -89,13 +103,15 @@ public void PreventDefault()
     public sealed class MeleePreHitArgs
     {
         internal MeleePreHitArgs(GameObject gameObject, PlayfieldObject target,
-                              GameObject originalGameObject, PlayfieldObject originalTarget, bool isFirstHit)
+                              GameObject originalGameObject, PlayfieldObject originalTarget,
+                              bool isFirstHit, bool fromClient)
         {
             GameObject = gameObject;
             Target = target;
             OriginalGameObject = originalGameObject;
             OriginalTarget = originalTarget;
             IsFirstHit = isFirstHit;
+            FromClient = fromClient;
         }
 
         /// <summary>
@@ -116,12 +132,11 @@ internal MeleePreHitArgs(GameObject gameObject, PlayfieldObject target,
         public bool IgnoreLineOfSight { get; set; }
         public bool IgnoreAlignedCheck { get; set; }
 
-
-
         /// <summary>
         ///   <para>Determines whether this hit was the first one on this object (used with <see cref="CanHitAgain"/>).</para>
         /// </summary>
         public bool IsFirstHit { get; }
+        public bool FromClient { get; }
 
         /// <summary>
         ///   <para>Prevents any default behaviour of the melee weapon.</para>