Merge pull request #103 from Monitor144hz/stable-sse

merge fixed #102, may fix other output issues from stable sse
Monitor221hz · Feb 7, 2024 · e4e7f9f · e4e7f9f
2 parents 142b2a1 + 6788371
commit e4e7f9f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/PandoraPlus/Patch/Patchers/Skyrim/Hkx/PackFileValidator.cs b/PandoraPlus/Patch/Patchers/Skyrim/Hkx/PackFileValidator.cs
@@ -70,13 +70,13 @@ public bool ValidateEventsAndVariables(PackFileGraph graph)
 
  eventNameElements.RemoveAt(i);
  eventFlagElements.RemoveAt(i);
- Logger.Warn($"Validator > {graph.ParentProject?.Identifier}~{graph.Name} > Duplicate Event > {eventName} > REMOVED");
+ Logger.Warn($"Validator > {graph.ParentProject?.Identifier}~{graph.Name} > Duplicate Event > {eventName} > Index > {i} > REMOVED");
  continue;
  }
 //#if DEBUG
-// Logger.Debug($"Validator > {packFile.ParentProject?.Identifier}~{packFile.Name} > Mapped Event > {eventName} > Index {i}");
+// Logger.Debug($"Validator > {graph.ParentProject?.Identifier}~{graph.Name} > Mapped Event > {eventName} > Index {i}");
 //#endif
- 
+
  }
 
  for (int i = variableLowerBound; i >= 0; i--)
@@ -92,19 +92,21 @@ public bool ValidateEventsAndVariables(PackFileGraph graph)
  variableNameElements.RemoveAt(i);
  variableTypeElements.RemoveAt(i);
  variableValueElements.RemoveAt(i);
- Logger.Warn($"Validator > {graph.ParentProject?.Identifier}~{graph.Name} > Duplicate Variable > {variableName} > REMOVED");
+ Logger.Warn($"Validator > {graph.ParentProject?.Identifier}~{graph.Name} > Duplicate Variable > {variableName} > Index > {i} > REMOVED");
  continue; 
  }
 //#if DEBUG
 // Logger.Debug($"Validator > {packFile.ParentProject?.Identifier}~{packFile.Name} > Mapped Variable > {variableName} > Index {i}");
 //#endif
 
  }
- for (int i = 0; i < eventNameElements.Count; i++)
+ eventLowerBound -= 2;
+ variableLowerBound -= 2;
+ for (int i = 0; i < eventLowerBound; i++)
  {
  eventIndices.Add(eventNameElements[i].Value, eventNameElements.Count - 1 - i);
  }
- for (int i = 0; i < variableNameElements.Count; i++)
+ for (int i = 0; i < variableLowerBound; i++)
  {
  variableIndices.Add(variableNameElements[i].Value, variableNameElements.Count - 1 - i);
  }

diff --git a/PandoraPlus/Patch/Patchers/Skyrim/SkyrimPatcher.cs b/PandoraPlus/Patch/Patchers/Skyrim/SkyrimPatcher.cs
@@ -33,7 +33,7 @@ public class SkyrimPatcher : IPatcher
 
  public IPatcher.PatcherFlags Flags { get; private set; } = IPatcher.PatcherFlags.None;
 
- private static readonly Version currentVersion = new Version(1, 1, 5);
+ private static readonly Version currentVersion = new Version(1, 1, 6);
 
  private static readonly string versionLabel = "alpha";
  public string GetVersionString() => $"{currentVersion.ToString()}-{versionLabel}";