Lint Cleanup (#853)

jhett12321 · web-flow · commit 3cb5e2d3a76d · 2025-12-27T03:02:15.000+01:00
* Update namespaces.

* Cleanup redundant null suppression/declaration operators.

* Cleanup redundant namespace.

* Fix misc lint errors.

* Configure async inspections.
diff --git a/NWN.Anvil.Samples/src/main/API/Async/NwTaskExamples.cs b/NWN.Anvil.Samples/src/main/API/Async/NwTaskExamples.cs
@@ -9,7 +9,7 @@
 using Anvil.API;
 using Anvil.Services;
 
-namespace NWN.Anvil.Samples.Async
+namespace NWN.Anvil.Samples.API.Async
 {
   [ServiceBinding(typeof(NwTaskExamples))]
   public class NwTaskExamples
diff --git a/NWN.Anvil.Samples/src/main/API/EngineStructures/CassowaryExamples.cs b/NWN.Anvil.Samples/src/main/API/EngineStructures/CassowaryExamples.cs
@@ -6,7 +6,7 @@
 using Anvil.Services;
 using NLog;
 
-namespace NWN.Anvil.Samples.EngineStructures
+namespace NWN.Anvil.Samples.API.EngineStructures
 {
   [ServiceBinding(typeof(CassowaryExamples))]
   public class CassowaryExamples
diff --git a/NWN.Anvil.Samples/src/main/API/EngineStructures/EffectExamples.cs b/NWN.Anvil.Samples/src/main/API/EngineStructures/EffectExamples.cs
@@ -4,11 +4,12 @@
 
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using Anvil.API;
 using Anvil.API.Events;
 using Anvil.Services;
 
-namespace NWN.Anvil.Samples.EngineStructures
+namespace NWN.Anvil.Samples.API.EngineStructures
 {
   [ServiceBinding(typeof(EffectExamples))]
   public class EffectExamples
@@ -23,7 +24,7 @@ public EffectExamples()
       blindnessEffect.SubType = EffectSubType.Supernatural;
 
       // Register methods to listen for the player/client enter event.
-      NwModule.Instance.OnClientEnter += RatSummonExample;
+      NwModule.Instance.OnClientEnter += eventData => _ = RatSummonExample(eventData);
 
       // When entering a specific area, remove all blindness effects:
       NwArea? area = NwObject.FindObjectsWithTag<NwArea>("clear_blind").FirstOrDefault();
@@ -40,7 +41,7 @@ public EffectExamples()
     /// <summary>
     /// Spawns a rat creature summon at the module spawn location when a player connects.
     /// </summary>
-    private async void RatSummonExample(ModuleEvents.OnClientEnter eventData)
+    private async Task RatSummonExample(ModuleEvents.OnClientEnter eventData)
     {
       // Create the summon effect.
       // Some effects require a "caster" for the effect, and must be made within the caster's context.
diff --git a/NWN.Anvil.Samples/src/main/API/EngineStructures/ItemPropertyExamples.cs b/NWN.Anvil.Samples/src/main/API/EngineStructures/ItemPropertyExamples.cs
@@ -6,7 +6,7 @@
 using Anvil.API.Events;
 using Anvil.Services;
 
-namespace NWN.Anvil.Samples.EngineStructures
+namespace NWN.Anvil.Samples.API.EngineStructures
 {
   [ServiceBinding(typeof(ItemPropertyExamples))]
   public class ItemPropertyExamples
diff --git a/NWN.Anvil.Tests/src/main/API/EngineStructures/ItemPropertyTests.cs b/NWN.Anvil.Tests/src/main/API/EngineStructures/ItemPropertyTests.cs
@@ -112,9 +112,9 @@ public sealed class AcBonusVsDamageTypeTest : ItemPropertyTest
 
     public sealed class AcBonusVsRaceTest : ItemPropertyTest
     {
-      protected override ItemProperty ItemProperty => ItemProperty.ACBonusVsRace(NwRace.FromRacialType(RacialType.Outsider)!, 3);
+      protected override ItemProperty ItemProperty => ItemProperty.ACBonusVsRace(NwRace.FromRacialType(RacialType.Outsider), 3);
       protected override ItemPropertyType PropertyType => ItemPropertyType.AcBonusVsRacialGroup;
-      protected override int SubType => NwRace.FromRacialType(RacialType.Outsider)!.Id;
+      protected override int SubType => NwRace.FromRacialType(RacialType.Outsider).Id;
       protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(2);
       protected override int CostTableValue => 3;
     }
@@ -163,9 +163,9 @@ public sealed class AttackBonusVsAlignmentGroupTest : ItemPropertyTest
 
     public sealed class AttackBonusVsRaceTest : ItemPropertyTest
     {
-      protected override ItemProperty ItemProperty => ItemProperty.AttackBonusVsRace(NwRace.FromRacialType(RacialType.Halfling)!, 9);
+      protected override ItemProperty ItemProperty => ItemProperty.AttackBonusVsRace(NwRace.FromRacialType(RacialType.Halfling), 9);
       protected override ItemPropertyType PropertyType => ItemPropertyType.AttackBonusVsRacialGroup;
-      protected override int SubType => NwRace.FromRacialType(RacialType.Halfling)!.Id;
+      protected override int SubType => NwRace.FromRacialType(RacialType.Halfling).Id;
       protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(2);
       protected override int CostTableValue => 9;
     }
@@ -268,9 +268,9 @@ public sealed class DamageBonusVsAlignmentGroupTest : ItemPropertyTest
 
     public sealed class DamageBonusVsRaceTest : ItemPropertyTest
     {
-      protected override ItemProperty ItemProperty => ItemProperty.DamageBonusVsRace(NwRace.FromRacialType(RacialType.Elemental)!, IPDamageType.Bludgeoning, IPDamageBonus.Plus2d6);
+      protected override ItemProperty ItemProperty => ItemProperty.DamageBonusVsRace(NwRace.FromRacialType(RacialType.Elemental), IPDamageType.Bludgeoning, IPDamageBonus.Plus2d6);
       protected override ItemPropertyType PropertyType => ItemPropertyType.DamageBonusVsRacialGroup;
-      protected override int SubType => NwRace.FromRacialType(RacialType.Elemental)!.Id;
+      protected override int SubType => NwRace.FromRacialType(RacialType.Elemental).Id;
       protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(4);
       protected override int CostTableValue => (int)IPDamageBonus.Plus2d6;
       protected override int Param1TableValue => (int)IPDamageType.Bludgeoning;
@@ -357,9 +357,9 @@ public sealed class DecreaseACTest : ItemPropertyTest
 
     public sealed class DecreaseSkillTest : ItemPropertyTest
     {
-      protected override ItemProperty ItemProperty => ItemProperty.DecreaseSkill(NwSkill.FromSkillType(Skill.Discipline)!, 5);
+      protected override ItemProperty ItemProperty => ItemProperty.DecreaseSkill(NwSkill.FromSkillType(Skill.Discipline), 5);
       protected override ItemPropertyType PropertyType => ItemPropertyType.DecreasedSkillModifier;
-      protected override int SubType => NwSkill.FromSkillType(Skill.Discipline)!.Id;
+      protected override int SubType => NwSkill.FromSkillType(Skill.Discipline).Id;
       protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(21);
       protected override int CostTableValue => 5;
     }
@@ -383,9 +383,9 @@ public sealed class EnhancementBonusVsAlignmentGroupTest : ItemPropertyTest
 
     public sealed class EnhancementBonusVsRaceTest : ItemPropertyTest
     {
-      protected override ItemProperty ItemProperty => ItemProperty.EnhancementBonusVsRace(NwRace.FromRacialType(RacialType.Dragon)!, 2);
+      protected override ItemProperty ItemProperty => ItemProperty.EnhancementBonusVsRace(NwRace.FromRacialType(RacialType.Dragon), 2);
       protected override ItemPropertyType PropertyType => ItemPropertyType.EnhancementBonusVsRacialGroup;
-      protected override int SubType => NwRace.FromRacialType(RacialType.Dragon)!.Id;
+      protected override int SubType => NwRace.FromRacialType(RacialType.Dragon).Id;
       protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(2);
       protected override int CostTableValue => 2;
     }
@@ -501,17 +501,17 @@ public sealed class LimitUseByAlignTest : ItemPropertyTest
 
     public sealed class LimitUseByClassTest : ItemPropertyTest
     {
-      protected override ItemProperty ItemProperty => ItemProperty.LimitUseByClass(NwClass.FromClassType(ClassType.Bard)!);
+      protected override ItemProperty ItemProperty => ItemProperty.LimitUseByClass(NwClass.FromClassType(ClassType.Bard));
       protected override ItemPropertyType PropertyType => ItemPropertyType.UseLimitationClass;
-      protected override int SubType => NwClass.FromClassType(ClassType.Bard)!.Id;
+      protected override int SubType => NwClass.FromClassType(ClassType.Bard).Id;
       protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(0);
     }
 
     public sealed class LimitUseByRaceTest : ItemPropertyTest
     {
-      protected override ItemProperty ItemProperty => ItemProperty.LimitUseByRace(NwRace.FromRacialType(RacialType.Undead)!);
+      protected override ItemProperty ItemProperty => ItemProperty.LimitUseByRace(NwRace.FromRacialType(RacialType.Undead));
       protected override ItemPropertyType PropertyType => ItemPropertyType.UseLimitationRacialType;
-      protected override int SubType => NwRace.FromRacialType(RacialType.Undead)!.Id;
+      protected override int SubType => NwRace.FromRacialType(RacialType.Undead).Id;
       protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(0);
     }
 
@@ -625,9 +625,9 @@ public sealed class RegenerationTest : ItemPropertyTest
 
     public sealed class SkillBonusTest : ItemPropertyTest
     {
-      protected override ItemProperty ItemProperty => ItemProperty.SkillBonus(NwSkill.FromSkillType(Skill.Persuade)!, 9);
+      protected override ItemProperty ItemProperty => ItemProperty.SkillBonus(NwSkill.FromSkillType(Skill.Persuade), 9);
       protected override ItemPropertyType PropertyType => ItemPropertyType.SkillBonus;
-      protected override int SubType => NwSkill.FromSkillType(Skill.Persuade)!.Id;
+      protected override int SubType => NwSkill.FromSkillType(Skill.Persuade).Id;
       protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(25);
       protected override int CostTableValue => 9;
     }
diff --git a/NWN.Anvil.Tests/src/main/API/EngineStructures/TalentTests.cs b/NWN.Anvil.Tests/src/main/API/EngineStructures/TalentTests.cs
@@ -9,7 +9,7 @@ public class TalentTests
     [Test(Description = "Creating a talent and disposing the talent explicitly frees the associated memory.")]
     public void CreateAndDisposeTalentFreesNativeStructure()
     {
-      Talent talent = NwSkill.FromSkillType(Skill.Intimidate)!.ToTalent();
+      Talent talent = NwSkill.FromSkillType(Skill.Intimidate).ToTalent();
       Assert.That(talent.IsValid, Is.True, "Talent was not valid after creation.");
       talent.Dispose();
       Assert.That(talent.IsValid, Is.False, "Talent was still valid after disposing.");
diff --git a/NWN.Anvil.Tests/src/main/API/Objects/NwCreatureTests.cs b/NWN.Anvil.Tests/src/main/API/Objects/NwCreatureTests.cs
@@ -217,8 +217,8 @@ public void GetFeatRemainingUsesReturnsValidValue()
 
       createdTestObjects.Add(creature);
 
-      NwFeat? feat = NwFeat.FromFeatType(Feat.BarbarianRage);
-      Assert.That(creature.GetFeatRemainingUses(feat!), Is.EqualTo(1));
+      NwFeat feat = NwFeat.FromFeatType(Feat.BarbarianRage);
+      Assert.That(creature.GetFeatRemainingUses(feat), Is.EqualTo(1));
     }
 
     [Test(Description = "Querying total feat uses returns a valid value.")]
@@ -232,10 +232,10 @@ public void GetFeatTotalUsesReturnsValidValue()
 
       createdTestObjects.Add(creature);
 
-      NwFeat? feat = NwFeat.FromFeatType(Feat.BarbarianRage);
+      NwFeat feat = NwFeat.FromFeatType(Feat.BarbarianRage);
 
       Assert.That(feat, Is.Not.Null, "Could not get feat.");
-      Assert.That(creature.GetFeatTotalUses(feat!), Is.EqualTo(1));
+      Assert.That(creature.GetFeatTotalUses(feat), Is.EqualTo(1));
     }
 
     [Test(Description = "Setting remaining feat uses correctly updates the creature.")]
@@ -251,14 +251,14 @@ public void SetFeatRemainingUsesCorrectlyUpdatesState(byte uses)
       Assert.That(creature!.IsValid, Is.True, "Creature was invalid after creation.");
 
       createdTestObjects.Add(creature);
-      NwFeat? feat = NwFeat.FromFeatType(Feat.BarbarianRage);
+      NwFeat feat = NwFeat.FromFeatType(Feat.BarbarianRage);
 
       Assert.That(feat, Is.Not.Null, "Could not get feat.");
 
-      creature.SetFeatRemainingUses(feat!, uses);
+      creature.SetFeatRemainingUses(feat, uses);
 
-      Assert.That(creature.GetFeatRemainingUses(feat!), Is.EqualTo(Math.Min(uses, creature.GetFeatTotalUses(feat!))), "Remaining feat uses was not updated after being set.");
-      Assert.That(creature.HasFeatPrepared(feat!), Is.EqualTo(uses > 0), "Creature incorrectly assumes the feat is/is not available.");
+      Assert.That(creature.GetFeatRemainingUses(feat), Is.EqualTo(Math.Min(uses, creature.GetFeatTotalUses(feat))), "Remaining feat uses was not updated after being set.");
+      Assert.That(creature.HasFeatPrepared(feat), Is.EqualTo(uses > 0), "Creature incorrectly assumes the feat is/is not available.");
     }
 
     [TestCase(ClassType.Barbarian, 1)]
@@ -290,7 +290,7 @@ public void LevelUpCreatureUpdatesStats(ClassType classType, int levels)
     {
       Location startLocation = NwModule.Instance.StartingLocation;
       NwCreature? creature = NwCreature.Create(StandardResRef.Creature.nw_bandit002, startLocation);
-      NwClass? nwClass = NwClass.FromClassType(classType);
+      NwClass nwClass = NwClass.FromClassType(classType);
 
       Assert.That(creature, Is.Not.Null, "Creature was null after creation.");
       Assert.That(nwClass, Is.Not.Null, "Class was null after creation.");
@@ -305,7 +305,7 @@ public void LevelUpCreatureUpdatesStats(ClassType classType, int levels)
         classLevels = classInfoBefore.Level;
       }
 
-      creature.LevelUp(nwClass!, levels);
+      creature.LevelUp(nwClass, levels);
 
       CreatureClassInfo? classInfo = creature.GetClassInfo(nwClass);
       Assert.That(classInfo, Is.Not.Null, "Creature did not have class after level up.");
diff --git a/NWN.Anvil.sln.DotSettings b/NWN.Anvil.sln.DotSettings
@@ -23,6 +23,13 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTrailingCommaInSinglelineLists/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AsyncIteratorInvocationWithoutAwaitForeach/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AsyncIteratorInvocationWithoutAwaitForeach/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AsyncVoidEventHandlerMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AsyncVoidLambda/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AsyncVoidLambda/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AsyncVoidMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AsyncVoidThrowException/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -84,6 +91,8 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberHidesStaticFromOuterClass/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeIntoPattern/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
@@ -121,6 +130,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseConfigureAwaitFalseForAsyncDisposable/@EntryIndexedValue">WARNING</s:String>
+	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableHidesOuterVariable/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
diff --git a/NWN.Anvil/src/main/API/Events/Native/CombatEvents/OnDisarmWeapon.cs b/NWN.Anvil/src/main/API/Events/Native/CombatEvents/OnDisarmWeapon.cs
@@ -41,7 +41,7 @@ private static int OnApplyDisarm(void* pEffectHandler, void* pObject, void* pEff
         {
           DisarmedObject = gameObject.ToNwObject<NwGameObject>()!,
           DisarmedBy = gameEffect.m_oidCreator.ToNwObject<NwGameObject>()!,
-          Feat = gameEffect.GetInteger(0) == 1 ? NwFeat.FromFeatType(API.Feat.ImprovedDisarm)! : NwFeat.FromFeatType(API.Feat.Disarm)!,
+          Feat = gameEffect.GetInteger(0) == 1 ? NwFeat.FromFeatType(API.Feat.ImprovedDisarm) : NwFeat.FromFeatType(API.Feat.Disarm),
         };
 
         eventData.Result = new Lazy<bool>(() => !eventData.PreventDisarm && Hook.CallOriginal(pEffectHandler, pObject, pEffect, bLoadingGame).ToBool());
diff --git a/NWN.Anvil/src/main/API/Objects/NwCreature.cs b/NWN.Anvil/src/main/API/Objects/NwCreature.cs
@@ -1701,9 +1701,9 @@ public int GetBaseSavingThrow(SavingThrow savingThrow)
     /// </summary>
     /// <param name="nwClass">The class with domains. Defaults to <see cref="ClassType.Cleric"/> if not specified.</param>
     /// <returns>An enumeration of this creature's domains.</returns>
-    public IEnumerable<NwDomain> GetClassDomains(NwClass? nwClass = default)
+    public IEnumerable<NwDomain> GetClassDomains(NwClass? nwClass = null)
     {
-      nwClass ??= NwClass.FromClassType(ClassType.Cleric)!;
+      nwClass ??= NwClass.FromClassType(ClassType.Cleric);
 
       const int error = (int)Domain.Error;
       int classT = nwClass.Id;
@@ -1950,9 +1950,9 @@ public EquipmentSlots GetSlotFromItem(NwItem item)
     /// </summary>
     /// <param name="nwClass">The class to query for specialized spell schools. Defaults to <see cref="ClassType.Wizard"/> if not specified.</param>
     /// <returns>The creature's selected spell specialization.</returns>
-    public SpellSchool GetSpecialization(NwClass? nwClass = default)
+    public SpellSchool GetSpecialization(NwClass? nwClass = null)
     {
-      nwClass ??= NwClass.FromClassType(ClassType.Wizard)!;
+      nwClass ??= NwClass.FromClassType(ClassType.Wizard);
       return (SpellSchool)NWScript.GetSpecialization(this, nwClass.Id);
     }
 
diff --git a/NWN.Anvil/src/main/API/Utils/VirtualMachine.cs b/NWN.Anvil/src/main/API/Utils/VirtualMachine.cs
@@ -117,7 +117,7 @@ public void ExecuteInScriptContext(System.Action action, uint objectId = NwObjec
       }
     }
 
-    public T ExecuteInScriptContext<T>(System.Func<T> action, uint objectId = NwObject.Invalid, int scriptEventId = 0)
+    public T ExecuteInScriptContext<T>(Func<T> action, uint objectId = NwObject.Invalid, int scriptEventId = 0)
     {
       int spBefore = PushScriptContext(objectId, scriptEventId);
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`using Anvil.API;`
`10`	`10`	`using Anvil.Services;`
`11`	`11`
`12`		`-namespace NWN.Anvil.Samples.Async`
	`12`	`+namespace NWN.Anvil.Samples.API.Async`
`13`	`13`	`{`
`14`	`14`	`[ServiceBinding(typeof(NwTaskExamples))]`
`15`	`15`	`public class NwTaskExamples`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Anvil.Services;`
`7`	`7`	`using NLog;`
`8`	`8`
`9`		`-namespace NWN.Anvil.Samples.EngineStructures`
	`9`	`+namespace NWN.Anvil.Samples.API.EngineStructures`
`10`	`10`	`{`
`11`	`11`	`[ServiceBinding(typeof(CassowaryExamples))]`
`12`	`12`	`public class CassowaryExamples`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Anvil.API.Events;`
`7`	`7`	`using Anvil.Services;`
`8`	`8`
`9`		`-namespace NWN.Anvil.Samples.EngineStructures`
	`9`	`+namespace NWN.Anvil.Samples.API.EngineStructures`
`10`	`10`	`{`
`11`	`11`	`[ServiceBinding(typeof(ItemPropertyExamples))]`
`12`	`12`	`public class ItemPropertyExamples`
Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,9 @@ public sealed class AcBonusVsDamageTypeTest : ItemPropertyTest`
`112`	`112`
`113`	`113`	`public sealed class AcBonusVsRaceTest : ItemPropertyTest`
`114`	`114`	`{`
`115`		`- protected override ItemProperty ItemProperty => ItemProperty.ACBonusVsRace(NwRace.FromRacialType(RacialType.Outsider)!, 3);`
	`115`	`+ protected override ItemProperty ItemProperty => ItemProperty.ACBonusVsRace(NwRace.FromRacialType(RacialType.Outsider), 3);`
`116`	`116`	`protected override ItemPropertyType PropertyType => ItemPropertyType.AcBonusVsRacialGroup;`
`117`		`- protected override int SubType => NwRace.FromRacialType(RacialType.Outsider)!.Id;`
	`117`	`+ protected override int SubType => NwRace.FromRacialType(RacialType.Outsider).Id;`
`118`	`118`	`protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(2);`
`119`	`119`	`protected override int CostTableValue => 3;`
`120`	`120`	`}`
`@@ -163,9 +163,9 @@ public sealed class AttackBonusVsAlignmentGroupTest : ItemPropertyTest`
`163`	`163`
`164`	`164`	`public sealed class AttackBonusVsRaceTest : ItemPropertyTest`
`165`	`165`	`{`
`166`		`- protected override ItemProperty ItemProperty => ItemProperty.AttackBonusVsRace(NwRace.FromRacialType(RacialType.Halfling)!, 9);`
	`166`	`+ protected override ItemProperty ItemProperty => ItemProperty.AttackBonusVsRace(NwRace.FromRacialType(RacialType.Halfling), 9);`
`167`	`167`	`protected override ItemPropertyType PropertyType => ItemPropertyType.AttackBonusVsRacialGroup;`
`168`		`- protected override int SubType => NwRace.FromRacialType(RacialType.Halfling)!.Id;`
	`168`	`+ protected override int SubType => NwRace.FromRacialType(RacialType.Halfling).Id;`
`169`	`169`	`protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(2);`
`170`	`170`	`protected override int CostTableValue => 9;`
`171`	`171`	`}`
`@@ -268,9 +268,9 @@ public sealed class DamageBonusVsAlignmentGroupTest : ItemPropertyTest`
`268`	`268`
`269`	`269`	`public sealed class DamageBonusVsRaceTest : ItemPropertyTest`
`270`	`270`	`{`
`271`		`- protected override ItemProperty ItemProperty => ItemProperty.DamageBonusVsRace(NwRace.FromRacialType(RacialType.Elemental)!, IPDamageType.Bludgeoning, IPDamageBonus.Plus2d6);`
	`271`	`+ protected override ItemProperty ItemProperty => ItemProperty.DamageBonusVsRace(NwRace.FromRacialType(RacialType.Elemental), IPDamageType.Bludgeoning, IPDamageBonus.Plus2d6);`
`272`	`272`	`protected override ItemPropertyType PropertyType => ItemPropertyType.DamageBonusVsRacialGroup;`
`273`		`- protected override int SubType => NwRace.FromRacialType(RacialType.Elemental)!.Id;`
	`273`	`+ protected override int SubType => NwRace.FromRacialType(RacialType.Elemental).Id;`
`274`	`274`	`protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(4);`
`275`	`275`	`protected override int CostTableValue => (int)IPDamageBonus.Plus2d6;`
`276`	`276`	`protected override int Param1TableValue => (int)IPDamageType.Bludgeoning;`
`@@ -357,9 +357,9 @@ public sealed class DecreaseACTest : ItemPropertyTest`
`357`	`357`
`358`	`358`	`public sealed class DecreaseSkillTest : ItemPropertyTest`
`359`	`359`	`{`
`360`		`- protected override ItemProperty ItemProperty => ItemProperty.DecreaseSkill(NwSkill.FromSkillType(Skill.Discipline)!, 5);`
	`360`	`+ protected override ItemProperty ItemProperty => ItemProperty.DecreaseSkill(NwSkill.FromSkillType(Skill.Discipline), 5);`
`361`	`361`	`protected override ItemPropertyType PropertyType => ItemPropertyType.DecreasedSkillModifier;`
`362`		`- protected override int SubType => NwSkill.FromSkillType(Skill.Discipline)!.Id;`
	`362`	`+ protected override int SubType => NwSkill.FromSkillType(Skill.Discipline).Id;`
`363`	`363`	`protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(21);`
`364`	`364`	`protected override int CostTableValue => 5;`
`365`	`365`	`}`
`@@ -383,9 +383,9 @@ public sealed class EnhancementBonusVsAlignmentGroupTest : ItemPropertyTest`
`383`	`383`
`384`	`384`	`public sealed class EnhancementBonusVsRaceTest : ItemPropertyTest`
`385`	`385`	`{`
`386`		`- protected override ItemProperty ItemProperty => ItemProperty.EnhancementBonusVsRace(NwRace.FromRacialType(RacialType.Dragon)!, 2);`
	`386`	`+ protected override ItemProperty ItemProperty => ItemProperty.EnhancementBonusVsRace(NwRace.FromRacialType(RacialType.Dragon), 2);`
`387`	`387`	`protected override ItemPropertyType PropertyType => ItemPropertyType.EnhancementBonusVsRacialGroup;`
`388`		`- protected override int SubType => NwRace.FromRacialType(RacialType.Dragon)!.Id;`
	`388`	`+ protected override int SubType => NwRace.FromRacialType(RacialType.Dragon).Id;`
`389`	`389`	`protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(2);`
`390`	`390`	`protected override int CostTableValue => 2;`
`391`	`391`	`}`
`@@ -501,17 +501,17 @@ public sealed class LimitUseByAlignTest : ItemPropertyTest`
`501`	`501`
`502`	`502`	`public sealed class LimitUseByClassTest : ItemPropertyTest`
`503`	`503`	`{`
`504`		`- protected override ItemProperty ItemProperty => ItemProperty.LimitUseByClass(NwClass.FromClassType(ClassType.Bard)!);`
	`504`	`+ protected override ItemProperty ItemProperty => ItemProperty.LimitUseByClass(NwClass.FromClassType(ClassType.Bard));`
`505`	`505`	`protected override ItemPropertyType PropertyType => ItemPropertyType.UseLimitationClass;`
`506`		`- protected override int SubType => NwClass.FromClassType(ClassType.Bard)!.Id;`
	`506`	`+ protected override int SubType => NwClass.FromClassType(ClassType.Bard).Id;`
`507`	`507`	`protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(0);`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`public sealed class LimitUseByRaceTest : ItemPropertyTest`
`511`	`511`	`{`
`512`		`- protected override ItemProperty ItemProperty => ItemProperty.LimitUseByRace(NwRace.FromRacialType(RacialType.Undead)!);`
	`512`	`+ protected override ItemProperty ItemProperty => ItemProperty.LimitUseByRace(NwRace.FromRacialType(RacialType.Undead));`
`513`	`513`	`protected override ItemPropertyType PropertyType => ItemPropertyType.UseLimitationRacialType;`
`514`		`- protected override int SubType => NwRace.FromRacialType(RacialType.Undead)!.Id;`
	`514`	`+ protected override int SubType => NwRace.FromRacialType(RacialType.Undead).Id;`
`515`	`515`	`protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(0);`
`516`	`516`	`}`
`517`	`517`
`@@ -625,9 +625,9 @@ public sealed class RegenerationTest : ItemPropertyTest`
`625`	`625`
`626`	`626`	`public sealed class SkillBonusTest : ItemPropertyTest`
`627`	`627`	`{`
`628`		`- protected override ItemProperty ItemProperty => ItemProperty.SkillBonus(NwSkill.FromSkillType(Skill.Persuade)!, 9);`
	`628`	`+ protected override ItemProperty ItemProperty => ItemProperty.SkillBonus(NwSkill.FromSkillType(Skill.Persuade), 9);`
`629`	`629`	`protected override ItemPropertyType PropertyType => ItemPropertyType.SkillBonus;`
`630`		`- protected override int SubType => NwSkill.FromSkillType(Skill.Persuade)!.Id;`
	`630`	`+ protected override int SubType => NwSkill.FromSkillType(Skill.Persuade).Id;`
`631`	`631`	`protected override ItemPropertyCostTablesEntry? CostTable => NwGameTables.ItemPropertyCostTables.ElementAtOrDefault(25);`
`632`	`632`	`protected override int CostTableValue => 9;`
`633`	`633`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class TalentTests`
`9`	`9`	`[Test(Description = "Creating a talent and disposing the talent explicitly frees the associated memory.")]`
`10`	`10`	`public void CreateAndDisposeTalentFreesNativeStructure()`
`11`	`11`	`{`
`12`		`- Talent talent = NwSkill.FromSkillType(Skill.Intimidate)!.ToTalent();`
	`12`	`+ Talent talent = NwSkill.FromSkillType(Skill.Intimidate).ToTalent();`
`13`	`13`	`Assert.That(talent.IsValid, Is.True, "Talent was not valid after creation.");`
`14`	`14`	`talent.Dispose();`
`15`	`15`	`Assert.That(talent.IsValid, Is.False, "Talent was still valid after disposing.");`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private static int OnApplyDisarm(void* pEffectHandler, void* pObject, void* pEff`
`41`	`41`	`{`
`42`	`42`	`DisarmedObject = gameObject.ToNwObject<NwGameObject>()!,`
`43`	`43`	`DisarmedBy = gameEffect.m_oidCreator.ToNwObject<NwGameObject>()!,`
`44`		`- Feat = gameEffect.GetInteger(0) == 1 ? NwFeat.FromFeatType(API.Feat.ImprovedDisarm)! : NwFeat.FromFeatType(API.Feat.Disarm)!,`
	`44`	`+ Feat = gameEffect.GetInteger(0) == 1 ? NwFeat.FromFeatType(API.Feat.ImprovedDisarm) : NwFeat.FromFeatType(API.Feat.Disarm),`
`45`	`45`	`};`
`46`	`46`
`47`	`47`	`eventData.Result = new Lazy<bool>(() => !eventData.PreventDisarm && Hook.CallOriginal(pEffectHandler, pObject, pEffect, bLoadingGame).ToBool());`