Merge phase 24 behavior numbers.

Co-authored-by: Cursor <cursoragent@cursor.com> # Conflicts: # docs/phases/README.md # src/HSchool.Content/CatalogLoader.cs
2026-08-20 00:36:32 +03:00
parent 2b4cd29bda f245076be8
commit 7a59ef27f4
11 changed files with 294 additions and 51 deletions
@@ -34,7 +34,7 @@ public sealed class CatalogLoader
        var resolved = ResolveInheritance(defs);
        ApplyPatches(resolved, patches);
        var catalog = Materialize(order, resolved, localesRu, localesEn);
-        ResolveReferences(catalog);
+        ResolveReferences(catalog, log);
        WarnMissingLabels(catalog, log);
        return catalog;
    }
@@ -399,7 +399,7 @@ public sealed class CatalogLoader
            en);
    }

-    private static void ResolveReferences(DefCatalog catalog)
+    private static void ResolveReferences(DefCatalog catalog, IContentLog log)
    {
        foreach (var thing in catalog.Things.Values)
        {
@@ -489,7 +489,7 @@ public sealed class CatalogLoader
            }
        }

-        PeopleDefValidator.Validate(catalog);
+        PeopleDefValidator.Validate(catalog, log);
    }

    private static void WarnMissingLabels(DefCatalog catalog, IContentLog log)