correctly check custom cache when generating

Author: MattFiler

CathodeLib/Scripts/CATHODE/CollisionMaps.cs

@@ -29,21 +29,15 @@ override protected bool LoadInternal()
 
             using (BinaryReader reader = new BinaryReader(File.OpenRead(_filepath)))
             {
-                //It seems typically in this file at the start there are a bunch of empty entries, and then there are a bunch of unresolvable ones, and then a bunch that can be resolved.
+                //The way this works:
+                // - First 18 entries are empty
+                // - Next set of entries are all the COLLISION_MAPPING resources referenced by COMMANDS.PAK (hence they have no composite_instance_id, as the composites aren't instanced - but they do have entity_ids)
+                // - There are then a few entries that have composite_instance_ids set but I can't resolve them - perhaps these are things from GLOBAL?
+                // - Then there's all the instanced entities with resolvable composite_instance_ids
 
-                //first 18 are always null
-
-                //always first 247 are the same? 18 null and the rest in required assets?
-
-                //note: some of the things we skip here actually contain useful info, but the game doesn't read it so there's no point us bothering with it 
-
-
-
-                //NOTE: skipping first 18 as they're always empty, at least, for what we parse
                 reader.BaseStream.Position = 4;
                 int entryCount = reader.ReadInt32();
-                reader.BaseStream.Position += (48 * 18);
-                for (int i = 0; i < entryCount - 18; i++)
+                for (int i = 0; i < entryCount; i++)
                 {
                     Entry entry = new Entry();
 
@@ -106,15 +100,16 @@ override protected bool LoadInternal()
 
         override protected bool SaveInternal()
         {
+            //composite_instance_id defo has something to do with the ordering as all the zeros are first
+
+
             //Entries = Entries.OrderBy(o => o.entity.entity_id.ToUInt32() + o.id.ToUInt32()).ThenBy(o => o.entity.composite_instance_id.ToUInt32()).ThenBy(o => o.zone_id.ToUInt32()).ToList();
 
             using (BinaryWriter writer = new BinaryWriter(File.OpenWrite(_filepath)))
             {
                 writer.BaseStream.SetLength(0);
-                writer.Write((Entries.Count + 18) * 48);
-                writer.Write(Entries.Count + 18);
-
-                writer.Write(new byte[18 * 48]);
+                writer.Write((Entries.Count) * 48);
+                writer.Write(Entries.Count);
 
                 for (int i = 0; i < Entries.Count; i++)
                 {

CathodeLib/Scripts/CATHODE/CommandsPAK/Components/Entity.cs

@@ -682,7 +682,6 @@ public EntityPath(List<ShortGuid> _path)
         {
             path = _path;
 
-            //TODO: this whole system of modifying the path is dumb, should really come up with a better solution
             if (path.Count == 0 || path[path.Count - 1] != ShortGuid.Invalid)
                 path.Add(ShortGuid.Invalid);
         }

CathodeLib/Scripts/CATHODE/CommandsPAK/Helpers/CommandsUtils.cs

@@ -271,11 +271,11 @@ public static Entity ResolveHierarchy(Commands commands, Composite composite, Li
                 asString = "";
                 return null;
             }
-
+        
             List<ShortGuid> hierarchyCopy = new List<ShortGuid>();
             for (int x = 0; x < hierarchy.Count; x++)
                 hierarchyCopy.Add(new ShortGuid(hierarchy[x].ToUInt32()));
-
+        
             Composite currentFlowgraphToSearch = composite;
             if (currentFlowgraphToSearch == null || currentFlowgraphToSearch.GetEntityByID(hierarchyCopy[0]) == null)
             {
@@ -292,19 +292,19 @@ public static Entity ResolveHierarchy(Commands commands, Composite composite, Li
                     hierarchyCopy.RemoveAt(0);
                 }
             }
-
+        
             Entity entity = null;
             string hierarchyString = "";
             for (int i = 0; i < hierarchyCopy.Count; i++)
             {
                 entity = currentFlowgraphToSearch.GetEntityByID(hierarchyCopy[i]);
-
+        
                 if (entity == null) break;
                 if (includeShortGuids) hierarchyString += "[" + entity.shortGUID.ToByteString() + "] ";
                 hierarchyString += EntityUtils.GetName(currentFlowgraphToSearch.shortGUID, entity.shortGUID);
                 if (i >= hierarchyCopy.Count - 2) break; //Last is always 00-00-00-00
                 hierarchyString += " -> ";
-
+        
                 if (entity.variant == EntityVariant.FUNCTION)
                 {
                     Composite flowRef = commands.GetComposite(((FunctionEntity)entity).function);

CathodeLib/Scripts/CATHODE/CommandsPAK/Helpers/ShortGuidUtils.cs

@@ -53,6 +53,8 @@ public static ShortGuid Generate(string value, bool cache = true)
         {
             if (_vanilla.cache.ContainsKey(value)) 
                 return _vanilla.cache[value];
+            if (_custom.cache.ContainsKey(value))
+                return _custom.cache[value];
 
             SHA1Managed sha1 = new SHA1Managed();
             byte[] hash1 = sha1.ComputeHash(Encoding.UTF8.GetBytes(value));
@@ -133,9 +135,14 @@ private static void Cache(ShortGuid guid, string value, bool isVanilla = false)
             }
             else
             {
+                //TODO: need to fix this for BSPNOSTROMO_RIPLEY_PATCH
                 if (_custom.cache.ContainsKey(value)) return;
                 _custom.cache.Add(value, guid);
-                _custom.cacheReversed.Add(guid, value);
+                try
+                {
+                    _custom.cacheReversed.Add(guid, value);
+                }
+                catch { }
             }
         }