Merge pull request #43 from Synthesis-Collective/42-implement-runtime…

…-build-cache runtime-"cache" performance improvement
Synthesis-Collective · Dec 24, 2024 · 1de313a · 1de313a
2 parents ddefde9 + 2a0695e
commit 1de313a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/SynthesisRPGLoot/Analyzers/ArmorAnalyzer.cs b/SynthesisRPGLoot/Analyzers/ArmorAnalyzer.cs
@@ -52,6 +52,9 @@ public ArmorAnalyzer(IPatcherState<ISkyrimMod, ISkyrimModGetter> state,
             {
                 ChosenRpgEnchantEffects[i] = new();
             }
+
+            GeneratedItemCache = new();
+            GeneratedLeveledItemsCache = new();
         }
 
         protected override void AnalyzeGear()
@@ -178,7 +181,7 @@ protected override FormKey EnchantItem(ResolvedListItem<IArmorGetter> item, int
                 var newArmorEditorId = EditorIdPrefix + RarityClasses[rarity].Label.ToUpper() + "_" +
                                        itemName +
                                        "_of_" + GetEnchantmentsStringForName(effects, true);
-                if (State.LinkCache.TryResolve<IArmorGetter>(newArmorEditorId, out var armorGetter))
+                if (GeneratedItemCache.TryGetValue(newArmorEditorId, out var armorGetter))
                 {
                     return armorGetter.FormKey;
                 }
@@ -198,6 +201,8 @@ protected override FormKey EnchantItem(ResolvedListItem<IArmorGetter> item, int
                     newArmor.Keywords?.Add(Skyrim.Keyword.MagicDisallowEnchanting);
                 }
 
+                GeneratedItemCache.Add(newArmor.EditorID, newArmor);
+
                 if (Program.Settings.GeneralSettings.LogGeneratedItems)
                     Console.WriteLine($"Generated {newArmor.Name}");
 
@@ -206,7 +211,7 @@ protected override FormKey EnchantItem(ResolvedListItem<IArmorGetter> item, int
             else
             {
                 var newArmorEditorId = EditorIdPrefix + item.Resolved.EditorID;
-                if (State.LinkCache.TryResolve<IArmorGetter>(newArmorEditorId, out var armorGetter))
+                if (GeneratedItemCache.TryGetValue(newArmorEditorId, out var armorGetter))
                 {
                     return State.PatchMod.Armors.GetOrAddAsOverride(armorGetter).FormKey;
                 }
@@ -219,6 +224,8 @@ protected override FormKey EnchantItem(ResolvedListItem<IArmorGetter> item, int
                     ? itemName
                     : RarityClasses[rarity].Label + " " + itemName;
 
+                GeneratedItemCache.Add(newArmor.EditorID, newArmor);
+
                 if (Program.Settings.GeneralSettings.LogGeneratedItems)
                     Console.WriteLine($"Generated {newArmor.Name}");
 

diff --git a/SynthesisRPGLoot/Analyzers/GearAnalyzer.cs b/SynthesisRPGLoot/Analyzers/GearAnalyzer.cs
@@ -68,6 +68,9 @@ public abstract class GearAnalyzer<TType>
 
         protected string ItemTypeDescriptor;
 
+        protected Dictionary<string, ILeveledItemGetter> GeneratedLeveledItemsCache { get; init; }
+
+        protected Dictionary<string, TType> GeneratedItemCache { get; init; }
 
         public void Analyze()
         {
@@ -157,7 +160,7 @@ public void Generate()
                 var levelForName = ench.Entry.Data.Level;
                 var topLevelListEditorId = $"HAL_TOP_LList_{ench.Resolved.EditorID}_Level_{levelForName}";
                 LeveledItem topLevelList;
-                if (State.LinkCache.TryResolve<ILeveledItemGetter>(topLevelListEditorId, out var topLeveledListGetter))
+                if (GeneratedLeveledItemsCache.TryGetValue(topLevelListEditorId, out var topLeveledListGetter))
                 {
                     topLevelList = State.PatchMod.LeveledItems.GetOrAddAsOverride(topLeveledListGetter);
                 }
@@ -168,6 +171,8 @@ public void Generate()
                     topLevelList.Entries = [];
                     topLevelList.EditorID = topLevelListEditorId;
                     topLevelList.Flags = GetLeveledItemFlags();
+
+                    GeneratedLeveledItemsCache.Add(topLevelList.EditorID,topLevelList);
 
                     for (var i = 0; i < GearSettings.BaseItemChanceWeight; i++)
                     {
@@ -183,7 +188,7 @@ public void Generate()
                         var leveledItemEditorId =
                             $"HAL_SUB_LList_{rarityClass.Label}_{ench.Resolved.EditorID}_Level_{levelForName}";
                         LeveledItem leveledItem;
-                        if (State.LinkCache.TryResolve<ILeveledItemGetter>(leveledItemEditorId,
+                        if (GeneratedLeveledItemsCache.TryGetValue(leveledItemEditorId,
                                 out var leveledItemGetter))
                         {
                             leveledItem = State.PatchMod.LeveledItems.GetOrAddAsOverride(leveledItemGetter);
@@ -195,6 +200,8 @@ public void Generate()
                             leveledItem.Entries = [];
                             leveledItem.EditorID = leveledItemEditorId;
                             leveledItem.Flags = GetLeveledItemFlags();
+
+                            GeneratedLeveledItemsCache[leveledItem.EditorID] = leveledItem;
 
                             for (var i = 0; i < VarietyCountPerRarity; i++)
                             {
@@ -247,11 +254,6 @@ protected FormKey GenerateEnchantment(int rarity)
             var objectEffectEditorId = EditorIdPrefix + "ENCH_" + RarityClasses[rarity].Label.ToUpper() + "_" +
                                        GetEnchantmentsStringForName(effects, true);
 
-            if (State.LinkCache.TryResolve<IObjectEffectGetter>(objectEffectEditorId, out var objectEffectGetter))
-            {
-                return objectEffectGetter.FormKey;
-            }
-
             var newObjectEffectGetter = State.PatchMod.ObjectEffects.AddNewLocking(State.PatchMod.GetNextFormKey());
             newObjectEffectGetter.DeepCopyIn(effects.First().Enchantment);
             newObjectEffectGetter.EditorID = objectEffectEditorId;
@@ -264,6 +266,7 @@ protected FormKey GenerateEnchantment(int rarity)
             ChosenRpgEnchants[rarity].Add(RarityClasses[rarity].Label + " " + GetEnchantmentsStringForName(effects),
                 newObjectEffectGetter.FormKey);
             ChosenRpgEnchantEffects[rarity].Add(newObjectEffectGetter.FormKey, effects);
+
             return newObjectEffectGetter.FormKey;
         }
 

diff --git a/SynthesisRPGLoot/Analyzers/WeaponAnalyzer.cs b/SynthesisRPGLoot/Analyzers/WeaponAnalyzer.cs
@@ -52,6 +52,9 @@ public WeaponAnalyzer(IPatcherState<ISkyrimMod, ISkyrimModGetter> state,
             {
                 ChosenRpgEnchantEffects[i] = new();
             }
+
+            GeneratedItemCache = new();
+            GeneratedLeveledItemsCache = new();
         }
 
         protected override void AnalyzeGear()
@@ -178,7 +181,7 @@ protected override FormKey EnchantItem(ResolvedListItem<IWeaponGetter> item, int
                 var newWeaponEditorId = EditorIdPrefix + RarityClasses[rarity].Label.ToUpper() + "_" +
                                         itemName +
                                         "_of_" + GetEnchantmentsStringForName(effects, true);
-                if (State.LinkCache.TryResolve<IWeaponGetter>(newWeaponEditorId, out var weaponGetter))
+                if (GeneratedItemCache.TryGetValue(newWeaponEditorId, out var weaponGetter))
                 {
                     return weaponGetter.FormKey;
                 }
@@ -198,6 +201,8 @@ protected override FormKey EnchantItem(ResolvedListItem<IWeaponGetter> item, int
                     newWeapon.Keywords?.Add(Skyrim.Keyword.MagicDisallowEnchanting);
                 }
 
+                GeneratedItemCache.Add(newWeapon.EditorID, newWeapon);
+
                 if (Program.Settings.GeneralSettings.LogGeneratedItems)
                     Console.WriteLine($"Generated {newWeapon.Name}");
 
@@ -206,10 +211,11 @@ protected override FormKey EnchantItem(ResolvedListItem<IWeaponGetter> item, int
             else
             {
                 var newWeaponEditorId = EditorIdPrefix + item.Resolved.EditorID;
-                if (State.LinkCache.TryResolve<IWeaponGetter>(newWeaponEditorId, out var weaponGetter))
+                if (GeneratedItemCache.TryGetValue(newWeaponEditorId, out var weaponGetter))
                 {
                     return weaponGetter.FormKey;
                 }
+
                 var newWeapon = State.PatchMod.Weapons.AddNewLocking(State.PatchMod.GetNextFormKey());
                 newWeapon.DeepCopyIn(item.Resolved);
                 newWeapon.EditorID = newWeaponEditorId;
@@ -218,6 +224,8 @@ protected override FormKey EnchantItem(ResolvedListItem<IWeaponGetter> item, int
                     ? itemName
                     : RarityClasses[rarity].Label + " " + itemName;
 
+                GeneratedItemCache.Add(newWeapon.EditorID, newWeapon);
+
                 if (Program.Settings.GeneralSettings.LogGeneratedItems)
                     Console.WriteLine($"Generated {newWeapon.Name}");