feat(02-05): add companion greeting to forest and avatar to lesson screen

- Add forest-greeting companion area in HTML with avatar + text
- Add lesson-companion area in HTML above letter area
- Wire getGreeting() call for returning users in app.ts
- Show companion avatar in lesson screen via getProgress lookup
- Fix pre-existing noUncheckedIndexedAccess errors in fallbacks.ts (Rule 3)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-03-29 12:15:45 +02:00
co-authored by Claude Opus 4.6
parent 2cf7687d51
commit 57a929bc1a
4 changed files with 50 additions and 3 deletions
+8
View File
@@ -30,6 +30,10 @@
<section id="screen-forest" class="screen"> <section id="screen-forest" class="screen">
<div class="forest"> <div class="forest">
<h1 class="forest__title">Dein Zauberwald</h1> <h1 class="forest__title">Dein Zauberwald</h1>
<div id="forest-greeting" class="companion-area" style="display:none">
<img id="forest-greeting-avatar" class="companion-area__avatar" src="" alt="">
<p id="forest-greeting-text" class="companion-area__text"></p>
</div>
<div class="forest__level-map" id="level-map"> <div class="forest__level-map" id="level-map">
<!-- Level cards rendered dynamically --> <!-- Level cards rendered dynamically -->
</div> </div>
@@ -39,6 +43,10 @@
<section id="screen-lesson" class="screen"> <section id="screen-lesson" class="screen">
<div class="lesson"> <div class="lesson">
<button class="lesson__back-btn" id="lesson-back-btn">&#x2190; Zurueck</button> <button class="lesson__back-btn" id="lesson-back-btn">&#x2190; Zurueck</button>
<div id="lesson-companion" class="companion-area" style="display:none">
<img id="lesson-companion-avatar" class="companion-area__avatar" src="" alt="">
<p id="lesson-companion-text" class="companion-area__text"></p>
</div>
<div class="lesson__letter-area" id="letter-area"> <div class="lesson__letter-area" id="letter-area">
<!-- Current letter appears here --> <!-- Current letter appears here -->
</div> </div>
+23
View File
@@ -2,6 +2,8 @@ import type { ScreenName } from "./types";
import { openDB, getProgress, saveProgress } from "./storage/db"; import { openDB, getProgress, saveProgress } from "./storage/db";
import { initWelcomeScreen, initLessonScreen } from "./ui/screens"; import { initWelcomeScreen, initLessonScreen } from "./ui/screens";
import { initForestScreen } from "./forest/scene"; import { initForestScreen } from "./forest/scene";
import { getGreeting } from "./companion/companion";
import { companions } from "./companion/characters";
let db: IDBDatabase; let db: IDBDatabase;
let lessonCleanup: (() => void) | null = null; let lessonCleanup: (() => void) | null = null;
@@ -89,6 +91,27 @@ export async function initApp(): Promise<void> {
// Returning user -- init forest and go there // Returning user -- init forest and go there
await initForestScreen(db, startLessonFromForest); await initForestScreen(db, startLessonFromForest);
showScreen("forest"); showScreen("forest");
// Show companion greeting (per COMP-01, D-14)
const companion = companions.find(
(c) => c.type === progress.selectedCharacter,
);
if (companion) {
const greetingEl = document.getElementById("forest-greeting")!;
const avatarEl = document.getElementById(
"forest-greeting-avatar",
) as HTMLImageElement;
const textEl = document.getElementById("forest-greeting-text")!;
avatarEl.src = companion.avatarUrl;
avatarEl.alt = companion.name;
greetingEl.style.display = "flex";
// Fetch greeting async (shows immediately with avatar, text fills in)
getGreeting(progress.selectedCharacter, db).then((text) => {
textEl.textContent = text;
});
}
} else { } else {
// First time -- show welcome, then forest after setup // First time -- show welcome, then forest after setup
initWelcomeScreen(db, async (screen: ScreenName) => { initWelcomeScreen(db, async (screen: ScreenName) => {
+2 -2
View File
@@ -163,12 +163,12 @@ export function getRandomFallbackGreeting(timeOfDay: TimeOfDay): string {
(g) => g.timeOfDay === timeOfDay || g.timeOfDay === "any", (g) => g.timeOfDay === timeOfDay || g.timeOfDay === "any",
); );
const index = Math.floor(Math.random() * matching.length); const index = Math.floor(Math.random() * matching.length);
return matching[index].text; return matching[index]?.text ?? "Willkommen im Zauberwald!";
} }
export function getRandomFallbackForestComment(): string { export function getRandomFallbackForestComment(): string {
const index = Math.floor(Math.random() * fallbackForestComments.length); const index = Math.floor(Math.random() * fallbackForestComments.length);
return fallbackForestComments[index]; return fallbackForestComments[index] ?? "Schau mal, was im Wald passiert!";
} }
export function getFallbackLetterIntro( export function getFallbackLetterIntro(
+17 -1
View File
@@ -5,7 +5,7 @@ import type {
Progress, Progress,
} from "../types"; } from "../types";
import { companions } from "../companion/characters"; import { companions } from "../companion/characters";
import { saveProgress } from "../storage/db"; import { saveProgress, getProgress } from "../storage/db";
import { import {
createExerciseState, createExerciseState,
handleKeyPress, handleKeyPress,
@@ -88,6 +88,22 @@ export function initLessonScreen(
const backBtn = document.getElementById("lesson-back-btn") as HTMLButtonElement; const backBtn = document.getElementById("lesson-back-btn") as HTMLButtonElement;
const state = createExerciseState(level); const state = createExerciseState(level);
// Show companion avatar (per ASST-04)
getProgress(_db).then((progress) => {
if (!progress) return;
const companion = companions.find(
(c) => c.type === progress.selectedCharacter,
);
if (!companion) return;
const area = document.getElementById("lesson-companion")!;
const avatar = document.getElementById(
"lesson-companion-avatar",
) as HTMLImageElement;
avatar.src = companion.avatarUrl;
avatar.alt = companion.name;
area.style.display = "flex";
});
// Render keyboard // Render keyboard
renderKeyboard(keyboardContainer, layout, level); renderKeyboard(keyboardContainer, layout, level);