Merge phase 24 behavior numbers.
ci / server (push) Failing after 3m35s
ci / client (push) Successful in 13s

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

# Conflicts:
#	docs/phases/README.md
#	src/HSchool.Content/CatalogLoader.cs
This commit is contained in:
Leonid Pershin
2026-08-20 00:36:32 +03:00
11 changed files with 294 additions and 51 deletions
@@ -0,0 +1,50 @@
namespace HSchool.Content.Tests;
public class BehaviorDefTests
{
private readonly CatalogLoader _loader = new();
[Theory]
[InlineData("dutyLessonWeight")]
[InlineData("dutyTravelWeight")]
[InlineData("needWeightAtZero")]
[InlineData("lunchWeight")]
public void NegativeGoalWeight_FailsTheCatalog(string field)
{
var error = Assert.Throws<ContentLoadException>(() => _loader.Load(
[CatalogLoader.CorePackId],
[
PackDocuments.Def(
CatalogLoader.CorePackId,
"behavior",
"rules",
$$"""{ "defName": "Behavior", "{{field}}": -1 }"""),
]));
Assert.Contains("negative", error.Message, StringComparison.OrdinalIgnoreCase);
Assert.Contains("Behavior", error.Message, StringComparison.Ordinal);
}
[Fact]
public void LunchHeavierThanLesson_WarnsAndStillLoads()
{
var log = new RecordingLog();
var catalog = _loader.Load(
[CatalogLoader.CorePackId],
[
PackDocuments.Def(
CatalogLoader.CorePackId,
"behavior",
"rules",
"""{ "defName": "Behavior", "dutyLessonWeight": 10, "lunchWeight": 11 }"""),
],
log);
Assert.NotNull(catalog.BehaviorRules);
Assert.Equal(11f, catalog.BehaviorRules.LunchWeight);
Assert.Contains(
log.Warnings,
warning => warning.Contains("lunchWeight", StringComparison.Ordinal)
&& warning.Contains("dutyLessonWeight", StringComparison.Ordinal));
}
}
@@ -81,6 +81,10 @@ public class VanillaCoreTests
Assert.Equal(0, catalog.BehaviorRules.CommuteSlackMin);
Assert.Equal(6, catalog.BehaviorRules.CommuteSlackMax);
Assert.Equal(0.35f, catalog.BehaviorRules.NeedThreshold);
Assert.Equal(10f, catalog.BehaviorRules.DutyLessonWeight);
Assert.Equal(5f, catalog.BehaviorRules.DutyTravelWeight);
Assert.Equal(20f, catalog.BehaviorRules.NeedWeightAtZero);
Assert.Equal(6f, catalog.BehaviorRules.LunchWeight);
}
/// <summary>