Merge branch 'dev' into rc

Author: Doxoh

api/AltV.Net.Example/SampleResource.cs

@@ -22,6 +22,18 @@ public override void OnStart()
             long currentTraceSize = 0;
             AltTrace.OnTraceFileSizeChange += size => { currentTraceSize = size; };
 
+            Alt.OnWeaponDamage += (player, target, weapon, damage, offset, part) =>
+            {
+                //Do Something
+                return "asdsad";
+            };
+
+            Alt.OnWeaponDamage += (player, target, weapon, damage, offset, part) =>
+            {
+                //Do Something
+                return false;
+            };
+
             Alt.OnConsoleCommand += (name, args) =>
             {
                 Console.WriteLine("Command name: " + name);

api/AltV.Net/Alt.Events.cs

@@ -81,6 +81,7 @@ public static event ExplosionDelegate OnExplosion
         /// Alt.OnWeaponDamage += (player, target, weapon, damage, shotOffset, bodyPart) => {
         ///   Console.WriteLine($"{player.Name} got damaged.");
         ///   return true; // return false will cancel the weapon damage event and player won't receive damage.
+        ///   return 5; // return a number will set the new damage
         /// };
         /// </code>
         /// </example>

api/AltV.Net/Alt.RegisterEvents.cs

@@ -327,7 +327,7 @@ public static void RegisterEvents(object target)
                                         {
                                             typeof(IPlayer), typeof(IEntity), typeof(uint), typeof(ushort),
                                             typeof(Position), typeof(BodyPart)
-                                        }, new[] {typeof(uint), typeof(bool)});
+                                        }, new[] {typeof(WeaponDamageResponse)});
                                     if (scriptFunction == null) return;
                                     OnWeaponDamage +=
                                         (player, targetEntity, weapon, damage, shotOffset, damageOffset) =>

api/AltV.Net/Core.Events.cs

@@ -519,13 +519,14 @@ public virtual void OnWeaponDamageEvent(IntPtr eventPointer, IPlayer sourcePlaye
                 {
                     var result = @delegate(sourcePlayer, targetEntity, weapon, damage, shotOffset, bodyPart);
 
-                    if (result is bool and false)
+                    if (result.Cancel)
                     {
                         cancel = true;
                     }
-                    else if (uint.TryParse(result, out uint newDamage))
+
+                    if (result.Damage.HasValue)
                     {
-                        weaponDamage ??= newDamage;
+                        weaponDamage ??= result.Damage.Value;
                     }
                 }
                 catch (TargetInvocationException exception)

api/AltV.Net/Data/WeaponDamageResponse.cs

@@ -0,0 +1,6 @@
+namespace AltV.Net.Data;
+
+public record WeaponDamageResponse(bool Cancel, uint? Damage) {
+    public static implicit operator WeaponDamageResponse(bool val) => new WeaponDamageResponse(val, null);
+    public static implicit operator WeaponDamageResponse(uint val) => new WeaponDamageResponse(false, val);
+};

api/AltV.Net/Events/Events.cs

@@ -59,7 +59,7 @@ public delegate void PlayerHealDelegate(IPlayer target, ushort oldHealth, ushort
     public delegate bool ExplosionDelegate(IPlayer player, ExplosionType explosionType, Position position,
         uint explosionFx, IEntity targetEntity);
 
-    public delegate dynamic WeaponDamageDelegate(IPlayer player, IEntity target, uint weapon, ushort damage,
+    public delegate WeaponDamageResponse WeaponDamageDelegate(IPlayer player, IEntity target, uint weapon, ushort damage,
         Position shotOffset, BodyPart bodyPart);
 
     public delegate void VehicleDestroyDelegate(IVehicle vehicle);