Skip to content

Commit 92bfd9c

Browse files
cleaned logging and added setting to log even less
1 parent 8e9db11 commit 92bfd9c

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
## Version 4.0.0 - 23.11.2024
44
* Added [Syllabore](https://github.com/kesac/Syllabore) support for Name Generation
55
* Made the Names more variable and not fully stuck to what their EditorID would be.
6-
* With the default settings and all the Anniversary Edition DLC Content Installed the patcher finished in ~2 minutes.
76
* Renamed more parts of the Patcher to Synthesis RPG Loot from Halgaris RPG Loot.
7+
* Reduced the amount of logging and added a toggle to disable logging for individual items for better performance.
8+
* Using the default settings and all the Anniversary Edition DLC Content Installed (On an AMD Ryzen 5 7600X CPU)
9+
* Runtime with logging for individual items disabled 1.8 min.
10+
* Runtime with logging for individual items enabled 2 min.
811

912
## Version 3.2.0 - 06.04.2024
1013
* Fixed unplayable armor and weapon records being used in the patcher

SynthesisRPGLoot/Analyzers/ArmorAnalyzer.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ protected override void AnalyzeGear()
155155

156156
var newEnchantmentsForName = GetEnchantmentsStringForName(resolvedEnchantments);
157157
var enchants = AllRpgEnchants[i];
158-
Console.WriteLine("Generated raw " + RarityClasses[i].Label + ItemTypeDescriptor +
159-
" enchantment of " + newEnchantmentsForName);
158+
160159
if (!enchants.ContainsKey(RarityClasses[i].Label + " " + newEnchantmentsForName))
161160
{
162161
enchants.Add(RarityClasses[i].Label + " " + newEnchantmentsForName, resolvedEnchantments);
@@ -184,7 +183,6 @@ protected override FormKey EnchantItem(ResolvedListItem<IArmorGetter> item, int
184183
return armorGetter.FormKey;
185184
}
186185

187-
Console.WriteLine("Generating Enchanted version of " + itemName);
188186
var newArmor = State.PatchMod.Armors.AddNewLocking(State.PatchMod.GetNextFormKey());
189187
newArmor.DeepCopyIn(item.Resolved);
190188
newArmor.EditorID = newArmorEditorId;
@@ -199,13 +197,14 @@ protected override FormKey EnchantItem(ResolvedListItem<IArmorGetter> item, int
199197
{
200198
newArmor.Keywords?.Add(Skyrim.Keyword.MagicDisallowEnchanting);
201199
}
202-
203-
Console.WriteLine("Generated " + newArmor.Name);
200+
201+
if (Program.Settings.GeneralSettings.LogGeneratedItems)
202+
Console.WriteLine($"Generated {newArmor.Name}");
203+
204204
return newArmor.FormKey;
205205
}
206206
else
207207
{
208-
Console.WriteLine("Generating unenchanted version of " + itemName);
209208
var newArmorEditorId = EditorIdPrefix + item.Resolved.EditorID;
210209
if (State.LinkCache.TryResolve<IArmorGetter>(newArmorEditorId, out var armorGetter))
211210
{
@@ -219,9 +218,9 @@ protected override FormKey EnchantItem(ResolvedListItem<IArmorGetter> item, int
219218
newArmor.Name = RarityClasses[rarity].Label.Equals("")
220219
? itemName
221220
: RarityClasses[rarity].Label + " " + itemName;
222-
223-
Console.WriteLine("Generated " + newArmor.Name);
224-
221+
222+
if (Program.Settings.GeneralSettings.LogGeneratedItems)
223+
Console.WriteLine($"Generated {newArmor.Name}");
225224

226225
return newArmor.FormKey;
227226
}

SynthesisRPGLoot/Analyzers/GearAnalyzer.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ protected FormKey GenerateEnchantment(int rarity)
191191
return objectEffectGetter.FormKey;
192192
}
193193

194-
Console.WriteLine("Generating " + RarityClasses[rarity].Label + ItemTypeDescriptor + " enchantment of " +
195-
GetEnchantmentsStringForName(effects));
196194
var newObjectEffectGetter = State.PatchMod.ObjectEffects.AddNewLocking(State.PatchMod.GetNextFormKey());
197195
newObjectEffectGetter.DeepCopyIn(effects.First().Enchantment);
198196
newObjectEffectGetter.EditorID = objectEffectEditorId;
@@ -205,7 +203,6 @@ protected FormKey GenerateEnchantment(int rarity)
205203
ChosenRpgEnchants[rarity].Add(RarityClasses[rarity].Label + " " + GetEnchantmentsStringForName(effects),
206204
newObjectEffectGetter.FormKey);
207205
ChosenRpgEnchantEffects[rarity].Add(newObjectEffectGetter.FormKey, effects);
208-
Console.WriteLine("Enchantment Generated");
209206
return newObjectEffectGetter.FormKey;
210207
}
211208

SynthesisRPGLoot/Analyzers/WeaponAnalyzer.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ protected override void AnalyzeGear()
155155

156156
var newEnchantmentsForName = GetEnchantmentsStringForName(resolvedEnchantments);
157157
var enchants = AllRpgEnchants[i];
158-
Console.WriteLine("Generated raw " + RarityClasses[i].Label + ItemTypeDescriptor +
159-
" enchantment of " + newEnchantmentsForName);
158+
160159
if (!enchants.ContainsKey(RarityClasses[i].Label + " " + newEnchantmentsForName))
161160
{
162161
enchants.Add(RarityClasses[i].Label + " " + newEnchantmentsForName, resolvedEnchantments);
@@ -184,7 +183,6 @@ protected override FormKey EnchantItem(ResolvedListItem<IWeaponGetter> item, int
184183
return weaponGetter.FormKey;
185184
}
186185

187-
Console.WriteLine("Generating Enchanted version of " + itemName);
188186
var newWeapon = State.PatchMod.Weapons.AddNewLocking(State.PatchMod.GetNextFormKey());
189187
newWeapon.DeepCopyIn(item.Resolved);
190188
newWeapon.EditorID = newWeaponEditorId;
@@ -200,12 +198,13 @@ protected override FormKey EnchantItem(ResolvedListItem<IWeaponGetter> item, int
200198
newWeapon.Keywords?.Add(Skyrim.Keyword.MagicDisallowEnchanting);
201199
}
202200

203-
Console.WriteLine("Generated " + newWeapon.Name);
201+
if (Program.Settings.GeneralSettings.LogGeneratedItems)
202+
Console.WriteLine($"Generated {newWeapon.Name}");
203+
204204
return newWeapon.FormKey;
205205
}
206206
else
207207
{
208-
Console.WriteLine("Generating unenchanted version of " + itemName);
209208
var newWeaponEditorId = EditorIdPrefix + item.Resolved.EditorID;
210209
if (State.LinkCache.TryResolve<IWeaponGetter>(newWeaponEditorId, out var weaponGetter))
211210
{
@@ -218,9 +217,9 @@ protected override FormKey EnchantItem(ResolvedListItem<IWeaponGetter> item, int
218217
newWeapon.Name = RarityClasses[rarity].Label.Equals("")
219218
? itemName
220219
: RarityClasses[rarity].Label + " " + itemName;
221-
222-
Console.WriteLine("Generated " + newWeapon.Name);
223-
220+
221+
if (Program.Settings.GeneralSettings.LogGeneratedItems)
222+
Console.WriteLine($"Generated {newWeapon.Name}");
224223

225224
return newWeapon.FormKey;
226225
}

SynthesisRPGLoot/Settings/GeneralSettings.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ namespace SynthesisRPGLoot.Settings;
1414
public class GeneralSettings
1515
{
1616
[MaintainOrder] public int RandomGenerationSeed = 42;
17+
18+
[MaintainOrder]
19+
[SynthesisTooltip("Disabling this can speed up the generation process.")]
20+
public bool LogGeneratedItems = true;
1721

1822
[MaintainOrder]
1923
[SynthesisSettingName("LeveledList Flags")]

0 commit comments

Comments
 (0)