Add opinions storage, morning drift, and Connections card tab.

This commit is contained in:
Leonid Pershin
2026-08-20 07:34:57 +03:00
parent b9d91d387e
commit b1b4f18b40
24 changed files with 1020 additions and 27 deletions
+13 -13
View File
@@ -12,25 +12,25 @@
## Задачи ## Задачи
- [ ] Мнение A→B: −100…100, несимметрично, ноль не хранить - [x] Мнение A→B: −100…100, несимметрично, ноль не хранить
- [ ] Пороги и подписи в `BehaviorDef`; клиент рисует присланную подпись, не считает сам - [x] Пороги и подписи в `BehaviorDef`; клиент рисует присланную подпись, не считает сам
- [ ] Генератор ставит семейные старты (родители, сиблинги, партнёры семьи) из данных - [x] Генератор ставит семейные старты (родители, сиблинги, партнёры семьи) из данных
- [ ] Каждое рабочее утро (и skip) ненулевые мнения слегка дрейфуют к семейному базису или к нулю; - [x] Каждое рабочее утро (и skip) ненулевые мнения слегка дрейфуют к семейному базису или к нулю;
дошли до нуля — запись выкинуть дошли до нуля — запись выкинуть
- [ ] `people.json` пишет мнение при сдвиге; старый сейв без поля — все нули кроме семьи - [x] `people.json` пишет мнение при сдвиге; старый сейв без поля — все нули кроме семьи
после первой загрузки-переписи после первой загрузки-переписи
- [ ] Вкладка карточки **Связи**: семья с числами, топ друзей/врагов, поиск по ненулевым - [x] Вкладка карточки **Связи**: семья с числами, топ друзей/врагов, поиск по ненулевым
- [ ] Игрок с вкладки ничего не меняет - [x] Игрок с вкладки ничего не меняет
- [ ] `docs/protocol.md` — HTTP карточки - [x] `docs/protocol.md` — HTTP карточки
## Тесты, без которых фаза не закрыта ## Тесты, без которых фаза не закрыта
- [ ] Родитель и ребёнок после генерации имеют плюс в обе стороны; чужие одноклассники — нет записи - [x] Родитель и ребёнок после генерации имеют плюс в обе стороны; чужие одноклассники — нет записи
- [ ] A→B и B→A могут различаться - [x] A→B и B→A могут различаться
- [ ] После нескольких утренних дрейфов без разговоров мнение одноклассников (если появилось) - [x] После нескольких утренних дрейфов без разговоров мнение одноклассников (если появилось)
ближе к нулю, семейное — к старту, не к нулю ближе к нулю, семейное — к старту, не к нулю
- [ ] Карточка без отдельного запроса «всех пар школы»: только этот человек - [x] Карточка без отдельного запроса «всех пар школы»: только этот человек
- [ ] Клиентский тест: вкладка «Связи» не монтирует лог - [x] Клиентский тест: вкладка «Связи» не монтирует лог
## Критерий готовности ## Критерий готовности
+32 -1
View File
@@ -269,6 +269,10 @@ person. `customPortraitPrompt` is the last saved user prompt for the custom vari
They are filled on the HTTP thread after the worker returns the card; generation does They are filled on the HTTP thread after the worker returns the card; generation does
not happen on this request. not happen on this request.
`connections` is the **Связи** tab: family links with `opinion` / `opinionLabel` from catalog bands,
plus `friends`, `enemies` and `others` (every non-family non-zero pair for this person only).
The client does not compute thresholds. There is no school-wide opinions endpoint.
```json ```json
{ {
"id": "f0.c0", "id": "f0.c0",
@@ -321,7 +325,34 @@ not happen on this request.
"hasAvatar": false, "hasAvatar": false,
"hasCustom": false, "hasCustom": false,
"hasFullBody": false, "hasFullBody": false,
"customPortraitPrompt": null "customPortraitPrompt": null,
"connections": {
"family": {
"parents": [
{
"id": "f0.p1",
"fullName": "Иванова Ольга Михайловна",
"female": true,
"opinion": 75,
"opinionLabel": "близкие друзья"
}
],
"children": [],
"siblings": [
{
"id": "f0.c1",
"fullName": "Иванов Кирилл Петрович",
"female": false,
"opinion": 45,
"opinionLabel": "друзья"
}
],
"partners": []
},
"friends": [],
"enemies": [],
"others": []
}
} }
``` ```
+12
View File
@@ -178,7 +178,13 @@ const ru = {
peopleTabApparel: 'Одежда', peopleTabApparel: 'Одежда',
peopleTabCarry: 'Ноша', peopleTabCarry: 'Ноша',
peopleTabNow: 'Сейчас', peopleTabNow: 'Сейчас',
peopleTabConnections: 'Связи',
peopleTabPortrait: 'Портрет', peopleTabPortrait: 'Портрет',
peopleConnectionsFriends: 'Друзья',
peopleConnectionsEnemies: 'Враги',
peopleConnectionsSearch: 'Поиск по связям',
peopleConnectionsEmpty: 'Нет других связей.',
peopleOpinionValue: '{label} ({value})',
peopleAtHome: 'дома', peopleAtHome: 'дома',
peopleApparelFit: 'Уместность: {value}', peopleApparelFit: 'Уместность: {value}',
peopleLockerYes: 'Есть шкафчик', peopleLockerYes: 'Есть шкафчик',
@@ -507,7 +513,13 @@ const en: Messages = {
peopleTabApparel: 'Clothes', peopleTabApparel: 'Clothes',
peopleTabCarry: 'Carried', peopleTabCarry: 'Carried',
peopleTabNow: 'Now', peopleTabNow: 'Now',
peopleTabConnections: 'Connections',
peopleTabPortrait: 'Portrait', peopleTabPortrait: 'Portrait',
peopleConnectionsFriends: 'Friends',
peopleConnectionsEnemies: 'Enemies',
peopleConnectionsSearch: 'Search connections',
peopleConnectionsEmpty: 'No other connections.',
peopleOpinionValue: '{label} ({value})',
peopleAtHome: 'home', peopleAtHome: 'home',
peopleApparelFit: 'Fit: {value}', peopleApparelFit: 'Fit: {value}',
peopleLockerYes: 'Has a locker', peopleLockerYes: 'Has a locker',
+23
View File
@@ -262,6 +262,28 @@ export interface PersonRel {
readonly id: string; readonly id: string;
readonly fullName: string; readonly fullName: string;
readonly female: boolean; readonly female: boolean;
readonly opinion?: number | null;
readonly opinionLabel?: string | null;
}
export interface PersonOpinionLink {
readonly id: string;
readonly fullName: string;
readonly female: boolean;
readonly opinion: number;
readonly opinionLabel: string;
}
export interface PersonConnections {
readonly family: {
readonly parents: readonly PersonRel[];
readonly children: readonly PersonRel[];
readonly siblings: readonly PersonRel[];
readonly partners: readonly PersonRel[];
};
readonly friends: readonly PersonOpinionLink[];
readonly enemies: readonly PersonOpinionLink[];
readonly others: readonly PersonOpinionLink[];
} }
export interface PersonCard { export interface PersonCard {
@@ -301,6 +323,7 @@ export interface PersonCard {
readonly hasCustom: boolean; readonly hasCustom: boolean;
readonly hasFullBody: boolean; readonly hasFullBody: boolean;
readonly customPortraitPrompt: string | null; readonly customPortraitPrompt: string | null;
readonly connections: PersonConnections | null;
} }
export interface WornItem { export interface WornItem {
@@ -78,6 +78,7 @@ function personCard(): PersonCard {
hasCustom: false, hasCustom: false,
hasFullBody: false, hasFullBody: false,
customPortraitPrompt: null, customPortraitPrompt: null,
connections: null,
}; };
} }
@@ -64,6 +64,25 @@ function card(overrides: Partial<PersonCard> = {}): PersonCard {
hasCustom: false, hasCustom: false,
hasFullBody: false, hasFullBody: false,
customPortraitPrompt: null, customPortraitPrompt: null,
connections: {
family: {
parents: [
{
id: 'f0.p0',
fullName: 'Иванова Ольга',
female: true,
opinion: 75,
opinionLabel: 'близкие друзья',
},
],
children: [],
siblings: [],
partners: [],
},
friends: [],
enemies: [],
others: [],
},
...overrides, ...overrides,
}; };
} }
@@ -261,6 +280,17 @@ describe('renderPersonCard', () => {
expect(root.querySelector('.people__log-tools')).toBeNull(); expect(root.querySelector('.people__log-tools')).toBeNull();
}); });
it('does not mount the log table on the connections tab', () => {
setLocale('ru');
const root = document.createElement('div');
renderPersonCard(root, card(), () => {}, { tab: 'connections', log: logPage() });
expect(root.querySelector('[data-card-tab="connections"]')?.hasAttribute('hidden')).toBe(false);
expect(root.textContent).toContain('близкие друзья');
expect(root.querySelector('.people__log')).toBeNull();
expect(root.querySelector('.people__log-tools')).toBeNull();
});
it('pages the log on the now tab', () => { it('pages the log on the now tab', () => {
setLocale('ru'); setLocale('ru');
const onLogPage = vi.fn(); const onLogPage = vi.fn();
+130 -3
View File
@@ -4,13 +4,14 @@ import type {
PersonLogDir, PersonLogDir,
PersonLogPage, PersonLogPage,
PersonLogQuery, PersonLogQuery,
PersonOpinionLink,
PersonRel, PersonRel,
PersonRole, PersonRole,
} from '../net/api.ts'; } from '../net/api.ts';
import { portraitUrl, type PortraitKind, type PortraitPrompt } from '../net/api.ts'; import { portraitUrl, type PortraitKind, type PortraitPrompt } from '../net/api.ts';
import { formatGameTimeOfDay } from '../format/gameTime.ts'; import { formatGameTimeOfDay } from '../format/gameTime.ts';
import { t, type MessageKey } from '../i18n/strings.ts'; import { t, type MessageKey } from '../i18n/strings.ts';
import { el } from './dom.ts'; import { clear, el } from './dom.ts';
const ROLE_KEYS: Record<PersonRole, MessageKey> = { const ROLE_KEYS: Record<PersonRole, MessageKey> = {
student: 'peopleRoleStudent', student: 'peopleRoleStudent',
@@ -18,7 +19,7 @@ const ROLE_KEYS: Record<PersonRole, MessageKey> = {
parent: 'peopleRoleParent', parent: 'peopleRoleParent',
}; };
export type PersonCardTab = 'overview' | 'apparel' | 'carry' | 'now' | 'portrait'; export type PersonCardTab = 'overview' | 'apparel' | 'carry' | 'now' | 'connections' | 'portrait';
export interface RenderPersonCardOptions { export interface RenderPersonCardOptions {
readonly place?: string; readonly place?: string;
@@ -110,6 +111,7 @@ export function renderPersonCard(
apparel: el('div', { class: 'people__tab-panel', dataset: { cardTab: 'apparel' } }), apparel: el('div', { class: 'people__tab-panel', dataset: { cardTab: 'apparel' } }),
carry: el('div', { class: 'people__tab-panel', dataset: { cardTab: 'carry' } }), carry: el('div', { class: 'people__tab-panel', dataset: { cardTab: 'carry' } }),
now: el('div', { class: 'people__tab-panel', dataset: { cardTab: 'now' } }), now: el('div', { class: 'people__tab-panel', dataset: { cardTab: 'now' } }),
connections: el('div', { class: 'people__tab-panel', dataset: { cardTab: 'connections' } }),
portrait: el('div', { class: 'people__tab-panel people__portrait-panel', dataset: { cardTab: 'portrait' } }), portrait: el('div', { class: 'people__tab-panel people__portrait-panel', dataset: { cardTab: 'portrait' } }),
}; };
@@ -118,6 +120,7 @@ export function renderPersonCard(
apparel: 'peopleTabApparel', apparel: 'peopleTabApparel',
carry: 'peopleTabCarry', carry: 'peopleTabCarry',
now: 'peopleTabNow', now: 'peopleTabNow',
connections: 'peopleTabConnections',
portrait: 'peopleTabPortrait', portrait: 'peopleTabPortrait',
}; };
@@ -142,6 +145,7 @@ export function renderPersonCard(
fillApparel(panels.apparel, card); fillApparel(panels.apparel, card);
fillCarry(panels.carry, card); fillCarry(panels.carry, card);
fillNow(panels.now, card, options.away === true, tab === 'now' ? options.log : null, options); fillNow(panels.now, card, options.away === true, tab === 'now' ? options.log : null, options);
fillConnections(panels.connections, card, onRelative);
fillPortrait(panels.portrait, card, options); fillPortrait(panels.portrait, card, options);
const showTab = (next: PersonCardTab): void => { const showTab = (next: PersonCardTab): void => {
@@ -160,7 +164,7 @@ export function renderPersonCard(
showTab(tab); showTab(tab);
parent.append(tabs, panels.overview, panels.apparel, panels.carry, panels.now, panels.portrait); parent.append(tabs, panels.overview, panels.apparel, panels.carry, panels.now, panels.connections, panels.portrait);
} }
function fillOverview(parent: HTMLElement, card: PersonCard, onRelative: (id: string) => void): void { function fillOverview(parent: HTMLElement, card: PersonCard, onRelative: (id: string) => void): void {
@@ -256,6 +260,46 @@ function fillCarry(parent: HTMLElement, card: PersonCard): void {
parent.append(grid ); parent.append(grid );
} }
function fillConnections(parent: HTMLElement, card: PersonCard, onRelative: (id: string) => void): void {
const connections = card.connections;
if (connections === null) {
return;
}
const family = section(t('peopleFamily'));
appendRelativesWithOpinion(family, t('peopleParents'), connections.family.parents, onRelative);
appendRelativesWithOpinion(family, t('peopleChildren'), connections.family.children, onRelative);
appendRelativesWithOpinion(family, t('peopleSiblings'), connections.family.siblings, onRelative);
appendRelativesWithOpinion(family, t('peoplePartners'), connections.family.partners, onRelative);
if (family.childElementCount > 1) {
parent.append(family);
}
appendOpinionLinks(parent, t('peopleConnectionsFriends'), connections.friends, onRelative);
appendOpinionLinks(parent, t('peopleConnectionsEnemies'), connections.enemies, onRelative);
const search = el('input', { class: 'input people__input', type: 'search' });
search.placeholder = t('peopleConnectionsSearch');
const list = el('div', { class: 'people__connections-list' });
const renderMatches = (): void => {
clear(list);
const query = search.value.trim().toLocaleLowerCase();
const matches = connections.others.filter((row) =>
query.length === 0 ? true : row.fullName.toLocaleLowerCase().includes(query),
);
if (matches.length === 0) {
list.append(el('p', { class: 'panel__empty', text: t('peopleConnectionsEmpty') }));
return;
}
appendOpinionLinks(list, '', matches, onRelative, false);
};
search.addEventListener('input', renderMatches);
parent.append(search, list);
renderMatches();
}
function fillNow( function fillNow(
parent: HTMLElement, parent: HTMLElement,
card: PersonCard, card: PersonCard,
@@ -682,3 +726,86 @@ function appendRelatives(
), ),
); );
} }
function appendRelativesWithOpinion(
parent: HTMLElement,
title: string,
relatives: readonly PersonRel[],
open: (id: string) => void,
): void {
if (relatives.length === 0) {
return;
}
const list = el('span', { class: 'people__rel-list' });
for (const relative of relatives) {
const caption =
relative.opinion !== null &&
relative.opinion !== undefined &&
relative.opinionLabel !== null &&
relative.opinionLabel !== undefined
? t('peopleOpinionValue', { label: relative.opinionLabel, value: relative.opinion })
: relative.fullName;
list.append(
el('button', {
class: 'people__link',
type: 'button',
text: caption,
title: relative.fullName,
onClick: () => open(relative.id),
}),
);
}
parent.append(
el(
'div',
{ class: 'people__rel' },
el('span', { class: 'people__rel-title', text: title }),
list,
),
);
}
function appendOpinionLinks(
parent: HTMLElement,
title: string,
rows: readonly PersonOpinionLink[],
open: (id: string) => void,
titled = true,
): void {
if (rows.length === 0) {
return;
}
const block = el('div', { class: 'people__connections-block' });
if (titled && title.length > 0) {
block.append(el('h4', { class: 'people__section-title', text: title }));
}
const list = el('dl', { class: 'people__pairs' });
for (const row of rows) {
list.append(
el(
'div',
{ class: 'people__pair' },
el(
'dt',
{},
el('button', {
class: 'people__link',
type: 'button',
text: row.fullName,
onClick: () => open(row.id),
}),
),
el('dd', {
text: t('peopleOpinionValue', { label: row.opinionLabel, value: row.opinion }),
}),
),
);
}
block.append(list);
parent.append(block);
}
+40
View File
@@ -308,6 +308,38 @@ public sealed class BehaviorDef : Def
/// <summary>Game minutes for <c>ChangeClothes*</c> actions.</summary> /// <summary>Game minutes for <c>ChangeClothes*</c> actions.</summary>
public float ChangeClothesMinutes { get; init; } = 5f; public float ChangeClothesMinutes { get; init; } = 5f;
/// <summary>Parent → child start. Child → parent uses <see cref="OpinionChildToParentStart"/>.</summary>
public int OpinionParentToChildStart { get; init; } = 85;
public int OpinionChildToParentStart { get; init; } = 75;
public int OpinionSiblingStart { get; init; } = 45;
public int OpinionPartnerStart { get; init; } = 65;
/// <summary>Points each work morning moves an opinion toward family basis or zero.</summary>
public int OpinionDriftPerMorning { get; init; } = 3;
/// <summary>How many non-family friends or enemies the card lists at the top.</summary>
public int OpinionTopCount { get; init; } = 5;
/// <summary>
/// Caption bands for 100…100. Highest <see cref="OpinionBand.Min"/> the value still meets wins.
/// Empty falls back to <see cref="DefaultOpinionBands"/>.
/// </summary>
public IReadOnlyList<OpinionBand> OpinionBands { get; init; } = DefaultOpinionBands;
public static IReadOnlyList<OpinionBand> DefaultOpinionBands { get; } =
[
new() { Min = 70, Id = "OpinionCloseFriend" },
new() { Min = 40, Id = "OpinionFriend" },
new() { Min = 20, Id = "OpinionPleasant" },
new() { Min = 1, Id = "OpinionAcquaintance" },
new() { Min = -1, Id = "OpinionStrained" },
new() { Min = -40, Id = "OpinionDislike" },
new() { Min = -100, Id = "OpinionEnemy" },
];
public static IReadOnlyList<ApparelConditionBand> DefaultConditionBands { get; } = public static IReadOnlyList<ApparelConditionBand> DefaultConditionBands { get; } =
[ [
new() { Min = 0.75f, Id = "ApparelConditionIntact" }, new() { Min = 0.75f, Id = "ApparelConditionIntact" },
@@ -325,6 +357,14 @@ public sealed class ApparelConditionBand
public required string Id { get; init; } public required string Id { get; init; }
} }
/// <summary>One caption on an opinion value. <see cref="Id"/> is a locale key, not a Def.</summary>
public sealed class OpinionBand
{
public int Min { get; init; }
public required string Id { get; init; }
}
public enum BodyAttributeKind public enum BodyAttributeKind
{ {
Number, Number,
+97
View File
@@ -0,0 +1,97 @@
using HSchool.Content;
namespace HSchool.People;
/// <summary>Seeds family opinions at generation or when an old save lacks them.</summary>
public static class OpinionGenerator
{
public static Roster SeedFamily(DefCatalog catalog, Roster roster)
{
ArgumentNullException.ThrowIfNull(catalog);
ArgumentNullException.ThrowIfNull(roster);
var rules = catalog.BehaviorRules;
if (rules is null)
{
return roster;
}
var people = new Person[roster.People.Count];
var changed = false;
for (var i = 0; i < roster.People.Count; i++)
{
var person = roster.People[i];
var updated = SeedPersonFamilyOpinions(roster, rules, roster.People, person);
people[i] = updated;
changed |= !ReferenceEquals(updated, person);
}
return changed ? roster with { People = people } : roster;
}
public static bool NeedsFamilyOpinions(Roster roster)
{
var people = roster.People.ToDictionary(person => person.Id, StringComparer.Ordinal);
foreach (var family in roster.Families)
{
foreach (var childId in family.ChildIds)
{
if (!people.TryGetValue(childId, out var child))
{
continue;
}
foreach (var parentId in family.ParentIds)
{
if (!child.Opinions.ContainsKey(parentId))
{
return true;
}
}
}
}
return false;
}
public static Person EnsureMutableOpinions(Person person)
{
if (person.Opinions is Dictionary<string, int>)
{
return person;
}
return person with
{
Opinions = new Dictionary<string, int>(person.Opinions, StringComparer.Ordinal),
};
}
private static Person SeedPersonFamilyOpinions(
Roster roster,
BehaviorDef rules,
IReadOnlyList<Person> rosterPeople,
Person person)
{
var mutable = EnsureMutableOpinions(person);
var changed = !ReferenceEquals(mutable, person);
var peopleById = rosterPeople.ToDictionary(row => row.Id, StringComparer.Ordinal);
foreach (var targetId in OpinionStore.FamilyMemberIds(roster, person))
{
if (!peopleById.TryGetValue(targetId, out var target))
{
continue;
}
var basis = OpinionStore.FamilyBasis(roster, rules, mutable, target);
if (basis == 0 || mutable.Opinions.ContainsKey(targetId))
{
continue;
}
changed |= OpinionStore.Set(mutable, targetId, basis);
}
return changed ? mutable : person;
}
}
+30
View File
@@ -0,0 +1,30 @@
using HSchool.Content;
namespace HSchool.People;
/// <summary>Threshold captions live in the catalog. The client draws what it is told.</summary>
public static class OpinionLabels
{
public const int MinValue = -100;
public const int MaxValue = 100;
public static string BandId(BehaviorDef? rules, int value)
{
var bands = rules?.OpinionBands is { Count: > 0 } listed
? listed
: BehaviorDef.DefaultOpinionBands;
OpinionBand? best = null;
foreach (var band in bands)
{
if (value >= band.Min && (best is null || band.Min > best.Min))
{
best = band;
}
}
return best?.Id ?? "OpinionAcquaintance";
}
public static string Label(DefCatalog catalog, string locale, int value) =>
catalog.Text(locale, BandId(catalog.BehaviorRules, value));
}
+147
View File
@@ -0,0 +1,147 @@
using HSchool.Content;
namespace HSchool.People;
/// <summary>Sparse A→B opinions on a person. Zero is not stored.</summary>
public static class OpinionStore
{
public static int? Get(Person person, string targetId) =>
person.Opinions.TryGetValue(targetId, out var value) ? value : null;
public static bool Set(Person person, string targetId, int value)
{
value = Math.Clamp(value, OpinionLabels.MinValue, OpinionLabels.MaxValue);
if (value == 0)
{
return Remove(person, targetId);
}
if (person.Opinions is not IDictionary<string, int> dict)
{
throw new InvalidOperationException($"Cannot mutate opinions for {person.Id}.");
}
if (dict.IsReadOnly)
{
throw new InvalidOperationException($"Cannot mutate opinions for {person.Id}.");
}
if (dict.TryGetValue(targetId, out var existing) && existing == value)
{
return false;
}
dict[targetId] = value;
return true;
}
public static bool Remove(Person person, string targetId)
{
if (person.Opinions is not IDictionary<string, int> dict)
{
throw new InvalidOperationException($"Cannot mutate opinions for {person.Id}.");
}
if (dict.IsReadOnly)
{
throw new InvalidOperationException($"Cannot mutate opinions for {person.Id}.");
}
return dict.Remove(targetId);
}
public static int FamilyBasis(Roster roster, BehaviorDef rules, Person from, Person to)
{
var family = roster.Families.FirstOrDefault(candidate =>
candidate.Id.Equals(from.FamilyId, StringComparison.Ordinal)
&& candidate.Id.Equals(to.FamilyId, StringComparison.Ordinal));
if (family is null)
{
return 0;
}
var fromParent = InFamily(family.ParentIds, from.Id);
var toParent = InFamily(family.ParentIds, to.Id);
var fromChild = InFamily(family.ChildIds, from.Id);
var toChild = InFamily(family.ChildIds, to.Id);
if (fromParent && toChild)
{
return rules.OpinionParentToChildStart;
}
if (fromChild && toParent)
{
return rules.OpinionChildToParentStart;
}
if (fromChild && toChild && !from.Id.Equals(to.Id, StringComparison.Ordinal))
{
return rules.OpinionSiblingStart;
}
if (fromParent && toParent && !from.Id.Equals(to.Id, StringComparison.Ordinal))
{
return rules.OpinionPartnerStart;
}
return 0;
}
public static int MoveToward(int current, int target, int step)
{
if (current == target)
{
return current;
}
if (current < target)
{
return Math.Min(current + step, target);
}
return Math.Max(current - step, target);
}
public static HashSet<string> FamilyMemberIds(Roster roster, Person person)
{
var family = roster.Families.FirstOrDefault(candidate =>
candidate.Id.Equals(person.FamilyId, StringComparison.Ordinal));
if (family is null)
{
return [];
}
var ids = new HashSet<string>(StringComparer.Ordinal);
foreach (var id in family.ParentIds)
{
if (!id.Equals(person.Id, StringComparison.Ordinal))
{
ids.Add(id);
}
}
foreach (var id in family.ChildIds)
{
if (!id.Equals(person.Id, StringComparison.Ordinal))
{
ids.Add(id);
}
}
return ids;
}
private static bool InFamily(IReadOnlyList<string> ids, string id)
{
foreach (var candidate in ids)
{
if (candidate.Equals(id, StringComparison.Ordinal))
{
return true;
}
}
return false;
}
}
+3
View File
@@ -52,6 +52,9 @@ public sealed record Person
/// <summary>Changing-room node when this pupil won a locker slot. Null for staff and the rest.</summary> /// <summary>Changing-room node when this pupil won a locker slot. Null for staff and the rest.</summary>
public string? LockerRoomId { get; init; } public string? LockerRoomId { get; init; }
/// <summary>What this person thinks of others, A→B. Sparse; zero is not stored.</summary>
public IReadOnlyDictionary<string, int> Opinions { get; init; } = new Dictionary<string, int>(StringComparer.Ordinal);
public int AgeOn(DateTime asOf) => SchoolYears.AgeYears(BirthDate, asOf); public int AgeOn(DateTime asOf) => SchoolYears.AgeYears(BirthDate, asOf);
} }
+2 -1
View File
@@ -44,7 +44,8 @@ public static class RosterGenerator
} }
var classes = FillClasses(demand.Classes, people); var classes = FillClasses(demand.Classes, people);
return LockerAssigner.Apply(catalog, map, new Roster(people, families, classes)); var roster = LockerAssigner.Apply(catalog, map, new Roster(people, families, classes));
return OpinionGenerator.SeedFamily(catalog, roster);
} }
/// <summary> /// <summary>
+21 -2
View File
@@ -81,7 +81,8 @@ internal sealed record PersonCardResponse(
bool HasAvatar = false, bool HasAvatar = false,
bool HasCustom = false, bool HasCustom = false,
bool HasFullBody = false, bool HasFullBody = false,
string? CustomPortraitPrompt = null); string? CustomPortraitPrompt = null,
PersonConnectionsResponse? Connections = null);
internal sealed record WornItemResponse( internal sealed record WornItemResponse(
string DefName, string DefName,
@@ -111,7 +112,25 @@ internal sealed record PersonFamilyResponse(
IReadOnlyList<PersonRelResponse> Siblings, IReadOnlyList<PersonRelResponse> Siblings,
IReadOnlyList<PersonRelResponse> Partners); IReadOnlyList<PersonRelResponse> Partners);
internal sealed record PersonRelResponse(string Id, string FullName, bool Female); internal sealed record PersonRelResponse(
string Id,
string FullName,
bool Female,
int? Opinion = null,
string? OpinionLabel = null);
internal sealed record PersonOpinionLinkResponse(
string Id,
string FullName,
bool Female,
int Opinion,
string OpinionLabel);
internal sealed record PersonConnectionsResponse(
PersonFamilyResponse Family,
IReadOnlyList<PersonOpinionLinkResponse> Friends,
IReadOnlyList<PersonOpinionLinkResponse> Enemies,
IReadOnlyList<PersonOpinionLinkResponse> Others);
internal sealed record DirectoryResponse(IReadOnlyList<DirectoryPersonResponse> People); internal sealed record DirectoryResponse(IReadOnlyList<DirectoryPersonResponse> People);
+111 -3
View File
@@ -88,7 +88,8 @@ internal static class PersonCardReader
Capacity(person, skills, catalog), Capacity(person, skills, catalog),
person.LockerRoomId is not null person.LockerRoomId is not null
|| person.Items.Any(item => item.Location.Equals(ItemLocations.Locker, StringComparison.Ordinal)), || person.Items.Any(item => item.Location.Equals(ItemLocations.Locker, StringComparison.Ordinal)),
person.Items.Count(item => item.Location.Equals(ItemLocations.Home, StringComparison.Ordinal))); person.Items.Count(item => item.Location.Equals(ItemLocations.Home, StringComparison.Ordinal)),
Connections: Connections(roster, person, catalog, locale));
} }
private static IReadOnlyDictionary<string, float>? LiveNeeds(World world, string personId) private static IReadOnlyDictionary<string, float>? LiveNeeds(World world, string personId)
@@ -373,8 +374,8 @@ internal static class PersonCardReader
} }
var people = roster.People.ToDictionary(member => member.Id, StringComparer.Ordinal); var people = roster.People.ToDictionary(member => member.Id, StringComparer.Ordinal);
var inParents = family.ParentIds.Contains(person.Id, StringComparer.Ordinal); var inParents = InFamily(family.ParentIds, person.Id);
var inChildren = family.ChildIds.Contains(person.Id, StringComparer.Ordinal); var inChildren = InFamily(family.ChildIds, person.Id);
return new PersonFamilyResponse( return new PersonFamilyResponse(
inChildren ? Relatives(family.ParentIds, people, except: person.Id) : [], inChildren ? Relatives(family.ParentIds, people, except: person.Id) : [],
inParents ? Relatives(family.ChildIds, people, except: person.Id) : [], inParents ? Relatives(family.ChildIds, people, except: person.Id) : [],
@@ -382,6 +383,19 @@ internal static class PersonCardReader
inParents ? Relatives(family.ParentIds, people, except: person.Id) : []); inParents ? Relatives(family.ParentIds, people, except: person.Id) : []);
} }
private static bool InFamily(IReadOnlyList<string> ids, string id)
{
foreach (var candidate in ids)
{
if (candidate.Equals(id, StringComparison.Ordinal))
{
return true;
}
}
return false;
}
private static IReadOnlyList<PersonRelResponse> Relatives( private static IReadOnlyList<PersonRelResponse> Relatives(
IReadOnlyList<string> ids, IReadOnlyList<string> ids,
IReadOnlyDictionary<string, Person> people, IReadOnlyDictionary<string, Person> people,
@@ -400,4 +414,98 @@ internal static class PersonCardReader
return rows; return rows;
} }
private static PersonConnectionsResponse Connections(
Roster roster,
Person person,
DefCatalog? catalog,
string locale)
{
var familyIds = OpinionStore.FamilyMemberIds(roster, person);
var people = roster.People.ToDictionary(member => member.Id, StringComparer.Ordinal);
var family = FamilyWithOpinions(roster, person, people, catalog, locale);
var others = new List<PersonOpinionLinkResponse>();
foreach (var (targetId, value) in person.Opinions)
{
if (familyIds.Contains(targetId) || !people.TryGetValue(targetId, out var target))
{
continue;
}
others.Add(Link(target, value, catalog, locale));
}
others.Sort((left, right) =>
{
var byAbs = Math.Abs(right.Opinion).CompareTo(Math.Abs(left.Opinion));
return byAbs != 0
? byAbs
: string.Compare(left.FullName, right.FullName, StringComparison.Ordinal);
});
var top = catalog?.BehaviorRules?.OpinionTopCount ?? 5;
var friends = others.Where(row => row.Opinion > 0).Take(top).ToArray();
var enemies = others.Where(row => row.Opinion < 0).Take(top).ToArray();
return new PersonConnectionsResponse(family, friends, enemies, others);
}
private static PersonFamilyResponse FamilyWithOpinions(
Roster roster,
Person person,
IReadOnlyDictionary<string, Person> people,
DefCatalog? catalog,
string locale)
{
var family = roster.Families.FirstOrDefault(candidate => candidate.Id.Equals(person.FamilyId, StringComparison.Ordinal));
if (family is null)
{
return new PersonFamilyResponse([], [], [], []);
}
var inParents = InFamily(family.ParentIds, person.Id);
var inChildren = InFamily(family.ChildIds, person.Id);
return new PersonFamilyResponse(
inChildren ? RelativesWithOpinions(family.ParentIds, people, person, except: person.Id, catalog, locale) : [],
inParents ? RelativesWithOpinions(family.ChildIds, people, person, except: person.Id, catalog, locale) : [],
inChildren ? RelativesWithOpinions(family.ChildIds, people, person, except: person.Id, catalog, locale) : [],
inParents ? RelativesWithOpinions(family.ParentIds, people, person, except: person.Id, catalog, locale) : []);
}
private static IReadOnlyList<PersonRelResponse> RelativesWithOpinions(
IReadOnlyList<string> ids,
IReadOnlyDictionary<string, Person> people,
Person person,
string except,
DefCatalog? catalog,
string locale)
{
var rows = new List<PersonRelResponse>();
foreach (var id in ids)
{
if (id.Equals(except, StringComparison.Ordinal) || !people.TryGetValue(id, out var relative))
{
continue;
}
int? opinion = null;
string? label = null;
if (person.Opinions.TryGetValue(id, out var value))
{
opinion = value;
label = catalog is null ? OpinionLabels.BandId(null, value) : OpinionLabels.Label(catalog, locale, value);
}
rows.Add(new PersonRelResponse(relative.Id, relative.Name.Full, relative.Female, opinion, label));
}
return rows;
}
private static PersonOpinionLinkResponse Link(Person target, int opinion, DefCatalog? catalog, string locale) =>
new(
target.Id,
target.Name.Full,
target.Female,
opinion,
catalog is null ? OpinionLabels.BandId(null, opinion) : OpinionLabels.Label(catalog, locale, opinion));
} }
+6
View File
@@ -984,6 +984,12 @@ internal sealed class SchoolWorker
generated = true; generated = true;
} }
if (OpinionGenerator.NeedsFamilyOpinions(roster))
{
roster = OpinionGenerator.SeedFamily(catalog, roster);
generated = true;
}
roster = LockerAssigner.Apply(catalog, map, roster); roster = LockerAssigner.Apply(catalog, map, roster);
if (!RosterFit.Matches(roster, demand)) if (!RosterFit.Matches(roster, demand))
@@ -46,4 +46,20 @@
"heavyOuterAboveC": 15, "heavyOuterAboveC": 15,
"apparelGoalWeight": 6, "apparelGoalWeight": 6,
"changeClothesMinutes": 5, "changeClothesMinutes": 5,
// Opinion starts and morning drift (slice 9 phase 41).
"opinionParentToChildStart": 85,
"opinionChildToParentStart": 75,
"opinionSiblingStart": 45,
"opinionPartnerStart": 65,
"opinionDriftPerMorning": 3,
"opinionTopCount": 5,
"opinionBands": [
{ "min": 70, "id": "OpinionCloseFriend" },
{ "min": 40, "id": "OpinionFriend" },
{ "min": 20, "id": "OpinionPleasant" },
{ "min": 1, "id": "OpinionAcquaintance" },
{ "min": -1, "id": "OpinionStrained" },
{ "min": -40, "id": "OpinionDislike" },
{ "min": -100, "id": "OpinionEnemy" },
],
} }
@@ -173,6 +173,13 @@
"ApparelConditionWorn": "worn", "ApparelConditionWorn": "worn",
"ApparelConditionTorn": "torn", "ApparelConditionTorn": "torn",
"ApparelConditionRags": "in rags", "ApparelConditionRags": "in rags",
"OpinionCloseFriend": "close friends",
"OpinionFriend": "friends",
"OpinionPleasant": "pleasant",
"OpinionAcquaintance": "acquaintances",
"OpinionStrained": "strained",
"OpinionDislike": "dislike",
"OpinionEnemy": "enemies",
"ActionStarted": "started: {0}", "ActionStarted": "started: {0}",
"ActionEnded": "finished: {0}", "ActionEnded": "finished: {0}",
"ApparelReplaced": "got a new {0}", "ApparelReplaced": "got a new {0}",
@@ -173,6 +173,13 @@
"ApparelConditionWorn": "поношенная", "ApparelConditionWorn": "поношенная",
"ApparelConditionTorn": "порванная", "ApparelConditionTorn": "порванная",
"ApparelConditionRags": "висит лохмотьями", "ApparelConditionRags": "висит лохмотьями",
"OpinionCloseFriend": "близкие друзья",
"OpinionFriend": "друзья",
"OpinionPleasant": "приятели",
"OpinionAcquaintance": "знакомые",
"OpinionStrained": "натянуто",
"OpinionDislike": "неприязнь",
"OpinionEnemy": "враги",
"ActionStarted": "начал: {0}", "ActionStarted": "начал: {0}",
"ActionEnded": "закончил: {0}", "ActionEnded": "закончил: {0}",
"ApparelReplaced": "получил новую {0}", "ApparelReplaced": "получил новую {0}",
+2 -1
View File
@@ -53,9 +53,10 @@ internal static class ApparelWear
} }
var morningChanged = MorningDress.Apply(school); var morningChanged = MorningDress.Apply(school);
var opinionsChanged = MorningOpinions.Apply(school);
var ragsReplaced = SchoolDay.IsWorkday(school.Catalog, school.Clock.Time, school.SchoolWeekDays) var ragsReplaced = SchoolDay.IsWorkday(school.Catalog, school.Clock.Time, school.SchoolWeekDays)
&& ReplaceRags(school); && ReplaceRags(school);
return bandCrossed | morningChanged | ragsReplaced; return bandCrossed | morningChanged | opinionsChanged | ragsReplaced;
} }
internal static bool CrossedDayStart(DateTime before, DateTime after) internal static bool CrossedDayStart(DateTime before, DateTime after)
+66
View File
@@ -0,0 +1,66 @@
using HSchool.Content;
using HSchool.People;
namespace HSchool.Simulation;
/// <summary>Drifts non-zero opinions toward family basis or zero at six on work mornings.</summary>
internal static class MorningOpinions
{
public static bool Apply(School school)
{
if (school.Catalog?.BehaviorRules is not { } rules || school.Roster is null)
{
return false;
}
if (!SchoolDay.IsWorkday(school.Catalog, school.Clock.Time, school.SchoolWeekDays))
{
return false;
}
var peopleById = school.Roster.People.ToDictionary(person => person.Id, StringComparer.Ordinal);
var changed = false;
foreach (var person in school.Roster.People)
{
changed |= DriftPerson(school.Roster, rules, peopleById, person, rules.OpinionDriftPerMorning);
}
return changed;
}
private static bool DriftPerson(
Roster roster,
BehaviorDef rules,
IReadOnlyDictionary<string, Person> peopleById,
Person person,
int drift)
{
if (person.Opinions.Count == 0)
{
return false;
}
var changed = false;
foreach (var (targetId, current) in person.Opinions.ToArray())
{
if (!peopleById.TryGetValue(targetId, out var target))
{
changed |= OpinionStore.Remove(person, targetId);
continue;
}
var basis = OpinionStore.FamilyBasis(roster, rules, person, target);
var next = OpinionStore.MoveToward(current, basis, drift);
if (next == 0)
{
changed |= OpinionStore.Remove(person, targetId);
}
else
{
changed |= OpinionStore.Set(person, targetId, next);
}
}
return changed;
}
}
+51 -2
View File
@@ -177,6 +177,36 @@ public class PeopleApiTests(AppHostFixture fixture)
Assert.Contains(motherCard.Family.Children, child => child.Id == card.Id); Assert.Contains(motherCard.Family.Children, child => child.Id == card.Id);
} }
[Fact]
public async Task Card_ConnectionsCarryOnlyThisPersonsOpinions()
{
using var client = fixture.App.CreateHttpClient("server");
await SchoolApiTests.ResetAsync(client);
var school = await SchoolApiTests.CreateAsync(client, "Связи карточка", Start, seed: 1);
var pupils = await GetPeopleAsync(client, school.Id, "role=student&pageSize=20");
var pupil = pupils.People.First(person => person.Roles.Contains("student"));
var card = await GetCardAsync(client, school.Id, pupil.Id);
Assert.NotNull(card.Connections);
Assert.NotEmpty(card.Connections!.Family.Parents);
Assert.All(card.Connections.Family.Parents, parent =>
{
Assert.NotNull(parent.Opinion);
Assert.True(parent.Opinion > 0);
Assert.False(string.IsNullOrWhiteSpace(parent.OpinionLabel));
});
var linkedIds = card.Connections.Others.Select(row => row.Id).ToHashSet(StringComparer.Ordinal);
foreach (var other in card.Connections.Friends.Concat(card.Connections.Enemies))
{
Assert.DoesNotContain(other.Id, linkedIds);
}
using var bulk = await client.GetAsync($"/api/schools/{school.Id}/people/opinions", TestContext.Current.CancellationToken);
Assert.Equal(HttpStatusCode.NotFound, bulk.StatusCode);
}
/// <summary> /// <summary>
/// Phases 7 and 9 together: the roster survives a restart, and what comes back is the /// Phases 7 and 9 together: the roster survives a restart, and what comes back is the
/// composition *after* the first-September intake. Generating from the seed again would /// composition *after* the first-September intake. Generating from the seed again would
@@ -320,7 +350,8 @@ public class PeopleApiTests(AppHostFixture fixture)
IReadOnlyList<LabeledStatResponse> Skills, IReadOnlyList<LabeledStatResponse> Skills,
IReadOnlyList<DefLabelResponse> Traits, IReadOnlyList<DefLabelResponse> Traits,
IReadOnlyList<NeedStatResponse> Needs, IReadOnlyList<NeedStatResponse> Needs,
PersonFamilyResponse Family); PersonFamilyResponse Family,
PersonConnectionsResponse? Connections);
private sealed record LabeledStatResponse(string Id, string Label, string Value); private sealed record LabeledStatResponse(string Id, string Label, string Value);
@@ -332,7 +363,25 @@ public class PeopleApiTests(AppHostFixture fixture)
IReadOnlyList<PersonRelResponse> Siblings, IReadOnlyList<PersonRelResponse> Siblings,
IReadOnlyList<PersonRelResponse> Partners); IReadOnlyList<PersonRelResponse> Partners);
private sealed record PersonRelResponse(string Id, string FullName, bool Female); private sealed record PersonRelResponse(
string Id,
string FullName,
bool Female,
int? Opinion = null,
string? OpinionLabel = null);
private sealed record PersonOpinionLinkResponse(
string Id,
string FullName,
bool Female,
int Opinion,
string OpinionLabel);
private sealed record PersonConnectionsResponse(
PersonFamilyResponse Family,
IReadOnlyList<PersonOpinionLinkResponse> Friends,
IReadOnlyList<PersonOpinionLinkResponse> Enemies,
IReadOnlyList<PersonOpinionLinkResponse> Others);
private sealed record DirectoryResponse(IReadOnlyList<DirectoryPersonResponse> People); private sealed record DirectoryResponse(IReadOnlyList<DirectoryPersonResponse> People);
@@ -0,0 +1,55 @@
namespace HSchool.People.Tests;
public class OpinionGeneratorTests
{
[Fact]
public void ParentAndChild_HavePositiveOpinionsBothWays_AfterGeneration()
{
var roster = Fixtures.Generate(Fixtures.Classrooms(4));
var people = roster.People.ToDictionary(person => person.Id, StringComparer.Ordinal);
var child = roster.People.First(person => person.IsStudent && !person.IsParent);
var family = roster.Families.Single(row => row.Id.Equals(child.FamilyId, StringComparison.Ordinal));
Assert.NotEmpty(family.ParentIds);
foreach (var parentId in family.ParentIds)
{
Assert.True(child.Opinions.TryGetValue(parentId, out var toParent));
Assert.True(toParent > 0);
var parent = people[parentId];
Assert.True(parent.Opinions.TryGetValue(child.Id, out var toChild));
Assert.True(toChild > 0);
}
}
[Fact]
public void Classmates_HaveNoOpinionEntry_AfterGeneration()
{
var roster = Fixtures.Generate(Fixtures.Classrooms(4));
var pupils = roster.People.Where(person => person.IsStudent).ToArray();
Assert.True(pupils.Length >= 2);
var first = pupils[0];
var classmate = pupils.First(person =>
person.Id != first.Id
&& !OpinionStore.FamilyMemberIds(roster, first).Contains(person.Id));
Assert.False(first.Opinions.ContainsKey(classmate.Id));
Assert.False(classmate.Opinions.ContainsKey(first.Id));
}
[Fact]
public void ParentToChild_AndChildToParent_CanDiffer()
{
var roster = Fixtures.Generate(Fixtures.Classrooms(4));
var people = roster.People.ToDictionary(person => person.Id, StringComparer.Ordinal);
var child = roster.People.First(person => person.IsStudent && !person.IsParent);
var parentId = roster.Families.Single(row => row.Id.Equals(child.FamilyId, StringComparison.Ordinal)).ParentIds[0];
var parent = people[parentId];
Assert.True(parent.Opinions.TryGetValue(child.Id, out var parentView));
Assert.True(child.Opinions.TryGetValue(parentId, out var childView));
Assert.NotEqual(parentView, childView);
}
}
@@ -0,0 +1,117 @@
using HSchool.Content;
using HSchool.People;
using HSchool.Schedule;
namespace HSchool.Simulation.Tests;
public class MorningOpinionsTests
{
private static readonly DateTime TuesdayMorning = new(2012, 4, 3, 6, 0, 0, DateTimeKind.Utc);
private static readonly DateTime TuesdayEvening = new(2012, 4, 3, 22, 0, 0, DateTimeKind.Utc);
private static readonly DateTime WednesdayMorning = new(2012, 4, 4, 6, 0, 0, DateTimeKind.Utc);
[Fact]
public void SeveralWorkMornings_DriftClassmateTowardZero_FamilyTowardStart()
{
using var school = OpenStaffed();
var child = school.Roster!.People.First(person => person.IsStudent && !person.IsParent);
var classmate = school.Roster.People.First(person =>
person.IsStudent
&& !person.Id.Equals(child.Id, StringComparison.Ordinal)
&& !OpinionStore.FamilyMemberIds(school.Roster, child).Contains(person.Id));
var family = school.Roster.Families.Single(row => row.Id.Equals(child.FamilyId, StringComparison.Ordinal));
var parentId = family.ParentIds[0];
var rules = school.Catalog!.BehaviorRules!;
OpinionStore.Set(child, classmate.Id, 30);
OpinionStore.Set(child, parentId, rules.OpinionChildToParentStart - 15);
AdvanceTo(school, TuesdayEvening);
for (var day = 0; day < 3; day++)
{
while (school.Clock.Time < WednesdayMorning.AddDays(day))
{
school.Tick(0.2d, 5d);
}
}
Assert.True(child.Opinions.TryGetValue(classmate.Id, out var classmateView));
Assert.True(classmateView < 30);
Assert.True(classmateView <= 30 - rules.OpinionDriftPerMorning);
Assert.True(child.Opinions.TryGetValue(parentId, out var parentView));
Assert.True(parentView > rules.OpinionChildToParentStart - 15);
Assert.True(parentView <= rules.OpinionChildToParentStart);
}
[Fact]
public void SkipEmpty_AppliesOpinionDrift()
{
using var school = OpenEmpty(TuesdayEvening);
var child = school.Roster!.People.First(person => person.IsStudent && !person.IsParent);
var classmate = school.Roster.People.First(person =>
person.IsStudent
&& !person.Id.Equals(child.Id, StringComparison.Ordinal)
&& !OpinionStore.FamilyMemberIds(school.Roster, child).Contains(person.Id));
OpinionStore.Set(child, classmate.Id, 12);
var before = child.Opinions[classmate.Id];
Assert.True(school.TrySkipEmpty().Succeeded);
Assert.True(child.Opinions.TryGetValue(classmate.Id, out var after));
Assert.True(after < before);
}
private static void AdvanceTo(School school, DateTime until)
{
while (school.Clock.Time < until)
{
school.Tick(0.2d, 5d);
}
}
private static School OpenStaffed()
{
var (catalog, map) = Vanilla();
var roster = RosterGenerator.Generate(catalog, map, schoolSeed: 1, "Russia", TuesdayMorning);
var pool = ApplicantPool.Create(catalog, roster, schoolSeed: 1, "Russia", TuesdayMorning);
var school = School.Create(1, "Мнения", TuesdayMorning, catalog, map);
school.InstallPeople(roster, seed: 1, "Russia", pool);
school.ConfigurePresence(weekDays: 5, maxDecisionsPerTick: 10_000);
return school;
}
private static School OpenEmpty(DateTime start)
{
var (catalog, map) = Vanilla();
var roster = RosterGenerator.Generate(catalog, map, schoolSeed: 1, "Russia", start);
var pool = ApplicantPool.Create(catalog, roster, schoolSeed: 1, "Russia", start);
var school = School.Create(1, "Мнения ночь", start, catalog, map);
school.InstallPeople(roster, seed: 1, "Russia", pool);
school.ConfigurePresence(weekDays: 5, maxDecisionsPerTick: 10_000);
return school;
}
private static (DefCatalog Catalog, MapLayout Map) Vanilla()
{
var root = Path.Combine(AppContext.BaseDirectory, "vanilla");
var documents = new List<ContentDocument>();
foreach (var path in Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories))
{
if (!path.EndsWith(".jsonc", StringComparison.OrdinalIgnoreCase)
&& !path.EndsWith(".json", StringComparison.OrdinalIgnoreCase))
{
continue;
}
var relative = Path.GetRelativePath(root, path).Replace('\\', '/');
documents.Add(new ContentDocument(CatalogLoader.CorePackId, relative, File.ReadAllText(path)));
}
var catalog = new CatalogLoader().Load([CatalogLoader.CorePackId], documents);
var map = CatalogLoader.LastDefaultMap([CatalogLoader.CorePackId], documents);
Assert.NotNull(map);
return (catalog, map);
}
}