Fixed face keyword applied to NPCs with aborted face patching

Synthesis-Collective · Nov 24, 2023 · 2f4fda1 · 2f4fda1
1 parent ddfeaf0
commit 2f4fda1
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/SynthEBD/Patcher/Patcher.cs b/SynthEBD/Patcher/Patcher.cs
@@ -662,14 +662,17 @@ private void MainLoop(
                     _combinationLog.LogAssignment(currentNPCInfo, assignedCombinations, assignedPaths);
                     if (npcRecord.Keywords == null) { npcRecord.Keywords = new Noggog.ExtendedList<IFormLinkGetter<IKeywordGetter>>(); }
 
-                    if (_patcherState.TexMeshSettings.bLegacyEBDMode)
+                    if (npcRecord.HeadTexture.TryGetModKey(out var headTextureSourceMod) && headTextureSourceMod.Equals(outputMod.ModKey)) // if the patcher tried to patch but didn't set a head texture, don't apply the headpart script to this NPC
                     {
-                        npcRecord.Keywords.Add(EBDFaceKW);
-                        npcRecord.Keywords.Add(EBDScriptKW);
-                    }
-                    else
-                    {
-                        npcRecord.Keywords.Add(synthEBDFaceKW);
+                        if (_patcherState.TexMeshSettings.bLegacyEBDMode)
+                        {
+                            npcRecord.Keywords.Add(EBDFaceKW);
+                            npcRecord.Keywords.Add(EBDScriptKW);
+                        }
+                        else
+                        {
+                            npcRecord.Keywords.Add(synthEBDFaceKW);
+                        }
                     }
                     RecordGenerator.AddCustomKeywordsToNPC(assignedCombinations, npcRecord, outputMod);