From e1dbff75dd86f617d230e758c46a433a32ed6f7a Mon Sep 17 00:00:00 2001 From: danny Date: Sat, 11 Jul 2026 23:11:33 +0200 Subject: [PATCH] CR: Bark-Pools erweitert + Googly Eyes als Blickrichtungs-Anzeige - ambient.json 10 -> 22 Zeilen (Akademie-Alltag, Viadukt-Geruechte, Wetten, Aberglaube), schergen.json 5 -> 10 Drohzeilen (Seil-, Vater-, Materialraum-Anspielungen; STORY-konform ohne neue Plot-Fakten) - googly_eyes.tscn: zwei weisse Kugeln mit versetzten Pupillen, an den rotierenden Meshes aller Charaktere: Spieler, Hub-NPCs (Imogen, Violet, Rhiannon, Wren, Maren, Jack), Sparring-Partner, Viadukt-Wren, Gauntlet-Maren/-Wren, Dreschen-Wren, Epilog-Figuren, Graue (auf dem Kopf) - Meshes drehen in Bewegungs-/Gespraechsrichtung, damit ist die Blickrichtung sichtbar; Drachen und Fern-Statisten bewusst ohne - Verifikation: Sonde 18/18 gruen (Pupillen an allen 16 Slots ueber 8 Szenen, Pool-Umfaenge), Boot-Check aller 7 Szenen fehlerfrei Co-Authored-By: Claude Fable 5 --- data/barks/ambient.json | 14 ++++++++++- data/barks/schergen.json | 7 +++++- docs/CHANGEREQUESTS_DONE.md | 26 ++++++++++++++++++++ scenes/epilogue/epilogue.tscn | 12 ++++++++- scenes/gauntlet/gauntlet.tscn | 9 ++++++- scenes/hatching/hatching_grounds.tscn | 6 ++++- scenes/hub/rider_quadrant.tscn | 21 +++++++++++++++- scenes/hub/sparring_hall.tscn | 6 ++++- scenes/npcs/googly_eyes.tscn | 35 +++++++++++++++++++++++++++ scenes/npcs/grey_cadet.tscn | 6 ++++- scenes/player.tscn | 6 ++++- scenes/viaduct/viaduct.tscn | 6 ++++- 12 files changed, 144 insertions(+), 10 deletions(-) create mode 100644 scenes/npcs/googly_eyes.tscn diff --git a/data/barks/ambient.json b/data/barks/ambient.json index b5e0836..b48cdd3 100644 --- a/data/barks/ambient.json +++ b/data/barks/ambient.json @@ -9,6 +9,18 @@ { "text": "Mein Bruder hat es letztes Jahr nicht geschafft. Also rede ich nicht darüber.", "weight": 1 }, { "text": "Devera sagt, das Wetter dreht. Schlecht fürs Flugfeld.", "weight": 1 }, { "text": "Die Gezeichneten halten zusammen, sagen sie. Sagen sie.", "weight": 2 }, - { "text": "Beim Dreschen zählt nur, wen der Drache ansieht. Alles andere ist Lärm.", "weight": 1 } + { "text": "Beim Dreschen zählt nur, wen der Drache ansieht. Alles andere ist Lärm.", "weight": 1 }, + { "text": "Schlaf ist auch nur eine Übung, die keiner besteht.", "weight": 1 }, + { "text": "Auf dem Viadukt hat es wieder einen erwischt. Der Wind, sagen sie.", "weight": 2 }, + { "text": "Ich putze meine Klinge dreimal am Tag. Nicht für den Glanz.", "weight": 1 }, + { "text": "Wer beim Battle Brief schläft, schläft bald für immer.", "weight": 1 }, + { "text": "Die Zweitjahre wetten auf uns. Auf die Reihenfolge, meine ich.", "weight": 2 }, + { "text": "Markham erzählt Geschichte, wie es der Führung passt. Merk dir beides.", "weight": 1 }, + { "text": "Ein Schwertschwanz durchschlägt Rüstung. Ein Skorpionschwanz dich.", "weight": 1 }, + { "text": "Ich hab aufgehört, Namen zu lernen. Tut weniger weh.", "weight": 2 }, + { "text": "Beim Essen sitzt keiner mehr am Fensterplatz. Der bringt Unglück, heißt es.", "weight": 1 }, + { "text": "Die Rotunde riecht nach Kreide und Angst.", "weight": 1 }, + { "text": "Manche beten vor dem Gauntlet. Ich lauf lieber schneller.", "weight": 2 }, + { "text": "Wenn dein Drache dich wählt, warst du nie allein. Sagt Kaori.", "weight": 1 } ] } diff --git a/data/barks/schergen.json b/data/barks/schergen.json index eae1a68..9c13d6d 100644 --- a/data/barks/schergen.json +++ b/data/barks/schergen.json @@ -4,6 +4,11 @@ { "text": "Pass auf, wo du hintrittst, Rowyth.", "weight": 2 }, { "text": "Dein kleiner Freund stolpert viel in letzter Zeit.", "weight": 2 }, { "text": "Cassian fragt nicht zweimal.", "weight": 1 }, - { "text": "Große Male brennen zuerst.", "weight": 1 } + { "text": "Große Male brennen zuerst.", "weight": 1 }, + { "text": "Der Gauntlet ist hoch. Und Seile reißen.", "weight": 2 }, + { "text": "Dein Vater hat auch geglaubt, er hätte Freunde.", "weight": 1 }, + { "text": "Wir zählen mit, Rowyth. Jeden Tag, den ihr zwei noch habt.", "weight": 2 }, + { "text": "Niemand sieht hin, wenn im Materialraum was umfällt.", "weight": 1 }, + { "text": "Schwache Glieder bricht man raus, bevor die Kette reißt.", "weight": 2 } ] } diff --git a/docs/CHANGEREQUESTS_DONE.md b/docs/CHANGEREQUESTS_DONE.md index d10fb20..c70d9a9 100644 --- a/docs/CHANGEREQUESTS_DONE.md +++ b/docs/CHANGEREQUESTS_DONE.md @@ -3,6 +3,32 @@ > Abgearbeitete Change Requests aus CHANGEREQUESTS.md, mit Datum und > Anmerkung, was geändert wurde. +## 2026-07-11 — CR: Mehr Bark-Zeilen + Googly Eyes für alle Charaktere + +**Request:** „Gib den Grauen NPCs bitte mehr Lines die sie sagen können +und geb den ganzen Charakteren googly Eyes damit ich weiß wo die hin +schauen." + +**Umsetzung:** +- **Bark-Pools erweitert:** ambient.json von 10 auf 22 Zeilen + (Akademie-Alltag, Viadukt-Gerüchte, Wetten der Zweitjahre, + Aberglaube), schergen.json von 5 auf 10 Drohzeilen (inkl. Seil-, + Vater- und Materialraum-Anspielungen — STORY-konform, keine neuen + Plot-Fakten). +- **Googly Eyes** (`scenes/npcs/googly_eyes.tscn`): zwei weiße Kugeln + mit leicht versetzten schwarzen Pupillen als Blickrichtungs-Anzeige. + Angebracht am rotierenden Mesh von: Spieler (dreht in + Bewegungsrichtung), Hub-NPCs Imogen/Violet/Rhiannon/Wren/Maren + (drehen sich im Gespräch/beim Wandern) + Jack, Sparring-Partner, + Viadukt-Wren, Gauntlet-Maren/-Wren (Maren behält die Augen auch in + der Liegeposition, da am Mesh), Dreschen-Wren, Epilog-Figuren + (Tyrveil/Imogen/Wren) und den Grauen (auf dem Kugel-Kopf). Drachen + und ferne Statisten (Rivalen, Rad-Dummys) bewusst ohne. + +**Verifikation:** Sonde 18/18 grün (Augen mit Pupillen an allen 16 +Charakter-Slots über 8 Szenen, Pool-Umfänge). Boot-Check aller 7 +Szenen fehlerfrei. + ## 2026-07-11 — Rotunden-Fix + v1-Ausbau Phase 3: „Die Grauen" + Bark-System **Request:** (a) Rotunde: Wände falsch angeordnet, zeigen in den Raum; diff --git a/scenes/epilogue/epilogue.tscn b/scenes/epilogue/epilogue.tscn index 13afb61..18ed815 100644 --- a/scenes/epilogue/epilogue.tscn +++ b/scenes/epilogue/epilogue.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=13 format=3] +[gd_scene load_steps=15 format=3] [ext_resource type="Script" path="res://scripts/gameplay/epilogue.gd" id="1_epilogue"] [ext_resource type="PackedScene" path="res://scenes/ui/speech_bubble.tscn" id="2_bubble"] +[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.7, 0.68, 0.72, 1) @@ -101,3 +102,12 @@ mesh = SubResource("CapsuleMesh_wren") [node name="SpeechBubble" parent="WrenFigure" instance=ExtResource("2_bubble")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.6, 0) + +[node name="GooglyEyes" parent="TyrveilFigure/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) + +[node name="GooglyEyes" parent="ImogenFigure/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) + +[node name="GooglyEyes" parent="WrenFigure/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) diff --git a/scenes/gauntlet/gauntlet.tscn b/scenes/gauntlet/gauntlet.tscn index 973354c..f91b43a 100644 --- a/scenes/gauntlet/gauntlet.tscn +++ b/scenes/gauntlet/gauntlet.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=3] +[gd_scene load_steps=36 format=3] [ext_resource type="Script" path="res://scripts/gameplay/gauntlet.gd" id="1_gauntlet"] [ext_resource type="PackedScene" path="res://scenes/player.tscn" id="2_player"] @@ -18,6 +18,7 @@ [ext_resource type="Script" path="res://scripts/gameplay/run_timer.gd" id="16_timer"] [ext_resource type="Script" path="res://scripts/gameplay/rival_climbers.gd" id="17_rivals"] [ext_resource type="Script" path="res://scripts/gameplay/dragon_distraction.gd" id="18_distraction"] +[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.62, 0.63, 0.66, 1) @@ -254,3 +255,9 @@ script = ExtResource("18_distraction") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 0.1, -0.6) [node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] + +[node name="GooglyEyes" parent="Maren/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) + +[node name="GooglyEyes" parent="Wren/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) diff --git a/scenes/hatching/hatching_grounds.tscn b/scenes/hatching/hatching_grounds.tscn index 089aee9..a56f201 100644 --- a/scenes/hatching/hatching_grounds.tscn +++ b/scenes/hatching/hatching_grounds.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=24 format=3] +[gd_scene load_steps=25 format=3] [ext_resource type="Script" path="res://scripts/gameplay/hatching_grounds.gd" id="1_hatching"] [ext_resource type="PackedScene" path="res://scenes/player.tscn" id="2_player"] [ext_resource type="PackedScene" path="res://scenes/ui/debug_overlay.tscn" id="3_debug"] [ext_resource type="Script" path="res://scripts/gameplay/zone_trigger.gd" id="4_zone"] [ext_resource type="PackedScene" path="res://scenes/ui/speech_bubble.tscn" id="5_bubble"] +[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) @@ -190,3 +191,6 @@ outline_size = 12 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 12) [node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] + +[node name="GooglyEyes" parent="Wren/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) diff --git a/scenes/hub/rider_quadrant.tscn b/scenes/hub/rider_quadrant.tscn index 09d9427..4df86cd 100644 --- a/scenes/hub/rider_quadrant.tscn +++ b/scenes/hub/rider_quadrant.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=40 format=3] +[gd_scene load_steps=41 format=3] [ext_resource type="Script" path="res://scripts/gameplay/hub_room.gd" id="1_room"] [ext_resource type="PackedScene" path="res://scenes/player.tscn" id="2_player"] @@ -9,6 +9,7 @@ [ext_resource type="Script" path="res://scripts/gameplay/ambient_chatter.gd" id="7_chatter"] [ext_resource type="Script" path="res://scripts/gameplay/jack_ambush.gd" id="10_jack"] [ext_resource type="Script" path="res://scripts/gameplay/grey_spawner.gd" id="11_grey"] +[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) @@ -739,3 +740,21 @@ jack_path = NodePath("../Jack") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 8) [node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] + +[node name="GooglyEyes" parent="Imogen/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) + +[node name="GooglyEyes" parent="Violet/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) + +[node name="GooglyEyes" parent="Rhiannon/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) + +[node name="GooglyEyes" parent="Wren/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) + +[node name="GooglyEyes" parent="Maren/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) + +[node name="GooglyEyes" parent="Jack/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) diff --git a/scenes/hub/sparring_hall.tscn b/scenes/hub/sparring_hall.tscn index e8960a2..ea09dd0 100644 --- a/scenes/hub/sparring_hall.tscn +++ b/scenes/hub/sparring_hall.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=3] +[gd_scene load_steps=39 format=3] [ext_resource type="Script" path="res://scripts/gameplay/hub_room.gd" id="1_room"] [ext_resource type="PackedScene" path="res://scenes/player.tscn" id="2_player"] @@ -7,6 +7,7 @@ [ext_resource type="Script" path="res://scripts/gameplay/training_station.gd" id="5_station"] [ext_resource type="Script" path="res://scripts/gameplay/sparring_fight.gd" id="6_fight"] [ext_resource type="PackedScene" path="res://scenes/ui/speech_bubble.tscn" id="7_bubble"] +[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) @@ -340,3 +341,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 2.8) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 2.8) [node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] + +[node name="GooglyEyes" parent="SparringPartner/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) diff --git a/scenes/npcs/googly_eyes.tscn b/scenes/npcs/googly_eyes.tscn new file mode 100644 index 0000000..fade94e --- /dev/null +++ b/scenes/npcs/googly_eyes.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=5 format=3] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_white"] +albedo_color = Color(0.98, 0.98, 0.98, 1) + +[sub_resource type="SphereMesh" id="SphereMesh_eye"] +material = SubResource("StandardMaterial3D_white") +radius = 0.1 +height = 0.2 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_black"] +albedo_color = Color(0.05, 0.05, 0.06, 1) + +[sub_resource type="SphereMesh" id="SphereMesh_pupil"] +material = SubResource("StandardMaterial3D_black") +radius = 0.05 +height = 0.1 + +[node name="GooglyEyes" type="Node3D"] + +[node name="LeftEye" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.14, 0, 0) +mesh = SubResource("SphereMesh_eye") + +[node name="LeftPupil" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.14, -0.015, -0.075) +mesh = SubResource("SphereMesh_pupil") + +[node name="RightEye" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.14, 0, 0) +mesh = SubResource("SphereMesh_eye") + +[node name="RightPupil" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.14, -0.015, -0.075) +mesh = SubResource("SphereMesh_pupil") diff --git a/scenes/npcs/grey_cadet.tscn b/scenes/npcs/grey_cadet.tscn index 6ac8cf2..e57e329 100644 --- a/scenes/npcs/grey_cadet.tscn +++ b/scenes/npcs/grey_cadet.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=3] +[gd_scene load_steps=8 format=3] [ext_resource type="Script" path="res://scripts/gameplay/grey_cadet.gd" id="1_grey"] [ext_resource type="PackedScene" path="res://scenes/ui/speech_bubble.tscn" id="2_bubble"] +[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_grey"] albedo_color = Color(0.55, 0.55, 0.57, 1) @@ -37,3 +38,6 @@ mesh = SubResource("SphereMesh_head") [node name="SpeechBubble" parent="." instance=ExtResource("2_bubble")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.4, 0) + +[node name="GooglyEyes" parent="Head" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.03, -0.15) diff --git a/scenes/player.tscn b/scenes/player.tscn index 4b636ac..8dfdf32 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=7 format=3] +[gd_scene load_steps=8 format=3] [ext_resource type="Script" path="res://scripts/gameplay/player.gd" id="1_player"] [ext_resource type="PackedScene" path="res://scenes/ui/speech_bubble.tscn" id="2_bubble"] [ext_resource type="PackedScene" path="res://scenes/ui/journal.tscn" id="3_journal"] +[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_player"] albedo_color = Color(0.3, 0.5, 0.85, 1) @@ -44,3 +45,6 @@ current = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.4, 0) [node name="Journal" parent="." instance=ExtResource("3_journal")] + +[node name="GooglyEyes" parent="MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3) diff --git a/scenes/viaduct/viaduct.tscn b/scenes/viaduct/viaduct.tscn index fb5ebc0..e7c28cc 100644 --- a/scenes/viaduct/viaduct.tscn +++ b/scenes/viaduct/viaduct.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=3] +[gd_scene load_steps=26 format=3] [ext_resource type="Script" path="res://scripts/gameplay/viaduct.gd" id="1_viaduct"] [ext_resource type="PackedScene" path="res://scenes/player.tscn" id="2_player"] @@ -8,6 +8,7 @@ [ext_resource type="Script" path="res://scripts/gameplay/wind_controller.gd" id="6_wind"] [ext_resource type="Script" path="res://scripts/gameplay/weather_controller.gd" id="7_weather"] [ext_resource type="Script" path="res://scripts/gameplay/balance_qte.gd" id="8_qte"] +[ext_resource type="PackedScene" path="res://scenes/npcs/googly_eyes.tscn" id="90_eyes"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_sky"] sky_horizon_color = Color(0.62, 0.63, 0.66, 1) @@ -194,3 +195,6 @@ outline_size = 12 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 2) [node name="DebugOverlay" parent="." instance=ExtResource("3_debug")] + +[node name="GooglyEyes" parent="Wren/MeshInstance3D" instance=ExtResource("90_eyes")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, -0.3)