Merge branch 'phase/44-quarrel-fight'

Co-authored-by: Cursor <cursoragent@cursor.com>

# Conflicts:
#	docs/phases/README.md
#	src/HSchool.Content/PeopleDefs.cs
#	src/HSchool.People/Roster.cs
#	src/HSchool.People/Seed.cs
This commit is contained in:
Leonid Pershin
2026-08-20 13:24:12 +03:00
21 changed files with 1505 additions and 24 deletions
+6
View File
@@ -63,6 +63,12 @@ public sealed record Person
/// <summary>Crushes and the one pair. Null without an orientation pack. Mutable overlay.</summary>
public PersonBonds? Bonds { get; set; }
/// <summary>
/// Victim a bully keeps aiming at. Cleared when they leave the roster or opinion hits the floor.
/// Null on everyone without a remembers-victim trait.
/// </summary>
public string? BullyVictimId { get; set; }
public int AgeOn(DateTime asOf) => SchoolYears.AgeYears(BirthDate, asOf);
}
+1
View File
@@ -19,6 +19,7 @@ public static class Seed
public const int ApparelSalt = 11;
public const int WhisperSalt = 12;
public const int OrientationSalt = 13;
public const int ConflictSalt = 14;
/// <summary>A stream that belongs to the school rather than to one family.</summary>
public static int ForSchool(int schoolSeed, int salt) => Mix(schoolSeed, familyIndex: -1, salt);