Merge branch 'phase/42-talk-circles'

Co-authored-by: Cursor <cursoragent@cursor.com> # Conflicts: # docs/phases/README.md # src/HSchool.Simulation/PersonLog.cs
2026-08-20 09:03:38 +03:00
parent 91a72b9b99 ef36bd5d35
commit ac17abfd90
27 changed files with 1949 additions and 176 deletions
@@ -12,6 +12,7 @@ public static class PersonLogTypes
 {
    public const string ActionStarted = "action-started";
    public const string ActionEnded = "action-ended";
+    public const string TalkEnded = "talk-ended";
    public const string ApparelReplaced = "apparel-replaced";
    public const string ApparelChanged = "apparel-changed";
    public const string LessonNoTeacher = "lesson-no-teacher";
@@ -67,6 +68,14 @@ public sealed record PersonLogEvent(string PersonId, DateTime Time, string Type,
            return string.Format(CultureInfo.InvariantCulture, catalog.Text(locale, "LessonNoTeacher"), name);
        }

+        if (Type.Equals(PersonLogTypes.TalkEnded, StringComparison.Ordinal))
+        {
+            var topic = catalog.Topics.TryGetValue(ThingDef ?? "", out var def)
+                ? catalog.Label(locale, def)
+                : ThingDef ?? Type;
+            return string.Format(CultureInfo.InvariantCulture, catalog.Text(locale, "TalkEnded"), topic);
+        }
+
        return Type;
    }
 }