Fixed Coordinate Load ME support

Added function to coordinate load for when main feature is off
jalil49 · Mar 15, 2021 · d0b89cb · d0b89cb
1 parent ab39bc1
commit d0b89cb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/CharaEvent.cs b/src/CharaEvent.cs
@@ -936,6 +936,13 @@ protected override void OnCoordinateBeingLoaded(ChaFileCoordinate coordinate)
                     if (TextureQueue.Peek() != null && TextureQueue.Peek().ObjectType != ObjectType.Unknown)
                     {
                         MaterialTextureProperty ME_Info = TextureQueue.Dequeue();
+                        if (!ThisOutfitData.ME_Work && ME_Info.TexID != null)
+                        {
+                            if (ThisOutfitData.importDictionaryQueue[ME_Info.CoordinateIndex].TryGetValue((int)ME_Info.TexID, out byte[] imgbyte))
+                            {
+                                ME_Info.TexID = ME_Support.SetAndGetTextureID(imgbyte);
+                            }
+                        }
                         ME_Info.Slot = ACCpostion;
                         MaterialTexture.Add(ME_Info);
                     }
@@ -1042,8 +1049,13 @@ protected override void OnCoordinateBeingLoaded(ChaFileCoordinate coordinate)
                     if (TextureQueue.Peek() != null && TextureQueue.Peek().ObjectType != ObjectType.Unknown)
                     {
                         MaterialTextureProperty ME_Info = TextureQueue.Dequeue();
-                        ME_Info.Slot = ACCpostion;
-
+                        if (!ThisOutfitData.ME_Work && ME_Info.TexID != null)
+                        {
+                            if (ThisOutfitData.importDictionaryQueue[ME_Info.CoordinateIndex].TryGetValue((int)ME_Info.TexID, out byte[] imgbyte))
+                            {
+                                ME_Info.TexID = ME_Support.SetAndGetTextureID(imgbyte);
+                            }
+                        }
                         ME_Info.Slot = ACCpostion;
                         MaterialTexture.Add(ME_Info);
                     }
@@ -1147,6 +1159,13 @@ protected override void OnCoordinateBeingLoaded(ChaFileCoordinate coordinate)
                 if (TextureQueue.Peek() != null && TextureQueue.Peek().ObjectType != ObjectType.Unknown)
                 {
                     MaterialTextureProperty ME_Info = TextureQueue.Dequeue();
+                    if (!ThisOutfitData.ME_Work && ME_Info.TexID != null)
+                    {
+                        if (ThisOutfitData.importDictionaryQueue[ME_Info.CoordinateIndex].TryGetValue((int)ME_Info.TexID, out byte[] imgbyte))
+                        {
+                            ME_Info.TexID = ME_Support.SetAndGetTextureID(imgbyte);
+                        }
+                    }
                     ME_Info.Slot = ACCpostion;
                     MaterialTexture.Add(ME_Info);
                 }

diff --git a/src/ClothingLoader.cs b/src/ClothingLoader.cs
@@ -358,8 +358,6 @@ private void GeneralizedLoad(int outfitnum)
                                 ME_Info.TexID = ME_Support.SetAndGetTextureID(imgbyte);
                             }
                         }
-                        ME_Info.Slot = ACCpostion;
-
                         ME_Info.Slot = ACCpostion;
                         MaterialTexture.Add(ME_Info);
                     }