Merge branch 'development'

Author: jhett12321

CHANGELOG.md

@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 8193.34.8
+https://github.com/nwn-dotnet/Anvil/compare/v8193.34.7...v8193.34.8
+
+### Deprecated
+- `NwObject.Destroy(float delay)` - Use the non-delay overload instead, with the `SchedulerService`.
+
+### Fixed
+- Fixed `NwEncounter.Destroy()` not destroying the encounter object.
+- Fixed `PlaceableEvents.OnPhysicalAttacked` event always returning no data.
+
 ## 8193.34.7
 https://github.com/nwn-dotnet/Anvil/compare/v8193.34.6...v8193.34.7
 

NWN.Anvil.Tests/src/main/API/Object/NwEncounterTests.cs

@@ -32,6 +32,29 @@ public void CreateEncounterIsCreated(string encounterResRef)
       createdTestObjects.Add(encounter);
     }
 
+    [Test(Description = "Creating a encounter and destroying it destroys the encounter.")]
+    [TestCase(StandardResRef.Encounter.x2_beholder001)]
+    [TestCase(StandardResRef.Encounter.x2_golem001)]
+    [TestCase(StandardResRef.Encounter.nw_dragonweak)]
+    [TestCase(StandardResRef.Encounter.x2_lich001)]
+    [TestCase(StandardResRef.Encounter.x2_mindflay001)]
+    [TestCase(StandardResRef.Encounter.nw_mummies)]
+    [TestCase(StandardResRef.Encounter.x2_slaad001)]
+    [TestCase(StandardResRef.Encounter.x2_undead001)]
+    [TestCase(StandardResRef.Encounter.nw_undeadhigh)]
+    [TestCase(StandardResRef.Encounter.x2_beholder001)]
+    public void DestroyEncounterIsDestroyed(string encounterResRef)
+    {
+      Location startLocation = NwModule.Instance.StartingLocation;
+      NwEncounter encounter = NwEncounter.Create(encounterResRef, startLocation);
+
+      Assert.That(encounter, Is.Not.Null, $"Encounter {encounterResRef} was null after creation.");
+      Assert.That(encounter.IsValid, Is.True, $"Encounter {encounterResRef} was invalid after creation.");
+
+      encounter.Destroy();
+      Assert.That(encounter.IsValid, Is.False, $"Encounter {encounterResRef} was still valid after deletion.");
+    }
+
     [TearDown]
     public void CleanupTestObjects()
     {

NWN.Anvil/src/main/API/Events/Game/PlaceableEvents/PlaceableEvents.OnPhysicalAttacked.cs

@@ -15,20 +15,27 @@ public static partial class PlaceableEvents
     [GameEvent(EventScriptType.PlaceableOnMeleeAttacked)]
     public sealed class OnPhysicalAttacked : IEvent
     {
+      public OnPhysicalAttacked()
+      {
+        Placeable = NWScript.OBJECT_SELF.ToNwObject<NwPlaceable>();
+        Attacker = NWScript.GetLastAttacker(Placeable).ToNwObject<NwCreature>();
+        AttackType = (SpecialAttack)NWScript.GetLastAttackType(Attacker);
+      }
+
       /// <summary>
       /// Gets the <see cref="NwCreature"/> that attacked the <see cref="NwPlaceable"/>.
       /// </summary>
-      public NwCreature Attacker { get; } = NWScript.GetLastAttacker().ToNwObject<NwCreature>();
+      public NwCreature Attacker { get; }
 
       /// <summary>
       /// Gets the <see cref="SpecialAttack"/> used to damage <see cref="NwPlaceable"/>.
       /// </summary>
-      public SpecialAttack AttackType { get; } = (SpecialAttack)NWScript.GetLastAttackType();
+      public SpecialAttack AttackType { get; }
 
       /// <summary>
       /// Gets the <see cref="NwPlaceable"/> that was physically attacked.
       /// </summary>
-      public NwPlaceable Placeable { get; } = NWScript.OBJECT_SELF.ToNwObject<NwPlaceable>();
+      public NwPlaceable Placeable { get; }
 
       NwObject IEvent.Context => Placeable;
 

NWN.Anvil/src/main/API/Object/NwEncounter.cs

@@ -251,6 +251,13 @@ public override byte[] Serialize()
       });
     }
 
+    public override void Destroy()
+    {
+      RemoveFromArea();
+      CNWSEncounter encounter = CNWSEncounter.FromPointer(Encounter.Pointer, true);
+      encounter.Dispose();
+    }
+
     internal override void RemoveFromArea()
     {
       Encounter.RemoveFromArea();

NWN.Anvil/src/main/API/Object/NwGameObject.cs

@@ -250,11 +250,20 @@ public void ApplyEffect(EffectDuration durationType, Effect effect, TimeSpan dur
     /// Destroys this object (irrevocably).
     /// </summary>
     /// <param name="delay">Time in seconds until this object should be destroyed.</param>
-    public void Destroy(float delay = 0.0f)
+    [Obsolete("Use the non-delay overload instead, in combination with the scheduler service or async/await.")]
+    public void Destroy(float delay)
     {
       NWScript.DestroyObject(this, delay);
     }
 
+    /// <summary>
+    /// Destroys this object (irrevocably).
+    /// </summary>
+    public virtual void Destroy()
+    {
+      NWScript.DestroyObject(this);
+    }
+
     /// <summary>
     /// Returns the distance to the target.<br/>
     /// If you only need to compare the distance, you can compare the squared distance using <see cref="DistanceSquared"/> to avoid a costly sqrt operation.