diff --git a/zenno/src/lib/data/convo.ts b/zenno/src/lib/data/convo.ts index dd25494..41890df 100644 --- a/zenno/src/lib/data/convo.ts +++ b/zenno/src/lib/data/convo.ts @@ -43,10 +43,14 @@ export enum Required { Chara3 = 4, } +export function convoCharas(c: Conversation): number[] { + return [c.chara_1, c.chara_2, c.chara_3].filter((id) => id != null); +} + export function requiredCharas(c: Conversation): number[] { switch (c.condition_type) { case Required.None: return [] - case Required.All: return [c.chara_1, c.chara_2, c.chara_3].filter((id) => id != null); + case Required.All: return convoCharas(c); case Required.Chara1: return [c.chara_1]; case Required.Chara2: return [c.chara_2!]; case Required.Chara3: return [c.chara_3!]; diff --git a/zenno/src/routes/chara/convo/+page.svelte b/zenno/src/routes/chara/convo/+page.svelte index a7a04cc..57440b4 100644 --- a/zenno/src/routes/chara/convo/+page.svelte +++ b/zenno/src/routes/chara/convo/+page.svelte @@ -1,15 +1,24 @@