add elemental immunity test; ensure return immunity is correct

hybrasyl · Apr 25, 2024 · 42318d8 · 42318d8
1 parent d08e7bd
commit 42318d8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/Extensions/CreatureBehaviorSet.cs b/src/Extensions/CreatureBehaviorSet.cs
@@ -84,7 +84,8 @@ public static void ProcessAll(IWorldDataManager manager)
             Name = cbs1.Name,
             StatAlloc = string.IsNullOrEmpty(cbs1.StatAlloc) ? cbs2.StatAlloc : cbs1.StatAlloc,
             Behavior = new CreatureBehavior(),
-            Castables = new CreatureCastables()
+            Castables = new CreatureCastables(),
+            Import = cbs1.Import
         };
 
         newCbs.Behavior.CastingSets = new List<CreatureCastingSet>();
@@ -123,7 +124,7 @@ public static void ProcessAll(IWorldDataManager manager)
                 newCbs.Castables.SpellCategories += $" {cbs2.Castables.SpellCategories}";
         }
 
-        cbs1.Immunities = cbs1.Immunities == null ? cbs2.Immunities : cbs1.Immunities.Union(cbs2.Immunities).ToList();
+        newCbs.Immunities = cbs1.Immunities == null ? cbs2.Immunities : cbs1.Immunities.Union(cbs2.Immunities).ToList();
 
         return newCbs;
     }

diff --git a/src/Hybrasyl.Xml.csproj b/src/Hybrasyl.Xml.csproj
@@ -4,8 +4,8 @@
         <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <AssemblyName>Hybrasyl.Xml</AssemblyName>
         <RootNamespace>Hybrasyl.Xml</RootNamespace>
-        <PackageVersion>0.9.3.31</PackageVersion>
-        <Version>0.9.3.31</Version>
+        <PackageVersion>0.9.3.32</PackageVersion>
+        <Version>0.9.3.32</Version>
         <BuildDocFx Condition="'$(Configuration)'=='Debug'">false</BuildDocFx>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Authors>ERISCO LLC</Authors>

diff --git a/tests/Immunities.cs b/tests/Immunities.cs
@@ -55,6 +55,25 @@ public void StatusCategoryImmunity()
         Assert.NotNull(statusImmune);
         Assert.True(statusImmune.ImmuneToStatusCategory("Str", out _));
     }
+
+    [Fact]
+    public void ElementalImmunity()
+    {
+        var elementalImmune = Fixture.SyncManager.Get<CreatureBehaviorSet>("ElementImmune");
+        Assert.NotNull(elementalImmune);
+        Assert.True(elementalImmune.ImmuneToElement("Fire", out _));
+        Assert.True(elementalImmune.ImmuneToElement(ElementType.Fire, out _));
+    }
+
+    [Fact]
+    public void ImmunityImports()
+    {
+        var importImmune = Fixture.SyncManager.Get<CreatureBehaviorSet>("ImmunityImport");
+        var importedImmune = Fixture.SyncManager.Get<CreatureBehaviorSet>(importImmune.Import);
+        Assert.NotNull(importImmune);
+        Assert.NotNull(importedImmune);
+        Assert.Equal(importImmune.Immunities.Count, importedImmune.Immunities.Count + importImmune.Immunities.Count);
+    }
 }