Merge branch 'development'

Author: jhett12321

.devcontainer/devcontainer.json

@@ -14,12 +14,14 @@
       "version": "8.0"
     },
     "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
-      "packages": "curl,unzip,procps,git"
+      "packages": "curl,unzip,procps,git,lldb"
     }
   },
   "appPort": ["5121:5121/udp"],
   "containerEnv": {
     "NWNX_DOTNET_ASSEMBLY": "/workspaces/NWN.Anvil/NWN.Anvil/bin/Debug/net8.0/NWN.Anvil",
     "ANVIL_ADD_PLUGIN_PATHS": "/workspaces/NWN.Anvil/NWN.Anvil.TestRunner/bin/Debug:/workspaces/NWN.Anvil/NWN.Anvil.Tests/bin/Debug"
-  }
+  },
+  "runArgs": ["--privileged"],
+  "onCreateCommand": ["sh", "-c", "dotnet tool install --global dotnet-sos && /root/.dotnet/tools/dotnet-sos install"]
 }

CHANGELOG.md

@@ -3,13 +3,43 @@ 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.37.2
+## Unreleased
+
+### Pending Changes
+https://github.com/nwn-dotnet/Anvil/compare/v8193.37.3...HEAD
+
+## 8193.37.3 (NWN 8193.37-17)
+https://github.com/nwn-dotnet/Anvil/compare/v8193.37.2...v8193.37.3
+
+### Added
+- Events: Added `Spell` property to `OnCreatureDamage` event.
+
+### Package Updates
+- NWNX: 292a2c0 -> 73cf6ab
+- NWN.Core: 8193.37.3 -> 8193.37.4
+- NWN.Native: 8193.37.3 -> 8193.37.4
+- Docker: Ubuntu 20.04 -> Debian 13 (Trixie)
+- Docker: Pinned OpenSSL 1.1.1t
+
+### Changed
+- Improved invalid object detection in some edge cases.
+- Events: Placeable `OnDamaged` event now supports damage sources from non-creatures.
+- NwCreature: `GetFeatRemainingUses`, `GetFeatTotalUses` now matches the behaviour of the NWScript function.
+  - If the feat has unlimited uses, returns int.MaxValue instead of 100.
+- NwSpell: `GetSpellLevelByClass` now matches the behaviour of the NWScript function.
+  - Returns the spell level for the specified class. Returns null if no spell level is defined for the specified class.
+  - `includeMasterSpell` parameter - If true, will use the master spell class level if this spell has no class level configured
+
+### Fixed
+- Fixed an OpenSSL crash when running Anvil/NWNX_DotNET on newer operating systems (Debian 12+, Ubuntu 22.04+)
+
+## 8193.37.2 (NWN 8193.37-15)
 https://github.com/nwn-dotnet/Anvil/compare/v8193.37.1...v8193.37.2
 
 ### Changed
 - Improved invalid object detection in some edge cases.
 
-## 8193.37.1
+## 8193.37.1 (NWN 8193.37-15)
 https://github.com/nwn-dotnet/Anvil/compare/v8193.37.0...v8193.37.1
 
 ### Added

NWN.Anvil.TestRunner/NWN.Anvil.TestRunner.csproj

@@ -63,8 +63,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NWN.Core" Version="8193.37.3" PrivateAssets="compile" />
-    <PackageReference Include="NWN.Native" Version="8193.37.3" PrivateAssets="compile" />
+    <PackageReference Include="NWN.Core" Version="8193.37.4" PrivateAssets="compile" />
+    <PackageReference Include="NWN.Native" Version="8193.37.4" PrivateAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

NWN.Anvil.Tests/NWN.Anvil.Tests.csproj

@@ -45,8 +45,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
-    <PackageReference Include="NWN.Core" Version="8193.37.3" PrivateAssets="compile" />
-    <PackageReference Include="NWN.Native" Version="8193.37.3" PrivateAssets="compile" />
+    <PackageReference Include="NWN.Core" Version="8193.37.4" PrivateAssets="compile" />
+    <PackageReference Include="NWN.Native" Version="8193.37.4" PrivateAssets="compile" />
   </ItemGroup>
 
 </Project>

NWN.Anvil/NWN.Anvil.csproj

@@ -67,8 +67,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.4.0" />
     <PackageReference Include="Paket.Core" Version="8.0.3" PrivateAssets="all" />
-    <PackageReference Include="NWN.Core" Version="8193.37.3" PrivateAssets="compile" />
-    <PackageReference Include="NWN.Native" Version="8193.37.3" PrivateAssets="compile" />
+    <PackageReference Include="NWN.Core" Version="8193.37.4" PrivateAssets="compile" />
+    <PackageReference Include="NWN.Native" Version="8193.37.4" PrivateAssets="compile" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
   </ItemGroup>
 

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

@@ -45,7 +45,7 @@ public OnDamaged()
         uint objSelf = NWScript.OBJECT_SELF;
         DamagedObject = objSelf.ToNwObject<NwPlaceable>()!;
         TotalDamageDealt = NWScript.GetTotalDamageDealt();
-        Damager = NWScript.GetLastDamager(objSelf).ToNwObject<NwCreature>()!;
+        Damager = NWScript.GetLastDamager(objSelf).ToNwObject<NwGameObject>();
       }
     }
   }

NWN.Anvil/src/main/API/Events/Native/DamageEvents/OnCreatureDamage.cs

@@ -12,6 +12,7 @@ public sealed class OnCreatureDamage : IEvent
     public DamageData<int> DamageData { get; private init; } = null!;
     public NwObject DamagedBy { get; private init; } = null!;
     public NwGameObject Target { get; private init; } = null!;
+    public NwSpell? Spell { get; private init; }
 
     NwObject IEvent.Context => DamagedBy;
 
@@ -49,6 +50,7 @@ private static int OnApplyDamage(void* pEffectListHandler, void* pObject, void*
             DamagedBy = effect.m_oidCreator.ToNwObject<NwObject>()!,
             Target = gameObject.ToNwObject<NwGameObject>()!,
             DamageData = new DamageData<int>(effect.m_nParamInteger),
+            Spell = NwSpell.FromSpellId((int)effect.m_nSpellId),
           });
         }
 

NWN.Anvil/src/main/API/Events/Native/ItemEvents/ItemEventHandlerEventFactory.cs

@@ -22,13 +22,19 @@ private static void OnEventHandler(void* pItem, uint nEventId, uint nCallerObjec
     {
       CNWSItem item = CNWSItem.FromPointer(pItem);
 
-      ItemHandlerEvent eventData = nEventId switch
+      ItemHandlerEvent? eventData = nEventId switch
       {
         11 => HandleEvent<OnItemDestroy>(item),
         16 => HandleEvent<OnItemDecrementStackSize>(item),
-        _ => throw new ArgumentOutOfRangeException(nameof(nEventId), nEventId, null),
+        _ => null,
       };
 
+      if (eventData == null)
+      {
+        Hook.CallOriginal(pItem, nEventId, nCallerObjectId, pScript, nCalendarDay, nTimeOfDay);
+        return;
+      }
+
       if (!eventData.Skip)
       {
         Hook.CallOriginal(pItem, nEventId, nCallerObjectId, pScript, nCalendarDay, nTimeOfDay);

NWN.Anvil/src/main/API/Extensions/IntegerExtensions.cs

@@ -155,21 +155,27 @@ public static int ToInt(this bool value)
 
       if (playerSearch.HasFlag(PlayerSearch.Controlled))
       {
-        CNWSPlayer? player = LowLevel.ServerExoApp.GetClientObjectByObjectId(objectId);
+        NwPlayer? player = NwPlayer.CreateInternal(LowLevel.ServerExoApp.GetClientObjectByObjectId(objectId));
         if (player != null)
         {
-          return new NwPlayer(player);
+          return player;
         }
       }
 
       if (playerSearch.HasFlag(PlayerSearch.Login))
       {
         CExoArrayListCNWSPlayerPtr? players = LowLevel.ServerExoApp.m_pcExoAppInternal.m_lstPlayerList;
-        foreach (CNWSPlayer player in players)
+        foreach (CNWSPlayer nwPlayer in players)
         {
-          if (player.m_oidPCObject == objectId)
+          if (nwPlayer == null || nwPlayer.Pointer == IntPtr.Zero || nwPlayer.m_oidPCObject != objectId)
           {
-            return new NwPlayer(player);
+            continue;
+          }
+
+          NwPlayer? player = NwPlayer.CreateInternal(nwPlayer);
+          if (player != null)
+          {
+            return player;
           }
         }
       }

NWN.Anvil/src/main/API/Objects/NwArea.cs

@@ -26,11 +26,16 @@ internal CNWSArea Area
       }
     }
 
-    internal NwArea(CNWSArea area) : base(area)
+    private NwArea(CNWSArea area) : base(area)
     {
       this.area = area;
     }
 
+    internal static NwArea? CreateInternal(CNWSArea? area)
+    {
+      return area != null && area.Pointer != IntPtr.Zero ? new NwArea(area) : null;
+    }
+
     public override bool IsValid => NWNXUtils.AsNWSArea(NWNXUtils.GetGameObject(ObjectId)) == area.Pointer;
 
     /// <summary>