Merge pull request #9 from Synthesis-Collective/bug-fix

Bug fix
Synthesis-Collective · Jun 16, 2021 · b298ab8 · b298ab8
2 parents f43b982 + 430cc42
commit b298ab8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/HalgarisRPGLoot/ArmorAnalyzer.cs b/HalgarisRPGLoot/ArmorAnalyzer.cs
@@ -95,13 +95,14 @@ public void Analyze()
 
             AllLevels = AllEnchantments.Select(e => e.Level).Distinct().ToHashSet();
 
+            short maxLvl = AllListItems.Select(i => i.Entry.Data.Level).Distinct().ToHashSet().Max();
 
             ByLevel = AllEnchantments.GroupBy(e => e.Level)
                 .OrderBy(e => e.Key)
                 .Select(e => (e.Key, e.ToArray()))
                 .ToArray();
 
-            ByLevelIndexed = Enumerable.Range(0, 100)
+            ByLevelIndexed = Enumerable.Range(0, maxLvl+1)
                 .Select(lvl => (lvl, ByLevel.Where(bl => bl.Key <= lvl).SelectMany(e => e.Item2).ToArray()))
                 .ToDictionary(kv => kv.lvl, kv => kv.Item2);
         }

diff --git a/HalgarisRPGLoot/Extensions.cs b/HalgarisRPGLoot/Extensions.cs
@@ -13,7 +13,7 @@ public static class Extensions
 
         public static T RandomItem<T>(this T[] itms)
         {
-            return itms[Random.Next(0, itms.Length)];
+            return itms[Random.Next(0, (itms.Length-1 <= 0 )? 1 : itms.Length-1)];
         }
 
         public static IEnumerable<T> Repeatedly<T>(Func<T> f)

diff --git a/HalgarisRPGLoot/WeaponAnalyer.cs b/HalgarisRPGLoot/WeaponAnalyer.cs
@@ -95,12 +95,14 @@ public void Analyze()
 
             AllLevels = AllEnchantments.Select(e => e.Level).Distinct().ToHashSet();
 
+            short maxLvl = AllListItems.Select(i => i.Entry.Data.Level).Distinct().ToHashSet().Max();
+
             ByLevel = AllEnchantments.GroupBy(e => e.Level)
                 .OrderBy(e => e.Key)
                 .Select(e => (e.Key, e.ToArray()))
                 .ToArray();
 
-            ByLevelIndexed = Enumerable.Range(0, 100)
+            ByLevelIndexed = Enumerable.Range(0, maxLvl+1)
                 .Select(lvl => (lvl, ByLevel.Where(bl => bl.Key <= lvl).SelectMany(e => e.Item2).ToArray()))
                 .ToDictionary(kv => kv.lvl, kv => kv.Item2);
         }