Merge pull request #13 from Synthesis-Collective/FX-Only-Enchantment-Fix

Fx only enchantment fix
Synthesis-Collective · Jul 10, 2021 · 7be8655 · 7be8655
2 parents 59eb101 + b3c325c
commit 7be8655
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/HalgarisRPGLoot/ArmorAnalyzer.cs b/HalgarisRPGLoot/ArmorAnalyzer.cs
@@ -232,9 +232,10 @@ private FormKey GenerateEnchantment(
         {
             var level = item.Entry.Data.Level;
             var forLevel = ByLevelIndexed[level];
+            var takeMin = Math.Min(rarityEnchCount, forLevel.Length);
             var effects = Extensions.Repeatedly(() => forLevel.RandomItem())
                 .Distinct()
-                .Take(rarityEnchCount)
+                .Take(takeMin)
                 .Shuffle();
 
             var oldench = effects.First().Enchantment;

diff --git a/HalgarisRPGLoot/WeaponAnalyer.cs b/HalgarisRPGLoot/WeaponAnalyer.cs
@@ -74,7 +74,7 @@ public void Analyze()
             AllEnchantedItems = AllListItems.Where(e => !e.Resolved.ObjectEffect.IsNull).ToArray();
 
             AllObjectEffects = State.LoadOrder.PriorityOrder.ObjectEffect().WinningOverrides()
-                .Where(k => !k.Name.ToString().EndsWith("FX")) // Excluding Bound Weapon FX Object Effects as they don't do a thing on non bound weapons. 
+                .Where(x => x.Name != null).Where(k => !k.Name.ToString().EndsWith("FX")) // Excluding Bound Weapon FX Object Effects as they don't do a thing on non bound weapons. 
                 .ToDictionary(k => k.FormKey);
 
             AllEnchantments = AllEnchantedItems
@@ -233,9 +233,10 @@ private FormKey GenerateEnchantment(
         {
             var level = item.Entry.Data.Level;
             var forLevel = ByLevelIndexed[level];
+            var takeMin = Math.Min(rarityEnchCount, forLevel.Length);
             var effects = Extensions.Repeatedly(() => forLevel.RandomItem())
                 .Distinct()
-                .Take(rarityEnchCount)
+                .Take(takeMin)
                 .Shuffle();
 
             var oldench = effects.First().Enchantment;