From 8d054214a40aecf7f7885427fa646ef9a692aba4 Mon Sep 17 00:00:00 2001
From: brather1ng <7596346+brather1ng@users.noreply.github.com>
Date: Thu, 12 Mar 2020 00:34:51 +0100
Subject: [PATCH] Update Engine to 0.2.2

---
 UpdateDB/UpdateDB.csproj                                        | 2 +-
 .../Computation/Model/ComputationObservablesTest.cs             | 2 +-
 WPFSKillTree.Tests/WPFSKillTree.Tests.csproj                    | 2 +-
 WPFSKillTree/Computation/ViewModels/ComputationViewModel.cs     | 2 +-
 WPFSKillTree/Model/ModelConverter.cs                            | 1 -
 WPFSKillTree/WPFSKillTree.csproj                                | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/UpdateDB/UpdateDB.csproj b/UpdateDB/UpdateDB.csproj
index f7f71174c..784b9cc63 100644
--- a/UpdateDB/UpdateDB.csproj
+++ b/UpdateDB/UpdateDB.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog" Version="4.6.8" />
-    <PackageReference Include="PoESkillTree.Engine" Version="0.2.1" />
+    <PackageReference Include="PoESkillTree.Engine" Version="0.2.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\WPFSKillTree\WPFSKillTree.csproj" />
diff --git a/WPFSKillTree.Tests/Computation/Model/ComputationObservablesTest.cs b/WPFSKillTree.Tests/Computation/Model/ComputationObservablesTest.cs
index d20a0d7df..a0632b279 100644
--- a/WPFSKillTree.Tests/Computation/Model/ComputationObservablesTest.cs
+++ b/WPFSKillTree.Tests/Computation/Model/ComputationObservablesTest.cs
@@ -219,7 +219,7 @@ private static PassiveTreeDefinition CreatePassiveTree(int nodeCount)
 
         private static PassiveNodeDefinition CreatePassiveNode(ushort id)
             => new PassiveNodeDefinition(id, default, "", false, false,
-                0, default, new string[0]);
+                default, new string[0]);
 
         private static IReadOnlyList<SkillNode> CreateSkillNodes(int nodeCount)
             => Enumerable.Range(0, nodeCount).Select(id => new SkillNode { Id = (ushort) id }).ToList();
diff --git a/WPFSKillTree.Tests/WPFSKillTree.Tests.csproj b/WPFSKillTree.Tests/WPFSKillTree.Tests.csproj
index 9f16c9cf6..49b6fea11 100644
--- a/WPFSKillTree.Tests/WPFSKillTree.Tests.csproj
+++ b/WPFSKillTree.Tests/WPFSKillTree.Tests.csproj
@@ -20,7 +20,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="PoESkillTree.Engine" Version="0.2.1" />
+    <PackageReference Include="PoESkillTree.Engine" Version="0.2.2" />
     <PackageReference Include="System.Reactive" Version="4.3.2" />
   </ItemGroup>
   <ItemGroup>
diff --git a/WPFSKillTree/Computation/ViewModels/ComputationViewModel.cs b/WPFSKillTree/Computation/ViewModels/ComputationViewModel.cs
index ba20cdcc7..1c8995039 100644
--- a/WPFSKillTree/Computation/ViewModels/ComputationViewModel.cs
+++ b/WPFSKillTree/Computation/ViewModels/ComputationViewModel.cs
@@ -181,7 +181,7 @@ private void InitializeDefensiveStats(IBuilderFactories f)
             AddAvailableStats(DefensiveStats, f.StatBuilders.Evasion.ChanceAgainstProjectileAttacks);
             AddAvailableStats(DefensiveStats, f.StatBuilders.Accuracy, Entity.Enemy);
             AddStats(DefensiveStats, f.DamageTypeBuilders.AnyDamageType().Resistance);
-            ForEachDamageType(t => AddAvailableStats(DefensiveStats, f.MetaStatBuilders.ResistanceAgainstHits(t)));
+            ForEachDamageType(t => AddAvailableStats(DefensiveStats, f.DamageTypeBuilders.From(t).ResistanceAgainstHits));
             ForEachDamageType(t => AddAvailableStats(DefensiveStats, f.MetaStatBuilders.MitigationAgainstHits(t)));
             ForEachDamageType(t => AddAvailableStats(DefensiveStats, f.MetaStatBuilders.MitigationAgainstDoTs(t)));
             ForEachDamageType(t => AddAvailableStats(DefensiveStats, f.MetaStatBuilders.MitigationAgainstDoTs(t)));
diff --git a/WPFSKillTree/Model/ModelConverter.cs b/WPFSKillTree/Model/ModelConverter.cs
index 4ecc46d7f..dce472a57 100644
--- a/WPFSKillTree/Model/ModelConverter.cs
+++ b/WPFSKillTree/Model/ModelConverter.cs
@@ -21,7 +21,6 @@ public static PassiveNodeDefinition Convert(SkillNode skillNode)
                 skillNode.Name,
                 skillNode.IsAscendancyNode,
                 !skillNode.IsRootNode && !skillNode.IsAscendancyStart && !skillNode.IsMultipleChoiceOption,
-                skillNode.PassivePointsGranted,
                 new NodePosition(skillNode.Position.X, skillNode.Position.Y), 
                 skillNode.StatDefinitions);
 
diff --git a/WPFSKillTree/WPFSKillTree.csproj b/WPFSKillTree/WPFSKillTree.csproj
index 86d360a13..b5f47d31f 100644
--- a/WPFSKillTree/WPFSKillTree.csproj
+++ b/WPFSKillTree/WPFSKillTree.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog" Version="4.6.8" />
-    <PackageReference Include="PoESkillTree.Engine" Version="0.2.1" />
+    <PackageReference Include="PoESkillTree.Engine" Version="0.2.2" />
     <PackageReference Include="System.Buffers" Version="4.5.0" />
     <PackageReference Include="System.Reactive" Version="4.3.2" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.0" />