Fix unwanted loading of chequip

Regression in 9e67b3c
LanternEQ · Oct 4, 2023 · b8bda98 · b8bda98
1 parent a58e715
commit b8bda98
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/LanternExtractor/EqFileHelper.cs b/LanternExtractor/EqFileHelper.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
@@ -158,8 +158,14 @@ public static string ObjArchivePath(string archivePath)
 
         private static bool IsValidArchive(string archiveName)
         {
-            return archiveName.EndsWith(".s3d") || archiveName.EndsWith(".t3d") || archiveName.EndsWith(".pfs")
-                && !archiveName.Contains("chequip") && !archiveName.EndsWith("_lit.s3d");
+            // chequip contains broken/conflicting data.
+            // _lit archives get injected later during archive extraction
+            if (archiveName.Contains("chequip") || archiveName.EndsWith("_lit.s3d"))
+            {
+                return false;
+            }
+
+            return archiveName.EndsWith(".s3d") || archiveName.EndsWith(".t3d") || archiveName.EndsWith(".pfs");
         }
 
         private static bool IsZoneArchive(string archiveName)